commit: 1529adff6983c98bc94b04f74c0cc0edbe8535ca Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Thu Mar 9 17:52:55 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Thu Mar 9 20:12:42 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1529adff
games-strategy/wesnoth: drop 1.16.6 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> games-strategy/wesnoth/Manifest | 1 - .../wesnoth-1.16.6-fix-build-with-boost-1.81.patch | 49 ---------- games-strategy/wesnoth/wesnoth-1.16.6.ebuild | 104 --------------------- 3 files changed, 154 deletions(-) diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest index 9cf9ac6ad743..899e199d0e98 100644 --- a/games-strategy/wesnoth/Manifest +++ b/games-strategy/wesnoth/Manifest @@ -1,3 +1,2 @@ -DIST wesnoth-1.16.6.tar.gz 518250360 BLAKE2B 3fc5f5827beacc309a42d1d135eadefbace57866397eed4e3c5618ba6372ae31fc0350b2180c1323872ae59789ca67cd1b4a973c2257c7fac59508af93e0b758 SHA512 fcf9e50ce065f7c8d2b940eec88de27f18c3adbb9c7ae238bf6821eef233a45c2bdc7a58d5cd2abc4f37bcab6e503aa72d46f623c882c711d9f06b2826340bf5 DIST wesnoth-1.16.8.tar.gz 518468407 BLAKE2B 9c224757e0d1727acc66a5421266fa6e050bb3727040b457379dd164097c88850f9b2d8b81422ff277548cb8cd51da70f5da63254c2c4ccedc3a45d1789c6037 SHA512 9e41e1c574c9744ba9818298d77df1503d7fc70ee24e4bf9d1f59ef17c2bc123f38f0aa21eddccce88cc28b62f2a2d12133ab25dd111655abf5b620f18457bf7 DIST wesnoth-1.17.11.tar.bz2 421068195 BLAKE2B 43106bb72c6b4a39b4995fb9804733e5420b636db08254e75e7698c58740b84a33c387194bf048247bddf1808f73d0d07b3816f18687390760fb5fab7c2d8449 SHA512 8208ae1c02d5e6a9fe50a2cf533d3b0b207151e5b877c98b003117641ae3c46ad31dbbe4bc46481f4f30382ae65b0183d7636452de5f6d42c8bd48d040f3dd5a diff --git a/games-strategy/wesnoth/files/wesnoth-1.16.6-fix-build-with-boost-1.81.patch b/games-strategy/wesnoth/files/wesnoth-1.16.6-fix-build-with-boost-1.81.patch deleted file mode 100644 index 785a5440cbbf..000000000000 --- a/games-strategy/wesnoth/files/wesnoth-1.16.6-fix-build-with-boost-1.81.patch +++ /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?= - <[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(); - } - diff --git a/games-strategy/wesnoth/wesnoth-1.16.6.ebuild b/games-strategy/wesnoth/wesnoth-1.16.6.ebuild deleted file mode 100644 index f8edac88d9d7..000000000000 --- a/games-strategy/wesnoth/wesnoth-1.16.6.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic xdg - -DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game" -HOMEPAGE="http://www.wesnoth.org - https://github.com/wesnoth/wesnoth"; -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -# uneven minor versions are development versions -if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -fi -IUSE="dbus dedicated doc nls server" - -RDEPEND=" - acct-group/wesnoth - acct-user/wesnoth - dev-libs/boost:=[bzip2,context,icu,nls] - >=media-libs/libsdl2-2.0.4:0[joystick,video,X] - !dedicated? ( - dev-libs/glib:2 - dev-libs/openssl:0= - >=media-libs/fontconfig-2.4.1 - >=media-libs/sdl2-image-2.0.0[jpeg,png] - >=media-libs/sdl2-mixer-2.0.0[vorbis] - media-libs/libvorbis - >=x11-libs/pango-1.22.0 - >=x11-libs/cairo-1.10.0 - sys-libs/readline:0= - dbus? ( sys-apps/dbus ) - )" -DEPEND="${RDEPEND} - x11-libs/libX11 -" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" - -PATCHES=( "${FILESDIR}"/${P}-fix-build-with-boost-1.81.patch ) - -src_prepare() { - cmake_src_prepare - - if ! use doc ; then - sed -i \ - -e '/manual/d' \ - doc/CMakeLists.txt || die - fi - - # respect LINGUAS (bug #483316) - if [[ ${LINGUAS+set} ]] ; then - local lang langs=() - for lang in $(cat po/LINGUAS) ; do - has ${lang} ${LINGUAS} && langs+=( ${lang} ) - done - echo "${langs[@]}" > po/LINGUAS || die - fi -} - -src_configure() { - filter-flags -ftracer -fomit-frame-pointer - - local mycmakeargs=() - - if use dedicated || use server ; then - mycmakeargs+=( - -DENABLE_CAMPAIGN_SERVER="ON" - -DENABLE_SERVER="ON" - -DSERVER_UID="${PN}" - -DSERVER_GID="${PN}" - -DFIFO_DIR="/run/wesnothd" - ) - else - mycmakeargs+=( - -DENABLE_CAMPAIGN_SERVER="OFF" - -DENABLE_SERVER="OFF" - ) - fi - mycmakeargs+=( - -Wno-dev - -DENABLE_GAME="$(usex !dedicated)" - -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)" - -DENABLE_NLS="$(usex nls)" - -DENABLE_NOTIFICATIONS="$(usex dbus)" - -DENABLE_STRICT_COMPILATION="OFF" - ) - cmake_src_configure -} - -src_install() { - local DOCS=( README.md changelog.md ) - cmake_src_install - if use dedicated || use server ; then - rmdir "${ED}"/run{/wesnothd,} || die - newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd - fi -}
