From f6960c66f1cbb93fb76099fdbd13297cc05838c6 Mon Sep 17 00:00:00 2001 From: Rmys Date: Sun, 10 Mar 2024 14:44:42 +0300 Subject: [PATCH] kio-kf6 rebuild --- .../framework/kio-kf6/files/6e7775d3.patch | 34 +++++++++++++++++++ desktop/kde6/framework/kio-kf6/pspec.xml | 9 ++++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 desktop/kde6/framework/kio-kf6/files/6e7775d3.patch diff --git a/desktop/kde6/framework/kio-kf6/files/6e7775d3.patch b/desktop/kde6/framework/kio-kf6/files/6e7775d3.patch new file mode 100644 index 0000000000..2c9b594b33 --- /dev/null +++ b/desktop/kde6/framework/kio-kf6/files/6e7775d3.patch @@ -0,0 +1,34 @@ +From 6e7775d315f389df0a440ed62b842ce83dc9a27e Mon Sep 17 00:00:00 2001 +From: Nicolas Fella +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/desktop/kde6/framework/kio-kf6/pspec.xml b/desktop/kde6/framework/kio-kf6/pspec.xml index 13280ec9ee..cd19511e36 100755 --- a/desktop/kde6/framework/kio-kf6/pspec.xml +++ b/desktop/kde6/framework/kio-kf6/pspec.xml @@ -60,7 +60,7 @@ switcheroo-control - + 6e7775d3.patch @@ -141,6 +141,13 @@ + + 2024-03-10 + 6.0.0 + Rebuild + Mustafa Cinasal + muscnsl@gmail.com + 2024-02-28 6.0.0