| 1 |
commit: 2d2dfebf0e7bc8bb71001095a8ab4e98ebf325b6 |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 9 19:44:19 2017 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 9 19:44:19 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d2dfebf |
| 7 |
|
| 8 |
kde-apps/kio-extras: Add missing patches from overlay |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
.../kio-extras-16.12.1-activities-optional.patch | 52 ++++++++++++++++++++++ |
| 13 |
.../files/kio-extras-16.12.1-man-optional.patch | 48 ++++++++++++++++++++ |
| 14 |
2 files changed, 100 insertions(+) |
| 15 |
|
| 16 |
diff --git a/kde-apps/kio-extras/files/kio-extras-16.12.1-activities-optional.patch b/kde-apps/kio-extras/files/kio-extras-16.12.1-activities-optional.patch |
| 17 |
new file mode 100644 |
| 18 |
index 0000000000..efa79a9d43 |
| 19 |
--- /dev/null |
| 20 |
+++ b/kde-apps/kio-extras/files/kio-extras-16.12.1-activities-optional.patch |
| 21 |
@@ -0,0 +1,52 @@ |
| 22 |
+From a84100dce8a32de89c6a854c965c0c54f1126563 Mon Sep 17 00:00:00 2001 |
| 23 |
+From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
| 24 |
+Date: Mon, 2 Jan 2017 02:16:40 +0100 |
| 25 |
+Subject: [PATCH 1/2] Make activities kioslave optional |
| 26 |
+ |
| 27 |
+Not everyone builds this for a Plasma desktop, Qt5Sql is already only |
| 28 |
+searched for in that subdirectory, so this gives some nice modularity. |
| 29 |
+ |
| 30 |
+REVIEW: 129783 |
| 31 |
+--- |
| 32 |
+ CMakeLists.txt | 11 +++++++++-- |
| 33 |
+ 1 file changed, 9 insertions(+), 2 deletions(-) |
| 34 |
+ |
| 35 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 36 |
+index edc2639..5ac418b 100644 |
| 37 |
+--- a/CMakeLists.txt |
| 38 |
++++ b/CMakeLists.txt |
| 39 |
+@@ -39,7 +39,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS |
| 40 |
+ Solid |
| 41 |
+ Bookmarks |
| 42 |
+ GuiAddons |
| 43 |
+- Activities |
| 44 |
+ ) |
| 45 |
+ # As this is the check used for linkage, only require it in the same location... |
| 46 |
+ if (UNIX) |
| 47 |
+@@ -56,6 +55,12 @@ include(ECMOptionalAddSubdirectory) |
| 48 |
+ |
| 49 |
+ add_definitions(-DQT_NO_URL_CAST_FROM_STRING) |
| 50 |
+ |
| 51 |
++find_package(KF5Activities QUIET) |
| 52 |
++set_package_properties(KF5Activities PROPERTIES |
| 53 |
++ PURPOSE "Provides the activities:/ kioslave and fileitem plugin." |
| 54 |
++ TYPE OPTIONAL |
| 55 |
++) |
| 56 |
++ |
| 57 |
+ find_package(SLP) |
| 58 |
+ set_package_properties(SLP PROPERTIES DESCRIPTION "SLP (Service Location Protocol) implementation" |
| 59 |
+ URL "http://www.openslp.org/" |
| 60 |
+@@ -126,7 +131,9 @@ endif() |
| 61 |
+ add_subdirectory( doc ) |
| 62 |
+ |
| 63 |
+ add_subdirectory( about ) |
| 64 |
+-add_subdirectory( activities ) |
| 65 |
++if(KF5Activities_FOUND) |
| 66 |
++ add_subdirectory( activities ) |
| 67 |
++endif() |
| 68 |
+ add_subdirectory( bookmarks ) |
| 69 |
+ add_subdirectory( filter ) |
| 70 |
+ if(Phonon4Qt5_FOUND) |
| 71 |
+-- |
| 72 |
+2.10.2 |
| 73 |
+ |
| 74 |
|
| 75 |
diff --git a/kde-apps/kio-extras/files/kio-extras-16.12.1-man-optional.patch b/kde-apps/kio-extras/files/kio-extras-16.12.1-man-optional.patch |
| 76 |
new file mode 100644 |
| 77 |
index 0000000000..9c6452b103 |
| 78 |
--- /dev/null |
| 79 |
+++ b/kde-apps/kio-extras/files/kio-extras-16.12.1-man-optional.patch |
| 80 |
@@ -0,0 +1,48 @@ |
| 81 |
+From c9f618e75f4d84a8c48cb321a477c68c6dbf9f08 Mon Sep 17 00:00:00 2001 |
| 82 |
+From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
| 83 |
+Date: Mon, 2 Jan 2017 02:35:08 +0100 |
| 84 |
+Subject: [PATCH 2/2] Make KF5KHtml dependency optional, only used by man |
| 85 |
+ |
| 86 |
+REVIEW: 129783 |
| 87 |
+--- |
| 88 |
+ CMakeLists.txt | 10 ++++++++-- |
| 89 |
+ 1 file changed, 8 insertions(+), 2 deletions(-) |
| 90 |
+ |
| 91 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 92 |
+index 5ac418b..7de37ea 100644 |
| 93 |
+--- a/CMakeLists.txt |
| 94 |
++++ b/CMakeLists.txt |
| 95 |
+@@ -34,7 +34,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS |
| 96 |
+ IconThemes |
| 97 |
+ I18n |
| 98 |
+ KIO |
| 99 |
+- KHtml |
| 100 |
+ KDELibs4Support |
| 101 |
+ Solid |
| 102 |
+ Bookmarks |
| 103 |
+@@ -124,6 +123,11 @@ if(UNIX) |
| 104 |
+ if(NOT OFFT_IS_64BIT) |
| 105 |
+ message(FATAL_ERROR "Large file support is not enabled.") |
| 106 |
+ endif() |
| 107 |
++ |
| 108 |
++ find_package(KF5KHtml QUIET) |
| 109 |
++ set_package_properties(KF5KHtml PROPERTIES TYPE OPTIONAL |
| 110 |
++ PURPOSE "Needed to build the man kioslave" |
| 111 |
++ ) |
| 112 |
+ else() |
| 113 |
+ # FIXME: on windows we ignore support until trash gets integrated |
| 114 |
+ endif() |
| 115 |
+@@ -158,7 +162,9 @@ if (MTP_FOUND) |
| 116 |
+ endif() |
| 117 |
+ |
| 118 |
+ if(NOT WIN32) |
| 119 |
+- add_subdirectory( man ) |
| 120 |
++ if(KF5KHtml_FOUND) |
| 121 |
++ add_subdirectory( man ) |
| 122 |
++ endif() |
| 123 |
+ check_include_files(rpc/rpc.h HAVE_RPC_RPC_H) |
| 124 |
+ add_feature_info("NFS kioslave" HAVE_RPC_RPC_H "The RPC library is needed to build the NFS kioslave") |
| 125 |
+ if(HAVE_RPC_RPC_H) |
| 126 |
+-- |
| 127 |
+2.10.2 |
| 128 |
+ |
Archives