gnucash-on-windows master: Update to aqbanking-6.4.0 and gwenhywfar-5.7.4

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/5c810014 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/7741b7ea (commit)



commit 5c810014d60d462f180a0f5cc93106b94232daa3
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sun Nov 21 14:35:28 2021 +0100

    Update to aqbanking-6.4.0 and gwenhywfar-5.7.4
    
    FinTS: SEPA internal transfers
    Paypal: Set transaction memo attribute from paypal response field 'NOTE'
    Improve CSV importer, translations
    
    Reason: https://github.com/Gnucash/gnucash/pull/1199

diff --git a/gnucash.modules b/gnucash.modules
index 01900d8..a9f2a36 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -143,9 +143,9 @@
 
   <autotools id="gwenhywfar" autogen-sh="configure"
              autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc PKG_CONFIG='pkg-config --dont-define-prefix'">
-    <branch module="384/gwenhywfar-5.7.2.tar.gz" version="5.7.2"
+    <branch module="396/gwenhywfar-5.7.4.tar.gz" version="5.7.4"
             repo="aqbanking">
-      <patch file="gwenhywfar-skip-gwenbuild.patch" strip="1"/>
+      <patch file="gwenhywfar-5.7.7-typemaker2-Makefiles.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="gcrypt"/>
@@ -173,7 +173,7 @@
 
   <autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
 	     autogenargs="--enable-local-install">
-    <branch module="386/aqbanking-6.3.2.tar.gz" repo="aqbanking" version="6.3.2">
+    <branch module="394/aqbanking-6.4.0.tar.gz" repo="aqbanking" version="6.4.0">
     </branch>
     <dependencies>
       <dep package="gwenhywfar"/>
diff --git a/patches/gwenhywfar-5.7.4-typemaker2-Makefiles.patch b/patches/gwenhywfar-5.7.4-typemaker2-Makefiles.patch
new file mode 100644
index 0000000..d58026a
--- /dev/null
+++ b/patches/gwenhywfar-5.7.4-typemaker2-Makefiles.patch
@@ -0,0 +1,37 @@
+--- a/tools/typemaker2/Makefile.in	2021-11-13 10:12:21.000000000 -0800
++++ b/tools/typemaker2/Makefile.in	2021-11-24 13:31:46.720542300 -0800
+@@ -125,8 +125,9 @@
+ am__DEPENDENCIES_1 =
+ @IS_WINDOWS_TRUE at am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
+ typemaker2_DEPENDENCIES =  \
++	c/libtm2_c.la \
+ 	$(top_builddir)/src/$(gwenhywfar_internal_libname) \
+-	c/libtm2_c.la $(am__DEPENDENCIES_2)
++	$(am__DEPENDENCIES_2)
+ AM_V_lt = $(am__v_lt_ at AM_V@)
+ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+@@ -560,8 +561,10 @@
+ 
+ 
+ #  tm_enum.c
+-typemaker2_LDADD = $(top_builddir)/src/$(gwenhywfar_internal_libname) \
+-	c/libtm2_c.la $(am__append_1)
++typemaker2_LDADD = \
++	c/libtm2_c.la \
++	$(top_builddir)/src/$(gwenhywfar_internal_libname) \
++	$(am__append_1)
+ @IS_WINDOWS_TRUE at typemaker2_LDFLAGS = -mconsole
+ EXTRA_DIST = $(typefiles)
+ all: all-recursive
+--- a/tools/typemaker2/c/Makefile.in	2021-11-13 10:12:21.000000000 -0800
++++ b/tools/typemaker2/c/Makefile.in	2021-11-24 13:39:45.614600400 -0800
+@@ -456,7 +456,7 @@
+ with_gui_gtk2 = @with_gui_gtk2@
+ with_gui_gtk3 = @with_gui_gtk3@
+ with_gui_qt4 = @with_gui_qt4@
+-INCLUDES = @all_includes@ -I$(top_builddir) -I../ -I../../ -I$(top_srcdir)/tools -I$(gwenhywfar_symlinkdir)
++INCLUDES = @all_includes@ -I$(top_builddir) -I${srcdir}/../ -I${srcdir}/../../ -I$(top_srcdir)/tools -I$(gwenhywfar_symlinkdir)
+ noinst_LTLIBRARIES = libtm2_c.la
+ libtm2_c_la_SOURCES = \
+  tm_builder_c.c \
diff --git a/patches/gwenhywfar-skip-gwenbuild.patch b/patches/gwenhywfar-skip-gwenbuild.patch
deleted file mode 100644
index c08a533..0000000
--- a/patches/gwenhywfar-skip-gwenbuild.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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:



Summary of changes:
 gnucash.modules                                    |  6 ++--
 .../gwenhywfar-5.7.4-typemaker2-Makefiles.patch    | 37 ++++++++++++++++++++++
 patches/gwenhywfar-skip-gwenbuild.patch            | 11 -------
 3 files changed, 40 insertions(+), 14 deletions(-)
 create mode 100644 patches/gwenhywfar-5.7.4-typemaker2-Makefiles.patch
 delete mode 100644 patches/gwenhywfar-skip-gwenbuild.patch