[gtk-osx] Bring gimp up to current release and fix its build.

[John Ralls <jralls src gnome org>]

commit 434cb4e9d7bd02603b48e08be62b10278246e8c3
Author: John Ralls <jralls ceridwen us>
Date:   Mon Feb 23 15:26:10 2015 -0800

    Bring gimp up to current release and fix its build.

 modulesets-stable/gtk-osx-random.modules         |   10 +++-
 modulesets-unstable/gtk-osx-random.modules       |   22 ++++++++
 modulesets/gtk-osx-random.modules                |    5 ++
 patches/Bug-555525-plug-ins-twain-tw_mac.c.patch |   61 ++++++++++++++++++++--
 4 files changed, 92 insertions(+), 6 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index 7b3d529..dff204f 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -282,8 +282,8 @@ Libglade itself is deprecated. This is the last release. -->
              autogenargs="--disable-python --without-x --without-dbus
                          --without-gnomevfs --without-wmf --enable-binreloc "
             makeargs='LDFLAGS="-framework Carbon"'>
-    <branch module="gimp/v2.8/gimp-2.8.2.tar.bz2" version="2.8.2"
-            md5sum="b542138820ca3a41cbd63fc331907955" repo="gimp">
+    <branch module="gimp/v2.8/gimp-2.8.14.tar.bz2" version="2.8.14"
+            md5sum="233c948203383fa078434cc3f8f925cb" 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>
@@ -297,6 +297,11 @@ Libglade itself is deprecated. This is the last release. -->
     </dependencies>
   </autotools>
 
+  <autotools id='json-glib' autogen-sh="configure">
+    <branch   module="json-glib/1.0/json-glib-1.0.2.tar.xz" version="1.0.2"
+             hash="sha256:887bd192da8f5edc53b490ec51bf3ffebd958a671f5963e4f3af32c22e35660a"/>
+  </autotools>
+
   <autotools id="babl" >
     <branch repo="ftp.gtk.org" version="0.1.10"
             module="babl/0.1/babl-0.1.10.tar.bz2">
@@ -309,6 +314,7 @@ Libglade itself is deprecated. This is the last release. -->
             module="gegl/0.2/gegl-0.2.0.tar.bz2"/>
     <dependencies>
       <dep package="babl"/>
+      <dep package="json-glib"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets-unstable/gtk-osx-random.modules b/modulesets-unstable/gtk-osx-random.modules
index 91eed54..3d0d59d 100644
--- a/modulesets-unstable/gtk-osx-random.modules
+++ b/modulesets-unstable/gtk-osx-random.modules
@@ -28,6 +28,8 @@
   <repository type="git" name="savannah" href="git://git.sv.gnu/org/"/>
   <repository type="tarball" name="boehm"
              href="http://www.hboem.info/"/>
+  <repository type="svn" name="exiv2.org"
+             href="svn://dev.exiv2.org/"/>
 
   <metamodule id="meta-gtk-osx-random">
     <dependencies>
@@ -204,6 +206,20 @@
     </dependencies>
   </autotools>
 
+  <cmake id="exiv2" supports-non-srcdir-builds="no">
+    <branch repo="exiv2.org" module="svn">
+    </branch>
+  </cmake>
+  
+  <autotools id="gexiv2" supports-non-srcdir-builds="no"
+            autogenargs="--enable-introspection --with-libtool=libtool"
+            autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s %(autogenargs)s">
+    <branch/>
+    <dependencies>
+      <dep package="exiv2"/>
+    </dependencies>
+  </autotools>
+  
   <autotools id="gimp" 
              autogenargs="--disable-python --disable-print --without-x
                           --without-dbus --without-gnomevfs --without-wmf"
@@ -217,9 +233,14 @@
       <dep package="lcms"/>
       <dep package="fontconfig"/>
       <dep package="gegl"/>
+      <dep package="gexiv2"/>
     </dependencies>
   </autotools>
 
+  <autotools id="json-glib">
+    <branch/>
+  </autotools>
+  
   <autotools id="babl">
     <branch />
   </autotools>
