gnucash-on-osx master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-osx/commit/899813ee (commit)
	 via  https://github.com/Gnucash/gnucash-on-osx/commit/0139c3a5 (commit)
	 via  https://github.com/Gnucash/gnucash-on-osx/commit/152581ed (commit)
	from  https://github.com/Gnucash/gnucash-on-osx/commit/fe704bf7 (commit)



commit 899813ee19268d7493d3b5abc99972dc71680bb9
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Mar 24 16:29:07 2020 -0700

    Fix up aqbanking-git and gwenhywfar-git.
    
    Sort of. AQBanking still needs manual intervention to build its built sources.

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index e872921..e43556c 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -65,7 +65,8 @@
   </autotools>
 
   <autotools id="gwenhywfar-git" autogen-template="make -fMakefile.cvs && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
-	     autogenargs="--with-guis='gtk3' --enable-local-install">
+             autogenargs="--with-guis='gtk3' --enable-local-install"
+             supports-non-srcdir-builds="no">
     <branch module="gwenhywfar" repo="aquamaniac"/>
     <dependencies>
       <dep package="libgcrypt"/>
@@ -99,13 +100,14 @@
   </autotools>
 
   <autotools id="aqbanking-git"
-	     autogenargs='--enable-local-install"'
-	     autogen-template="make -fMakefile.cvs && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s" >
+	     autogenargs="--enable-local-install"
+	     autogen-template="ACLOCAL_FLAGS=-I$PREFIX/share/aclocal make -fMakefile.cvs && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s" 
+             supports-non-srcdir-builds="no">
      <branch module="aqbanking" repo="aquamaniac" >
     </branch>
     <dependencies>
       <dep package="libofx"/>
-      <dep package="gwenhywfar-svn"/>
+      <dep package="gwenhywfar-git"/>
       <dep package="gmp"/>
       <dep package="xmlsec"/>
       <dep package="libchipcard"/>

commit 0139c3a5df9ab2959abe0a9923fb2d0bc53097bd
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Mar 24 16:27:23 2020 -0700

    Change gnucash-git branch to maint.
    
    Starts new contributors on the right branch.

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 76e4726..e872921 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -315,7 +315,7 @@
 
  <cmake id="gnucash-git"
         cmakeargs="-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DGTEST_ROOT=${JHBUILD_SOURCE}/googletest/googletest -DGMOCK_ROOT=${JHBUILD_SOURCE}/googletest/googlemock">
-   <branch repo="github" module="Gnucash/gnucash.git" revision="master"
+   <branch repo="github" module="Gnucash/gnucash.git" revision="maint"
 	   checkoutdir="gnucash-git"/>
     <dependencies>
       <dep package="meta-gtk-osx-gtk3"/>

commit 152581ed7eb740b206bb5e240cf8803a0a141bbc
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Mar 24 16:26:17 2020 -0700

    Update AQBanking to 6.1.4.
    
    Fixes OFX Direct Connect.

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 1ccfe16..76e4726 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -86,7 +86,7 @@
 
   <autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
 	     autogenargs="--enable-local-install">
-    <branch module="269/aqbanking-6.1.2.tar.gz" version="6.1.2"
+    <branch module="283/aqbanking-6.1.4.tar.gz" version="6.1.4"
             repo="aqbanking">
     </branch>
     <dependencies>



Summary of changes:
 modulesets/gnucash.modules | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)