| 1 |
commit: b506bb7a7461c55bfa78745c2917bc97ae4d6c5b |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 9 14:29:35 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 9 14:29:35 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b506bb7a |
| 7 |
|
| 8 |
kde-plasma/plasma-nm: Improve patch |
| 9 |
|
| 10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 12 |
|
| 13 |
.../plasma-nm/files/plasma-nm-5.14.0-cmake.patch | 35 ++++++++++------------ |
| 14 |
1 file changed, 16 insertions(+), 19 deletions(-) |
| 15 |
|
| 16 |
diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.14.0-cmake.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.14.0-cmake.patch |
| 17 |
index d2a7f5126b..31ff517f2e 100644 |
| 18 |
--- a/kde-plasma/plasma-nm/files/plasma-nm-5.14.0-cmake.patch |
| 19 |
+++ b/kde-plasma/plasma-nm/files/plasma-nm-5.14.0-cmake.patch |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-From 20514e001ed9f91326181ac2d7ef2a7b2c718903 Mon Sep 17 00:00:00 2001 |
| 22 |
+From 2eac836c4085beb679b665c0c7cfd3f49b928230 Mon Sep 17 00:00:00 2001 |
| 23 |
From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
| 24 |
Date: Tue, 9 Oct 2018 16:03:12 +0200 |
| 25 |
Subject: [PATCH] openconnect: add missing dependency Qt5Xml |
| 26 |
@@ -15,27 +15,24 @@ Tags: #plasma |
| 27 |
|
| 28 |
Differential Revision: https://phabricator.kde.org/D16073 |
| 29 |
--- |
| 30 |
- CMakeLists.txt | 1 + |
| 31 |
- vpn/openconnect/CMakeLists.txt | 1 + |
| 32 |
- 2 files changed, 2 insertions(+) |
| 33 |
- |
| 34 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 35 |
-index ef1ed46a..cb4eb858 100644 |
| 36 |
---- a/CMakeLists.txt |
| 37 |
-+++ b/CMakeLists.txt |
| 38 |
-@@ -25,6 +25,7 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS |
| 39 |
- Network |
| 40 |
- Quick |
| 41 |
- Widgets |
| 42 |
-+ Xml |
| 43 |
- ) |
| 44 |
- |
| 45 |
- find_package(KF5 ${KF5_MIN_VERSION} REQUIRED |
| 46 |
+ vpn/openconnect/CMakeLists.txt | 4 ++++ |
| 47 |
+ 1 file changed, 4 insertions(+) |
| 48 |
+ |
| 49 |
diff --git a/vpn/openconnect/CMakeLists.txt b/vpn/openconnect/CMakeLists.txt |
| 50 |
-index cf43740d..fa1bd4a0 100644 |
| 51 |
+index cf43740d..c3f07088 100644 |
| 52 |
--- a/vpn/openconnect/CMakeLists.txt |
| 53 |
+++ b/vpn/openconnect/CMakeLists.txt |
| 54 |
-@@ -49,6 +49,7 @@ if (OPENCONNECT_FOUND) |
| 55 |
+@@ -6,6 +6,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_MODULE_PATH}) |
| 56 |
+ |
| 57 |
+ find_package(OpenConnect ${MINIMUM_OPENCONNECT_VERSION_REQUIRED} MODULE) |
| 58 |
+ if (OPENCONNECT_FOUND) |
| 59 |
++ |
| 60 |
++ find_package(Qt5Xml ${QT_MIN_VERSION} CONFIG REQUIRED) |
| 61 |
++ |
| 62 |
+ if (${OPENCONNECT_VERSION} VERSION_LESS "3.99") |
| 63 |
+ # macro_optional_find_package(OpenSSL) |
| 64 |
+ # macro_log_feature(OpenSSL_FOUND "OpenSSL headers" "Encryption suite" "http://www.openssl.org" FALSE "" "Needed for OpenConnect support in Network Management") |
| 65 |
+@@ -49,6 +52,7 @@ if (OPENCONNECT_FOUND) |
| 66 |
KF5::IconThemes |
| 67 |
KF5::KIOWidgets |
| 68 |
KF5::CoreAddons |
Archives