@@ -228,6 +249,7 @@
     <branch />
     <dependencies>
       <dep package="babl"/>
+      <dep package="json-glib"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gtk-osx-random.modules b/modulesets/gtk-osx-random.modules
index fb01c8b..21d8c37 100644
--- a/modulesets/gtk-osx-random.modules
+++ b/modulesets/gtk-osx-random.modules
@@ -236,6 +236,10 @@
     </dependencies>
   </autotools>
 
+  <autotools id="json-glib">
+    <branch tag="1.0.2"/>
+  </autotools>
+  
    <autotools id="babl">
      <branch tag="BABL_0_1_10"/>
   </autotools>
@@ -244,6 +248,7 @@
     <branch tag="GEGL_0_2_0"/>
     <dependencies>
       <dep package="babl"/>
+      <dep package="json-glib"/>
     </dependencies>
   </autotools>
 
diff --git a/patches/Bug-555525-plug-ins-twain-tw_mac.c.patch 
b/patches/Bug-555525-plug-ins-twain-tw_mac.c.patch
index 3d55c71..5d54118 100644
--- a/patches/Bug-555525-plug-ins-twain-tw_mac.c.patch
+++ b/patches/Bug-555525-plug-ins-twain-tw_mac.c.patch
@@ -1,10 +1,55 @@
---- 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 @@
+From 1b8aa4be14d80f53c85552adc7cb2192afde3217 Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls ceridwen us>
+Date: Mon, 23 Feb 2015 15:12:33 -0800
+Subject: [PATCH] Fix clang complaining about missing void in function
+ prototypes.
+
+---
+ plug-ins/twain/tw_local.h | 6 +++---
+ plug-ins/twain/tw_mac.c   | 6 ++++--
+ 2 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/plug-ins/twain/tw_local.h b/plug-ins/twain/tw_local.h
+index e76cf87..45b2fca 100644
+--- a/plug-ins/twain/tw_local.h
++++ b/plug-ins/twain/tw_local.h
+@@ -34,7 +34,7 @@ TW_UINT16 callDSM(pTW_IDENTITY, pTW_IDENTITY,
+                 TW_UINT16, TW_MEMREF);
+ 
+ int twainIsAvailable(void);
+-void twainQuitApplication ();
++void twainQuitApplication (void);
+ gboolean twainSetupCallback (pTW_SESSION twSession);
+ 
+ TW_HANDLE twainAllocHandle(size_t size);
+@@ -42,7 +42,7 @@ TW_MEMREF twainLockHandle (TW_HANDLE handle);
+ void twainUnlockHandle (TW_HANDLE handle);
+ void twainFreeHandle (TW_HANDLE handle);
+ 
+-int twainMain ();
+-int scanImage ();
++int twainMain (void);
++int scanImage (void);
+ 
+ #endif
+diff --git a/plug-ins/twain/tw_mac.c b/plug-ins/twain/tw_mac.c
+index 796d28e..48cc0d9 100644
+--- a/plug-ins/twain/tw_mac.c
++++ b/plug-ins/twain/tw_mac.c
+@@ -146,7 +146,7 @@ TW_UINT16 twainCallback(pTW_IDENTITY pOrigin,
+   return TWRC_SUCCESS;
+ }
+ 
+-void twainQuitApplication ()
++void twainQuitApplication (void)
+ {
+   QuitApplicationEventLoop();
+ }
+@@ -192,14 +192,16 @@ static void twainSetupMacUI()
  
    /* Voodoo magic fix inspired by java_swt launcher */
    /* Without this the icon setting doesn't work about half the time. */
-+#ifndef __LP64__
++#ifdef __LP_64__
    CGrafPtr p = BeginQDContextForApplicationDockTile();
    EndQDContextForApplicationDockTile(p);
  
@@ -13,3 +58,11 @@
  }
  
  int
+-twainMain()
++twainMain(void)
+ {
+   EventLoopTimerRef timer;
+   OSStatus err;
+-- 
+2.2.2
+