summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2016-06-27 04:05:34 +1000
committerMichael Palimaka <kensington@gentoo.org>2016-06-27 04:07:11 +1000
commitd2ec04368e585abd931ba9e5f18bc16b9ef67e45 (patch)
tree3f1b1403c0e0aa0671c5f99b2c54af8b80586067 /net-p2p/ktorrent
parentdev-libs/libdbusmenu: reset XDG environment (diff)
downloadgentoo-d2ec04368e585abd931ba9e5f18bc16b9ef67e45.tar.gz
gentoo-d2ec04368e585abd931ba9e5f18bc16b9ef67e45.tar.bz2
gentoo-d2ec04368e585abd931ba9e5f18bc16b9ef67e45.zip
reponet-p2p/ktorrent: backport patch from upstream solving build failure
Gentoo-bug: 587048 Package-Manager: portage-2.3.0
Diffstat (limited to 'net-p2p/ktorrent')
-rw-r--r--net-p2p/ktorrent/files/ktorrent-5.0.1-build.patch38
-rw-r--r--net-p2p/ktorrent/ktorrent-5.0.1.ebuild2
2 files changed, 40 insertions, 0 deletions
diff --git a/net-p2p/ktorrent/files/ktorrent-5.0.1-build.patch b/net-p2p/ktorrent/files/ktorrent-5.0.1-build.patch
new file mode 100644
index 000000000000..58949a2884f6
--- /dev/null
+++ b/net-p2p/ktorrent/files/ktorrent-5.0.1-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
+--- a/ktorrent/dialogs/pastedialog.h
++++ b/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
+--- a/plugins/mediaplayer/mediaview.h
++++ b/plugins/mediaplayer/mediaview.h
+@@ -25,7 +25,7 @@
+ #include <QListView>
+ #include <QCheckBox>
+ #include <QSortFilterProxyModel>
+-#include <KSharedConfigPtr>
++#include <KSharedConfig>
+ #include "mediafile.h"
+
+
+--
+2.7.3
+
diff --git a/net-p2p/ktorrent/ktorrent-5.0.1.ebuild b/net-p2p/ktorrent/ktorrent-5.0.1.ebuild
index 978204d69bc5..cbc24f5fa8e0 100644
--- a/net-p2p/ktorrent/ktorrent-5.0.1.ebuild
+++ b/net-p2p/ktorrent/ktorrent-5.0.1.ebuild
@@ -100,6 +100,8 @@ RDEPEND="${COMMON_DEPEND}
# kde5_src_prepare
# }
+PATCHES=( "${FILESDIR}/${P}-build.patch" )
+
src_prepare() {
kde5_src_prepare