From 938bc30f2e307a0a6b9cd15e19a2e46364d1d029 Mon Sep 17 00:00:00 2001 From: Mateusz Korniak Date: Fri, 2 Sep 2016 15:59:48 +0200 Subject: [PATCH] - up to 4.3.1. KIO magnet dropped upstream. --- ...ompilation-of-ipblocklisttest-target.patch | 21 +++++++++++++++++++ ktorrent.spec | 11 +++++----- 2 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 Fix-compilation-of-ipblocklisttest-target.patch diff --git a/Fix-compilation-of-ipblocklisttest-target.patch b/Fix-compilation-of-ipblocklisttest-target.patch new file mode 100644 index 0000000..7490859 --- /dev/null +++ b/Fix-compilation-of-ipblocklisttest-target.patch @@ -0,0 +1,21 @@ +From 51fb21577392476b731c776f94668daf6a00ff1f Mon Sep 17 00:00:00 2001 +From: Juan Palacios +Date: Thu, 20 Mar 2014 23:37:07 +0100 +Subject: [PATCH 26/34] Fix compilation of ipblocklisttest target + +--- + plugins/ipfilter/tests/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/ipfilter/tests/CMakeLists.txt b/plugins/ipfilter/tests/CMakeLists.txt +index 3b40887..19f27c4 100644 +--- a/plugins/ipfilter/tests/CMakeLists.txt ++++ b/plugins/ipfilter/tests/CMakeLists.txt +@@ -1,3 +1,3 @@ + set(ipblocklisttest_SRCS ipblocklisttest.cpp ../ipblocklist.cpp) + kde4_add_unit_test(ipblocklisttest TESTNAME ipblocklisttest ${ipblocklisttest_SRCS}) +-target_link_libraries(ipblocklisttest ${QT_QTTEST_LIBRARY} ktorrent) ++target_link_libraries(ipblocklisttest ${QT_QTNETWORK_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBKTORRENT_LIBRARIES}) +-- +1.9.3 + diff --git a/ktorrent.spec b/ktorrent.spec index 92b0fd4..cf05c19 100644 --- a/ktorrent.spec +++ b/ktorrent.spec @@ -6,13 +6,14 @@ Summary: Native KDE BitTorrent client Summary(de.UTF-8): Ein nativer KDE BitTorrent Klient Summary(pl.UTF-8): Natywny klient BitTorrenta dla KDE Name: ktorrent -Version: 4.1.3 +Version: 4.3.1 Release: 1 License: GPL Group: Applications/Networking Source0: http://ktorrent.org/downloads/%{version}/%{name}-%{version}.tar.bz2 -# Source0-md5: 4cdd6597a11a465d91e17ac86320883e -Patch0: plasma_applet_remove_taskmanager.diff +# Source0-md5: 696852076315d3aa8ccc8745482872dd +# Patch0: plasma_applet_remove_taskmanager.diff +Patch0: Fix-compilation-of-ipblocklisttest-target.patch URL: http://ktorrent.org/ BuildRequires: Qt3Support-devel >= %{qtver} BuildRequires: QtCore-devel >= %{qtver} @@ -27,7 +28,7 @@ BuildRequires: gmp-devel BuildRequires: kde4-kdebase-workspace-devel >= %{kdever} BuildRequires: kde4-kdelibs-devel >= %{kdever} BuildRequires: kde4-kdepimlibs-devel >= %{kdever} -BuildRequires: libktorrent-devel >= 1.0.5 +BuildRequires: libktorrent-devel >= 1.3 BuildRequires: qca-devel >= 2.0.0 BuildRequires: qt4-build >= %{qtver} BuildRequires: qt4-qmake >= %{qtver} @@ -112,7 +113,6 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/ktorrent %attr(755,root,root) %{_bindir}/ktmagnetdownloader %attr(755,root,root) %{_bindir}/ktupnptest -%attr(755,root,root) %{_libdir}/kde4/kio_magnet.so %attr(755,root,root) %{_libdir}/kde4/ktbwschedulerplugin.so %attr(755,root,root) %{_libdir}/kde4/ktinfowidgetplugin.so %attr(755,root,root) %{_libdir}/kde4/ktipfilterplugin.so @@ -135,7 +135,6 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/libktcore.so.*.*.* %{_desktopdir}/kde4/ktorrent.desktop %{_datadir}/apps/ktorrent -%{_datadir}/config.kcfg/magnetsettings.kcfg %{_datadir}/kde4/services/ktbwschedulerplugin.desktop %{_datadir}/kde4/services/ktinfowidgetplugin.desktop %{_datadir}/kde4/services/ktipfilterplugin.desktop -- 2.44.0