summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-10-09 16:14:11 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2018-10-09 16:14:11 +0200
commitd46715889205ac9915ad9661bf4dcade478f226d (patch)
treebc1193fb4905063eb7b86cffb42f9809e70aa4bc
parentb454b04b56383543de6200842a798b6635f71488 (diff)
downloadkde-d46715889205ac9915ad9661bf4dcade478f226d.tar.gz
kde-d46715889205ac9915ad9661bf4dcade478f226d.tar.bz2
kde-d46715889205ac9915ad9661bf4dcade478f226d.zip
kde-plasma/plasma-nm: Fix build with USE=openconnect
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11
-rw-r--r--kde-plasma/plasma-nm/files/plasma-nm-5.14.0-cmake.patch48
-rw-r--r--kde-plasma/plasma-nm/plasma-nm-5.14.0.ebuild2
2 files changed, 50 insertions, 0 deletions
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
new file mode 100644
index 00000000000..d2a7f5126b6
--- /dev/null
+++ b/kde-plasma/plasma-nm/files/plasma-nm-5.14.0-cmake.patch
@@ -0,0 +1,48 @@
+From 20514e001ed9f91326181ac2d7ef2a7b2c718903 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue, 9 Oct 2018 16:03:12 +0200
+Subject: [PATCH] openconnect: add missing dependency Qt5Xml
+
+Summary: QDomDocument is imported from vpn/openconnect/openconnectauth.cpp
+
+Test Plan: Build succeeds now.
+
+Reviewers: #plasma
+
+Subscribers: plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D16073
+---
+ CMakeLists.txt | 1 +
+ vpn/openconnect/CMakeLists.txt | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ef1ed46a..cb4eb858 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,6 +25,7 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
+ Network
+ Quick
+ Widgets
++ Xml
+ )
+
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
+diff --git a/vpn/openconnect/CMakeLists.txt b/vpn/openconnect/CMakeLists.txt
+index cf43740d..fa1bd4a0 100644
+--- a/vpn/openconnect/CMakeLists.txt
++++ b/vpn/openconnect/CMakeLists.txt
+@@ -49,6 +49,7 @@ if (OPENCONNECT_FOUND)
+ KF5::IconThemes
+ KF5::KIOWidgets
+ KF5::CoreAddons
++ Qt5::Xml
+ ${OPENCONNECT_LIBRARIES}
+ ${maybe_OPENSSL_LIBRARIES}
+ )
+--
+2.19.1
+
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.14.0.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.14.0.ebuild
index 86195daf563..0ad55aa99f5 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.14.0.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.14.0.ebuild
@@ -53,6 +53,8 @@ RDEPEND="${DEPEND}
!kde-plasma/plasma-nm:4
"
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
src_configure() {
local mycmakeargs=(
-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)