backport upstream patch to fix session restore on wayland (https://bugs.kde.org/show_bug.cgi?id=436318 ) [release 6.1.5-2mamba;Wed Sep 18 2024]

This commit is contained in:
Silvan Calarco 2024-09-18 21:52:40 +02:00
parent 4a1a3a3c53
commit 5e2c77776c
2 changed files with 45 additions and 1 deletions

View File

@ -0,0 +1,39 @@
From fae71841ff018e34bbb02aa1098b53f63c1743d2 Mon Sep 17 00:00:00 2001
From: Fushan Wen <qydwhotmail@gmail.com>
Date: Tue, 17 Sep 2024 07:53:35 +0000
Subject: [PATCH] startkde: Fix wayland session restore saving
When we added manual saving support to plasma-shutdown a guard was
changed in the normal shutdown path. This guard was wrong, we want to
check we're in the restorePreviousLogout path here.
This amends 804976c5ecec1fbf5f6e7e09970a8269bdf748d2
BUG: 436318
(cherry picked from commit 4dff1973116597210cf9fb1c102e5c9433d13b1d)
89ee67ad startkde: Fix wayland session restore saving
Co-authored-by: David Edmundson <kde@davidedmundson.co.uk>
---
startkde/plasma-shutdown/shutdown.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/startkde/plasma-shutdown/shutdown.cpp b/startkde/plasma-shutdown/shutdown.cpp
index 11c002bcd80..ab93cca6ef7 100644
--- a/startkde/plasma-shutdown/shutdown.cpp
+++ b/startkde/plasma-shutdown/shutdown.cpp
@@ -84,7 +84,7 @@ void Shutdown::ksmServerComplete()
{
const KConfigGroup c(KSharedConfig::openConfig(QStringLiteral("ksmserverrc")), QStringLiteral("General"));
- if (c.readEntry("loginMode", "restorePreviousLogout") == QLatin1String("restoreSavedSession")) {
+ if (c.readEntry("loginMode", "restorePreviousLogout") == QLatin1String("restorePreviousLogout")) {
// Now record windows that are not session managed
int ret = QProcess::execute(QStringLiteral(PLASMA_FALLBACK_SESSION_SAVE_BIN));
if (ret) {
--
GitLab

View File

@ -2,7 +2,7 @@
Name: plasma-workspace Name: plasma-workspace
Version: 6.1.5 Version: 6.1.5
Release: 1mamba Release: 2mamba
Summary: KDE Plasma Workspace Summary: KDE Plasma Workspace
Group: Graphical Desktop/Applications/Environment Group: Graphical Desktop/Applications/Environment
Vendor: openmamba Vendor: openmamba
@ -20,6 +20,7 @@ Source7: openmambaLookAndFeel.sh
Source8: openmamba-preview-light.png Source8: openmamba-preview-light.png
Source9: openmamba-preview-dark.png Source9: openmamba-preview-dark.png
Patch1: plasma-workspace-5.25.4-hide-qtwindows-style.patch Patch1: plasma-workspace-5.25.4-hide-qtwindows-style.patch
Patch2: plasma-workspace-6.1.5-backport-fix_wayland_session_restore_saving.patch
License: GPL License: GPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -196,6 +197,7 @@ openmamba theme for KDE Plasma.
#-D -T #-D -T
#:<< __EOF #:<< __EOF
%patch 1 -p1 %patch 1 -p1
%patch 2 -p1 -b .backport-fix_wayland_session_restore_saving
# From Fedora # From Fedora
@ -466,6 +468,9 @@ install -D -m0755 %{SOURCE7} %{buildroot}%{_datadir}/kconf_update/openmambaLookA
%{_datadir}/kconf_update/openmambaLookAndFeel.* %{_datadir}/kconf_update/openmambaLookAndFeel.*
%changelog %changelog
* Wed Sep 18 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 6.1.5-2mamba
- backport upstream patch to fix session restore on wayland (https://bugs.kde.org/show_bug.cgi?id=436318 )
* Sat Sep 14 2024 Automatic Build System <autodist@openmamba.org> 6.1.5-1mamba * Sat Sep 14 2024 Automatic Build System <autodist@openmamba.org> 6.1.5-1mamba
- automatic version update by autodist - automatic version update by autodist