kde-frameworks/kio: Fix kterminallauncherjob

Inherit default process environment from parent
Upstream commit 6e7775d315f389df0a440ed62b842ce83dc9a27e
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=482107

See also:
https://mail.kde.org/pipermail/distributions/2024-March/001483.html

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

2 files changed, 125 insertions, 0 deletions

diff --git a/kde-frameworks/kio/files/kio-6.0.0-kterminallauncherjob.patch b/kde-frameworks/kio/files/kio-6.0.0-kterminallauncherjob.patch
new file mode 100644
index 000000000000..2c9b594b33ee
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-6.0.0-kterminallauncherjob.patch
@@ -0,0 +1,34 @@
+From 6e7775d315f389df0a440ed62b842ce83dc9a27e Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Fri, 1 Mar 2024 22:16:07 +0100
+Subject: [PATCH] [kterminallauncherjob] Inherit default process environment
+ from parent
+
+Before Qt 6.3, an empty (default constructed) QProcessEnvironment caused
+QProcess to incorrectly inherit the environment variables from the parent
+process. This was fixed in qtbase 5fc9c02a695.
+
+CommandLauncherJob was adjusted for this in 916984940f64e07db9b4d152be9f2a87dda0cfb4,
+however here we are overriding its default env with our own default-constructed one
+
+BUG: 482107
+---
+ src/gui/kterminallauncherjob.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gui/kterminallauncherjob.cpp b/src/gui/kterminallauncherjob.cpp
+index c4e83fb11b..edd99327bd 100644
+--- a/src/gui/kterminallauncherjob.cpp
++++ b/src/gui/kterminallauncherjob.cpp
+@@ -22,7 +22,7 @@ public:
+     QString m_fullCommand; // "xterm -e ls"
+     QString m_desktopName;
+     QByteArray m_startupId;
+-    QProcessEnvironment m_environment;
++    QProcessEnvironment m_environment{QProcessEnvironment::InheritFromParent};
+ };
+ 
+ KTerminalLauncherJob::KTerminalLauncherJob(const QString &command, QObject *parent)
+-- 
+GitLab
+
diff --git a/kde-frameworks/kio/kio-6.0.0-r1.ebuild b/kde-frameworks/kio/kio-6.0.0-r1.ebuild
new file mode 100644
index 000000000000..384afe22e7e1
--- /dev/null
+++ b/kde-frameworks/kio/kio-6.0.0-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_HANDBOOK="optional"
+ECM_HANDBOOK_DIR="docs"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org xdg-utils
+
+DESCRIPTION="Framework providing transparent file and data management"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE="acl +kwallet wayland X"
+
+# tests hang
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,ssl,widgets]
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	=kde-frameworks/kauth-${PVCUT}*:6
+	=kde-frameworks/kbookmarks-${PVCUT}*:6
+	=kde-frameworks/kcodecs-${PVCUT}*:6
+	=kde-frameworks/kcolorscheme-${PVCUT}*:6
+	=kde-frameworks/kcompletion-${PVCUT}*:6
+	=kde-frameworks/kconfig-${PVCUT}*:6
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:6
+	=kde-frameworks/kcoreaddons-${PVCUT}*:6
+	=kde-frameworks/kcrash-${PVCUT}*:6
+	=kde-frameworks/kdbusaddons-${PVCUT}*:6
+	=kde-frameworks/kguiaddons-${PVCUT}*:6
+	=kde-frameworks/ki18n-${PVCUT}*:6
+	=kde-frameworks/kiconthemes-${PVCUT}*:6
+	=kde-frameworks/kitemviews-${PVCUT}*:6
+	=kde-frameworks/kjobwidgets-${PVCUT}*:6
+	=kde-frameworks/knotifications-${PVCUT}*:6
+	=kde-frameworks/kservice-${PVCUT}*:6
+	=kde-frameworks/ktextwidgets-${PVCUT}*:6
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:6
+	=kde-frameworks/kwindowsystem-${PVCUT}*:6[wayland?,X?]
+	=kde-frameworks/kxmlgui-${PVCUT}*:6
+	=kde-frameworks/solid-${PVCUT}*:6
+	sys-power/switcheroo-control
+	acl? (
+		sys-apps/attr
+		virtual/acl
+	)
+	handbook? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		=kde-frameworks/karchive-${PVCUT}*:6
+		=kde-frameworks/kdoctools-${PVCUT}*:6
+	)
+	kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:6 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-power/switcheroo-control
+"
+PDEPEND=">=kde-frameworks/kded-${PVCUT}:6"
+
+PATCHES=( "${FILESDIR}/${P}-kterminallauncherjob.patch" ) # KDE-bug 482107
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package acl ACL)
+		$(cmake_use_find_package kwallet KF6Wallet)
+		-DWITH_WAYLAND=$(usex wayland)
+		-DWITH_X11=$(usex X)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	ecm_pkg_postrm
+	xdg_desktop_database_update
+}