kf6-kio: Add backport to fix konsole

Signed-off-by: Reilly Brogan <reilly@reillybrogan.com>
getsolus · Mar 16, 2024 · 724d236 · 724d236
1 parent 5d5d7df
commit 724d236
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 5 deletions.
diff --git a/packages/k/kf6-kio/files/kterminallauncherjob.patch b/packages/k/kf6-kio/files/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/packages/k/kf6-kio/package.yml b/packages/k/kf6-kio/package.yml
@@ -1,6 +1,6 @@
 name       : kf6-kio
 version    : 6.0.0
-release    : 5
+release    : 6
 source     :
     - https://cdn.download.kde.org/stable/frameworks/6.0/kio-6.0.0.tar.xz : 4951adf043299e463803cc63ed33d5261b81bff969eb189dc13350f495cb4b42
 homepage   : https://community.kde.org/Frameworks
@@ -61,6 +61,7 @@ rundeps    :
 clang      : yes
 optimize   : thin-lto
 setup      : |
+    %patch -p1 -i $pkgfiles/kterminallauncherjob.patch
     %cmake_kf6
 build      : |
     %ninja_build

diff --git a/packages/k/kf6-kio/pspec_x86_64.xml b/packages/k/kf6-kio/pspec_x86_64.xml
@@ -37,7 +37,6 @@
             <Path fileType="library">/usr/lib64/libKF6KIOWidgets.so.6</Path>
             <Path fileType="library">/usr/lib64/libKF6KIOWidgets.so.6.0.0</Path>
             <Path fileType="library">/usr/lib64/libkuriikwsfiltereng_private.so</Path>
-            <Path fileType="library">/usr/lib64/qt6/plugins/designer/kio6widgets.so</Path>
             <Path fileType="library">/usr/lib64/qt6/plugins/kf6/kded/remotenotifier.so</Path>
             <Path fileType="library">/usr/lib64/qt6/plugins/kf6/kio/kio_file.so</Path>
             <Path fileType="library">/usr/lib64/qt6/plugins/kf6/kio/kio_ftp.so</Path>
@@ -308,7 +307,7 @@
 </Description>
         <PartOf>programming.devel</PartOf>
         <RuntimeDependencies>
-            <Dependency release="5">kf6-kio</Dependency>
+            <Dependency release="6">kf6-kio</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include/KF6/KIO/kio_version.h</Path>
@@ -553,13 +552,14 @@
             <Path fileType="library">/usr/lib64/libKF6KIOFileWidgets.so</Path>
             <Path fileType="library">/usr/lib64/libKF6KIOGui.so</Path>
             <Path fileType="library">/usr/lib64/libKF6KIOWidgets.so</Path>
+            <Path fileType="library">/usr/lib64/qt6/plugins/designer/kio6widgets.so</Path>
             <Path fileType="doc">/usr/share/doc/qt6/KF6KIO.qch</Path>
             <Path fileType="doc">/usr/share/doc/qt6/KF6KIO.tags</Path>
         </Files>
     </Package>
     <History>
-        <Update release="5">
-            <Date>2024-02-28</Date>
+        <Update release="6">
+            <Date>2024-03-16</Date>
             <Version>6.0.0</Version>
             <Comment>Packaging update</Comment>
             <Name>Reilly Brogan</Name>