Hello community,
here is the log from the commit of package plasma5-workspace for
openSUSE:Factory checked in at 2020-09-09 17:45:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plasma5-workspace (Old)
and /work/SRC/openSUSE:Factory/.plasma5-workspace.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-workspace"
Wed Sep 9 17:45:04 2020 rev:144 rq:832134 version:5.19.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/plasma5-workspace/plasma5-workspace.changes
2020-09-04 11:09:16.782945329 +0200
+++
/work/SRC/openSUSE:Factory/.plasma5-workspace.new.3399/plasma5-workspace.changes
2020-09-09 17:45:09.442339582 +0200
@@ -1,0 +2,6 @@
+Fri Sep 4 10:42:01 UTC 2020 - Hans-Peter Jansen <h...@urpla.net>
+
+- apply 0001-ksmserver-Use-UpdateLaunchEnvJob-to-sync-SESSION_MAN.patch,
+ that fixes the broken session restore
+
+-------------------------------------------------------------------
New:
----
0001-ksmserver-Use-UpdateLaunchEnvJob-to-sync-SESSION_MAN.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plasma5-workspace.spec ++++++
--- /var/tmp/diff_new_pack.860cC3/_old 2020-09-09 17:45:11.534341282 +0200
+++ /var/tmp/diff_new_pack.860cC3/_new 2020-09-09 17:45:11.538341285 +0200
@@ -48,6 +48,8 @@
Patch503: 0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch
# PATCH-FEATURE-OPENSUSE
Patch506: 0001-Revert-No-icons-on-the-desktop-by-default.patch
+# PATCH-FIX-UPSTREAM
+Patch510: 0001-ksmserver-Use-UpdateLaunchEnvJob-to-sync-SESSION_MAN.patch
BuildRequires: breeze5-icons
BuildRequires: fdupes
BuildRequires: kf5-filesystem
++++++ 0001-ksmserver-Use-UpdateLaunchEnvJob-to-sync-SESSION_MAN.patch ++++++
>From d24cef54d68fb29994ed610bc70867d6fc811287 Mon Sep 17 00:00:00 2001
From: David Edmundson <k...@davidedmundson.co.uk>
Date: Tue, 1 Sep 2020 13:56:51 +0100
Subject: [PATCH] [ksmserver] Use UpdateLaunchEnvJob to sync SESSION_MANAGER
env
ksmserver starts in plasma-session. It currently sets the
SESSION_MANAGER env back to just kinit and plasma-session which is then
used for anything else that plasma-session starts.
This is after start-plasma has synced the environment to DBus/systemd.
By using the shared UpdateLaunchEnvJob we can sync all these places.
BUG: 425982
---
ksmserver/server.cpp | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
index d7e24a750..29e6b914f 100644
--- a/ksmserver/server.cpp
+++ b/ksmserver/server.cpp
@@ -97,6 +97,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
#include "kscreenlocker_interface.h"
#include "kwinsession_interface.h"
+#include <updatelaunchenvjob.h>
+
KSMServer* the_server = nullptr;
KSMServer* KSMServer::self()
@@ -661,12 +663,8 @@ KSMServer::KSMServer(InitFlags flags)
fclose(f);
setenv( "SESSION_MANAGER", session_manager, true );
- // Pass env. var to kdeinit.
- org::kde::KLauncher klauncher( QStringLiteral( "org.kde.klauncher5" ),
QStringLiteral( "/KLauncher" ), QDBusConnection::sessionBus());
- klauncher.setLaunchEnv( QStringLiteral( "SESSION_MANAGER" ),
QString::fromLocal8Bit( (const char*) session_manager ) );
-
- org::kde::Startup startup(QStringLiteral("org.kde.Startup"),
QStringLiteral("/Startup"), QDBusConnection::sessionBus());
- startup.updateLaunchEnv( QStringLiteral( "SESSION_MANAGER" ),
QString::fromLocal8Bit( (const char*) session_manager ) );
+ auto updateEnvJob = new
UpdateLaunchEnvJob(QStringLiteral("SESSION_MANAGER"),
QString::fromLatin1(session_manager));
+ updateEnvJob->start();
free(session_manager);
}
--
2.28.0
