From 5b87adeb48e29bb54105cfdccf8f6419b4501ec1 Mon Sep 17 00:00:00 2001
From: Phil Longstaff <plongstaff@newearth.org>
Date: Wed, 13 May 2009 00:58:08 +0000
Subject: [PATCH] 1) Add commands to build win32 version of gnucash using
 webkit. 2) Correct URLs for aqbanking

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18070 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 packaging/win32/defaults.sh | 17 ++++++------
 packaging/win32/dist.sh     | 11 ++++----
 packaging/win32/install.sh  | 53 ++++++++++++++++++++-----------------
 3 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/packaging/win32/defaults.sh b/packaging/win32/defaults.sh
index 255b87bfb0..0d12d61713 100644
--- a/packaging/win32/defaults.sh
+++ b/packaging/win32/defaults.sh
@@ -173,6 +173,7 @@ set_default ZLIB_DEV_URL "$GNOME_WIN32_DEPS_URL/zlib-dev-1.2.3.zip"
 set_default PKG_CONFIG_URL "$GNOME_WIN32_DEPS_URL/pkg-config-0.23.zip"
 set_default CAIRO_URL "$GNOME_WIN32_DEPS_URL/cairo_1.8.6-1_win32.zip"
 set_default CAIRO_DEV_URL "$GNOME_WIN32_DEPS_URL/cairo-dev_1.8.6-1_win32.zip"
+set_default PIXMAN_URL "http://cairographics.org/releases/pixman-0.14.0.tar.gz"
 set_default EXPAT_URL "$GNOME_WIN32_DEPS_URL/expat-2.0.0.zip"
 set_default FONTCONFIG_URL "$GNOME_WIN32_DEPS_URL/fontconfig-2.4.2-tml-20071015.zip"
 set_default FONTCONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/fontconfig-dev-2.4.2-tml-20071015.zip"
@@ -240,7 +241,11 @@ set_default INNO_DIR $GLOBAL_DIR\\inno
 set_default HH_URL "http://download.microsoft.com/download/OfficeXPProf/Install/4.71.1015.0/W98NT42KMe/EN-US/HTMLHELP.EXE"
 set_default HH_DIR $GLOBAL_DIR\\hh
 
-set_default SVN_URL "http://subversion.tigris.org/files/documents/15/44582/svn-win32-1.5.5.zip"
+set_default WEBKIT_URL "http://webkitgtk.org/webkit-1.1.5-win32.zip"
+#set_default WEBKIT_URL "http://webkitgtk.org/webkit_1.0.1.orig.tar.gz"
+set_default WEBKIT_DIR $GLOBAL_DIR\\webkit-1.1.5
+
+set_default SVN_URL "http://subversion.tigris.org/files/documents/15/35379/svn-1.4.2-setup.exe"
 set_default SVN_DIR $GLOBAL_DIR\\svn
 
 # OFX import in gnucash and ofx directconnect support for aqbanking
@@ -258,7 +263,7 @@ set_default AQBANKING3 yes
 if [ "$AQBANKING3" != "yes" ]; then
     set_default GWENHYWFAR_URL "$SF_MIRROR/gwenhywfar/gwenhywfar-2.6.2.tar.gz"
 else
-    set_default GWENHYWFAR_URL "http://www.aquamaniac.de/sites/download/download.php?package=01&release=17&file=01&dummy=gwenhywfar-3.6.0.tar.gz"
+    set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=17&file=01&dummy=gwenhywfar-3.6.0.tar.gz"
     set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-3.6.0-patch.diff
 fi
 set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
@@ -269,18 +274,13 @@ set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-1.20.tar.gz"
 if [ "$AQBANKING3" != "yes" ]; then
     set_default AQBANKING_URL "$SF_MIRROR/aqbanking/aqbanking-2.3.3.tar.gz"
 else
