gnucash stable: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/579da58a (commit)
	 via  https://github.com/Gnucash/gnucash/commit/f7df9755 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/3dde9f07 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/5132476a (commit)
	from  https://github.com/Gnucash/gnucash/commit/7c233d46 (commit)



commit 579da58a104401cb2732608f8276a228ea7320b5
Merge: 7c233d46e6 f7df9755fc
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu May 9 17:28:35 2024 -0700

    Merge Gwynn Ciesla's "Allow building with GCC 14.1" into stable.


commit f7df9755fcaf8a9556bc984bb606db8569780486
Author: Gwyn Ciesla <gwync at protonmail.com>
Date:   Wed May 8 14:07:20 2024 -0500

    Update CMakeLists.txt
    
    Co-authored-by: Yaakov Selkowitz <yselkowi at redhat.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86d16d62d4..73f0c179df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -510,7 +510,7 @@ if (WITH_PYTHON)
 
   # Determine where to install the python libraries.
   execute_process(
-    COMMAND ${Python3_EXECUTABLE} -c "from sysconfig import get_path; print(get_path('platlib', 'posix_prefix', {'userbase': '${CMAKE_INSTALL_PREFIX}'}))"
+    COMMAND ${Python3_EXECUTABLE} -c "from sysconfig import get_path; print(get_path('platlib', 'posix_prefix', {'platbase': '${CMAKE_INSTALL_PREFIX}'}))"
     RESULT_VARIABLE PYTHON_SYSCONFIG_RESULT
     OUTPUT_VARIABLE PYTHON_SYSCONFIG_OUTPUT
     ERROR_VARIABLE PYTHON_SYSCONFIG_ERROR

commit 3dde9f0762343e84db755e20a29133dc0aa383a9
Author: Gwyn Ciesla <gwync at protonmail.com>
Date:   Mon Apr 1 15:24:02 2024 -0500

    Fix python install paths

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab926920c2..86d16d62d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -510,7 +510,7 @@ if (WITH_PYTHON)
 
   # Determine where to install the python libraries.
   execute_process(
-    COMMAND ${Python3_EXECUTABLE} -c "from sysconfig import get_path; print(get_path('platlib', 'posix_user', {'userbase': '${CMAKE_INSTALL_PREFIX}'}))"
+    COMMAND ${Python3_EXECUTABLE} -c "from sysconfig import get_path; print(get_path('platlib', 'posix_prefix', {'userbase': '${CMAKE_INSTALL_PREFIX}'}))"
     RESULT_VARIABLE PYTHON_SYSCONFIG_RESULT
     OUTPUT_VARIABLE PYTHON_SYSCONFIG_OUTPUT
     ERROR_VARIABLE PYTHON_SYSCONFIG_ERROR

commit 5132476a2f5f51e5a8a368a6badd7dd36b62e76b
Author: Gwyn Ciesla <gwync at protonmail.com>
Date:   Mon Apr 1 15:21:31 2024 -0500

    Allow building with c++20 and greater/

diff --git a/libgnucash/engine/gnc-option-impl.hpp b/libgnucash/engine/gnc-option-impl.hpp
index 3842fc2c68..53d010fb3b 100644
--- a/libgnucash/engine/gnc-option-impl.hpp
+++ b/libgnucash/engine/gnc-option-impl.hpp
@@ -396,13 +396,13 @@ template <typename ValueType>
 class GncOptionRangeValue : public OptionClassifier
 {
 public:
-    GncOptionRangeValue<ValueType>(const char* section, const char* name,
+    GncOptionRangeValue(const char* section, const char* name,
                                    const char* key, const char* doc_string,
                                    ValueType value, ValueType min,
                                    ValueType max, ValueType step) :
         GncOptionRangeValue<ValueType>{section, name, key, doc_string, value, min,
                                        max, step, GncOptionUIType::NUMBER_RANGE} {}
-    GncOptionRangeValue<ValueType>(const char* section, const char* name,
+    GncOptionRangeValue(const char* section, const char* name,
                                    const char* key, const char* doc_string,
                                    ValueType value, ValueType min,
                                    ValueType max, ValueType step, GncOptionUIType ui) :
@@ -412,8 +412,8 @@ public:
         m_min{min}, m_max{max}, m_step{step} {
            if constexpr(is_same_decayed_v<ValueType, int>)
                 set_alternate(true);}
-    GncOptionRangeValue<ValueType>(const GncOptionRangeValue<ValueType>&) = default;
-    GncOptionRangeValue<ValueType>(GncOptionRangeValue<ValueType>&&) = default;
+    GncOptionRangeValue(const GncOptionRangeValue<ValueType>&) = default;
+    GncOptionRangeValue(GncOptionRangeValue<ValueType>&&) = default;
     GncOptionRangeValue<ValueType>& operator=(const GncOptionRangeValue<ValueType>&) = default;
     GncOptionRangeValue<ValueType>& operator=(GncOptionRangeValue<ValueType>&&) = default;
     ValueType get_value() const { return m_value; }



Summary of changes:
 CMakeLists.txt                        | 2 +-
 libgnucash/engine/gnc-option-impl.hpp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)