| 1 |
commit: f35a07ec72e72b4220a941d1442b6d81606a7a0d |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 28 13:05:46 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 28 13:05:54 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f35a07ec |
| 7 |
|
| 8 |
x11-misc/sddm: rebase consolekit patch |
| 9 |
|
| 10 |
Gentoo-bug: 595658 |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.2 |
| 13 |
|
| 14 |
x11-misc/sddm/files/sddm-9999-consolekit.patch | 18 ++++++++---------- |
| 15 |
1 file changed, 8 insertions(+), 10 deletions(-) |
| 16 |
|
| 17 |
diff --git a/x11-misc/sddm/files/sddm-9999-consolekit.patch b/x11-misc/sddm/files/sddm-9999-consolekit.patch |
| 18 |
index acdfdc1..692ee17 100644 |
| 19 |
--- a/x11-misc/sddm/files/sddm-9999-consolekit.patch |
| 20 |
+++ b/x11-misc/sddm/files/sddm-9999-consolekit.patch |
| 21 |
@@ -1,13 +1,11 @@ |
| 22 |
diff --git a/data/scripts/Xsession b/data/scripts/Xsession |
| 23 |
-index a5d270d..4b48524 100755 |
| 24 |
+index 0c923a8..eae4f28 100755 |
| 25 |
--- a/data/scripts/Xsession |
| 26 |
+++ b/data/scripts/Xsession |
| 27 |
-@@ -74,7 +74,7 @@ case $session in |
| 28 |
- exec xterm -geometry 80x24-0-0 |
| 29 |
- ;; |
| 30 |
- *) |
| 31 |
-- eval exec "$session" |
| 32 |
-+ eval exec ck-launch-session "$session" |
| 33 |
- ;; |
| 34 |
- esac |
| 35 |
- exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop." |
| 36 |
+@@ -91,5 +91,5 @@ fi |
| 37 |
+ if [ -z "$@" ]; then |
| 38 |
+ exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." |
| 39 |
+ else |
| 40 |
+- exec $@ |
| 41 |
++ exec ck-launch-session $@ |
| 42 |
+ fi |
Archives