|
 |
653b2e3 |
From 20135166521b601da1d4a9dc6c13b58fd3847735 Mon Sep 17 00:00:00 2001
|
|
|
653b2e3 |
From: David Edmundson <kde@davidedmundson.co.uk>
|
|
|
653b2e3 |
Date: Wed, 27 Jan 2021 10:56:43 +0000
|
|
|
653b2e3 |
Subject: [PATCH 14/21] Fix the systemd wayland boot
|
|
|
653b2e3 |
|
|
|
653b2e3 |
Plasma-workspace currently starts kwin_wayland before afterwards
|
|
|
653b2e3 |
continuing to spawn the full session, through whatever mechanism.
|
|
|
653b2e3 |
|
|
|
653b2e3 |
We ultimately want to just have systemd manage everything all at once,
|
|
|
653b2e3 |
but this was not realised in time for 5.21 due to a problem of
|
|
|
653b2e3 |
propogating environment variables.
|
|
|
653b2e3 |
|
|
|
653b2e3 |
By removing this file we go to a working state with the option enabled,
|
|
|
653b2e3 |
and can build on it for the next release.
|
|
|
653b2e3 |
|
|
|
653b2e3 |
BUG: 432189
|
|
|
653b2e3 |
|
|
|
653b2e3 |
|
|
|
653b2e3 |
(cherry picked from commit ca81be6635131bfe2d290022128d0569357d2dd5)
|
|
|
653b2e3 |
---
|
|
|
653b2e3 |
CMakeLists.txt | 5 ++++-
|
|
|
653b2e3 |
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
653b2e3 |
|
|
|
653b2e3 |
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
653b2e3 |
index 0e00408e8..f10361b62 100644
|
|
|
653b2e3 |
--- a/CMakeLists.txt
|
|
|
653b2e3 |
+++ b/CMakeLists.txt
|
|
|
4709f29 |
@@ -814,7 +814,10 @@ configure_package_config_file(KWinDBusIn
|
|
|
653b2e3 |
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/KWinDBusInterfaceConfig.cmake
|
|
|
653b2e3 |
DESTINATION ${CMAKECONFIG_INSTALL_DIR})
|
|
|
653b2e3 |
|
|
|
653b2e3 |
-ecm_install_configured_files(INPUT plasma-kwin_x11.service.in plasma-kwin_wayland.service.in @ONLY
|
|
|
653b2e3 |
+
|
|
|
653b2e3 |
+# plasma-kwin_wayland.service.in is currently disabled as plasma-workspace currently launches
|
|
|
653b2e3 |
+# kwin-wayland explicitly. Porting this is currently blocked on propogating DISPLAY
|
|
|
653b2e3 |
+ecm_install_configured_files(INPUT plasma-kwin_x11.service.in @ONLY
|
|
|
653b2e3 |
DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR})
|
|
|
4709f29 |
|
|
|
4709f29 |
find_package(KF5I18n CONFIG REQUIRED)
|
|
|
653b2e3 |
--
|
|
|
653b2e3 |
2.29.2
|
|
|
653b2e3 |
|