From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 854E415800A for ; Thu, 24 Aug 2023 14:35:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 20E102BC01C; Thu, 24 Aug 2023 14:35:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0A3772BC01C for ; Thu, 24 Aug 2023 14:35:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 37CB8340B6A for ; Thu, 24 Aug 2023 14:35:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C93681069 for ; Thu, 24 Aug 2023 14:35:18 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1692887707.71e03c5df298be999546115390312bb25314bef0.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/wesnoth/, games-strategy/wesnoth/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-strategy/wesnoth/files/wesnoth-1.16.10-boost-1.83.patch games-strategy/wesnoth/wesnoth-1.16.10.ebuild X-VCS-Directories: games-strategy/wesnoth/files/ games-strategy/wesnoth/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: 71e03c5df298be999546115390312bb25314bef0 X-VCS-Branch: master Date: Thu, 24 Aug 2023 14:35:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 44f9d864-87a5-4424-a0f6-723517739067 X-Archives-Hash: 1131eb2e29c20ed3a8faf3f01a738916 commit: 71e03c5df298be999546115390312bb25314bef0 Author: Pacho Ramos gentoo org> AuthorDate: Thu Aug 24 14:32:23 2023 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Thu Aug 24 14:35:07 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71e03c5d games-strategy/wesnoth: Apply patch fixing boost-1.83 compat Thanks-to: solpeth Closes: https://github.com/gentoo/gentoo/pull/32415 Closes: https://bugs.gentoo.org/912385 Closes: https://bugs.gentoo.org/912968 Signed-off-by: Pacho Ramos gentoo.org> .../wesnoth/files/wesnoth-1.16.10-boost-1.83.patch | 26 ++++++++++++++++++++++ games-strategy/wesnoth/wesnoth-1.16.10.ebuild | 4 ++++ 2 files changed, 30 insertions(+) diff --git a/games-strategy/wesnoth/files/wesnoth-1.16.10-boost-1.83.patch b/games-strategy/wesnoth/files/wesnoth-1.16.10-boost-1.83.patch new file mode 100644 index 000000000000..2c9e55db0472 --- /dev/null +++ b/games-strategy/wesnoth/files/wesnoth-1.16.10-boost-1.83.patch @@ -0,0 +1,26 @@ +From 136e651d69fc91fa7a4154f8a4a7e977cc46eca4 Mon Sep 17 00:00:00 2001 +From: Pentarctagon +Date: Thu, 17 Aug 2023 23:19:21 -0500 +Subject: [PATCH] Compile fix for boost 1.83. + +Fixes #7849 +--- + src/gettext.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/gettext.cpp b/src/gettext.cpp +index 9888dede35ad..fa9b17ba85b2 100644 +--- a/src/gettext.cpp ++++ b/src/gettext.cpp +@@ -169,7 +169,11 @@ namespace + return msg; + } + ++#if BOOST_VERSION < 108300 + const char* get(int domain_id, const char* ctx, const char* sid, int n) const override ++#else ++ const char* get(int domain_id, const char* ctx, const char* sid, bl::count_type n) const override ++#endif + { + auto& base = get_base(); + const char* msg = base.get(domain_id, ctx, sid, n); diff --git a/games-strategy/wesnoth/wesnoth-1.16.10.ebuild b/games-strategy/wesnoth/wesnoth-1.16.10.ebuild index d3d826ea899c..cb9bc76bf65d 100644 --- a/games-strategy/wesnoth/wesnoth-1.16.10.ebuild +++ b/games-strategy/wesnoth/wesnoth-1.16.10.ebuild @@ -43,6 +43,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${PN}-1.16.10-boost-1.83.patch #912385 +) + src_prepare() { cmake_src_prepare