Merge pull request #7240 from Hoshpak/update-ktorrent

Update ktorrent to 5.0.1

common/shlibs

@@ -1311,7 +1311,7 @@ libqoauth.so.1 qoauth-1.0.1_1
 libIrrlicht.so.1.8 irrlicht-1.8_1
 libsnappy.so.1 snappy-1.1.0_1
 libkonq.so.5 kde-baseapps-4.10.4_1
-libktorrent.so.5 libktorrent-1.3.1_1
+libktorrent.so.6 libktorrent-2.0.1_1
 libvncserver.so.1 libvncserver-0.9.11_1
 libvncclient.so.1 libvncserver-0.9.11_1
 libotr.so.5 libotr-4.0.0_1

srcpkgs/ktorrent/patches/build.patch

@@ -0,0 +1,38 @@
+From ac8eb6b360fbaa2588ec523bb81c380289586db6 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Sat, 14 May 2016 11:19:34 +0200
+Subject: [PATCH] Fix compilation, KSharedConfig was not found.
+
+---
+ ktorrent/dialogs/pastedialog.h  | 1 +
+ plugins/mediaplayer/mediaview.h | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/ktorrent/dialogs/pastedialog.h b/ktorrent/dialogs/pastedialog.h
+index 2446848..430ea82 100644
+--- ktorrent/dialogs/pastedialog.h
++++ ktorrent/dialogs/pastedialog.h
+@@ -22,6 +22,7 @@
+ #define PASTEDIALOG_H
+ 
+ #include <KDialog>
++#include <KSharedConfig>
+ #include "ui_pastedlgbase.h"
+ 
+ 
+diff --git a/plugins/mediaplayer/mediaview.h b/plugins/mediaplayer/mediaview.h
+index 2b9a7e6..d1959c1 100644
+--- plugins/mediaplayer/mediaview.h
++++ plugins/mediaplayer/mediaview.h
+@@ -25,7 +25,7 @@
+ #include <QListView>
+ #include <QCheckBox>
+ #include <QSortFilterProxyModel>
+-#include <KSharedConfigPtr>
++#include <KSharedConfig>
+ #include "mediafile.h"
+ 
+ 
+-- 
+2.7.3
+

srcpkgs/ktorrent/template

@@ -1,15 +1,17 @@
 # Template file for 'ktorrent'
 pkgname=ktorrent
-version=4.3.1
+version=5.0.1
-revision=2
+revision=1
 short_desc="BitTorrent client based on the KDE platform"
 maintainer="Norbert Vegh <vegh@norvegh.com>"
 license="GPL-2"
 homepage="http://ktorrent.pwsp.net/"
-distfiles="http://mirror.netcologne.de/gentoo/distfiles/${pkgname}-${version}.tar.bz2"
+distfiles="http://mirror.netcologne.de/gentoo/distfiles/${pkgname}-${version}.tar.xz"
-checksum=66094f6833347afb0c49e332f0ec15ec48db652cbe66476840846ffd5ca0e4a1
+checksum=d00feeca5dcc6a76a039d67dbe91a2d5a5e1da0f5e0bbd8da2c156d9c44879e5
 build_style=cmake
-hostmakedepends="automoc4"
+hostmakedepends="extra-cmake-modules"
-configure_args="-DKDE4_BUILD_TESTS=OFF"
+makedepends="qt5-devel qt5-script-devel ki18n-devel kio-devel kxmlgui-devel
-makedepends="kdelibs-devel qt-devel qt-webkit-devel gmp-devel qca-devel
+ knotifications-devel ksolid-devel kconfig-devel kcoreaddons-devel kdoctools-devel
- libressl-devel phonon-devel libktorrent-devel kdepimlibs-devel boost-devel"
+ kross-devel kcmutils-devel sonnet-devel kdbusaddons-devel kcrash-devel
+ karchive-devel kdelibs4support-devel knotifyconfig-devel libktorrent-devel
+ gmp-devel taglib-devel kdnssd-devel"

srcpkgs/libktorrent/template

@@ -1,22 +1,23 @@
 # Template file for 'libktorrent'
 pkgname=libktorrent
-version=1.3.1
+version=2.0.1
-revision=2
+revision=1
 build_style=cmake
-hostmakedepends="automoc4"
+hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python doxygen"
-makedepends="gmp-devel boost-devel qt-devel phonon-devel libgcrypt-devel qca-devel kdelibs-devel"
+makedepends="qt5-devel karchive-devel ksolid-devel kio-devel ki18n-devel kcrash-devel gmp-devel qca-qt5-devel"
 short_desc="A BitTorrent protocol implementation"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-2"
 homepage="http://ktorrent.pwsp.net"
-distfiles="http://mirror.netcologne.de/gentoo/distfiles/${pkgname}-${version}.tar.bz2"
+distfiles="http://mirror.netcologne.de/gentoo/distfiles/${pkgname}-${version}.tar.xz"
-checksum=2fe11ccb4bf2028c3da11e52cde890f1b3a90560e548eac89a4f8e1558b09725
+checksum=c70d9ee11a1ac95145284e2ab9aec689df21b7462f389389b8d54f892a273f42
+nocross="fails to detect qca-qt5"
 
 libktorrent-devel_package() {
 	depends="${sourcepkg}-${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/share/apps/cmake
+		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"
 	}
 }