[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/

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

commit:     fdf904d0dbe13b7f91cb00d9720bc53e4b0f53fc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 22 20:53:47 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov  9 13:01:48 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fdf904d0

kde-plasma/plasma-workspace: Fix krunner cwd

krunner starts applications with cwd "/" with init system other than systemd
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=432975

Thanks-to: Andrea Arcangeli <aarcange <AT> redhat.com>
Bug: https://bugs.gentoo.org/767478
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...asma-workspace-5.22.5-krunner-cwd-at-home.patch | 30 ++++++++++++++++++++++
 .../plasma-workspace-5.23.49.9999.ebuild           |  5 +++-
 .../plasma-workspace/plasma-workspace-9999.ebuild  |  5 +++-
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-krunner-cwd-at-home.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-krunner-cwd-at-home.patch
new file mode 100644
index 0000000000..27db136c29
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-krunner-cwd-at-home.patch
@@ -0,0 +1,30 @@
+Commit 7ca34e0baa7fa65efc929eee5b6b0c3d2104db8e already reverted one
+change that caused the cwd of all apps spawned by krunner to
+erroneously be set to the root dir.
+
+That regressions is back so it's more robust to fix in within krunner.
+
+Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
+---
+ krunner/main.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/krunner/main.cpp b/krunner/main.cpp
+index 4593687ca..fa4a62ac4 100644
+--- a/krunner/main.cpp
++++ b/krunner/main.cpp
+@@ -12,6 +12,7 @@
+ #include <QDBusConnection>
+ #include <QDBusMessage>
+ #include <QDebug>
++#include <QDir>
+ #include <QQuickWindow>
+ #include <QSessionManager>
+ #include <QUrl>
+@@ -112,5 +113,6 @@ int main(int argc, char **argv)
+         }
+     });
+ 
++    QDir::setCurrent(QDir::homePath());
+     return app.exec();
+ }

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.23.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.23.49.9999.ebuild
index 0ea9e2eeda..b4f4d8416f 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.23.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.23.49.9999.ebuild
@@ -148,7 +148,10 @@ RDEPEND="${COMMON_DEPEND}
 BDEPEND="virtual/pkgconfig"
 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
 
-PATCHES=( "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" ) # downstream
+PATCHES=(
+	"${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream
+	"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
+)
 
 src_prepare() {
 	ecm_src_prepare

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index f8672bc733..027fc1d4fe 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -148,7 +148,10 @@ RDEPEND="${COMMON_DEPEND}
 BDEPEND="virtual/pkgconfig"
 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
 
-PATCHES=( "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" ) # downstream
+PATCHES=(
+	"${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream
+	"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
+)
 
 src_prepare() {
 	ecm_src_prepare