commit: fe5ae496a9aa4f5bb3f9fdea9a83217cb14c3406 Author: Stefan Strogin <steils <AT> gentoo <DOT> org> AuthorDate: Sun Apr 13 00:58:23 2025 +0000 Commit: Stefan Strogin <steils <AT> gentoo <DOT> org> CommitDate: Sun Apr 13 01:03:40 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe5ae496
games-strategy/wesnoth: add 1.19.10 Add patch to fix linking error with boost::charconv. Bug: https://github.com/wesnoth/wesnoth/issues/10062 Signed-off-by: Stefan Strogin <steils <AT> gentoo.org> games-strategy/wesnoth/Manifest | 1 + .../wesnoth/files/wesnoth-1.19.10-boost-1.87.patch | 45 +++++++++ games-strategy/wesnoth/wesnoth-1.19.10.ebuild | 111 +++++++++++++++++++++ 3 files changed, 157 insertions(+) diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest index e9c3e8ff8a21..75d3c26b04e5 100644 --- a/games-strategy/wesnoth/Manifest +++ b/games-strategy/wesnoth/Manifest @@ -1,3 +1,4 @@ DIST wesnoth-1.18.3.tar.bz2 461694247 BLAKE2B 1998e2fdff56271dd86c390e3c25dcbaa98b4f131f15584e5d3f2f5866856a69aebf9c8d97b1126601b3e08467a9410f3ba7b53c253737c6bbf62ccb1e9ba96f SHA512 def324c9ed66ac59e2a9d0ab9ab95f00ddab2d31dacb2d0b5cfba42c5acdba210937f7dd6afde8870a387847a6d021a28dffcb04ce513272df6a4b52a626f30a +DIST wesnoth-1.19.10.tar.bz2 546744036 BLAKE2B a80fb0bf5b46f3021d4b05d3d4f5aebd3895131dfec14aa9e42cfa12eefaa43d250e09d47d8e21946693366ad1e043188106508013158d39febf1c3708c08d78 SHA512 ed3400053ba3901c450fa9930de27ef0dc4e34c4b1b8b83b60f1ba2547061eb69529ebbee390cd9c471bfff5d11a8aa9a5b67b11339416e52f8269822592f5e9 DIST wesnoth-1.19.5.tar.bz2 509947975 BLAKE2B 26ae05b709a2643af493b98531a8456a57ad725baac31e11b2ab2207b3fbbfe655389d80bae01aece08b14df2046bcb80092eca7691fce5b838b9c3ef9727930 SHA512 e0332cb20469ba74aa60d109a0abf536767c04ce5007fa2ec7512c3e5d88b4fa32aacafb0fb729647dc0eb922fa8846fcbc24ffb681cd59bad8a07e4db0968da DIST wesnoth-1.19.7.tar.bz2 501064088 BLAKE2B 202f2ed3fcb9810cc3d98bd003ab60ad3e78f199eae2d0fa135455dadc3305f46f154549337386b508472779ed707b27226d15a868705147bd2fc04ffcf91a0c SHA512 d39ecaa1dbea6c547e3767b555c6d1fa9c47dc8a06af0fb8d9171f01822520657c44e12f7bbfe7bd2a696f8b8cecb115e7fb6fff4e5ebc35278cca794b26c3e5 diff --git a/games-strategy/wesnoth/files/wesnoth-1.19.10-boost-1.87.patch b/games-strategy/wesnoth/files/wesnoth-1.19.10-boost-1.87.patch new file mode 100644 index 000000000000..738c6563389d --- /dev/null +++ b/games-strategy/wesnoth/files/wesnoth-1.19.10-boost-1.87.patch @@ -0,0 +1,45 @@ +From 28b1fbc3bd8f3f44bdfa911e946f391dbc7717ea Mon Sep 17 00:00:00 2001 +From: Jon Daniel <[email protected]> +Date: Wed, 26 Mar 2025 20:17:55 +0100 +Subject: [PATCH] fix boost_charconv linkage + +--- + src/CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index c3a2c52d7412b..a3d9e6daa380f 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -226,6 +226,7 @@ if(ENABLE_GAME) + Boost::coroutine + Boost::locale + Boost::filesystem ++ boost_charconv + Fontconfig::Fontconfig + SDL2::SDL2 + SDL2::SDL2main +@@ -273,6 +274,7 @@ if(ENABLE_TESTS) + Boost::locale + Boost::filesystem + Boost::unit_test_framework ++ boost_charconv + Fontconfig::Fontconfig + SDL2::SDL2 + SDL2::SDL2main +@@ -321,6 +323,7 @@ if(ENABLE_SERVER) + Boost::coroutine + Boost::locale + Boost::filesystem ++ boost_charconv + ) + if(MSVC) + target_link_options(wesnothd PRIVATE /WX) +@@ -362,6 +365,7 @@ if(ENABLE_CAMPAIGN_SERVER) + Boost::coroutine + Boost::locale + Boost::filesystem ++ boost_charconv + ) + if(MSVC) + target_link_options(campaignd PRIVATE /WX) diff --git a/games-strategy/wesnoth/wesnoth-1.19.10.ebuild b/games-strategy/wesnoth/wesnoth-1.19.10.ebuild new file mode 100644 index 000000000000..fbd2ae33d68b --- /dev/null +++ b/games-strategy/wesnoth/wesnoth-1.19.10.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2025 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://downloads.sourceforge.net/${PN}/${P}.tar.bz2"; + +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.18: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,webp] + >=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}"/${PN}-1.19.10-boost-1.87.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_test() { + # Allow SDL_Mixer test to pass, bug #931551 + SDL_AUDIODRIVER=dummy cmake_src_test +} + +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 +}
