1 |
commit: a11418492c2e9be873316663037a5d3e72434625 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Sep 11 19:26:11 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 12 05:34:11 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a1141849 |
7 |
|
8 |
kde-plasma/plasma-vault: remove unused patch(es) |
9 |
|
10 |
.../files/plasma-vault-5.13.2-nm-qt-optional.patch | 74 ---------------------- |
11 |
1 file changed, 74 deletions(-) |
12 |
|
13 |
diff --git a/kde-plasma/plasma-vault/files/plasma-vault-5.13.2-nm-qt-optional.patch b/kde-plasma/plasma-vault/files/plasma-vault-5.13.2-nm-qt-optional.patch |
14 |
deleted file mode 100644 |
15 |
index 38fbccf56c..0000000000 |
16 |
--- a/kde-plasma/plasma-vault/files/plasma-vault-5.13.2-nm-qt-optional.patch |
17 |
+++ /dev/null |
18 |
@@ -1,74 +0,0 @@ |
19 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
20 |
---- a/CMakeLists.txt |
21 |
-+++ b/CMakeLists.txt |
22 |
-@@ -58,8 +58,11 @@ |
23 |
- KIO |
24 |
- Plasma |
25 |
- WidgetsAddons |
26 |
-- NetworkManagerQt |
27 |
- ) |
28 |
-+find_package (KF5NetworkManagerQt ${KF5_DEP_VERSION}) |
29 |
-+if (KF5NetworkManagerQt_FOUND) |
30 |
-+ set (HAVE_NETWORKMANAGER TRUE) |
31 |
-+endif() |
32 |
- find_package (KF5SysGuard REQUIRED) |
33 |
- |
34 |
- include_directories ( |
35 |
-diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt |
36 |
---- a/kded/CMakeLists.txt |
37 |
-+++ b/kded/CMakeLists.txt |
38 |
-@@ -1,3 +1,5 @@ |
39 |
-+configure_file (config-plasma-vault.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-plasma-vault.h) |
40 |
-+ |
41 |
- include_directories ( |
42 |
- ${CMAKE_CURRENT_SOURCE_DIR} |
43 |
- ${CMAKE_CURRENT_SOURCE_DIR}/engine |
44 |
-@@ -85,8 +87,13 @@ |
45 |
- KF5::SysGuard |
46 |
- KF5::WidgetsAddons |
47 |
- KF5::ProcessCore |
48 |
-- KF5::NetworkManagerQt |
49 |
- ) |
50 |
-+if (HAVE_NETWORKMANAGER) |
51 |
-+ target_link_libraries ( |
52 |
-+ kded_plasmavault |
53 |
-+ KF5::NetworkManagerQt |
54 |
-+ ) |
55 |
-+endif () |
56 |
- |
57 |
- |
58 |
- install ( |
59 |
-diff --git a/kded/config-plasma-vault.cmake b/kded/config-plasma-vault.cmake |
60 |
-new file mode 100644 |
61 |
---- /dev/null |
62 |
-+++ b/kded/config-plasma-vault.cmake |
63 |
-@@ -0,0 +1 @@ |
64 |
-+#cmakedefine HAVE_NETWORKMANAGER |
65 |
-diff --git a/kded/service.cpp b/kded/service.cpp |
66 |
---- a/kded/service.cpp |
67 |
-+++ b/kded/service.cpp |
68 |
-@@ -37,7 +37,23 @@ |
69 |
- |
70 |
- #include <functional> |
71 |
- |
72 |
-+#include <config-plasma-vault.h> |
73 |
-+#ifdef HAVE_NETWORKMANAGER |
74 |
- #include <NetworkManagerQt/Manager> |
75 |
-+#else |
76 |
-+namespace NetworkManager |
77 |
-+{ |
78 |
-+ bool isNetworkingEnabled() |
79 |
-+ { |
80 |
-+ return true; |
81 |
-+ } |
82 |
-+ |
83 |
-+ void setNetworkingEnabled(bool enabled) |
84 |
-+ { |
85 |
-+ Q_UNUSED(enabled); |
86 |
-+ } |
87 |
-+} |
88 |
-+#endif |
89 |
- |
90 |
- K_PLUGIN_FACTORY_WITH_JSON(PlasmaVaultServiceFactory, |
91 |
- "plasmavault.json", |
92 |
- |