From d36f293fabf3322b8d1b9da6a3e5174ddf89d382 Mon Sep 17 00:00:00 2001
From: Vincent Legoll <vincent.legoll@gmail.com>
Date: Tue, 10 Jun 2025 21:27:33 +0200
Subject: [PATCH] wesnoth: update to 1.18.5

Signed-off-by: Vincent Legoll <vincent.legoll@gmail.com>
---
 .../wesnoth/patches/000-fix-musl-build.patch  | 34 -------------------
 srcpkgs/wesnoth/template                      |  4 +--
 2 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/wesnoth/patches/000-fix-musl-build.patch

diff --git a/srcpkgs/wesnoth/patches/000-fix-musl-build.patch b/srcpkgs/wesnoth/patches/000-fix-musl-build.patch
deleted file mode 100644
index cb205e67d8b..00000000000
--- a/srcpkgs/wesnoth/patches/000-fix-musl-build.patch
+++ /dev/null
@@ -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);
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 34a5b431930..16d2a65a465 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,6 +1,6 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
-version=1.18.0
+version=1.18.5
 revision=1
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://wesnoth.org"
 changelog="https://github.com/wesnoth/wesnoth/raw/master/changelog.md"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=2cdc75b97c3437e6490f1982c7938e87d5dcbe29ca8aed32a8d13b25e06939c0
+checksum=e15db3caf446d91d389fc275f10c1a9e7ca3c6176c3b8ce94f5ee4a7a0c81bd6
 replaces="wesnoth-data>=0"
 
 CFLAGS="-UNDEBUG"