[arch-commits] Commit in ktorrent/repos (12 files)

Andrea Scarpino andrea at nymeria.archlinux.org
Sat Feb 8 16:27:50 UTC 2014


    Date: Saturday, February 8, 2014 @ 17:27:50
  Author: andrea
Revision: 205598

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  ktorrent/repos/extra-i686/PKGBUILD
    (from rev 205597, ktorrent/trunk/PKGBUILD)
  ktorrent/repos/extra-i686/kde412.patch
    (from rev 205597, ktorrent/trunk/kde412.patch)
  ktorrent/repos/extra-i686/kdebug-315239.patch
    (from rev 205597, ktorrent/trunk/kdebug-315239.patch)
  ktorrent/repos/extra-i686/ktorrent.install
    (from rev 205597, ktorrent/trunk/ktorrent.install)
  ktorrent/repos/extra-x86_64/PKGBUILD
    (from rev 205597, ktorrent/trunk/PKGBUILD)
  ktorrent/repos/extra-x86_64/kde412.patch
    (from rev 205597, ktorrent/trunk/kde412.patch)
  ktorrent/repos/extra-x86_64/kdebug-315239.patch
    (from rev 205597, ktorrent/trunk/kdebug-315239.patch)
  ktorrent/repos/extra-x86_64/ktorrent.install
    (from rev 205597, ktorrent/trunk/ktorrent.install)
Deleted:
  ktorrent/repos/extra-i686/PKGBUILD
  ktorrent/repos/extra-i686/ktorrent.install
  ktorrent/repos/extra-x86_64/PKGBUILD
  ktorrent/repos/extra-x86_64/ktorrent.install

----------------------------------+
 /PKGBUILD                        |   84 +++++++++++++++++++++++++++++++++++++
 /ktorrent.install                |   26 +++++++++++
 extra-i686/PKGBUILD              |   31 -------------
 extra-i686/kde412.patch          |   18 +++++++
 extra-i686/kdebug-315239.patch   |   65 ++++++++++++++++++++++++++++
 extra-i686/ktorrent.install      |   13 -----
 extra-x86_64/PKGBUILD            |   31 -------------
 extra-x86_64/kde412.patch        |   18 +++++++
 extra-x86_64/kdebug-315239.patch |   65 ++++++++++++++++++++++++++++
 extra-x86_64/ktorrent.install    |   13 -----
 10 files changed, 276 insertions(+), 88 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2014-02-08 16:27:38 UTC (rev 205597)
