summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2015-09-27 01:55:42 +1000
committerMichael Palimaka <kensington@gentoo.org>2015-09-27 01:56:27 +1000
commita5fa7a7db833f23eddd20837a381147446156a50 (patch)
tree12d06823d1d10dfa07301b9c6946c36edb045c82 /kde-apps/dolphin/files
parentkde-apps/kio-extras: version bump (diff)
downloadgentoo-a5fa7a7db833f23eddd20837a381147446156a50.tar.gz
gentoo-a5fa7a7db833f23eddd20837a381147446156a50.tar.bz2
gentoo-a5fa7a7db833f23eddd20837a381147446156a50.zip
kde-apps/dolphin: version bump
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'kde-apps/dolphin/files')
-rw-r--r--kde-apps/dolphin/files/dolphin-15.08.1-kactivities.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/kde-apps/dolphin/files/dolphin-15.08.1-kactivities.patch b/kde-apps/dolphin/files/dolphin-15.08.1-kactivities.patch
new file mode 100644
index 00000000000..08cce3e26d6
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-15.08.1-kactivities.patch
@@ -0,0 +1,29 @@
+From 6e218c4c146c08626c6bf4c87e9849a9de7462c4 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Sat, 26 Sep 2015 05:34:26 +1000
+Subject: [PATCH] Fix KF5Activities being optional.
+
+If found via find_package(KF5 COMPONENTS Activities) instead, it will
+inherit REQUIRED from the previous call.
+
+REVIEW: 125360
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d98f261..d926e9f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -66,7 +66,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+ WindowSystem
+ Notifications
+ )
+-find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS
++find_package(KF5 ${KF5_MIN_VERSION} OPTIONAL_COMPONENTS
+ Activities
+ )
+
+--
+2.4.9
+