[neon/kf6/kf6-kio/Neon/stable] debian/patches: Revert "add patch recommended by nate"

Jonathan Riddell null at kde.org
Mon Mar 18 11:28:03 GMT 2024


Git commit d194082786a8142aa91a61e2e9598d3c631626fb by Jonathan Riddell.
Committed on 18/03/2024 at 11:27.
Pushed by jriddell into branch 'Neon/stable'.

Revert "add patch recommended by nate"

This reverts commit 2350232640b874abf699cfd2b021acc41fe00e6d.

D  +0    -28   debian/patches/kterminallauncherjob.diff
D  +0    -1    debian/patches/series

https://invent.kde.org/neon/kf6/kf6-kio/-/commit/d194082786a8142aa91a61e2e9598d3c631626fb

diff --git a/debian/patches/kterminallauncherjob.diff b/debian/patches/kterminallauncherjob.diff
deleted file mode 100644
index 98086c4..0000000
--- a/debian/patches/kterminallauncherjob.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 6e7775d315f389df0a440ed62b842ce83dc9a27e
-Author: Nicolas Fella <nicolas.fella at gmx.de>
-Date:   Fri Mar 1 22:16:07 2024 +0100
-
-    [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
-
-diff --git a/src/gui/kterminallauncherjob.cpp b/src/gui/kterminallauncherjob.cpp
-index c4e83fb11..edd99327b 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)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c2d34a0..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-kterminallauncherjob.diff


More information about the Neon-commits mailing list