[ktorrent] 4.3.1-11

Rex Dieter rdieter at fedoraproject.org
Sun Jul 13 23:12:28 UTC 2014 

commit e00c582bf60de882a6c44a8e76055ea17e14eea2
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Jul 13 18:12:48 2014 -0500

    4.3.1-11
    
    - pull in some upstream fixes... in particular,
    - ktorrent can't parse ip block list (#1101122)
    - s/kdebase-/kde-/ in -runtime,-workspace deps

 ...filter-extraction-fixes-from-master-branc.patch |   72 ++++++++++++++++++++
 ...Fix-compilation-of-ipblocklisttest-target.patch |   21 ++++++
 ktorrent.spec                                      |   17 ++++-
 3 files changed, 106 insertions(+), 4 deletions(-)
---
diff --git a/0015-Backport-ipfilter-extraction-fixes-from-master-branc.patch b/0015-Backport-ipfilter-extraction-fixes-from-master-branc.patch
new file mode 100644
index 0000000..04c86cf
--- /dev/null
+++ b/0015-Backport-ipfilter-extraction-fixes-from-master-branc.patch
@@ -0,0 +1,72 @@
+From 3dfcbeb9765e99f9b99951134b17268eb7a617d2 Mon Sep 17 00:00:00 2001
+From: Joris Guisson <joris.guisson at gmail.com>
+Date: Thu, 1 Aug 2013 13:19:29 +0200
+Subject: [PATCH 15/34] Backport ipfilter extraction fixes from master branch
+ to 4.3 branch
+
+BUG: 315239
+---
+ ChangeLog                                  |  3 +++
+ plugins/ipfilter/downloadandconvertjob.cpp | 22 +++++-----------------
+ 2 files changed, 8 insertions(+), 17 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index c5ae9da..42c48ff 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,6 @@
++Changes in 4.3.2:
++- Backport ipfilter extraction fixes from master branch (315239)
++
+ Changes in 4.3.1:
+ - Fix new custom groups not appearing in add to group submenu (307230)
+ - Fix crash when right clicking on some locations in the GroupView due to 0 pointer (307160)
+diff --git a/plugins/ipfilter/downloadandconvertjob.cpp b/plugins/ipfilter/downloadandconvertjob.cpp
+index d3092ac..4080c2a 100644
+--- a/plugins/ipfilter/downloadandconvertjob.cpp
++++ b/plugins/ipfilter/downloadandconvertjob.cpp
+@@ -114,12 +114,13 @@ namespace kt
+ 		
+ 		//now determine if it's ZIP or TXT file
+ 		KMimeType::Ptr ptr = KMimeType::findByPath(temp);
++        Out(SYS_IPF|LOG_NOTICE) << "Mimetype: " << ptr->name() << endl;
+ 		if (ptr->name() == "application/zip")
+ 		{
+ 			active_job = KIO::file_move(temp,QString(kt::DataDir() + QLatin1String("level1.zip")),-1,KIO::HideProgressInfo|KIO::Overwrite);
+ 			connect(active_job,SIGNAL(result(KJob*)),this,SLOT(extract(KJob*)));
+ 		}
+-		else if (ptr->name() == "application/x-gzip" || ptr->name() == "application/x-bzip")
++		else if (ptr->name() == "application/x-gzip" || ptr->name() == "application/x-bzip" || ptr->name() == "application/gzip")
+ 		{
+ 			active_job = new bt::DecompressFileJob(temp,QString(kt::DataDir() + "level1.txt"));
+ 			connect(active_job,SIGNAL(result(KJob*)),this,SLOT(convert(KJob*)));
+@@ -174,23 +175,10 @@ namespace kt
+ 		}
+ 		
+ 		QString destination = kt::DataDir() + "level1.txt";
+-		if (zip->directory()->entries().contains("splist.txt"))
++        QStringList entries = zip->directory()->entries();
++		if (entries.count() >= 1)
+ 		{
+-			active_job = new bt::ExtractFileJob(zip,"splist.txt",destination);
+-			connect(active_job,SIGNAL(result(KJob*)),this,SLOT(convert(KJob*)));
+-			unzip = true;
+-			active_job->start();
+-		}
+-		else if (zip->directory()->entries().contains("level1.txt"))
+-		{
+-			active_job = new bt::ExtractFileJob(zip,"level1.txt",destination);
+-			connect(active_job,SIGNAL(result(KJob*)),this,SLOT(convert(KJob*)));
+-			unzip = true;
+-			active_job->start();
+-		}
+-		else if (zip->directory()->entries().contains("ipfilter.dat"))
+-		{
+-			active_job = new bt::ExtractFileJob(zip,"ipfilter.dat",destination);
++			active_job = new bt::ExtractFileJob(zip,entries.front(),destination);
+ 			connect(active_job,SIGNAL(result(KJob*)),this,SLOT(convert(KJob*)));
+ 			unzip = true;
+ 			active_job->start();
+-- 
+1.9.3
+
diff --git a/0026-Fix-compilation-of-ipblocklisttest-target.patch b/0026-Fix-compilation-of-ipblocklisttest-target.patch
new file mode 100644
index 0000000..7490859
--- /dev/null
+++ b/0026-Fix-compilation-of-ipblocklisttest-target.patch
@@ -0,0 +1,21 @@
+From 51fb21577392476b731c776f94668daf6a00ff1f Mon Sep 17 00:00:00 2001
+From: Juan Palacios <jpalaciosdev at gmail.com>
+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 3b16ebc..cc69f19 100644
--- a/ktorrent.spec
+++ b/ktorrent.spec
@@ -9,7 +9,7 @@
 
 Name:           ktorrent
 Version:        4.3.1
-Release:        10%{?pre}%{?dist}
+Release:        11%{?pre}%{?dist}
 Summary:        A BitTorrent program
 License:        GPLv2+
 URL:            http://ktorrent.pwsp.net/
@@ -20,14 +20,16 @@ Source0:        http://ktorrent.pwsp.net/downloads/%{version}%{?pre}/ktorrent-%{
 Patch50: ktorrent-4.2.0-mimetype_magnet.patch
 
 ## upstream patches
+Patch115: 0015-Backport-ipfilter-extraction-fixes-from-master-branc.patch
+Patch126: 0026-Fix-compilation-of-ipblocklisttest-target.patch
 
 BuildRequires: boost-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: GeoIP-devel
 # libtaskmanager support, for plasma applet
-BuildRequires: kdebase-workspace-devel
-BuildRequires: kdelibs4-devel >= 4.4
+BuildRequires: kde-workspace-devel
+BuildRequires: kdelibs4-devel
 BuildRequires: kdelibs4-webkit-devel
 BuildRequires: kdepimlibs-devel
 BuildRequires: libktorrent-devel >= %{libktorrent_ver} 
@@ -39,7 +41,7 @@ Obsoletes: ktorrent < 3.2.3-2
 
 Requires: kross(python)
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
+Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}}
 
 %description
 KTorrent is a BitTorrent program for KDE. Its main features are native KDE
@@ -64,6 +66,8 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 %prep
 %setup -q -n %{name}-%{version}%{?pre}
 
+%patch115 -p1 -b .0015
+%patch126 -p1 -b .0026
 %patch50 -p1 -b .mimetype_magnet
 
 if [ -x %{_bindir}/plasma-dataengine-depextractor ]; then
@@ -147,6 +151,11 @@ fi
 
 
 %changelog
+* Sun Jul 13 2014 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-11
+- pull in some upstream fixes... in particular,
+- ktorrent can't parse ip block list (#1101122)
+- s/kdebase-/kde-/ in -runtime,-workspace deps
+
 * Thu Jun 19 2014 Rex Dieter <rdieter at fedoraproject.org> 4.3.1-10
 - BR: kdelibs4-webkit-devel

More information about the scm-commits mailing list