gnucash stable: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Tue Nov 26 18:50:55 EST 2024


Updated	 via  https://github.com/Gnucash/gnucash/commit/64a319eb (commit)
	 via  https://github.com/Gnucash/gnucash/commit/c07e74ef (commit)
	 via  https://github.com/Gnucash/gnucash/commit/f4ee875d (commit)
	 via  https://github.com/Gnucash/gnucash/commit/4819f2de (commit)
	from  https://github.com/Gnucash/gnucash/commit/764157dd (commit)



commit 64a319eb46d80955e32896d0ecb16d8db990f8f9
Merge: 764157ddeb c07e74ef7d
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Nov 26 15:45:14 2024 -0800

    Merge Landry Breuil's 'boost-1.87' into stable.
    
    Makes the boost-1.67 requirement hard, no patched earlier versions are
    supported.


commit c07e74ef7df3ed54c8bf23eef0542c519fa7c6a2
Author: Landry Breuil <landry at rhaalovely.net>
Date:   Tue Nov 26 08:44:23 2024 +0100

    remove references to hybrid patched boost versions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0a8229e7d..8a93e5bef2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -583,7 +583,7 @@ if (Boost_FOUND)
   set(HAVE_BOOST 1)
 endif()
 if (NOT HAVE_BOOST)
-message (SEND_ERROR "A suitable Boost is not installed, and is required. GnuCash requires that Boost be compatible and compiled with C++17. Boost 1.67 is the first compatible release but some distributions have patched earlier ones to work with C++17. Please install it and ensure that the following libraries are built: date_time, filesystem, locale, regex, program_options and system.")
+message (SEND_ERROR "A suitable Boost is not installed, and is required. GnuCash requires that Boost be compatible and compiled with C++17. Please install it and ensure that the following libraries are built: date_time, filesystem, locale, regex, program_options and system.")
 endif()
 
 
diff --git a/README.dependencies b/README.dependencies
index e748b8b176..6ccea76659 100644
--- a/README.dependencies
+++ b/README.dependencies
@@ -72,11 +72,6 @@ Libraries/Deps
                                                 regex libraries.
                                                 locale and regex libs must be
                                                 built with ICU support.
-                                                Note that 1.67.0 is the first
-                                                *release* that supports C++17,
-                                                but that some distributions
-                                                have patched earlier versions
-                                                to work.
   swig                  3.0.12                  Makes Guile and Python Bindings.
   webkit                2.4.11 (Windows,
                         2.14.1 (Everything Else)

commit f4ee875d8aab2ba18c662f59dfaaadc9e9e3a3b5
Author: Landry Breuil <landry at rhaalovely.net>
Date:   Mon Nov 25 08:47:30 2024 +0100

    drop fallback block supporting boost pre-1.67.0
    
    io_context appeared in 1.66, and debian 10/ubuntu 20 had 1.67 or newer..

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b96fc8dbd9..b0a8229e7d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -581,20 +581,6 @@ find_package (Boost 1.67.0 COMPONENTS date_time filesystem locale program_option
 if (Boost_FOUND)
   include_directories(${Boost_INCLUDE_DIRS})
   set(HAVE_BOOST 1)
-else()
-  find_package (Boost 1.60.0 REQUIRED COMPONENTS date_time regex locale filesystem system program_options)
-  if (Boost_FOUND)
-    include (CheckIncludeFileCXX)
-    set(CMAKE_REQUIRED_FLAGS "-std=c++17")
-    set(CMAKE_REQUIRED_INCLUDES ${Boost_INCLUDE_DIR})
-    check_include_file_cxx("boost/locale.hpp" AUTO_PTR)
-    unset(CMAKE_REQUIRED_FLAGS)
-    unset(CMAKE_REQUIRED_INCLUDES)
-    if(AUTO_PTR)
-      include_directories(${Boost_INCLUDE_DIRS})
-      set(HAVE_BOOST 1)
-    endif()
-  endif()
 endif()
 if (NOT HAVE_BOOST)
 message (SEND_ERROR "A suitable Boost is not installed, and is required. GnuCash requires that Boost be compatible and compiled with C++17. Boost 1.67 is the first compatible release but some distributions have patched earlier ones to work with C++17. Please install it and ensure that the following libraries are built: date_time, filesystem, locale, regex, program_options and system.")

commit 4819f2de2171af07ce25a6f305b2ac0108363dea
Author: Landry Breuil <landry at rhaalovely.net>
Date:   Mon Nov 25 08:47:24 2024 +0100

    fix build with recent boost where io_service was removed (deprecated since many releases)

diff --git a/libgnucash/app-utils/gnc-quotes.cpp b/libgnucash/app-utils/gnc-quotes.cpp
index 67258aaf5b..1fdf64a385 100644
--- a/libgnucash/app-utils/gnc-quotes.cpp
+++ b/libgnucash/app-utils/gnc-quotes.cpp
@@ -205,7 +205,7 @@ GncFQQuoteSource::run_cmd (const StrVec& args, const std::string& json_string) c
     try
     {
         std::future<std::vector<char> > out_buf, err_buf;
-        boost::asio::io_service svc;
+        boost::asio::io_context svc;
 
         auto input_buf = bp::buffer (json_string);
 	bp::child process;



Summary of changes:
 CMakeLists.txt                      | 16 +---------------
 README.dependencies                 |  5 -----
 libgnucash/app-utils/gnc-quotes.cpp |  2 +-
 3 files changed, 2 insertions(+), 21 deletions(-)



More information about the gnucash-changes mailing list