From 4f119c3867d64797df36121ef6525c88e15a1b9e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 29 Jan 2011 17:07:12 +0100
Subject: [PATCH] gimp: update to 2.6.11.

---
 srcpkgs/gimp/gimp-devel.template      |  2 --
 srcpkgs/gimp/gimp-python.template     |  2 --
 srcpkgs/gimp/patches/libpng-1.4.patch | 25 -------------------------
 srcpkgs/gimp/template                 |  7 +++----
 4 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/gimp/patches/libpng-1.4.patch

diff --git a/srcpkgs/gimp/gimp-devel.template b/srcpkgs/gimp/gimp-devel.template
index 24794e733d..6a73213ebd 100644
--- a/srcpkgs/gimp/gimp-devel.template
+++ b/srcpkgs/gimp/gimp-devel.template
@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=2
-
 Add_dependency run intltool
 Add_dependency run pkg-config
 Add_dependency run gtk+-devel
diff --git a/srcpkgs/gimp/gimp-python.template b/srcpkgs/gimp/gimp-python.template
index 421fd068cb..84014bc608 100644
--- a/srcpkgs/gimp/gimp-python.template
+++ b/srcpkgs/gimp/gimp-python.template
@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains the Python bindings."
 
-revision=1
-
 Add_dependency run glibc
 Add_dependency run gimp
 Add_dependency run glib
diff --git a/srcpkgs/gimp/patches/libpng-1.4.patch b/srcpkgs/gimp/patches/libpng-1.4.patch
deleted file mode 100644
index 4cad8ab03e..0000000000
--- a/srcpkgs/gimp/patches/libpng-1.4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- plug-ins/file-ico/ico-load.c	2010-01-18 19:01:46.000000000 -0500
-+++ plug-ins/file-ico/ico-load.c	2010-01-18 19:14:43.000000000 -0500
-@@ -286,14 +286,22 @@
-   switch (color_type)
-     {
-     case PNG_COLOR_TYPE_GRAY:
-+#if PNG_LIBPNG_VER < 10400
-       png_set_gray_1_2_4_to_8 (png_ptr);
-+#else
-+      png_set_expand_gray_1_2_4_to_8(png_ptr);
-+#endif
-       if ( bit_depth == 16 )
-         png_set_strip_16 (png_ptr);
-       png_set_gray_to_rgb (png_ptr);
-       png_set_add_alpha (png_ptr, 0xff, PNG_FILLER_AFTER);
-       break;
-     case PNG_COLOR_TYPE_GRAY_ALPHA:
-+#if PNG_LIBPNG_VER < 10400
-       png_set_gray_1_2_4_to_8 (png_ptr);
-+#else
-+      png_set_expand_gray_1_2_4_to_8(png_ptr);
-+#endif
-       if ( bit_depth == 16 )
-         png_set_strip_16 (png_ptr);
-       png_set_gray_to_rgb (png_ptr);
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index b241db8834..8279a72d5d 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,14 +1,13 @@
 # Template build file for 'gimp'.
 pkgname=gimp
-version=2.6.8
-revision=5
-distfiles="ftp://ftp.gimp.org/pub/gimp/v2.6/$pkgname-$version.tar.bz2"
+version=2.6.11
+distfiles="ftp://ftp.gimp.org/pub/gimp/v2.6/gimp-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--without-aa --without-gvfs --without-gnomevfs
 --enable-gimp-remote --without-hal"
 short_desc="The GNU image manipulation program"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=d5d4218b742390157fca23a9d2cce436904546a2ea419ffeb44a5f43c99a3332
+checksum=9b6d08d0803b3912ea596d1b77b9c21ee13778c23388a225c004b8c1587cb0a1
 long_desc="
  Powerful image manipulation program similar to \"Adobe Photoshop\"[tm].
  It supports layers, arbitrary image sizes and working on several images