From nobody Thu Dec 29 09:38:37 2022 X-Original-To: dev-commits-ports-main@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 4NjNcY2c77z2kmpH; Thu, 29 Dec 2022 09:38:37 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NjNcY23qBz3KVC; Thu, 29 Dec 2022 09:38:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672306717; 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=2nQvoWF+Uo76xvVI3rZJaMa4Jp1LNi2X1YrM4eRy7Es=; b=V9bxffZkNHInlBYQClxtNCxH8q5437uN8J+jcUmc5IaShJeGI/xqWelD7Xqn2ehaCDCxj8 30LctAQ+TXVRrfKqkgW/tHYspRfsMCxms3rLGeRf5DUZwOgY1TtHTRocFAvOpfBrNkqRGi cG9jjvGNC6JPdwTQ6g9a6m8rbqFNO3IEpC9b18OffC1WiXez0uJMn+VzjSfdB0oVQXuUY9 xfpCeaZYM/+xP3K6d4tWYNdYIuIjRmLmofC+bkjD4mlMjAeLI89Z/TfWlTxmLgbSeSUQiN cCkWlRGOQw0i4RYXtJOB48SF6vk2caiTtlcrp8+x3qeEWctfeQHgWnUOfOtHnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672306717; 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=2nQvoWF+Uo76xvVI3rZJaMa4Jp1LNi2X1YrM4eRy7Es=; b=EV3bxnp1couXZ50huTKcFkN62NtsWjbs7j4clRoW9JB0Phi+oR2hVYxt5NQoEseyy/ikja mcWRga/VyZLE9t49kedHzDDfjHAGIGjnQ0uPzkg7kDeWSE5kQsXztcmOfyk+4fMk5NTCnU LS2SPrvuPQaMItrRlrDl6TyqmWwKU3uGQO6wZ7JYaVAoAqq2s0VfIw1E8MrcOTeoexLkgw kue8zDiAPEncQY7jmlV6USZ7fP57A1E96LjcPlzl1lh0GVmzKgxGkJ3xRYYNvuIleAyq3t axUL5goXY+uv9arfZEkfeDTH/4hHd/xL+/AVH3+47T3SDd7ONPpP8Wsc3D5x/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672306717; a=rsa-sha256; cv=none; b=jyAsLdrhC14q1LsB16kGRVFRO41W2xIciIkVVN0BpH+p5ht+kxlNNBf6DDkDUwBE+XWJWT +/GqqKT/kF3UWWn+doo4JE28fB22oyg2jBRR9ZEkT7FIn+eHS/to3iAIiN9ObIY68rMWQr Qp5qX5Gm4KxCDO8fQzoIXfpJAnjY78biiW/6Yy1yqlk1UeOjN4VOh7Ul9f3nb/U3kaBSuK d+7XFosycR48GOlyclhblHsZ32TY7foT1VZcEAd8GL4/+gre3q5/Oq/wXE0LJuL5JbPUz1 /YmkilY/ECuLthPh1mL/h+3A0ZahlDdCptU52cSViFjUFr/EoDzks/knuWsEuQ== 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 4NjNcY14zxzPD7; Thu, 29 Dec 2022 09:38:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BT9cbmI073425; Thu, 29 Dec 2022 09:38:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BT9cbmG073424; Thu, 29 Dec 2022 09:38:37 GMT (envelope-from git) Date: Thu, 29 Dec 2022 09:38:37 GMT Message-Id: <202212290938.2BT9cbmG073424@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: 91b469ce3803 - main - games/wesnoth: prepare for upcoming Boost 1.81 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 91b469ce380322a58ae233a614608f9c4c33ce7c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=91b469ce380322a58ae233a614608f9c4c33ce7c commit 91b469ce380322a58ae233a614608f9c4c33ce7c Author: Dima Panov AuthorDate: 2022-12-29 09:38:01 +0000 Commit: Dima Panov CommitDate: 2022-12-29 09:38:01 +0000 games/wesnoth: prepare for upcoming Boost 1.81 --- games/wesnoth/files/patch-src_gettext.cpp | 49 +++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/games/wesnoth/files/patch-src_gettext.cpp b/games/wesnoth/files/patch-src_gettext.cpp new file mode 100644 index 000000000000..1a53f897bad8 --- /dev/null +++ b/games/wesnoth/files/patch-src_gettext.cpp @@ -0,0 +1,49 @@ +https://bugs.gentoo.org/886575 +https://github.com/wesnoth/wesnoth/issues/7215 + +From d71e90ee50a89673cf9b6748bcb2975071d15445 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= + +Date: Mon, 28 Nov 2022 23:21:38 +0700 +Subject: [PATCH] gettext: fix build with Boost.Locale 1.81 + +See https://github.com/boostorg/locale/pull/128/ + +(cherry picked from commit fd96415bdf0a2e3a05e1a587a1c3853847e2c2bc) +--- src/gettext.cpp ++++ src/gettext.cpp +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + #if defined(__GNUC__) + #pragma GCC diagnostic push +@@ -224,8 +225,13 @@ namespace + } + + generator_.use_ansi_encoding(false); ++#if BOOST_VERSION < 108100 + generator_.categories(bl::message_facet | bl::information_facet | bl::collation_facet | bl::formatting_facet | bl::convert_facet); + generator_.characters(bl::char_facet); ++#else ++ generator_.categories(bl::category_t::message | bl::category_t::information | bl::category_t::collation | bl::category_t::formatting | bl::category_t::convert); ++ generator_.characters(bl::char_facet_t::char_f); ++#endif + // We cannot have current_locale_ be a non boost-generated locale since it might not supply + // the bl::info facet. As soon as we add message paths, update_locale_internal might fail, + // for example because of invalid .mo files. So make sure we call it at least once before adding paths/domains +@@ -368,7 +374,12 @@ namespace + if(std::has_facet>(current_locale_)) { + res << "has bl::collator facet, "; + } ++#if BOOST_VERSION < 108100 + res << "generator categories='" << generator_.categories() << "'"; ++#else ++ res << "generator categories='" << ++ static_cast::type>(generator_.categories()) << "'"; ++#endif + return res.str(); + } +