From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6EBFC138334 for ; Tue, 9 Oct 2018 14:30:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70F38E07BA; Tue, 9 Oct 2018 14:30:20 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2B599E07BA for ; Tue, 9 Oct 2018 14:30:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E5E88335C39 for ; Tue, 9 Oct 2018 14:30:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 019D53CF for ; Tue, 9 Oct 2018 14:30:02 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1539095375.b506bb7a7461c55bfa78745c2917bc97ae4d6c5b.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-nm/files/plasma-nm-5.14.0-cmake.patch X-VCS-Directories: kde-plasma/plasma-nm/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b506bb7a7461c55bfa78745c2917bc97ae4d6c5b X-VCS-Branch: master Date: Tue, 9 Oct 2018 14:30:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 773ef9bc-500e-4e64-a011-55bc5b47fd90 X-Archives-Hash: 24ca9364861c0fbe281bcc82ab96ab2f commit: b506bb7a7461c55bfa78745c2917bc97ae4d6c5b Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Oct 9 14:29:35 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Oct 9 14:29:35 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b506bb7a kde-plasma/plasma-nm: Improve patch Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 .../plasma-nm/files/plasma-nm-5.14.0-cmake.patch | 35 ++++++++++------------ 1 file changed, 16 insertions(+), 19 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 index d2a7f5126b..31ff517f2e 100644 --- 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 @@ -1,4 +1,4 @@ -From 20514e001ed9f91326181ac2d7ef2a7b2c718903 Mon Sep 17 00:00:00 2001 +From 2eac836c4085beb679b665c0c7cfd3f49b928230 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Tue, 9 Oct 2018 16:03:12 +0200 Subject: [PATCH] openconnect: add missing dependency Qt5Xml @@ -15,27 +15,24 @@ 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 + vpn/openconnect/CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + diff --git a/vpn/openconnect/CMakeLists.txt b/vpn/openconnect/CMakeLists.txt -index cf43740d..fa1bd4a0 100644 +index cf43740d..c3f07088 100644 --- a/vpn/openconnect/CMakeLists.txt +++ b/vpn/openconnect/CMakeLists.txt -@@ -49,6 +49,7 @@ if (OPENCONNECT_FOUND) +@@ -6,6 +6,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_MODULE_PATH}) + + find_package(OpenConnect ${MINIMUM_OPENCONNECT_VERSION_REQUIRED} MODULE) + if (OPENCONNECT_FOUND) ++ ++ find_package(Qt5Xml ${QT_MIN_VERSION} CONFIG REQUIRED) ++ + if (${OPENCONNECT_VERSION} VERSION_LESS "3.99") + # macro_optional_find_package(OpenSSL) + # macro_log_feature(OpenSSL_FOUND "OpenSSL headers" "Encryption suite" "http://www.openssl.org" FALSE "" "Needed for OpenConnect support in Network Management") +@@ -49,6 +52,7 @@ if (OPENCONNECT_FOUND) KF5::IconThemes KF5::KIOWidgets KF5::CoreAddons