[gnumeric] win32: update gtk+, pnago, gdk-pixbuf etc to latest.

[Morten Welinder <mortenw src gnome org>]

commit 626b670018c637a281013ab501fe5d050394a8a9
Author: Morten Welinder <terra gnome org>
Date:   Tue Aug 26 22:38:35 2014 -0400

    win32: update gtk+, pnago, gdk-pixbuf etc to latest.

 tools/win32/jhbuildrc.py                   |    6 +++---
 tools/win32/moduleset.in                   |   28 ++++++++++++++--------------
 tools/win32/patches/gtk-disable-demo.patch |    4 ++--
 3 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/tools/win32/jhbuildrc.py b/tools/win32/jhbuildrc.py
index c497b72..d7df805 100644
--- a/tools/win32/jhbuildrc.py
+++ b/tools/win32/jhbuildrc.py
@@ -72,9 +72,9 @@ os.environ['LDFLAGS']  \
        = ' -mno-cygwin' \
        + ' -L' + os.path.join(os.sep, prefix, 'lib') \
        + ' -L' + os.path.join(os.sep, prefix, 'lib64')
-os.environ['CFLAGS']    = _optim + ' -mno-cygwin -mms-bitfields -march=i686 ' + ' -I' + os.path.join(os.sep, 
prefix, 'include')
-os.environ['CPPLAGS']   = _optim + ' -mno-cygwin -mms-bitfields -march=i686 ' + ' -I' + os.path.join(os.sep, 
prefix, 'include')
-os.environ['CXXLAGS']   = _optim + ' -mno-cygwin -mms-bitfields -march=i686 ' + ' -I' + os.path.join(os.sep, 
prefix, 'include')
+os.environ['CFLAGS']    = _optim + ' -DWINVER=0x501 -D_WIN32_IE=0x501 -mno-cygwin -mms-bitfields -march=i686 
' + ' -I' + os.path.join(os.sep, prefix, 'include')
+os.environ['CPPLAGS']   = _optim + ' -DWINVER=0x501 -D_WIN32_IE=0x501 -mno-cygwin -mms-bitfields -march=i686 
' + ' -I' + os.path.join(os.sep, prefix, 'include')
+os.environ['CXXLAGS']   = _optim + ' -DWINVER=0x501 -D_WIN32_IE=0x501 -mno-cygwin -mms-bitfields -march=i686 
' + ' -I' + os.path.join(os.sep, prefix, 'include')
 os.environ['ARFLAGS']   = 'rcs'
 os.environ['INSTALL']   = os.path.expanduser('~/bin/install-check')
 os.environ['ACLOCAL_AMFLAGS'] = ' -I m4 -I '+prefix+'/share/aclocal'   # for libgnomedb
diff --git a/tools/win32/moduleset.in b/tools/win32/moduleset.in
index efcd47e..41ebc8c 100644
--- a/tools/win32/moduleset.in
+++ b/tools/win32/moduleset.in
@@ -137,9 +137,9 @@
 <!-- Gtk stack -->
     <autotools id="pixman">
        <branch repo="cairographics"
-               module="pixman-0.30.0.tar.gz"
-               version="0.30.0">
-         <patch file="&patch_dir;pixman-crash.patch" strip="1"/>
+               module="pixman-0.32.6.tar.gz"
+               version="0.32.6">
+         <!-- <patch file="&patch_dir;pixman-crash.patch" strip="1"/> -->
        </branch>
     </autotools>
     <autotools id="cairo">
@@ -204,14 +204,14 @@
        </dependencies>
     </autotools>
 
-    <tarball id="harfbuzz" version="0.9.19">
-      <source href="http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.19.tar.bz2"/>
+    <tarball id="harfbuzz" version="0.9.35">
+      <source href="http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.35.tar.bz2"/>
     </tarball>
 
     <autotools id="pango">
        <branch repo="gnome.org"
-               module="sources/pango/1.35/pango-1.35.0.tar.xz"
-               version="1.35.0"
+               module="sources/pango/1.36/pango-1.36.6.tar.xz"
+               version="1.36.6"
                skip-autogen="never">
          <!-- <patch file="&patch_dir;pango-destdir.patch" strip="1"/> -->
        </branch>
@@ -226,7 +226,7 @@
     </autotools>
 
     <autotools id="atk">
-       <branch repo="gnome.org" module="sources/atk/2.9/atk-2.9.3.tar.xz" version="2.9.3"/>
+       <branch repo="gnome.org" module="sources/atk/2.13/atk-2.13.3.tar.xz" version="2.13.3"/>
        <dependencies>
            <dep package="glib"/>
        </dependencies>
@@ -234,8 +234,8 @@
 
     <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"
+               module="sources/gdk-pixbuf/2.31/gdk-pixbuf-2.31.0.tar.xz"
+               version="2.31.0"
                skip-autogen="never">
          <patch file="&patch_dir;gdk-pixbuf-destdir.patch" strip="1"/>
          <patch file="&patch_dir;gdk-pixbuf-queryloaders.patch" strip="1"/>
@@ -248,13 +248,13 @@
     </autotools>
 
     <autotools id="gtk+">
-       <branch repo="gnome.org" module="sources/gtk+/3.10/gtk+-3.10.6.tar.xz"
-               version="3.10.6">
+       <branch repo="gnome.org" module="sources/gtk+/3.13/gtk+-3.13.7.tar.xz"
+               version="3.13.7">
            <patch file="&patch_dir;gtk-disable-demo.patch"/>
            <patch file="&patch_dir;gtk-use-wine-to-cross-compile.patch"/>
-           <patch file="&patch_dir;gtk-release-flux.patch" strip="1"/>
+<!--       <patch file="&patch_dir;gtk-release-flux.patch" strip="1"/> -->
 <!--       <patch file="&patch_dir;gtk-b705980.patch" strip="1"/> -->
-           <patch file="&patch_dir;gtk-gtkwin32embedwidget.patch" strip="1"/>
+<!--       <patch file="&patch_dir;gtk-gtkwin32embedwidget.patch" strip="1"/> -->
        </branch>
        <dependencies>
            <dep package="glib"/>
diff --git a/tools/win32/patches/gtk-disable-demo.patch b/tools/win32/patches/gtk-disable-demo.patch
index f64a38b..b413157 100644
--- a/tools/win32/patches/gtk-disable-demo.patch
+++ b/tools/win32/patches/gtk-disable-demo.patch
@@ -5,7 +5,7 @@
   ## Makefile.am for GTK+
   include $(top_srcdir)/Makefile.decl
   
-! SRC_SUBDIRS = gdk gtk libgail-util modules demos tests testsuite examples
+! SRC_SUBDIRS = util gdk gtk libgail-util modules demos tests testsuite examples
   SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
   
   # require automake 1.4
@@ -13,7 +13,7 @@
   ## Makefile.am for GTK+
   include $(top_srcdir)/Makefile.decl
   
-! SRC_SUBDIRS = gdk gtk libgail-util modules
+! SRC_SUBDIRS = util gdk gtk libgail-util modules
   SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
   
   # require automake 1.4