gnome-vfs 2.24.4

3 files changed, 45 insertions, 63 deletions

diff --git a/abs/extra/gnome-vfs/PKGBUILD b/abs/extra/gnome-vfs/PKGBUILD
index 5d52b94..dae1cfe 100644
--- a/abs/extra/gnome-vfs/PKGBUILD
+++ b/abs/extra/gnome-vfs/PKGBUILD
@@ -1,34 +1,30 @@
-# $Id: PKGBUILD 92007 2010-09-28 16:42:58Z ibiru $
+# $Id: PKGBUILD 136438 2011-08-29 09:40:33Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-vfs
 pkgver=2.24.4
-pkgrel=1
+pkgrel=6
 pkgdesc="The GNOME Virtual File System"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 license=('LGPL')
-depends=('fam' 'gconf>=2.32.0' 'hal>=0.5.13' 'bzip2' 'avahi>=0.6.27' 'smbclient>=3.5.5' 'gnome-mime-data>=2.18.0-2' 'heimdal>=1.3.3' 'gnutls>=2.8.6')
+depends=('gconf' 'bzip2' 'avahi' 'smbclient' 'gnome-mime-data' 'krb5' 'gnutls' 'libgcrypt')
 makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gnome-common')
-options=('!libtool' '!emptydirs' '!makeflags')
-conflicts=(gnome-vfs-samba)
-provides=(gnome-vfs-samba)
-replaces=(gnome-vfs-samba gnome-vfs-extras)
+options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gnome-vfs.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/gnome-vfs-${pkgver}.tar.bz2
-        hal-show-volume-names.patch
-        gnutls-config.patch)
+        gnutls-config.patch
+        gcrypt-config.patch)
 sha256sums=('62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa'
-            'b38b86d6c966dcf64f9140d800aebe8a14845bb8ce7c045f52d4df483cacd23b'
-            '66c7cfb12995c0dd94a2caea95c7e3c55981993f05a79c585d60915ff131955d')
+            '66c7cfb12995c0dd94a2caea95c7e3c55981993f05a79c585d60915ff131955d'
+            'c059e218f310da683778919d36e7862f7e763384805f6453d328fbaf507a8114')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  #Archlinux patch (b.g.o #321498)
-  patch -Np1 -i "${srcdir}/hal-show-volume-names.patch"
-
   #Fix build with new gnutls
   patch -Np1 -i "${srcdir}/gnutls-config.patch"
+  #fix build with new libgcrypt >= 1.5.0
+  patch -Np1 -i "${srcdir}/gcrypt-config.patch"
   libtoolize --force
   gtkdocize
   aclocal
@@ -37,16 +33,17 @@ build() {
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/gnome-vfs-2.0 \
-      --enable-samba --enable-hal \
+      --enable-samba --disable-hal \
       --enable-avahi --disable-howl \
       --disable-openssl --enable-gnutls
   make
 }
+
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
 
   install -d -m755 "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-vfs-2.0 ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-vfs-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas
   rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }
