r21369 - gnucash/trunk/packaging/win32 - Bug 651645 - Windows SVN trunk nightly builds fails to open compressed

[Geert Janssens]

Author: gjanssens
Date: 2011-10-03 12:52:00 -0400 (Mon, 03 Oct 2011)
New Revision: 21369
Trac: http://svn.gnucash.org/trac/changeset/21369

Modified:
   gnucash/trunk/packaging/win32/defaults.sh
   gnucash/trunk/packaging/win32/install-impl.sh
Log:
Bug 651645 - Windows SVN trunk nightly builds fails to open compressed
xml files

Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh	2011-09-30 18:48:07 UTC (rev 21368)
+++ gnucash/trunk/packaging/win32/defaults.sh	2011-10-03 16:52:00 UTC (rev 21369)
@@ -210,13 +210,13 @@
 
 XMLSOFT_URL="http://xmlsoft.org/sources/win32"
 XSLT_BASE_URL="http://ftp.acc.umu.se/pub/GNOME/sources/libxslt/1.1"
-XML2_BASE_URL="http://ftp.acc.umu.se/pub/GNOME/sources/libxml2/2.6"
+XML2_BASE_URL="ftp://xmlsoft.org/libxml2"
 LIBXSLT_VERSION="1.1.22"
 #LIBXSLT_VERSION=1.1.26
 set_default LIBXSLT_SRC_URL "${XSLT_BASE_URL}/libxslt-${LIBXSLT_VERSION}.tar.bz2"
 set_default LIBXSLT_MAKEFILE_PATCH "`pwd`/libxslt-1.1.22.Makefile.in.patch"
-LIBXML2_VERSION="2.6.27"
-set_default LIBXML2_SRC_URL "${XML2_BASE_URL}/libxml2-${LIBXML2_VERSION}.tar.bz2"
+LIBXML2_VERSION="2.7.7"
+set_default LIBXML2_SRC_URL "${XML2_BASE_URL}/libxml2-${LIBXML2_VERSION}.tar.gz"
 set_default LIBXSLT_ICONV_URL "${XMLSOFT_URL}/iconv-1.9.2.win32.zip"
 set_default LIBXSLT_ZLIB_URL "${XMLSOFT_URL}/zlib-1.2.3.win32.zip"
 set_default LIBXSLT_DIR $GLOBAL_DIR\\libxslt

Modified: gnucash/trunk/packaging/win32/install-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/install-impl.sh	2011-09-30 18:48:07 UTC (rev 21368)
+++ gnucash/trunk/packaging/win32/install-impl.sh	2011-10-03 16:52:00 UTC (rev 21369)
@@ -619,7 +619,8 @@
                     --prefix=${_GNOME_UDIR} \
                     --disable-static \
                     --with-python=no \
-                    --without-threads
+                    --without-threads \
+                    CPPFLAGS="${GNOME_CPPFLAGS}" LDFLAGS="${GNOME_LDFLAGS}"
                 make
                 make install
             qpopd