gnucash stable: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/cbf89a73 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/31cc25d1 (commit)
	from  https://github.com/Gnucash/gnucash/commit/6cb2eeea (commit)



commit cbf89a73be988d74ca01a029d9fb91e612ae9917
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Feb 22 10:30:52 2024 +0100

    Avoid deprecation warning for -py3 in swig >= 4.1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d50497cf1..bbb910e3e1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -278,7 +278,6 @@ endif()
 # SWIG
 find_package (SWIG 3.0.12 REQUIRED)
 include (${SWIG_USE_FILE})
-string(REGEX MATCH "^[0-9]+[.]" SWIG_MAJOR ${SWIG_VERSION})
 
 # Find Guile and determine which version we are using.
 # Look for guile versions in this order: 3.0 > 2.2 > 2.0
diff --git a/common/cmake_modules/GncAddSwigCommand.cmake b/common/cmake_modules/GncAddSwigCommand.cmake
index 05e181084b..23bbebcabf 100644
--- a/common/cmake_modules/GncAddSwigCommand.cmake
+++ b/common/cmake_modules/GncAddSwigCommand.cmake
@@ -69,10 +69,15 @@ macro (gnc_add_swig_python_command _target _out_var _py_out_var _output _py_outp
     set(${_py_out_var} ${py_outfile}) # This variable is set for convenience to use in the calling CMakeLists.txt
 
     set (DEFAULT_SWIG_PYTHON_FLAGS
-        -python -py3
+        -python
         -Wall -Werror
         ${SWIG_ARGS}
         )
+    if (${SWIG_VERSION} VERSION_LESS 4.1)
+        set (DEFAULT_SWIG_PYTHON_FLAGS
+            ${SWIG_ARGS} -py3
+            )
+    endif()
     set (DEFAULT_SWIG_PYTHON_C_INCLUDES
          ${GLIB2_INCLUDE_DIRS}
          ${CMAKE_SOURCE_DIR}/common

commit 31cc25d1aa230ea4df277a3a2a706e6f32fc8065
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Feb 22 10:30:03 2024 +0100

    Remove non-existing file from POTFILES.in

diff --git a/po/POTFILES.in b/po/POTFILES.in
index b9b5d73f74..088ff5056c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -656,7 +656,6 @@ libgnucash/engine/gnc-option-impl.cpp
 libgnucash/engine/gncOrder.c
 libgnucash/engine/gncOwner.c
 libgnucash/engine/gnc-pricedb.cpp
-libgnucash/engine/gnc-quote-source.cpp
 libgnucash/engine/gnc-rational.cpp
 libgnucash/engine/gnc-session.c
 libgnucash/engine/gncTaxTable.c



Summary of changes:
 CMakeLists.txt                               | 1 -
 common/cmake_modules/GncAddSwigCommand.cmake | 7 ++++++-
 po/POTFILES.in                               | 1 -
 3 files changed, 6 insertions(+), 3 deletions(-)