diff --git a/abs/extra/gnome-vfs/gcrypt-config.patch b/abs/extra/gnome-vfs/gcrypt-config.patch
new file mode 100644
index 0000000..8ce9187
--- /dev/null
+++ b/abs/extra/gnome-vfs/gcrypt-config.patch
@@ -0,0 +1,31 @@
+# Allow gnome-vfs-2.24 to build with libgcrypt >= 1.5.0
+--- gnome-vfs-2.24.4/configure.in	2010-07-01 12:36:09.000000000 -0300
++++ gnome-vfs-2.24.4-libgcrypt//configure.in	2011-07-22 15:55:02.296325640 -0300
+@@ -689,6 +689,16 @@
+ AM_CONDITIONAL(HAVE_SSL, test x$have_ssl = xtrue)
+
+ dnl ****************************
++dnl LibGCrypt 1.5.0
++dnl ****************************
++
++AM_PATH_LIBGCRYPT(1.5.0)
++
++if test "x${LIBGCRYPT_LIBS}" = "x"; then
++	AC_MSG_ERROR([unable to find libgcrypt])
++fi
++
++dnl ****************************
+ dnl DNS-SD implementations
+ dnl ****************************
+ AM_CONDITIONAL(HAVE_AVAHI, false)
+@@ -1045,8 +1055,8 @@
+ dnl ==============================================================================
+
+ PKG_CHECK_MODULES(LIBGNOMEVFS, glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement)
+-LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS"
+-LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS"
++LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS $LIBGCRYPT_CFLAGS"
++LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS  $LIBGCRYPT_LIBS"
+ AC_SUBST(LIBGNOMEVFS_CFLAGS)
+ AC_SUBST(LIBGNOMEVFS_LIBS)
+
diff --git a/abs/extra/gnome-vfs/hal-show-volume-names.patch b/abs/extra/gnome-vfs/hal-show-volume-names.patch
deleted file mode 100644
index 5b8420c..0000000
--- a/abs/extra/gnome-vfs/hal-show-volume-names.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Index: gnome-vfs-hal-mounts.c
-===================================================================
-RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-hal-mounts.c,v
-retrieving revision 1.33
-diff -u -p -r1.33 gnome-vfs-hal-mounts.c
---- gnome-vfs/libgnomevfs/gnome-vfs-hal-mounts.c	7 Jul 2006 15:56:57 -0000	1.33
-+++ gnome-vfs/libgnomevfs/gnome-vfs-hal-mounts.c	14 Jul 2006 18:48:51 -0000
-@@ -877,6 +877,7 @@ _hal_add_volume (GnomeVFSVolumeMonitorDa
- 	GnomeVFSDrive *drive;
- 	GnomeVFSVolumeMonitor *volume_monitor;
- 	char *name;
-+  char *icon;
- 	gboolean allowed_by_policy;
- 	const char *backing_udi;
- 
-@@ -975,6 +976,8 @@ _hal_add_volume (GnomeVFSVolumeMonitorDa
- 	 */
- 	drive = _gnome_vfs_volume_monitor_find_drive_by_hal_udi (volume_monitor, libhal_volume_get_udi (hal_volume));
- 	if (drive == NULL && allowed_by_policy) {
-+    name = _hal_drive_policy_get_display_name (volume_monitor_daemon, hal_drive, hal_volume);
-+    icon = _hal_drive_policy_get_icon (volume_monitor_daemon, hal_drive, hal_volume);
- 		drive = g_object_new (GNOME_VFS_TYPE_DRIVE, NULL);
- 		if (libhal_volume_disc_has_audio (hal_volume)) {
- 			drive->priv->activation_uri = g_strdup_printf ("cdda://%s", 
-@@ -989,16 +992,16 @@ _hal_add_volume (GnomeVFSVolumeMonitorDa
- 			 * So just set it to the empty string
- 			 */
- 			drive->priv->activation_uri = g_strdup ("");
-+      g_free (name);
-+      name = _hal_volume_policy_get_display_name (volume_monitor_daemon, hal_drive, hal_volume);
-+      g_free (icon);
-+      icon = _hal_volume_policy_get_icon (volume_monitor_daemon, hal_drive, hal_volume);
- 		}
- 		drive->priv->is_connected = TRUE;
- 		drive->priv->device_path = g_strdup (libhal_volume_get_device_file (hal_volume));
- 		drive->priv->device_type = _hal_get_gnome_vfs_device_type (hal_drive);
- 	
--		/* TODO: could add an icon of a drive with media in it since this codepath only
--		 * handles drives with media in them
--		 */
--		drive->priv->icon = _hal_drive_policy_get_icon (volume_monitor_daemon, hal_drive, NULL);
--		name = _hal_drive_policy_get_display_name (volume_monitor_daemon, hal_drive, hal_volume);
-+    drive->priv->icon = icon;
- 		drive->priv->display_name = _gnome_vfs_volume_monitor_uniquify_drive_name (volume_monitor, name);
- 		g_free (name);
- 		name = g_utf8_casefold (drive->priv->display_name, -1);