-    set_default AQBANKING_URL "http://www.aquamaniac.de/sites/download/download.php?package=03&release=19&file=01&dummy=aqbanking-3.8.1.tar.gz"
+    set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=19&file=01&dummy=aqbanking-3.8.1.tar.gz"
 fi
 set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
 set_default AQBANKING_WITH_QT yes
 # If set to yes, download Qt from http://www.trolltech.com/developer/downloads/qt/windows,
 # install it and set QTDIR in custom.sh, like "QTDIR=/c/Qt/4.2.3".
 
-set_default LIBGDA_URL "http://ftp.acc.umu.se/pub/GNOME/sources/libgda/3.1/libgda-3.1.2.tar.gz"
-set_default LIBGDA_DIR $GLOBAL_DIR\\libgda
-set_default LIBGDA_PATCH `pwd`/libgda-3.1.2-patch.diff
-set_default LIBGDA_PATCH2 `pwd`/libgda-3.1.2-patch2.diff
-
 set_default SQLITE3_URL "http://sqlite.org/sqlite-amalgamation-3.6.1.tar.gz"
 set_default SQLITE3_DIR $GLOBAL_DIR\\sqlite3
 set_default LIBDBI_URL "http://downloads.sourceforge.net/libdbi/libdbi-0.8.3.tar.gz"
@@ -346,6 +346,7 @@ add_step inst_gwenhywfar
 add_step inst_ktoblzcheck
 add_step inst_aqbanking
 add_step inst_libdbi
+add_step inst_webkit
 ##
 if [ "$UPDATE_SOURCES" = "yes" ]; then
  add_step svn_up
diff --git a/packaging/win32/dist.sh b/packaging/win32/dist.sh
index 9104df8f8f..be2fcff912 100755
--- a/packaging/win32/dist.sh
+++ b/packaging/win32/dist.sh
@@ -110,6 +110,7 @@ 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 $GTKHTML_URL $DOWNLOAD_DIR $DIST_DIR
     rm -rf $DIST_UDIR/etc/gconf/gconf.xml.defaults/{desktop,schemas}
     cp -a $DIST_UDIR/lib/locale $DIST_UDIR/share
