gnucash master: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Sat Mar 29 01:56:10 EDT 2014


Updated	 via  https://github.com/Gnucash/gnucash/commit/4e5e0621 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/1b269e17 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/963c8a00 (commit)
	from  https://github.com/Gnucash/gnucash/commit/9293f480 (commit)



commit 4e5e0621322147ff6ada9d72ace36e213dec61c7
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Mar 28 22:52:45 2014 -0700

    Win32: Roll back Gwenhywfar to 4.9.0 to resolve broken build.
    
    cc1.exe: warnings being treated as errors
    In file included from c:/soft/aqbanking/include/aqbanking5/aqbanking/abgui.h:16:0,
                     from ../../../../repos/src/import-export/aqb/gnc-ab-utils.c:52:
    c:/soft/gwenhywfar/include/gwenhywfar4/gwenhywfar/gui_be.h:60:10: error: 'libintl_printf' is an unrecognized format function type
    make[5]: *** [gnc-ab-utils.lo] Error 1

diff --git a/packaging/win32/defaults.sh b/packaging/win32/defaults.sh
index ba832cf..4816cb5 100644
--- a/packaging/win32/defaults.sh
+++ b/packaging/win32/defaults.sh
@@ -343,7 +343,7 @@ set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
 #set_default LIBOFX_PATCH `pwd`/libofx-x.x.x.patch
 
 ## online banking: gwenhywfar+aqbanking
-GWENHYWFAR_VERSION="4.11.0beta"
+GWENHYWFAR_VERSION="4.9.0beta"
 set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=74&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
 set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
 

commit 1b269e17cd666693085c25c5a4cab3b2c1e801e9
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Mar 28 21:47:41 2014 -0700

    Ensure that the autoconf and automake checked are the ones we install
    
    rather than some random one installed elsewhere on the path.

diff --git a/packaging/win32/install-impl.sh b/packaging/win32/install-impl.sh
index f8a65e6..9329a87 100644
--- a/packaging/win32/install-impl.sh
+++ b/packaging/win32/install-impl.sh
@@ -352,7 +352,7 @@ function inst_autotools() {
     add_to_env $_AUTOTOOLS_UDIR/bin PATH
     add_to_env -I$_AUTOTOOLS_UDIR/include AUTOTOOLS_CPPFLAGS
     add_to_env -L$_AUTOTOOLS_UDIR/lib AUTOTOOLS_LDFLAGS
-    if quiet autoconf --help && quiet automake --help
+    if quiet $_AUTOTOOLS_UDIR/bin/autoconf --help && quiet $_AUTOTOOLS_UDIR/bin/automake --help
     then
         echo "autoconf/automake already installed in $_AUTOTOOLS_UDIR.  skipping."
     else

commit 963c8a0048c9bf9d1291962fc926e25788b7a19b
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Mar 28 21:46:26 2014 -0700

    Update Active Perl version to the one current "community edition".

diff --git a/packaging/win32/defaults.sh b/packaging/win32/defaults.sh
index 4e77870..ba832cf 100644
--- a/packaging/win32/defaults.sh
+++ b/packaging/win32/defaults.sh
@@ -178,7 +178,7 @@ set_default READLINE_BIN_URL "$SF_MIRROR/gnuwin32/readline-5.0-1-bin.zip"
 set_default READLINE_LIB_URL "$SF_MIRROR/gnuwin32/readline-5.0-1-lib.zip"
 set_default READLINE_DIR $GLOBAL_DIR\\readline
 
-set_default ACTIVE_PERL_URL "http://downloads.activestate.com/ActivePerl/releases/5.14.4.1405/ActivePerl-5.14.4.1405-MSWin32-x86-296746.zip"
+set_default ACTIVE_PERL_URL "http://downloads.activestate.com/ActivePerl/releases/5.16.3.1603/ActivePerl-5.16.3.1603-MSWin32-x86-296746.zip"
 set_default ACTIVE_PERL_DIR $GLOBAL_DIR\\active-perl
 
 set_default AUTOCONF_URL "http://ftp.gnu.org/gnu/autoconf/autoconf-2.63.tar.bz2"



Summary of changes:
 packaging/win32/defaults.sh     | 4 ++--
 packaging/win32/install-impl.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)



More information about the gnucash-changes mailing list