From nobody Tue May 13 10:28:06 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZxXjy751Nz5wffn; Tue, 13 May 2025 10:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZxXjy5XBFz3NkP; Tue, 13 May 2025 10:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747132086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5eM+/q/cwVkXF0RhxHQeYZnlxiw/2h5Ph+PwugvlBgE=; b=bz5yiC7OGliGXhO14apSQoZssv4Aw96Dc4llxKZXS6+h2yxHZ1/p1kCXm7cFpw9NpUsT0W H3kwx5ph3CEuehz/gMf0wriPmHbGEfy+36eBUCLGR2voKmBdBU8ceL4/AFwC0PLJQ6JN6b G3r5+rrUtY0EDxP9ZpUkZDHreazV6CE/OeC8ifLFwXUqkSvelDZKzUTRxf5uWaZjG7Mdpe X3BphpLOy98nOmWSwamjDeByNRT9w75Lk2BXeuGPgMa1Y06AC7jbfDOS37tMnkULuhaKKa ++E67u7a9hrgeqr0AXlPAMjKs5s4xajH1UQakH2yJOHhpySggnhnRzJcSCHDEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747132086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5eM+/q/cwVkXF0RhxHQeYZnlxiw/2h5Ph+PwugvlBgE=; b=eMX+dugJEIn8eHa6V8i4J1cItv0A0K7X/X5hhiaDc/GHGJPSGY1wkFmFDyE0/ybP+UM6Yq gRAU5Z+WFGhMUp0MkntmBcHnjxTzLwSXx1a0UEqm7LPG9Xb3mQaD0BAnPp3DcDHolT1NdS fLNY1ftjq3rKTpjcni0pfDBCOkeZx1R3yid4IsiYJunnN1lSWWZtFCr32lilalPgDZt2E8 9hqCTyIam+LuSW50s0cK2kaWQNkPooh24FMxkNxAhg8o5IB5H71DJN0oA1BsVaiVYqI90i XzmrvcJu8qWdl+55G8bMZiCi99ATFYgC/CQIb0Xz+iEGSX3Mz977jmSYfEmhGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747132086; a=rsa-sha256; cv=none; b=NVjVQIwqxUnS6jY+/zInnjWWHDpo5y6p5KQN6xO9rQfS6Ld0CkdFUnqBRGKQv/JpqtDpYV hrqqXlq8Kfd3M5giUhROxuluBGrVaFkQJwTG/279vB8CCmyRgfEVl+e1t4TC347UrviJVb MidMgKYKVfS7cfOwWMQqJD5ZvldZO1HKOS+UXEcUCghfAeRuRvv206WwkG8Kg6v6kmMRkq d9AccxWO/PRtgvRV8jA9ojn6V4Le2FGEnB+T4CTcWQ7yUlIRlSlU2uct1l73ILUaaRH/Sf DaOKGUpiT3JQCs/vq5scOvxn4j6ka4gu+KD/W7ajlvecUL2dpMV6Y4hLO4axuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZxXjy5243zjnW; Tue, 13 May 2025 10:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54DAS6Mj011497; Tue, 13 May 2025 10:28:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54DAS6FT011494; Tue, 13 May 2025 10:28:06 GMT (envelope-from git) Date: Tue, 13 May 2025 10:28:06 GMT Message-Id: <202505131028.54DAS6FT011494@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 7ff140f2c87c - main - games/wesnoth: prepare for Boost-1.88 (+) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7ff140f2c87cf693be43e1ea1699c02ac30fb58b Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=7ff140f2c87cf693be43e1ea1699c02ac30fb58b commit 7ff140f2c87cf693be43e1ea1699c02ac30fb58b Author: Dima Panov AuthorDate: 2025-05-12 08:29:49 +0000 Commit: Dima Panov 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 + #include + #include + #include +-#include ++#include ++#include + #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 + #endif +-#include ++#define BOOST_PROCESS_VERSION 1 ++#include + #include // for system + #include + #include // 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 + #include + + namespace {