rpm/xfce4-session
SHA256
1
0
Fork 0
forked from pool/xfce4-session
Code Pull Requests Activity

Accepting request 560752 from home:seife:xfce

Browse Source 
add xfce4-session-systemd-user-addons.patch

OBS-URL: https://build.opensuse.org/request/show/560752
OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=135
This commit is contained in:
Stefan Seyfried 2017-12-30 13:52:31 +00:00 committed by Git OBS Bridge
parent 2b6cd04439
commit ad19e9c8ff
3 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
xfce4-session-systemd-user-addons.patch Normal file
View File

@ -0,0 +1,34 @@
Set XAUTHLOCALHOSTNAME in systemd user session, or starting of systemd-activated
services will fail.
Observed on openSUSE-Tumbleweed-Rescue-CD-x86_64-Snapshot20171213-Media.iso
Index: b/scripts/xinitrc.in
===================================================================
--- a/scripts/xinitrc.in
+++ b/scripts/xinitrc.in
@@ -86,6 +86,10 @@ cat /dev/null $XRESOURCES | xrdb -nocpp
# load local modmap
test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
+# if XAUTHLOCALHOSTNAME is not set in systemd user session, starting of xfce4-notifyd etc. will fail
+if systemctl --user list-jobs >/dev/null 2>&1; then # user session is running
+ dbus-update-activation-environment --systemd XAUTHLOCALHOSTNAME=$XAUTHLOCALHOSTNAME
+fi
# check if we start xfce4-session with ck-launch-session. this is only
# required for starting from a console, not a login manager
if test "x$XFCE4_SESSION_WITH_CK" = "x1"; then
Index: b/scripts/xinitrc.in.in
===================================================================
--- a/scripts/xinitrc.in.in
+++ b/scripts/xinitrc.in.in
@@ -86,6 +86,10 @@ cat /dev/null $XRESOURCES | xrdb -nocpp
# load local modmap
test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
+# if XAUTHLOCALHOSTNAME is not set in systemd user session, starting of xfce4-notifyd etc. will fail
+if systemctl --user list-jobs >/dev/null 2>&1; then # user session is running
+ dbus-update-activation-environment --systemd XAUTHLOCALHOSTNAME=$XAUTHLOCALHOSTNAME
+fi
# check if we start xfce4-session with ck-launch-session. this is only
# required for starting from a console, not a login manager
if test "x$XFCE4_SESSION_WITH_CK" = "x1"; then

6
xfce4-session.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Dec 30 13:15:51 UTC 2017 - seife+obs@b1-systems.com
- add xfce4-session-systemd-user-addons.patch to fix systemd-user
services by exporting XAUTHLOCALHOSTNAME
-------------------------------------------------------------------
Mon Dec 18 14:51:34 UTC 2017 - crrodriguez@opensuse.org

3
xfce4-session.spec
View File

@ -32,6 +32,8 @@ Patch0: xfce4-session-simple-splash-remove-shadows.patch
Patch1: xfce4-session-adapt-session-scripts.patch
# PATCH-FIX-UPSTREAM xfce4-session-Make-verbose-logging-conditional.patch boo#999676
Patch2: xfce4-session-Make-verbose-logging-conditional.patch
# PATCH-FIX-OPENSUSE xfce4-session-systemd-user-addons.patch seife+dev@b1-systems.com -- fix systemd-user session settings
Patch3: xfce4-session-systemd-user-addons.patch
BuildRequires: iceauth
BuildRequires: intltool
BuildRequires: update-desktop-files
@ -117,6 +119,7 @@ This package provides the upstream look and feel for the Xfce Session Manager.
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
xdt-autogen