diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2021-05-09 13:24:34 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-05-09 14:10:15 +0200 |
commit | cb148e54742c0810a6abc045f12cf8415f22edae (patch) | |
tree | a6d4a0e25d7fc203fa157930119ac28071205ba6 /kde-plasma/plasma-workspace | |
parent | profiles: targets/systemd: Unmask kde-plasma/plasma-meta[firewall] (diff) | |
download | gentoo-cb148e54742c0810a6abc045f12cf8415f22edae.tar.gz gentoo-cb148e54742c0810a6abc045f12cf8415f22edae.tar.bz2 gentoo-cb148e54742c0810a6abc045f12cf8415f22edae.zip |
kde-plasma/plasma-workspace: Rebase revert-activate-krunner.patch
Still not fixed in 5.21.5.
Bug: https://bugs.gentoo.org/767478
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-plasma/plasma-workspace')
-rw-r--r-- | kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-revert-activate-krunner.patch | 56 | ||||
-rw-r--r-- | kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild | 1 |
2 files changed, 57 insertions, 0 deletions
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-revert-activate-krunner.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-revert-activate-krunner.patch new file mode 100644 index 000000000000..c2637286da10 --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-revert-activate-krunner.patch @@ -0,0 +1,56 @@ +From 9bdae154bb3711b0220d0a8a685b2329f487d1f2 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Mon, 15 Feb 2021 17:35:19 +0100 +Subject: [PATCH] Revert "Activate KRunner instead of running the binary" + +Causes applications to be started with cwd "/". + +See also: https://bugs.gentoo.org/767478 + +This reverts commit 0e575a20ef36532b5b40a40ea30f915976942477. +--- + krunner/CMakeLists.txt | 3 ++- + krunner/{krunner.desktop => krunner.desktop.cmake} | 4 ++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + rename krunner/{krunner.desktop => krunner.desktop.cmake} (94%) + +diff --git a/krunner/CMakeLists.txt b/krunner/CMakeLists.txt +index 07d27c1dc..8e1f2e3bd 100644 +--- a/krunner/CMakeLists.txt ++++ b/krunner/CMakeLists.txt +@@ -31,7 +31,8 @@ target_compile_definitions(krunner PRIVATE -DPROJECT_VERSION="${PROJECT_VERSION} + install(TARGETS krunner ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) + install(FILES ${krunner_dbusAppXML} DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR} ) + +-install(FILES krunner.desktop DESTINATION ${DATA_INSTALL_DIR}/kglobalaccel) ++configure_file(krunner.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/krunner.desktop @ONLY) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/krunner.desktop DESTINATION ${DATA_INSTALL_DIR}/kglobalaccel) + + set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KRunnerAppDBusInterface") + configure_package_config_file(KRunnerAppDBusInterfaceConfig.cmake.in +diff --git a/krunner/krunner.desktop b/krunner/krunner.desktop.cmake +similarity index 94% +rename from krunner/krunner.desktop +rename to krunner/krunner.desktop.cmake +index 7a0398696..c4c8c9d92 100644 +--- a/krunner/krunner.desktop ++++ b/krunner/krunner.desktop.cmake +@@ -1,5 +1,5 @@ + [Desktop Entry] +-Exec=dbus-send --type=method_call --dest=org.kde.krunner /App org.kde.krunner.App.toggleDisplay ++Exec=@CMAKE_INSTALL_PREFIX@/bin/krunner + Name=KRunner + Name[ar]=مشغّل.ك + Name[ast]=KRunner +@@ -60,7 +60,7 @@ Actions=RunClipboard + X-KDE-Wayland-Interfaces=org_kde_plasma_window_management + + [Desktop Action RunClipboard] +-Exec=dbus-send --type=method_call --dest=org.kde.krunner /App org.kde.krunner.App.displayWithClipboardContents ++Exec=krunner -c + Name=Run command on clipboard contents + Name[az]=Əmri, mübadilə buferindən başlatmaq + Name[ca]=Executa una ordre al contingut del porta-retalls +-- +2.31.1 + diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild index db34bfe37efb..35b280c763ac 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild @@ -145,6 +145,7 @@ PDEPEND=" PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" + "${FILESDIR}/${P}-revert-activate-krunner.patch" # bug 767478 "${FILESDIR}/${P}-transparency.patch" # KDE-bug 434202 "${FILESDIR}/${P}-transparency-panelConfig.patch" # KDE-bug 434285 "${FILESDIR}/${P}-dangerous-shortcuts.patch" # KDE-bug 435954 |