[arch-commits] Commit in gdm/trunk (2 files)

[Ionut Biru]

    Date: Thursday, April 29, 2010 @ 18:52:16
  Author: ibiru
Revision: 79019

proper set path to at-spi-registryd

Modified:
  gdm/trunk/04_fix_external_program_directories.patch
  gdm/trunk/PKGBUILD

-------------------------------------------+
 04_fix_external_program_directories.patch |   28 ++++++++--------------------
 PKGBUILD                                  |    3 ++-
 2 files changed, 10 insertions(+), 21 deletions(-)

Modified: 04_fix_external_program_directories.patch
===================================================================
--- 04_fix_external_program_directories.patch	2010-04-29 22:49:10 UTC (rev 79018)
+++ 04_fix_external_program_directories.patch	2010-04-29 22:52:16 UTC (rev 79019)
@@ -1,5 +1,5 @@
-diff -Nur gdm-2.30.2.orig//daemon/gdm-server.c gdm-2.30.2/daemon/gdm-server.c
---- gdm-2.30.2.orig//daemon/gdm-server.c	2010-04-26 20:08:42.000000000 +0300
+diff -Nur gdm-2.30.2.orig/daemon/gdm-server.c gdm-2.30.2/daemon/gdm-server.c
+--- gdm-2.30.2.orig/daemon/gdm-server.c	2010-04-26 20:08:42.000000000 +0300
 +++ gdm-2.30.2/daemon/gdm-server.c	2010-04-29 22:55:49.631648355 +0300
 @@ -127,7 +127,7 @@
          g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
@@ -10,20 +10,8 @@
                                     server->priv->display_name);
  
          g_debug ("GdmServer: Running helper %s", command);
-diff -Nur gdm-2.30.2.orig//data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in gdm-2.30.2/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in
---- gdm-2.30.2.orig//data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in	2010-03-26 15:28:03.000000000 +0200
-+++ gdm-2.30.2/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in	2010-04-29 23:26:16.987951899 +0300
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- Type=Application
- _Name=AT SPI Registry Wrapper
--Exec=@AT_SPI_REGISTRYD_DIR@/at-spi-registryd
-+Exec=/usr/lib/at-spi/at-spi-registryd
- OnlyShowIn=GNOME;
- AutostartCondition=GNOME /desktop/gnome/interface/accessibility
- X-GNOME-Autostart-Phase=Initialization
-diff -Nur gdm-2.30.2.orig//data/greeter-autostart/gnome-settings-daemon.desktop.in.in gdm-2.30.2/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
---- gdm-2.30.2.orig//data/greeter-autostart/gnome-settings-daemon.desktop.in.in	2010-03-17 23:27:16.000000000 +0200
+diff -Nur gdm-2.30.2.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in gdm-2.30.2/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
+--- gdm-2.30.2.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in	2010-03-17 23:27:16.000000000 +0200
 +++ gdm-2.30.2/data/greeter-autostart/gnome-settings-daemon.desktop.in.in	2010-04-29 22:53:54.984878068 +0300
 @@ -1,8 +1,8 @@
  [Desktop Entry]
@@ -36,8 +24,8 @@
  OnlyShowIn=GNOME;
  X-GNOME-Autostart-Phase=Initialization
  X-GNOME-Autostart-Notify=true
-diff -Nur gdm-2.30.2.orig//data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in gdm-2.30.2/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in
---- gdm-2.30.2.orig//data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in	2010-03-26 15:28:03.000000000 +0200
+diff -Nur gdm-2.30.2.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in gdm-2.30.2/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in
+--- gdm-2.30.2.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in	2010-03-26 15:28:03.000000000 +0200
 +++ gdm-2.30.2/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in	2010-04-29 22:54:24.638396328 +0300
 @@ -1,5 +1,5 @@
  [Desktop Entry]
@@ -46,8 +34,8 @@
 -Exec=@LIBEXECDIR@/polkit-gnome-authentication-agent-1
 +Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
  OnlyShowIn=GNOME;
-diff -Nur gdm-2.30.2.orig//gui/simple-chooser/gdm-chooser-session.c gdm-2.30.2/gui/simple-chooser/gdm-chooser-session.c
---- gdm-2.30.2.orig//gui/simple-chooser/gdm-chooser-session.c	2010-03-17 23:27:16.000000000 +0200
+diff -Nur gdm-2.30.2.orig/gui/simple-chooser/gdm-chooser-session.c gdm-2.30.2/gui/simple-chooser/gdm-chooser-session.c
+--- gdm-2.30.2.orig/gui/simple-chooser/gdm-chooser-session.c	2010-03-17 23:27:16.000000000 +0200
 +++ gdm-2.30.2/gui/simple-chooser/gdm-chooser-session.c	2010-04-29 22:57:08.691626507 +0300
 @@ -131,7 +131,7 @@
          ret = FALSE;

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-29 22:49:10 UTC (rev 79018)
+++ PKGBUILD	2010-04-29 22:52:16 UTC (rev 79019)
@@ -22,7 +22,7 @@
         gdm-autologin.pam
         gdm)
 sha256sums=('884f4816a78f8f1eece8f1468f19dc01c5350d4a3513d3c0e854f45f870c1ec5'
-            '3e4f4c77441ecb3edfdd063c91187291e4b8cbfca6b4b4764e51000fe969d713'
+            'cb585c39c6671387b5a25f21a99c97e3a20eaf4188fea1b62871681a1ebf8bff'
             'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
             '3daff680ff6b7ea56f84f40843e46e72477c81e9e405028203c942af04d07ae5'
             '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550')
@@ -32,6 +32,7 @@
   patch -Np1 -i "${srcdir}/04_fix_external_program_directories.patch" || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gdm --localstatedir=/var --disable-static \
+      --with-at-spi-registryd-directory=/usr/lib/at-spi \
       --disable-scrollkeeper || return 1
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1