From f4b870977be9966c10c4f3f9db6d20500fc0a6ea Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Tue, 17 Aug 2021 08:55:32 +0100 Subject: [PATCH] Re-enable systemd managed kwin This was blocked on environment variables issues which are now resolved --- CMakeLists.txt | 5 +---- plasma-kwin_wayland.service.in | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 923dcbf56e..0319f9eed7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -455,8 +455,5 @@ configure_package_config_file(KWinDBusInterfaceConfig.cmake.in install(FILES ${CMAKE_CURRENT_BINARY_DIR}/KWinDBusInterfaceConfig.cmake DESTINATION ${CMAKECONFIG_INSTALL_DIR}) - -# plasma-kwin_wayland.service.in is currently disabled as plasma-workspace currently launches -# kwin-wayland explicitly. Porting this is currently blocked on propogating DISPLAY -ecm_install_configured_files(INPUT plasma-kwin_x11.service.in @ONLY +ecm_install_configured_files(INPUT plasma-kwin_x11.service.in plasma-kwin_wayland.service.in @ONLY DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR}) diff --git a/plasma-kwin_wayland.service.in b/plasma-kwin_wayland.service.in index 678810cf5b..6db09b26ba 100644 --- a/plasma-kwin_wayland.service.in +++ b/plasma-kwin_wayland.service.in @@ -3,6 +3,6 @@ Description=KDE Window Manager PartOf=graphical-session.target [Service] -ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/kwin_wayland -BusName=org.kde.KWin +ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/kwin_wayland_wrapper --xwayland +BusName=org.kde.KWinWrapper Slice=session.slice