diff options
Diffstat (limited to 'abs/extra-testing/gnome-vfs')
-rw-r--r-- | abs/extra-testing/gnome-vfs/PKGBUILD | 49 | ||||
-rw-r--r-- | abs/extra-testing/gnome-vfs/gnome-vfs.install | 17 | ||||
-rw-r--r-- | abs/extra-testing/gnome-vfs/gnutls-config.patch | 25 | ||||
-rw-r--r-- | abs/extra-testing/gnome-vfs/hal-show-volume-names.patch | 46 |
4 files changed, 0 insertions, 137 deletions
diff --git a/abs/extra-testing/gnome-vfs/PKGBUILD b/abs/extra-testing/gnome-vfs/PKGBUILD deleted file mode 100644 index b8434a7..0000000 --- a/abs/extra-testing/gnome-vfs/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 75359 2010-04-01 11:48:46Z allan $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-vfs -pkgver=2.24.3 -pkgrel=2 -pkgdesc="The GNOME Virtual File System" -arch=(i686 x86_64) -license=('LGPL') -depends=('fam' 'gconf>=2.28.0' 'hal>=0.5.13' 'bzip2' 'avahi>=0.6.25' 'smbclient>=3.3.7' 'gnome-mime-data>=2.18.0-2' 'heimdal>=1.3.1' 'gnutls>=2.8.3') -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) -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=('3b0f342e79813bfc11d8e636db96b3ffd16c9ca48b07306410e09a3fd1065b4a' - 'b38b86d6c966dcf64f9140d800aebe8a14845bb8ce7c045f52d4df483cacd23b' - '66c7cfb12995c0dd94a2caea95c7e3c55981993f05a79c585d60915ff131955d') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - #Archlinux patch (b.g.o #321498) - patch -Np1 -i "${srcdir}/hal-show-volume-names.patch" || return 1 - - #Fix build with new gnutls - patch -Np1 -i "${srcdir}/gnutls-config.patch" || return 1 - libtoolize --force || return 1 - gtkdocize || return 1 - aclocal || return 1 - autoconf || return 1 - automake || return 1 - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/gnome-vfs-2.0 \ - --enable-samba --enable-hal \ - --enable-avahi --disable-howl \ - --disable-openssl --enable-gnutls || return 1 - make || return 1 - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1 - - 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 - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/abs/extra-testing/gnome-vfs/gnome-vfs.install b/abs/extra-testing/gnome-vfs/gnome-vfs.install deleted file mode 100644 index 793a3e7..0000000 --- a/abs/extra-testing/gnome-vfs/gnome-vfs.install +++ /dev/null @@ -1,17 +0,0 @@ -pkgname=gnome-vfs - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} diff --git a/abs/extra-testing/gnome-vfs/gnutls-config.patch b/abs/extra-testing/gnome-vfs/gnutls-config.patch deleted file mode 100644 index f6fa18b..0000000 --- a/abs/extra-testing/gnome-vfs/gnutls-config.patch +++ /dev/null @@ -1,25 +0,0 @@ -# Allow gnome-vfs-2.24 to build with gnutls >= 2.7.0 -# Use pkg-config in place of gnutls own macro since it's not present anymore. ---- a/configure.in 2009-03-07 19:59:53.805507753 +0100 -+++ b/configure.in 2009-03-07 18:34:36.928169018 +0100 -@@ -686,14 +686,14 @@ - AC_MSG_ERROR([*** Can't use both openssl and gnutls at the same time. Please pick one only. ***]) - else - AC_CHECK_HEADER(gcrypt.h,, AC_MSG_ERROR([*** Need gcrypt.h to compile with GnuTLS support ***])) -- AM_PATH_LIBGNUTLS(1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) -- have_ssl=true]) -+ PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) -+ have_ssl=true]) - - if test "x${LIBGNUTLS_LIBS}" = "x"; then -- AM_PATH_LIBGNUTLS(0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) -- AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME]) -- have_ssl=true], -- AC_MSG_ERROR([Unable to find GNUTLS])) -+ PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) -+ AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME]) -+ have_ssl=true], -+ AC_MSG_ERROR([Unable to find GNUTLS])) - fi - fi - fi diff --git a/abs/extra-testing/gnome-vfs/hal-show-volume-names.patch b/abs/extra-testing/gnome-vfs/hal-show-volume-names.patch deleted file mode 100644 index 5b8420c..0000000 --- a/abs/extra-testing/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); |