gnucash-on-windows master: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Tue Jun 21 18:36:31 EDT 2016


Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/1377fe4a (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/98d03667 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/484109bc (commit)



commit 1377fe4af61c33be0e93434906947b5797a89f85
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Jun 21 15:34:27 2016 -0700

    Another bump in glib tarballs.
    
    This one fixes the lib and include paths in zlib.pc which caused cmake
    builds to fail in gcdev-maint. It also brings back some libraries that
    got left out of glib-2.38.2-2-minGW.tar.gz.

diff --git a/defaults.sh b/defaults.sh
index 866628e..c5298f0 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -270,8 +270,8 @@ set_default LIBXML2_URL             "$GNOME_WIN32_DEPS_URL/libxml2_2.7.7-1_win32
 set_default LIBXML2_DEV_URL         "$GNOME_WIN32_DEPS_URL/libxml2-dev_2.7.7-1_win32.zip"
 set_default PKG_CONFIG_URL          "$GNOME_WIN32_DEPS_URL/pkg-config_0.25-1_win32.zip"
 set_default PKG_CONFIG_DEV_URL      "$GNOME_WIN32_DEPS_URL/pkg-config-dev_0.25-1_win32.zip"
-set_default GLIB_URL                "$GC_DEPS_URL/glib-$GLIB_VERSION-2-minGW.tar.gz"
-set_default GLIB_DEV_URL            "$GC_DEPS_URL/glib-$GLIB_VERSION-dev-minGW.tgz"
+set_default GLIB_URL                "$GC_DEPS_URL/glib-$GLIB_VERSION-2-minGW.tgz"
+set_default GLIB_DEV_URL            "$GC_DEPS_URL/glib-$GLIB_VERSION-2-dev-minGW.tgz"
 set_default CAIRO_VERSION="1.10.2"
 set_default CAIRO_URL               "$GC_DEPS_URL/cairo-1.10.2-minGW.tgz"
 set_default CAIRO_DEV_URL           "$GC_DEPS_URL/cairo-1.10.2-dev-minGW.tgz"

commit 98d036670ac31831841053643b24595dcec92c75
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Jun 21 12:57:59 2016 -0700

    Use correct URLs for new Gwen and AQB, patch AQB.
    
    Patch required because MinGW doesn't provide strndup.

diff --git a/defaults.sh b/defaults.sh
index 333ca41..866628e 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -349,17 +349,21 @@ set_default LIBOFX_PATCH `pwd`/libofx-0.9.8.patch
 
 ## online banking: gwenhywfar+aqbanking
 GWENHYWFAR_VERSION="4.15.3"
-set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=78&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
+## NB: Dummy means dummy! The important value in the following url is
+## the release number, not the file name at the end!
+set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=201&file=01&dummy=gwenhywfar-4.15.3.tar.gz"
 set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
-set_default GWEN_PATCH `pwd`/gwen-4.13.1.patch
 
 KTOBLZCHECK_VERSION="1.48"
 set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-${KTOBLZCHECK_VERSION}.tar.gz"
 # ktoblzcheck is being installed into GWENHYWFAR_DIR
 
 AQBANKING_VERSION="5.6.10"
-set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=118&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
+## NB: Dummy means dummy! The important value in the following url is
+## the release number, not the file name at the end!
+set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=206&file=01&dummy=aqbanking-5.6.10.tar.gz"
 set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
+set_default AQB_PATCH `pwd`/swift940-strndup.patch
 
 set_default SQLITE3_URL "http://sqlite.org/sqlite-amalgamation-3.6.1.tar.gz"
 set_default SQLITE3_DIR $GLOBAL_DIR\\sqlite3
diff --git a/install-impl.sh b/install-impl.sh
index 654e2d9..9a00e3d 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -283,6 +283,10 @@ function inst_aqbanking() {
         wget_unpacked $AQBANKING_URL $DOWNLOAD_DIR $TMP_DIR
         assert_one_dir $TMP_UDIR/aqbanking-*
         qpushd $TMP_UDIR/aqbanking-*
+            if [ -n "$AQB_PATCH" -a -f "$AQB_PATCH" ]; then
+                patch -p1 < $AQB_PATCH
+            fi
+
             _AQ_CPPFLAGS="-I${_LIBOFX_UDIR}/include ${KTOBLZCHECK_CPPFLAGS} ${GNOME_CPPFLAGS} ${GNUTLS_CPPFLAGS} -I${_GWENHYWFAR_UDIR}/include/gwenhywfar4"
             _AQ_LDFLAGS="-L${_LIBOFX_UDIR}/lib ${KTOBLZCHECK_LDFLAGS} ${GNOME_LDFLAGS} ${GNUTLS_LDFLAGS}"
             if test x$CROSS_COMPILE = xyes; then
@@ -640,6 +644,9 @@ function inst_gwenhywfar() {
     then
         echo "Gwenhywfar ${GWENHYWFAR_VERSION} already installed in $_GWENHYWFAR_UDIR. skipping."
     else
+#        INSTALLED_GWEN=`${PKG_CONFIG} --modversion gwenhywfar`
+#        echo "GWENHYWFAR installed version ${INSTALLED_GWEN} doesn't match required version ${GWENHYWFAR_VERSION}"
+#        exit
         wget_unpacked $GWENHYWFAR_URL $DOWNLOAD_DIR $TMP_DIR
         assert_one_dir $TMP_UDIR/gwenhywfar-*
         qpushd $TMP_UDIR/gwenhywfar-*
diff --git a/swift940-strndup.patch b/swift940-strndup.patch
new file mode 100644
index 0000000..0132853
--- /dev/null
+++ b/swift940-strndup.patch
@@ -0,0 +1,32 @@
+--- a/src/plugins/parsers/swift/swift940.c     2015-06-01 10:16:28.000000000 -0700
++++ b/src/plugins/parsers/swift/swift940.c     2016-06-20 16:45:18.000000000 -0700
+@@ -31,9 +31,18 @@
+ 
+ 
+ /* #define ENABLE_FULL_SEPA_LOG */
++inline char* strndup_impl(char* instr, size_t len)
++{
++     char *outstr = malloc(len +1);
++     if (outstr)
++     {
++          memset(outstr, 0, len);
++          memcpy(outstr, instr, len);
++     }
++     return outstr;
++}
+ 
+-
+-
++#define strndup(str, len) strndup_impl(str, len)
+ #define CENTURY_CUTOFF_YEAR 79
+ 
+ 
+@@ -266,7 +277,7 @@
+ 
+ 	    /* found begin of the next SEPA field or end of buffer */
+ 	    if (s > sLastTagStart) {
+-	      int tagLen;
++	      size_t tagLen;
+ 
+ 	      /* we currently have a field, close that first */
+ 	      tagLen=s-sLastTagStart;



Summary of changes:
 defaults.sh            | 14 +++++++++-----
 install-impl.sh        |  7 +++++++
 swift940-strndup.patch | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 swift940-strndup.patch



More information about the gnucash-changes mailing list