commit: e285349773b6806ab64678856f93bb4ffc859709 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Jan 19 21:00:08 2026 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Jan 19 21:04:36 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2853497
games-strategy/wesnoth: add 1.18.6, fix build w/ boost-1.89 Closes: https://bugs.gentoo.org/969015 Closes: https://bugs.gentoo.org/966133 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> games-strategy/wesnoth/Manifest | 1 + .../wesnoth/files/wesnoth-1.18.6-boost-1.89.patch | 69 +++++++++++++ games-strategy/wesnoth/wesnoth-1.18.6.ebuild | 107 +++++++++++++++++++++ 3 files changed, 177 insertions(+) diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest index 7351e6de4b69..763c70b92579 100644 --- a/games-strategy/wesnoth/Manifest +++ b/games-strategy/wesnoth/Manifest @@ -1,3 +1,4 @@ DIST wesnoth-1.18.5.tar.bz2 461916727 BLAKE2B 9a48235e32091f3977aef7fa396460e7ff08c988e722f591aac980849a0ee8c29557bac426b5a33ecd646efafd86cb43ccb416dc7c43c9be2819cea9ed7891d9 SHA512 43137cd90f0d64eab579d58aadbf3cff045ead5709040e84b8299e33d2515182b0c5c0747cc06f9d9a4155e160dbee59963a1165392dde0c3cdb85c9c70ebc0b +DIST wesnoth-1.18.6.tar.bz2 467190064 BLAKE2B 3af57b8e78fbcd2ad34318990ff4915b3257367287ce86a69409dbaf79bb4026abcac3457f6ec894e7f9fc61cb89444caab00d5887f03314d52a0949da14a131 SHA512 ef48783e7bd5f95e4763bbdae92e28267bba69709f56bef749bb4af8f2e2d75a1bfe567bbc1e177935eeeb4b73b5348a9f34a3e7483014d826af99dc8183edc1 DIST wesnoth-1.19.18.tar.bz2 617048843 BLAKE2B 290b0d724d4951ca0b9b6c7f97adc5fa6e96282b3f788f23d4f9bbfe1214555efcc931df53b25549e4a986bedd8ce0484af206bd56136a95da0315be4891703d SHA512 89e03194195023d58c6d58529ca8533e72031aa821a9c58c4e391f46082ed4835cdee36229c8401efa0acaaf29d89d79b2817396096853fe1e8e3ca9511627e4 DIST wesnoth-1.19.19.tar.bz2 623738775 BLAKE2B dfab8633d5909b1797b7447104d7eb661bc4c437ef12e3937ef3be8fc9cda8e13d34a2c92e22969de8ff4683fd40fa04948b59f47c858bd6752370af78b1015c SHA512 861fa0e4ba9d69cfd0d67c0a8f56674e728f3a7070a7e34ccd4289d82c37edaa478aea0d30580f21596c1e3bc568b24da87cb244324d77d8c6829a53e8dadecf diff --git a/games-strategy/wesnoth/files/wesnoth-1.18.6-boost-1.89.patch b/games-strategy/wesnoth/files/wesnoth-1.18.6-boost-1.89.patch new file mode 100644 index 000000000000..fbc13fa4a20f --- /dev/null +++ b/games-strategy/wesnoth/files/wesnoth-1.18.6-boost-1.89.patch @@ -0,0 +1,69 @@ +From b28c566d38c13352c4d97b4f804b23d491df038a Mon Sep 17 00:00:00 2001 +From: Nils Kneuper <[email protected]> +Date: Sat, 25 Oct 2025 01:12:27 +0200 +Subject: [PATCH] Changed CMake to not directly pull in boost-system + +fixing build issues on archlinux using boost-libs >1.89.0-2 + +* asturm 2026-01-19: Backported to 1.18 branch + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index afca54a1a78c7..4ea33aa37332b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,7 +52,7 @@ + option(ENABLE_TESTS "Build unit tests") + option(ENABLE_NLS "Enable building of translations" ${ENABLE_GAME}) + +-set(BOOST_VERSION "1.67") ++set(BOOST_VERSION "1.70") + + if(NOT WIN32) + set(Lua_FIND_VERSION_MAJOR 5) +@@ -93,7 +93,7 @@ + find_library(SECURITY_LIBRARY Security REQUIRED) + endif() + +-find_package(Boost ${BOOST_VERSION} REQUIRED COMPONENTS iostreams program_options regex system thread random coroutine locale filesystem graph) ++find_package(Boost ${BOOST_VERSION} REQUIRED COMPONENTS iostreams program_options regex thread random coroutine locale filesystem graph) + find_package(ICU REQUIRED COMPONENTS data i18n uc) + + # no, gettext executables are not required when NLS is deactivated +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -248,7 +248,6 @@ + Boost::iostreams + Boost::program_options + Boost::regex +- Boost::system + Boost::random + Boost::coroutine + Boost::locale +@@ -295,7 +294,6 @@ + Boost::iostreams + Boost::program_options + Boost::regex +- Boost::system + Boost::random + Boost::coroutine + Boost::locale +@@ -344,7 +342,6 @@ + Boost::iostreams + Boost::program_options + Boost::regex +- Boost::system + Boost::random + Boost::coroutine + Boost::locale +@@ -385,7 +382,6 @@ + Boost::iostreams + Boost::program_options + Boost::regex +- Boost::system + Boost::random + Boost::coroutine + Boost::locale diff --git a/games-strategy/wesnoth/wesnoth-1.18.6.ebuild b/games-strategy/wesnoth/wesnoth-1.18.6.ebuild new file mode 100644 index 000000000000..5bf77990a699 --- /dev/null +++ b/games-strategy/wesnoth/wesnoth-1.18.6.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2026 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="https://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 test" +RESTRICT="!test? ( test )" + +RDEPEND=" + acct-group/wesnoth + acct-user/wesnoth + dev-libs/boost:=[bzip2,context,icu,nls] + >=media-libs/libsdl2-2.0.10: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}/${P}-boost-1.89.patch" ) + +src_prepare() { + cmake_src_prepare + + use doc || cmake_comment_add_subdirectory -f doc manual + + # 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" + -DENABLE_TESTS="$(usex test)" + ) + 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 +}
