[gnumeric] win32: pango.

[Morten Welinder <mortenw src gnome org>]

commit 2c5e004f39ebd8b440c0a8ded093f7261ae3e9f0
Author: Morten Welinder <terra gnome org>
Date:   Sat Jul 27 12:35:21 2013 -0400

    win32: pango.

 tools/win32/ChangeLog    |    3 ++-
 tools/win32/jhbuildrc.py |    4 +++-
 tools/win32/moduleset.in |    8 ++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/tools/win32/ChangeLog b/tools/win32/ChangeLog
index 80e6ad7..5ac5742 100644
--- a/tools/win32/ChangeLog
+++ b/tools/win32/ChangeLog
@@ -1,7 +1,8 @@
 2013-07-27  Morten Welinder  <terra gnome org>
 
        * moduleset.in: libdatrie to 0.2.6; libthai to 0.1.19; libxslt to
-       1.1.28; gtk-doc to 1.19; cairo grows glib dep.
+       1.1.28; gtk-doc to 1.19; new harfbuzz module; pango to 1.35.0;
+       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 5ac1880..ad1c819 100644
--- a/tools/win32/jhbuildrc.py
+++ b/tools/win32/jhbuildrc.py
@@ -126,7 +126,9 @@ module_autogenargs['png']  = autogenargs + """ --without-libpng-compat"""
 module_autogenargs['fontconfig']= autogenargs + """ --with-arch=x86 --enable-libxml2"""
 module_autogenargs['pango']    = autogenargs + """ --disable-gtk-doc \
                                                   --enable-explicit-deps=no \
-                                                  --with-included-modules"""
+                                                 --disable-introspection \
+                                                 --with-xft=no \
+                                                  --with-included-modules=no"""
 #                                                --disable-ft
 module_autogenargs['pixman']   = autogenargs + """ --enable-explicit-deps=no \
                                                   --enable-gtk=no \
diff --git a/tools/win32/moduleset.in b/tools/win32/moduleset.in
index f9b4f4f..619a15c 100644
--- a/tools/win32/moduleset.in
+++ b/tools/win32/moduleset.in
@@ -179,9 +179,12 @@
        </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>
+
     <autotools id="pango">
-       <branch repo="gnome.org" module="sources/pango/1.28/pango-1.28.0.tar.bz2" version="1.28.0">
-         <patch file="&patch_dir;pango-no-introspection.patch"/>
+       <branch repo="gnome.org" module="sources/pango/1.35/pango-1.35.0.tar.xz" version="1.35.0">
        </branch>
        <dependencies>
            <dep package="freetype"/>
@@ -189,6 +192,7 @@
            <dep package="glib"/>
            <dep package="libthai"/>
            <dep package="gtk-doc"/>
+           <dep package="harfbuzz"/>
        </dependencies>
     </autotools>