aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2016-10-29 00:05:46 +1100
committerMichael Palimaka <kensington@gentoo.org>2016-10-29 00:05:54 +1100
commitf35a07ec72e72b4220a941d1442b6d81606a7a0d (patch)
treeec3f31d3240fed7aa7f612bc998479d5b716b693 /x11-misc/sddm
parentapp-emulation/q4wine: sync with main tree (diff)
downloadqt-f35a07ec72e72b4220a941d1442b6d81606a7a0d.tar.gz
qt-f35a07ec72e72b4220a941d1442b6d81606a7a0d.tar.bz2
qt-f35a07ec72e72b4220a941d1442b6d81606a7a0d.zip
x11-misc/sddm: rebase consolekit patch
Gentoo-bug: 595658 Package-Manager: portage-2.3.2
Diffstat (limited to 'x11-misc/sddm')
-rw-r--r--x11-misc/sddm/files/sddm-9999-consolekit.patch18
1 files changed, 8 insertions, 10 deletions
diff --git a/x11-misc/sddm/files/sddm-9999-consolekit.patch b/x11-misc/sddm/files/sddm-9999-consolekit.patch
index acdfdc1a..692ee174 100644
--- a/x11-misc/sddm/files/sddm-9999-consolekit.patch
+++ b/x11-misc/sddm/files/sddm-9999-consolekit.patch
@@ -1,13 +1,11 @@
diff --git a/data/scripts/Xsession b/data/scripts/Xsession
-index a5d270d..4b48524 100755
+index 0c923a8..eae4f28 100755
--- a/data/scripts/Xsession
+++ b/data/scripts/Xsession
-@@ -74,7 +74,7 @@ case $session in
- exec xterm -geometry 80x24-0-0
- ;;
- *)
-- eval exec "$session"
-+ eval exec ck-launch-session "$session"
- ;;
- esac
- exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop."
+@@ -91,5 +91,5 @@ fi
+ if [ -z "$@" ]; then
+ exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
+ else
+- exec $@
++ exec ck-launch-session $@
+ fi