commit: e8af21c27196cff6725c6efca95fc6fec50c6b52 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Sun Dec 14 08:53:56 2025 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Sun Dec 14 08:53:56 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8af21c2
games-strategy/wesnoth: drop 1.18.4, 1.19.11-r1 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> games-strategy/wesnoth/Manifest | 2 - .../wesnoth/files/wesnoth-1.18.3-gcc15.patch | 29 -- .../wesnoth/files/wesnoth-1.18.4-boost-1.88.patch | 72 ---- .../wesnoth/files/wesnoth-1.19.11-boost-1.88.patch | 456 --------------------- games-strategy/wesnoth/wesnoth-1.18.4.ebuild | 114 ------ games-strategy/wesnoth/wesnoth-1.19.11-r1.ebuild | 111 ----- 6 files changed, 784 deletions(-) diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest index aa5f9ff46739..3da736b81fca 100644 --- a/games-strategy/wesnoth/Manifest +++ b/games-strategy/wesnoth/Manifest @@ -1,5 +1,3 @@ -DIST wesnoth-1.18.4.tar.bz2 461847477 BLAKE2B ebeae7c50c3583a16744ad7e36e2330b8babfd323cc152a9001e3f11018447ada64d070506c5d5ebaa2b9041861dc81680354b4f3d55b4eb118f887b4ff5a4f6 SHA512 c86538dae0c5d8c0c7270ab8e13ca2a5b9b6ff44e84789bc803d2135615e55dfdd34fd6b56f325f448940fcc396d884c533d067312b988b27c155157068db3bc DIST wesnoth-1.18.5.tar.bz2 461916727 BLAKE2B 9a48235e32091f3977aef7fa396460e7ff08c988e722f591aac980849a0ee8c29557bac426b5a33ecd646efafd86cb43ccb416dc7c43c9be2819cea9ed7891d9 SHA512 43137cd90f0d64eab579d58aadbf3cff045ead5709040e84b8299e33d2515182b0c5c0747cc06f9d9a4155e160dbee59963a1165392dde0c3cdb85c9c70ebc0b -DIST wesnoth-1.19.11.tar.bz2 547541350 BLAKE2B d1b82cdcfdb15a0a5ac3648a94fb85aee9e2aabdff306c5fb9e19ae2411423e74c6c0218a3d09c66b718371c46bb4a76dd40512b2ead484cc3410fb7980092b7 SHA512 0f782c61c9f2f2193b1462768742488229b93bc95772ad8e434583f605dbed95ab0ccf39f3fc3a39ad35970f3dad84e318f543180795ad3b04c6e6765bfc3d70 DIST wesnoth-1.19.13.tar.bz2 547180467 BLAKE2B 0cd9bf89538da980862e71fc7ab520518523cfca49d6732a50d531d49065e886b79d5c355cb7df2fe5779f961b7734979cb253534d8ec901e9d52184ae0cc853 SHA512 94f1420902e882f47c6c5cc1832becd419128707b06e662afc74f303fec71a6cb6890a03f9f37c3982603d597c61d4cfeb352abac23bd3a73091c8341210b13a DIST wesnoth-1.19.18.tar.bz2 617048843 BLAKE2B 290b0d724d4951ca0b9b6c7f97adc5fa6e96282b3f788f23d4f9bbfe1214555efcc931df53b25549e4a986bedd8ce0484af206bd56136a95da0315be4891703d SHA512 89e03194195023d58c6d58529ca8533e72031aa821a9c58c4e391f46082ed4835cdee36229c8401efa0acaaf29d89d79b2817396096853fe1e8e3ca9511627e4 diff --git a/games-strategy/wesnoth/files/wesnoth-1.18.3-gcc15.patch b/games-strategy/wesnoth/files/wesnoth-1.18.3-gcc15.patch deleted file mode 100644 index 37cf8e731a55..000000000000 --- a/games-strategy/wesnoth/files/wesnoth-1.18.3-gcc15.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://bugs.gentoo.org/938229 - -From 1fb93b68d15c7c039f04d0145ad47fb3102ec359 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <[email protected]> -Date: Sat, 24 Aug 2024 22:21:47 +0100 -Subject: [PATCH] filesystem.hpp: include missing <cstdint> - -Without the change build fails on upcoming `gcc-15` as: - - In file included from src/desktop/paths.cpp:20: - src/filesystem.hpp:232:13: error: 'uint8_t' was not declared in this scope - 232 | std::vector<uint8_t> read_file_binary(const std::string& fname); - | ^~~~~~~ ---- - src/filesystem.hpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/filesystem.hpp b/src/filesystem.hpp -index 38bf6952b452c..3cdb4b6ae7120 100644 ---- a/src/filesystem.hpp -+++ b/src/filesystem.hpp -@@ -21,6 +21,7 @@ - #pragma once - - #include <ctime> -+#include <cstdint> - #include <fstream> - #include <iosfwd> - #include <memory> diff --git a/games-strategy/wesnoth/files/wesnoth-1.18.4-boost-1.88.patch b/games-strategy/wesnoth/files/wesnoth-1.18.4-boost-1.88.patch deleted file mode 100644 index 6a01897362cd..000000000000 --- a/games-strategy/wesnoth/files/wesnoth-1.18.4-boost-1.88.patch +++ /dev/null @@ -1,72 +0,0 @@ -https://bugs.gentoo.org/955590 -https://github.com/wesnoth/wesnoth/issues/10174 -https://github.com/wesnoth/wesnoth/pull/10202 - -From ce4f4077494e51ce95d5061582e1be53967d1a07 Mon Sep 17 00:00:00 2001 -From: Gunter Labes <[email protected]> -Date: Wed, 14 May 2025 21:36:42 +0200 -Subject: [PATCH] Handle boost process defaulting to v2 and add missing include - ---- - src/filesystem.cpp | 10 ++++++++-- - src/game_launcher.cpp | 12 +++++++++--- - 2 files changed, 17 insertions(+), 5 deletions(-) - -diff --git a/src/filesystem.cpp b/src/filesystem.cpp -index ab9672a1f7707..bf647d1d3cdcd 100644 ---- a/src/filesystem.cpp -+++ b/src/filesystem.cpp -@@ -23,6 +23,7 @@ - - #include "config.hpp" - #include "deprecation.hpp" -+#include "game_config_view.hpp" - #include "gettext.hpp" - #include "log.hpp" - #include "serialization/base64.hpp" -@@ -30,12 +31,17 @@ - #include "serialization/unicode.hpp" - #include "utils/general.hpp" - -+#include <boost/algorithm/string/replace.hpp> - #include <boost/filesystem.hpp> - #include <boost/filesystem/fstream.hpp> - #include <boost/iostreams/device/file_descriptor.hpp> - #include <boost/iostreams/stream.hpp> --#include <boost/process.hpp> --#include "game_config_view.hpp" -+#if BOOST_VERSION >= 108800 // v2 is now default -+# define BOOST_PROCESS_VERSION 1 -+# include <boost/process/v1/search_path.hpp> -+#else -+# include <boost/process.hpp> -+#endif - - #ifdef _WIN32 - #include <boost/locale.hpp> -diff --git a/src/game_launcher.cpp b/src/game_launcher.cpp -index 42a6f193fbab0..85f937073f5b8 100644 ---- a/src/game_launcher.cpp -+++ b/src/game_launcher.cpp -@@ -57,11 +57,17 @@ - #include "wesnothd_connection_error.hpp" - #include "wml_exception.hpp" // for wml_exception - --#include <algorithm> // for copy, max, min, stable_sort - #ifdef _WIN32 --#include <boost/process/windows.hpp> -+# include <boost/process/windows.hpp> -+#endif -+#if BOOST_VERSION >= 108800 // v2 is now default -+# define BOOST_PROCESS_VERSION 1 -+# include <boost/process/v1/child.hpp> -+#else -+# include <boost/process.hpp> - #endif --#include <boost/process.hpp> -+ -+#include <algorithm> // for copy, max, min, stable_sort - #include <cstdlib> // for system - #include <new> - #include <utility> // for pair - diff --git a/games-strategy/wesnoth/files/wesnoth-1.19.11-boost-1.88.patch b/games-strategy/wesnoth/files/wesnoth-1.19.11-boost-1.88.patch deleted file mode 100644 index c54c82d217b1..000000000000 --- a/games-strategy/wesnoth/files/wesnoth-1.19.11-boost-1.88.patch +++ /dev/null @@ -1,456 +0,0 @@ -https://bugs.gentoo.org/955590 -https://github.com/wesnoth/wesnoth/issues/10174 -https://github.com/wesnoth/wesnoth/commit/1fa291599cf6fc869799aeaa7d5bdf1f5db7ee76 -https://github.com/wesnoth/wesnoth/pull/10175 - -From 1fa291599cf6fc869799aeaa7d5bdf1f5db7ee76 Mon Sep 17 00:00:00 2001 -From: smokespren <[email protected]> -Date: Sat, 3 May 2025 18:00:55 -0400 -Subject: [PATCH] Fixed CMake build failure due to dependency on Boost CharConv - (#10167) - ---- - CMakeLists.txt | 13 ++++++++----- - src/CMakeLists.txt | 37 ++++--------------------------------- - 2 files changed, 12 insertions(+), 38 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7ec8fdf8433f3..661daf5a192c6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -53,6 +53,14 @@ option(ENABLE_TESTS "Build unit tests") - option(ENABLE_NLS "Enable building of translations" ${ENABLE_GAME}) - - set(BOOST_VERSION "1.70") -+set(BOOST_REQ_COMPONENTS iostreams program_options regex system thread random coroutine locale filesystem graph) -+ -+if(ENABLE_TESTS) -+ list(APPEND BOOST_REQ_COMPONENTS unit_test_framework) -+endif() -+ -+find_package(Boost ${BOOST_VERSION} REQUIRED CONFIG COMPONENTS ${BOOST_REQ_COMPONENTS} -+ OPTIONAL_COMPONENTS charconv) - - if(NOT WIN32) - set(Lua_FIND_VERSION_MAJOR 5) -@@ -93,7 +101,6 @@ if(APPLE) - find_library(SECURITY_LIBRARY Security REQUIRED) - endif() - --find_package(Boost ${BOOST_VERSION} REQUIRED CONFIG COMPONENTS iostreams program_options regex system thread random coroutine locale filesystem graph) - find_package(ICU REQUIRED COMPONENTS data i18n uc) - - # no, gettext executables are not required when NLS is deactivated -@@ -551,10 +558,6 @@ if(ENABLE_GAME OR ENABLE_TESTS) - pkg_check_modules(LIBREADLINE readline) - endif() - --if(ENABLE_TESTS) -- find_package(Boost ${BOOST_VERSION} REQUIRED CONFIG COMPONENTS unit_test_framework) --endif() -- - if(ENABLE_GAME) - if(ENABLE_NOTIFICATIONS) - pkg_check_modules(LIBDBUS dbus-1) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index c3a2c52d7412b..65a9929088275 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -218,14 +218,7 @@ if(ENABLE_GAME) - ${game-external-libs} - OpenSSL::Crypto - OpenSSL::SSL -- Boost::iostreams -- Boost::program_options -- Boost::regex -- Boost::system -- Boost::random -- Boost::coroutine -- Boost::locale -- Boost::filesystem -+ ${Boost_LIBRARIES} - Fontconfig::Fontconfig - SDL2::SDL2 - SDL2::SDL2main -@@ -264,15 +257,7 @@ if(ENABLE_TESTS) - ${game-external-libs} - OpenSSL::Crypto - OpenSSL::SSL -- Boost::iostreams -- Boost::program_options -- Boost::regex -- Boost::system -- Boost::random -- Boost::coroutine -- Boost::locale -- Boost::filesystem -- Boost::unit_test_framework -+ ${Boost_LIBRARIES} - Fontconfig::Fontconfig - SDL2::SDL2 - SDL2::SDL2main -@@ -313,14 +298,7 @@ if(ENABLE_SERVER) - ${MYSQL_LIBS} - OpenSSL::Crypto - OpenSSL::SSL -- Boost::iostreams -- Boost::program_options -- Boost::regex -- Boost::system -- Boost::random -- Boost::coroutine -- Boost::locale -- Boost::filesystem -+ ${Boost_LIBRARIES} - ) - if(MSVC) - target_link_options(wesnothd PRIVATE /WX) -@@ -354,14 +332,7 @@ if(ENABLE_CAMPAIGN_SERVER) - ${MYSQL_LIBS} - OpenSSL::Crypto - OpenSSL::SSL -- Boost::iostreams -- Boost::program_options -- Boost::regex -- Boost::system -- Boost::random -- Boost::coroutine -- Boost::locale -- Boost::filesystem -+ ${Boost_LIBRARIES} - ) - if(MSVC) - target_link_options(campaignd PRIVATE /WX) - -From e2117f08e1e08130edfce513808af30e598e61c5 Mon Sep 17 00:00:00 2001 -From: Charles Dang <[email protected]> -Date: Sat, 3 May 2025 18:08:22 -0400 -Subject: [PATCH 1/3] Use boost::process::v2 on 1.81 and later - -Except on MacOS, since MacCompileStuff needs to be updated manually... ---- - CMakeLists.txt | 2 +- - SConstruct | 3 ++ - packaging/flatpak/org.wesnoth.Wesnoth.json | 2 +- - src/filesystem.cpp | 31 +++++++++--- - src/game_launcher.cpp | 48 ++++++++++++++++--- - utils/dockerbuilds/CI/Dockerfile-base-steamrt | 2 +- - 6 files changed, 71 insertions(+), 17 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 661daf5a192c6..d4cd4806feb06 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -60,7 +60,7 @@ if(ENABLE_TESTS) - endif() - - find_package(Boost ${BOOST_VERSION} REQUIRED CONFIG COMPONENTS ${BOOST_REQ_COMPONENTS} -- OPTIONAL_COMPONENTS charconv) -+ OPTIONAL_COMPONENTS charconv process) - - if(NOT WIN32) - set(Lua_FIND_VERSION_MAJOR 5) -diff --git a/SConstruct b/SConstruct -index c177f51f02d8c..acca9d2251f74 100755 ---- a/SConstruct -+++ b/SConstruct -@@ -397,6 +397,9 @@ if env["prereqs"]: - conf.CheckBoostLocaleBackends(["icu", "winapi"]) \ - or Warning("Only icu and winapi backends of Boost Locale are supported. Bugs/crashes are very likely with other backends") - -+ # Allowed to fail. We only need to link against process when using the v2 API -+ conf.CheckBoost("process", require_version = boost_version) -+ - if env['harden']: - env["have_fortify"] = conf.CheckFortifySource() - -diff --git a/packaging/flatpak/org.wesnoth.Wesnoth.json b/packaging/flatpak/org.wesnoth.Wesnoth.json -index 95275e2bed997..7aba34c87bbb7 100644 ---- a/packaging/flatpak/org.wesnoth.Wesnoth.json -+++ b/packaging/flatpak/org.wesnoth.Wesnoth.json -@@ -54,7 +54,7 @@ - } - ], - "build-commands":[ -- "./bootstrap.sh --prefix=/app --with-libraries=filesystem,locale,iostreams,program_options,regex,random,thread,coroutine,context,graph,charconv", -+ "./bootstrap.sh --prefix=/app --with-libraries=filesystem,locale,iostreams,process,program_options,regex,random,thread,coroutine,context,graph,charconv", - "./b2 -j$FLATPAK_BUILDER_N_JOBS install cxxflags='-fPIE -fstack-protector-strong' define=_FORTIFY_SOURCE=2 link=static variant=release address-model=64 --layout=system" - ] - }, -diff --git a/src/filesystem.cpp b/src/filesystem.cpp -index d52adc2cc51d3..adfe361ceb613 100644 ---- a/src/filesystem.cpp -+++ b/src/filesystem.cpp -@@ -22,6 +22,7 @@ - #include "filesystem.hpp" - - #include "config.hpp" -+#include "game_config_view.hpp" - #include "gettext.hpp" - #include "log.hpp" - #include "serialization/base64.hpp" -@@ -31,13 +32,22 @@ - #include "utils/general.hpp" - - #include <boost/algorithm/string/predicate.hpp> -+#include <boost/algorithm/string/replace.hpp> - #include <boost/filesystem.hpp> - #include <boost/filesystem/fstream.hpp> - #include <boost/format.hpp> - #include <boost/iostreams/device/file_descriptor.hpp> - #include <boost/iostreams/stream.hpp> --#include <boost/process.hpp> --#include "game_config_view.hpp" -+ -+#if !defined(_WIN32) && !defined(__APPLE__) -+ -+#if BOOST_VERSION >= 108100 -+#include <boost/process/v2/environment.hpp> -+#else -+#include <boost/process/search_path.hpp> -+#endif -+ -+#endif - - #ifdef _WIN32 - #include <boost/locale.hpp> -@@ -78,7 +88,6 @@ static lg::log_domain log_filesystem("filesystem"); - #define WRN_FS LOG_STREAM(warn, log_filesystem) - #define ERR_FS LOG_STREAM(err, log_filesystem) - --namespace bp = boost::process; - namespace bfs = boost::filesystem; - using boost::system::error_code; - -@@ -1012,15 +1021,23 @@ std::string get_exe_path() - // with version - std::string version = std::to_string(game_config::wesnoth_version.major_version()) + "." + std::to_string(game_config::wesnoth_version.minor_version()); - std::string exe = filesystem::get_program_invocation("wesnoth-"+version); -- bfs::path search = bp::search_path(exe).string(); -- if(!search.string().empty()) { -+#if BOOST_VERSION >= 108600 -+ bfs::path search = boost::process::v2::environment::find_executable(exe); -+#else -+ bfs::path search = boost::process::search_path(exe); -+#endif -+ if(!search.empty()) { - return search.string(); - } - - // versionless - exe = filesystem::get_program_invocation("wesnoth"); -- search = bp::search_path(exe).string(); -- if(!search.string().empty()) { -+#if BOOST_VERSION >= 108600 -+ search = boost::process::v2::environment::find_executable(exe); -+#else -+ search = boost::process::search_path(exe); -+#endif -+ if(!search.empty()) { - return search.string(); - } - -diff --git a/src/game_launcher.cpp b/src/game_launcher.cpp -index 0943ad15c3664..9f1106b89af71 100644 ---- a/src/game_launcher.cpp -+++ b/src/game_launcher.cpp -@@ -50,11 +50,38 @@ - #include "wesnothd_connection_error.hpp" - #include "wml_exception.hpp" // for wml_exception - --#include <algorithm> // for copy, max, min, stable_sort -+#ifdef __APPLE__ -+ -+// -+// HACK: MacCompileStuff is currently on 1.86, so it could use the v2 API, -+// but we need to update the libs manually to link against boost::process. -+// -+// -- vultraz, 2025-05-12 -+// -+#if BOOST_VERSION > 108600 -+#error MacCompileStuff has been updated. Remove this block and the accompanying __APPLE__ checks below. -+#endif -+#include <boost/process/v1/child.hpp> -+ -+#elif BOOST_VERSION >= 108100 -+ -+// boost::asio (via boost::process) complains about winsock.h otherwise -+#ifdef _WIN32 -+#define WIN32_LEAN_AND_MEAN -+#endif -+#include <boost/process/v2/process.hpp> -+ -+#else -+ -+// process::v1 only. The v1 folders do not exist until 1.86 - #ifdef _WIN32 - #include <boost/process/windows.hpp> - #endif --#include <boost/process.hpp> -+#include <boost/process/child.hpp> -+ -+#endif -+ -+#include <algorithm> // for copy, max, min, stable_sort - #include <cstdlib> // for system - #include <new> - #include <thread> -@@ -85,8 +112,6 @@ static lg::log_domain log_network("network"); - static lg::log_domain log_enginerefac("enginerefac"); - #define LOG_RG LOG_STREAM(info, log_enginerefac) - --namespace bp = boost::process; -- - game_launcher::game_launcher(const commandline_options& cmdline_opts) - : cmdline_opts_(cmdline_opts) - , font_manager_() -@@ -783,10 +808,15 @@ void game_launcher::start_wesnothd() - LOG_GENERAL << "Starting wesnothd"; - try - { -+#if !defined(__APPLE__) && BOOST_VERSION >= 108100 -+ boost::asio::io_context io_context; -+ auto c = boost::process::v2::process{io_context, wesnothd_program, { "-c", config }}; -+#else - #ifndef _WIN32 -- bp::child c(wesnothd_program, "-c", config); -+ boost::process::child c(wesnothd_program, "-c", config); - #else -- bp::child c(wesnothd_program, "-c", config, bp::windows::create_no_window); -+ boost::process::child c(wesnothd_program, "-c", config, boost::process::windows::create_no_window); -+#endif - #endif - c.detach(); - // Give server a moment to start up -@@ -794,7 +824,11 @@ void game_launcher::start_wesnothd() - std::this_thread::sleep_for(50ms); - return; - } -- catch(const bp::process_error& e) -+#if defined(__APPLE__) || BOOST_VERSION < 108100 -+ catch(const boost::process::process_error& e) -+#else -+ catch(const std::exception& e) -+#endif - { - prefs::get().set_mp_server_program_name(""); - -diff --git a/utils/dockerbuilds/CI/Dockerfile-base-steamrt b/utils/dockerbuilds/CI/Dockerfile-base-steamrt -index b872942a5790b..cc7ca1d66ec30 100644 ---- a/utils/dockerbuilds/CI/Dockerfile-base-steamrt -+++ b/utils/dockerbuilds/CI/Dockerfile-base-steamrt -@@ -10,7 +10,7 @@ RUN apt-get install -y scons meson libreadline-dev expect-dev - - RUN wget --max-redirect 3 https://archives.boost.io/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_}.tar.gz - RUN mkdir -p /src/boost && tar zxf boost_${BOOST_VERSION_}.tar.gz -C /src/boost --strip-components=1 --RUN cd /src/boost && ./bootstrap.sh --with-libraries=charconv,iostreams,regex,system,filesystem,program_options,random,locale,context,coroutine,graph && ./b2 toolset=gcc-10 --layout=system link=static variant=release cxxflags='-fPIE -fstack-protector-strong' define=_FORTIFY_SOURCE=2 install -+RUN cd /src/boost && ./bootstrap.sh --with-libraries=charconv,iostreams,regex,system,filesystem,process,program_options,random,locale,context,coroutine,graph && ./b2 toolset=gcc-10 --layout=system link=static variant=release cxxflags='-fPIE -fstack-protector-strong' define=_FORTIFY_SOURCE=2 install - - RUN wget --max-redirect 3 https://download.gnome.org/sources/pango/${PANGO_VERSION}/pango-${PANGO_VERSION_FULL}.tar.xz - RUN mkdir -p /src/pango && tar xf pango-${PANGO_VERSION_FULL}.tar.xz -C /src/pango --strip-components=1 - -From 5e25513e6531b0f078800c24eee13fe1c8c2cb0d Mon Sep 17 00:00:00 2001 -From: Charles Dang <[email protected]> -Date: Mon, 12 May 2025 13:13:50 -0400 -Subject: [PATCH 2/3] fixup - ---- - src/filesystem.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/filesystem.cpp b/src/filesystem.cpp -index adfe361ceb613..759d1395030ed 100644 ---- a/src/filesystem.cpp -+++ b/src/filesystem.cpp -@@ -1021,7 +1021,7 @@ std::string get_exe_path() - // with version - std::string version = std::to_string(game_config::wesnoth_version.major_version()) + "." + std::to_string(game_config::wesnoth_version.minor_version()); - std::string exe = filesystem::get_program_invocation("wesnoth-"+version); --#if BOOST_VERSION >= 108600 -+#if BOOST_VERSION >= 108100 - bfs::path search = boost::process::v2::environment::find_executable(exe); - #else - bfs::path search = boost::process::search_path(exe); -@@ -1032,7 +1032,7 @@ std::string get_exe_path() - - // versionless - exe = filesystem::get_program_invocation("wesnoth"); --#if BOOST_VERSION >= 108600 -+#if BOOST_VERSION >= 108100 - search = boost::process::v2::environment::find_executable(exe); - #else - search = boost::process::search_path(exe); - -From 8b59674eb64848db47beebd404e579be83c2ee1d Mon Sep 17 00:00:00 2001 -From: Charles Dang <[email protected]> -Date: Mon, 12 May 2025 13:37:53 -0400 -Subject: [PATCH 3/3] let's try 86 again - ---- - src/filesystem.cpp | 6 +++--- - src/game_launcher.cpp | 6 +++--- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/filesystem.cpp b/src/filesystem.cpp -index 759d1395030ed..5eed05df8d586 100644 ---- a/src/filesystem.cpp -+++ b/src/filesystem.cpp -@@ -41,7 +41,7 @@ - - #if !defined(_WIN32) && !defined(__APPLE__) - --#if BOOST_VERSION >= 108100 -+#if BOOST_VERSION >= 108600 - #include <boost/process/v2/environment.hpp> - #else - #include <boost/process/search_path.hpp> -@@ -1021,7 +1021,7 @@ std::string get_exe_path() - // with version - std::string version = std::to_string(game_config::wesnoth_version.major_version()) + "." + std::to_string(game_config::wesnoth_version.minor_version()); - std::string exe = filesystem::get_program_invocation("wesnoth-"+version); --#if BOOST_VERSION >= 108100 -+#if BOOST_VERSION >= 108600 - bfs::path search = boost::process::v2::environment::find_executable(exe); - #else - bfs::path search = boost::process::search_path(exe); -@@ -1032,7 +1032,7 @@ std::string get_exe_path() - - // versionless - exe = filesystem::get_program_invocation("wesnoth"); --#if BOOST_VERSION >= 108100 -+#if BOOST_VERSION >= 108600 - search = boost::process::v2::environment::find_executable(exe); - #else - search = boost::process::search_path(exe); -diff --git a/src/game_launcher.cpp b/src/game_launcher.cpp -index 9f1106b89af71..8a32fac619023 100644 ---- a/src/game_launcher.cpp -+++ b/src/game_launcher.cpp -@@ -63,7 +63,7 @@ - #endif - #include <boost/process/v1/child.hpp> - --#elif BOOST_VERSION >= 108100 -+#elif BOOST_VERSION >= 108600 - - // boost::asio (via boost::process) complains about winsock.h otherwise - #ifdef _WIN32 -@@ -808,7 +808,7 @@ void game_launcher::start_wesnothd() - LOG_GENERAL << "Starting wesnothd"; - try - { --#if !defined(__APPLE__) && BOOST_VERSION >= 108100 -+#if !defined(__APPLE__) && BOOST_VERSION >= 108600 - boost::asio::io_context io_context; - auto c = boost::process::v2::process{io_context, wesnothd_program, { "-c", config }}; - #else -@@ -824,7 +824,7 @@ void game_launcher::start_wesnothd() - std::this_thread::sleep_for(50ms); - return; - } --#if defined(__APPLE__) || BOOST_VERSION < 108100 -+#if defined(__APPLE__) || BOOST_VERSION < 108600 - catch(const boost::process::process_error& e) - #else - catch(const std::exception& e) - diff --git a/games-strategy/wesnoth/wesnoth-1.18.4.ebuild b/games-strategy/wesnoth/wesnoth-1.18.4.ebuild deleted file mode 100644 index 17707fec3651..000000000000 --- a/games-strategy/wesnoth/wesnoth-1.18.4.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic xdg - -DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game" -HOMEPAGE="https://www.wesnoth.org - https://github.com/wesnoth/wesnoth"; -SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"; - -LICENSE="GPL-2" -SLOT="0" -# uneven minor versions are development versions -if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -fi -IUSE="dbus dedicated doc nls server test" -RESTRICT="!test? ( test )" - -RDEPEND=" - acct-group/wesnoth - acct-user/wesnoth - dev-libs/boost:=[bzip2,context,icu,nls] - >=media-libs/libsdl2-2.0.10:0[joystick,video,X] - !dedicated? ( - dev-libs/glib:2 - dev-libs/openssl:0= - >=media-libs/fontconfig-2.4.1 - >=media-libs/sdl2-image-2.0.0[jpeg,png,webp] - >=media-libs/sdl2-mixer-2.0.0[vorbis] - media-libs/libvorbis - >=x11-libs/pango-1.22.0 - >=x11-libs/cairo-1.10.0 - sys-libs/readline:0= - dbus? ( sys-apps/dbus ) - )" -DEPEND="${RDEPEND} - x11-libs/libX11 -" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.18.3-gcc15.patch - "${FILESDIR}"/${PN}-1.18.4-boost-1.88.patch -) - -src_prepare() { - cmake_src_prepare - - if ! use doc ; then - sed -i \ - -e '/manual/d' \ - doc/CMakeLists.txt || die - fi - - # respect LINGUAS (bug #483316) - if [[ ${LINGUAS+set} ]] ; then - local lang langs=() - for lang in $(cat po/LINGUAS) ; do - has ${lang} ${LINGUAS} && langs+=( ${lang} ) - done - echo "${langs[@]}" > po/LINGUAS || die - fi -} - -src_configure() { - filter-flags -ftracer -fomit-frame-pointer - - local mycmakeargs=() - - if use dedicated || use server ; then - mycmakeargs+=( - -DENABLE_CAMPAIGN_SERVER="ON" - -DENABLE_SERVER="ON" - -DSERVER_UID="${PN}" - -DSERVER_GID="${PN}" - -DFIFO_DIR="/run/wesnothd" - ) - else - mycmakeargs+=( - -DENABLE_CAMPAIGN_SERVER="OFF" - -DENABLE_SERVER="OFF" - ) - fi - mycmakeargs+=( - -Wno-dev - -DENABLE_GAME="$(usex !dedicated)" - -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)" - -DENABLE_NLS="$(usex nls)" - -DENABLE_NOTIFICATIONS="$(usex dbus)" - -DENABLE_STRICT_COMPILATION="OFF" - -DENABLE_TESTS="$(usex test)" - ) - cmake_src_configure -} - -src_test() { - # Allow SDL_Mixer test to pass, bug #931551 - SDL_AUDIODRIVER=dummy cmake_src_test -} - -src_install() { - local DOCS=( README.md changelog.md ) - cmake_src_install - if use dedicated || use server ; then - rmdir "${ED}"/run{/wesnothd,} || die - newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd - fi -} diff --git a/games-strategy/wesnoth/wesnoth-1.19.11-r1.ebuild b/games-strategy/wesnoth/wesnoth-1.19.11-r1.ebuild deleted file mode 100644 index 60f5302cd80b..000000000000 --- a/games-strategy/wesnoth/wesnoth-1.19.11-r1.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic xdg - -DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game" -HOMEPAGE="https://www.wesnoth.org"; -SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"; - -LICENSE="GPL-2+ CC-BY-SA-4.0" -SLOT="0" -# uneven minor versions are development versions -if (( ($(ver_cut 2) % 2) == 0 )) ; then - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -fi -IUSE="dbus dedicated doc nls server test" -RESTRICT="!test? ( test )" - -RDEPEND=" - acct-group/wesnoth - acct-user/wesnoth - dev-libs/boost:=[bzip2,context,icu,nls] - >=media-libs/libsdl2-2.0.18:0[joystick,video,X] - !dedicated? ( - dev-libs/glib:2 - dev-libs/openssl:0= - >=media-libs/fontconfig-2.4.1 - >=media-libs/sdl2-image-2.0.0[jpeg,png,webp] - >=media-libs/sdl2-mixer-2.0.0[vorbis] - media-libs/libvorbis - >=x11-libs/pango-1.22.0 - >=x11-libs/cairo-1.10.0 - sys-libs/readline:0= - dbus? ( sys-apps/dbus ) - )" -DEPEND="${RDEPEND} - x11-libs/libX11 -" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.19.11-boost-1.88.patch -) - -src_prepare() { - cmake_src_prepare - - if ! use doc ; then - sed -i '/manual/d' doc/CMakeLists.txt || die - fi - - # respect LINGUAS (bug #483316) - if [[ ${LINGUAS+set} ]]; then - local lang langs=() - for lang in $(cat po/LINGUAS) ; do - has ${lang} ${LINGUAS} && langs+=( ${lang} ) - done - echo "${langs[@]}" > po/LINGUAS || die - fi -} - -src_configure() { - filter-flags -ftracer -fomit-frame-pointer - - local mycmakeargs=( - -Wno-dev - -DENABLE_STRICT_COMPILATION="OFF" - -DHARDEN="OFF" #936527 - -DENABLE_GAME="$(usex !dedicated)" - -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)" - -DENABLE_NLS="$(usex nls)" - -DENABLE_NOTIFICATIONS="$(usex dbus)" - -DENABLE_TESTS="$(usex test)" - ) - - if use dedicated || use server ; then - mycmakeargs+=( - -DENABLE_CAMPAIGN_SERVER="ON" - -DENABLE_SERVER="ON" - -DSERVER_UID="${PN}" - -DSERVER_GID="${PN}" - -DFIFO_DIR="/run/wesnothd" - ) - else - mycmakeargs+=( - -DENABLE_CAMPAIGN_SERVER="OFF" - -DENABLE_SERVER="OFF" - ) - fi - - cmake_src_configure -} - -src_test() { - # Allow SDL_Mixer test to pass, bug #931551 - SDL_AUDIODRIVER=dummy cmake_src_test -} - -src_install() { - local DOCS=( README.md changelog.md ) - cmake_src_install - if use dedicated || use server ; then - rmdir "${ED}"/run{/wesnothd,} || die - newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd - fi -}
