diff --git a/0008-systemd-Move-kwin-to-wants.patch b/0008-systemd-Move-kwin-to-wants.patch new file mode 100644 index 0000000..d0ffd16 --- /dev/null +++ b/0008-systemd-Move-kwin-to-wants.patch @@ -0,0 +1,29 @@ +From 75bdbc4a3ce6e00a29025e0a15455fb92fb9cd7a Mon Sep 17 00:00:00 2001 +From: David Edmundson +Date: Wed, 27 Jan 2021 10:58:20 +0000 +Subject: [PATCH 08/10] [systemd] Move kwin to "wants" + +As kwin-wayland is still spawned manually by us for Plasma 5.21. + + +(cherry picked from commit 07b2d67f5b4c8114822c319dc2b8d77fac20a86f) +--- + startkde/systemd/plasma-workspace@.target | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/startkde/systemd/plasma-workspace@.target b/startkde/systemd/plasma-workspace@.target +index ca0bf390d..9fae5fe3c 100644 +--- a/startkde/systemd/plasma-workspace@.target ++++ b/startkde/systemd/plasma-workspace@.target +@@ -1,6 +1,6 @@ + [Unit] + Description=KDE Plasma Workspace +-Requires=plasma-kwin_%i.service plasma-core.target xdg-desktop-autostart.target graphical-session.target +-Wants=plasma-restoresession.service plasma-xembedsniproxy.service plasma-gmenudbusmenuproxy.service plasma-powerdevil.service plasma-ksplash-ready.service plasma-polkit-agent.service plasma-baloo.service plasma-foreground-booster.service ++Requires=plasma-core.target xdg-desktop-autostart.target graphical-session.target ++Wants=plasma-kwin_%i.service plasma-restoresession.service plasma-xembedsniproxy.service plasma-gmenudbusmenuproxy.service plasma-powerdevil.service plasma-ksplash-ready.service plasma-polkit-agent.service plasma-baloo.service plasma-foreground-booster.service + BindsTo=graphical-session.target + Before=graphical-session.target xdg-desktop-autostart.target plasma-ksplash-ready.service plasma-restoresession.service +-- +2.29.2 + diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 64686c0..da9bb55 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -16,7 +16,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.20.90 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -63,7 +63,8 @@ Patch105: plasma-workspace-5.7.3-folderview_layout.patch ## upstreamable Patches -## upstream Patches lookaside cache +## upstream Patches +Patch8: 0008-systemd-Move-kwin-to-wants.patch ## upstream Patches (master branch) @@ -418,6 +419,7 @@ BuildArch: noarch %setup -q -a 20 ## upstream patches +%patch8 -p1 -b .0008 %patch100 -p1 -b .konsole-in-contextmenu # FIXME/TODO: it is unclear whether this is needed or even a good idea anymore -- rex @@ -724,6 +726,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %changelog +* Thu Jan 28 2021 Rex Dieter - 5.20.90-7 +- pull in upstream wayland session fix (kde#432189) + * Wed Jan 27 2021 Fedora Release Engineering - 5.20.90-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild