gnucash-on-osx master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-osx/commit/577bf236 (commit)
	 via  https://github.com/Gnucash/gnucash-on-osx/commit/82313edd (commit)
	 via  https://github.com/Gnucash/gnucash-on-osx/commit/09bdfd89 (commit)
	from  https://github.com/Gnucash/gnucash-on-osx/commit/4d9b5652 (commit)



commit 577bf236065b7a6e2769d981c65fa7bb560f66a0
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Oct 27 12:30:37 2020 -0700

    Fix gnucash-docs replacing makeargs with ninjaargs.
    
    Because that's what jhbuild configures CMake to build with.

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 6e3454e..3f1d2f3 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -339,7 +339,7 @@
  </cmake>
 
   <cmake id="gnucash-docs-git"
-	    makeargs=" html" makeinstallargs="install-html" >
+	    ninjaargs="html" >
     <branch  repo="github" module="Gnucash/gnucash-docs.git" revision="master"
 	   checkoutdir="gnucash-docs-git"/>
   </cmake>
@@ -352,13 +352,13 @@
   </cmake>
 
   <cmake id="gnucash-docs"
-         ninjaargs="html" ninjainstallargs="install-html" >
+         ninjaargs="html">
     <branch  module="gnucash/gnucash%20%28stable%29/4.2/gnucash-docs-4.2.tar.gz"
 	     version="4.2" repo="sourceforge"/>
   </cmake>
 
   <cmake id="gnucash-unstable-docs"
-	    makeargs=" html" makeinstallargs="install-html" >
+	    ninjaargs="html">
     <branch  module="gnucash/gnucash%20%28unstable%29/3.906/gnucash-docs-3.906.tar.gz"
 	     version="3.906" repo="sourceforge"/>
   </cmake>

commit 82313eddc94f5f30f5b7e668f07d1a2ba133dfd6
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Oct 27 12:28:04 2020 -0700

    Switch GnuCash webkit to WebKit2.

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index e911845..6e3454e 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -290,7 +290,7 @@
       <dep package="swig"/>
       <dep package="boost"/>
       <dep package="googletest"/>
-      <dep package="webkit1gtk3"/>
+      <dep package="webkit2gtk3"/>
     </dependencies>
 
  </cmake>
@@ -314,7 +314,7 @@
       <dep package="swig"/>
       <dep package="boost"/>
       <dep package="googletest"/>
-      <dep package="webkit1gtk3"/>
+      <dep package="webkit2gtk3"/>
     </dependencies>
  </cmake>
 
@@ -334,7 +334,7 @@
       <dep package="swig"/>
       <dep package="boost"/>
       <dep package="googletest"/>
-      <dep package="webkit1gtk3"/>
+      <dep package="webkit2gtk3"/>
     </dependencies>
  </cmake>
 

commit 09bdfd89748961786a55c51a8bf3eb433a2e1982
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Oct 17 18:18:04 2020 -0700

    Update AQBanking and Gwenhywfar to new stable releases.

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 7906e76..e911845 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -49,7 +49,7 @@
 
   <autotools id="gwenhywfar" autogen-sh="configure"
 	     autogenargs="--with-guis='gtk3' --enable-local-install">
-    <branch module="331/gwenhywfar-5.4.0.tar.gz" version="5.4.0"
+    <branch module="344/gwenhywfar-5.4.1.tar.gz" version="5.4.1"
             repo="aqbanking" >
       <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/gwen-include-file.patch" strip="1"/>
       <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/gwen-macos-bundle-path.patch" strip="1"/>
@@ -87,7 +87,7 @@
 
   <autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
 	     autogenargs="--enable-local-install">
-    <branch module="334/aqbanking-6.2.2.tar.gz" version="6.2.2"
+    <branch module="342/aqbanking-6.2.5.tar.gz" version="6.2.5"
             repo="aqbanking">
     </branch>
     <dependencies>



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