From 1e35d635ea805596a43cdc79e5d88f4c08ff4071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= Date: Sun, 13 Jul 2025 21:43:59 +0200 Subject: [PATCH] wesnoth: bump to version 1.18.5, re-enable separate data package --- ....18.4.patchset => wesnoth-1.18.5.patchset} | 0 ...th-1.18.4.recipe => wesnoth-1.18.5.recipe} | 36 ++++++++++--------- 2 files changed, 19 insertions(+), 17 deletions(-) rename games-strategy/wesnoth/patches/{wesnoth-1.18.4.patchset => wesnoth-1.18.5.patchset} (100%) rename games-strategy/wesnoth/{wesnoth-1.18.4.recipe => wesnoth-1.18.5.recipe} (85%) diff --git a/games-strategy/wesnoth/patches/wesnoth-1.18.4.patchset b/games-strategy/wesnoth/patches/wesnoth-1.18.5.patchset similarity index 100% rename from games-strategy/wesnoth/patches/wesnoth-1.18.4.patchset rename to games-strategy/wesnoth/patches/wesnoth-1.18.5.patchset diff --git a/games-strategy/wesnoth/wesnoth-1.18.4.recipe b/games-strategy/wesnoth/wesnoth-1.18.5.recipe similarity index 85% rename from games-strategy/wesnoth/wesnoth-1.18.4.recipe rename to games-strategy/wesnoth/wesnoth-1.18.5.recipe index 8fbba8613..c468927ac 100644 --- a/games-strategy/wesnoth/wesnoth-1.18.4.recipe +++ b/games-strategy/wesnoth/wesnoth-1.18.5.recipe @@ -25,7 +25,7 @@ LICENSE="GNU GPL v2" REVISION="1" branch="`echo "$portVersion" | cut -b1-4`" SOURCE_URI="https://sourceforge.net/projects/wesnoth/files/wesnoth-$branch/wesnoth-$portVersion/wesnoth-$portVersion.tar.bz2" -CHECKSUM_SHA256="2b95351729fcf1384d521d540aa0adfc80a9be2991aa4791f3b090678e4364ae" +CHECKSUM_SHA256="e15db3caf446d91d389fc275f10c1a9e7ca3c6176c3b8ce94f5ee4a7a0c81bd6" PATCHES="wesnoth-$portVersion.patchset" ADDITIONAL_FILES=" wesnoth.rdef.in @@ -36,6 +36,8 @@ POST_INSTALL_SCRIPTS="$relativePostInstallDir/wesnoth-postinstall.sh" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" +boostVersion="1.88.0" + PROVIDES=" wesnoth$secondaryArchSuffix = $portVersion cmd:wesnoth = $portVersion @@ -70,30 +72,30 @@ REQUIRES=" lib:libSDL2_mixer_2.0$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libvorbisfile$secondaryArchSuffix - #wesnoth_data == $portVersion base + wesnoth_data == $portVersion base " -# The following lines and the wesnoth_data REQUIRE should be uncommented -# when https://github.com/haikuports/haikuporter/issues/320 has been resolved -#SUMMARY_data="Battle for Wesnoth - Data files" -#DESCRIPTION_data="Data files for the Battle for Wesnoth game." +SUMMARY_data="Battle for Wesnoth - Data files" +DESCRIPTION_data="Data files for the Battle for Wesnoth game." -#ARCHITECTURES_data="any" +ARCHITECTURES_data="any" -#PROVIDES_data="wesnoth_data = $portVersion" +PROVIDES_data=" + wesnoth_data = $portVersion + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel cairo1.18${secondaryArchSuffix}_devel # do not use xcairo gcc${secondaryArchSuffix}_syslibs_devel - devel:libboost_coroutine$secondaryArchSuffix >= 1.83.0 - devel:libboost_filesystem$secondaryArchSuffix >= 1.83.0 - devel:libboost_graph$secondaryArchSuffix >= 1.83.0 - devel:libboost_iostreams$secondaryArchSuffix >= 1.83.0 - devel:libboost_locale$secondaryArchSuffix >= 1.83.0 - devel:libboost_program_options$secondaryArchSuffix >= 1.83.0 - devel:libboost_regex$secondaryArchSuffix >= 1.83.0 - devel:libboost_system$secondaryArchSuffix >= 1.83.0 + devel:libboost_coroutine$secondaryArchSuffix >= $boostVersion + devel:libboost_filesystem$secondaryArchSuffix >= $boostVersion + devel:libboost_graph$secondaryArchSuffix >= $boostVersion + devel:libboost_iostreams$secondaryArchSuffix >= $boostVersion + devel:libboost_locale$secondaryArchSuffix >= $boostVersion + devel:libboost_program_options$secondaryArchSuffix >= $boostVersion + devel:libboost_regex$secondaryArchSuffix >= $boostVersion + devel:libboost_system$secondaryArchSuffix >= $boostVersion devel:libcurl$secondaryArchSuffix devel:libdbus_1$secondaryArchSuffix # Optional, for notification support devel:libfontconfig$secondaryArchSuffix @@ -154,7 +156,7 @@ INSTALL() -e "s|@MINOR@|$MINOR|" \ $portDir/additional-files/wesnoth.rdef.in > wesnoth.rdef - #packageEntries data $dataDir/wesnoth + packageEntries data $dataDir/wesnoth # Setup post-install script (to prevent issues with wesnothd's var path) mkdir -p $postInstallDir