From de2b0795e51f662a9c06377f657eb91b6d732948 Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Wed, 28 Dec 2011 06:07:03 +0000
Subject: [PATCH] Fix libxml2 mismatch with libgsf

Move WebKit to install into dist directory before Gnome, and install the locally-built
libxml2-2.dll; also the locally-built pixman, since it seems silly to custom build it
and then download a precompiled one for the distribution.

There's some cleanup in here from the gnucash.iss.in and GCC/Guile changes as well, because it's
harder to separate changes in a single file into multiple commits with subversion.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/2.4@21781 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 packaging/win32/dist-impl.sh | 14 +++++++++-----
 packaging/win32/dist.sh      |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/packaging/win32/dist-impl.sh b/packaging/win32/dist-impl.sh
index 5762d98bd0..86b8bd94c5 100755
--- a/packaging/win32/dist-impl.sh
+++ b/packaging/win32/dist-impl.sh
@@ -71,11 +71,11 @@ function dist_autotools() {
 function dist_guile() {
     setup Guile
     mkdir -p $DIST_UDIR/bin
-    cp -a $_GUILE_UDIR/bin/libguile{.,-ltdl.,-srfi}*dll $DIST_UDIR/bin
+    cp -a $_GUILE_UDIR/bin/libguile{.,-srfi}*dll $DIST_UDIR/bin
     cp -a $_GUILE_UDIR/bin/guile.exe $DIST_UDIR/bin
     mkdir -p $DIST_UDIR/share
     cp -a $_GUILE_UDIR/share/guile $DIST_UDIR/share
-    [ -f $DIST_UDIR/share/guile/1.6/slibcat ] && rm $DIST_UDIR/share/guile/1.6/slibcat
+    [ -f $DIST_UDIR/share/guile/1.8/slibcat ] && rm $DIST_UDIR/share/guile/1.8/slibcat
 }
 
 function dist_openssl() {
@@ -87,7 +87,6 @@ function dist_openssl() {
 
 function dist_gnome() {
     setup Gnome platform
-    wget_unpacked $LIBXML2_URL $DOWNLOAD_DIR $DIST_DIR
     wget_unpacked $GETTEXT_RUNTIME_URL $DOWNLOAD_DIR $DIST_DIR
     smart_wget $LIBICONV_URL $DOWNLOAD_DIR
     unzip -q $LAST_FILE bin/iconv.dll -d $DIST_DIR
@@ -117,8 +116,10 @@ function dist_gnome() {
     wget_unpacked $LIBBONOBOUI_URL $DOWNLOAD_DIR $DIST_DIR
     wget_unpacked $LIBGNOMEUI_URL $DOWNLOAD_DIR $DIST_DIR
     wget_unpacked $LIBGLADE_URL $DOWNLOAD_DIR $DIST_DIR
-	wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $DIST_DIR
-	wget_unpacked $GTK_THEME_URL $DOWNLOAD_DIR $TMP_DIR
+    wget_unpacked $GTK_THEME_URL $DOWNLOAD_DIR $TMP_DIR
+
+    cp $_GNOME_UDIR/bin/libxml2-2.dll $DIST_DIR/bin
+    cp $_GNOME_UDIR/bin/libpixman-1-0.dll $DIST_DIR/bin
 
     assert_one_dir $TMP_UDIR/gtk2-themes-*
     cp -a $TMP_UDIR/gtk2-themes-*/lib $DIST_DIR/
@@ -253,16 +254,19 @@ function dist_gnucash() {
         # aqbanking < 5
         AQBANKING_VERSION_H=${_AQBANKING_UDIR}/include/aqbanking/version.h
         GWENHYWFAR_VERSION_H=${_GWENHYWFAR_UDIR}/include/gwenhywfar3/gwenhywfar/version.h
+        _AQB_PFX=""
     else
         # aqbanking >= 5.0.0
         AQBANKING_VERSION_H=${_AQBANKING_UDIR}/include/aqbanking5/aqbanking/version.h
         GWENHYWFAR_VERSION_H=${_GWENHYWFAR_UDIR}/include/gwenhywfar4/gwenhywfar/version.h
+        _AQB_PFX=";;"
     fi
 
     _AQBANKING_SO_EFFECTIVE=$(awk '/AQBANKING_SO_EFFECTIVE / { print $3 }' ${AQBANKING_VERSION_H} )
     _GWENHYWFAR_SO_EFFECTIVE=$(awk '/GWENHYWFAR_SO_EFFECTIVE / { print $3 }' ${GWENHYWFAR_VERSION_H} )
     sed < $_BUILD_UDIR/packaging/win32/gnucash.iss \
         > $_GNUCASH_UDIR/gnucash.iss \
+        -e "s#@-aqb_pfx-@#${_AQB_PFX}#" \
         -e "s#@-qtbindir-@#${_QTDIR_WIN}/bin#g" \
         -e "s#@-gwenhywfar_so_effective-@#${_GWENHYWFAR_SO_EFFECTIVE}#g" \
         -e "s#@-aqbanking_so_effective-@#${_AQBANKING_SO_EFFECTIVE}#g"
diff --git a/packaging/win32/dist.sh b/packaging/win32/dist.sh
index 7253826c18..da0a08e5b7 100755
--- a/packaging/win32/dist.sh
+++ b/packaging/win32/dist.sh
@@ -28,6 +28,7 @@ add_step dist_prepare
 add_step dist_regex
 add_step dist_autotools
 add_step dist_guile
+add_step dist_webkit
 add_step dist_gnome
 add_step dist_isocodes
 add_step dist_pcre
@@ -41,7 +42,6 @@ add_step dist_gwenhywfar
 add_step dist_ktoblzcheck
 add_step dist_aqbanking
 add_step dist_libdbi
-add_step dist_webkit
 add_step dist_gnucash
 add_step dist_finish