[gimp] build/win: Upgrade exiv2 to 0.24

[Michael Henning <mhenning src gnome org>]

commit f4478907d89ad8c1adc91e6eed81aa425be76cda
Author: Michael Henning <drawoc darkrefraction com>
Date:   Wed Feb 5 13:33:57 2014 -0500

    build/win: Upgrade exiv2 to 0.24
    
    And also switch to compiling exiv2 with cmake.

 build/windows/jhbuild/README.md          |    2 +-
 build/windows/jhbuild/build.jhbuildrc    |    4 ++++
 build/windows/jhbuild/misclibs.moduleset |   12 +++++-------
 build/windows/jhbuild/toolchain.cmake    |    5 +++++
 4 files changed, 15 insertions(+), 8 deletions(-)
---
diff --git a/build/windows/jhbuild/README.md b/build/windows/jhbuild/README.md
index 1c1a198..9d6ea66 100644
--- a/build/windows/jhbuild/README.md
+++ b/build/windows/jhbuild/README.md
@@ -4,7 +4,7 @@ To begin with, you need to install jhbuild, mingw-w64, and a few other build-rel
 
 If you're using debian, install these packages:
 
-       sudo apt-get install build-essential mingw-w64 git jhbuild automake autoconf libtool libgtk2.0-dev 
ragel intltool bison flex gperf gtk-doc-tools nasm ruby
+       sudo apt-get install build-essential mingw-w64 git jhbuild automake autoconf libtool libgtk2.0-dev 
ragel intltool bison flex gperf gtk-doc-tools nasm ruby cmake
 
 From there, in theory, you can simply clone this repo, cd into it, and run:
 
diff --git a/build/windows/jhbuild/build.jhbuildrc b/build/windows/jhbuild/build.jhbuildrc
index 12ca353..5b98858 100644
--- a/build/windows/jhbuild/build.jhbuildrc
+++ b/build/windows/jhbuild/build.jhbuildrc
@@ -85,6 +85,10 @@ os.environ['CFLAGS']  += os.environ.get('MINGW_CFLAGS', '')
 os.environ['CFLAGS']  += flavour_cflags
 os.environ['CXXFLAGS']+= flavour_cflags
 
+# CMake stuff
+cmakeargs += ' -DCMAKE_TOOLCHAIN_FILE=' + os.environ['PWD'] + '/toolchain.cmake '
+cmakeargs += ' -DCMAKE_FIND_ROOT_PATH="' + searchprefix + ';' + prefix + '" '
+
 #Don't install libraries in lib64, even if compiling on 64-bit machines
 use_lib64 = False
 
diff --git a/build/windows/jhbuild/misclibs.moduleset b/build/windows/jhbuild/misclibs.moduleset
index 6aafaac..b77f0c2 100644
--- a/build/windows/jhbuild/misclibs.moduleset
+++ b/build/windows/jhbuild/misclibs.moduleset
@@ -130,12 +130,10 @@
        </suggests>
 </autotools>
 
-<autotools id="exiv2" autogen-sh="configure"
-               makeargs="xmpsdk; make -C po all; make -C src lib"
-               makeinstallargs="-C po install; make -C src install-lib">
-       <branch version="0.23" repo="exiv2"
-                       module="exiv2-0.23.tar.gz"
-                       hash="md5:dab67c07bb63a4386d4ea607a8e06eaf">
+<cmake id="exiv2">
+       <branch version="0.24" repo="exiv2"
+                       module="exiv2-0.24.tar.gz"
+                       hash="md5:b8a23dc56a98ede85c00718a97a8d6fc">
        </branch>
        <dependencies>
                <dep package="zlib"/>
@@ -143,7 +141,7 @@
                <dep package="iconv"/>
                <dep package="gettext"/>
        </dependencies>
-</autotools>
+</cmake>
 
 <autotools id="libgexiv2" autogen-sh="|| autoreconf --force --install; ./configure">
        <branch version="0.7.0" repo="yorba"
diff --git a/build/windows/jhbuild/toolchain.cmake b/build/windows/jhbuild/toolchain.cmake
new file mode 100644
index 0000000..f2b6da0
--- /dev/null
+++ b/build/windows/jhbuild/toolchain.cmake
@@ -0,0 +1,5 @@
+set (CMAKE_SYSTEM_NAME Windows)
+
+set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)