gnucash-on-osx master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-osx/commit/09c6a44a (commit)
	 via  https://github.com/Gnucash/gnucash-on-osx/commit/490001d6 (commit)
	from  https://github.com/Gnucash/gnucash-on-osx/commit/46efd0f3 (commit)



commit 09c6a44ac1f2764bdd6027a549a026cb266beacf
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Oct 23 17:43:29 2021 -0700

    Release new GnuCash 4.8 bundle with gtk repaired so that it runs on macOS 12.

diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index fecc710..5025075 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Gnucash</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Gnucash version 4.8-1 © 2021 GnucashContributors</string>
+	<string>Gnucash version 4.8-2 © 2021 GnucashContributors</string>
 	<key>CFBundleIconFile</key>
 	<string>gnucash.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleLongVersionString</key>
-	<string>4.8-1 © 2021 Gnucash Contributors</string>
+	<string>4.8-2 © 2021 Gnucash Contributors</string>
 	<key>CFBundleName</key>
 	<string>Gnucash</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.8-1</string>
+	<string>4.8-2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>4.8-1</string>
+	<string>4.8-2</string>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 	  <dict>

commit 490001d65a364fb3aeb3ca6c1a07b08b0f304f86
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Oct 23 17:42:52 2021 -0700

    Fix mariadb-connector setup for libdbi-drivers.

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 577df97..6eb7f9c 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -163,7 +163,7 @@
     </dependencies>
   </autotools>
 
-  <cmake id="mariadb-connector" cmakeargs="-DWITH_SSL=gnutls">
+  <cmake id="mariadb-connector" cmakeargs="-DWITH_SSL=gnutls -DWITH_MYSQLCOMPAT=ON">
     <branch repo="github-tarball" module="mariadb-corporation/mariadb-connector-c/archive/refs/tags/v3.2.4.tar.gz" version="3.2.4"
             checkoutdir="mariadb-connector-c-3.2.4">
       <patch file="mariadb-connector-fix-includes.patch" strip="1"/>
@@ -179,7 +179,7 @@
   </autotools>
 
   <autotools id="libdbi-drivers" autogen-sh='autoreconf'
-	     autogenargs='--with-mysql --with-mysql-libdir=$PREFIX/lib  --with-mysql-incdir=$PREFIX/include/mariadb/ --with-pgsql --with-sqlite3 --disable-docs --disable-dependency-tracking'>
+	     autogenargs='--with-mysql --with-mysql-libdir=$PREFIX/lib/mariadb/  --with-mysql-incdir=$PREFIX/include/mariadb/ --with-pgsql --with-sqlite3 --disable-docs --disable-dependency-tracking'>
     <branch repo="sourceforge-git"
 	    module="libdbi-drivers/libdbi-drivers">
     </branch>



Summary of changes:
 gnucash-bundler/Info.plist | 8 ++++----
 modulesets/gnucash.modules | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)