diff options
Diffstat (limited to 'system/sddm/xsession.patch')
| -rw-r--r-- | system/sddm/xsession.patch | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/system/sddm/xsession.patch b/system/sddm/xsession.patch index 5bef451944..457ba85ed0 100644 --- a/system/sddm/xsession.patch +++ b/system/sddm/xsession.patch @@ -1,22 +1,25 @@ diff -Naur a/data/scripts/Xsession b/data/scripts/Xsession ---- a/data/scripts/Xsession 2017-11-03 11:49:19.374409491 +0000 -+++ b/data/scripts/Xsession 2017-11-03 11:50:17.807893273 +0000 -@@ -67,7 +67,6 @@ +--- a/data/scripts/Xsession 2018-07-18 11:31:40.000000000 +0100 ++++ b/data/scripts/Xsession 2018-08-07 20:06:16.937412206 +0100 +@@ -68,6 +68,7 @@ # by the scripts to work xsessionddir="/etc/X11/Xsession.d" OPTIONFILE=/etc/X11/Xsession.options --USERXSESSION=$HOME/.xsession ++# This seems to break with some WMs + USERXSESSION=$HOME/.xsession USERXSESSIONRC=$HOME/.xsessionrc ALTUSERXSESSION=$HOME/.Xsession - -@@ -90,10 +89,6 @@ +@@ -91,9 +92,10 @@ fi [ -f $HOME/.Xresources ] && xrdb -merge $HOME/.Xresources -if [ -f "$USERXSESSION" ]; then - . "$USERXSESSION" -fi -- - if [ -z "$@" ]; then ++# This seems to break with some WMs ++#if [ -f "$USERXSESSION" ]; then ++# . "$USERXSESSION" ++#fi + + if [ -z "$*" ]; then exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." - else |