Date: Sunday, April 12, 2015 @ 16:09:09 Author: fyan Revision: 236293
archrelease: copy trunk to staging-i686, staging-x86_64 Added: ktorrent/repos/staging-i686/ ktorrent/repos/staging-i686/PKGBUILD (from rev 236292, ktorrent/trunk/PKGBUILD) ktorrent/repos/staging-i686/kde412.patch (from rev 236292, ktorrent/trunk/kde412.patch) ktorrent/repos/staging-i686/kdebug-315239.patch (from rev 236292, ktorrent/trunk/kdebug-315239.patch) ktorrent/repos/staging-i686/ktorrent.install (from rev 236292, ktorrent/trunk/ktorrent.install) ktorrent/repos/staging-x86_64/ ktorrent/repos/staging-x86_64/PKGBUILD (from rev 236292, ktorrent/trunk/PKGBUILD) ktorrent/repos/staging-x86_64/kde412.patch (from rev 236292, ktorrent/trunk/kde412.patch) ktorrent/repos/staging-x86_64/kdebug-315239.patch (from rev 236292, ktorrent/trunk/kdebug-315239.patch) ktorrent/repos/staging-x86_64/ktorrent.install (from rev 236292, ktorrent/trunk/ktorrent.install) ------------------------------------+ staging-i686/PKGBUILD | 42 ++++++++++++++++++++++ staging-i686/kde412.patch | 18 +++++++++ staging-i686/kdebug-315239.patch | 65 +++++++++++++++++++++++++++++++++++ staging-i686/ktorrent.install | 13 +++++++ staging-x86_64/PKGBUILD | 42 ++++++++++++++++++++++ staging-x86_64/kde412.patch | 18 +++++++++ staging-x86_64/kdebug-315239.patch | 65 +++++++++++++++++++++++++++++++++++ staging-x86_64/ktorrent.install | 13 +++++++ 8 files changed, 276 insertions(+) Copied: ktorrent/repos/staging-i686/PKGBUILD (from rev 236292, ktorrent/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2015-04-12 14:09:09 UTC (rev 236293) @@ -0,0 +1,42 @@ +# $Id$ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Travis Willard <trav...@wmpub.ca> +# Contributor: Georg Grabler <ggrab...@gmail.com> + +pkgname=ktorrent +pkgver=4.3.1 +pkgrel=4 +pkgdesc="A powerful BitTorrent client for KDE" +arch=('i686' 'x86_64') +url='http://ktorrent.pwsp.net/' +license=('GPL2') +depends=('libktorrent' 'kdebase-runtime' 'taglib') +makedepends=('automoc4' 'cmake' 'boost' 'kdebase-workspace') +install=${pkgname}.install +source=("http://ktorrent.pwsp.net/downloads/${pkgver}/${pkgname}-${pkgver}.tar.bz2" + 'kde412.patch' + 'kdebug-315239.patch') +sha1sums=('6b56bab48dd07805225c3d4d5d5d1c4c1def241e' + 'f2c0e05913b2f21b593818e2cd3547d09f86be86' + 'd247aecbbbbbda3eef8dcb51d3db244b1c845f85') + +prepare() { + mkdir build + + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/kde412.patch + patch -p1 -i "${srcdir}"/kdebug-315239.patch +} + +build() { + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd build + make DESTDIR="${pkgdir}" install +} Copied: ktorrent/repos/staging-i686/kde412.patch (from rev 236292, ktorrent/trunk/kde412.patch) =================================================================== --- staging-i686/kde412.patch (rev 0) +++ staging-i686/kde412.patch 2015-04-12 14:09:09 UTC (rev 236293) @@ -0,0 +1,18 @@ +From: Christoph Feck <christ...@maxiom.de> +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}) + + Copied: ktorrent/repos/staging-i686/kdebug-315239.patch (from rev 236292, ktorrent/trunk/kdebug-315239.patch) =================================================================== --- staging-i686/kdebug-315239.patch (rev 0) +++ staging-i686/kdebug-315239.patch 2015-04-12 14:09:09 UTC (rev 236293) @@ -0,0 +1,65 @@ +commit 3dfcbeb9765e99f9b99951134b17268eb7a617d2 +Author: Joris Guisson <joris.guis...@gmail.com> +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(); Copied: ktorrent/repos/staging-i686/ktorrent.install (from rev 236292, ktorrent/trunk/ktorrent.install) =================================================================== --- staging-i686/ktorrent.install (rev 0) +++ staging-i686/ktorrent.install 2015-04-12 14:09:09 UTC (rev 236293) @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: ktorrent/repos/staging-x86_64/PKGBUILD (from rev 236292, ktorrent/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2015-04-12 14:09:09 UTC (rev 236293) @@ -0,0 +1,42 @@ +# $Id$ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Travis Willard <trav...@wmpub.ca> +# Contributor: Georg Grabler <ggrab...@gmail.com> + +pkgname=ktorrent +pkgver=4.3.1 +pkgrel=4 +pkgdesc="A powerful BitTorrent client for KDE" +arch=('i686' 'x86_64') +url='http://ktorrent.pwsp.net/' +license=('GPL2') +depends=('libktorrent' 'kdebase-runtime' 'taglib') +makedepends=('automoc4' 'cmake' 'boost' 'kdebase-workspace') +install=${pkgname}.install +source=("http://ktorrent.pwsp.net/downloads/${pkgver}/${pkgname}-${pkgver}.tar.bz2" + 'kde412.patch' + 'kdebug-315239.patch') +sha1sums=('6b56bab48dd07805225c3d4d5d5d1c4c1def241e' + 'f2c0e05913b2f21b593818e2cd3547d09f86be86' + 'd247aecbbbbbda3eef8dcb51d3db244b1c845f85') + +prepare() { + mkdir build + + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/kde412.patch + patch -p1 -i "${srcdir}"/kdebug-315239.patch +} + +build() { + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd build + make DESTDIR="${pkgdir}" install +} Copied: ktorrent/repos/staging-x86_64/kde412.patch (from rev 236292, ktorrent/trunk/kde412.patch) =================================================================== --- staging-x86_64/kde412.patch (rev 0) +++ staging-x86_64/kde412.patch 2015-04-12 14:09:09 UTC (rev 236293) @@ -0,0 +1,18 @@ +From: Christoph Feck <christ...@maxiom.de> +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}) + + Copied: ktorrent/repos/staging-x86_64/kdebug-315239.patch (from rev 236292, ktorrent/trunk/kdebug-315239.patch) =================================================================== --- staging-x86_64/kdebug-315239.patch (rev 0) +++ staging-x86_64/kdebug-315239.patch 2015-04-12 14:09:09 UTC (rev 236293) @@ -0,0 +1,65 @@ +commit 3dfcbeb9765e99f9b99951134b17268eb7a617d2 +Author: Joris Guisson <joris.guis...@gmail.com> +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(); Copied: ktorrent/repos/staging-x86_64/ktorrent.install (from rev 236292, ktorrent/trunk/ktorrent.install) =================================================================== --- staging-x86_64/ktorrent.install (rev 0) +++ staging-x86_64/ktorrent.install 2015-04-12 14:09:09 UTC (rev 236293) @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}