gnucash stable: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/30cbf307 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/60919829 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/a9a0c210 (commit)
	from  https://github.com/Gnucash/gnucash/commit/cb98864f (commit)



commit 30cbf3074e44e868e2469d00656204e10796adc2
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Apr 2 15:24:56 2023 -0700

    Fix misplaced static variable decl.
    
    Why this compiled is a mystery. Since empty wasn't captured it should
    have raised an unused variable for the outside the lambda declaration
    and an undeclared variable for the use inside. Only gcc 7 raised the
    first error and nothing noticed the second.

diff --git a/bindings/guile/gnc-optiondb.i b/bindings/guile/gnc-optiondb.i
index 2730295d48..6ee883438b 100644
--- a/bindings/guile/gnc-optiondb.i
+++ b/bindings/guile/gnc-optiondb.i
@@ -985,8 +985,8 @@ wrap_unique_ptr(GncOptionDBPtr, GncOptionDB);
                         const GncOptionMultichoiceValue& option)
     {
         static const auto uint16_t_max = std::numeric_limits<uint16_t>::max();
-        static const char* empty{""};
         auto scm_to_str = [](auto item)->const char* {
+                static const char* empty{""};
                 if (scm_is_integer(item))
                     item = scm_number_to_string(item, scm_from_uint(10u));
                 else if (scm_is_symbol(item))

commit 609198295262b62eab66598c0ac760ea2ae0f84c
Merge: cb98864f7b a9a0c2104a
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Apr 2 14:30:29 2023 -0700

    Merge Richard Cohen's 'fix-cmake-310-build' into stable.


commit a9a0c2104a8c628747ec5a27bfcc32d697658a89
Author: Richard Cohen <richard at daijobu.co.uk>
Date:   Thu Mar 30 14:06:06 2023 +0100

    Fix cmake 3.10 build

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 934ea0e788..4a3d01f80f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -773,15 +773,15 @@ endif()
 
 string(REGEX MATCH "^([0-9]+)\.([0-9]+)" GLIB_MIN_MATCH ${GLIB_MIN_VERSION})
 set(GLIB_API ${CMAKE_MATCH_1}_${CMAKE_MATCH_2})
-target_compile_definitions(PkgConfig::GLIB2 INTERFACE
+set_property(TARGET PkgConfig::GLIB2 PROPERTY INTERFACE_COMPILE_DEFINITIONS
   GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_${GLIB_API}
   GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_${GLIB_API})
 
 string(REGEX MATCH "^([0-9]+)\.([0-9]+)" GTK_MIN_MATCH ${GTK_MIN_VERSION})
 set(GTK_API ${CMAKE_MATCH_1}_${CMAKE_MATCH_2})
-target_compile_definitions(PkgConfig::GTK3 INTERFACE
-    GDK_VERSION_MIN_REQUIRED=GDK_VERSION_${GTK_API}
-    GDK_VERSION_MAX_ALLOWED=GDK_VERSION_${GTK_API})
+set_property(TARGET PkgConfig::GTK3 PROPERTY INTERFACE_COMPILE_DEFINITIONS
+  GDK_VERSION_MIN_REQUIRED=GDK_VERSION_${GTK_API}
+  GDK_VERSION_MAX_ALLOWED=GDK_VERSION_${GTK_API})
 
 add_definitions (-DHAVE_CONFIG_H)
 



Summary of changes:
 CMakeLists.txt                | 8 ++++----
 bindings/guile/gnc-optiondb.i | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)