pool/ktorrent
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 626027 from KDE:Extra

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/626027
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ktorrent?expand=0&rev=111
This commit is contained in:
Dominique Leuenberger 2018-07-31 13:59:14 +00:00 committed by Git OBS Bridge
parent 49e0fdf98e
commit 9f40a62bb5
3 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Fix-build-against-new-Syndication-library.patch Normal file
View File

@ -0,0 +1,44 @@
From 46a4d7a378372a028522cfba94e77a11c478b36c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
Date: Fri, 4 May 2018 00:31:44 +0200
Subject: Fix build against new Syndication library
Syndication::Loader::loadUrl() now always requires a DataRetriever
to be passed as a second argument. The behavior of the old method
was basically identical to using FeedRetriever anyway, so we can
use the FeedRetriever here to make it compile against new Syndication
and keep the behavior.
---
plugins/syndication/ktfeed.cpp | 2 +-
plugins/syndication/syndicationactivity.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/plugins/syndication/ktfeed.cpp b/plugins/syndication/ktfeed.cpp
index 099cd4f..f20eb2c 100644
--- a/plugins/syndication/ktfeed.cpp
+++ b/plugins/syndication/ktfeed.cpp
@@ -277,7 +277,7 @@ namespace kt
status = DOWNLOADING;
update_timer.stop();
Syndication::Loader* loader = Syndication::Loader::create(this, SLOT(loadingFromDiskComplete(Syndication::Loader*, Syndication::FeedPtr, Syndication::ErrorCode)));
- loader->loadFrom(QUrl(dir + QStringLiteral("feed.xml")));
+ loader->loadFrom(QUrl(dir + QStringLiteral("feed.xml")), new FeedRetriever());
updated();
}
diff --git a/plugins/syndication/syndicationactivity.cpp b/plugins/syndication/syndicationactivity.cpp
index 293540d..61e8039 100644
--- a/plugins/syndication/syndicationactivity.cpp
+++ b/plugins/syndication/syndicationactivity.cpp
@@ -135,7 +135,7 @@ namespace kt
}
else
{
- loader->loadFrom(QUrl(url));
+ loader->loadFrom(QUrl(url), new FeedRetriever());
downloads.insert(loader, url);
}
}
--
cgit v0.11.2

6
ktorrent.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Jul 29 08:19:21 UTC 2018 - wbauer@tmo.at
- Add Fix-build-against-new-Syndication-library.patch to make it
compile with KDE Applications 18.08
-------------------------------------------------------------------
Mon Jun 4 05:39:50 UTC 2018 - christophe@krop.fr

3
ktorrent.spec
View File

@ -34,6 +34,8 @@ Patch1: fix-build-with-qt5.6.patch
Patch2: fix-build.patch
# PATCH-FIX-UPSTREAM fix-build-with-Qt-5_11.patch
Patch3: fix-build-with-Qt-5_11.patch
# PATCH-FIX-UPSTREAM
Patch4: Fix-build-against-new-Syndication-library.patch
BuildRequires: extra-cmake-modules
BuildRequires: fdupes
BuildRequires: libktorrent-devel >= 2.1
@ -107,6 +109,7 @@ for BitTorrent.
%endif
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
%if 0%{?suse_version} < 1330