make install works. First time on the game, played some minutes, this game is really nice.
What about those tools/.py files portcheck complain about ? pkg_info -L wesnoth | grep '.py$' /usr/local/share/wesnoth/data/tools/addon_manager/* /usr/local/share/wesnoth/data/tools/expand-terrain-macros.py /usr/local/share/wesnoth/data/tools/hexometer.py /usr/local/share/wesnoth/data/tools/pywmlx/* /usr/local/share/wesnoth/data/tools/terrain2wiki.py /usr/local/share/wesnoth/data/tools/unit_tree/* /usr/local/share/wesnoth/data/tools/wesnoth/* I have a diff to add lang/python (MODPY_COMPILEALL) if you want. On 15/06/2024 23:49, Solene Rapenne wrote: > update to latest version > > https://github.com/wesnoth/wesnoth/blob/1.18.1/changelog.md#version-1181 > > I dropped a patch because it didn't apply and the new code seemed > fine to me, I'm not sure about why this patch exist either as it > had no comment, the game runs fine without it with this version I'm not c++ expert, could be a warning treated as an error (looks like an implicit cast of type pointer NULL to type double or int). Now it assign std::nullopt, I also think you can safely remove the patch from what I read about std::optional/std::nullopt. > ok? > > diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile > index a59e3ea2fd2..9dbec8ccf91 100644 > --- a/games/wesnoth/Makefile > +++ b/games/wesnoth/Makefile > @@ -3,7 +3,7 @@ PORTROACH = limitw:1,even > BROKEN-hppa = missing atomic ops > COMMENT= fantasy turn-based strategy game > > -DISTNAME= wesnoth-1.18.0 > +DISTNAME= wesnoth-1.18.1 > > CATEGORIES= games x11 > > diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo > index 47f8e7ef565..931026388d3 100644 > --- a/games/wesnoth/distinfo > +++ b/games/wesnoth/distinfo > @@ -1,2 +1,2 @@ > -SHA256 (wesnoth-1.18.0.tar.bz2) = > LNx1uXw0N+ZJDxmCx5OOh9XcvinKiu0yqNE7JeBpOcA= > -SIZE (wesnoth-1.18.0.tar.bz2) = 460686063 > +SHA256 (wesnoth-1.18.1.tar.bz2) = > 1PKBFWygPFaM471TyEIVeZnoQnWW/by5Z0hn1MPR9a4= > +SIZE (wesnoth-1.18.1.tar.bz2) = 461256300 > diff --git a/games/wesnoth/patches/patch-src_utils_config_filters_hpp > b/games/wesnoth/patches/patch-src_utils_config_filters_hpp > deleted file mode 100644 > index 82116b28146..00000000000 > --- a/games/wesnoth/patches/patch-src_utils_config_filters_hpp > +++ /dev/null > @@ -1,23 +0,0 @@ > -Index: src/utils/config_filters.hpp > ---- src/utils/config_filters.hpp.orig > -+++ src/utils/config_filters.hpp > -@@ -40,8 +40,8 @@ bool bool_matches_if_present(const config& filter, con > - * > - * Always returns true if the filter puts no restriction on the value of @a > cfg[@a attribute]. > - */ > --bool double_matches_if_present(const config& filter, const config& cfg, > const std::string& attribute, std::optional<double> def = NULL); > --bool int_matches_if_present(const config& filter, const config& cfg, const > std::string& attribute, std::optional<int> def = NULL); > -+bool double_matches_if_present(const config& filter, const config& cfg, > const std::string& attribute, std::optional<double> def = 0); > -+bool int_matches_if_present(const config& filter, const config& cfg, const > std::string& attribute, std::optional<int> def = 0); > - > - /** > - * Restricts filters to only looking for values that are zero or more. > -@@ -62,7 +62,7 @@ bool unsigned_matches_if_present(const config& filter, > - * The function is named "negative" in case we later want to add a > "reciprocal" for the "multiply"/"divide" pair. > - */ > - bool int_matches_if_present_or_negative( > -- const config& filter, const config& cfg, const std::string& attribute, > const std::string& opposite, std::optional<int> def = NULL); > -+ const config& filter, const config& cfg, const std::string& attribute, > const std::string& opposite, std::optional<int> def = 0); > - > - bool string_matches_if_present( > - const config& filter, const config& cfg, const std::string& attribute, > const std::string& def); > diff --git a/games/wesnoth/pkg/PLIST b/games/wesnoth/pkg/PLIST > index ebca913eb42..e54990cf133 100644 > --- a/games/wesnoth/pkg/PLIST > +++ b/games/wesnoth/pkg/PLIST > @@ -18740,6 +18740,7 @@ share/wesnoth/data/gui/window/attack_predictions.cfg > share/wesnoth/data/gui/window/campaign_dialog.cfg > share/wesnoth/data/gui/window/campaign_difficulty.cfg > share/wesnoth/data/gui/window/chat_log.cfg > +share/wesnoth/data/gui/window/community_dialog.cfg > share/wesnoth/data/gui/window/core_dialog.cfg > share/wesnoth/data/gui/window/custom_tod.cfg > share/wesnoth/data/gui/window/debug_clock.cfg > @@ -19485,6 +19486,7 @@ > share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/attacks/attack > > share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/attacks/attacks_wfl_self.cfg > > share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/attacks/attacks_zero.cfg > > share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/backstab.cfg > +share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/damage_recalculation_mid_attack.cfg > share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/feeding.cfg > > share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/firststrike_and_laststrike.cfg > share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/heals/ > @@ -19660,6 +19662,7 @@ > share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/res > > share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_apply_to_blade.cfg > > share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_apply_to_invalid.cfg > > share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_apply_to_non_blade.cfg > +share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_cumulative_max_value.cfg > > share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_divide.cfg > > share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_high_fraction.cfg > > share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_low_fraction.cfg > @@ -19676,12 +19679,16 @@ > share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/res > > share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_sub.cfg > > share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_sub_divide.cfg > > share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_sub_multiply.cfg > +share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_to_damage_type_special.cfg > > share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_mixed_same_id.cfg > > share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_mixed_unique_id.cfg > +share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_mixed_unique_id_skeletal.cfg > > share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_no_same_id.cfg > > share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_no_unique_id.cfg > +share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_no_unique_id_skeletal.cfg > > share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_yes_same_id.cfg > > share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_yes_unique_id.cfg > +share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_two_cumulative_yes_unique_id_skeletal.cfg > > share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_wfl_other.cfg > > share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_wfl_self.cfg > > share/wesnoth/data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/resistance/resistance_zero.cfg >
