gnucash future: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Wed Jun 17 16:00:52 EDT 2026
Updated via https://github.com/Gnucash/gnucash/commit/24481321 (commit)
via https://github.com/Gnucash/gnucash/commit/3c7e0142 (commit)
from https://github.com/Gnucash/gnucash/commit/06a79ad2 (commit)
commit 24481321def01af9406d16a87faeaa1865c1d09a
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Jun 11 14:01:04 2026 -0700
Replace deprecated g_module_build_path with g_build_filename
Note that deducing the module file extension is now done by g_module_open.
diff --git a/libgnucash/engine/qof-backend.cpp b/libgnucash/engine/qof-backend.cpp
index db03d0831e..a97dc6a0ad 100644
--- a/libgnucash/engine/qof-backend.cpp
+++ b/libgnucash/engine/qof-backend.cpp
@@ -100,16 +100,7 @@ QofBackend::register_backend(const char* directory, const char* module_name)
auto pkgdir = gnc_path_get_pkglibdir ();
if (!absdir || !g_path_is_absolute(absdir))
absdir = pkgdir;
- auto fullpath = g_module_build_path (absdir, module_name);
-/* Darwin modules can have either .so or .dylib for a suffix */
- if (!g_file_test (fullpath, G_FILE_TEST_EXISTS) &&
- g_strcmp0 (G_MODULE_SUFFIX, "so") == 0)
- {
- auto modname = g_strdup_printf ("lib%s.dylib", module_name);
- g_free (fullpath);
- fullpath = g_build_filename (absdir, modname, nullptr);
- g_free (modname);
- }
+ auto fullpath = g_build_filename (absdir, module_name, nullptr);
auto backend = g_module_open (fullpath, G_MODULE_BIND_LAZY);
g_free (fullpath);
g_free (pkgdir);
diff --git a/libgnucash/gnc-module/test/test-dynload.c b/libgnucash/gnc-module/test/test-dynload.c
index d37751b20d..f1db3a6ba7 100644
--- a/libgnucash/gnc-module/test/test-dynload.c
+++ b/libgnucash/gnc-module/test/test-dynload.c
@@ -49,27 +49,14 @@ main(int argc, char ** argv)
/* MinGW builds libgnc-module-0.dll */
if (libdir == NULL)
{
- modpath = g_module_build_path ("../.libs", "gnc-module-0");
+ modpath = g_build_filename ("../.libs", "gnc-module-0", nullptr);
}
else
{
- modpath = g_module_build_path (libdir, "gnc-module");
- }
-#elif defined(GNC_PLATFORM_OSX)
-/* We build libgnc-module as a shared library for testing, and on OSX
- * that means that g_module_build_path (), which uses ".so", doesn't
- * build the right path name.
- */
- if (libdir == NULL)
- {
- modpath = g_build_filename ("..", ".libs", "libgnc-module.dylib", NULL);
- }
- else
- {
- modpath = g_build_filename (libdir, "libgnc-module.dylib", NULL);
+ modpath = g_build_filename (libdir, "gnc-module", nullptr);
}
#else /* Regular Unix */
- modpath = g_module_build_path (libdir, "gnc-module");
+ modpath = g_build_filename (libdir, "gnc-module", NULL);
#endif
gmodule = g_module_open(modpath, 0);
commit 3c7e01420ad448a4ca05b2b8db7c1a8199c5c9df
Author: John Ralls <jralls at ceridwen.us>
Date: Wed Jun 10 21:34:56 2026 -0700
Replace mac dependencies tarball.
Provides new ICU required for the future branch.
diff --git a/.github/workflows/mac-tests.yaml b/.github/workflows/mac-tests.yaml
index f813e51a58..2cce9cf266 100644
--- a/.github/workflows/mac-tests.yaml
+++ b/.github/workflows/mac-tests.yaml
@@ -20,9 +20,9 @@ jobs:
uses: carlosperate/download-file-action at v2
id: dependencies
with:
- file-url: 'https://downloads.sourceforge.net/gnucash/Dependencies/gnucash-5.15-mac-dependencies.tar.xz'
- file-name: gnucash-5.15-mac-dependencies.tar.xz
- sha256: '15d14226e93cf18c60eb36d79686171a6b920ed1f72a815b8bad8f8755c76a02'
+ file-url: 'https://downloads.sourceforge.net/gnucash/Dependencies/gnucash-future-mac-dependencies.tar.xz'
+ file-name: gnucash-future-mac-dependencies.tar.xz
+ sha256: 'dbcecf47b368eee317d18e2ad547b754329c17075420aaecddaf99f9d53b6c7b'
- name: download googletest
uses: carlosperate/download-file-action at v2
@@ -34,7 +34,7 @@ jobs:
run: |
mkdir -p $HOME/gnucash/inst
cd $HOME/gnucash/inst
- tar -xf $GITHUB_WORKSPACE/gnucash-5.15-mac-dependencies.tar.xz
+ tar -xf $GITHUB_WORKSPACE/gnucash-future-mac-dependencies.tar.xz
mkdir $HOME/gnucash/source
cd $HOME/gnucash/source
tar -xf $GITHUB_WORKSPACE/googletest.tar.gz
Summary of changes:
.github/workflows/mac-tests.yaml | 8 ++++----
libgnucash/engine/qof-backend.cpp | 11 +----------
libgnucash/gnc-module/test/test-dynload.c | 19 +++----------------
3 files changed, 8 insertions(+), 30 deletions(-)
More information about the gnucash-changes
mailing list