[gentoo-commits] repo/gentoo:master commit in: net-p2p/ktorrent/files/, net-p2p/ktorrent/

[Michael Palimaka]

commit:     d2ec04368e585abd931ba9e5f18bc16b9ef67e45
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 26 18:05:34 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 26 18:07:11 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2ec0436

reponet-p2p/ktorrent: backport patch from upstream solving build failure

Gentoo-bug: 587048

Package-Manager: portage-2.3.0

 net-p2p/ktorrent/files/ktorrent-5.0.1-build.patch | 38 +++++++++++++++++++++++
 net-p2p/ktorrent/ktorrent-5.0.1.ebuild            |  2 ++
 2 files changed, 40 insertions(+)

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 0000000..58949a2
--- /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@×××.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 978204d..cbc24f5 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