1 |
commit: d46715889205ac9915ad9661bf4dcade478f226d |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 9 14:14:11 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 9 14:14:11 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d4671588 |
7 |
|
8 |
kde-plasma/plasma-nm: Fix build with USE=openconnect |
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 | 48 ++++++++++++++++++++++ |
14 |
kde-plasma/plasma-nm/plasma-nm-5.14.0.ebuild | 2 + |
15 |
2 files changed, 50 insertions(+) |
16 |
|
17 |
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 |
18 |
new file mode 100644 |
19 |
index 0000000000..d2a7f5126b |
20 |
--- /dev/null |
21 |
+++ b/kde-plasma/plasma-nm/files/plasma-nm-5.14.0-cmake.patch |
22 |
@@ -0,0 +1,48 @@ |
23 |
+From 20514e001ed9f91326181ac2d7ef2a7b2c718903 Mon Sep 17 00:00:00 2001 |
24 |
+From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
25 |
+Date: Tue, 9 Oct 2018 16:03:12 +0200 |
26 |
+Subject: [PATCH] openconnect: add missing dependency Qt5Xml |
27 |
+ |
28 |
+Summary: QDomDocument is imported from vpn/openconnect/openconnectauth.cpp |
29 |
+ |
30 |
+Test Plan: Build succeeds now. |
31 |
+ |
32 |
+Reviewers: #plasma |
33 |
+ |
34 |
+Subscribers: plasma-devel |
35 |
+ |
36 |
+Tags: #plasma |
37 |
+ |
38 |
+Differential Revision: https://phabricator.kde.org/D16073 |
39 |
+--- |
40 |
+ CMakeLists.txt | 1 + |
41 |
+ vpn/openconnect/CMakeLists.txt | 1 + |
42 |
+ 2 files changed, 2 insertions(+) |
43 |
+ |
44 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
45 |
+index ef1ed46a..cb4eb858 100644 |
46 |
+--- a/CMakeLists.txt |
47 |
++++ b/CMakeLists.txt |
48 |
+@@ -25,6 +25,7 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS |
49 |
+ Network |
50 |
+ Quick |
51 |
+ Widgets |
52 |
++ Xml |
53 |
+ ) |
54 |
+ |
55 |
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED |
56 |
+diff --git a/vpn/openconnect/CMakeLists.txt b/vpn/openconnect/CMakeLists.txt |
57 |
+index cf43740d..fa1bd4a0 100644 |
58 |
+--- a/vpn/openconnect/CMakeLists.txt |
59 |
++++ b/vpn/openconnect/CMakeLists.txt |
60 |
+@@ -49,6 +49,7 @@ if (OPENCONNECT_FOUND) |
61 |
+ KF5::IconThemes |
62 |
+ KF5::KIOWidgets |
63 |
+ KF5::CoreAddons |
64 |
++ Qt5::Xml |
65 |
+ ${OPENCONNECT_LIBRARIES} |
66 |
+ ${maybe_OPENSSL_LIBRARIES} |
67 |
+ ) |
68 |
+-- |
69 |
+2.19.1 |
70 |
+ |
71 |
|
72 |
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.14.0.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.14.0.ebuild |
73 |
index 86195daf56..0ad55aa99f 100644 |
74 |
--- a/kde-plasma/plasma-nm/plasma-nm-5.14.0.ebuild |
75 |
+++ b/kde-plasma/plasma-nm/plasma-nm-5.14.0.ebuild |
76 |
@@ -53,6 +53,8 @@ RDEPEND="${DEPEND} |
77 |
!kde-plasma/plasma-nm:4 |
78 |
" |
79 |
|
80 |
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) |
81 |
+ |
82 |
src_configure() { |
83 |
local mycmakeargs=( |
84 |
-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager) |