Merge pull request #7573 from Hoshpak/update-ktorrent

Update ktorrent to 5.1.0
This commit is contained in:
Toyam Cox 2017-09-06 12:15:08 -04:00 committed by GitHub
commit ebdd7accce
4 changed files with 7 additions and 45 deletions

View file

@ -1317,7 +1317,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.6 libktorrent-2.0.1_1
libKF5Torrent.so.6 libktorrent-2.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

View file

@ -1,38 +0,0 @@
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

View file

@ -1,17 +1,17 @@
# Template file for 'ktorrent'
pkgname=ktorrent
version=5.0.1
version=5.1.0
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.xz"
checksum=d00feeca5dcc6a76a039d67dbe91a2d5a5e1da0f5e0bbd8da2c156d9c44879e5
checksum=3c57882f78006dcec3c5fb243479e995cc541e51e6acded5bf98a09900c486a3
build_style=cmake
hostmakedepends="extra-cmake-modules"
makedepends="qt5-devel qt5-script-devel ki18n-devel kio-devel kxmlgui-devel
knotifications-devel ksolid-devel kconfig-devel kcoreaddons-devel kdoctools-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"
karchive-devel knotifyconfig-devel libktorrent-devel kplotting-devel
gmp-devel taglib-devel kdnssd-devel kdewebkit-devel"

View file

@ -1,6 +1,6 @@
# Template file for 'libktorrent'
pkgname=libktorrent
version=2.0.1
version=2.1
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python doxygen"
@ -10,7 +10,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2"
homepage="http://ktorrent.pwsp.net"
distfiles="http://mirror.netcologne.de/gentoo/distfiles/${pkgname}-${version}.tar.xz"
checksum=c70d9ee11a1ac95145284e2ab9aec689df21b7462f389389b8d54f892a273f42
checksum=3eefdcceec73410c558e82d7be22eb2ed18679e9ab64f34cc100b54e186fe26f
nocross="fails to detect qca-qt5"
libktorrent-devel_package() {