[gentoo-commits] repo/gentoo:master commit in: kde-misc/basket/files/, kde-misc/basket/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     c1632e5741f84abda83a89256f22bdf7eddee489
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 18:24:24 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 19:05:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1632e57

kde-misc/basket: Fix build dependencies

Gentoo-bug: 609228
Reported-by: Michael Rokicki <roki942 <AT> hotmail.com>

Package-Manager: portage-2.3.3

 kde-misc/basket/basket-2.49a.ebuild           |  2 +
 kde-misc/basket/files/basket-2.49a-deps.patch | 72 +++++++++++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/kde-misc/basket/basket-2.49a.ebuild b/kde-misc/basket/basket-2.49a.ebuild
index 1d9710dc00..9ce92828c1 100644
--- a/kde-misc/basket/basket-2.49a.ebuild
+++ b/kde-misc/basket/basket-2.49a.ebuild
@@ -54,6 +54,8 @@ DEPEND="${RDEPEND}
 	$(add_qt_dep qtconcurrent)
 "
 
+PATCHES=( "${FILESDIR}"/${P}-deps.patch )
+
 src_prepare() {
 	kde5_src_prepare
 	if ! use test; then

diff --git a/kde-misc/basket/files/basket-2.49a-deps.patch b/kde-misc/basket/files/basket-2.49a-deps.patch
new file mode 100644
index 0000000000..225d484c40
--- /dev/null
+++ b/kde-misc/basket/files/basket-2.49a-deps.patch
@@ -0,0 +1,72 @@
+commit 1372381456ceb4d3d15f6c78df6ba8bf0a3388a2
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Sat Feb 18 19:02:21 2017 +0100
+
+    Fix dependencies
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 50858f6..2997365 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -33,8 +33,10 @@ endif (BUILD_KPARTS)
+ find_package(Qt5 REQUIRED COMPONENTS
+   Concurrent
+   Core
+-  Gui
+   DBus
++  Gui
++  Widgets
++  Xml
+ )
+ 
+ include(KDECompilerSettings)
+@@ -44,6 +46,7 @@ include(KDECMakeSettings)
+ 
+ find_package(KF5 REQUIRED COMPONENTS
+   Archive
++  Completion
+   Config
+   ConfigWidgets #KCM
+   CoreAddons
+@@ -51,7 +54,6 @@ find_package(KF5 REQUIRED COMPONENTS
+   DBusAddons
+   DocTools
+   FileMetaData
+-  FrameworkIntegration
+   GlobalAccel
+   GuiAddons
+   I18n
+@@ -60,7 +62,9 @@ find_package(KF5 REQUIRED COMPONENTS
+   KIO
+   Notifications
+   Parts
++  Service
+   TextWidgets
++  WidgetsAddons
+   WindowSystem
+   XmlGui
+ )
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index f08dbe0..b394573 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -83,7 +83,6 @@ target_link_libraries(basketcommon
+   KF5::KIOWidgets
+   KF5::Notifications
+   KF5::Parts
+-  KF5::Style
+   KF5::TextWidgets
+   KF5::WindowSystem
+   KF5::XmlGui
+diff --git a/src/basketscene.cpp b/src/basketscene.cpp
+index 638199c..55b2f09 100644
+--- a/src/basketscene.cpp
++++ b/src/basketscene.cpp
+@@ -62,7 +62,6 @@
+ #include <QMenu>
+ 
+ #include <KTextEdit>
+-#include <KStyle>
+ 
+ #include <KColorScheme> // for KStatefulBrush
+ #include <KOpenWithDialog>