gnucash stable: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/10d51954 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/003f5bb9 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/76254e05 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/d0249d98 (commit)
	from  https://github.com/Gnucash/gnucash/commit/21351264 (commit)



commit 10d519544b6948aadb04bce354a9f220512f6193
Merge: 003f5bb96a 76254e050f
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat May 3 17:46:10 2025 -0700

    Merge Bill Sommerfeld's 'gnc-date-fix' into stable.


commit 003f5bb96a4a7b852108abd577504b36217df2d8
Merge: 213512649a d0249d9883
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat May 3 17:45:08 2025 -0700

    Merge Bill Sommerfeld's 'base-typemaps-unused-fix' into stable.


commit 76254e050f30477d5df56e6adb0adf8ac31b08c1
Author: Bill Sommerfeld <sommerfeld at hamachi.org>
Date:   Fri May 2 14:29:35 2025 -0700

    Fix build of test-gnc-date on systems without HAVE_STRUCT_TM_GMTOFF

diff --git a/libgnucash/engine/test/test-gnc-date.c b/libgnucash/engine/test/test-gnc-date.c
index fe68f0196e..f0dad140f1 100644
--- a/libgnucash/engine/test/test-gnc-date.c
+++ b/libgnucash/engine/test/test-gnc-date.c
@@ -1151,7 +1151,7 @@ test_qof_scan_date (void)
     time64 now = gnc_time(NULL);
     gchar buff[MAX_DATE_LENGTH];
     struct tm tm = { 0, 0, 0, 0, 0, 0, 0, 0, 0
-#ifndef G_OS_WIN32
+#ifdef HAVE_STRUCT_TM_GMTOFF
         , 0, 0
 #endif
     };

commit d0249d98830ff70a3b0f0e287a85629ad5ca48ef
Author: Bill Sommerfeld <sommerfeld at hamachi.org>
Date:   Fri May 2 14:31:27 2025 -0700

    Avoid unused variable warnings on systems without HAVE_STRUCT_TM_GMTOFF

diff --git a/common/base-typemaps.i b/common/base-typemaps.i
index 2a878a0122..42dc4ee3cf 100644
--- a/common/base-typemaps.i
+++ b/common/base-typemaps.i
@@ -95,6 +95,8 @@ typedef char gchar;
     SCM zone = SCM_SIMPLE_VECTOR_REF(tm, 10);
     tzone = SCM_UNBNDP(zone) ? NULL : scm_to_locale_string(zone);
     t.tm_zone = tzone;
+%#else
+    (void)tzone;
 %#endif
     $1 = &t;
  }



Summary of changes:
 common/base-typemaps.i                 | 2 ++
 libgnucash/engine/test/test-gnc-date.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)