[gnumeric] [win32] update build

From: Jody Goldberg <jody src gnome org>
To: svn-commits-list gnome org
Subject: [gnumeric] [win32] update build
Date: Fri, 8 May 2009 01:04:28 -0400 (EDT)
commit 7d88c6dca9197f5a75174146aa9318a622586674
Author: Jody Goldberg <jody gnome org>
Date:   Fri May 8 01:02:23 2009 -0400

    [win32] update build
    
        - Use newer libdatrie, libthai, glib, gtk, gda
        - Add gnu iconv for libdatrie
        - DOWNGRADE cairo to 1.8.2 to fix crash when draggin charts
        - minor build fixes for zlib
        - remove stale gtk patches
        - move to git
        - add freetype/fontconfig to work towards evince
        - add gmathml - get pygobject building smoothly - start wrapper to setup external links in the hopes of getting a turn-key build.
---
 BUGS                                           |   27 ++++
 Makefile.am                                    |    2 +-
 NEWS                                           |    3 +
 configure.in                                   |    5 +-
 doc/C/gnumeric.xml                             |    3 +-
 src/main-application.c                         |    6 +
 src/print-cell.c                               |    4 +-
 src/wbc-gtk-actions.c                          |    8 +
 tools/win32/gdk-pixbuf.loaders                 |  122 ++++++++++++++++
 tools/win32/gnumeric.nsi.in                    |   13 +-
 tools/win32/gtk.immodules                      |   38 +++++
 tools/win32/gtkrc                              |    3 +
 tools/win32/jhbuildrc-debug                    |   22 ++--
 tools/win32/jhbuildrc-release                  |   10 +-
 tools/win32/moduleset                          |  177 +++++++++++++++++-------
 tools/win32/patches/fontconfig-CC.patch        |   60 ++++++++
 tools/win32/patches/glib_win32_cachefile.patch |    6 +
 tools/win32/patches/gtk-VK_DECIMAL.patch       |   19 ---
 tools/win32/patches/libart.patch               |   11 --
 tools/win32/patches/libthai.patch              |   30 +++--
 tools/win32/patches/pygobject.patch            |  105 ++++-----------
 tools/win32/patches/zlib.patch                 |    2 +-
 tools/win32/setup                              |    8 +
 23 files changed, 489 insertions(+), 195 deletions(-)

diff --git a/BUGS b/BUGS
index cc11ea1..c6db346 100644
--- a/BUGS
+++ b/BUGS
@@ -769,13 +769,38 @@ Architecture Changes
 
 41) win32
     41.1) Fix preview [#533795]
+	41.1.1) port over evince based preview from unix
+	    41.1.1.1) port it					(DONE)
+	    41.1.1.2) patch glib [#566348]
     41.2) python installation [#549387]
+	41.2.1) pygobject build fix				(DONE)
+	41.2.2) automate pygobject build fix			(DONE)
+	41.2.3) package pygobject
+	41.2.4) install pygobject
     41.3) libbz2 not found for libgsf				(DONE)
     41.4) hhmap
 	41.4.1) how to generate
 	41.4.2) include in the installer
     41.5) optionally add quicklaunch & desktop links
     41.6) long pause between license and screen ?
+    41.7) version dll.a the same way the .dll is handled
+    41.8) Fix Paradox build
+	41.8.1) find solution					(DONE)
+	41.8.2) automate solution
+    41.9) Add MS Office processing instruction hooks for us
+    41.10) freetype
+	41.10.1) fix build					(DONE)
+	41.10.2) extend jhbuild to automate fix			(DONE)
+	41.10.3) get patch into mainline [#566437]
+    41.11) fontconfig
+	41.11.1) jpg not found
+	41.11.2) zlib not found
+	41.11.3) CPPFLAGS patch
+    41.12) evince
+	41.12.1) totem screensaver disable
+	    41.12.1.1) make patch
+	41.12.2) session management
+	41.12.3) direct connection to unix print backend
 
 autoformat
 ----------
@@ -839,3 +864,5 @@ General Ideas
     - 'Custom' autofilter type to eval expr per cell
     - autofilter : refresh
     - macro hook in validation to run proc if valid
+
+/* vim : ai, ts=8, sw=4, expandtab */
diff --git a/Makefile.am b/Makefile.am
index 0773b3c..e1bd6dd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = . po po-functions src plugins component icons templates doc tools schemas test
+SUBDIRS = . po po-functions src plugins icons templates doc tools schemas test
 
 XML_I18N_XML_KIND = --pass-through
 
diff --git a/NEWS b/NEWS
index 85f00dd..140ed9d 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,9 @@ Andreas:
 	* Save and load text formatting of comments [#580838]
 	* Save and load text formatting of sheet object labels [#580979]	
 
+Jody:
+	* Closer to a turnkey win32 build.
+
 Morten:
 	* Optimize styles on load.
 
diff --git a/configure.in b/configure.in
index 68c88df..666ae1a 100644
--- a/configure.in
+++ b/configure.in
@@ -655,7 +655,10 @@ SAVE_LIBS=$LIBS
 CFLAGS="$CFLAGS $GNUMERIC_CFLAGS"
 LIBS="$GNUMERIC_LIBS $LIBS"
 
-AC_CHECK_FUNCS(g_date_set_time_t g_slice_alloc pango_font_map_create_context gtk_recent_manager_get_default gtk_orientable_set_orientation gtk_adjustment_configure gsf_open_pkg_foreach_rel gsf_infile_msvba_steal_modules)
+AC_CHECK_FUNCS(g_date_set_time_t g_slice_alloc g_option_context_set_delocalize)
+AC_CHECK_FUNCS(pango_font_map_create_context)
+AC_CHECK_FUNCS(gtk_recent_manager_get_default gtk_orientable_set_orientation gtk_adjustment_configure gsf_open_pkg_foreach_rel)
+AC_CHECK_FUNCS(gsf_infile_msvba_steal_modules)
 
 AC_MSG_CHECKING([for PANGO_WEIGHT_THIN etc.])
 AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pango/pango.h>]],
diff --git a/doc/C/gnumeric.xml b/doc/C/gnumeric.xml
index 061fff0..ea2f60e 100644
--- a/doc/C/gnumeric.xml
+++ b/doc/C/gnumeric.xml
@@ -165,7 +165,6 @@
 -->
 
 <!-- =============Document Header ============================= -->
-<?dbhh topicname="BARF" topicid="4200"?>
 <book id="index" lang="en">
 <!-- please do not change the id; for translations, change lang to -->
 <!-- appropriate code -->
@@ -891,4 +890,4 @@
 
 
 </book>
-
+<?dbhh topicname="BARF" topicid="4200"?>
diff --git a/src/main-application.c b/src/main-application.c
index dfb6f66..434d9cd 100644
--- a/src/main-application.c
+++ b/src/main-application.c
@@ -171,6 +171,12 @@ gnumeric_arg_parse (int argc, char **argv)
 	g_option_context_add_main_entries (ocontext, gnumeric_options, GETTEXT_PACKAGE);
 	g_option_context_add_group	  (ocontext, gnm_get_option_group ());
 
