wesnoth: update to 1.18.0.
This commit is contained in:
iFoundSilentHouse
classabbyamp
parent
06780f36cb
commit
68a700c4dc
|
|
@ -0,0 +1,34 @@
|
|||
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);
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
Audio test was built to access real audio hardware.
|
||||
Patch disables audio test to pass all the other tests on CI and other no-audio-hardware systems.
|
||||
---
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 52b0de2..bfb6d9c 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -196,12 +196,6 @@ if((ENABLE_GAME OR ENABLE_TESTS) AND NOT MSVC)
|
||||
target_link_libraries(sdl2_webp ${game-external-libs})
|
||||
add_test(NAME SDL2_WEBP_SUPPORT COMMAND sdl2_webp "${CMAKE_SOURCE_DIR}/data/core/images/scons_conftest_images/end-n.webp")
|
||||
|
||||
- # test for audio support in SDL2
|
||||
- add_executable(sdl2_audio conftests/sdl2_audio.cpp)
|
||||
- set_target_properties(sdl2_audio PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/Testing)
|
||||
- target_link_libraries(sdl2_audio ${game-external-libs})
|
||||
- add_test(NAME SDL2_AUDIO_SUPPORT COMMAND sdl2_audio "${CMAKE_SOURCE_DIR}/data/core/music/main_menu.ogg")
|
||||
-
|
||||
add_custom_target(conftests
|
||||
COMMAND ${CMAKE_COMMAND} -E env "SDL_AUDIODRIVER=dummy" ${CMAKE_CTEST_COMMAND}
|
||||
DEPENDS
|
||||
@@ -211,7 +205,6 @@ if((ENABLE_GAME OR ENABLE_TESTS) AND NOT MSVC)
|
||||
sdl2_jpg
|
||||
sdl2_png
|
||||
sdl2_webp
|
||||
- sdl2_audio
|
||||
)
|
||||
endif()
|
||||
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
From 182d0ff548b0149a17a6fefcf061074db05c82de Mon Sep 17 00:00:00 2001
|
||||
From: Pentarctagon <pentarctagon@tutamail.com>
|
||||
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);
|
||||
|
|
@ -1,20 +1,21 @@
|
|||
# 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 <orphan@voidlinux.org>"
|
||||
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=a60521b1ee1c2ddc7dfde89a038b893a4b43337085bd1478f4bc92dab7da7fc7
|
||||
checksum=2cdc75b97c3437e6490f1982c7938e87d5dcbe29ca8aed32a8d13b25e06939c0
|
||||
replaces="wesnoth-data>=0"
|
||||
|
||||
CFLAGS="-UNDEBUG"
|
||||
|
|
|
|||
Loading…
Reference in New Issue