Update to 3.12.0

[packages/gdm.git] / shell-check.patch

diff --git a/shell-check.patch b/shell-check.patch
index f3ac9cf9afe01a4b331515c4aeb6235859435249..9d849837aafc603953485d6ddd73531da5a6682b 100644 (file)
--- a/shell-check.patch
+++ b/shell-check.patch
@@ -1,26 +1,9 @@
-From 64e6b10f98fe7226a2f41807268dae3afa80236d Mon Sep 17 00:00:00 2001
-From: György Balló <ballogy@freestart.hu>
-Date: Fri, 30 Sep 2011 21:48:40 +0000
-Subject: data: add back check for gnome-shell before running gdm-shell session
-
-Add back commit 4892c9447324f2248ce944f150abe3143f78eaa3
-
-This commit does a quick check to make sure gnome-shell is
-installed, and supports --gdm-mode. If either of those fail,
-then fall back to the old greeter.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=660409
----
-diff --git a/data/gdm-shell.session.in b/data/gdm-shell.session.in
-index 3d408c3..496cc10 100644
---- a/data/gdm-shell.session.in
-+++ b/data/gdm-shell.session.in
+--- gdm-3.8.0/data/gdm-shell-with-fallback.session.in.wiget    2013-03-27 21:51:33.323698132 +0100
++++ gdm-3.8.0/data/gdm-shell-with-fallback.session.in  2013-03-27 21:52:51.497070438 +0100
 @@ -1,5 +1,5 @@
  [GNOME Session]
  Name=Display Manager
  RequiredComponents=gnome-shell;gnome-settings-daemon;
--IsRunnableHelper=@libexecdir@/gnome-session-check-accelerated
-+IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated'
+-IsRunnableHelper=bash -c 'type -p gnome-shell >& /dev/null && @CHECK_ACCELERATED_DIR@/gnome-session-check-accelerated'
++IsRunnableHelper=/bin/sh -c 'type -p gnome-shell 2>&1 >/dev/null && @CHECK_ACCELERATED_DIR@/gnome-session-check-accelerated'
  FallbackSession=gdm-fallback
---
-cgit v0.9.0.2