From 71e206c31e948709a88fafc342bd2d8695942aa5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 10 Mar 2023 00:03:27 +0000 Subject: gentoo auto-resync : 10:03:2023 - 00:03:27 --- games-strategy/Manifest.gz | Bin 8066 -> 8065 bytes games-strategy/wesnoth/Manifest | 3 - .../wesnoth-1.16.6-fix-build-with-boost-1.81.patch | 49 ---------- games-strategy/wesnoth/wesnoth-1.16.6.ebuild | 104 --------------------- 4 files changed, 156 deletions(-) delete mode 100644 games-strategy/wesnoth/files/wesnoth-1.16.6-fix-build-with-boost-1.81.patch delete mode 100644 games-strategy/wesnoth/wesnoth-1.16.6.ebuild (limited to 'games-strategy') diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz index a00010794849..cb1c765e36f9 100644 Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest index 55fd2ebcd208..b1082e9ed828 100644 --- a/games-strategy/wesnoth/Manifest +++ b/games-strategy/wesnoth/Manifest @@ -1,10 +1,7 @@ -AUX wesnoth-1.16.6-fix-build-with-boost-1.81.patch 1907 BLAKE2B 8c98e374f17ceb8afd29aad80ee2e3971d62fcd8b996379b6d198c162fe8376fde7f7d68122a955e65852a40f9712bfdd941630722011a8326c0216eaf73aed2 SHA512 3d930b1de00163e7970c35e80d2c87069050b1a64884cbd5ed7c9e44f47857e070561d0cb31575e7263b4cfd5907d82f067445115acf7a66823a1f5eed752a55 AUX wesnoth-1.16.8-gcc-13.patch 827 BLAKE2B 5e162b5b23330266f58b05ed71f3faa32ab0dbae4c64606ee77941c20c04c01a439f929847a795750c757f99ab5cc5308e50b952280b547d99c8c6bf4a54ebdc SHA512 635f03af67a51dce5b71581a1d8f427983efc0d9489a9d16ebcbefd47be346b65430a7133dd48769fbac6a71054a99ad5f026db1d70894079ad152120ff96f43 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab -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 -EBUILD wesnoth-1.16.6.ebuild 2319 BLAKE2B c86c9cec4ad90a28f213774a1a096b2e2d2390710f53e40e501ba6a0bfa3b7a7784a64bf79b7d864ecfd8fea7c70dfa8d7ddb37a6cdb367f9531a268f9a80bac SHA512 10c1f6aaf81dbb1accf909461a256ba4d2fdea608375802006584d77188a07b67cc5d81528c7174ecdb9329902baf610b789cf3ae56034bbd0414404de92bc84 EBUILD wesnoth-1.16.8.ebuild 2309 BLAKE2B ae5ef5da2d544367f89753c864149a1d6dfaa6c9ef66056b6e8862ca489736802e18636645ebe8c19ebcbb9e7bb3dd1c5ae84fec64cd28912389cffbb2e6c260 SHA512 9b233db9f0ee9f731d471bf8c0485bf43552b39f834bf40d0b798419c1c9084c83388e0cf61ca457e92e26afa221a8f89cf9a98648e48790445ffb0b599d1653 EBUILD wesnoth-1.17.11.ebuild 2228 BLAKE2B 8e2bd9e6c1be1fb0e30c554222afcad7ca2cd852b4dfe4dac74f23f081e868a9119813421fb5c82c603dd8c67bdcb90077f8c1efd5923e3ff40267db5ee1c527 SHA512 14e94c5be518cc7d0fa7df9f2f93436e0fae1c402ccb80712b495dd5c5b59f2c46e49b1d08841de08a7472e2970dec82f8686d7003a839be9648a7e429a2e166 MISC metadata.xml 475 BLAKE2B fe3a0b92f39b2158ec38fe2d7528463bb243cc44df562f7ad450227b35bab1d59a1638fe1d702cd70358a0137851e08be1878d590afbcc28dd19176b2a7df7fd SHA512 6293671db448eef2a211ae8dbb88624a42ac46712331db441a55d44566e7843f820047dde7936d725fea6d24a8196223e30712ffbd3864e63614f7f849cda6b4 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?= - -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 - #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(); - } - 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 -} -- cgit v1.2.3