Date: Saturday, April 16, 2016 @ 12:13:03 Author: arojas Revision: 265045
Drop old patches Deleted: ktorrent/trunk/kde412.patch ktorrent/trunk/kdebug-315239.patch ---------------------+ kde412.patch | 18 ------------- kdebug-315239.patch | 65 -------------------------------------------------- 2 files changed, 83 deletions(-) Deleted: kde412.patch =================================================================== --- kde412.patch 2016-04-16 09:49:54 UTC (rev 265044) +++ kde412.patch 2016-04-16 10:13:03 UTC (rev 265045) @@ -1,18 +0,0 @@ -From: Christoph Feck <[email protected]> -Date: Fri, 19 Oct 2012 08:56:22 +0000 -Subject: SVN_SILENT link -X-Git-Url: http://quickgit.kde.org/?p=ktorrent.git&a=commitdiff&h=3ef62c439027acc0a166101419fff4bc0c69013d ---- -SVN_SILENT link ---- - - ---- a/plugins/ipfilter/tests/CMakeLists.txt -+++ b/plugins/ipfilter/tests/CMakeLists.txt -@@ -1,4 +1,4 @@ - 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_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBKTORRENT_LIBRARIES}) - - Deleted: kdebug-315239.patch =================================================================== --- kdebug-315239.patch 2016-04-16 09:49:54 UTC (rev 265044) +++ kdebug-315239.patch 2016-04-16 10:13:03 UTC (rev 265045) @@ -1,65 +0,0 @@ -commit 3dfcbeb9765e99f9b99951134b17268eb7a617d2 -Author: Joris Guisson <[email protected]> -Date: Thu Aug 1 13:19:29 2013 +0200 - - Backport ipfilter extraction fixes from master branch to 4.3 branch - - BUG: 315239 - -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();
