diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile index 7ac3ac9bfe83..b384793af4f7 100644 --- a/games/wesnoth/Makefile +++ b/games/wesnoth/Makefile @@ -1,94 +1,93 @@ PORTNAME= wesnoth -PORTVERSION= 1.16.6 -PORTREVISION= 2 +PORTVERSION= 1.16.7 PORTEPOCH= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \ http://files.wesnoth.org/ \ http://ports.toco-domains.de/ MAINTAINER= fluffy@FreeBSD.org COMMENT= Fantasy turn-based strategy game WWW= https://www.wesnoth.org/ LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfreetype.so:print/freetype2 \ libvorbisfile.so:audio/libvorbis \ libboost_thread.so:devel/boost-libs \ libpng.so:graphics/png \ libfontconfig.so:x11-fonts/fontconfig \ libicudata.so:devel/icu \ libharfbuzz.so:print/harfbuzz LDFLAGS+= -L${LOCALBASE}/lib -lboost_system PORTSCOUT= limitw:1,even USES= cmake compiler:c++17-lang cpe gnome pkgconfig \ python:3.7+,run readline shebangfix ssl sdl tar:bzip2 xorg USE_SDL= image2 mixer2 ttf2 USE_LDCONFIG= yes USE_GNOME= cairo pango USE_XORG= ice sm x11 xext SHEBANG_FILES= data/tools/about_cfg_to_wiki \ data/tools/addon_manager/html.py \ data/tools/expand-terrain-macros.py \ data/tools/extractbindings data/tools/imgcheck \ data/tools/GUI.pyw \ data/tools/hexometer.py \ data/tools/steam-changelog \ data/tools/trackviewer.pyw \ data/tools/terrain2wiki.py \ data/tools/tmx_trackplacer \ data/tools/unit_tree/TeamColorizer \ data/tools/unit_tree/helpers.py \ data/tools/unit_tree/overview.py \ data/tools/unit_tree/update-wmlunits \ data/tools/wesnoth/campaignserver_client.py \ data/tools/wesnoth/trackplacer3/datatypes.py \ data/tools/wesnoth/version.py \ data/tools/wesnoth/wescamp.py data/tools/wesnoth/wmldata.py \ data/tools/wesnoth/wmlparser.py \ data/tools/wesnoth/wmlparser3.py \ data/tools/wesnoth_addon_manager data/tools/wmlflip \ data/tools/wmlindent data/tools/wmllint \ data/tools/wmllint-1.4 \ data/tools/wmlunits \ data/tools/wmlscope \ data/tools/wmlxgettext CPE_VENDOR= ${PORTNAME} CPE_PRODUCT= battle_for_wesnoth CMAKE_ARGS= -DMANDIR="man" -DENABLE_STRICT_COMPILATION=off PORTDOCS= * PORTDATA= * OPTIONS_DEFINE= CAMPAIGN DOCS FRIBIDI NLS \ NOTIFY SERVER TEST OPTIONS_DEFAULT= CAMPAIGN FRIBIDI NOTIFY SERVER OPTIONS_SUB= yes CAMPAIGN_DESC= Campaign server CAMPAIGN_CMAKE_ON=-DENABLE_CAMPAIGN_SERVER=on DOCS_CMAKE_OFF= -DDOCDIR=none FRIBIDI_DESC= Bidirectional support FRIBIDI_LIB_DEPENDS=libfribidi.so:converters/fribidi FRIBIDI_CMAKE_OFF=-DENABLE_FRIBIDI=off NLS_USES= gettext NLS_CMAKE_ON= -DLOCALEDIR=${PREFIX}/share/locale NLS_CMAKE_OFF= -DENABLE_NLS=off NOTIFY_DESC= Desktop notifications NOTIFY_LIB_DEPENDS=libdbus-1.so:devel/dbus NOTIFY_CMAKE_OFF=-DENABLE_NOTIFICATIONS=off SERVER_DESC= Server SERVER_CMAKE_OFF=-DENABLE_SERVER=off TEST_CMAKE_ON= -DENABLE_TESTS=on post-install: ${FIND} ${STAGEDIR}${PREFIX}/man -type d -empty -delete .include diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo index 3a9ce67a5365..b5800569035e 100644 --- a/games/wesnoth/distinfo +++ b/games/wesnoth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1662731937 -SHA256 (wesnoth-1.16.6.tar.bz2) = 1fce2c625da53adee4ec62b4e0a810bae1a01c9b893027b10beafaa3a0648501 -SIZE (wesnoth-1.16.6.tar.bz2) = 475677376 +TIMESTAMP = 1674061945 +SHA256 (wesnoth-1.16.7.tar.bz2) = f88b134b2c6ade58f4e5fb4fe459f33870fe336c17edc5772baccb8d60d0ec73 +SIZE (wesnoth-1.16.7.tar.bz2) = 476140035 diff --git a/games/wesnoth/files/patch-src_gettext.cpp b/games/wesnoth/files/patch-src_gettext.cpp deleted file mode 100644 index 1a53f897bad8..000000000000 --- a/games/wesnoth/files/patch-src_gettext.cpp +++ /dev/null @@ -1,49 +0,0 @@ -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(); - } -