[gentoo-commits] proj/kde:master commit in: kde-apps/konqueror/, kde-apps/konqueror/files/

[Michael Palimaka]

commit:     0c096c62ac3f12356ee75b5103f9d90093a6f80e
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Aug 24 20:34:55 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 24 20:58:04 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0c096c62

kde-apps/konqueror: Remove kde-base/kactivities dependency

Package-Manager: portage-2.2.28

 .../konqueror/files/konqueror-16.08.0-kactivities.patch   | 15 +++++++++++++++
 ...nqueror-16.08.0.ebuild => konqueror-16.08.0-r1.ebuild} |  4 +++-
 kde-apps/konqueror/konqueror-16.08.49.9999.ebuild         |  4 +++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/kde-apps/konqueror/files/konqueror-16.08.0-kactivities.patch b/kde-apps/konqueror/files/konqueror-16.08.0-kactivities.patch
new file mode 100644
index 0000000..9207fd6
--- /dev/null
+++ b/kde-apps/konqueror/files/konqueror-16.08.0-kactivities.patch
@@ -0,0 +1,15 @@
+Make sure KActivities headers aren't used either if disabled.
+
+--- a/dolphin/src/CMakeLists.txt	2016-08-24 22:25:42.603345565 +0200
++++ b/dolphin/src/CMakeLists.txt	2016-08-24 22:27:39.921317927 +0200
+@@ -27,7 +27,9 @@
+ macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER)
+ configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h )
+ 
+-include_directories( ${KACTIVITIES_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} )
++if (KActivities_FOUND)
++  include_directories( ${KACTIVITIES_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} )
++endif (KActivities_FOUND)
+ 
+ if(HAVE_BALOO)
+   include_directories(${BALOO_INCLUDE_DIR} ${BALOO_WIDGETS_INCLUDE_DIR} ${KFILEMETADATA_INCLUDE_DIR})

diff --git a/kde-apps/konqueror/konqueror-16.08.0.ebuild b/kde-apps/konqueror/konqueror-16.08.0-r1.ebuild
similarity index 95%
rename from kde-apps/konqueror/konqueror-16.08.0.ebuild
rename to kde-apps/konqueror/konqueror-16.08.0-r1.ebuild
index 9a4f654..bc8892e 100644
--- a/kde-apps/konqueror/konqueror-16.08.0.ebuild
+++ b/kde-apps/konqueror/konqueror-16.08.0-r1.ebuild
@@ -21,7 +21,6 @@ RESTRICT="test"
 DEPEND="
 	$(add_kdeapps_dep libkonq)
 	filemanager? (
-		$(add_kdebase_dep kactivities '' 4.13)
 		media-libs/phonon[qt4]
 		x11-libs/libXrender
 	)
@@ -52,6 +51,8 @@ KMEXTRACTONLY="
 	lib/konq/
 "
 
+PATCHES=( "${FILESDIR}/${PN}-16.08.0-kactivities.patch" )
+
 src_prepare() {
 	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 
@@ -78,6 +79,7 @@ src_configure() {
 			-DWITH_Baloo=OFF
 			-DWITH_BalooWidgets=OFF
 			-DWITH_KFileMetaData=OFF
+			-DCMAKE_DISABLE_FIND_PACKAGE_KActivities=ON
 		)
 	fi
 

diff --git a/kde-apps/konqueror/konqueror-16.08.49.9999.ebuild b/kde-apps/konqueror/konqueror-16.08.49.9999.ebuild
index fde7e07..8109e67 100644
--- a/kde-apps/konqueror/konqueror-16.08.49.9999.ebuild
+++ b/kde-apps/konqueror/konqueror-16.08.49.9999.ebuild
@@ -21,7 +21,6 @@ RESTRICT="test"
 DEPEND="
 	$(add_kdeapps_dep libkonq)
 	filemanager? (
-		$(add_kdebase_dep kactivities '' 4.13)
 		media-libs/phonon[qt4]
 		x11-libs/libXrender
 	)
@@ -52,6 +51,8 @@ KMEXTRACTONLY="
 	lib/konq/
 "
 
+PATCHES=( "${FILESDIR}/${PN}-16.08.0-kactivities.patch" )
+
 src_prepare() {
 	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 
@@ -78,6 +79,7 @@ src_configure() {
 			-DWITH_Baloo=OFF
 			-DWITH_BalooWidgets=OFF
 			-DWITH_KFileMetaData=OFF
+			-DCMAKE_DISABLE_FIND_PACKAGE_KActivities=ON
 		)
 	fi