diff --git a/0180-Add-plasma-kwallet-pam.service-to-our-wanted-list.patch b/0180-Add-plasma-kwallet-pam.service-to-our-wanted-list.patch new file mode 100644 index 0000000..3c11ce8 --- /dev/null +++ b/0180-Add-plasma-kwallet-pam.service-to-our-wanted-list.patch @@ -0,0 +1,25 @@ +From 27704daf4440b1d41262d687bf60b734fbc8475c Mon Sep 17 00:00:00 2001 +From: David Edmundson +Date: Fri, 16 Jul 2021 16:11:29 +0100 +Subject: [PATCH 180/219] Add plasma-kwallet-pam.service to our wanted list + +Order is handled by the wallet service. +--- + startkde/systemd/plasma-workspace@.target | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/startkde/systemd/plasma-workspace@.target b/startkde/systemd/plasma-workspace@.target +index 0950e2fc4..6c676d4da 100644 +--- a/startkde/systemd/plasma-workspace@.target ++++ b/startkde/systemd/plasma-workspace@.target +@@ -1,6 +1,6 @@ + [Unit] + Description=KDE Plasma Workspace + 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 kde-baloo.service plasma-foreground-booster.service ++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 kde-baloo.service plasma-foreground-booster.service plasma-kwallet-pam.service + BindsTo=graphical-session.target + Before=graphical-session.target xdg-desktop-autostart.target plasma-ksplash-ready.service plasma-restoresession.service +-- +2.31.1 + diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 25d316e..0afb82b 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -14,7 +14,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.22.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -68,6 +68,7 @@ Patch105: plasma-workspace-5.21.90-folderview_layout.patch ## upstreamable Patches ## upstream Patches (master branch) +Patch180: 0180-Add-plasma-kwallet-pam.service-to-our-wanted-list.patch # udev BuildRequires: zlib-devel @@ -431,6 +432,9 @@ BuildArch: noarch %prep %setup -q -a 20 +## upstream patches +%patch180 -p1 + %patch100 -p1 -b .konsole-in-contextmenu # FIXME/TODO: it is unclear whether this is needed or even a good idea anymore -- rex %if 0%{?default_lookandfeel:1} @@ -737,6 +741,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %changelog +* Fri Jul 30 2021 Rex Dieter - 5.22.4-2 +- pull in upstream fix to add dependency on kwallet-pam user service + * Tue Jul 27 2021 Jan Grulich - 5.22.4-1 - 5.22.4