@@ -198,12 +199,9 @@ function dist_libdbi() {
     cp -a ${_LIBDBI_DRIVERS_UDIR}/lib/dbd/* ${DIST_UDIR}/lib/dbd
 }
 
-function dist_libgda() {
-    setup Libgda
-    cp -a ${_LIBGDA_UDIR}/bin/* ${DIST_UDIR}/bin
-    cp -a ${_LIBGDA_UDIR}/lib/libgda-3.0 ${DIST_UDIR}/lib
-    cp -a ${_LIBGDA_UDIR}/share/libgda-3.0 ${DIST_UDIR}/share
-    cp -a ${_LIBGDA_UDIR}/share/locale ${DIST_UDIR}/lib
+function dist_webkit() {
+    setup WebKit
+    cp -a ${_WEBKIT_UDIR}/bin/* ${DIST_UDIR}/bin
 }
 
 function dist_gnucash() {
@@ -291,6 +289,7 @@ fi
 dist_gwenhywfar
 dist_aqbanking
 dist_libdbi
+dist_webkit
 dist_gnucash
 finish
 qpopd
diff --git a/packaging/win32/install.sh b/packaging/win32/install.sh
index 9be2a3400c..71547d4f8c 100755
--- a/packaging/win32/install.sh
+++ b/packaging/win32/install.sh
@@ -40,6 +40,8 @@ register_env_var READLINE_CPPFLAGS " "
 register_env_var READLINE_LDFLAGS " "
 register_env_var REGEX_CPPFLAGS " "
 register_env_var REGEX_LDFLAGS " "
+register_env_var WEBKIT_CFLAGS " "
+register_env_var WEBKIT_LIBS " "
 
 function prepare() {
     # Necessary so that intltoolize doesn't come up with some
@@ -592,6 +594,16 @@ EOF
             sed '/Requires/s,\(.*\) enchant\(.*\) iso-codes\(.*\),\1\2\3,' lib/pkgconfig/libgtkhtml-3.14.pc > tmp
             mv tmp lib/pkgconfig/libgtkhtml-3.14.pc
         qpopd
+        wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $TMP_DIR
+        assert_one_dir $TMP_UDIR/pixman-*
+        qpushd $TMP_UDIR/pixman-*
+            ./configure ${HOST_XCOMPILE} \
+                --prefix=$_GNOME_UDIR \
+                --disable-static
+            make
+            make install
+        qpopd
+        ${PKG_CONFIG} --exists pixman-1 || die "pixman not installed correctly"
         quiet gconftool-2 --version &&
         quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgtkhtml-3.14 &&
         quiet intltoolize --version || die "gnome not installed correctly"
@@ -1076,30 +1088,20 @@ function inst_libdbi() {
     fi
 }
 
-function inst_libgda() {
-    setup LibGDA
-    _LIBGDA_UDIR=`unix_path ${LIBGDA_DIR}`
-    add_to_env ${_LIBGDA_UDIR}/bin PATH
-    add_to_env ${_LIBGDA_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
-    if quiet ${PKG_CONFIG} --exists libgda-3.0
+function inst_webkit() {
+    setup WebKit
+    _WEBKIT_UDIR=`unix_path ${WEBKIT_DIR}`
+    add_to_env ${_WEBKIT_UDIR}/bin PATH
+    add_to_env -lwebkit-1.0-2 WEBKIT_LIBS
+    add_to_env -L${_WEBKIT_UDIR}/bin WEBKIT_LIBS
+    add_to_env -I${_WEBKIT_UDIR}/include WEBKIT_CFLAGS
+    if quiet ${LD} ${WEBKIT_LIBS} -o $TMP_UDIR/ofile
     then
-        echo "Libgda already installed. skipping."
+        echo "webkit already installed.  skipping."
     else
-        wget_unpacked $LIBGDA_URL $DOWNLOAD_DIR $TMP_DIR
-        assert_one_dir $TMP_UDIR/libgda-*
-        qpushd $TMP_UDIR/libgda-*
-            #patch to ignore vfs, as libgda uses depriciated header
-            patch libgda/gda-data-model-dir.c $LIBGDA_PATCH
-            #patch to use g_setenv instead of setenv (bug #510739)
-            patch tools/gda-sql.c $LIBGDA_PATCH2
-            ./configure ${HOST_XCOMPILE} \
-                --prefix=${_LIBGDA_UDIR} \
-                CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS}" \
-                LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} -lintl"
-            make
-            make install
-        qpopd
-        ${PKG_CONFIG} --exists libgda-3.0 || die "Libgda not installed correctly"
+        wget_unpacked $WEBKIT_URL $DOWNLOAD_DIR $WEBKIT_DIR
+ls $WEBKIT_DIR
+        quiet ${LD} ${WEBKIT_LIBS} -o $TMP_UDIR/ofile || die "webkit not installed correctly"
     fi
 }
 
@@ -1153,6 +1155,7 @@ function inst_gnucash() {
             ${AQBANKING_OPTIONS} \
             --enable-binreloc \
             --enable-locale-specific-tax \
+            --enable-webkit \
             CPPFLAGS="${AUTOTOOLS_CPPFLAGS} ${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${LIBDBI_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} ${HH_CPPFLAGS} -D_WIN32" \
             LDFLAGS="${AUTOTOOLS_LDFLAGS} ${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${LIBDBI_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${HH_LDFLAGS}" \
             PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
@@ -1183,6 +1186,8 @@ function make_install() {
     _OPENSP_UDIR=`unix_path ${OPENSP_DIR}`
     _LIBDBI_UDIR=`unix_path ${LIBDBI_DIR}`
     _SQLITE3_UDIR=`unix_path ${SQLITE3_DIR}`
+    _WEBKIT_UDIR=`unix_path ${WEBKIT_DIR}`
+    _GNUTLS_UDIR=`unix_path ${GNUTLS_DIR}`
     AQBANKING_UPATH="${_OPENSSL_UDIR}/bin:${_GWENHYWFAR_UDIR}/bin:${_AQBANKING_UDIR}/bin"
     AQBANKING_PATH="${OPENSSL_DIR}\\bin;${GWENHYWFAR_DIR}\\bin;${AQBANKING_DIR}\\bin"
 
@@ -1196,7 +1201,7 @@ function make_install() {
         qpushd $_BUILD_UDIR/src/bin
             rm gnucash
             make PATH_SEPARATOR=";" \
-                bindir="${_INSTALL_UDIR}/bin:${_INSTALL_UDIR}/lib:${_INSTALL_UDIR}/lib/gnucash:${_GOFFICE_UDIR}/bin:${_LIBGSF_UDIR}/bin:${_PCRE_UDIR}/bin:${_GNOME_UDIR}/bin:${_GUILE_UDIR}/bin:${_REGEX_UDIR}/bin:${_AUTOTOOLS_UDIR}/bin:${AQBANKING_UPATH}:${_LIBOFX_UDIR}/bin:${_OPENSP_UDIR}/bin:${_LIBDBI_UDIR}/bin:${_SQLITE3_UDIR}/bin" \
+                bindir="${_INSTALL_UDIR}/bin:${_INSTALL_UDIR}/lib:${_INSTALL_UDIR}/lib/gnucash:${_GNUTLS_UTIR}/bin:${_GMP_UDIR}/bin:${_GOFFICE_UDIR}/bin:${_LIBGSF_UDIR}/bin:${_PCRE_UDIR}/bin:${_GNOME_UDIR}/bin:${_GUILE_UDIR}/bin:${_WEBKIT_UDIR}/bin:${_REGEX_UDIR}/bin:${_AUTOTOOLS_UDIR}/bin:${AQBANKING_UPATH}:${_LIBOFX_UDIR}/bin:${_OPENSP_UDIR}/bin:${_LIBDBI_UDIR}/bin:${_SQLITE3_UDIR}/bin" \
                 gnucash
         qpopd
     fi
@@ -1232,7 +1237,7 @@ function make_install() {
         # Create a startup script that works without the msys shell
         qpushd $_INSTALL_UDIR/bin
             echo "setlocal" > gnucash.cmd
-            echo "set PATH=${INSTALL_DIR}\\bin;${INSTALL_DIR}\\lib;${INSTALL_DIR}\\lib\\gnucash;${GOFFICE_DIR}\\bin;${LIBGSF_DIR}\\bin;${PCRE_DIR}\\bin;${GNOME_DIR}\\bin;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;${AQBANKING_PATH};${LIBOFX_DIR}\\bin;${OPENSP_DIR}\\bin;${LIBDBI_DIR}\\bin;${SQLITE3_DIR}\\bin;%PATH%" > gnucash.cmd
+            echo "set PATH=${INSTALL_DIR}\\bin;${INSTALL_DIR}\\lib;${INSTALL_DIR}\\lib\\gnucash;${GNUTLS_DIR}\\bin;${GMP_DIR}\\bin;${GOFFICE_DIR}\\bin;${LIBGSF_DIR}\\bin;${PCRE_DIR}\\bin;${WEBKIT_DIR}\\bin;${GNOME_DIR}\\bin;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;${AQBANKING_PATH};${LIBOFX_DIR}\\bin;${OPENSP_DIR}\\bin;${LIBDBI_DIR}\\bin;${SQLITE3_DIR}\\bin;%PATH%" > gnucash.cmd
             echo "set GUILE_WARN_DEPRECATED=no" >> gnucash.cmd
             echo "set GNC_MODULE_PATH=${INSTALL_DIR}\\lib\\gnucash" >> gnucash.cmd
             echo "set GUILE_LOAD_PATH=${INSTALL_DIR}\\share\\gnucash\\guile-modules;${INSTALL_DIR}\\share\\gnucash\\scm;%GUILE_LOAD_PATH%" >> gnucash.cmd