gnucash-on-windows master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/62847d55 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/6d125300 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/7a5f8c3c (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/f1ec6b99 (commit)



commit 62847d559d6bb547ac27956f8da2c5672880b668
Merge: 7a5f8c3 6d12530
Author: John Ralls <jralls at ceridwen.us>
Date:   Wed Sep 15 13:39:18 2021 -0700

    Merge Frank Ellenberger's 'aqb-6-3-1' into maint.

diff --cc gnucash.modules
index abf1088,64bd17e..6424bdf
--- a/gnucash.modules
+++ b/gnucash.modules
@@@ -142,9 -142,9 +142,10 @@@
    </autotools>
  
    <autotools id="gwenhywfar" autogen-sh="configure"
--             autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl PKG_CONFIG='pkg-config --dont-define-prefix'">
-     <branch module="364/gwenhywfar-5.6.0.tar.gz" version="5.6.0"
++             autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc PKG_CONFIG='pkg-config --dont-define-prefix'">
+     <branch module="377/gwenhywfar-5.7.1.tar.gz" version="5.7.1"
              repo="aqbanking">
++      <patch file="gwenhywfar-skip-gwenbuild.patch" strip="1"/>
      </branch>
      <dependencies>
        <dep package="gcrypt"/>
diff --cc patches/gwenhywfar-skip-gwenbuild.patch
index 0000000,0000000..c08a533
new file mode 100644
--- /dev/null
+++ b/patches/gwenhywfar-skip-gwenbuild.patch
@@@ -1,0 -1,0 +1,11 @@@
++--- a/tools/Makefile.in	2021-09-10 05:08:57.000000000 -0700
+++++ b/tools/Makefile.in	2021-09-16 13:17:54.766520400 -0700
++@@ -456,7 +456,7 @@
++ with_gui_gtk2 = @with_gui_gtk2@
++ with_gui_gtk3 = @with_gui_gtk3@
++ with_gui_qt4 = @with_gui_qt4@
++-SUBDIRS = xmlmerge typemaker typemaker2 gcttool gsa gwenbuild
+++SUBDIRS = xmlmerge typemaker typemaker2 gcttool gsa
++ all: all-recursive
++ 
++ .SUFFIXES:

commit 6d125300054dbd8bfdd045d57a76393c93879152
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Tue Sep 14 13:01:54 2021 +0200

    Update to aqbanking-6.3.1 & gwenhywfar-5.7.1

diff --git a/gnucash.modules b/gnucash.modules
index abf1088..64bd17e 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -143,7 +143,7 @@
 
   <autotools id="gwenhywfar" autogen-sh="configure"
              autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl PKG_CONFIG='pkg-config --dont-define-prefix'">
-    <branch module="364/gwenhywfar-5.6.0.tar.gz" version="5.6.0"
+    <branch module="377/gwenhywfar-5.7.1.tar.gz" version="5.7.1"
             repo="aqbanking">
     </branch>
     <dependencies>
@@ -172,7 +172,7 @@
 
   <autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
 	     autogenargs="--enable-local-install">
-    <branch module="372/aqbanking-6.3.0.tar.gz" repo="aqbanking" version="6.3.0">
+    <branch module="379/aqbanking-6.3.1.tar.gz" repo="aqbanking" version="6.3.1">
     </branch>
     <dependencies>
       <dep package="gwenhywfar"/>

commit 7a5f8c3c5af1d80dc8ec37cff0e933c11a32b7ca
Author: Christian Stimming <christian at cstimming.de>
Date:   Mon Sep 13 08:17:49 2021 +0200

    Extend setup variables to include our version also in AppVersion
    
    Some users pointed out that until now, a version checking tool called
    WinGet is not able to find out the installed version of gnucash, as it is
    looking for a registry key "DisplayVersion". This might be caused by not
    setting the AppVersion value for the inno setup (and there is no other
    variable to be found concerning version in inno), which is hence added here.
    https://jrsoftware.org/ishelp/index.php?topic=setup_appversion

diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 00db0f5..9a83c0e 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -8,6 +8,7 @@
 [Setup]
 ; Using the name here directly because we want it capitalized
 AppName=GnuCash
+AppVersion=@PACKAGE_VERSION@
 AppVerName=GnuCash @PACKAGE_VERSION@
 AppPublisher=GnuCash Development Team
 AppPublisherURL=http://www.gnucash.org



Summary of changes:
 gnucash.modules                         |  7 ++++---
 inno_setup/gnucash-mingw64.iss          |  1 +
 patches/gwenhywfar-skip-gwenbuild.patch | 11 +++++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 patches/gwenhywfar-skip-gwenbuild.patch