[gnumeric] fixed win32 png build and libthai version

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

commit e2099d4a2b1256ead931963c8de2f8e173a0a769
Author: Jean Brefort <jean brefort normalesup org>
Date:   Fri Feb 12 20:27:28 2010 +0100

    fixed win32 png build and libthai version

 tools/win32/jhbuildrc.py              |    4 +++-
 tools/win32/moduleset.in              |   15 ++++++++++-----
 tools/win32/patches/png-symbols.patch |   24 ++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 6 deletions(-)
---
diff --git a/tools/win32/jhbuildrc.py b/tools/win32/jhbuildrc.py
index d471be8..9bb6cc2 100644
--- a/tools/win32/jhbuildrc.py
+++ b/tools/win32/jhbuildrc.py
@@ -56,7 +56,8 @@ else:
     sys.exit (0)
 
 #Exporting tool flags enviroment variables
-# -no-undefined' 
+# -no-undefined' /
+use_lib64 = False
 os.environ['LDFLAGS']	 \
 	= ' -mno-cygwin' \
 	+ ' -L' + os.path.join(os.sep, prefix, 'lib') \
@@ -108,6 +109,7 @@ module_autogenargs['glib']	=    autogenargs + """ --enable-explicit-deps=no \
                                                   --cache-file=win32.cache \
                                                   --disable-gtk-doc"""
 module_autogenargs['freetype']  = autogenargs
+module_autogenargs['png']  = autogenargs + """ --without-libpng-compat"""
 module_autogenargs['fontconfig']= autogenargs + """ --with-arch=x86"""
 module_autogenargs['pango']	= autogenargs + """ --disable-gtk-doc \
                                                   --enable-explicit-deps=no \
diff --git a/tools/win32/moduleset.in b/tools/win32/moduleset.in
index 27edaa2..87e41f2 100644
--- a/tools/win32/moduleset.in
+++ b/tools/win32/moduleset.in
@@ -21,6 +21,8 @@
 		href="http://ftp.debian.org/debian/pool/main/"/>
     <repository type="tarball" name="sourceforge"
 		href="http://downloads.sourceforge.net/project/"/>
+    <repository type="tarball" name="simplesystems.org"
+		href="ftp://ftp.simplesystems.org/pub/libpng/png/src"/>
 
     <tarball id="gettext" version="0.17">
 	<source href="ftp://ftp.gnu.org/pub/gnu/gettext/gettext-0.17.tar.gz";
@@ -84,12 +86,15 @@
 	    <patch file="http://gnome.org/~aruiz/gtk+/patches/jpeg_mingwport.patch"; strip="1"/>
 	</patches>
     </tarball>
-    <tarball id="png" version="1.2.42">
-	<source href="ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.2.42.tar.bz2"/>
+    <autotools id="png" autogen-sh="autogen.sh&amp;&amp;./configure"  skip-autogen="never">
+	<branch repo="simplesystems.org" module="libpng-1.2.42.tar.bz2"
+		version="1.2.42">
+	    <patch file="&patch_dir;png-symbols.patch"/>
+	</branch>
 	<dependencies>
 	    <dep package="zlib"/>
 	</dependencies>
-    </tarball>
+    </autotools>
     <!--
     <tarball id="tiff" version="3.8.2">
 	<source href="ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.8.2.tar.gz";
@@ -136,8 +141,8 @@
     </autotools>
     <autotools id="libthai">
 	<branch repo="debian"
-		module="libt/libthai/libthai_0.1.12.orig.tar.gz"
-		version="0.1.12" checkoutdir="libthai-0.1.12">
+		module="libt/libthai/libthai_0.1.13.orig.tar.gz"
+		version="0.1.13" checkoutdir="libthai-0.1.13">
 	    <patch file="&patch_dir;libthai.patch"/>
 	</branch>
 	<dependencies>
diff --git a/tools/win32/patches/png-symbols.patch b/tools/win32/patches/png-symbols.patch
new file mode 100644
index 0000000..1d9f840
--- /dev/null
+++ b/tools/win32/patches/png-symbols.patch
@@ -0,0 +1,24 @@
+--- configure.ac	2010-02-10 18:08:43.002509267 +0100
++++ configure.ac	2010-02-10 18:09:19.238592081 +0100
+@@ -74,15 +74,15 @@
+ AC_SUBST(LIBPNG_NO_MMX)
+ 
+ AC_MSG_CHECKING([if libraries can be versioned])
+-GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script`
+-if test "$GLD"; then
+-    have_ld_version_script=yes
+-    AC_MSG_RESULT(yes)
+-else
++#GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script`
++#if test "$GLD"; then
++#    have_ld_version_script=yes
++#    AC_MSG_RESULT(yes)
++#else
+     have_ld_version_script=no
+     AC_MSG_RESULT(no)
+     AC_MSG_WARN(*** You have not enabled versioned symbols.)
+-fi
++#fi
+ AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
+ 
+ if test "$have_ld_version_script" = "yes"; then