[gnumeric] win32: gdk-pixbuf

[Morten Welinder <mortenw src gnome org>]

commit d121306c7152d1d90df60b5c41096b138f921d7f
Author: Morten Welinder <terra gnome org>
Date:   Sat Jul 27 15:10:21 2013 -0400

    win32: gdk-pixbuf

 tools/win32/ChangeLog    |    2 +-
 tools/win32/jhbuildrc.py |    1 +
 tools/win32/moduleset.in |   15 ++++++++++++---
 3 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/tools/win32/ChangeLog b/tools/win32/ChangeLog
index c9fe524..a172f35 100644
--- a/tools/win32/ChangeLog
+++ b/tools/win32/ChangeLog
@@ -2,7 +2,7 @@
 
        * moduleset.in: libdatrie to 0.2.6; libthai to 0.1.19; libxslt to
        1.1.28; gtk-doc to 1.19; new harfbuzz module; pango to 1.35.0; atk
-       to 2.9.3; cairo grows glib dep.
+       to 2.9.3; new gdk-pixbuf module; cairo grows glib dep.
 
 2013-07-20  Morten Welinder  <terra gnome org>
 
diff --git a/tools/win32/jhbuildrc.py b/tools/win32/jhbuildrc.py
index ad1c819..ca07353 100644
--- a/tools/win32/jhbuildrc.py
+++ b/tools/win32/jhbuildrc.py
@@ -156,6 +156,7 @@ module_autogenargs['libxslt']       = autogenargs + """ --without-crypto"""
 autogenargs += """ --disable-scrollkeeper --disable-gtk-doc"""
 
 module_autogenargs['atk']      = autogenargs + """ --disable-glibtest --enable-introspection=no"""
+module_autogenargs['gdk-pixbuf'] = autogenargs + """ --disable-introspection  --without-libtiff"""
 module_autogenargs['gtk+']     = autogenargs + """ --disable-glibtest --enable-gdiplus --without-libjasper  
--without-libtiff --without-libjpeg --enable-cups=no --enable-introspection=no"""
 
 module_autogenargs['libgda']   = autogenargs + """ --without-odbc --without-java --without-libsoup"""
diff --git a/tools/win32/moduleset.in b/tools/win32/moduleset.in
index 69ca208..73336c1 100644
--- a/tools/win32/moduleset.in
+++ b/tools/win32/moduleset.in
@@ -203,12 +203,21 @@
        </dependencies>
     </autotools>
 
+    <autotools id="gdk-pixbuf">
+       <branch repo="gnome.org" module="sources/gdk-pixbuf/2.29/gdk-pixbuf-2.29.2.tar.xz"
+               version="2.29.2">
+       </branch>
+       <dependencies>
+           <dep package="glib"/>
+           <dep package="jpeg"/>
+       </dependencies>
+    </autotools>
+
     <autotools id="gtk+">
-       <branch repo="gnome.org" module="sources/gtk+/2.20/gtk+-2.20.0.tar.bz2"
-               version="2.18.5">
+       <branch repo="gnome.org" module="sources/gtk+/3.9/gtk+-3.9.8.tar.xz"
+               version="3.9.8">
            <patch file="&patch_dir;gtk-disable-demo.patch"/>
            <patch file="&patch_dir;gtk-use-wine-to-cross-compile.patch"/>
-           <patch file="&patch_dir;gtk-gdk-expose-order.patch" strip="1"/>
            <patch file="&patch_dir;gtk-gtkprintoperation-win32.patch" strip="1"/>
        </branch>
        <dependencies>