summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2017-01-10 19:27:21 +0100
committerJohannes Huber <johu@gentoo.org>2017-01-10 19:27:30 +0100
commit80054c028619878721c171a81444bb515fb34192 (patch)
treed1a50247e11bdaf4cfb66a42f01e033811636935 /net-p2p/ktorrent/files
parentdev-libs/qtkeychain: Remove 0.6.2 (diff)
downloadgentoo-80054c028619878721c171a81444bb515fb34192.tar.gz
gentoo-80054c028619878721c171a81444bb515fb34192.tar.bz2
gentoo-80054c028619878721c171a81444bb515fb34192.zip
net-p2p/ktorrent: Drop slot 4
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'net-p2p/ktorrent/files')
-rw-r--r--net-p2p/ktorrent/files/ktorrent-4.3.1-ipfilter.patch72
-rw-r--r--net-p2p/ktorrent/files/ktorrent-4.3.1-underlinking.patch21
2 files changed, 0 insertions, 93 deletions
diff --git a/net-p2p/ktorrent/files/ktorrent-4.3.1-ipfilter.patch b/net-p2p/ktorrent/files/ktorrent-4.3.1-ipfilter.patch
deleted file mode 100644
index 4572c3d89c64..000000000000
--- a/net-p2p/ktorrent/files/ktorrent-4.3.1-ipfilter.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 3dfcbeb9765e99f9b99951134b17268eb7a617d2 Mon Sep 17 00:00:00 2001
-From: Joris Guisson <joris.guisson@gmail.com>
-Date: Thu, 1 Aug 2013 13:19:29 +0200
-Subject: [PATCH] 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.8.3.2
-
diff --git a/net-p2p/ktorrent/files/ktorrent-4.3.1-underlinking.patch b/net-p2p/ktorrent/files/ktorrent-4.3.1-underlinking.patch
deleted file mode 100644
index 84e6fa72e6b0..000000000000
--- a/net-p2p/ktorrent/files/ktorrent-4.3.1-underlinking.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 3ef62c439027acc0a166101419fff4bc0c69013d Mon Sep 17 00:00:00 2001
-From: Christoph Feck <christoph@maxiom.de>
-Date: Fri, 19 Oct 2012 10:56:22 +0200
-Subject: [PATCH] SVN_SILENT link
-
----
- 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..90d6d42 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_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBKTORRENT_LIBRARIES})
---
-1.8.1.2
-