summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2021-09-22 22:53:47 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2021-11-09 14:01:48 +0100
commitfdf904d0dbe13b7f91cb00d9720bc53e4b0f53fc (patch)
tree3c23faf7c6ec5d834290eec954a4a4ed5b050d55
parentc6c186c3932ac7ba478cd20d3b9a85e7ff4c725e (diff)
downloadkde-fdf904d0dbe13b7f91cb00d9720bc53e4b0f53fc.tar.gz
kde-fdf904d0dbe13b7f91cb00d9720bc53e4b0f53fc.tar.bz2
kde-fdf904d0dbe13b7f91cb00d9720bc53e4b0f53fc.zip
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@redhat.com> Bug: https://bugs.gentoo.org/767478 Package-Manager: Portage-3.0.23, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-krunner-cwd-at-home.patch30
-rw-r--r--kde-plasma/plasma-workspace/plasma-workspace-5.23.49.9999.ebuild5
-rw-r--r--kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild5
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 00000000000..27db136c294
--- /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 0ea9e2eeda4..b4f4d8416f3 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 f8672bc733e..027fc1d4fea 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