summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2016-09-15 21:33:27 +1000
committerMichael Palimaka <kensington@gentoo.org>2016-09-15 21:38:26 +1000
commit5bc2531e9317b8679cc9e1ae68ee5883518bb613 (patch)
tree29fde51ed18962fcd1f1c5cf98f58ba728bc67f7 /kde-apps/konqueror/files
parentprofiles: mask >=kde-apps/minuet-16.08.0 as it requires masked Qt 5.7 (diff)
downloadgentoo-5bc2531e9317b8679cc9e1ae68ee5883518bb613.tar.gz
gentoo-5bc2531e9317b8679cc9e1ae68ee5883518bb613.tar.bz2
gentoo-5bc2531e9317b8679cc9e1ae68ee5883518bb613.zip
kde-apps: version bump 16.08.1
Package-Manager: portage-2.3.0
Diffstat (limited to 'kde-apps/konqueror/files')
-rw-r--r--kde-apps/konqueror/files/konqueror-16.08.0-kactivities.patch15
1 files changed, 15 insertions, 0 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 000000000000..9207fd6b9739
--- /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})