+++ extra-i686/PKGBUILD	2014-02-08 16:27:50 UTC (rev 205598)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Travis Willard <travisw at wmpub.ca>
-# Contributor: Georg Grabler <ggrabler at gmail.com>
-
-pkgname=ktorrent
-pkgver=4.3.1
-pkgrel=1
-pkgdesc="A powerful BitTorrent client for KDE"
-arch=('i686' 'x86_64')
-url='http://ktorrent.org/'
-license=('GPL2')
-depends=('libktorrent' 'kdebase-workspace' 'taglib')
-makedepends=('automoc4' 'cmake' 'boost')
-source=("http://ktorrent.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
-install=${pkgname}.install
-sha1sums=('6b56bab48dd07805225c3d4d5d5d1c4c1def241e')
-
-build() {
-	mkdir 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/extra-i686/PKGBUILD (from rev 205597, ktorrent/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2014-02-08 16:27:50 UTC (rev 205598)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Travis Willard <travisw at wmpub.ca>
+# Contributor: Georg Grabler <ggrabler at gmail.com>
+
+pkgname=ktorrent
+pkgver=4.3.1
+pkgrel=2
+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/extra-i686/kde412.patch (from rev 205597, ktorrent/trunk/kde412.patch)
===================================================================
--- extra-i686/kde412.patch	                        (rev 0)
+++ extra-i686/kde412.patch	2014-02-08 16:27:50 UTC (rev 205598)
@@ -0,0 +1,18 @@
+From: Christoph Feck <christoph at 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/extra-i686/kdebug-315239.patch (from rev 205597, ktorrent/trunk/kdebug-315239.patch)
===================================================================
--- extra-i686/kdebug-315239.patch	                        (rev 0)
+++ extra-i686/kdebug-315239.patch	2014-02-08 16:27:50 UTC (rev 205598)
@@ -0,0 +1,65 @@
+commit 3dfcbeb9765e99f9b99951134b17268eb7a617d2
+Author: Joris Guisson <joris.guisson at 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();

Deleted: extra-i686/ktorrent.install
===================================================================
--- extra-i686/ktorrent.install	2014-02-08 16:27:38 UTC (rev 205597)
+++ extra-i686/ktorrent.install	2014-02-08 16:27:50 UTC (rev 205598)
@@ -1,13 +0,0 @@
-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/extra-i686/ktorrent.install (from rev 205597, ktorrent/trunk/ktorrent.install)
===================================================================
--- extra-i686/ktorrent.install	                        (rev 0)
+++ extra-i686/ktorrent.install	2014-02-08 16:27:50 UTC (rev 205598)
@@ -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
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2014-02-08 16:27:38 UTC (rev 205597)
+++ extra-x86_64/PKGBUILD	2014-02-08 16:27:50 UTC (rev 205598)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Travis Willard <travisw at wmpub.ca>
-# Contributor: Georg Grabler <ggrabler at gmail.com>
-
-pkgname=ktorrent
-pkgver=4.3.1
-pkgrel=1
-pkgdesc="A powerful BitTorrent client for KDE"
-arch=('i686' 'x86_64')
-url='http://ktorrent.org/'
-license=('GPL2')
-depends=('libktorrent' 'kdebase-workspace' 'taglib')
-makedepends=('automoc4' 'cmake' 'boost')
-source=("http://ktorrent.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
-install=${pkgname}.install
-sha1sums=('6b56bab48dd07805225c3d4d5d5d1c4c1def241e')
-
-build() {
-	mkdir 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/extra-x86_64/PKGBUILD (from rev 205597, ktorrent/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2014-02-08 16:27:50 UTC (rev 205598)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Travis Willard <travisw at wmpub.ca>
+# Contributor: Georg Grabler <ggrabler at gmail.com>
+
+pkgname=ktorrent
+pkgver=4.3.1
+pkgrel=2
+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/extra-x86_64/kde412.patch (from rev 205597, ktorrent/trunk/kde412.patch)
===================================================================
--- extra-x86_64/kde412.patch	                        (rev 0)
+++ extra-x86_64/kde412.patch	2014-02-08 16:27:50 UTC (rev 205598)
@@ -0,0 +1,18 @@
+From: Christoph Feck <christoph at 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/extra-x86_64/kdebug-315239.patch (from rev 205597, ktorrent/trunk/kdebug-315239.patch)
===================================================================
--- extra-x86_64/kdebug-315239.patch	                        (rev 0)
+++ extra-x86_64/kdebug-315239.patch	2014-02-08 16:27:50 UTC (rev 205598)
@@ -0,0 +1,65 @@
+commit 3dfcbeb9765e99f9b99951134b17268eb7a617d2
+Author: Joris Guisson <joris.guisson at 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();

Deleted: extra-x86_64/ktorrent.install
===================================================================
--- extra-x86_64/ktorrent.install	2014-02-08 16:27:38 UTC (rev 205597)
+++ extra-x86_64/ktorrent.install	2014-02-08 16:27:50 UTC (rev 205598)
@@ -1,13 +0,0 @@
-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/extra-x86_64/ktorrent.install (from rev 205597, ktorrent/trunk/ktorrent.install)
===================================================================
--- extra-x86_64/ktorrent.install	                        (rev 0)
+++ extra-x86_64/ktorrent.install	2014-02-08 16:27:50 UTC (rev 205598)
@@ -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
+}




More information about the arch-commits mailing list