[arch-commits] Commit in imlib/trunk (ChangeLog PKGBUILD)

[Jan de Groot]

    Date: Tuesday, August 2, 2011 @ 13:43:26
  Author: jgc
Revision: 134263

remove AC_PATH_XTRA to get rid of libsm dependency

Modified:
  imlib/trunk/PKGBUILD
Deleted:
  imlib/trunk/ChangeLog

-----------+
 ChangeLog |   13 -------------
 PKGBUILD  |   20 +++++++++++---------
 2 files changed, 11 insertions(+), 22 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2011-08-02 17:38:18 UTC (rev 134262)
+++ ChangeLog	2011-08-02 17:43:26 UTC (rev 134263)
@@ -1,13 +0,0 @@
-2009-07-01  Eric Belanger  <eric at archlinux.org>
-
-	* imlib 1.9.15-6
-	* Rebuild for libjpeg 7
-
-2009-06-14  Eric Belanger  <eric at archlinux.org>
-
-	* imlib 1.9.15-5
-	* Added libxt makedepends (close FS#15086)
-	* Changed libungif depends to giflib
-	* Updated url
-	* FHS man pages
-	* Added ChangeLog

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-02 17:38:18 UTC (rev 134262)
+++ PKGBUILD	2011-08-02 17:43:26 UTC (rev 134263)
@@ -4,12 +4,12 @@
 
 pkgname=imlib
 pkgver=1.9.15
-pkgrel=9
+pkgrel=10
 pkgdesc="General image handling library for X11 and Gtk"
 arch=('i686' 'x86_64')
 url="http://freshmeat.net/projects/imlib/"
 license=('GPL')
-depends=('gtk' 'giflib' 'libpng>=1.4.0' 'libtiff>=3.9.2-2' 'libjpeg>=8' 'libsm')
+depends=('gtk' 'giflib' 'libpng>=1.4.0' 'libtiff>=3.9.2-2' 'libjpeg>=8')
 makedepends=('libxt')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/${pkgname}-${pkgver}.tar.bz2
@@ -23,11 +23,13 @@
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/debian-bug448360.patch" || return 1
-  patch -Np1 -i "${srcdir}/CAN-2004-1026.patch" || return 1
-  patch -Np0 -i "${srcdir}/aclocal-fixes.patch" || return 1
-  patch -Np1 -i "${srcdir}/libpng14.patch" || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --enable-shm || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  patch -Np1 -i "${srcdir}/debian-bug448360.patch"
+  patch -Np1 -i "${srcdir}/CAN-2004-1026.patch"
+  patch -Np0 -i "${srcdir}/aclocal-fixes.patch"
+  patch -Np1 -i "${srcdir}/libpng14.patch"
+  sed '/AC_PATH_XTRA/d' -i configure.in
+  autoreconf --force --install
+  ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --enable-shm
+  make
+  make DESTDIR="${pkgdir}" install
 }