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

[Jan de Groot]

    Date: Monday, June 18, 2007 @ 13:26:48
  Author: jgc
    Path: /home/cvs-arch/arch/build/lib/libgsf

   Added: configure-fix.patch (1.1)
Modified: PKGBUILD (1.14 -> 1.15)

upgpkg: libgsf 1.14.4-1
Add patch to build without gnome (bgo448842)


---------------------+
 PKGBUILD            |   24 +++++++++++++++---------
 configure-fix.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 9 deletions(-)


Index: arch/build/lib/libgsf/PKGBUILD
diff -u arch/build/lib/libgsf/PKGBUILD:1.14 arch/build/lib/libgsf/PKGBUILD:1.15
--- arch/build/lib/libgsf/PKGBUILD:1.14	Fri Mar  9 10:23:40 2007
+++ arch/build/lib/libgsf/PKGBUILD	Mon Jun 18 13:26:48 2007
@@ -1,22 +1,28 @@
-# $Id: PKGBUILD,v 1.14 2007/03/09 15:23:40 tpowa Exp $
-# Maintainer: dorphell <dorphell at archlinux.org>
+# $Id: PKGBUILD,v 1.15 2007/06/18 17:26:48 jgc Exp $
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
 
 pkgname=libgsf
-pkgver=1.14.3
-pkgrel=2
+pkgver=1.14.4
+pkgrel=1
 pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats."
 arch=(i686 x86_64)
+license=('GPL' 'LGPL')
 depends=('libxml2' 'glib2' 'bzip2')
-makedepends=('intltool' 'pkgconfig' 'python')
-options=('nolibtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/1.14/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('c707a7ffc3e2bf802556bae86a453020')
+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')
 
 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
+  ./configure --prefix=/usr --disable-gtk-doc --without-gnome --without-bonobo
   make || return 1
   make DESTDIR=${startdir}/pkg install
   rm -f ${startdir}/pkg/usr{,/share}/man/man1/gsf-office-thumbnailer.1
Index: arch/build/lib/libgsf/configure-fix.patch
diff -u /dev/null arch/build/lib/libgsf/configure-fix.patch:1.1
--- /dev/null	Mon Jun 18 13:26:48 2007
+++ arch/build/lib/libgsf/configure-fix.patch	Mon Jun 18 13:26:48 2007
@@ -0,0 +1,26 @@
+--- 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)
+ 
+ # ===================