[gnumeric] make python-loader build for win32, not sure it will work.

[Jean Bréfort <jbrefort src gnome org>]

commit b20f7674f2ea677a087537783f74b89c7aac5550
Author: Jean Brefort <jean brefort normalesup org>
Date:   Sun Feb 14 13:35:53 2010 +0100

    make python-loader build for win32, not sure it will work.

 tools/win32/build                                |    4 +-
 tools/win32/jhbuildrc.py                         |    2 +-
 tools/win32/moduleset.in                         |    4 ++-
 tools/win32/patches/gtk-doc-disable-python.patch |   12 +++---
 tools/win32/patches/pygconsts.patch              |   11 ++++++
 tools/win32/patches/pygobject-configure.patch    |   42 ++++++++++++++++++++++
 6 files changed, 65 insertions(+), 10 deletions(-)
---
diff --git a/tools/win32/build b/tools/win32/build
index 7ea262f..d7d72d7 100755
--- a/tools/win32/build
+++ b/tools/win32/build
@@ -79,8 +79,8 @@ setup_html_help() {
 	wine msiexec /i ${py_pkg}
     fi
     build_ls_s "${WINEDIR}/Python${py_ver}"			 	"Python${py_ver}" 
-    build_ls_s "${WINEDIR}/windows/system32/python${py_ver}.dll" 	"bin/libpython${py_ver}.dll"
-    build_ls_s "${WINEDIR}/Python${py_ver}/libs/python${py_ver}.lib"	"lib/libpython${py_ver}.dll.a"
+    build_ls_s "${WINEDIR}/windows/system32/python${py_ver}.dll" 	"bin/python${py_ver}.dll"
+    build_ls_s "${WINEDIR}/Python${py_ver}/libs/libpython${py_ver}.a"	"lib/libpython${py_ver}.dll.a"
 
 # Download HTML Help
     if [ ! -f "${archive_dir}/htmlhelp.exe" ]; then
diff --git a/tools/win32/jhbuildrc.py b/tools/win32/jhbuildrc.py
index 9bb6cc2..cd65630 100644
--- a/tools/win32/jhbuildrc.py
+++ b/tools/win32/jhbuildrc.py
@@ -144,7 +144,7 @@ module_autogenargs['gtk+']	= autogenargs + """ --disable-glibtest --enable-gdipl
 module_autogenargs['libgda']	= autogenargs + """ --without-odbc --without-java --without-libsoup"""
 module_autogenargs['pxlib']	= autogenargs + """ --with-gsf=""" + prefix
 module_autogenargs['libglade']	= autogenargs
-module_autogenargs['pygobject']	= autogenargs
+module_autogenargs['pygobject']	= autogenargs + """ --without-ffi --without-gio-unix"""
 module_autogenargs['libgsf']	= autogenargs + """ --without-gnome-vfs --without-bonobo"""
 module_autogenargs['goffice']	= autogenargs + """ --without-gconf --with-gmathml"""
 module_autogenargs['gnumeric']	= autogenargs + """ --disable-component"""
diff --git a/tools/win32/moduleset.in b/tools/win32/moduleset.in
index 9d7f034..770d1fe 100644
--- a/tools/win32/moduleset.in
+++ b/tools/win32/moduleset.in
@@ -57,7 +57,7 @@
 
     <autotools id="gtk-doc"
 	autogen-sh="autoreconf"  skip-autogen="never">
-	<branch repo="gnome.org" module="sources/gtk-doc/1.11/gtk-doc-1.11.tar.bz2" version="1.11">
+	<branch repo="gnome.org" module="sources/gtk-doc/1.13/gtk-doc-1.13.tar.bz2" version="1.13">
 	    <patch file="&patch_dir;gtk-doc-disable-python.patch"/>
 	</branch>
 	<suggests>
@@ -232,6 +232,8 @@
 		version="2.20.0">
 	    <patch file="&patch_dir;pygobject.patch"/>
 	    <patch file="&patch_dir;pygiochannel.patch"/>
+	    <patch file="&patch_dir;pygobject-configure.patch"/>
+	    <patch file="&patch_dir;pygconsts.patch"/>
 	</branch>
 
 	<dependencies>
diff --git a/tools/win32/patches/gtk-doc-disable-python.patch b/tools/win32/patches/gtk-doc-disable-python.patch
index 0564310..2f9fa05 100644
--- a/tools/win32/patches/gtk-doc-disable-python.patch
+++ b/tools/win32/patches/gtk-doc-disable-python.patch
@@ -1,11 +1,11 @@
---- configure.in	2008-10-16 14:50:35.000000000 -0400
-+++ configure.in	2009-10-10 07:20:59.000000000 -0400
-@@ -45,7 +45,7 @@
+--- configure.ac	2009-12-18 10:05:54.000000000 +0100
++++ configure.ac.new	2010-02-14 09:24:23.207538964 +0100
+@@ -51,7 +51,7 @@
  dnl
  dnl Check for Python.
  dnl
--AM_PATH_PYTHON([2.3],,)
-+dnl AM_PATH_PYTHON([2.3],,)
- AM_CONDITIONAL([HAVE_PYTHON], [test -n "$PYTHON"])
+-AM_PATH_PYTHON([2.3],,[:])
++dnl AM_PATH_PYTHON([2.3],,[:])
+ AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
  
  dnl
diff --git a/tools/win32/patches/pygconsts.patch b/tools/win32/patches/pygconsts.patch
new file mode 100644
index 0000000..627eac5
--- /dev/null
+++ b/tools/win32/patches/pygconsts.patch
@@ -0,0 +1,11 @@
+--- gobject/generate-constants.c.orig	2010-02-13 17:09:17.607115911 +0100
++++ gobject/generate-constants.c	2010-02-13 17:09:39.663240878 +0100
+@@ -15,7 +15,7 @@
+   printf("G_MINFLOAT = %f\n", G_MINFLOAT);
+   printf("G_MAXFLOAT = %f\n", G_MAXFLOAT);
+   printf("G_MINDOUBLE = %f\n", G_MINDOUBLE);
+-  printf("G_MAXDOUBLE = %f\n", G_MAXDOUBLE);
++  printf("G_MAXDOUBLE = %g\n", G_MAXDOUBLE);
+   printf("G_MINSHORT = %d\n", G_MINSHORT);
+   printf("G_MAXSHORT = %d\n", G_MAXSHORT);
+   printf("G_MAXUSHORT = %u\n", G_MAXUSHORT);
diff --git a/tools/win32/patches/pygobject-configure.patch b/tools/win32/patches/pygobject-configure.patch
new file mode 100644
index 0000000..03c075d
--- /dev/null
+++ b/tools/win32/patches/pygobject-configure.patch
@@ -0,0 +1,42 @@
+--- configure.ac.orig	2009-09-23 21:50:00.000000000 +0200
++++ configure.ac	2010-02-13 22:05:28.071571958 +0100
+@@ -192,14 +192,22 @@
+ fi
+ 
+ dnl giounix
+-PKG_CHECK_MODULES(GIOUNIX, gio-unix-2.0 >= giounix_required_version,
+-	have_giounix=true, have_giounix=false)
+-AC_SUBST(GIOUNIX_CFLAGS)
+-AC_SUBST(GIOUNIX_LIBS)
+-AM_CONDITIONAL(BUILD_GIOUNIX, $have_giounix)
+-if test -n "$export_dynamic"; then
+-  GIOUNIX_LIBS=`echo $GIOUNIX_LIBS | sed -e "s/$export_dynamic//"`
++AC_ARG_WITH(gio-unix,
++  AC_HELP_STRING([--without-gio-unix], [Disable gio-unix support]),
++  with_giounix=$withval,
++  with_giounix=auto)
++if test x"$with_gio_unix" = xno ; then
++  have_giounix=false
++else
++  PKG_CHECK_MODULES(GIOUNIX, gio-unix-2.0 >= giounix_required_version,
++    have_giounix=true, have_giounix=false)
++  AC_SUBST(GIOUNIX_CFLAGS)
++  AC_SUBST(GIOUNIX_LIBS)
++  if test -n "$export_dynamic"; then
++    GIOUNIX_LIBS=`echo $GIOUNIX_LIBS | sed -e "s/$export_dynamic//"`
++  fi
+ fi
++AM_CONDITIONAL(BUILD_GIOUNIX, $have_giounix)
+ 
+ dnl gobject_introspection
+ PKG_CHECK_MODULES(GOBJECT_INTROSPECTION, gobject-introspection-1.0 >= gobject_introspection_required_version,
+@@ -244,6 +252,9 @@
+   PKG-INFO)
+ AC_OUTPUT
+ 
++# fix path in Makefiles
++for i in Makefile */Makefile; do sed -i "s/\\\\Lib\\\\/\/lib\/python2.6\//" $i;done
++
+ echo
+ echo "libffi support: $have_libffi"
+ echo