[arch-commits] CVS update of arch/build/lib/libgsf (PKGBUILD configure-fix.patch)

[Jan de Groot]

    Date: Monday, July 16, 2007 @ 16:58:35
  Author: jgc
    Path: /home/cvs-arch/arch/build/lib/libgsf

Modified: PKGBUILD (1.15 -> 1.16)
 Removed: configure-fix.patch (1.1)

upgpkg: libgsf 1.14.5-1
Update, remove old patch


---------------------+
 PKGBUILD            |   13 ++++---------
 configure-fix.patch |   26 --------------------------
 2 files changed, 4 insertions(+), 35 deletions(-)


Index: arch/build/lib/libgsf/PKGBUILD
diff -u arch/build/lib/libgsf/PKGBUILD:1.15 arch/build/lib/libgsf/PKGBUILD:1.16
--- arch/build/lib/libgsf/PKGBUILD:1.15	Mon Jun 18 13:26:48 2007
+++ arch/build/lib/libgsf/PKGBUILD	Mon Jul 16 16:58:35 2007
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.15 2007/06/18 17:26:48 jgc Exp $
+# $Id: PKGBUILD,v 1.16 2007/07/16 20:58:35 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
 
 pkgname=libgsf
-pkgver=1.14.4
+pkgver=1.14.5
 pkgrel=1
 pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats."
 arch=(i686 x86_64)
@@ -11,16 +11,11 @@
 depends=('libxml2' 'glib2' 'bzip2')
 makedepends=('perlxml' 'pkgconfig' 'python')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/1.14/${pkgname}-${pkgver}.tar.bz2
-	configure-fix.patch)
-md5sums=('2d07ad2f1336c101ce14982ba7289f80')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/1.14/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('0c1a70ca77aef5706544c1b4082a632a')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np0 -i ${startdir}/src/configure-fix.patch || return 1
-  aclocal -I./m4
-  autoconf
-  automake
   sed -i -e 's/gsf-gnome gsf-win32//' -e 's/thumbnailer//' Makefile.*
   ./configure --prefix=/usr --disable-gtk-doc --without-gnome --without-bonobo
   make || return 1
Index: arch/build/lib/libgsf/configure-fix.patch
diff -u arch/build/lib/libgsf/configure-fix.patch:1.1 arch/build/lib/libgsf/configure-fix.patch:removed
--- arch/build/lib/libgsf/configure-fix.patch:1.1	Mon Jun 18 13:26:48 2007
+++ arch/build/lib/libgsf/configure-fix.patch	Mon Jul 16 16:58:35 2007
@@ -1,26 +0,0 @@
---- configure.in.orig	2007-06-18 17:17:21.000000000 +0000
-+++ configure.in	2007-06-18 17:18:13.000000000 +0000
-@@ -367,6 +367,7 @@
- have_gnome=no
- if  test $want_gnome = no ; then 
-     AC_MSG_WARN([GNOME support disabled, as requested (Use --with-gnome to enable)])
-+    WITH_BONOBO=no
- else
-     dnl check for bonobo
-     AC_ARG_WITH(bonobo,
-@@ -377,7 +378,6 @@
- 	*) AC_MSG_ERROR(bad value ${withval} for --with-bonobo) ;;
- 	esac],
- 	[WITH_BONOBO=yes]) dnl Default value
--    AM_CONDITIONAL(WITH_BONOBO, test $WITH_BONOBO = yes)
- 
-     if test $WITH_BONOBO = yes; then
- 	libgsf_gnome_reqs="$libgsf_gnome_reqs libbonobo-2.0 >= 2.0.0"
-@@ -391,6 +391,7 @@
- 	    AC_MSG_WARN([GNOME support disabled, unable to find required version of VFS and/or Bonobo])
- 	 fi])
- fi
-+AM_CONDITIONAL(WITH_BONOBO, test $WITH_BONOBO = yes)
- AM_CONDITIONAL(WITH_LIBGSF_GNOME, test $have_gnome = yes)
- 
- # ===================