pool/plasma5-workspace
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

- Add upstream patch to fix starting a wayland session from gdm and

Browse Source 
lightdm: (boo#1085772):
  * 0001-Use-dbus-run-session-instead-of-dbus-launch-exit-wit.patch

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=386
This commit is contained in:
Fabian Vogt
2018-03-19 09:32:10 +00:00
committed by Git OBS Bridge
parent 5591aa65c1
commit 10b245350b
3 changed files with 55 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
0001-Use-dbus-run-session-instead-of-dbus-launch-exit-wit.patch Normal file
View File

@@ -0,0 +1,44 @@
From 19bee4105feb3e8de0fc1e170bf36260d6c2b3b2 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Mon, 19 Mar 2018 10:11:50 +0100
Subject: [PATCH] Use dbus-run-session instead of dbus-launch
--exit-with-session
Summary:
dbus-launch --exit-with-session behaves badly if there's no X server running.
This resulted in it breaking when being launched from gdm or lightdm.
Also, the manpage explicitly states "This option is not recommended".
Test Plan:
Using it right now, started with sddm.
Also verified that nothing remains after logout.
Reviewers: #plasma, davidedmundson
Reviewed By: #plasma, davidedmundson
Subscribers: plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D11478
---
plasmawayland.desktop.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plasmawayland.desktop.cmake b/plasmawayland.desktop.cmake
index f3db4af7..6cbb2c13 100644
--- a/plasmawayland.desktop.cmake
+++ b/plasmawayland.desktop.cmake
@@ -1,6 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
-Exec=dbus-launch --exit-with-session ${CMAKE_INSTALL_FULL_BINDIR}/startplasmacompositor
+Exec=dbus-run-session ${CMAKE_INSTALL_FULL_BINDIR}/startplasmacompositor
TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasmacompositor
DesktopNames=KDE
Name=Plasma
--
2.16.2

7
plasma5-workspace.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Mar 19 09:31:21 UTC 2018 - fabian@ritter-vogt.de
- Add upstream patch to fix starting a wayland session from gdm and
lightdm: (boo#1085772):
* 0001-Use-dbus-run-session-instead-of-dbus-launch-exit-wit.patch
-------------------------------------------------------------------
Tue Mar 6 16:07:55 CET 2018 - fabian@ritter-vogt.de

8
plasma5-workspace.spec
View File

@@ -39,8 +39,9 @@ Source1: baselibs.conf
Patch0: 0001-Rename-qdbus-in-startkde.patch
# PATCH-FIX-OPENSUSE 0001-Ignore-default-sddm-face-icons.patch boo#1001364 fabian@ritter-vogt.de -- Ignore default sddm face icons
Patch1: 0001-Ignore-default-sddm-face-icons.patch
# PATCHES 100-200 and above are from upstream 5.11 branch
# PATCHES 201-300 and above are from upstream master/5.12 branch
# PATCHES 100-200 and above are from upstream 5.12 branch
Patch100: 0001-Use-dbus-run-session-instead-of-dbus-launch-exit-wit.patch
# PATCHES 201-300 and above are from upstream master/5.13 branch
BuildRequires: breeze5-icons
BuildRequires: fdupes
BuildRequires: kf5-filesystem
@@ -257,8 +258,7 @@ Plasma 5 session with Wayland from a display manager.
%prep
%setup -q -n plasma-workspace-%{version}
%patch0 -p1
%patch1 -p1
%autopatch -p1
%build
%cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}