+#ifdef G_OS_WIN32
+	/* we have already translated to utf8, do not do it again.
+	 * http://bugzilla.gnome.org/show_bug.cgi?id=361321 */
+	g_option_context_set_delocalize   (ocontext, FALSE);
+#endif
+
 #ifdef GNM_WITH_GNOME
 #ifndef GNOME_PARAM_GOPTION_CONTEXT
 	/*
diff --git a/src/print-cell.c b/src/print-cell.c
index 424a636..4ffe373 100644
--- a/src/print-cell.c
+++ b/src/print-cell.c
@@ -100,7 +100,7 @@ print_cell_gtk (GnmCell const *cell, GnmStyle const *mstyle,
 
 		/* Clip the printed rectangle */
 		cairo_save (context);
-
+#if 0
 		if (!rv->rotation) {
 			/* We do not clip rotated cells.  */
 			cairo_new_path (context);
@@ -108,7 +108,7 @@ print_cell_gtk (GnmCell const *cell, GnmStyle const *mstyle,
 					 width + 1, height + 1);
 			cairo_clip (context);
 		}
-
+#endif
 		/* Set the font colour */
 		cairo_set_source_rgb (context,
 			 UINT_RGBA_R (fore_color) / 255.,
diff --git a/src/wbc-gtk-actions.c b/src/wbc-gtk-actions.c
index 772424d..1826e26 100644
--- a/src/wbc-gtk-actions.c
+++ b/src/wbc-gtk-actions.c
@@ -105,6 +105,14 @@ static GNM_ACTION_DEF (cb_file_open)	{ gui_file_open (wbcg, NULL); }
 static GNM_ACTION_DEF (cb_file_save)	{ gui_file_save (wbcg, wb_control_view (WORKBOOK_CONTROL (wbcg))); }
 static GNM_ACTION_DEF (cb_file_save_as)	{ gui_file_save_as (wbcg, wb_control_view (WORKBOOK_CONTROL (wbcg))); }
 
+#ifndef HAVE_MKDTEMP
+#include <mathfunc.h>
+#ifdef G_OS_WIN32
+#include <process.h>
+#include <errno.h>
+#endif
+#endif
+
 static GNM_ACTION_DEF (cb_file_sendto) {
 	WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
 	WorkbookView *wbv = wb_control_view (wbc);
diff --git a/tools/win32/gdk-pixbuf.loaders b/tools/win32/gdk-pixbuf.loaders
new file mode 100644
index 0000000..36fc827
--- /dev/null
+++ b/tools/win32/gdk-pixbuf.loaders
@@ -0,0 +1,122 @@
+# GdkPixbuf Image Loader Modules file
+# Created by gdk-pixbuf-query-loaders from gtk+-2.15.0
+#
+# LoaderDir = /local/jody/target/lib/gtk-2.0/2.10.0/loaders
+#
+"/local/jody/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll"
+"jpeg" 5 "gtk20" "The JPEG image format"
+"image/jpeg" ""
+"jpeg" "jpe" "jpg" ""
+"\377\330" "" 100
+
+"/local/jody/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll"
+"pnm" 4 "gtk20" "The PNM/PBM/PGM/PPM image format family"
+"image/x-portable-anymap" "image/x-portable-bitmap" "image/x-portable-graymap" "image/x-portable-pixmap" ""
+"pnm" "pbm" "pgm" "ppm" ""
+"P1" "" 100
+"P2" "" 100
+"P3" "" 100
+"P4" "" 100
+"P5" "" 100
+"P6" "" 100
+
+"/local/jody/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll"
+"pcx" 4 "gtk20" "The PCX image format"
+"image/x-pcx" ""
+"pcx" ""
+"\n \001" "" 100
+"\n\002\001" "" 100
+"\n\003\001" "" 100
+"\n\004\001" "" 100
+"\n\005\001" "" 100
+
+"/local/jody/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll"
+"xpm" 4 "gtk20" "The XPM image format"
+"image/x-xpixmap" ""
+"xpm" ""
+"/* XPM */" "" 100
+
+"/local/jody/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll"
+"ico" 5 "gtk20" "The ICO image format"
+"image/x-icon" "image/x-ico" ""
+"ico" "cur" ""
+"  \001   " "zz znz" 100
+"  \002   " "zz znz" 100
+
+"/local/jody/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll"
+"png" 5 "gtk20" "The PNG image format"
+"image/png" ""
+"png" ""
+"\211PNG\r\n\032\n" "" 100
+
+"/local/jody/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll"
+"gif" 4 "gtk20" "The GIF image format"
+"image/gif" ""
+"gif" ""
+"GIF8" "" 100
+
+"/local/jody/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll"
+"tiff" 1 "gtk20" "The TIFF image format"
+"image/tiff" ""
+"tiff" "tif" ""
+"MM *" "  z " 100
+"II* " "   z" 100
+
+"/local/jody/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll"
+"ras" 4 "gtk20" "The Sun raster image format"
+"image/x-cmu-raster" "image/x-sun-raster" ""
+"ras" ""
+"Y\246j\225" "" 100
+
+"/local/jody/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll"
+"bmp" 5 "gtk20" "The BMP image format"
+"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
+"bmp" ""
+"BM" "" 100
+
+"/local/jody/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll"
+"xbm" 4 "gtk20" "The XBM image format"
+"image/x-xbitmap" ""
+"xbm" ""
+"#define " "" 100
+"/*" "" 50
+
+"/local/jody/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.dll"
+"jpeg2000" 4 "gtk20" "The JPEG 2000 image format"
+"image/jp2" "image/jpeg2000" "image/jpx" ""
+"jp2" "jpc" "jpx" "j2k" "jpf" ""
+"    jP" "!!!!  " 100
+"\377O\377Q" "" 100
+
+"/local/jody/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll"
+"wbmp" 4 "gtk20" "The WBMP image format"
+"image/vnd.wap.wbmp" ""
+"wbmp" ""
+"  " "zz" 1
+" `" "z " 1
+" @" "z " 1
+"  " "z " 1
+
+"/local/jody/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll"
+"icns" 4 "gtk20" "The ICNS image format"
+"image/x-icns" ""
+"icns" ""
+"icns" "" 100
+
+"/local/jody/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll"
+"ani" 4 "gtk20" "The ANI image format"
+"application/x-navi-animation" ""
+"ani" ""
+"RIFF    ACON" "    xxxx    " 100
+
+"/local/jody/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll"
+"tga" 4 "gtk20" "The Targa image format"
+"image/x-tga" ""
+"tga" "targa" ""
+" \001\001" "x  " 100
+" \001\t" "x  " 100
+"  \002" "xz " 99
+"  \003" "xz " 100
+"  \n" "xz " 100
+"  \013" "xz " 100
+
diff --git a/tools/win32/gnumeric.nsi.in b/tools/win32/gnumeric.nsi.in
index 151b7eb..b484851 100644
--- a/tools/win32/gnumeric.nsi.in
+++ b/tools/win32/gnumeric.nsi.in
@@ -8,7 +8,7 @@ SetCompressor /SOLID lzma
 !define GNM_LONGNAME		"Gnumeric Spreadsheet"
 !define GNM_APPNAME		"Gnumeric Spreadsheet"
 !define GNM_VERSION		"@VERSION@"
-!define GNM_VERSION_TAG		"20080707-debug"
+!define GNM_VERSION_TAG		"20081126-debug"
 !define GNM_VERSION_FULL	"${GNM_VERSION}-${GNM_VERSION_TAG}"
 !define GNM_UNINST_KEY		"Software\Microsoft\Windows\CurrentVersion\Uninstall\${GNM_NAME}"
 !define GNM_STARTMENU_REG_VAL	"NSIS:StartMenuDir"
@@ -17,8 +17,8 @@ SetCompressor /SOLID lzma
 
 !define GOFFICE_VERSION		"@GOFFICE_VERSION@"
 
-!define GTK_VERSION		"2.13"
-!define GTK_VENDORRC		"4"
+!define GTK_VERSION		"2.14"
+!define GTK_VENDORRC		"6"
 !define GTK_VENDORVERSION	"${GTK_VERSION}.${GTK_VENDORRC}"
 
 ; MUI 1.67 compatible ------
@@ -98,19 +98,20 @@ Section "Gnumeric (required)" SEC01
 
     SetOutPath "${GNM_ROOT}"
     File /r etc
-    File /r /x "*.a" /x "*.la" /x "*.lib" /x "*.def" /x "pkgconfig" /x "include" lib
+    File /r /x "*.a" /x "*.la" /x "*.lib" /x "*.def" /x "pkgconfig" /x "include" /x "Python25" lib
 
     SetOutPath "${GNM_ROOT}\share"
     File /r "share\themes"
     File /r "share\goffice"
     File /r /x C "share\gnumeric"
     File /r "share\libthai"
-    File /r "share\libgda-3.0"
+    File /r /x "gtk-doc" "share\libgda-3.0"
     ;File /r /x "demo" "share\gnome-db-3.0"
     File /r "share\pixmaps"
 
     SetOutPath "${GNM_ROOT}\${GNM_HELP_DIR}"
     File "${GNM_HELP}"
+    File "${GNM_HELP_DIR}\gnumeric.hhmap"
 
     WriteRegStr SHCTX "Software\GNOME\${GNM_NAME}" "Path" "${GNM_ROOT}\bin"
     WriteRegStr SHCTX "Software\GNOME\${GNM_NAME}" "Version" "${GNM_VERSION_FULL}"
@@ -132,7 +133,7 @@ Section "Gnumeric (required)" SEC01
     WriteRegStr HKCR "GNOME.Gnumeric"			"" "Gnumeric Spreadsheet"
     WriteRegStr HKCR "GNOME.Gnumeric\shell"		"" "Open"
     WriteRegStr HKCR "GNOME.Gnumeric\DefaultIcon"		"" "${GNM_ROOT}\bin\gnumeric.exe,0"
-    WriteRegStr HKCR "GNOME.Gnumeric\shell\Open\command"	"" '"${GNM_ROOT}\bin\gnumeric.exe" "%1"'
+    WriteRegStr HKCR "GNOME.Gnumeric\shell\Open\command"	"" '${GNM_ROOT}\bin\gnumeric.exe "%1"'
 SectionEnd
 
 #############################################################################
diff --git a/tools/win32/gtk.immodules b/tools/win32/gtk.immodules
new file mode 100644
index 0000000..63ff3ef
--- /dev/null
+++ b/tools/win32/gtk.immodules
@@ -0,0 +1,38 @@
+# GTK+ Input Method Modules file
+# Created by /jody/target/bin/gtk-query-immodules-2.0 from gtk+-2.14.3
+#
+# ModulesPath = /local/jody/.gtk-2.0/2.10.0/i686-pc-linux-gnu/immodules:/local/jody/.gtk-2.0/2.10.0/immodules:/local/jody/.gtk-2.0/i686-pc-linux-gnu/immodules:/local/jody/.gtk-2.0/immodules:/local/jody/target/lib/gtk-2.0/2.10.0/i686-pc-linux-gnu/immodules:/local/jody/target/lib/gtk-2.0/2.10.0/immodules:/local/jody/target/lib/gtk-2.0/i686-pc-linux-gnu/immodules:/local/jody/target/lib/gtk-2.0/immodules
+#
+"/local/jody/target/lib/gtk-2.0/2.10.0/immodules/im-inuktitut.dll" 
+"inuktitut" "Inuktitut (Transliterated)" "gtk20" "/local/jody/target/share/locale" "iu" 
+
+"/local/jody/target/lib/gtk-2.0/2.10.0/immodules/im-xim.dll" 
+"xim" "X Input Method" "gtk20" "/local/jody/target/share/locale" "ko:ja:th:zh" 
+
+"/local/jody/target/lib/gtk-2.0/2.10.0/immodules/im-am-et.dll" 
+"am_et" "Amharic (EZ+)" "gtk20" "/local/jody/target/share/locale" "am" 
+
+"/local/jody/target/lib/gtk-2.0/2.10.0/immodules/im-thai.dll" 
+"thai" "Thai-Lao" "gtk+" "/local/jody/target/share/locale" "lo:th" 
+
+"/local/jody/target/lib/gtk-2.0/2.10.0/immodules/im-multipress.dll" 
+"multipress" "Multipress" "gtk20" "" "" 
+
+"/local/jody/target/lib/gtk-2.0/2.10.0/immodules/im-cedilla.dll" 
+"cedilla" "Cedilla" "gtk20" "/local/jody/target/share/locale" "az:ca:co:fr:gv:oc:pt:sq:tr:wa" 
+
+"/local/jody/target/lib/gtk-2.0/2.10.0/immodules/im-ipa.dll" 
+"ipa" "IPA" "gtk20" "/local/jody/target/share/locale" "" 
+
+"/local/jody/target/lib/gtk-2.0/2.10.0/immodules/im-ti-er.dll" 
+"ti_er" "Tigrigna-Eritrean (EZ+)" "gtk20" "/local/jody/target/share/locale" "ti" 
+
+"/local/jody/target/lib/gtk-2.0/2.10.0/immodules/im-viqr.dll" 
+"viqr" "Vietnamese (VIQR)" "gtk20" "/local/jody/target/share/locale" "vi" 
+
+"/local/jody/target/lib/gtk-2.0/2.10.0/immodules/im-ti-et.dll" 
+"ti_et" "Tigrigna-Ethiopian (EZ+)" "gtk20" "/local/jody/target/share/locale" "ti" 
+
+"/local/jody/target/lib/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.dll" 
+"cyrillic_translit" "Cyrillic (Transliterated)" "gtk20" "/local/jody/target/share/locale" "" 
+
diff --git a/tools/win32/gtkrc b/tools/win32/gtkrc
new file mode 100755
index 0000000..2b83bbf
--- /dev/null
+++ b/tools/win32/gtkrc
@@ -0,0 +1,3 @@
+gtk-icon-theme-name = "gnome"
+gtk-theme-name = "MS-Windows"
+
diff --git a/tools/win32/jhbuildrc-debug b/tools/win32/jhbuildrc-debug
index bbeb32d..1e07888 100644
--- a/tools/win32/jhbuildrc-debug
+++ b/tools/win32/jhbuildrc-debug
@@ -9,12 +9,12 @@
 
 #moduleset = 'http://osl.ulpgc.es/~arc/gnome/gtk/gtk+-win32.moduleset'
 moduleset = '/gnome/src/gnumeric/tools/win32/moduleset'
-modules = ['gnumeric']
+modules = ['gnumeric', 'evince']
 
 # checkoutroot: path to download packages elsewhere
 # prefix:       target path to install the compiled binaries
-checkoutroot = os.path.expanduser('~/win32/debug/src/')
-prefix	     = os.path.expanduser("~/win32/debug/test")
+checkoutroot = os.path.expanduser('~/win32/debug/src')
+prefix	     = os.path.expanduser("~/win32/debug/build")
 os.environ['prefix']	= prefix	# for use in zlib kludge
 
 #The host value is obtained with the result of executing
@@ -81,23 +81,25 @@ for tool in ('AR', 'RANLIB', 'STRIP', 'AS',
 
 #Module specific configure arguments
 module_autogenargs['zlib']    = autogenargs
+module_autogenargs['libbz2'] = ' --prefix='+prefix + ' --shared'
 module_autogenargs['pcre']    = autogenargs + ' --enable-utf8' + ' --enable-shared'
 module_autogenargs['gettext'] = autogenargs + """ --without-emacs \
 						  --disable-libasprintf \
                                                   --disable-java \
                                                   --disable-native-java \
                                                   --enable-relocatable"""
-#module_autogenargs['zlib']   = ' --prefix='+prefix + ' --shared'
-module_autogenargs['libbz2'] = ' --prefix='+prefix + ' --shared'
 
 #module_autogenargs['jpeg']   = ' --enable-shared' + ' --disable-static' + ' --prefix='+prefix 
 
-module_autogenargs['glib'] =    autogenargs + """ --enable-explicit-deps=no \
+module_autogenargs['glib']	=    autogenargs + """ --enable-explicit-deps=no \
                                                   --cache-file=win32.cache \
                                                   --disable-gtk-doc"""
+module_autogenargs['freetype']  = autogenargs
+module_autogenargs['fontconfig']= autogenargs + """ --with-arch=x86"""
 module_autogenargs['pango']	= autogenargs + """ --disable-gtk-doc \
                                                   --enable-explicit-deps=no \
                                                   --with-included-modules"""
+#						  --disable-ft
 module_autogenargs['pixman']	= autogenargs + """ --enable-explicit-deps=no \
                                                   --enable-xlib=no \
                                                   --enable-xlib-xrender=no \
@@ -106,9 +108,10 @@ module_autogenargs['cairo']	= autogenargs + """ --enable-explicit-deps=no \
                                                   --enable-xlib=no \
                                                   --enable-xlib-xrender=no \
                                                   --enable-win32-font=yes \
-						  --enable-ft=no \
+						  --enable-ft=yes \
 						  --disable-static \
 						  --enable-shared"""
+#						  --enable-ft=no
 
 module_autogenargs['libxml2']	= autogenargs + """ --disable-scrollkeeper --without-iconv"""
 
@@ -117,7 +120,7 @@ autogenargs += """ --disable-scrollkeeper --disable-gtk-doc"""
 module_autogenargs['atk']	= autogenargs + """ --disable-glibtest"""
 module_autogenargs['gtk+']	= autogenargs + """ --disable-glibtest --without-libjasper"""
 
-module_autogenargs['libgda']	= autogenargs + """ --without-odbc --without-lda"""
+module_autogenargs['libgda']	= autogenargs + """ --without-odbc --without-lda --without-java"""
 module_autogenargs['pxlib']	= autogenargs + """ --with-gsf=""" + prefix
 module_autogenargs['psiconv']	= autogenargs + """ --disable-xhtml-docs \
 						    --disable-html4-docs \
@@ -126,5 +129,6 @@ module_autogenargs['psiconv']	= autogenargs + """ --disable-xhtml-docs \
 module_autogenargs['libglade']	= autogenargs
 module_autogenargs['pygobject']	= autogenargs
 module_autogenargs['libgsf']	= autogenargs + """ --without-gnome-vfs --without-bonobo"""
-module_autogenargs['goffice']	= autogenargs + """ --without-gconf"""
+module_autogenargs['goffice']	= autogenargs + """ --without-gconf --with-gmathml"""
 module_autogenargs['gnumeric']	= autogenargs
+module_autogenargs['evince']	= autogenargs + """ --without-keyring"""
diff --git a/tools/win32/jhbuildrc-release b/tools/win32/jhbuildrc-release
index 2b026f7..50f1d13 100644
--- a/tools/win32/jhbuildrc-release
+++ b/tools/win32/jhbuildrc-release
@@ -14,7 +14,7 @@ modules = ['gnumeric']
 # checkoutroot: path to download packages elsewhere
 # prefix:       target path to install the compiled binaries
 checkoutroot = os.path.expanduser('~/win32/release/src/')
-prefix	     = os.path.expanduser("~/win32/release/test")
+prefix	     = os.path.expanduser("~/win32/release/build")
 os.environ['prefix']	= prefix	# for use in zlib kludge
 
 #The host value is obtained with the result of executing
@@ -80,15 +80,14 @@ for tool in ('AR', 'RANLIB', 'STRIP', 'AS',
 	autogenargs += ' '+tool+'="'+os.environ[tool]+'" '
 
 #Module specific configure arguments
-module_autogenargs['zlib']    = autogenargs + ' --prefix='+prefix+' --shared'
+module_autogenargs['zlib']    = autogenargs
+module_autogenargs['libbz2'] = ' --prefix='+prefix + ' --shared'
 module_autogenargs['pcre']    = autogenargs + ' --enable-utf8' + ' --enable-shared'
 module_autogenargs['gettext'] = autogenargs + """ --without-emacs \
 						  --disable-libasprintf \
                                                   --disable-java \
                                                   --disable-native-java \
                                                   --enable-relocatable"""
-#module_autogenargs['zlib']   = ' --prefix='+prefix + ' --shared'
-module_autogenargs['libbz2'] = ' --prefix='+prefix + ' --shared'
 
 #module_autogenargs['jpeg']   = ' --enable-shared' + ' --disable-static' + ' --prefix='+prefix 
 
@@ -96,6 +95,7 @@ module_autogenargs['glib'] =    autogenargs + """ --enable-explicit-deps=no \
                                                   --cache-file=win32.cache \
                                                   --disable-gtk-doc"""
 module_autogenargs['pango']	= autogenargs + """ --disable-gtk-doc \
+						  --disable-ft	\
                                                   --enable-explicit-deps=no \
                                                   --with-included-modules"""
 module_autogenargs['pixman']	= autogenargs + """ --enable-explicit-deps=no \
@@ -126,5 +126,5 @@ module_autogenargs['psiconv']	= autogenargs + """ --disable-xhtml-docs \
 module_autogenargs['libglade']	= autogenargs
 module_autogenargs['pygobject']	= autogenargs
 module_autogenargs['libgsf']	= autogenargs + """ --without-gnome-vfs --without-bonobo"""
-module_autogenargs['goffice']	= autogenargs + """ --without-gconf"""
+module_autogenargs['goffice']	= autogenargs + """ --without-gconf --with-gmathml"""
 module_autogenargs['gnumeric']	= autogenargs
diff --git a/tools/win32/moduleset b/tools/win32/moduleset
index 8072ce6..f0448fb 100644
--- a/tools/win32/moduleset
+++ b/tools/win32/moduleset
@@ -4,14 +4,24 @@
       <!-- <!ENTITY patch_dir "http://svn.gnome.org/svn/gnumeric/trunk/tools/win32/patches/";> -->
 ]>
 <moduleset>
-    <repository type="svn" name="svn.gnome.org" default="yes"
-		href="http://svn.gnome.org/svn/"/>
+    <repository type="git" name="git.gnome.org" default="yes"
+		href="git://git.gnome.org/"/>
     <repository type="tarball" name="gnome.org"
 		href="http://download.gnome.org"/>
     <repository type="tarball" name="zlib.net"
 		href="http://www.zlib.net"/>
+    <repository type="tarball" name="savannah"
+		href="http://savannah.nongnu.org/download"/>
+
     <repository type="git" name="freedesktop.org"
 		href="git://cgit.freedesktop.org/git"/>
+    <repository type="tarball" name="cairographics"
+		href="http://cairographics.org/releases/"/>
+
+    <repository type="git" name="emmanuel"
+		href="http://cgit.freedesktop.org/~emmanuel/gmathml"/>
+    <repository type="tarball" name="debian"
+		href="http://ftp.debian.org/debian/pool/main/"/>
 
     <tarball id="gettext" version="0.17">
 	<source href="ftp://ftp.gnu.org/pub/gnu/gettext/gettext-0.17.tar.gz";
@@ -28,8 +38,9 @@
 	</patches>
     </tarball>
     <autotools id="gtk-doc">
-	<branch module="gtk-doc/trunk" checkoutdir="gtk-doc"/>
+	<branch module="gtk-doc" checkoutdir="gtk-doc"/>
 	<dependencies>
+	    <dep package="glib"/>
 	</dependencies>
     </autotools>
 
@@ -49,15 +60,14 @@
 	</dependencies>
     </autotools>
 -->
-    <tarball id="glib" version="2.18.3">
-	<source href="http://download.gnome.org/sources/glib/2.18/glib-2.18.3.tar.bz2"; />
+    <tarball id="glib" version="2.20.1">
+	<source href="http://download.gnome.org/sources/glib/2.18/glib-2.20.1.tar.bz2"; />
 	<patches>
 		<patch file="http://www.gnome.org/~aruiz/gtk+/patches/glib_win32_cachefile.patch"/>
 		<patch file="&patch_dir;glib-goption-disable-localization.patch"/>
 	</patches>
 	<dependencies>
 	    <dep package="gettext"/>
-	    <dep package="gtk-doc"/>
 	</dependencies>
     </tarball>
 
@@ -86,8 +96,8 @@
 	    <patch file="http://gnome.org/~aruiz/gtk+/patches/jpeg_mingwport.patch"; strip="1"/>
 	</patches>
     </tarball>
-    <tarball id="png" version="1.2.29">
-	<source href="ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.2.29.tar.bz2"/>
+    <tarball id="png" version="1.2.35">
+	<source href="ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.2.35.tar.bz2"/>
 	<dependencies>
 	    <dep package="zlib"/>
 	</dependencies>
@@ -104,44 +114,73 @@
 
 <!-- Gtk stack -->
     <autotools id="pixman">
-	<branch repo="freedesktop.org"/>
+	<branch repo="cairographics"
+		module="pixman-0.14.0.tar.gz"
+		version="0.14.0"/>
     </autotools>
     <autotools id="cairo">
-	<branch repo="freedesktop.org"/>
+	<branch repo="cairographics"
+		module="cairo-1.8.2.tar.gz"
+		version="1.8.2"/>
+	<patches>
+	</patches>
 	<dependencies>
 	    <dep package="zlib"/>
 	    <dep package="png"/>
 	    <dep package="pixman"/>
+	    <dep package="freetype"/>
+	    <dep package="fontconfig"/>
 	</dependencies>
     </autotools>
 
-    <tarball id="libdatrie" version="0.1.2" checkoutdir="libdatrie-0.1.3">
-	<source href="http://ftp.debian.org/pool/main/libd/libdatrie/libdatrie_0.1.3.orig.tar.gz";
-		md5sum="917a40de487df3c29650b7434f473fa0"/>
+    <tarball id="iconv" version="1.13">
+	<source href="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.13.tar.gz"/>
     </tarball>
-    <tarball id="libthai" version="0.1.9" checkoutdir="libthai-0.1.9">
-	<source href="http://ftp.debian.org/pool/main/libt/libthai/libthai_0.1.9.orig.tar.gz";
-		md5sum="7002d111b293f202d20b28aa2b4ed68f"/>
+    <autotools id="libdatrie">
+	<branch repo="debian"
+		module="libd/libdatrie/libdatrie_0.2.2.orig.tar.gz"
+		version="0.2.2" checkoutdir="libdatrie-0.2.2"/>
+	<dependencies>
+	    <dep package="iconv"/>
+	</dependencies>
+    </autotools>
+    <autotools id="libthai">
+	<branch repo="debian"
+		module="libt/libthai/libthai_0.1.11.orig.tar.gz"
+		version="0.1.11" checkoutdir="libthai-0.1.11"/>
 	<dependencies>
 	    <dep package="libdatrie"/>
 	</dependencies>
 	<patches>
-	    <patch file="&patch_dir;libthai.patch"/>
+	    <!-- <patch file="&patch_dir;libthai.patch"/> -->
 	</patches>
-    </tarball>
+    </autotools>
 
     <autotools id="gnome-common">
 	<branch/>
 	<dependencies>
 	</dependencies>
     </autotools>
-    <autotools id="intltool">
-	<branch/>
+
+    <autotools id="freetype"
+	autogen-sh="configure"  skip-autogen="never">
+	<branch repo="savannah" module="freetype/freetype-2.3.7.tar.bz2" version="2.3.7"/>
 	<dependencies>
-	    <dep package="gnome-common"/>
 	</dependencies>
     </autotools>
 
+    <tarball id="fontconfig" version="2.4.2"
+	autogen-sh="autoreconf" skip-autogen="never">
+	<source href="http://fontconfig.org/release/fontconfig-2.4.2.tar.gz"/>
+	<dependencies>
+	    <dep package="freetype"/>
+	</dependencies>
+	<patches>
+	    <patch file="http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/fontconfig-2.4.2-tml-20071015.diff"/>
+            <patch file="&patch_dir;fontconfig-CC.patch"/>
+	</patches>
+    </tarball>
+
 <!--
     <tarball id="pango" version="1.16.4">
 	<source href="http://ftp.gnome.org/pub/gnome/sources/pango/1.16/pango-1.16.4.tar.bz2";
@@ -156,6 +195,7 @@
     <autotools id="pango">
 	<branch/>
 	<dependencies>
+	    <dep package="freetype"/>
 	    <dep package="cairo"/>
 	    <dep package="glib"/>
 	    <dep package="libthai"/>
@@ -163,8 +203,8 @@
 	</dependencies>
     </autotools>
 
-    <tarball id="atk" version="1.22.0">
-	<source href="http://ftp.acc.umu.se/pub/gnome/sources/atk/1.22/atk-1.22.0.tar.bz2"/>
+    <tarball id="atk" version="1.26.0">
+	<source href="http://ftp.acc.umu.se/pub/gnome/sources/atk/1.26/atk-1.26.0.tar.bz2"/>
 	<dependencies>
 	    <dep package="glib"/>
 	</dependencies>
@@ -181,10 +221,9 @@
     </autotools>
     -->
 
-    <autotools id="gtk+" version="2.14.4">
-	<branch repo="gnome.org" module="sources/gtk+/2.14/gtk+-2.14.4.tar.bz2"
-		version="2.14.4">
-	    <patch file="&patch_dir;gtk-VK_DECIMAL.patch"/>
+    <autotools id="gtk+">
+	<branch repo="gnome.org" module="sources/gtk+/2.16/gtk+-2.16.1.tar.bz2"
+		version="2.16.1">
 	</branch>
 	<dependencies>
 	    <dep package="glib"/>
@@ -201,9 +240,8 @@
 	    <dep package="zlib"/>
 	</dependencies>
     </tarball>
-    <tarball id="libglade" version="2.6.0">
-	<source href="http://ftp.gnome.org/pub/gnome/sources/libglade/2.6/libglade-2.6.0.tar.bz2";
-		md5sum="81d7b2b64871ce23a5fae1e5da0b1f6e"/>
+    <tarball id="libglade" version="2.6.4">
+	<source href="http://ftp.gnome.org/pub/gnome/sources/libglade/2.6/libglade-2.6.4.tar.bz2"/>
 	<dependencies>
 	    <dep package="gtk+"/>
 	    <dep package="libxml2"/>
@@ -211,9 +249,10 @@
     </tarball>
 
 <!-- python stack -->
-    <autotools id="pygobject" version="3.1.2">
-	<branch repo="gnome.org" module="sources/pygobject/2.14/pygobject-2.14.2.tar.bz2"
-		version="3.1.2">
+    <autotools id="pygobject" 
+	autogen-sh="autoreconf" skip-autogen="never">
+	<branch repo="gnome.org" module="sources/pygobject/2.16/pygobject-2.16.1.tar.bz2"
+		version="2.16.1">
 	    <patch file="&patch_dir;pygobject.patch"/>
 	</branch>
 
@@ -222,25 +261,22 @@
 	</dependencies>
     </autotools>
 
-    <autotools id="libgda" version="3.1.5">
-	<branch repo="gnome.org" module="sources/libgda/3.1/libgda-3.1.5.tar.bz2"
-		version="3.1.5">
+    <autotools id="libgda">
+	<branch repo="gnome.org" module="sources/libgda/4.1/libgda-4.1.0.tar.bz2"
+		version="4.1.0">
 	</branch>
 	<dependencies>
-	    <dep package="intltool"/>
 	    <dep package="glib"/>
 	    <dep package="libxml2"/>
 	</dependencies>
     </autotools>
 
-    <autotools id="libgnomedb" version="3.1.2"
-	autogen-sh="autoreconf">
-	<branch repo="gnome.org" module="sources/libgnomedb/3.1/libgnomedb-3.1.2.tar.bz2"
-		version="3.1.2">
-	    <patch file="&patch_dir;libgnomedb.patch"/>
+    <autotools id="libgnomedb"
+	autogen-sh="autoreconf" skip-autogen="never">
+	<branch repo="gnome.org" module="sources/libgnomedb/3.99/libgnomedb-3.99.7.tar.bz2"
+		version="3.99.7">
 	</branch>
 	<dependencies>
-	    <dep package="intltool"/>
 	    <dep package="libgda"/>
 	    <dep package="gtk+"/>
 	</dependencies>
@@ -252,7 +288,7 @@
 	<patches>
 	</patches>
     </tarball>
-    <tarball id="psiconv" version="2.6.0">
+    <tarball id="psiconv" version="0.9.8">
 	<source href="http://software.frodo.looijaard.name/psiconv/files/psiconv-0.9.8.tar.gz";
 		md5sum="8d7548e3c6b9cd408544736133728acd"/>
 	<patches>
@@ -260,19 +296,62 @@
 	</patches>
     </tarball>
 
+<!-- print preview -->
+  <tarball id="poppler" version="0.10.5">
+    <source href="http://poppler.freedesktop.org/poppler-0.10.5.tar.gz"/>
+    <dependencies>
+      <dep package="cairo"/>
+      <dep package="glib"/>
+      <dep package="freetype"/>
+      <dep package="fontconfig"/>
+    </dependencies>
+    <suggests>
+      <dep package="poppler-data"/>
+    </suggests>
+    <after>
+      <dep package="gtk+"/>
+    </after>
+  </tarball>
+  <autotools id="evince"
+    autogenargs="--without-keyring">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="libxml2"/>
+      <!-- <dep package="gnome-icon-theme"/>-->
+      <dep package="libglade"/>
+      <dep package="poppler"/>
+      <!-- <dep package="gnome-doc-utils"/>-->
+    </dependencies>
+    <suggests>
+      <dep package="gnome-keyring"/>
+    </suggests>
+    <after>
+      <dep package="nautilus"/>
+    </after>
+  </autotools>
 <!-- Gnumeric stack -->
-    <autotools id="libgsf" version="trunk">
+    <autotools id="libgsf">
 	<branch/>
 	<dependencies>
 	    <dep package="glib"/>
 	    <dep package="libxml2"/>
 	    <dep package="zlib"/>
 	    <dep package="libbz2"/>
-	    <dep package="intltool"/>
 	</dependencies>
     </autotools>
 
-    <autotools id="goffice" version="trunk">
+    <autotools id="gmathml">
+	<branch repo="emmanuel"/>
+	<dependencies>
+	    <dep package="gtk+"/>
+	</dependencies>
+	<patches>
+	</patches>
+    </autotools>
+
+    <autotools id="goffice">
 	<branch/>
 	<dependencies>
 	    <dep package="glib"/>
@@ -281,12 +360,12 @@
 	    <dep package="libxml2"/>
 	    <dep package="pango"/>
 	    <dep package="libglade"/>
-	    <dep package="intltool"/>
+	    <dep package="gmathml"/>
 	</dependencies>
 	<patches>
 	</patches>
     </autotools>
-    <autotools id="gnumeric" version="trunk">
+    <autotools id="gnumeric">
 	<branch>
 	    <patch file="&patch_dir;gnumeric-pending-win32-fixes.patch"/>
 	</branch>
diff --git a/tools/win32/patches/fontconfig-CC.patch b/tools/win32/patches/fontconfig-CC.patch
new file mode 100644
index 0000000..7711d3d
--- /dev/null
+++ b/tools/win32/patches/fontconfig-CC.patch
@@ -0,0 +1,60 @@
+*** doc/Makefile.in	Sat Dec  2 18:27:32 2006
+--- doc/Makefile.in	Thu May  7 18:11:12 2009
+***************
+*** 115,121 ****
+  AUTOHEADER = @AUTOHEADER@
+  AUTOMAKE = @AUTOMAKE@
+  AWK = @AWK@
+- CC = @CC_FOR_BUILD@
+  CCDEPMODE = @CCDEPMODE@
+  CC_FOR_BUILD = @CC_FOR_BUILD@
+  CFLAGS = @CFLAGS@
+--- 115,120 ----
+*** fc-arch/Makefile.in	Sat Dec  2 18:27:32 2006
+--- fc-arch/Makefile.in	Thu May  7 18:11:15 2009
+***************
+*** 102,108 ****
+  AUTOHEADER = @AUTOHEADER@
+  AUTOMAKE = @AUTOMAKE@
+  AWK = @AWK@
+- CC = @CC_FOR_BUILD@
+  CCDEPMODE = @CCDEPMODE@
+  CC_FOR_BUILD = @CC_FOR_BUILD@
+  CFLAGS = @CFLAGS@
+--- 102,107 ----
+*** fc-case/Makefile.in	Sat Dec  2 18:27:32 2006
+--- fc-case/Makefile.in	Thu May  7 18:11:18 2009
+***************
+*** 102,108 ****
+  AUTOHEADER = @AUTOHEADER@
+  AUTOMAKE = @AUTOMAKE@
+  AWK = @AWK@
+- CC = @CC_FOR_BUILD@
+  CCDEPMODE = @CCDEPMODE@
+  CC_FOR_BUILD = @CC_FOR_BUILD@
+  CFLAGS = @CFLAGS@
+--- 102,107 ----
+*** fc-glyphname/Makefile.in	Sat Dec  2 18:27:33 2006
+--- fc-glyphname/Makefile.in	Thu May  7 18:11:22 2009
+***************
+*** 102,108 ****
+  AUTOHEADER = @AUTOHEADER@
+  AUTOMAKE = @AUTOMAKE@
+  AWK = @AWK@
+- CC = @CC_FOR_BUILD@
+  CCDEPMODE = @CCDEPMODE@
+  CC_FOR_BUILD = @CC_FOR_BUILD@
+  CFLAGS = @CFLAGS@
+--- 102,107 ----
+*** fc-lang/Makefile.in	Sat Dec  2 18:27:33 2006
+--- fc-lang/Makefile.in	Thu May  7 18:11:24 2009
+***************
+*** 102,108 ****
+  AUTOHEADER = @AUTOHEADER@
+  AUTOMAKE = @AUTOMAKE@
+  AWK = @AWK@
+- CC = @CC_FOR_BUILD@
+  CCDEPMODE = @CCDEPMODE@
+  CC_FOR_BUILD = @CC_FOR_BUILD@
+  CFLAGS = @CFLAGS@
+--- 102,107 ----
diff --git a/tools/win32/patches/glib_win32_cachefile.patch b/tools/win32/patches/glib_win32_cachefile.patch
new file mode 100644
index 0000000..ab26f44
--- /dev/null
+++ b/tools/win32/patches/glib_win32_cachefile.patch
@@ -0,0 +1,6 @@
+diff -uN ../glib-2.12.11.arc/win32.cache ./win32.cache
+--- ../glib-2.12.11.arc/win32.cache	1970-01-01 00:00:00.000000000 +0000
++++ ./win32.cache	2007-05-05 21:18:38.000000000 +0100
+@@ -0,0 +1,2 @@
++glib_cv_long_long_format=I64
++glib_cv_stack_grows=no
diff --git a/tools/win32/patches/gtk-VK_DECIMAL.patch b/tools/win32/patches/gtk-VK_DECIMAL.patch
deleted file mode 100644
index 1e2b5f3..0000000
--- a/tools/win32/patches/gtk-VK_DECIMAL.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-2008-10-14  Jody Goldberg <jody gnome org>
-
-	Bug 555522 : KP_Decimal is not locale specific.
-
-	* gdk/win32/gdkkeys-win32.c (handle_special) : Add missing VK_DECIMAL.
-
-Index: gdk/win32/gdkkeys-win32.c
-===================================================================
---- gdk/win32/gdkkeys-win32.c	(revision 21622)
-+++ gdk/win32/gdkkeys-win32.c	(working copy)
-@@ -151,6 +151,8 @@
-       *ksymp = GDK_KP_Separator; break;
-     case VK_SUBTRACT:
-       *ksymp = GDK_KP_Subtract; break;
-+    case VK_DECIMAL:
-+      *ksymp = GDK_KP_Decimal; break;
-     case VK_DIVIDE:
-       *ksymp = GDK_KP_Divide; break;
-     case VK_NUMPAD0:
diff --git a/tools/win32/patches/libart.patch b/tools/win32/patches/libart.patch
deleted file mode 100644
index 886786c..0000000
--- a/tools/win32/patches/libart.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in	2007-08-06 15:58:01.000000000 -0400
-+++ Makefile.in	2007-08-06 15:58:21.000000000 -0400
-@@ -6,7 +6,7 @@
- 
- 
- art_config.h:	gen_art_config$(EXEEXT)
--	./gen_art_config > art_config.h
-+	./gen_art_config$(EXEEXT) > art_config.h
- 
- @OS_WIN32_TRUE install-libtool-import-lib:
- @OS_WIN32_TRUE@	$(INSTALL) .libs/libart_lgpl_2.dll.a $(DESTDIR)$(libdir)
diff --git a/tools/win32/patches/libthai.patch b/tools/win32/patches/libthai.patch
index a8ad26c..69169a4 100644
--- a/tools/win32/patches/libthai.patch
+++ b/tools/win32/patches/libthai.patch
@@ -1,11 +1,19 @@
---- configure.orig	2007-03-03 05:28:56.000000000 -0500
-+++ configure	2007-08-06 17:07:55.000000000 -0400
-@@ -19895,7 +19895,7 @@
- echo "${ECHO_T}yes" >&6; }
- 	:
- fi
--for ac_prog in trietool
-+for ac_prog in "trietool$EXEEXT"
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
+*** configure	Mon Apr  6 02:21:26 2009
+--- configure	Sun May  3 15:09:02 2009
+***************
+*** 11615,11621 ****
+  
+  
+  if test "x$enable_dict" = "xyes"; then
+!   for ac_prog in trietool-0.2
+  do
+    # Extract the first word of "$ac_prog", so it can be a program name with args.
+  set dummy $ac_prog; ac_word=$2
+--- 11615,11621 ----
+  
+  
+  if test "x$enable_dict" = "xyes"; then
+!   for ac_prog in "trietool-0.2$EXEEXT"
+  do
+    # Extract the first word of "$ac_prog", so it can be a program name with args.
+  set dummy $ac_prog; ac_word=$2
diff --git a/tools/win32/patches/pygobject.patch b/tools/win32/patches/pygobject.patch
index 230c121..e26a855 100644
--- a/tools/win32/patches/pygobject.patch
+++ b/tools/win32/patches/pygobject.patch
@@ -1,89 +1,38 @@
-diff -cr configure configure
-*** configure	Fri May 23 12:54:08 2008
---- configure	Thu Sep  4 14:57:17 2008
+*** m4/python.m4.orig	2009-05-04 20:36:02.000000000 -0400
+--- m4/python.m4	2009-05-04 20:40:46.000000000 -0400
 ***************
-*** 10441,10446 ****
---- 10441,10447 ----
-  
-                  { echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5
-  echo $ECHO_N "checking for $am_display_PYTHON script directory... $ECHO_C" >&6; }
-+ am_cv_python_pythondir="${prefix}/lib/python2.5/site-packages" 2>/dev/null ||
-  if test "${am_cv_python_pythondir+set}" = set; then
-    echo $ECHO_N "(cached) $ECHO_C" >&6
-  else
-***************
-*** 10481,10496 ****
-  
-  { echo "$as_me:$LINENO: checking for headers required to compile python extensions" >&5
-  echo $ECHO_N "checking for headers required to compile python extensions... $ECHO_C" >&6; }
-! py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
-! py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+*** 43,58 ****
+  [AC_REQUIRE([AM_PATH_PYTHON])
+  AC_MSG_CHECKING(for headers required to compile python extensions)
+  dnl deduce PYTHON_INCLUDES
+! py_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"`
+! py_exec_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)"`
 ! if test -x "$PYTHON-config"; then
 ! PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null`
 ! else
 ! PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
 ! if test "$py_prefix" != "$py_exec_prefix"; then
 !   PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+! >fi
 ! fi
-! fi
-  
+  AC_SUBST(PYTHON_INCLUDES)
+  dnl check if the headers exist:
   save_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
---- 10482,10488 ----
-  
-  { echo "$as_me:$LINENO: checking for headers required to compile python extensions" >&5
-  echo $ECHO_N "checking for headers required to compile python extensions... $ECHO_C" >&6; }
+--- 43,59 ----
+  [AC_REQUIRE([AM_PATH_PYTHON])
+  AC_MSG_CHECKING(for headers required to compile python extensions)
+  dnl deduce PYTHON_INCLUDES
+! dnl py_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"`
+! dnl py_exec_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)"`
+! dnl if test -x "$PYTHON-config"; then
+! dnl PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null`
+! dnl else
+! dnl PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+! dnl if test "$py_prefix" != "$py_exec_prefix"; then
+! dnl   PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+! dnl fi
+! dnl fi
 ! PYTHON_INCLUDES="-I${PY_INCLUDE_DIR}"
-  
+  AC_SUBST(PYTHON_INCLUDES)
+  dnl check if the headers exist:
   save_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
-***************
-*** 10539,10545 ****
-  { echo "$as_me:$LINENO: checking for PySignal_SetWakeupFd in Python.h" >&5
-  echo $ECHO_N "checking for PySignal_SetWakeupFd in Python.h... $ECHO_C" >&6; }
-  py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
-- PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
-  old_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS="-Wall -Werror $PYTHON_INCLUDES"
-  cat >conftest.$ac_ext <<_ACEOF
---- 10531,10536 ----
-diff -cr gobject/Makefile.am gobject/Makefile.am
-*** gobject/Makefile.am	Fri May 23 12:42:18 2008
---- gobject/Makefile.am	Thu Sep  4 14:50:05 2008
-***************
-*** 35,41 ****
-  
-  _gobject_la_CFLAGS = $(GLIB_CFLAGS)
-  _gobject_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gobject
-! _gobject_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS)
-  _gobject_la_SOURCES = \
-  	gobjectmodule.c \
-  	pygboxed.c \
---- 35,41 ----
-  
-  _gobject_la_CFLAGS = $(GLIB_CFLAGS)
-  _gobject_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gobject
-! _gobject_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS) -lpython25
-  _gobject_la_SOURCES = \
-  	gobjectmodule.c \
-  	pygboxed.c \
-diff -cr tests/Makefile.am tests/Makefile.am
-*** tests/Makefile.am	Fri May 23 12:42:14 2008
---- tests/Makefile.am	Thu Sep  4 14:49:37 2008
-***************
-*** 15,21 ****
-  linked_LIBS = testhelper.la
-  
-  testhelper_la_LDFLAGS = -module -avoid-version
-! testhelper_la_LIBADD = $(GLIB_LIBS)
-  testhelper_la_SOURCES = \
-  	testhelpermodule.c \
-  	test-thread.c \
---- 15,21 ----
-  linked_LIBS = testhelper.la
-  
-  testhelper_la_LDFLAGS = -module -avoid-version
-! testhelper_la_LIBADD = $(GLIB_LIBS) -lpython25
-  testhelper_la_SOURCES = \
-  	testhelpermodule.c \
-  	test-thread.c \
diff --git a/tools/win32/patches/zlib.patch b/tools/win32/patches/zlib.patch
index d4c0899..eaee22d 100644
--- a/tools/win32/patches/zlib.patch
+++ b/tools/win32/patches/zlib.patch
@@ -105,7 +105,7 @@ diff -cNr win32/Makefile.gcc win32/Makefile.gcc
 ! $(SHAREDLIB) $(IMPLIB): win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
 ! 	$(CC) -shared -o $@ $(OBJS) $(OBJA) zlibrc.o
 ! 	$(DLLTOOL) --def win32/zlib.def --dllname $(SHAREDLIB) --output-lib $(IMPLIB)
-! 	strip $(SHAREDLIB)
+! 	i586-mingw32msvc-strip $(SHAREDLIB)
   
   example: example.o $(STATICLIB)
   	$(LD) $(LDFLAGS) -o $@ example.o $(STATICLIB)
diff --git a/tools/win32/setup b/tools/win32/setup
new file mode 100755
index 0000000..2065531
--- /dev/null
+++ b/tools/win32/setup
@@ -0,0 +1,8 @@
+#!/bin/sh
+WINEDIR="$HOME/.wine/drive_c"
+
+if [ ! -L Python25 ]; then		ln -s "$WINEDIR/Python25" ; fi
+if [ ! -d bin ]; then			mkdir bin; fi
+if [ ! -d bin/libpython25.dll ]; then (	cd bin ; ln -s "$WINEDIR/windows/system32/python25.dll" libpython25.dll ) ; fi
+if [ ! -d lib ]; then			mkdir lib; fi
+if [ ! -d lib/libpython25.a ]; then (	cd lib ; ln -s "$WINEDIR/Python25/libs/libpython25.a" libpython25.a ) ; fi
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]