[gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-nm/files/, kde-plasma/plasma-nm/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     6bb12775c7c8fe97a5ed8effd7fedeb555fe227d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 19 18:40:00 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 19 18:40:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bb12775

kde-plasma/plasma-nm: Persist imported VPN connections on disk

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=468666

Bug: https://bugs.gentoo.org/899706
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...m-5.27.4-persist-imported-vpn-connections.patch | 31 ++++++++
 kde-plasma/plasma-nm/plasma-nm-5.27.4-r1.ebuild    | 85 ++++++++++++++++++++++
 2 files changed, 116 insertions(+)

diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.27.4-persist-imported-vpn-connections.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.27.4-persist-imported-vpn-connections.patch
new file mode 100644
index 000000000000..8d7fc814c35f
--- /dev/null
+++ b/kde-plasma/plasma-nm/files/plasma-nm-5.27.4-persist-imported-vpn-connections.patch
@@ -0,0 +1,31 @@
+From d795e92bd12705d0ce506c4ac900b0ccb7bdc69b Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Tue, 18 Apr 2023 23:54:02 +0200
+Subject: [PATCH] Persist imported VPN connections on disk
+
+Otherwise they disappear after a reboot
+
+BUG: 468666
+
+
+(cherry picked from commit 024035190982ac5957310ef78fbc34b9c51766c2)
+---
+ libs/handler.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libs/handler.cpp b/libs/handler.cpp
+index 625cbabd7..57fb9f2e3 100644
+--- a/libs/handler.cpp
++++ b/libs/handler.cpp
+@@ -378,7 +378,7 @@ void Handler::addConnection(NMConnection *connection)
+ 
+     nm_client_add_connection2(client,
+                               nm_connection_to_dbus(connection, NM_CONNECTION_SERIALIZE_ALL),
+-                              NM_SETTINGS_ADD_CONNECTION2_FLAG_IN_MEMORY,
++                              NM_SETTINGS_ADD_CONNECTION2_FLAG_TO_DISK,
+                               nullptr,
+                               true,
+                               nullptr,
+-- 
+GitLab
+

diff --git a/kde-plasma/plasma-nm/plasma-nm-5.27.4-r1.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.27.4-r1.ebuild
new file mode 100644
index 000000000000..9a6797eed250
--- /dev/null
+++ b/kde-plasma/plasma-nm/plasma-nm-5.27.4-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+KFMIN=5.102.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.7
+inherit ecm plasma.kde.org
+
+DESCRIPTION="KDE Plasma applet for NetworkManager"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="openconnect teamd"
+
+DEPEND="
+	>=app-crypt/qca-2.3.0:2[qt5(+)]
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/modemmanager-qt-${KFMIN}:5
+	>=kde-frameworks/networkmanager-qt-${KFMIN}:5[teamd=]
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	net-misc/networkmanager[teamd=]
+	>=dev-qt/qtxml-${QTMIN}:5
+	net-misc/mobile-broadband-provider-info
+	openconnect? (
+		>=dev-qt/qtxml-${QTMIN}:5
+		net-vpn/networkmanager-openconnect
+		net-vpn/openconnect:=
+	)
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kquickcharts-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+BDEPEND="
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${P}-persist-imported-vpn-connections.patch" ) # KDE-bug 468666
+
+src_prepare() {
+	ecm_src_prepare
+
+	# TODO: try to get a build switch upstreamed
+	if ! use openconnect; then
+		sed -e "s/^pkg_check_modules.*openconnect/#&/" -i CMakeLists.txt || die
+	fi
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	if ! has_version "kde-plasma/plasma-workspace:5"; then
+		elog "${PN} is not terribly useful without kde-plasma/plasma-workspace:5."
+		elog "However, the networkmanagement KCM can be called from either systemsettings"
+		elog "or manually: $ kcmshell5 kcm_networkmanagement"
+	fi
+}