diff --git a/Fix-build-against-new-Syndication-library.patch b/Fix-build-against-new-Syndication-library.patch deleted file mode 100644 index e6d8f36..0000000 --- a/Fix-build-against-new-Syndication-library.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 46a4d7a378372a028522cfba94e77a11c478b36c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= -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 - diff --git a/fix-build-with-Qt-5_11.patch b/fix-build-with-Qt-5_11.patch deleted file mode 100644 index 46895a3..0000000 --- a/fix-build-with-Qt-5_11.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 16691987fdf035f7cafd6c65f7287639ac4cc27f Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 18 Mar 2018 19:13:26 +0100 -Subject: Fix build with Qt 5.11 (missing headers) - -Reviewers: stikonas - -Reviewed By: stikonas - -Differential Revision: https://phabricator.kde.org/D11456 ---- - ktorrent/dialogs/fileselectdlg.cpp | 1 + - ktorrent/groups/groupview.cpp | 1 + - plugins/search/searchprefpage.cpp | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/ktorrent/dialogs/fileselectdlg.cpp b/ktorrent/dialogs/fileselectdlg.cpp -index 139b4752..ec7d8ede 100644 ---- a/ktorrent/dialogs/fileselectdlg.cpp -+++ b/ktorrent/dialogs/fileselectdlg.cpp -@@ -20,6 +20,7 @@ - - #include "fileselectdlg.h" - -+#include - #include - #include - #include -diff --git a/ktorrent/groups/groupview.cpp b/ktorrent/groups/groupview.cpp -index 990ed0d3..76208144 100644 ---- a/ktorrent/groups/groupview.cpp -+++ b/ktorrent/groups/groupview.cpp -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/plugins/search/searchprefpage.cpp b/plugins/search/searchprefpage.cpp -index 667e7a82..4be6cd5c 100644 ---- a/plugins/search/searchprefpage.cpp -+++ b/plugins/search/searchprefpage.cpp -@@ -21,6 +21,7 @@ - - #include "searchprefpage.h" - -+#include - #include - #include - #include --- -2.17.0 - -From c66233cd9f5b87f9e265beae0a16839d3a5645a3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= -Date: Fri, 4 May 2018 00:33:44 +0200 -Subject: Fix build against Qt 5.11 (missing includes) - ---- - plugins/syndication/syndicationactivity.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/plugins/syndication/syndicationactivity.cpp b/plugins/syndication/syndicationactivity.cpp -index 61e80396..5736d526 100644 ---- a/plugins/syndication/syndicationactivity.cpp -+++ b/plugins/syndication/syndicationactivity.cpp -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - - #include - #include --- -2.17.0 - diff --git a/fix-build.patch b/fix-build.patch deleted file mode 100644 index 37e8b6d..0000000 --- a/fix-build.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit 6d7433d44c7f18cd84d2de105beb5c646ed0e355 -Author: Adriaan de Groot -Date: Tue Apr 24 19:15:32 2018 +0200 - - QTimer may not be an incomplete type as it is used as a member variable. - Add the #include to fully define the type. This problem shows up when this - header is included in a context that doesn't already have QTimer included -- - CMake 3.11 exposes that accidentally. - - Upstreamed from FreeBSD ports. - -diff --git a/ktorrent/dialogs/torrentcreatordlg.h b/ktorrent/dialogs/torrentcreatordlg.h -index 68dde8ad..12a1a433 100644 ---- a/ktorrent/dialogs/torrentcreatordlg.h -+++ b/ktorrent/dialogs/torrentcreatordlg.h -@@ -23,6 +23,8 @@ - #define KT_TORRENTCREATORDLG_HH - - #include -+#include -+ - #include "ui_torrentcreatordlg.h" - #include - diff --git a/initial-preference.diff b/initial-preference.diff index 0d2090c..dbf21d4 100644 --- a/initial-preference.diff +++ b/initial-preference.diff @@ -1,5 +1,5 @@ ---- ktorrent/org.kde.ktorrent.desktop.orig 2011-03-14 19:48:22.000000000 +0200 -+++ ktorrent/org.kde.ktorrent.desktop 2011-03-16 00:26:00.162000025 +0200 +--- a/ktorrent/org.kde.ktorrent.desktop.orig 2011-03-14 19:48:22.000000000 +0200 ++++ b/ktorrent/org.kde.ktorrent.desktop 2011-03-16 00:26:00.162000025 +0200 @@ -120,6 +120,7 @@ Type=Application X-DocPath=ktorrent/index.html diff --git a/ktorrent-5.1.0.tar.xz b/ktorrent-5.1.0.tar.xz deleted file mode 100644 index 410e62d..0000000 --- a/ktorrent-5.1.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3c57882f78006dcec3c5fb243479e995cc541e51e6acded5bf98a09900c486a3 -size 2046916 diff --git a/ktorrent-5.1.1.tar.xz b/ktorrent-5.1.1.tar.xz new file mode 100644 index 0000000..5f33372 --- /dev/null +++ b/ktorrent-5.1.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b54149cf1dd3ed59cb7be54c326469a64e152f39f2d7db01de9fdd6b2ce3562a +size 2049392 diff --git a/ktorrent.changes b/ktorrent.changes index e60bd9b..264db29 100644 --- a/ktorrent.changes +++ b/ktorrent.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Fri Aug 31 12:11:47 UTC 2018 - wbauer@tmo.at + +- Update to version 5.1.1 + * Formatting torrent ratio as floating point number - no + scientific notation (kde#395525) + * Show high-resolution and vector logos properly in HighDPI mode + (kde#390605) + * Fix crash when changing file download order (kde#384371) + * Fix installation of icons + * Fix IPFilter plugin + * Fix toolbar button text hiding opt + * Remove unused KService dependency + * Set text and border color from palette for syndication preview + * Fix build against new Syndication library + * Fix build with Qt 5.11 +- Adjust initial-preference.diff to apply with -p1, and use + %autopatch to apply all patches +- Drop patches merged upstream: + * fix-build.patch + * fix-build-with-Qt-5_11.patch + * Fix-build-against-new-Syndication-library.patch + ------------------------------------------------------------------- Sun Jul 29 08:19:21 UTC 2018 - wbauer@tmo.at @@ -657,7 +680,7 @@ Fri Apr 17 14:11:13 CEST 2009 - dmueller@suse.de to filesystem rpm ------------------------------------------------------------------ -Mon Apr 06 14:45 CET 2009 - mrdocs@opensuse.org +Mon Apr 06 14:45 CEST 2009 - mrdocs@opensuse.org - Bump version to 3.2.1 - Webseeding has been improved considerably diff --git a/ktorrent.spec b/ktorrent.spec index 927ee59..792c66f 100644 --- a/ktorrent.spec +++ b/ktorrent.spec @@ -17,25 +17,21 @@ Name: ktorrent -Version: 5.1.0 +Version: 5.1.1 Release: 0 Summary: KDE BitTorrent Client License: GPL-2.0-or-later Group: Productivity/Networking/File-Sharing URL: http://ktorrent.org/ -Source0: http://download.kde.org/stable/ktorrent/5.1/%{name}-%{version}.tar.xz +Source0: http://download.kde.org/stable/ktorrent/%{version}/%{name}-%{version}.tar.xz Source2: ktorrent.1 Source3: ktupnptest.1 # PATCH-FIX-OPENSUSE initial-preference.diff cmorve69@yahoo.es -- InitialPreference to set it as the default torrent downloader Patch0: initial-preference.diff +%if 0%{?suse_version} < 1330 # PATCH-FIX-OPENSUSE fix-build-with-qt5.6.patch -- make it build with Qt < 5.7.0 (i.e. on Leap 42.x) Patch1: fix-build-with-qt5.6.patch -# PATCH-FIX-UPSTREAM fix-build.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 +%endif BuildRequires: extra-cmake-modules BuildRequires: fdupes BuildRequires: libktorrent-devel >= 2.1 @@ -63,7 +59,6 @@ BuildRequires: cmake(KF5Notifications) BuildRequires: cmake(KF5NotifyConfig) BuildRequires: cmake(KF5Parts) BuildRequires: cmake(KF5Plotting) -BuildRequires: cmake(KF5Service) BuildRequires: cmake(KF5Solid) BuildRequires: cmake(KF5TextWidgets) BuildRequires: cmake(KF5WebKit) @@ -103,13 +98,7 @@ for BitTorrent. %prep %setup -q -%patch0 -%if 0%{?suse_version} < 1330 -%patch1 -p1 -%endif -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 +%autopatch -p1 %build %if 0%{?suse_version} < 1330