From 1b625fb75ac2de50a0da044a53345bc515e86328 Mon Sep 17 00:00:00 2001 From: iFoundSilentHouse Date: Tue, 26 Mar 2024 13:44:06 +0600 Subject: [PATCH] wesnoth: update to 1.18.0. --- .../wesnoth/patches/000-fix-muls-build.patch | 24 +++++++++++++++++ srcpkgs/wesnoth/patches/boost-1.83.0.patch | 26 ------------------- srcpkgs/wesnoth/template | 11 +++++--- 3 files changed, 32 insertions(+), 29 deletions(-) create mode 100644 srcpkgs/wesnoth/patches/000-fix-muls-build.patch delete mode 100644 srcpkgs/wesnoth/patches/boost-1.83.0.patch diff --git a/srcpkgs/wesnoth/patches/000-fix-muls-build.patch b/srcpkgs/wesnoth/patches/000-fix-muls-build.patch new file mode 100644 index 00000000000000..2b4c2ab33049db --- /dev/null +++ b/srcpkgs/wesnoth/patches/000-fix-muls-build.patch @@ -0,0 +1,24 @@ +diff --git a/src/utils/config_filters.hpp b/src/utils/config_filters.hpp +index 878042a089e..80ef011321c 100644 +--- a/src/utils/config_filters.hpp ++++ b/src/utils/config_filters.hpp +@@ -40,8 +40,8 @@ bool bool_matches_if_present(const config& filter, const config& cfg, const std: + * + * 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 def = NULL); +-bool int_matches_if_present(const config& filter, const config& cfg, const std::string& attribute, std::optional def = NULL); ++bool double_matches_if_present(const config& filter, const config& cfg, const std::string& attribute, std::optional def = 0); ++bool int_matches_if_present(const config& filter, const config& cfg, const std::string& attribute, std::optional 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, const config& cfg, const + * 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 def = NULL); ++ const config& filter, const config& cfg, const std::string& attribute, const std::string& opposite, std::optional def = 0); + + bool string_matches_if_present( + const config& filter, const config& cfg, const std::string& attribute, const std::string& def); diff --git a/srcpkgs/wesnoth/patches/boost-1.83.0.patch b/srcpkgs/wesnoth/patches/boost-1.83.0.patch deleted file mode 100644 index 5a07fa82ba8971..00000000000000 --- a/srcpkgs/wesnoth/patches/boost-1.83.0.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 182d0ff548b0149a17a6fefcf061074db05c82de Mon Sep 17 00:00:00 2001 -From: Pentarctagon -Date: Thu, 17 Aug 2023 23:16:09 -0500 -Subject: [PATCH] Compile fix for boost 1.83. - -Fixes #7849 ---- - src/gettext.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/gettext.cpp b/src/gettext.cpp -index 2d27ef6abc00..5e0d2f6c3ea5 100644 ---- a/src/gettext.cpp -+++ b/src/gettext.cpp -@@ -166,7 +166,11 @@ namespace - return msg; - } - -+#if BOOST_VERSION < 108300 - const char* get(int domain_id, const char* ctx, const char* sid, int n) const override -+#else -+ const char* get(int domain_id, const char* ctx, const char* sid, bl::count_type n) const override -+#endif - { - auto& base = get_base(); - const char* msg = base.get(domain_id, ctx, sid, n); diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template index 1af59888ab187d..446c33f238db20 100644 --- a/srcpkgs/wesnoth/template +++ b/srcpkgs/wesnoth/template @@ -1,21 +1,26 @@ # Template file for 'wesnoth' pkgname=wesnoth -version=1.16.10 +version=1.18.0 revision=1 build_style=cmake configure_args="-DENABLE_OMP=1" hostmakedepends="pkg-config gettext" makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel - zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel" + zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel libcurl-devel" depends="desktop-file-utils" short_desc="Turn-based fantasy strategy game" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://wesnoth.org" +changelog="https://github.com/wesnoth/wesnoth/blob/master/changelog.md" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=a60521b1ee1c2ddc7dfde89a038b893a4b43337085bd1478f4bc92dab7da7fc7 +checksum=2cdc75b97c3437e6490f1982c7938e87d5dcbe29ca8aed32a8d13b25e06939c0 replaces="wesnoth-data>=0" +case "$XBPS_TARGET_MACHINE" in + x86_64*|i686*) make_check=no ;; # Somehow tests fail on CI environment + # Needs testing for x86 archs before every update +esac CFLAGS="-UNDEBUG" CXXFLAGS="-UNDEBUG"