[arch-commits] CVS update of extra/gnome/gnome-volume-manager (3 files)

Jan de Groot jgc at archlinux.org
Sun Mar 16 15:22:57 UTC 2008 

    Date: Sunday, March 16, 2008 @ 11:22:57
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-volume-manager

Modified: PKGBUILD (1.23 -> 1.24) gnome-volume-manager.install (1.8 -> 1.9)
          gvm-check-local.patch (1.1 -> 1.2)

upgpkg: gnome-volume-manager 2.22.1-1
    GNOME 2.22


------------------------------+
 PKGBUILD                     |   27 ++++++++++++++-------------
 gnome-volume-manager.install |   19 ++-----------------
 gvm-check-local.patch        |   21 ++++++++++++---------
 3 files changed, 28 insertions(+), 39 deletions(-)


Index: extra/gnome/gnome-volume-manager/PKGBUILD
diff -u extra/gnome/gnome-volume-manager/PKGBUILD:1.23 extra/gnome/gnome-volume-manager/PKGBUILD:1.24
--- extra/gnome/gnome-volume-manager/PKGBUILD:1.23	Sun Sep 23 14:40:17 2007
+++ extra/gnome/gnome-volume-manager/PKGBUILD	Sun Mar 16 11:22:57 2008
@@ -1,35 +1,36 @@
-# $Id: PKGBUILD,v 1.23 2007/09/23 18:40:17 jgc Exp $
+# $Id: PKGBUILD,v 1.24 2008/03/16 15:22:57 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Link Dupont <link at subpop.net>
 
 pkgname=gnome-volume-manager
-pkgver=2.17.0
-pkgrel=3
+pkgver=2.22.1
+pkgrel=1
 pkgdesc="GNOME daemon to auto-mount and manage media devices"
 arch=(i686 x86_64)
 license=('GPL')
 url=http://www.gnome.org/
-depends=('libgnomeui>=2.20.0' 'libnotify>=0.4.4' 'gnome-mount>=0.6')
-makedepends=('nautilus>=2.20.0' 'perlxml' 'pkgconfig')
+depends=('libgnomeui>=2.22.01' 'libnotify>=0.4.4' 'gnome-mount>=0.7')
+makedepends=('nautilus>=2.22.0' 'perlxml' 'pkgconfig')
 install=gnome-volume-manager.install
-groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.17/${pkgname}-${pkgver}.tar.bz2
+groups=('gnome')
+options=(!emptydirs)
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.22/${pkgname}-${pkgver}.tar.bz2
 	gvm-mount-async.patch
 	gvm-check-local.patch)
-md5sums=('104cec26e721e0bba69debd392367195'
+md5sums=('a0cb86f541515f33443c848879d04785'
          '534b8b9633148bd975b2b9b518c41fb4'
-         'cb45810b2adb95d39e1272470f10a21a')
+         '0171374e6bfda523c09a7dbfc1ec0c11')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
   patch -Np0 -i ${startdir}/src/gvm-mount-async.patch || return 1
   patch -Np0 -i ${startdir}/src/gvm-check-local.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var
+              --localstatedir=/var || return 1
   make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
 
-  mkdir -p ${startdir}/pkg/usr/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  install -m755 -d ${startdir}/pkg/usr/share/gconf/schemas
+  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
   rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
 }
Index: extra/gnome/gnome-volume-manager/gnome-volume-manager.install
diff -u extra/gnome/gnome-volume-manager/gnome-volume-manager.install:1.8 extra/gnome/gnome-volume-manager/gnome-volume-manager.install:1.9
--- extra/gnome/gnome-volume-manager/gnome-volume-manager.install:1.8	Sun Apr 22 12:12:32 2007
+++ extra/gnome/gnome-volume-manager/gnome-volume-manager.install	Sun Mar 16 11:22:57 2008
@@ -1,8 +1,7 @@
 pkgname=gnome-volume-manager
 
 post_install() {
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
+  usr/sbin/gconfpkg --install ${pkgname}
 }
 
 pre_upgrade() {
@@ -14,19 +13,5 @@
 }
 
 pre_remove() {
-  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=(usr/share/gconf/schemas/${pkgname}.schemas)
-  elif [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=(opt/gnome/share/gconf/schemas/${pkgname}.schemas)
-  else
-    schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
-  fi
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  
-  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  usr/sbin/gconfpkg --uninstall ${pkgname}
 }
-
-op=$1
-shift
-
-$op $*
Index: extra/gnome/gnome-volume-manager/gvm-check-local.patch
diff -u extra/gnome/gnome-volume-manager/gvm-check-local.patch:1.1 extra/gnome/gnome-volume-manager/gvm-check-local.patch:1.2
--- extra/gnome/gnome-volume-manager/gvm-check-local.patch:1.1	Sun Sep 23 14:40:17 2007
+++ extra/gnome/gnome-volume-manager/gvm-check-local.patch	Sun Mar 16 11:22:57 2008
@@ -1,10 +1,10 @@
---- src/manager.c.orig	2007-09-23 18:07:07.000000000 +0000
-+++ src/manager.c	2007-09-23 18:26:48.000000000 +0000
-@@ -3177,55 +3177,9 @@
+--- src/manager.c.orig	2008-03-16 15:14:05.000000000 +0000
++++ src/manager.c	2008-03-16 15:16:03.000000000 +0000
+@@ -3637,58 +3637,9 @@
  static gboolean
- gvm_local_user (void)
+ gvm_user_is_local_fallback (void)
  {
--	static guint32 local = 0;
+-	static guint local = 0;
 -	struct dirent *dent;
 -	struct utmp *utmp;
 -	const char *user;
@@ -24,8 +24,11 @@
 -	
 -	/* this works for pam_console ($path/user) and pam_foreground ($path/user:vt) - see bug #336932 */
 -	while ((dent = readdir (dir))) {
--                if (!strncmp (user, dent->d_name, n) && dent->d_name[n] == '\0'
--		    || (dent->d_name[n] == ':' && ((vt = strtol (dent->d_name + n + 1, &vtend, 10)) >= 0) && *vtend == '\0')) {
+-                if (!strncmp (user, dent->d_name, n)
+-		    && (dent->d_name[n] == '\0'
+-			|| (dent->d_name[n] == ':'
+-			    && ((vt = strtol (dent->d_name + n + 1, &vtend, 10)) >= 0)
+-			    && *vtend == '\0'))) {
 -			local = LOCAL_USER_FOUND;
 -			break;
 -		}
@@ -43,7 +46,7 @@
 -				continue;
 -			
 -			/* only accept local X sessions or local tty's (user started X via `startx`) */
--			local = utmp->ut_line[0] == ':' && utmp->ut_line[1] >= '0' && utmp->ut_line[1] <= '9'
+-			local = (utmp->ut_line[0] == ':' && utmp->ut_line[1] >= '0' && utmp->ut_line[1] <= '9')
 -				|| !strncmp (utmp->ut_line, "tty", 3) ? LOCAL_USER_FOUND : 0;
 -		}
 -		
@@ -57,5 +60,5 @@
 +	display = g_getenv("DISPLAY");
 +	return (display != NULL && display[0] == ':');
  }
+ #endif /* __linux__ */
  
- /* checks that the user is at the local active X session */

More information about the arch-commits mailing list