gnucash-on-osx master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-osx/commit/c5ae617c (commit)
	 via  https://github.com/Gnucash/gnucash-on-osx/commit/91bc0c13 (commit)
	from  https://github.com/Gnucash/gnucash-on-osx/commit/e90ad7ff (commit)



commit c5ae617c6983084ff4dac31ded1b97370ef5edbf
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Aug 26 17:45:52 2021 -0700

    Simplify gnucash sourceforge download modules
    
    Sourceforge doesn't need the path, just the project name and file name.

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 5d5350e..c1b7bb5 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -264,7 +264,7 @@
   <autotools id="gnucash-oldstable"
 	     autogen-sh="configure"
 	     autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-dbi-dbd-dir=$PREFIX/lib/dbd --with-html-engine='webkit'">
-    <branch module="project/gnucash/gnucash%20%28stable%29/3.11/gnucash-3.11.tar.bz2" version="3.11"
+    <branch module="gnucash/gnucash-3.11.tar.bz2" version="3.11"
 	    repo="sourceforge">
     </branch>
     <dependencies>
@@ -288,7 +288,7 @@
 
 <cmake id="gnucash"
         cmakeargs="-DGTEST_ROOT=${JHBUILD_SOURCE}/googletest/">
-   <branch module="gnucash/gnucash%20%28stable%29/4.6/gnucash-4.6.tar.bz2"
+   <branch module="gnucash/gnucash-4.6.tar.bz2"
            checkoutdir="gnucash-4.6" repo="sourceforge" version="4.6" />
     <dependencies>
       <dep package="meta-gtk-osx-gtk3"/>
@@ -311,7 +311,7 @@
 
 <cmake id="gnucash-unstable"
         cmakeargs="-DGTEST_ROOT=${JHBUILD_SOURCE}/googletest">
-   <branch module="gnucash/gnucash%20%28unstable%29/3.906/gnucash-3.906.tar.bz2"
+   <branch module="gnucash/gnucash-3.906.tar.bz2"
            checkoutdir="gnucash-3.906" repo="sourceforge" version="3.906" />
    
     <dependencies>
@@ -361,19 +361,19 @@
   <cmake id="gnucash-olddocs" autogenargs="--disable-scrollkeeper"
 	    autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
 	    makeargs=" html" makeinstallargs="install-html" >
-    <branch  module="gnucash/gnucash%20%28stable%29/gnucash-docs-3.11.tar.gz"
+    <branch  module="gnucash/gnucash-docs-3.11.tar.gz"
 	     version="3.11" repo="sourceforge"/>
   </cmake>
 
   <cmake id="gnucash-docs"
          ninjaargs="html">
-    <branch  module="gnucash/gnucash%20%28stable%29/4.6/gnucash-docs-4.6.tar.gz"
+    <branch  module="gnucash/gnucash-docs-4.6.tar.gz"
 	     version="4.6" repo="sourceforge"/>
   </cmake>
 
   <cmake id="gnucash-unstable-docs"
 	    ninjaargs="html">
-    <branch  module="gnucash/gnucash%20%28unstable%29/3.906/gnucash-docs-3.906.tar.gz"
+    <branch  module="gnucash/gnucash-docs-3.906.tar.gz"
 	     version="3.906" repo="sourceforge"/>
   </cmake>
 

commit 91bc0c13c0c7bb156a68ba7377768fbcd3fc5bf9
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Aug 26 17:45:02 2021 -0700

    Fix boost downoad module.

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index fbc8d2f..5d5350e 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -222,7 +222,7 @@
   </autotools>
 
   <cmake id="boost" cmakeargs="-DLIBRARIES='date_time;regex;locale;filesystem;program_options'">
-    <branch module="boost/1.77.0/boost_1_77_0.tar.bz2" version="1.77.0" 
+    <branch module="boost/boost_1_77_0.tar.bz2" version="1.77.0" 
             hash="sha256:fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854"
             repo="sourceforge">
       <patch file="boost-cmake.patch" strip="1"/>



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