From e350342bfc42f7803c58dafea0c0ad190507430b Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Tue, 2 Feb 2021 13:28:06 +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 59d50e464..02b2c5731 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 85c91dbad..457daaaa7 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.display +Exec=@CMAKE_INSTALL_PREFIX@/bin/krunner Name=KRunner Name[ar]=مشغّل.ك Name[ast]=KRunner @@ -59,7 +59,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.30.0