From 653b2e3c2bca0fedd98ac01aab6246ad4acf014c Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Jan 28 2021 21:07:43 +0000
Subject: pull in upstream wayland fix (#432189)

.spec cosmetics
revert BR: make (not needed)

---

diff --git a/0014-Fix-the-systemd-wayland-boot.patch b/0014-Fix-the-systemd-wayland-boot.patch
new file mode 100644
index 0000000..65410ac
--- /dev/null
+++ b/0014-Fix-the-systemd-wayland-boot.patch
@@ -0,0 +1,40 @@
+From 20135166521b601da1d4a9dc6c13b58fd3847735 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Wed, 27 Jan 2021 10:56:43 +0000
+Subject: [PATCH 14/21] Fix the systemd wayland boot
+
+Plasma-workspace currently starts kwin_wayland before afterwards
+continuing to spawn the full session, through whatever mechanism.
+
+We ultimately want to just have systemd manage everything all at once,
+but this was not realised in time for 5.21 due to a problem of
+propogating environment variables.
+
+By removing this file we go to a working state with the option enabled,
+and can build on it for the next release.
+
+BUG: 432189
+
+
+(cherry picked from commit ca81be6635131bfe2d290022128d0569357d2dd5)
+---
+ CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0e00408e8..f10361b62 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -814,5 +814,8 @@ configure_package_config_file(KWinDBusInterfaceConfig.cmake.in
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/KWinDBusInterfaceConfig.cmake
+     DESTINATION ${CMAKECONFIG_INSTALL_DIR})
+ 
+-ecm_install_configured_files(INPUT plasma-kwin_x11.service.in plasma-kwin_wayland.service.in @ONLY
++
++# 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
+             DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR})
+-- 
+2.29.2
+
diff --git a/kwin.spec b/kwin.spec
index 158242c..f35da17 100644
--- a/kwin.spec
+++ b/kwin.spec
@@ -17,7 +17,7 @@
 
 Name:    kwin
 Version: 5.20.90
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: KDE Window manager
 
 # all sources are effectively GPLv2+, except for:
@@ -25,7 +25,6 @@ Summary: KDE Window manager
 # KDE e.V. may determine that future GPL versions are accepted
 License: GPLv2 or GPLv3
 URL:     https://userbase.kde.org/KWin
-#URL:    https://cgit.kde.org/%{name}.git
 
 %global revision %(echo %{version} | cut -d. -f3)
 %if %{revision} >= 50
@@ -39,8 +38,9 @@ Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.
 
 ## upstream patches
 
+Patch14: 0014-Fix-the-systemd-wayland-boot.patch
+
 # Base
-BuildRequires: make
 BuildRequires:  extra-cmake-modules
 BuildRequires:  kf5-rpm-macros
 BuildRequires:  systemd-rpm-macros
@@ -251,8 +251,9 @@ sed -i \
 
 
 %build
-%{cmake_kf5} \
+%cmake_kf5 \
   -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF}
+
 %cmake_build
 
 
@@ -325,7 +326,7 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||:
 %{_kf5_qtplugindir}/org.kde.kwin.waylandbackends/KWinWaylandWaylandBackend.so
 %{_kf5_qtplugindir}/org.kde.kwin.waylandbackends/KWinWaylandX11Backend.so
 %{_kf5_qtplugindir}/org.kde.kwin.waylandbackends/KWinWaylandVirtualBackend.so
-%{_userunitdir}/plasma-kwin_wayland.service
+#{_userunitdir}/plasma-kwin_wayland.service
 
 %files x11
 %{_kf5_bindir}/kwin_x11
@@ -359,6 +360,11 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||:
 
 
 %changelog
+* Thu Jan 28 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.20.90-3
+- pull in upstream wayland fix (#432189)
+- .spec cosmetics
+- revert BR: make (not needed)
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.20.90-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild