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

[Jan de Groot]

    Date: Thursday, April 24, 2008 @ 17:27:56
  Author: jgc
Revision: 923

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

........
  r111 | jgc | 2008-04-10 20:14:26 +0000 (Thu, 10 Apr 2008) | 2 lines
  
  upgpkg: gnome-session 2.22.1.1-1
      Remove old patch that is no longer needed with newer versions of dbus
........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........

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

----------------+
 PKGBUILD       |    8 +++-----
 gsm-dbus.patch |   52 ----------------------------------------------------
 2 files changed, 3 insertions(+), 57 deletions(-)


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

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-04-24 21:21:27 UTC (rev 922)
+++ extra-i686/PKGBUILD	2008-04-24 21:27:56 UTC (rev 923)
@@ -2,26 +2,24 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-session
-pkgver=2.22.0
+pkgver=2.22.1.1
 pkgrel=1
 pkgdesc="The GNOME Session Handler"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
-depends=('tcp_wrappers' 'libgnomeui>=2.22.01' 'gnome-settings-daemon>=2.22.0' 'at-spi>=1.22.0')
+depends=('tcp_wrappers' 'libgnomeui>=2.22.1' 'gnome-settings-daemon>=2.22.1' 'at-spi>=1.22.1')
 makedepends=('perlxml' 'pkgconfig')
 options=(!emptydirs)
 install=gnome-session.install
 url="http://www.gnome.org"
 groups=('gnome')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.22/${pkgname}-${pkgver}.tar.bz2
-	gsm-dbus.patch
 	gnome.desktop)
-md5sums=('5f9531565c5ec08104c3518c72c79f42' '80f38a9a76938d08e6437fea24c841b3'
+md5sums=('6e1e975efb0c717b09821ed4231eb584'
 	 '152cddde06e16f16641746467f7ff965')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np1 -i ${startdir}/src/gsm-dbus.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
 	      --with-reboot-command=reboot --with-halt-command=halt \
 	      --with-rsh-command=ssh \

Deleted: extra-i686/gsm-dbus.patch
===================================================================
--- extra-i686/gsm-dbus.patch	2008-04-24 21:21:27 UTC (rev 922)
+++ extra-i686/gsm-dbus.patch	2008-04-24 21:27:56 UTC (rev 923)
@@ -1,52 +0,0 @@
---- gnome-session-2.18.0/gnome-session/gsm-dbus.c	2007-03-12 19:48:31.000000000 +0100
-+++ gnome-session-2.16.2/gnome-session/gsm-dbus.c	2007-03-24 23:22:17.000000000 +0100
-@@ -25,7 +25,6 @@
- #include <sys/wait.h>
- 
- #include <errno.h>
--#include <fcntl.h>
- #include <limits.h>
- #include <signal.h>
- #include <stdlib.h>
-@@ -195,9 +194,6 @@
-   do
-     {
-       ssize_t i, result;
--      ssize_t oldbytes;
--
--      oldbytes = bytes;
- 
-       result = read (fd, &buf[bytes], bufsize - bytes);
-       if (result < 0)
-@@ -212,12 +208,11 @@
-       else
-         done = TRUE;
- 
--      for (i = oldbytes; !discard && i < bytes; i++)
-+      for (i = 0; !discard && i < bytes; i++)
-         if (buf[i] == '\n')
-           {
-             buf[i] = '\0';
-             discard = TRUE;
--	    done = TRUE;
-           }
-     }
-   while (!done);
-@@ -247,7 +242,7 @@
-     {
-       if (fd != STDIN_FILENO && fd != STDOUT_FILENO && fd != STDERR_FILENO &&
-           fd != address_fd && fd != pid_fd)
--        fcntl (fd, F_SETFD, FD_CLOEXEC);
-+        close (fd);
-     }
- 
-   g_snprintf (address_str, sizeof (address_str), "%d", address_fd);
-@@ -344,7 +339,7 @@
-    * strtoul dance to check for a valid number.
-    */
-   errno = 0;
--  tmp_num = strtoul (pid_str, &tmp_ep, 10);
-+  tmp_num = strtoul(pid_str, &tmp_ep, 10);
-   if (pid_str[0] == '\0' || *tmp_ep != '\0')
-     {
-       g_printerr ("dbus-daemon pid invalid (not a number)\n");