[arch-commits] Commit in gdm/trunk (PKGBUILD fix_external_program_directories.patch)

[Ionut Biru]

    Date: Saturday, September 3, 2011 @ 05:52:30
  Author: ibiru
Revision: 136940

fix location for session check

Modified:
  gdm/trunk/PKGBUILD
  gdm/trunk/fix_external_program_directories.patch

----------------------------------------+
 PKGBUILD                               |    6 +++---
 fix_external_program_directories.patch |   14 ++++++++++++--
 2 files changed, 15 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-03 09:44:35 UTC (rev 136939)
+++ PKGBUILD	2011-09-03 09:52:30 UTC (rev 136940)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=gdm
 pkgver=3.1.90
-pkgrel=1
+pkgrel=2
 pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -11,7 +11,7 @@
 groups=('gnome-extra')
 options=('!libtool')
 depends=('libcanberra' 'libxklavier' 'gnome-session' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb' 'nss')
-makedepends=('intltool' 'gnome-doc-utils' 'xorg-server')
+makedepends=('intltool' 'gnome-doc-utils' 'xorg-server' 'gobject-introspection')
 install=gdm.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
         fix_external_program_directories.patch
@@ -19,7 +19,7 @@
         gdm-autologin.pam
         gdm)
 sha256sums=('3fb9c52b8a18f39539c53d84645b89836de25a3eb3a0b84388e76a4f988178bf'
-            'c02af756912f744a0b32c05f2b552fd425b4d30cf9f8fe22e04be8746c325fc0'
+            'b7c19ab68dc38216f751be6d1e66d617fb9011e23185590e52ac1974d3bc1afb'
             'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
             '3daff680ff6b7ea56f84f40843e46e72477c81e9e405028203c942af04d07ae5'
             '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550')

Modified: fix_external_program_directories.patch
===================================================================
--- fix_external_program_directories.patch	2011-09-03 09:44:35 UTC (rev 136939)
+++ fix_external_program_directories.patch	2011-09-03 09:52:30 UTC (rev 136940)
@@ -1,6 +1,6 @@
 diff -Nur gdm-3.1.90.orig/daemon/gdm-server.c gdm-3.1.90/daemon/gdm-server.c
 --- gdm-3.1.90.orig/daemon/gdm-server.c	2011-09-02 13:13:16.132989960 +0000
-+++ gdm-3.1.90/daemon/gdm-server.c	2011-09-02 13:18:17.495996840 +0000
++++ gdm-3.1.90/daemon/gdm-server.c	2011-09-03 08:00:30.007431483 +0000
 @@ -131,7 +131,7 @@
          g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
  
@@ -10,9 +10,19 @@
                                     server->priv->display_name);
  
          g_debug ("GdmServer: Running helper %s", command);
+diff -Nur gdm-3.1.90.orig/data/gdm-shell.session.in gdm-3.1.90/data/gdm-shell.session.in
+--- gdm-3.1.90.orig/data/gdm-shell.session.in	2011-09-02 13:13:16.136323327 +0000
++++ gdm-3.1.90/data/gdm-shell.session.in	2011-09-03 08:01:06.721067234 +0000
+@@ -1,5 +1,5 @@
+ [GNOME Session]
+ Name=Display Manager
+ RequiredComponents=gnome-shell;gnome-settings-daemon;
+-IsRunnableHelper=bash -c "gnome-shell --help | grep -q gdm-mode && (gnome-shell --version | grep -q '3.1.90$' && false || true) && (mutter --version | grep -q '3.1.90$' && false || true) && @libexecdir@/gnome-session-check-accelerated"
++IsRunnableHelper=bash -c "gnome-shell --help | grep -q gdm-mode && (gnome-shell --version | grep -q '3.1.90$' && false || true) && (mutter --version | grep -q '3.1.90$' && false || true) && /usr/lib/gnome-session/gnome-session-check-accelerated"
+ FallbackSession=gdm-fallback
 diff -Nur gdm-3.1.90.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.1.90/gui/simple-chooser/gdm-chooser-session.c
 --- gdm-3.1.90.orig/gui/simple-chooser/gdm-chooser-session.c	2011-09-02 13:13:16.136323327 +0000
-+++ gdm-3.1.90/gui/simple-chooser/gdm-chooser-session.c	2011-09-02 13:22:54.168703021 +0000
++++ gdm-3.1.90/gui/simple-chooser/gdm-chooser-session.c	2011-09-03 08:00:30.010764843 +0000
 @@ -131,7 +131,7 @@
          ret = FALSE;