[gnumeric] win32: libgsf

[Morten Welinder <mortenw src gnome org>]

commit 6297af12d829b119a9e2980643f68ecf288dbc06
Author: Morten Welinder <terra gnome org>
Date:   Thu Aug 1 18:48:35 2013 -0400

    win32: libgsf

 tools/win32/ChangeLog    |    4 ++++
 tools/win32/jhbuildrc.py |    2 +-
 tools/win32/moduleset.in |    6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/tools/win32/ChangeLog b/tools/win32/ChangeLog
index a172f35..8af61a9 100644
--- a/tools/win32/ChangeLog
+++ b/tools/win32/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-01  Morten Welinder  <terra gnome org>
+
+       * moduleset.in: libgsf to 1.14.28.
+
 2013-07-27  Morten Welinder  <terra gnome org>
 
        * moduleset.in: libdatrie to 0.2.6; libthai to 0.1.19; libxslt to
diff --git a/tools/win32/jhbuildrc.py b/tools/win32/jhbuildrc.py
index 9197cd3..ea6b52e 100644
--- a/tools/win32/jhbuildrc.py
+++ b/tools/win32/jhbuildrc.py
@@ -162,7 +162,7 @@ module_autogenargs['libgda']        = autogenargs + """ --without-odbc --without-java -
 module_autogenargs['pxlib']    = autogenargs + """ --with-gsf=""" + prefix
 module_autogenargs['libglade'] = autogenargs
 module_autogenargs['pygobject']        = autogenargs + """ --without-ffi --without-gio-unix"""
-module_autogenargs['libgsf']   = autogenargs + """ --without-gnome-vfs --without-bonobo"""
+module_autogenargs['libgsf']   = autogenargs + """ --disable-introspection"""
 module_autogenargs['goffice']  = autogenargs + """ --without-gconf --with-gmathml --without-long-double"""
 module_autogenargs['gnumeric'] = autogenargs + """ --disable-component --without-perl"""
 module_autogenargs['poppler']  = autogenargs + """ --disable-cms"""
diff --git a/tools/win32/moduleset.in b/tools/win32/moduleset.in
index 73336c1..06923f0 100644
--- a/tools/win32/moduleset.in
+++ b/tools/win32/moduleset.in
@@ -218,7 +218,7 @@
                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-gtkprintoperation-win32.patch" strip="1"/>
+           <patch file="&patch_dir;gtk-warp-prototype.patch" strip="1"/>
        </branch>
        <dependencies>
            <dep package="glib"/>
@@ -331,11 +331,11 @@
 
 <!-- Gnumeric stack -->
     <autotools id="libgsf">
-       <branch repo="gnome.org" module="sources/libgsf/1.14/libgsf-1.14.21.tar.gz" version="1.14.21">
+       <branch repo="gnome.org" module="sources/libgsf/1.14/libgsf-1.14.28.tar.xz" version="1.14.28">
        </branch>
        <dependencies>
            <dep package="glib"/>
-           <dep package="gtk+"/> <!-- make sure gdkpixbuf does not pick up external gtk -->
+           <dep package="gdk-pixbuf"/>
            <dep package="libxml2"/>
            <dep package="zlib"/>
            <dep package="libbz2"/>