wesnoth: update to 1.18.5

Signed-off-by: Vincent Legoll <vincent.legoll@gmail.com>
This commit is contained in:
Vincent Legoll 2025-06-10 21:27:33 +02:00 committed by Duncan Overbruck
parent d9d0e9ff6c
commit d36f293fab
2 changed files with 2 additions and 36 deletions

View file

@ -1,34 +0,0 @@
From 21e2ec584756c0e7c46ca5037c52a775560931ad Mon Sep 17 00:00:00 2001
From: newfrenchy83 <31768074+newfrenchy83@users.noreply.github.com>
Date: Sat, 30 Mar 2024 13:34:30 +0100
Subject: [PATCH] Fix default argument in matches_if_present filters (#8649)
Source: https://github.com/wesnoth/wesnoth/commit/21e2ec584756c0e7c46ca5037c52a775560931ad
---
src/utils/config_filters.hpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/utils/config_filters.hpp b/src/utils/config_filters.hpp
index 878042a089e7..04ff6d289811 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<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 = std::nullopt);
+bool int_matches_if_present(const config& filter, const config& cfg, const std::string& attribute, std::optional<int> def = std::nullopt);
/**
* 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<int> def = NULL);
+ const config& filter, const config& cfg, const std::string& attribute, const std::string& opposite, std::optional<int> def = std::nullopt);
bool string_matches_if_present(
const config& filter, const config& cfg, const std::string& attribute, const std::string& def);

View file

@ -1,6 +1,6 @@
# Template file for 'wesnoth' # Template file for 'wesnoth'
pkgname=wesnoth pkgname=wesnoth
version=1.18.0 version=1.18.5
revision=1 revision=1
build_style=cmake build_style=cmake
configure_args="-DENABLE_OMP=1" configure_args="-DENABLE_OMP=1"
@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
homepage="https://wesnoth.org" homepage="https://wesnoth.org"
changelog="https://github.com/wesnoth/wesnoth/raw/master/changelog.md" changelog="https://github.com/wesnoth/wesnoth/raw/master/changelog.md"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=2cdc75b97c3437e6490f1982c7938e87d5dcbe29ca8aed32a8d13b25e06939c0 checksum=e15db3caf446d91d389fc275f10c1a9e7ca3c6176c3b8ce94f5ee4a7a0c81bd6
replaces="wesnoth-data>=0" replaces="wesnoth-data>=0"
CFLAGS="-UNDEBUG" CFLAGS="-UNDEBUG"