From 22a7afa9198d103fd181636ffff9ded8e066e2e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Sun, 9 Feb 2014 03:19:47 +0000 Subject: Sun Feb 9 03:15:59 UTC 2014 --- extra/avogadro/PKGBUILD | 4 +-- extra/ktorrent/PKGBUILD | 27 +++++++++++----- extra/ktorrent/kde412.patch | 18 +++++++++++ extra/ktorrent/kdebug-315239.patch | 65 ++++++++++++++++++++++++++++++++++++++ extra/whois/PKGBUILD | 6 ++-- 5 files changed, 107 insertions(+), 13 deletions(-) create mode 100644 extra/ktorrent/kde412.patch create mode 100644 extra/ktorrent/kdebug-315239.patch (limited to 'extra') diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD index e7fbea6a3..da6afa824 100644 --- a/extra/avogadro/PKGBUILD +++ b/extra/avogadro/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 205472 2014-02-05 17:31:40Z andrea $ +# $Id: PKGBUILD 205595 2014-02-08 15:48:17Z andrea $ # Maintainer: # Contributor: Andrea Scarpino # Contributor: Nick B pkgname=avogadro pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="An advanced molecular editor based on Qt" arch=('i686' 'x86_64') url="http://avogadro.openmolecules.net/wiki/Main_Page" diff --git a/extra/ktorrent/PKGBUILD b/extra/ktorrent/PKGBUILD index 4d9053872..ab0e6ba2d 100644 --- a/extra/ktorrent/PKGBUILD +++ b/extra/ktorrent/PKGBUILD @@ -1,23 +1,34 @@ -# $Id: PKGBUILD 176930 2013-02-02 18:16:57Z andrea $ +# $Id: PKGBUILD 205598 2014-02-08 16:27:50Z andrea $ # Maintainer: Ronald van Haren # Contributor: Travis Willard # Contributor: Georg Grabler pkgname=ktorrent pkgver=4.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="A powerful BitTorrent client for KDE" arch=('i686' 'x86_64') -url='http://ktorrent.org/' +url='http://ktorrent.pwsp.net/' license=('GPL2') -depends=('libktorrent' 'kdebase-workspace' 'taglib') -makedepends=('automoc4' 'cmake' 'boost') -source=("http://ktorrent.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.bz2") +depends=('libktorrent' 'kdebase-runtime' 'taglib') +makedepends=('automoc4' 'cmake' 'boost' 'kdebase-workspace') install=${pkgname}.install -sha1sums=('6b56bab48dd07805225c3d4d5d5d1c4c1def241e') +source=("http://ktorrent.pwsp.net/downloads/${pkgver}/${pkgname}-${pkgver}.tar.bz2" + 'kde412.patch' + 'kdebug-315239.patch') +sha1sums=('6b56bab48dd07805225c3d4d5d5d1c4c1def241e' + 'f2c0e05913b2f21b593818e2cd3547d09f86be86' + 'd247aecbbbbbda3eef8dcb51d3db244b1c845f85') -build() { +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 \ diff --git a/extra/ktorrent/kde412.patch b/extra/ktorrent/kde412.patch new file mode 100644 index 000000000..445a645d2 --- /dev/null +++ b/extra/ktorrent/kde412.patch @@ -0,0 +1,18 @@ +From: Christoph Feck +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}) + + diff --git a/extra/ktorrent/kdebug-315239.patch b/extra/ktorrent/kdebug-315239.patch new file mode 100644 index 000000000..524a10d88 --- /dev/null +++ b/extra/ktorrent/kdebug-315239.patch @@ -0,0 +1,65 @@ +commit 3dfcbeb9765e99f9b99951134b17268eb7a617d2 +Author: Joris Guisson +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(); diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD index 7ccd5f456..425c5c379 100644 --- a/extra/whois/PKGBUILD +++ b/extra/whois/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 203047 2014-01-02 17:53:12Z giovanni $ +# $Id: PKGBUILD 205600 2014-02-08 18:07:53Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Tom Newsom pkgname=whois -pkgver=5.1.0 +pkgver=5.1.1 pkgrel=1 pkgdesc="The whois client by Marco d'Itri" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('libidn') makedepends=('perl') backup=('etc/whois.conf') source=("http://ftp.debian.org/debian/pool/main/w/whois/${pkgname}_${pkgver}.tar.xz") -md5sums=('e16cc6ca56a6834ab60ace26215d6b0c') +md5sums=('aa4561134a03e22e2d759748ca676a97') build() { cd "${srcdir}/${pkgname}-${pkgver}" -- cgit v1.2.3