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

[Eric Bélanger]

    Date: Tuesday, June 29, 2010 @ 00:05:07
  Author: eric
Revision: 84315

upgpkg: gimp-devel 2.7.0-4
Rebuilt for poppler-glib 0.14.0 (close FS#20011)

Modified:
  gimp-devel/trunk/ChangeLog
  gimp-devel/trunk/PKGBUILD

-----------+
 ChangeLog |    5 +++++
 PKGBUILD  |   35 ++++++++++++++++++++---------------
 2 files changed, 25 insertions(+), 15 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2010-06-29 03:00:33 UTC (rev 84314)
+++ ChangeLog	2010-06-29 04:05:07 UTC (rev 84315)
@@ -1,3 +1,8 @@
+2010-06-28  Eric Belanger  <eric at archlinux.org>
+
+	* gimp-devel 2.7.0-4
+	* Rebuilt for poppler-glib 0.14.0 (close FS#20011)
+
 2010-02-15  Eric Belanger  <eric at archlinux.org>
 
 	* gimp-devel 2.7.0-3

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-06-29 03:00:33 UTC (rev 84314)
+++ PKGBUILD	2010-06-29 04:05:07 UTC (rev 84315)
@@ -4,7 +4,7 @@
 
 pkgname=gimp-devel
 pkgver=2.7.0
-pkgrel=3
+pkgrel=4
 pkgdesc="GNU Image Manipulation Program (Development Version)"
 arch=('i686' 'x86_64')
 url="http://www.gimp.org/"
@@ -22,6 +22,7 @@
 conflicts=('gimp')
 provides=("gimp=${pkgver}")
 install=gimp-devel.install
+changelog=ChangeLog
 source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/gimp-${pkgver}.tar.bz2 linux.gpl libpng-1.4.patch)
 md5sums=('bd9fb22079a547f1f302c219b1a29fcc' 'bb27bc214261d36484093e857f015f38'\
          '211eccab51593526e852816e647f7da4')
@@ -30,24 +31,28 @@
 
 build() {
   cd "${srcdir}/gimp-${pkgver}"
-  patch -p1 < ../libpng-1.4.patch || return 1
+  patch -p1 < ../libpng-1.4.patch
   ./configure --prefix=/usr --sysconfdir=/etc \
     --enable-mp --enable-gimp-console --enable-gimp-remote \
     --enable-python --with-gif-compression=lzw \
-    --without-aa || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install-strip || return 1
+    --without-aa
+  make
+}
 
-  install -D -m644 "${srcdir}/linux.gpl" "${pkgdir}/usr/share/gimp/2.0/palettes/Linux.gpl" || return 1
+package() {
+  cd "${srcdir}/gimp-${pkgver}"
+  make DESTDIR="${pkgdir}" install-strip
 
-  ln -sf gimp-console-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1" || return 1
-  ln -sf gimp-remote-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-remote.1" || return 1
-  ln -sf gimprc-${pkgver%.*}.5.gz "${pkgdir}/usr/share/man/man5/gimprc.5" || return 1
-  ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1" || return 1
-  ln -s gimp-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp.1" || return 1
+  install -D -m644 "${srcdir}/linux.gpl" "${pkgdir}/usr/share/gimp/2.0/palettes/Linux.gpl"
 
-  ln -s gimp-${pkgver%.*} "${pkgdir}/usr/bin/gimp" || return 1
-  ln -s gimp-console-${pkgver%.*} "${pkgdir}/usr/bin/gimp-console" || return 1
-  ln -s gimp-remote-${pkgver%.*} "${pkgdir}/usr/bin/gimp-remote" || return 1
-  ln -s gimptool-2.0 "${pkgdir}/usr/bin/gimptool" || return 1
+  ln -sf gimp-console-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1"
+  ln -sf gimp-remote-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-remote.1"
+  ln -sf gimprc-${pkgver%.*}.5.gz "${pkgdir}/usr/share/man/man5/gimprc.5"
+  ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1"
+  ln -s gimp-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp.1"
+
+  ln -s gimp-${pkgver%.*} "${pkgdir}/usr/bin/gimp"
+  ln -s gimp-console-${pkgver%.*} "${pkgdir}/usr/bin/gimp-console"
+  ln -s gimp-remote-${pkgver%.*} "${pkgdir}/usr/bin/gimp-remote"
+  ln -s gimptool-2.0 "${pkgdir}/usr/bin/gimptool"
 }