From e561df722bc1f5d14da69836d9ad7eebc855fa49 Mon Sep 17 00:00:00 2001
From: Aleix Pol <aleixpol@kde.org>
Date: Sat, 20 Jul 2019 18:23:30 +0200
Subject: [PATCH] Embrace X-KDE-Wayland-Interfaces

Summary:
Requests several KWin-specific interfaces to be used on KRunner and
Plasma Shell.

Test Plan: See D22571

Reviewers: #plasma, #kwin, davidedmundson

Reviewed By: #plasma, #kwin, davidedmundson

Subscribers: davidedmundson, zzag, mvourlakos, plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D22589
---
 krunner/CMakeLists.txt                                      | 4 +++-
 krunner/{krunner.desktop => krunner.desktop.cmake}          | 3 ++-
 shell/CMakeLists.txt                                        | 6 ++++--
 ...lasmashell.desktop => org.kde.plasmashell.desktop.cmake} | 4 +++-
 4 files changed, 12 insertions(+), 5 deletions(-)
 rename krunner/{krunner.desktop => krunner.desktop.cmake} (95%)
 rename shell/{org.kde.plasmashell.desktop => org.kde.plasmashell.desktop.cmake} (94%)

diff --git a/krunner/CMakeLists.txt b/krunner/CMakeLists.txt
index 170b3e712..b22e99dbf 100644
--- a/krunner/CMakeLists.txt
+++ b/krunner/CMakeLists.txt
@@ -28,7 +28,9 @@ 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 95%
rename from krunner/krunner.desktop
rename to krunner/krunner.desktop.cmake
index 93247f7a0..91cb9e87d 100644
--- a/krunner/krunner.desktop
+++ b/krunner/krunner.desktop.cmake
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=krunner
+Exec=@CMAKE_INSTALL_PREFIX@/bin/krunner
 Name=KRunner
 Name[ar]=مشغّل.ك
 Name[bs]=KPokretač
@@ -51,6 +51,7 @@ X-DBUS-ServiceName=org.kde.krunner
 X-KDE-StartupNotify=false
 X-KDE-Shortcuts=Alt+Space,Alt+F2,Search
 Actions=RunClipboard
+X-KDE-Wayland-Interfaces=org_kde_plasma_window_management
 
 [Desktop Action RunClipboard]
 Exec=krunner -c
diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
index b7ce9dfe6..99ba538c1 100644
--- a/shell/CMakeLists.txt
+++ b/shell/CMakeLists.txt
@@ -81,9 +81,11 @@ if(HAVE_X11)
   target_link_libraries(plasmashell Qt5::X11Extras)
 endif()
 
+configure_file(org.kde.plasmashell.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasmashell.desktop @ONLY)
+
 install(TARGETS plasmashell ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES org.kde.plasmashell.desktop DESTINATION ${KDE_INSTALL_APPDIR})
-install(FILES org.kde.plasmashell.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasmashell.desktop DESTINATION ${KDE_INSTALL_APPDIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasmashell.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR})
 install( FILES dbus/org.kde.PlasmaShell.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR} )
 
 install(FILES
diff --git a/shell/org.kde.plasmashell.desktop b/shell/org.kde.plasmashell.desktop.cmake
similarity index 94%
rename from shell/org.kde.plasmashell.desktop
rename to shell/org.kde.plasmashell.desktop.cmake
index 6c90794e0..9bd6fbe8d 100644
--- a/shell/org.kde.plasmashell.desktop
+++ b/shell/org.kde.plasmashell.desktop.cmake
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=plasmashell
+Exec=@CMAKE_INSTALL_PREFIX@/bin/plasmashell
 X-DBUS-StartupType=Unique
 Name=Plasma Desktop Workspace
 Name[ar]=مساحة عمل سطح مكتب بلازما
@@ -56,3 +56,5 @@ OnlyShowIn=KDE;
 X-KDE-autostart-phase=0
 Icon=plasma
 NoDisplay=true
+
+X-KDE-Wayland-Interfaces=org_kde_plasma_window_management,org_kde_kwin_keystate