Hello community, here is the log from the commit of package ktorrent for openSUSE:Factory checked in at 2018-07-31 15:59:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ktorrent (Old) and /work/SRC/openSUSE:Factory/.ktorrent.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ktorrent" Tue Jul 31 15:59:14 2018 rev:111 rq:626027 version:5.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ktorrent/ktorrent.changes 2018-06-04 13:23:42.242041208 +0200 +++ /work/SRC/openSUSE:Factory/.ktorrent.new/ktorrent.changes 2018-07-31 15:59:18.087536454 +0200 @@ -1,0 +2,6 @@ +Sun Jul 29 08:19:21 UTC 2018 - [email protected] + +- Add Fix-build-against-new-Syndication-library.patch to make it + compile with KDE Applications 18.08 + +------------------------------------------------------------------- New: ---- Fix-build-against-new-Syndication-library.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktorrent.spec ++++++ --- /var/tmp/diff_new_pack.wcEzQ3/_old 2018-07-31 15:59:18.835537722 +0200 +++ /var/tmp/diff_new_pack.wcEzQ3/_new 2018-07-31 15:59:18.835537722 +0200 @@ -34,6 +34,8 @@ 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 @@ %endif %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build %if 0%{?suse_version} < 1330 ++++++ Fix-build-against-new-Syndication-library.patch ++++++ >From 46a4d7a378372a028522cfba94e77a11c478b36c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <[email protected]> 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
