summaryrefslogtreecommitdiffstats
path: root/abs/extra-testing
diff options
context:
space:
mode:
authorCecil Hugh Watson <knoppmyth@gmail.com>2010-09-05 06:07:20 (GMT)
committerCecil Hugh Watson <knoppmyth@gmail.com>2010-09-05 06:07:20 (GMT)
commitf508f694cb958868145869dc952971b897f391ca (patch)
treec31a5eca558daf92501f1a1fa53c5310bbdab85a /abs/extra-testing
parent6e8437cd0a5a3cfbcecfd41e795a5d6ceed093b5 (diff)
downloadlinhes_pkgbuild-f508f694cb958868145869dc952971b897f391ca.zip
linhes_pkgbuild-f508f694cb958868145869dc952971b897f391ca.tar.gz
linhes_pkgbuild-f508f694cb958868145869dc952971b897f391ca.tar.bz2
gnome-vfs:Bumped/Updated for LinHES 7.
Diffstat (limited to 'abs/extra-testing')
-rw-r--r--abs/extra-testing/gnome-vfs/PKGBUILD36
-rw-r--r--abs/extra-testing/gnome-vfs/gnutls-config.patch25
2 files changed, 48 insertions, 13 deletions
diff --git a/abs/extra-testing/gnome-vfs/PKGBUILD b/abs/extra-testing/gnome-vfs/PKGBUILD
index 9a54cdd..b8434a7 100644
--- a/abs/extra-testing/gnome-vfs/PKGBUILD
+++ b/abs/extra-testing/gnome-vfs/PKGBUILD
@@ -1,35 +1,45 @@
-# $Id: PKGBUILD 30314 2009-03-18 21:34:12Z jgc $
+# $Id: PKGBUILD 75359 2010-04-01 11:48:46Z allan $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=gnome-vfs
-pkgver=2.24.1
+pkgver=2.24.3
pkgrel=2
pkgdesc="The GNOME Virtual File System"
arch=(i686 x86_64)
license=('LGPL')
-depends=('fam' 'gconf>=2.26.0-2' 'hal>=0.5.11' 'bzip2' 'avahi>=0.6.24' 'smbclient>=3.3.1' 'gnome-mime-data>=2.18.0-2' 'heimdal>=1.2.1' 'gnutls>=2.6.4')
-makedepends=('pkgconfig' 'intltool')
-options=('!libtool' '!emptydirs')
+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)
-md5sums=('100f9af16dc659e375ee8da45175a28d' '109d07aa1dc8cb6523c47c4984047dce')
+ 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 ${startdir}/src/hal-show-volume-names.patch || return 1
+ 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
+ --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
diff --git a/abs/extra-testing/gnome-vfs/gnutls-config.patch b/abs/extra-testing/gnome-vfs/gnutls-config.patch
new file mode 100644
index 0000000..f6fa18b
--- /dev/null
+++ b/abs/extra-testing/gnome-vfs/gnutls-config.patch
@@ -0,0 +1,25 @@
+# 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