[arch-commits] Commit in gnome-session/repos (4 files)

[Jan de Groot]

    Date: Saturday, October 25, 2008 @ 06:17:25
  Author: jgc
Revision: 17129

Merged revisions 17128 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/gnome-session/trunk

........
  r17128 | jgc | 2008-10-25 12:17:08 +0200 (Sat, 25 Oct 2008) | 1 line
  
  upgpkg: gnome-session 2.24.1-1
........

Modified:
  gnome-session/repos/extra-i686/	(properties)
  gnome-session/repos/extra-i686/PKGBUILD
  gnome-session/repos/extra-i686/gnome-session.sh
Deleted:
  gnome-session/repos/extra-i686/bgo554202.patch

------------------+
 PKGBUILD         |   13 +++++--------
 bgo554202.patch  |   38 --------------------------------------
 gnome-session.sh |    6 ++++--
 3 files changed, 9 insertions(+), 48 deletions(-)


Property changes on: gnome-session/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /gnome-session/trunk:1-16547
   + /gnome-session/trunk:1-17128

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-10-25 10:17:08 UTC (rev 17128)
+++ extra-i686/PKGBUILD	2008-10-25 10:17:25 UTC (rev 17129)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-session
-pkgver=2.24.0
-pkgrel=2
+pkgver=2.24.1
+pkgrel=1
 pkgdesc="The GNOME Session Handler"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
@@ -14,15 +14,12 @@
 url="http://www.gnome.org"
 groups=('gnome')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2
-	gnome-session.sh
-	bgo554202.patch)
-md5sums=('2f586c2829430937fb2d18b4b8478bad'
-         '7c6aa6eef09e4f7ece9aaad45c08add0'
-         '65e7781b8bb69c795ef8cf70a61ce3cc')
+	gnome-session.sh)
+md5sums=('5bf6f5753eab034638aee80d993801d2'
+         '06f84ea99c2c1c686756bf7aac33661a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/bgo554202.patch" || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
 	      --with-at-spi-registryd-directory=/usr/lib/at-spi || return 1
   make || return 1

Deleted: extra-i686/bgo554202.patch
===================================================================
--- extra-i686/bgo554202.patch	2008-10-25 10:17:08 UTC (rev 17128)
+++ extra-i686/bgo554202.patch	2008-10-25 10:17:25 UTC (rev 17129)
@@ -1,38 +0,0 @@
---- trunk/tools/gnome-session-save.c	2008/09/01 16:49:20	5029
-+++ trunk/tools/gnome-session-save.c	2008/09/29 15:16:06	5128
-@@ -45,7 +45,7 @@
- 
- /* True if killing. This is deprecated, but we keep it for compatibility
-  * reasons. */
--static gboolean kill = FALSE;
-+static gboolean kill_session = FALSE;
- 
- /* The real options that should be used now. They are not ambiguous. */
- static gboolean logout = FALSE;
-@@ -67,7 +67,7 @@
-         {"force-logout", '\0', 0, G_OPTION_ARG_NONE, &force_logout, N_("Log out, ignoring any existing inhibitors"), NULL},
-         {"logout-dialog", '\0', 0, G_OPTION_ARG_NONE, &logout_dialog, N_("Show logout dialog"), NULL},
-         {"shutdown-dialog", '\0', 0, G_OPTION_ARG_NONE, &shutdown_dialog, N_("Show shutdown dialog"), NULL},
--        {"kill", '\0', 0, G_OPTION_ARG_NONE, &kill, N_("Kill session"), NULL},
-+        {"kill", '\0', 0, G_OPTION_ARG_NONE, &kill_session, N_("Kill session"), NULL},
-         {"gui",  '\0', 0, G_OPTION_ARG_NONE, &show_error_dialogs, N_("Use dialog boxes for errors"), NULL},
-         {"silent", '\0', 0, G_OPTION_ARG_NONE, &no_interaction, N_("Do not require confirmation"), NULL},
-         {NULL}
-@@ -259,7 +259,7 @@
-         }
- 
-         conflicting_options = 0;
--        if (kill)
-+        if (kill_session)
-                 conflicting_options++;
-         if (logout)
-                 conflicting_options++;
-@@ -272,7 +272,7 @@
-         if (conflicting_options > 1)
-                 display_error (_("Program called with conflicting options"));
- 
--        if (kill) {
-+        if (kill_session) {
-                 if (no_interaction)
-                         logout = TRUE;
-                 else

Modified: extra-i686/gnome-session.sh
===================================================================
--- extra-i686/gnome-session.sh	2008-10-25 10:17:08 UTC (rev 17128)
+++ extra-i686/gnome-session.sh	2008-10-25 10:17:25 UTC (rev 17129)
@@ -1,3 +1,5 @@
 #!/bin/sh
-. /etc/X11/xinit/xinitrc.d/30-dbus
-exec /usr/lib/gnome-session/gnome-session
+if [ -n "${DISPLAY}" ]; then
+  . /etc/X11/xinit/xinitrc.d/30-dbus
+fi
+exec /usr/lib/gnome-session/gnome-session $@