gnucash-on-osx master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-osx/commit/646fa731 (commit)
	 via  https://github.com/Gnucash/gnucash-on-osx/commit/85e75fed (commit)
	from  https://github.com/Gnucash/gnucash-on-osx/commit/f6b227c7 (commit)



commit 646fa731d2ce1fae11f82e7ff3a657934c5ae58a
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Dec 12 12:02:27 2022 -0800

    Bug 798643 - Need fr.lproj directory under Resources
    
    Added directory and documentation as requested.

diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 8063c3f..6ae30a3 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -211,6 +211,14 @@
     ${prefix}/share/doc/gnucash-docs/de/gnucash-guide/
   </data>
 
+   <data dest="${bundle}/Contents/Resources/fr.lproj/GnuCash Help/">
+    ${prefix}/share/doc/gnucash-docs/C/gnucash-help/
+  </data>
+
+  <data dest="${bundle}/Contents/Resources/fr.lproj/GnuCash Guide/">
+    ${prefix}/share/doc/gnucash-docs/C/gnucash-guide/
+  </data>
+
   <data dest="${bundle}/Contents/Resources/it.lproj/GnuCash Help/">
     ${prefix}/share/doc/gnucash-docs/it/gnucash-help/
   </data>

commit 85e75fedc73b8766b0ef6d5f9d9cc90ef1b84d5e
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Dec 12 11:48:43 2022 -0800

    Add guile30 module and set up gnucash-unstable and gnucash-git to use it.

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 52fe31c..2d0809b 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -254,6 +254,19 @@
     </dependencies>
   </autotools>
 
+  <autotools id="guile30" autogen-sh="configure">
+    <branch repo="ftp.gnu.org" module="guile/guile-3.0.8.tar.gz"
+	    version="3.0.8">
+     <patch file="guile-2.2-libguile-Makefile-fixups.patch" strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="libunistring"/>
+      <dep package="gmp"/>
+      <dep package="libffi"/>
+      <dep package="bdw-gc"/>
+    </dependencies>
+  </autotools>
+
   <cmake id="googletest" cmakeargs="-DBUILD_GMOCK=OFF" skip-install="True">
     <branch module="google/googletest" repo="github" tag="release-1.10.0"/>
   </cmake>
@@ -321,7 +334,7 @@
       <dep package="libdbi-drivers"/>
       <dep package="shared-mime-info"/>
       <dep package="iso-codes"/>
-      <dep package="guile22"/>
+      <dep package="guile30"/>
       <dep package="swig"/>
       <dep package="boost"/>
       <dep package="googletest"/>
@@ -341,7 +354,7 @@
       <dep package="libdbi-drivers"/>
       <dep package="shared-mime-info"/>
       <dep package="iso-codes"/>
-      <dep package="guile22"/>
+      <dep package="guile30"/>
       <dep package="swig"/>
       <dep package="boost"/>
       <dep package="googletest"/>



Summary of changes:
 gnucash-bundler/gnucash.bundle |  8 ++++++++
 modulesets/gnucash.modules     | 17 +++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)