From 71df7f0ab2df1aef05a1f26d6b49f29a462a103b Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 6 Jun 2012 18:10:46 +0200
Subject: [PATCH] gimp: rebuild against libpng-1.5.

---
 srcpkgs/gimp/gimp-devel.template  | 17 ++++++-----------
 srcpkgs/gimp/gimp-python.template |  4 +---
 srcpkgs/gimp/gimp.rshlibs         |  2 +-
 srcpkgs/gimp/template             | 14 +++++---------
 4 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/srcpkgs/gimp/gimp-devel.template b/srcpkgs/gimp/gimp-devel.template
index 8f7be18c19..d6e5495370 100644
--- a/srcpkgs/gimp/gimp-devel.template
+++ b/srcpkgs/gimp/gimp-devel.template
@@ -1,19 +1,14 @@
 # Template file for 'gimp-devel'.
 #
-depends="intltool pkg-config gtk+-devel atk-devel glib-devel pango-devel cairo-devel freetype-devel fontconfig-devel glibc-devel lcms-devel alsa-lib-devel dbus-glib-devel dbus-devel jpeg-devel libexif-devel libcurl-devel libpng-devel libmng-devel zlib-devel libSM-devel libICE-devel libX11-devel libXpm-devel libXmu-devel libXt-devel libXext-devel libXfixes-devel poppler-glib-devel tiff-devel webkit-gtk-devel libsoup-devel libwmf-devel expat-devel librsvg-devel gegl-devel babl-devel gimp"
+noarch=yes
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mkdir -p ${DESTDIR}/usr/share
-
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
-	mv ${SRCPKGDESTDIR}/usr/share/aclocal ${DESTDIR}/usr/share
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove usr/share/gtk-doc usr/share
+	vmove usr/share/aclocal usr/share
 }
diff --git a/srcpkgs/gimp/gimp-python.template b/srcpkgs/gimp/gimp-python.template
index 381bc1798d..7c19b7d546 100644
--- a/srcpkgs/gimp/gimp-python.template
+++ b/srcpkgs/gimp/gimp-python.template
@@ -1,14 +1,12 @@
 # Template file for 'gimp-python'.
 #
 depends="pygtk"
+pycompile_dirs="usr/lib/gimp/2.0/python"
 short_desc="${sourcepkg} Python bindings"
 long_desc="${long_desc}
 
  This package contains the Python bindings."
 
-pycompile_dirs="usr/lib/gimp/2.0/python"
-
-
 do_install() {
 	mkdir -p ${DESTDIR}/usr/lib/gimp/2.0/plug-ins
 
diff --git a/srcpkgs/gimp/gimp.rshlibs b/srcpkgs/gimp/gimp.rshlibs
index 8965bb916e..9f6772425f 100644
--- a/srcpkgs/gimp/gimp.rshlibs
+++ b/srcpkgs/gimp/gimp.rshlibs
@@ -25,7 +25,6 @@ librt.so.1
 liblcms.so.1
 libasound.so.2
 libdl.so.2
-libpng14.so.14
 libjpeg.so.8
 libexif.so.12
 libwebkitgtk-1.0.so.0
@@ -44,3 +43,4 @@ libgudev-1.0.so.0
 libtiff.so.5
 libbz2.so.1
 libgegl-0.2.so.0
+libpng15.so.15
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 1b68aa9a92..e7b8e5d448 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,17 +1,18 @@
 # Template build file for 'gimp'.
 pkgname=gimp
 version=2.8.0
-homepage="http://www.gimp.org"
-distfiles="ftp://ftp.gimp.org/pub/gimp/v${version%.*}/gimp-$version.tar.bz2"
+revision=3
 build_style=gnu-configure
 configure_args="--without-aa"
 license="GPL-3"
 depends="desktop-file-utils hicolor-icon-theme"
-makedepends="pkg-config intltool gtk+-devel lcms-devel alsa-lib-devel dbus-glib-devel libXmu-devel libXext-devel libXcursor-devel libexif-devel webkit-gtk-devel libwmf-devel librsvg-devel poppler-glib-devel libmng-devel libXpm-devel libcurl-devel babl-devel gegl-devel pygtk-devel libgudev-devel jasper-devel"
+makedepends="pkg-config intltool libpng-devel>=1.5.10 gtk+-devel lcms-devel alsa-lib-devel dbus-glib-devel libXmu-devel libXext-devel libXcursor-devel libexif-devel webkit-gtk-devel libwmf-devel librsvg-devel poppler-glib-devel libmng-devel libXpm-devel libcurl-devel babl-devel gegl-devel pygtk-devel libgudev-devel jasper-devel"
 fulldepends="iso-codes"
-revision=2
+subpackages="gimp-devel gimp-python"
 short_desc="The GNU image manipulation program"
 maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://www.gimp.org"
+distfiles="ftp://ftp.gimp.org/pub/gimp/v${version%.*}/gimp-$version.tar.bz2"
 checksum=dd6cee080d18faefa010ba4823e60ee7c49a4d1574a78c6dfb590592a09f2dcc
 long_desc="
  Powerful image manipulation program similar to Adobe Photoshop[tm].
@@ -30,8 +31,3 @@ conf_files="
 /etc/gimp/2.0/templaterc
 /etc/gimp/2.0/gimprc
 /etc/gimp/2.0/controllerrc"
-
-subpackages="gimp-devel gimp-python"
-
-
-