[gnumeric] win32: pixman, fontconfig, freetype, libxml2, cairo.

[Morten Welinder <mortenw src gnome org>]

commit 029e4096e6ecc5d671a86df872e3208cf781ee52
Author: Morten Welinder <terra gnome org>
Date:   Sat Jul 20 19:00:22 2013 -0400

    win32: pixman, fontconfig, freetype, libxml2, cairo.

 tools/win32/ChangeLog    |    5 +++++
 tools/win32/jhbuildrc.py |    4 +++-
 tools/win32/moduleset.in |   17 ++++++++---------
 3 files changed, 16 insertions(+), 10 deletions(-)
---
diff --git a/tools/win32/ChangeLog b/tools/win32/ChangeLog
index 7aa1080..1fdfa34 100644
--- a/tools/win32/ChangeLog
+++ b/tools/win32/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-20  Morten Welinder  <mwelinder gmail com>
+
+       * moduleset.in: Update pixman to 0.30.0, freetype to 2.5.0,
+       libxml2 to 2.9.1, fontconfig to 2.10.93, and cairo to 1.12.14.
+
 2013-07-17  Morten Welinder  <terra gnome org>
 
        * moduleset.in: Update zlib to 1.2.8.  Update gettext to 0.18.
diff --git a/tools/win32/jhbuildrc.py b/tools/win32/jhbuildrc.py
index 129a7b3..d905900 100644
--- a/tools/win32/jhbuildrc.py
+++ b/tools/win32/jhbuildrc.py
@@ -122,7 +122,7 @@ module_autogenargs['glib']  =    autogenargs + """ --enable-explicit-deps=no \
                                                   --disable-gtk-doc"""
 module_autogenargs['freetype']  = autogenargs
 module_autogenargs['png']  = autogenargs + """ --without-libpng-compat"""
-module_autogenargs['fontconfig']= autogenargs + """ --with-arch=x86"""
+module_autogenargs['fontconfig']= autogenargs + """ --with-arch=x86 --enable-libxml2"""
 module_autogenargs['pango']    = autogenargs + """ --disable-gtk-doc \
                                                   --enable-explicit-deps=no \
                                                   --with-included-modules"""
@@ -137,6 +137,8 @@ module_autogenargs['cairo'] = autogenargs + """ --enable-explicit-deps=no \
                                                   --enable-xlib-xrender=no \
                                                   --enable-win32-font=yes \
                                                  --enable-ft=yes \
+                                                 --enable-xcb=no \
+                                                 --enable-gobject=no \
                                                  --disable-static \
                                                  --enable-shared"""
 #                                                --enable-ft=no
diff --git a/tools/win32/moduleset.in b/tools/win32/moduleset.in
index a94e29c..89b2c85 100644
--- a/tools/win32/moduleset.in
+++ b/tools/win32/moduleset.in
@@ -108,13 +108,13 @@
 <!-- Gtk stack -->
     <autotools id="pixman">
        <branch repo="cairographics"
-               module="pixman-0.17.2.tar.gz"
-               version="0.17.2"/>
+               module="pixman-0.30.0.tar.gz"
+               version="0.30.0"/>
     </autotools>
     <autotools id="cairo">
        <branch repo="cairographics"
-               module="cairo-1.8.8.tar.gz"
-               version="1.8.8">
+               module="cairo-1.12.14.tar.xz"
+               version="1.12.14">
        </branch>
        <dependencies>
            <dep package="zlib"/>
@@ -157,15 +157,14 @@
 
     <autotools id="freetype"
        autogen-sh="configure"  skip-autogen="never">
-       <branch repo="savannah" module="freetype/freetype-2.3.11.tar.bz2" version="2.3.11"/>
+       <branch repo="savannah" module="freetype/freetype-2.5.0.tar.bz2" version="2.3.11"/>
        <dependencies>
        </dependencies>
     </autotools>
 
     <autotools id="fontconfig"
        autogen-sh="autoreconf"  skip-autogen="never">
-       <branch repo="fontconfig" module="fontconfig-2.8.0.tar.gz" version="2.8.0">
-           <patch file="&patch_dir;fontconfig-CC.patch"/>
+       <branch repo="fontconfig" module="fontconfig-2.10.93.tar.bz2" version="2.10.93">
        </branch>
        <dependencies>
            <dep package="freetype"/>
@@ -210,8 +209,8 @@
     </autotools>
 
 <!-- glade stack -->
-    <tarball id="libxml2" version="2.7.7">
-       <source href="ftp://xmlsoft.org/libxml2/libxml2-2.7.7.tar.gz"/>
+    <tarball id="libxml2" version="2.9.1">
+       <source href="ftp://xmlsoft.org/libxml2/libxml2-2.9.1.tar.gz"/>
        <dependencies>
            <dep package="zlib"/>
        </dependencies>