gnucash-on-osx master: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Thu Nov 3 18:03:36 EDT 2022


Updated	 via  https://github.com/Gnucash/gnucash-on-osx/commit/f6b227c7 (commit)
	 via  https://github.com/Gnucash/gnucash-on-osx/commit/df7ed4c6 (commit)
	from  https://github.com/Gnucash/gnucash-on-osx/commit/ec9edd82 (commit)



commit f6b227c7f9307ac48e0d5bf57236317e76dbb5db
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Nov 3 14:59:38 2022 -0700

    Fix need for manual intervention when building libdbi & libdbi-drivers
    
    Build with tarballs generated from fixed git repository checkouts;
    Upstream is at best moribund, so no bugs or patches filed.

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 3f149c6..52fe31c 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -17,8 +17,6 @@
 	      href="https://git.code.sf.net/p/"/>
   <repository type="tarball" name="csail"
 	      href="http://groups.csail.mit.edu/mac/ftpdir/"/>
-  <repository type="tarball" name="gnucash.org"
-	      href="http://www.gnucash.org/pub/gnucash/sources/"/>
   <repository type="tarball" name="xmlsec"
 	      href="http://www.aleksey.com/xmlsec/download/"/>
   <repository type="git" name="aquamaniac"
@@ -173,15 +171,17 @@
     </dependencies>
   </cmake>
 
-  <autotools id="libdbi" autogen-sh="autoreconf" autogenargs="--disable-docs">
-    <branch repo="sourceforge-git" module="libdbi/libdbi" >
+  <autotools id="libdbi" autogen-sh="configure" autogenargs="--disable-docs">
+    <branch repo="sourceforge" module="gnucash/libdbi-0.9.1.tar.gz" version="0.9.1"
+            hash="sha256:870c81447e45ea7f02379dec91ca53f0a28c2438cf88bb3a6491fb4db30db528">
     </branch>
   </autotools>
 
-  <autotools id="libdbi-drivers" autogen-sh='autoreconf'
+  <autotools id="libdbi-drivers" autogen-sh="configure"
 	     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 repo="sourceforge"
+            module="gnucash/libdbi-drivers-0.9.1.tar.gz" version="0.9.1"
+            hash="sha256:3346b3f09edb2c2464422560ff783f7a7fa1fcd287427f0a8f2db8a1d995acb9">
     </branch>
     <dependencies>
       <dep package="libdbi"/>

commit df7ed4c65334b3448f841ef40f787addc4625493
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Nov 3 11:40:16 2022 -0700

    Upgrade xmlsec.
    
    This version correctly links gcrypt with gnutls.

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 3719fce..3f149c6 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -78,8 +78,8 @@
   </autotools>
 
   <autotools id="xmlsec" autogenargs="--enable-docs=no --with-gcrypt --with-gnutls">
-    <branch module="xmlsec1-1.2.32.tar.gz"
-            repo="xmlsec" version="1.2.32" >
+    <branch module="xmlsec1-1.2.36.tar.gz"
+            repo="xmlsec" version="1.2.36" >
     </branch>
     <dependencies>
       <dep package="openssl"/>



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



More information about the gnucash-changes mailing list