git: 7ff140f2c87c - main - games/wesnoth: prepare for Boost-1.88 (+)

The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7ff140f2c87cf693be43e1ea1699c02ac30fb58b

commit 7ff140f2c87cf693be43e1ea1699c02ac30fb58b
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2025-05-12 08:29:49 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2025-05-13 10:27:43 +0000

    games/wesnoth: prepare for Boost-1.88 (+)
    
    While here, backport upstream patches to build with clang19+/gcc15+ changes for type_traits
---
 games/wesnoth/Makefile                                 |  5 ++++-
 games/wesnoth/distinfo                                 |  8 +++++++-
 games/wesnoth/files/patch-CMakeLists.txt               | 11 +++++++++++
 games/wesnoth/files/patch-src_filesystem.cpp           | 17 +++++++++++++++++
 games/wesnoth/files/patch-src_game__launcher.cpp       | 12 ++++++++++++
 games/wesnoth/files/patch-src_serialization_base64.cpp | 10 ++++++++++
 6 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 3c0c234da4bf..8dcff44cf95c 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -6,7 +6,10 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERS
 		http://files.wesnoth.org/ \
 		http://ports.toco-domains.de/
 
-#PATCH_SITES+=	https://github.com/wesnoth/wesnoth/commit/
+PATCH_SITES+=	https://github.com/wesnoth/wesnoth/commit/
+PATCHFILES+=	8a91c0c05a037e75f53cdbd07c0a9f83186c69a5.patch:-p1
+PATCHFILES+=	385a153aa02fee7b8674d4f470fddf98a4f57bb3.patch:-p1
+PATCHFILES+=	51f424f5ab516a79691084fa4611fc28867e3171.patch:-p1
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Fantasy turn-based strategy game
diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo
index 6418b57ed02c..f98c2fe4ee7a 100644
--- a/games/wesnoth/distinfo
+++ b/games/wesnoth/distinfo
@@ -1,3 +1,9 @@
-TIMESTAMP = 1741648592
+TIMESTAMP = 1747037175
 SHA256 (wesnoth-1.18.4.tar.bz2) = 2b95351729fcf1384d521d540aa0adfc80a9be2991aa4791f3b090678e4364ae
 SIZE (wesnoth-1.18.4.tar.bz2) = 461847477
+SHA256 (8a91c0c05a037e75f53cdbd07c0a9f83186c69a5.patch) = bf57831b40ef380c4c5a7efc02e466f06fc657ecbd2ea58fc7564c22b3957318
+SIZE (8a91c0c05a037e75f53cdbd07c0a9f83186c69a5.patch) = 13923
+SHA256 (385a153aa02fee7b8674d4f470fddf98a4f57bb3.patch) = 13734ffe400e7fdc11d2205c2d30fa2866076ddb1d693be35710a0d01d26c09c
+SIZE (385a153aa02fee7b8674d4f470fddf98a4f57bb3.patch) = 6548
+SHA256 (51f424f5ab516a79691084fa4611fc28867e3171.patch) = e7548946e8fb8c940090984b8f38efc35759eecbe1001645c911f8123891b53d
+SIZE (51f424f5ab516a79691084fa4611fc28867e3171.patch) = 13139
diff --git a/games/wesnoth/files/patch-CMakeLists.txt b/games/wesnoth/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..12e918ff6c45
--- /dev/null
+++ b/games/wesnoth/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2025-02-17 21:50:08 UTC
++++ CMakeLists.txt
+@@ -93,7 +93,7 @@ endif()
+ 	find_library(SECURITY_LIBRARY Security REQUIRED)
+ endif()
+ 
+-find_package(Boost ${BOOST_VERSION} REQUIRED COMPONENTS iostreams program_options regex system thread random coroutine locale filesystem graph)
++find_package(Boost ${BOOST_VERSION} REQUIRED COMPONENTS iostreams program_options process 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
diff --git a/games/wesnoth/files/patch-src_filesystem.cpp b/games/wesnoth/files/patch-src_filesystem.cpp
new file mode 100644
index 000000000000..3f4f6b59b332
--- /dev/null
+++ b/games/wesnoth/files/patch-src_filesystem.cpp
@@ -0,0 +1,17 @@
+--- src/filesystem.cpp.orig	2025-02-17 21:50:08 UTC
++++ src/filesystem.cpp
+@@ -30,11 +30,13 @@
+ #include "serialization/unicode.hpp"
+ #include "utils/general.hpp"
+ 
++#define BOOST_PROCESS_VERSION 1
+ #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 <boost/process/v1/search_path.hpp>
++#include <boost/algorithm/string/replace.hpp>
+ #include "game_config_view.hpp"
+ 
+ #ifdef _WIN32
diff --git a/games/wesnoth/files/patch-src_game__launcher.cpp b/games/wesnoth/files/patch-src_game__launcher.cpp
new file mode 100644
index 000000000000..8d0db636c090
--- /dev/null
+++ b/games/wesnoth/files/patch-src_game__launcher.cpp
@@ -0,0 +1,12 @@
+--- src/game_launcher.cpp.orig	2025-02-17 21:50:08 UTC
++++ src/game_launcher.cpp
+@@ -61,7 +61,8 @@
+ #ifdef _WIN32
+ #include <boost/process/windows.hpp>
+ #endif
+-#include <boost/process.hpp>
++#define BOOST_PROCESS_VERSION 1
++#include <boost/process/v1/child.hpp>
+ #include <cstdlib>   // for system
+ #include <new>
+ #include <utility> // for pair
diff --git a/games/wesnoth/files/patch-src_serialization_base64.cpp b/games/wesnoth/files/patch-src_serialization_base64.cpp
new file mode 100644
index 000000000000..28535fa62b83
--- /dev/null
+++ b/games/wesnoth/files/patch-src_serialization_base64.cpp
@@ -0,0 +1,10 @@
+--- src/serialization/base64.cpp.orig	2025-02-17 21:50:08 UTC
++++ src/serialization/base64.cpp
+@@ -15,6 +15,7 @@
+ 
+ #include "serialization/base64.hpp"
+ 
++#include <cstdint>
+ #include <string>
+ 
+ namespace {