diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile index 3c0c234da4bf..8dcff44cf95c 100644 --- a/games/wesnoth/Makefile +++ b/games/wesnoth/Makefile @@ -1,129 +1,132 @@ PORTNAME= wesnoth PORTVERSION= 1.18.4 PORTEPOCH= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \ http://files.wesnoth.org/ \ http://ports.toco-domains.de/ -#PATCH_SITES+= https://github.com/wesnoth/wesnoth/commit/ +PATCH_SITES+= https://github.com/wesnoth/wesnoth/commit/ +PATCHFILES+= 8a91c0c05a037e75f53cdbd07c0a9f83186c69a5.patch:-p1 +PATCHFILES+= 385a153aa02fee7b8674d4f470fddf98a4f57bb3.patch:-p1 +PATCHFILES+= 51f424f5ab516a79691084fa4611fc28867e3171.patch:-p1 MAINTAINER= fluffy@FreeBSD.org COMMENT= Fantasy turn-based strategy game WWW= https://www.wesnoth.org/ LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfreetype.so:print/freetype2 \ libvorbisfile.so:audio/libvorbis \ libboost_thread.so:devel/boost-libs \ libcurl.so:ftp/curl \ libpng.so:graphics/png \ libfontconfig.so:x11-fonts/fontconfig \ libicudata.so:devel/icu \ libharfbuzz.so:print/harfbuzz USES= cmake compiler:c++17-lang cpe desktop-file-utils \ gnome lua:54 pkgconfig python:run \ readline shebangfix ssl sdl tar:bzip2 xorg USE_SDL= image2 mixer2 ttf2 USE_GNOME= cairo pango USE_XORG= ice sm x11 xext LDFLAGS+= -lboost_system -lpthread PORTSCOUT= limitw:1,even SHEBANG_FILES= data/tools/about_cfg_to_wiki \ data/tools/addon_manager/__init__.py \ data/tools/addon_manager/html.py \ data/tools/check_mixed_indent \ data/tools/expand-terrain-macros.py \ data/tools/extractbindings data/tools/imgcheck \ data/tools/GUI.pyw \ data/tools/hexometer.py \ data/tools/steam-changelog \ data/tools/TeamColorizer \ data/tools/trackviewer.pyw \ data/tools/terrain2wiki.py \ data/tools/tmx_trackplacer \ data/tools/unit_tree/__init__.py \ data/tools/unit_tree/animations.py \ data/tools/unit_tree/helpers.py \ data/tools/unit_tree/html_output.py \ data/tools/unit_tree/overview.py \ data/tools/unit_tree/team_colorizer.py \ data/tools/unit_tree/update-wmlunits \ data/tools/unit_tree/wiki_output.py \ data/tools/wesnoth/campaignserver_client.py \ data/tools/wesnoth/libgithub.py \ data/tools/wesnoth/trackplacer3/cfgfileformat.py \ data/tools/wesnoth/trackplacer3/datatypes.py \ data/tools/wesnoth/trackplacer3/tmxfileformat.py \ data/tools/wesnoth/version.py \ data/tools/wesnoth/wescamp.py \ data/tools/wesnoth/wmldata.py \ data/tools/wesnoth/wmliterator3.py \ data/tools/wesnoth/wmlparser.py \ data/tools/wesnoth/wmlparser3.py \ data/tools/wesnoth/wmltools3.py \ data/tools/wesnoth_addon_manager \ data/tools/wmlflip \ data/tools/wmlindent \ data/tools/wmllint \ data/tools/wmllint-1.4 \ data/tools/wmlunits \ data/tools/wmlscope \ data/tools/wmlxgettext \ po/FINDCPP \ po/FINDPY \ run_boost_tests \ run_wml_tests \ update_copyrights \ utils/ai_test/ai_test.py \ utils/compare_images.py \ utils/dockerbuilds/mingw/get_dlls.py \ utils/git_export_campaign \ utils/optiwebp.py \ utils/po_stat.py \ utils/pofix.py \ utils/unused_functions.py \ utils/update_appdata \ utils/update_copyright.py \ utils/woptipng.py CPE_VENDOR= ${PORTNAME} CPE_PRODUCT= battle_for_wesnoth CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR=${PREFIX}/share/man \ -DENABLE_STRICT_COMPILATION=off PORTDOCS= * PORTDATA= * OPTIONS_DEFINE= CAMPAIGN DOCS FRIBIDI NLS \ NOTIFY SERVER TEST OPTIONS_DEFAULT= CAMPAIGN FRIBIDI NOTIFY SERVER OPTIONS_SUB= yes CAMPAIGN_DESC= Campaign server CAMPAIGN_CMAKE_ON=-DENABLE_CAMPAIGN_SERVER=on DOCS_CMAKE_OFF= -DDOCDIR=none FRIBIDI_DESC= Bidirectional support FRIBIDI_LIB_DEPENDS=libfribidi.so:converters/fribidi FRIBIDI_CMAKE_OFF=-DENABLE_FRIBIDI=off NLS_USES= gettext NLS_CMAKE_ON= -DLOCALEDIR=${PREFIX}/share/locale NLS_CMAKE_OFF= -DENABLE_NLS=off NOTIFY_DESC= Desktop notifications NOTIFY_LIB_DEPENDS=libdbus-1.so:devel/dbus NOTIFY_CMAKE_OFF=-DENABLE_NOTIFICATIONS=off SERVER_DESC= Server SERVER_CMAKE_OFF=-DENABLE_SERVER=off TEST_CMAKE_ON= -DENABLE_TESTS=on #post-install: # ${FIND} ${STAGEDIR}${PREFIX}/man -type d -empty -delete .include diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo index 6418b57ed02c..f98c2fe4ee7a 100644 --- a/games/wesnoth/distinfo +++ b/games/wesnoth/distinfo @@ -1,3 +1,9 @@ -TIMESTAMP = 1741648592 +TIMESTAMP = 1747037175 SHA256 (wesnoth-1.18.4.tar.bz2) = 2b95351729fcf1384d521d540aa0adfc80a9be2991aa4791f3b090678e4364ae SIZE (wesnoth-1.18.4.tar.bz2) = 461847477 +SHA256 (8a91c0c05a037e75f53cdbd07c0a9f83186c69a5.patch) = bf57831b40ef380c4c5a7efc02e466f06fc657ecbd2ea58fc7564c22b3957318 +SIZE (8a91c0c05a037e75f53cdbd07c0a9f83186c69a5.patch) = 13923 +SHA256 (385a153aa02fee7b8674d4f470fddf98a4f57bb3.patch) = 13734ffe400e7fdc11d2205c2d30fa2866076ddb1d693be35710a0d01d26c09c +SIZE (385a153aa02fee7b8674d4f470fddf98a4f57bb3.patch) = 6548 +SHA256 (51f424f5ab516a79691084fa4611fc28867e3171.patch) = e7548946e8fb8c940090984b8f38efc35759eecbe1001645c911f8123891b53d +SIZE (51f424f5ab516a79691084fa4611fc28867e3171.patch) = 13139 diff --git a/games/wesnoth/files/patch-CMakeLists.txt b/games/wesnoth/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..12e918ff6c45 --- /dev/null +++ b/games/wesnoth/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2025-02-17 21:50:08 UTC ++++ CMakeLists.txt +@@ -93,7 +93,7 @@ endif() + 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 process regex system thread random coroutine locale filesystem graph) + find_package(ICU REQUIRED COMPONENTS data i18n uc) + + # no, gettext executables are not required when NLS is deactivated diff --git a/games/wesnoth/files/patch-src_filesystem.cpp b/games/wesnoth/files/patch-src_filesystem.cpp new file mode 100644 index 000000000000..3f4f6b59b332 --- /dev/null +++ b/games/wesnoth/files/patch-src_filesystem.cpp @@ -0,0 +1,17 @@ +--- src/filesystem.cpp.orig 2025-02-17 21:50:08 UTC ++++ src/filesystem.cpp +@@ -30,11 +30,13 @@ + #include "serialization/unicode.hpp" + #include "utils/general.hpp" + ++#define BOOST_PROCESS_VERSION 1 + #include + #include + #include + #include +-#include ++#include ++#include + #include "game_config_view.hpp" + + #ifdef _WIN32 diff --git a/games/wesnoth/files/patch-src_game__launcher.cpp b/games/wesnoth/files/patch-src_game__launcher.cpp new file mode 100644 index 000000000000..8d0db636c090 --- /dev/null +++ b/games/wesnoth/files/patch-src_game__launcher.cpp @@ -0,0 +1,12 @@ +--- src/game_launcher.cpp.orig 2025-02-17 21:50:08 UTC ++++ src/game_launcher.cpp +@@ -61,7 +61,8 @@ + #ifdef _WIN32 + #include + #endif +-#include ++#define BOOST_PROCESS_VERSION 1 ++#include + #include // for system + #include + #include // for pair diff --git a/games/wesnoth/files/patch-src_serialization_base64.cpp b/games/wesnoth/files/patch-src_serialization_base64.cpp new file mode 100644 index 000000000000..28535fa62b83 --- /dev/null +++ b/games/wesnoth/files/patch-src_serialization_base64.cpp @@ -0,0 +1,10 @@ +--- src/serialization/base64.cpp.orig 2025-02-17 21:50:08 UTC ++++ src/serialization/base64.cpp +@@ -15,6 +15,7 @@ + + #include "serialization/base64.hpp" + ++#include + #include + + namespace {