[arch-commits] Commit in ktorrent/repos (12 files)
Antonio Rojas
arojas at archlinux.org
Sat Apr 16 10:13:45 UTC 2016
Date: Saturday, April 16, 2016 @ 12:13:45
Author: arojas
Revision: 265046
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
ktorrent/repos/testing-i686/PKGBUILD
(from rev 265045, ktorrent/trunk/PKGBUILD)
ktorrent/repos/testing-i686/ktorrent.install
(from rev 265045, ktorrent/trunk/ktorrent.install)
ktorrent/repos/testing-x86_64/PKGBUILD
(from rev 265045, ktorrent/trunk/PKGBUILD)
ktorrent/repos/testing-x86_64/ktorrent.install
(from rev 265045, ktorrent/trunk/ktorrent.install)
Deleted:
ktorrent/repos/testing-i686/PKGBUILD
ktorrent/repos/testing-i686/kde412.patch
ktorrent/repos/testing-i686/kdebug-315239.patch
ktorrent/repos/testing-i686/ktorrent.install
ktorrent/repos/testing-x86_64/PKGBUILD
ktorrent/repos/testing-x86_64/kde412.patch
ktorrent/repos/testing-x86_64/kdebug-315239.patch
ktorrent/repos/testing-x86_64/ktorrent.install
------------------------------------+
/PKGBUILD | 74 +++++++++++++++++++++++++++++++++++
/ktorrent.install | 26 ++++++++++++
testing-i686/PKGBUILD | 37 -----------------
testing-i686/kde412.patch | 18 --------
testing-i686/kdebug-315239.patch | 65 ------------------------------
testing-i686/ktorrent.install | 13 ------
testing-x86_64/PKGBUILD | 37 -----------------
testing-x86_64/kde412.patch | 18 --------
testing-x86_64/kdebug-315239.patch | 65 ------------------------------
testing-x86_64/ktorrent.install | 13 ------
10 files changed, 100 insertions(+), 266 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2016-04-16 10:13:03 UTC (rev 265045)
+++ testing-i686/PKGBUILD 2016-04-16 10:13:45 UTC (rev 265046)
@@ -1,37 +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=5.0
-pkgrel=1
-pkgdesc="A powerful BitTorrent client for KDE"
-arch=('i686' 'x86_64')
-url='http://ktorrent.pwsp.net/'
-license=('GPL2')
-depends=('libktorrent' 'kdelibs4support' 'kcmutils' 'knotifyconfig' 'kross')
-makedepends=('extra-cmake-modules' 'python' 'kdoctools' 'boost' 'plasma-workspace' 'kdnssd' 'taglib')
-optdepends=('plasma-workspace: shutdown plugin' 'kdnssd: zeroconf plugin' 'taglib: mediaplayer plugin')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz")
-sha1sums=('06c9e9a644704b72c20842ab19f794f659be9f0a')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../$pkgname-$pkgver \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
- -DKDE_INSTALL_LIBDIR=lib
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: ktorrent/repos/testing-i686/PKGBUILD (from rev 265045, ktorrent/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2016-04-16 10:13:45 UTC (rev 265046)
@@ -0,0 +1,37 @@
+# $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=5.0
+pkgrel=1
+pkgdesc="A powerful BitTorrent client for KDE"
+arch=('i686' 'x86_64')
+url='http://ktorrent.pwsp.net/'
+license=('GPL2')
+depends=('libktorrent' 'kdelibs4support' 'kcmutils' 'knotifyconfig' 'kross')
+makedepends=('extra-cmake-modules' 'python' 'kdoctools' 'boost' 'plasma-workspace' 'kdnssd' 'taglib')
+optdepends=('plasma-workspace: shutdown plugin' 'kdnssd: zeroconf plugin' 'taglib: mediaplayer plugin')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz")
+sha1sums=('06c9e9a644704b72c20842ab19f794f659be9f0a')
+
+prepare() {
+ mkdir -p build
+}
+
+build() {
+ cd build
+ cmake ../$pkgname-$pkgver \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DKDE_INSTALL_LIBDIR=lib
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Deleted: testing-i686/kde412.patch
===================================================================
--- testing-i686/kde412.patch 2016-04-16 10:13:03 UTC (rev 265045)
+++ testing-i686/kde412.patch 2016-04-16 10:13:45 UTC (rev 265046)
@@ -1,18 +0,0 @@
-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})
-
-
Deleted: testing-i686/kdebug-315239.patch
===================================================================
--- testing-i686/kdebug-315239.patch 2016-04-16 10:13:03 UTC (rev 265045)
+++ testing-i686/kdebug-315239.patch 2016-04-16 10:13:45 UTC (rev 265046)
@@ -1,65 +0,0 @@
-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: testing-i686/ktorrent.install
===================================================================
--- testing-i686/ktorrent.install 2016-04-16 10:13:03 UTC (rev 265045)
+++ testing-i686/ktorrent.install 2016-04-16 10:13:45 UTC (rev 265046)
@@ -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/testing-i686/ktorrent.install (from rev 265045, ktorrent/trunk/ktorrent.install)
===================================================================
--- testing-i686/ktorrent.install (rev 0)
+++ testing-i686/ktorrent.install 2016-04-16 10:13:45 UTC (rev 265046)
@@ -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: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2016-04-16 10:13:03 UTC (rev 265045)
+++ testing-x86_64/PKGBUILD 2016-04-16 10:13:45 UTC (rev 265046)
@@ -1,37 +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=5.0
-pkgrel=1
-pkgdesc="A powerful BitTorrent client for KDE"
-arch=('i686' 'x86_64')
-url='http://ktorrent.pwsp.net/'
-license=('GPL2')
-depends=('libktorrent' 'kdelibs4support' 'kcmutils' 'knotifyconfig' 'kross')
-makedepends=('extra-cmake-modules' 'python' 'kdoctools' 'boost' 'plasma-workspace' 'kdnssd' 'taglib')
-optdepends=('plasma-workspace: shutdown plugin' 'kdnssd: zeroconf plugin' 'taglib: mediaplayer plugin')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz")
-sha1sums=('06c9e9a644704b72c20842ab19f794f659be9f0a')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../$pkgname-$pkgver \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
- -DKDE_INSTALL_LIBDIR=lib
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: ktorrent/repos/testing-x86_64/PKGBUILD (from rev 265045, ktorrent/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2016-04-16 10:13:45 UTC (rev 265046)
@@ -0,0 +1,37 @@
+# $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=5.0
+pkgrel=1
+pkgdesc="A powerful BitTorrent client for KDE"
+arch=('i686' 'x86_64')
+url='http://ktorrent.pwsp.net/'
+license=('GPL2')
+depends=('libktorrent' 'kdelibs4support' 'kcmutils' 'knotifyconfig' 'kross')
+makedepends=('extra-cmake-modules' 'python' 'kdoctools' 'boost' 'plasma-workspace' 'kdnssd' 'taglib')
+optdepends=('plasma-workspace: shutdown plugin' 'kdnssd: zeroconf plugin' 'taglib: mediaplayer plugin')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz")
+sha1sums=('06c9e9a644704b72c20842ab19f794f659be9f0a')
+
+prepare() {
+ mkdir -p build
+}
+
+build() {
+ cd build
+ cmake ../$pkgname-$pkgver \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DKDE_INSTALL_LIBDIR=lib
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Deleted: testing-x86_64/kde412.patch
===================================================================
--- testing-x86_64/kde412.patch 2016-04-16 10:13:03 UTC (rev 265045)
+++ testing-x86_64/kde412.patch 2016-04-16 10:13:45 UTC (rev 265046)
@@ -1,18 +0,0 @@
-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})
-
-
Deleted: testing-x86_64/kdebug-315239.patch
===================================================================
--- testing-x86_64/kdebug-315239.patch 2016-04-16 10:13:03 UTC (rev 265045)
+++ testing-x86_64/kdebug-315239.patch 2016-04-16 10:13:45 UTC (rev 265046)
@@ -1,65 +0,0 @@
-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: testing-x86_64/ktorrent.install
===================================================================
--- testing-x86_64/ktorrent.install 2016-04-16 10:13:03 UTC (rev 265045)
+++ testing-x86_64/ktorrent.install 2016-04-16 10:13:45 UTC (rev 265046)
@@ -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/testing-x86_64/ktorrent.install (from rev 265045, ktorrent/trunk/ktorrent.install)
===================================================================
--- testing-x86_64/ktorrent.install (rev 0)
+++ testing-x86_64/ktorrent.install 2016-04-16 10:13:45 UTC (rev 265046)
@@ -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