[arch-commits] Commit in gtk1-engines/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Eric Bélanger]

    Date: Friday, November 14, 2008 @ 03:03:27
  Author: eric
Revision: 19030

Merged revisions 19007,19029 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/gtk1-engines/trunk

........
  r19007 | thayer | 2008-11-13 14:40:47 -0500 (Thu, 13 Nov 2008) | 2 lines
  
  upgpkg: gtk1-engines 0.12-2
      added imlib dep, stripped libtool libs
........
  r19029 | eric | 2008-11-14 03:02:55 -0500 (Fri, 14 Nov 2008) | 2 lines
  
  upgpkg: gtk1-engines 0.12-2
      updated x86_64 build fix
........

Modified:
  gtk1-engines/repos/extra-x86_64/	(properties)
  gtk1-engines/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)


Property changes on: gtk1-engines/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /gtk1-engines/trunk:1-8858
   + /gtk1-engines/trunk:1-19029

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-14 08:02:55 UTC (rev 19029)
+++ extra-x86_64/PKGBUILD	2008-11-14 08:03:27 UTC (rev 19030)
@@ -1,11 +1,16 @@
 # $Id$
-# Maintainer: damir <damir at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+# Maintainer: Thayer Williams <thayer at archlinux.org>
+
 pkgname=gtk1-engines
 pkgver=0.12
-pkgrel=1
+pkgrel=2
 pkgdesc="Theme-Engines and Themes for GTK+ 1 - including gtk-engines-pixmap"
+url="http://ftp.gnome.org/pub/gnome/sources/gtk-engines/0.12/"
+license=('GPL2')
 arch=('i686' 'x86_64')
-depends=('gtk')
+depends=('gtk' 'imlib')
+options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk-engines/0.12/gtk-engines-$pkgver.tar.gz)
 md5sums=('c867d1ebd6dbea355765d689a11330ec')
 
@@ -15,17 +20,15 @@
   # arch64 fix from fedora
 
 if [ "$CARCH" == "x86_64" ]; then
-  rm acinclude.m4
-  touch depcomp
-  libtoolize --force --copy
-  aclocal
-  automake
-  autoconf
+  sed -i -e 's/AM_PROG_LIBTOOL/AC_PROG_LIBTOOL/' configure.in
+  rm -f acinclude.m4
+  autoreconf -f -i
 fi
 
   ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname
   make || return 1
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR=$startdir/pkg install || return 1
+
   # removes files that are already provided by gtk-engines (for gtk2)
   rm $startdir/pkg/usr/share/themes/Metal/README.html
   rm $startdir/pkg/usr/share/themes/Redmond95/README.html