pull in upstream fix for lockscreen detection (kde#432251)

epel9
Rex Dieter 4 years ago
parent bc9ef72076
commit a57073bc51

@ -0,0 +1,34 @@
From 3800aa256e2dec27ae8c80f428512ed3960d0575 Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
Date: Wed, 27 Jan 2021 14:54:57 +0000
Subject: [PATCH 09/10] Make ksmserver's lock screen detection automatic
Use of a flag doesn't make it easy to share code, especially with the
systemd units.
(cherry picked from commit d3adf06c72301365b0c707f968974574e345adac)
---
ksmserver/main.cpp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp
index fcd8dd724..f01fbe755 100644
--- a/ksmserver/main.cpp
+++ b/ksmserver/main.cpp
@@ -286,6 +286,12 @@ int main(int argc, char *argv[])
flags |= KSMServer::InitFlag::NoLockScreen;
}
+ // we use the session_type here as ksmserver is already forced as X above
+ // in wayland, kwin manages the lock screen
+ if (qgetenv("XDG_SESSION_TYPE") == QByteArrayLiteral("wayland")) {
+ flags |= KSMServer::InitFlag::NoLockScreen;
+ }
+
KSMServer *server = new KSMServer(flags);
// for the KDE-already-running check in startkde
--
2.29.2

@ -16,7 +16,7 @@
Name: plasma-workspace
Summary: Plasma workspace, applications and applets
Version: 5.20.90
Release: 7%{?dist}
Release: 8%{?dist}
License: GPLv2+
URL: https://invent.kde.org/plasma/%{name}
@ -65,6 +65,7 @@ Patch105: plasma-workspace-5.7.3-folderview_layout.patch
## upstream Patches
Patch8: 0008-systemd-Move-kwin-to-wants.patch
Patch9: 0009-Make-ksmserver-s-lock-screen-detection-automatic.patch
## upstream Patches (master branch)
@ -724,8 +725,10 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper,
%{_kf5_datadir}/plasma/look-and-feel/org.fedoraproject.fedora.desktop/
%endif
%changelog
* Fri Jan 29 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.20.90-8
- pull in upstream fix for lockscreen detection (kde#432251)
* Thu Jan 28 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.20.90-7
- pull in upstream wayland session fix (kde#432189)

Loading…
Cancel
Save