gnucash-on-osx master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-osx/commit/ec219a0a (commit)
	 via  https://github.com/Gnucash/gnucash-on-osx/commit/42ffb266 (commit)
	 via  https://github.com/Gnucash/gnucash-on-osx/commit/091073cd (commit)
	 via  https://github.com/Gnucash/gnucash-on-osx/commit/cbac6045 (commit)
	 via  https://github.com/Gnucash/gnucash-on-osx/commit/166d26ec (commit)
	 via  https://github.com/Gnucash/gnucash-on-osx/commit/399ff2de (commit)
	from  https://github.com/Gnucash/gnucash-on-osx/commit/50f42a9a (commit)



commit ec219a0ad4e4ba37c3fa1444bbe6841e4e064f37
Merge: 42ffb26 166d26e
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Jan 19 11:24:40 2026 -0800

    Merge Michael Pratt's hardcoded-local-path into master.


commit 42ffb2669ef04627ce77a9761a79e264edf55ebd
Merge: 091073c 399ff2d
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Jan 19 11:23:14 2026 -0800

    Merge Michael Pratt's libdbi/libofx include paths into master.


commit 091073cdfc4b9cbf76b2d78f4ac4914bbcbd32b8
Merge: 50f42a9 cbac604
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Jan 19 11:22:33 2026 -0800

    Merge Michael Pratt's ignore-libdbi-driver-warning into master.


commit cbac6045c14ed7ff1cd7bdbd25a0c53e3484d340
Author: Michael Pratt <michael at pratt.im>
Date:   Wed Jan 14 08:40:04 2026 -0500

    Ignore libdbi-driver compiler warning
    
    The signature of test_with_matcher is completely wrong here, but this code is
    only used for cgreen's self tests, so it doesn't really matter.

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index a6b60ac..a3702cb 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -190,6 +190,7 @@
     <branch repo="sourceforge"
             module="gnucash/libdbi-drivers-0.9.1.tar.gz" version="0.9.1"
             hash="sha256:3346b3f09edb2c2464422560ff783f7a7fa1fcd287427f0a8f2db8a1d995acb9">
+      <patch file="libdbi-drivers-cgreen.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="libdbi"/>
diff --git a/patches/libdbi-drivers-cgreen.patch b/patches/libdbi-drivers-cgreen.patch
new file mode 100644
index 0000000..6e0a2d2
--- /dev/null
+++ b/patches/libdbi-drivers-cgreen.patch
@@ -0,0 +1,14 @@
+diff -r -u libdbi-drivers-0.9.1.orig/tests/cgreen/src/constraint.c libdbi-drivers-0.9.1/tests/cgreen/src/constraint.c
+--- a/tests/cgreen/src/constraint.c	2026-01-14 08:32:39
++++ b/tests/cgreen/src/constraint.c	2026-01-14 06:58:22
+@@ -101,7 +101,10 @@
+ 
+     constraint->parameter = parameter;
+     constraint->compare = &compare_using_matcher;
++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wincompatible-function-pointer-types"
+     constraint->test = &test_with_matcher;
++#pragma clang diagnostic pop
+     constraint->name = matcher_name;
+     constraint->expected = (intptr_t)matcher_function;
+     return constraint;

commit 166d26ecf7fe7d9e8bc4b871271f00766f777350
Author: Michael Pratt <michael at pratt.im>
Date:   Wed Jan 14 07:47:02 2026 -0500

    Avoid hardcoded gtk-oss module path

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index a6b60ac..e165877 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -31,8 +31,8 @@
               href="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/"
               type="tarball" />
 
-  <!--include href="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/modulesets-stable/gtk-osx.modules"/-->
- <include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/>
+ <include href="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/modulesets-stable/gtk-osx.modules"/>
+ <!--include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
 
   <meson id="shared-mime-info-2.2">
     <branch module="2.2/shared-mime-info-2.2.tar.bz2"

commit 399ff2de8fdf05b1c8d51ea65ad1111340e41ce4
Author: Michael Pratt <michael at pratt.im>
Date:   Wed Jan 14 07:47:02 2026 -0500

    Configure lib/include paths for libofx and libdbi-drivers
    
    Both of these seem to ignore $PREFIX by default when searching for the OpenSP
    and libdbi dependencies, respectively. Explicitly configure the path so they
    can be found.

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index a6b60ac..c339ad4 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -138,7 +138,8 @@
     </branch>
   </autotools>
 
-  <autotools id="libofx" autogen-sh='configure'>
+  <autotools id="libofx" autogen-sh='configure'
+	     autogenargs="--with-opensp-libs=$PREFIX/lib/ --with-opensp-includes=$PREFIX/include/OpenSP/">
     <branch repo="github-tarball" module="libofx/libofx/releases/download/0.10.9/libofx-0.10.9.tar.gz"
             version="0.10.9">
     </branch>
@@ -186,7 +187,7 @@
   </autotools>
 
   <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'>
+	     autogenargs='--with-mysql --with-mysql-libdir=$PREFIX/lib/mariadb/  --with-mysql-incdir=$PREFIX/include/mariadb/ --with-pgsql --with-sqlite3 --disable-docs --disable-dependency-tracking --with-dbi-libdir=$PREFIX/lib --with-dbi-incdir=$PREFIX/include/dbi/'>
     <branch repo="sourceforge"
             module="gnucash/libdbi-drivers-0.9.1.tar.gz" version="0.9.1"
             hash="sha256:3346b3f09edb2c2464422560ff783f7a7fa1fcd287427f0a8f2db8a1d995acb9">



Summary of changes:
 modulesets/gnucash.modules          | 10 ++++++----
 patches/libdbi-drivers-cgreen.patch | 14 ++++++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 patches/libdbi-drivers-cgreen.patch