gnucash-on-windows master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/e56a0ce2 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/b6bc66fb (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/4829dc04 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/6e35c76b (commit)



commit e56a0ce206c61bd5090e2ba3a432ecee24de4dfd
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Jan 11 09:49:00 2018 -0800

    Fix AQBanking setup crash.
    
    Gcc-7.2 generates bad code that sets a bad stack pointer when returning from call
    in GWEN_Gui_ReadDialogPrefs. Work around by disabling optimization when
    building gwenhywfar.

diff --git a/jhbuildrc.in b/jhbuildrc.in
index 1f149bf..b0c1725 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -79,4 +79,5 @@ module_makeargs["gnucash"]="-j 1"
 module_makeargs["gnucash-git"]="-j 1"
 
 module_extra_env["gnucash"]={'ACLOCAL_FLAGS':'-I' + os.path.join('/mingw32', 'share', 'aclocal')}
+module_extra_env["gwenhywfar"]={'CFLAGS':'-O0'}
 

commit b6bc66fbd927b5d67969c0e95b540d1522664e5a
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Jan 11 09:46:08 2018 -0800

    Upgrade Gwenhywfar to latest release and don't build libgwengui-gtk2.

diff --git a/gnucash.modules b/gnucash.modules
index 81e345e..9ac4db6 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -142,8 +142,8 @@
   </autotools>
 
   <autotools id="gwenhywfar" autogen-sh="configure"
-	     autogenargs="--with-guis=gtk2 --enable-local-install --disable-binreloc --disable-ssl">
-    <branch module="gnucash/Dependencies/gwenhywfar-4.17.0.tar.gz" version="4.17.0"
+	     autogenargs="--with-guis='' --enable-local-install --disable-binreloc --disable-ssl">
+    <branch module="gnucash/Dependencies/gwenhywfar-4.18.0.tar.gz" version="4.18.0"
 	    repo="sourceforge">
     </branch>
     <dependencies>
@@ -153,7 +153,7 @@
   </autotools>
 
   <autotools id="gwenhywfar-svn" autogen-template="make -fMakefile.cvs && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
-	     autogenargs="--with-guis=gtk2 --enable-local-install --disable-binreloc --disable-ssl">
+	     autogenargs="--with-guis='' --enable-local-install --disable-binreloc --disable-ssl">
     <branch module="gwenhywfar" repo="aquamaniac"/>
     <dependencies>
       <dep package="gcrypt"/>
diff --git a/jhbuildrc.in b/jhbuildrc.in
index f7973aa..1f149bf 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -78,6 +78,5 @@ module_makeargs["aqbanking"]="-j 1"
 module_makeargs["gnucash"]="-j 1"
 module_makeargs["gnucash-git"]="-j 1"
 
-module_extra_env["gwenhywfar"]={'CPPFLAGS':_popen('pkg-config --cflags gtk+-2.0'), 'LDFLAGS':_popen('pkg-config --libs gtk+-2.0')}
 module_extra_env["gnucash"]={'ACLOCAL_FLAGS':'-I' + os.path.join('/mingw32', 'share', 'aclocal')}
 

commit 4829dc0497ec08f0508bf8f100b3b3dba002b50b
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Jan 11 09:41:52 2018 -0800

    Change COPYING to LICENSE, reflecting file actually distributed in the tarball.

diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index a8e3495..8738faf 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -16,7 +16,7 @@ AppUpdatesURL=http://www.gnucash.org
 VersionInfoVersion=@PACKAGE_VERSION@
 DefaultDirName={pf}\@PACKAGE@
 DefaultGroupName=GnuCash
-LicenseFile=@INST_DIR@\share\doc\@PACKAGE@\COPYING
+LicenseFile=@INST_DIR@\share\doc\@PACKAGE@\LICENSE
 Compression=lzma
 MinVersion=5.0
 PrivilegesRequired=poweruser
@@ -102,7 +102,7 @@ Source: "@INST_DIR@\share\doc\@PACKAGE@\README-fr.win32-bin.txt"; DestDir: "{app
 Source: "@INST_DIR@\share\doc\@PACKAGE@\README-it.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
 Source: "@INST_DIR@\share\doc\@PACKAGE@\README-zh_CN.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
 Source: "@INST_DIR@\share\doc\@PACKAGE@\README-zh_TW.win32-bin.txt"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
-Source: "@INST_DIR@\share\doc\@PACKAGE@\COPYING"; DestDir: "{app}\doc\@PACKAGE@"; Flags: ignoreversion; Components: main
+Source: "@INST_DIR@\share\doc\@PACKAGE@\LICENSE"; DestDir: "{app}\doc\@PACKAGE@"; Flags: ignoreversion; Components: main
 Source: "@INST_DIR@\share\doc\@PACKAGE@\AUTHORS"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
 Source: "@INST_DIR@\share\doc\@PACKAGE@\ChangeLog"; DestDir: "{app}\doc\@PACKAGE@"; Components: main
 Source: "@INST_DIR@\share\doc\@PACKAGE at -docs\*.chm"; DestDir: "{app}\share\@PACKAGE@\help"; Flags: recursesubdirs; Components: main



Summary of changes:
 gnucash.modules                | 6 +++---
 inno_setup/gnucash-mingw64.iss | 4 ++--
 jhbuildrc.in                   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)