[gtk-osx: 3/3] Bump babl, gegl, and gimp, patch around gimp bug 555545

[John Ralls <jralls src gnome org>]

commit 53206ea570e552eb75e829ea3110387148234155
Author: Eric Butler <eric codebutler com>
Date:   Tue Feb 28 15:53:52 2012 -0800

    Bump babl, gegl, and gimp, patch around gimp bug 555545

 modulesets-stable/gtk-osx-random.modules         |   14 ++++++++------
 patches/Bug-555525-plug-ins-twain-tw_mac.c.patch |   15 +++++++++++++++
 2 files changed, 23 insertions(+), 6 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index 6e4900d..c4cecc9 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -266,8 +266,10 @@ Libglade itself is deprecated. This is the last release. -->
                           --without-dbus --without-gnomevfs --without-wmf --enable-binreloc "
 	     autogen-template="autoreconf -fis &amp;&amp; %(srcdir)s/%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
              makeargs='LDFLAGS="-framework Carbon"'>
-    <branch module="gimp/v2.6/gimp-2.6.11.tar.bz2" version="2.6.11"
-            md5sum="bb2939fe13e54fc7255cef5d097bb5dd" repo="gimp"/>
+    <branch module="gimp/v2.6/gimp-2.6.12.tar.bz2" version="2.6.12"
+            md5sum="9f876ee63a0c4a4c83f50f32fb3bbe63" repo="gimp">
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/Bug-555525-plug-ins-twain-tw_mac.c.patch"; strip="1" />
+    </branch>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-core"/>
@@ -285,13 +287,13 @@ Libglade itself is deprecated. This is the last release. -->
   </autotools>
 
 <autotools id="babl" >
-    <branch repo="ftp.gtk.org" version="0.1.2"
-            module="babl/0.1/babl-0.1.2.tar.bz2"/>
+    <branch repo="ftp.gtk.org" version="0.1.6"
+            module="babl/0.1/babl-0.1.6.tar.bz2"/>
   </autotools>
 
   <autotools id="gegl" autogen-sh="configure" autogenargs="--disable-docs">
-    <branch repo="ftp.gtk.org" version="0.1.2"
-            module="gegl/0.1/gegl-0.1.2.tar.bz2"/>
+    <branch repo="ftp.gtk.org" version="0.1.8"
+            module="gegl/0.1/gegl-0.1.8.tar.bz2"/>
     <dependencies>
       <dep package="babl"/>
     </dependencies>
diff --git a/patches/Bug-555525-plug-ins-twain-tw_mac.c.patch b/patches/Bug-555525-plug-ins-twain-tw_mac.c.patch
new file mode 100644
index 0000000..3d55c71
--- /dev/null
+++ b/patches/Bug-555525-plug-ins-twain-tw_mac.c.patch
@@ -0,0 +1,15 @@
+--- a/plug-ins/twain/tw_mac.c.orig	2009-07-20 15:20:51.000000000 -0500
++++ b/plug-ins/twain/tw_mac.c	2009-12-27 02:51:31.000000000 -0600
+@@ -193,10 +193,12 @@
+ 
+   /* Voodoo magic fix inspired by java_swt launcher */
+   /* Without this the icon setting doesn't work about half the time. */
++#ifndef __LP64__
+   CGrafPtr p = BeginQDContextForApplicationDockTile();
+   EndQDContextForApplicationDockTile(p);
+ 
+   SetApplicationDockTileImage (icon);
++#endif
+ }
+ 
+ int