gnucash-on-osx master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-osx/commit/f14b740c (commit)
	 via  https://github.com/Gnucash/gnucash-on-osx/commit/5e1b0ecc (commit)
	from  https://github.com/Gnucash/gnucash-on-osx/commit/2c263cc0 (commit)



commit f14b740c59408b710163530d0a600f95abf3586f
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Feb 25 16:12:25 2025 -0800

    Add meta-gtk-osx-bootstrap to meta-gnucash-dependencies.

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 9e3c69a..bb0a6c3 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -294,6 +294,7 @@
       <dep package="libdbi-drivers"/>
       <dep package="libofx"/>
       <dep package="mariadb-connector"/>
+      <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-gtk3"/>
       <dep package="pgsql"/>
       <dep package="shared-mime-info"/>

commit 5e1b0ecc35be0021715d09793ea981cf61fe477c
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Feb 25 16:11:25 2025 -0800

    libdbi-drivers: pre-patched tarball doesn't need patching

diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 690ac47..9e3c69a 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -189,7 +189,6 @@
     <branch repo="sourceforge"
             module="gnucash/libdbi-drivers-0.9.1.tar.gz" version="0.9.1"
             hash="sha256:3346b3f09edb2c2464422560ff783f7a7fa1fcd287427f0a8f2db8a1d995acb9">
-      <patch file="libdbi-drivers-cgreen-include.patch"/>
     </branch>
     <dependencies>
       <dep package="libdbi"/>
diff --git a/patches/libdbi-drivers-cgreen-include.patch b/patches/libdbi-drivers-cgreen-include.patch
deleted file mode 100644
index 31318ae..0000000
--- a/patches/libdbi-drivers-cgreen-include.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/tests/cgreen/Makefile.am	2010-09-29 15:22:34.000000000 -0600
-+++ b/tests/cgreen/Makefile.am	2020-02-29 09:16:54.000000000 -0700
-@@ -4,7 +4,7 @@
- 
- noinst_LIBRARIES = libcgreen.a
- 
--INCLUDES = -Iinclude
-+INCLUDES = -I${srcdir}/include
- 
- libcgreen_a_SOURCES =  src/unit.c src/messaging.c src/breadcrumb.c src/reporter.c src/assertions.c src/vector.c src/mocks.c src/constraint.c src/parameters.c src/text_reporter.c src/cdash_reporter.c 
- 
-
-Diff finished.  Sat Feb 29 09:19:34 2020



Summary of changes:
 modulesets/gnucash.modules                  |  2 +-
 patches/libdbi-drivers-cgreen-include.patch | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 patches/libdbi-drivers-cgreen-include.patch