Date: Friday, April 15, 2011 @ 03:50:36
Author: jgc
Revision: 119776
upgpkg: gnome-vfs 2.24.4-2
Remove hal backend
Modified:
gnome-vfs/trunk/PKGBUILD
Deleted:
gnome-vfs/trunk/hal-show-volume-names.patch
-----------------------------+
PKGBUILD | 13 +++--------
hal-show-volume-names.patch | 46 ------------------------------------------
2 files changed, 4 insertions(+), 55 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-04-15 07:32:51 UTC (rev 119775)
+++ PKGBUILD 2011-04-15 07:50:36 UTC (rev 119776)
@@ -3,11 +3,11 @@
pkgname=gnome-vfs
pkgver=2.24.4
-pkgrel=1
+pkgrel=2
pkgdesc="The GNOME Virtual File System"
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=('fam' 'gconf' 'bzip2' 'avahi' 'smbclient' 'gnome-mime-data' 'heimdal'
'gnutls')
makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gnome-common')
options=('!libtool' '!emptydirs' '!makeflags')
conflicts=(gnome-vfs-samba)
@@ -16,17 +16,12 @@
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)
sha256sums=('62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa'
- 'b38b86d6c966dcf64f9140d800aebe8a14845bb8ce7c045f52d4df483cacd23b'
'66c7cfb12995c0dd94a2caea95c7e3c55981993f05a79c585d60915ff131955d')
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"
libtoolize --force
@@ -37,13 +32,13 @@
./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
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
}
Deleted: hal-show-volume-names.patch
===================================================================
--- hal-show-volume-names.patch 2011-04-15 07:32:51 UTC (rev 119775)
+++ hal-show-volume-names.patch 2011-04-15 07:50:36 UTC (rev 119776)
@@ -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);
