commit: cd2f8a1feead56791c194edacd6860da2c2ec382 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Sat Dec 23 09:09:41 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Dec 23 15:46:17 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=cd2f8a1f
kde-plasma/plasma-nm: remove unused patch Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../plasma-nm-5.27.80-openconnect-optional.patch | 77 ---------------------- 1 file changed, 77 deletions(-) diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.27.80-openconnect-optional.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.27.80-openconnect-optional.patch deleted file mode 100644 index fc2b5a9c72..0000000000 --- a/kde-plasma/plasma-nm/files/plasma-nm-5.27.80-openconnect-optional.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 50ace5c0641e0f2e7b8cdaf8f57afda147df7f96 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Thu, 23 Feb 2023 22:00:41 +0100 -Subject: [PATCH] Introduce BUILD_OPENCONNECT option (default ON) - -QtWebEngine is a huge dependency, considerably increasing the entry barrier -to build and contribute to plasma-nm. It is easily possible to make it -optional in this case so it should be done. - -Signed-off-by: Andreas Sturmlechner <[email protected]> ---- - CMakeLists.txt | 19 +++++++++++++++---- - vpn/CMakeLists.txt | 2 +- - 2 files changed, 16 insertions(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3acdb4b7..f03f6e3a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -17,6 +17,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) - find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) - -+option(BUILD_OPENCONNECT "Build OpenConnect VPN plugin" ON) -+ - include(KDEInstallDirs) - include(KDECMakeSettings) - include(KDECompilerSettings NO_POLICY_SCOPE) -@@ -34,11 +36,22 @@ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS - Network - Quick - QuickWidgets -- WebEngineCore -- WebEngineWidgets - Widgets - ) - -+find_package(PkgConfig REQUIRED) -+ -+if (BUILD_OPENCONNECT) -+ pkg_check_modules(OPENCONNECT IMPORTED_TARGET openconnect>=3.99) -+ if (NOT TARGET PkgConfig::OPENCONNECT) -+ set(BUILD_OPENCONNECT OFF) -+ endif() -+endif() -+ -+if (BUILD_OPENCONNECT) -+ find_package(Qt${QT_MAJOR_VERSION}WebEngineWidgets ${QT_MIN_VERSION} CONFIG REQUIRED) -+endif() -+ - find_package(KF5 ${KF5_MIN_VERSION} REQUIRED - ConfigWidgets - Completion -@@ -80,8 +93,6 @@ set_package_properties(KF5Prison PROPERTIES DESCRIPTION "Prison library" - PURPOSE "Needed to create mobile barcodes for WiFi networks" - ) - --find_package(PkgConfig REQUIRED) --pkg_check_modules(OPENCONNECT IMPORTED_TARGET openconnect>=3.99) - pkg_check_modules(NETWORKMANAGER IMPORTED_TARGET libnm>1.4.0 REQUIRED) - pkg_check_modules(MOBILEBROADBANDPROVIDERINFO mobile-broadband-provider-info) - pkg_get_variable(BROADBANDPROVIDER_DATABASE mobile-broadband-provider-info database) -diff --git a/vpn/CMakeLists.txt b/vpn/CMakeLists.txt -index 2bf0086a..25baa308 100644 ---- a/vpn/CMakeLists.txt -+++ b/vpn/CMakeLists.txt -@@ -9,6 +9,6 @@ add_subdirectory(sstp) - add_subdirectory(strongswan) - add_subdirectory(vpnc) - --if(TARGET PkgConfig::OPENCONNECT) -+if (BUILD_OPENCONNECT) - add_subdirectory(openconnect) - endif() --- -2.39.2 -
