reponet-p2p/ktorrent: backport patch from upstream solving build failure
authorMichael Palimaka <kensington@gentoo.org>
Sun, 26 Jun 2016 18:05:34 +0000 (04:05 +1000)
committerMichael Palimaka <kensington@gentoo.org>
Sun, 26 Jun 2016 18:07:11 +0000 (04:07 +1000)
Gentoo-bug: 587048

Package-Manager: portage-2.3.0

net-p2p/ktorrent/files/ktorrent-5.0.1-build.patch [new file with mode: 0644]
net-p2p/ktorrent/ktorrent-5.0.1.ebuild

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 (file)
index 0000000..58949a2
--- /dev/null
@@ -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
+
index 978204d69bc545d22714aa878a7f94427a9a6518..cbc24f5fa8e07ee1e302edb73e65d899224590a9 100644 (file)
@@ -100,6 +100,8 @@ RDEPEND="${COMMON_DEPEND}
 #      kde5_src_prepare
 # }
 
+PATCHES=( "${FILESDIR}/${P}-build.patch" )
+
 src_prepare() {
        kde5_src_prepare