forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
games-strategy/wesnoth: fix build with boost-1.81
Signed-off-by: Christophe Lermytte <[email protected]> Closes: https://bugs.gentoo.org/886575 Closes: gentoo#28708 Signed-off-by: Sam James <[email protected]>
- Loading branch information
1 parent
fea113a
commit ae18d0e
Showing
2 changed files
with
51 additions
and
0 deletions.
There are no files selected for viewing
49 changes: 49 additions & 0 deletions
49
games-strategy/wesnoth/files/wesnoth-1.16.6-fix-build-with-boost-1.81.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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?= | ||
<[email protected]> | ||
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) | ||
--- a/src/gettext.cpp | ||
+++ b/src/gettext.cpp | ||
@@ -26,6 +26,7 @@ | ||
#include <mutex> | ||
#include <boost/locale.hpp> | ||
#include <set> | ||
+#include <type_traits> | ||
|
||
#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<bl::collator<char>>(current_locale_)) { | ||
res << "has bl::collator<char> facet, "; | ||
} | ||
+#if BOOST_VERSION < 108100 | ||
res << "generator categories='" << generator_.categories() << "'"; | ||
+#else | ||
+ res << "generator categories='" << | ||
+ static_cast<std::underlying_type<bl::category_t>::type>(generator_.categories()) << "'"; | ||
+#endif | ||
return res.str(); | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters