From: iFoundSilentHouse <iFoundSilentHouse@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] wesnoth: update to 1.18.0.
Date: Thu, 28 Mar 2024 03:44:51 +0100 [thread overview]
Message-ID: <20240328024451.B992B21303@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-49545@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 628 bytes --]
There is an updated pull request by iFoundSilentHouse against master on the void-packages repository
https://github.com/iFoundSilentHouse/void-packages wesnoth-1.18.0
https://github.com/void-linux/void-packages/pull/49545
wesnoth: update to 1.18.0.
- I tested the changes in this PR: **YES**
Checked out new compaign.
- I built this PR locally for my native architecture, (x86_64-glibc)
Patch for boost is no longer needed as it was commited to 1.17 version.
Added libcurl as changelog says wesnoth now needs it for compiling.
A patch file from https://github.com/void-linux/void-packages/pull/49545.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wesnoth-1.18.0-49545.patch --]
[-- Type: text/x-diff, Size: 9769 bytes --]
From ad86b85609e20096a1360a3dcc3513c93204120e Mon Sep 17 00:00:00 2001
From: iFoundSilentHouse <adeptslab@gmail.com>
Date: Wed, 27 Mar 2024 17:11:47 +0600
Subject: [PATCH 1/2] wesnoth: update to 1.18.0.
wesnoth: update to 1.18.0
---
.../wesnoth/patches/000-fix-musl-build.patch | 79 +++++++++++++++++++
.../patches/001-disable-audio-test.patch | 25 ++++++
srcpkgs/wesnoth/patches/boost-1.83.0.patch | 26 ------
srcpkgs/wesnoth/template | 7 +-
4 files changed, 108 insertions(+), 29 deletions(-)
create mode 100644 srcpkgs/wesnoth/patches/000-fix-musl-build.patch
create mode 100644 srcpkgs/wesnoth/patches/001-disable-audio-test.patch
delete mode 100644 srcpkgs/wesnoth/patches/boost-1.83.0.patch
diff --git a/srcpkgs/wesnoth/patches/000-fix-musl-build.patch b/srcpkgs/wesnoth/patches/000-fix-musl-build.patch
new file mode 100644
index 00000000000000..1cea150d84f4c7
--- /dev/null
+++ b/srcpkgs/wesnoth/patches/000-fix-musl-build.patch
@@ -0,0 +1,79 @@
+diff --git a/src/utils/config_filters.cpp b/src/utils/config_filters.cpp
+index f833acd7..dc0cbad5 100644
+--- a/src/utils/config_filters.cpp
++++ b/src/utils/config_filters.cpp
+@@ -53,7 +53,7 @@ bool utils::config_filters::unsigned_matches_if_present(const config& filter, co
+ return in_ranges<int>(cfg[attribute].to_int(0), utils::parse_ranges_unsigned(filter[attribute].str()));
+ }
+
+-bool utils::config_filters::int_matches_if_present(const config& filter, const config& cfg, const std::string& attribute, std::optional<int> def)
++bool utils::config_filters::int_matches_if_present(const config& filter, const config& cfg, const std::string& attribute, int def)
+ {
+ if(!filter.has_attribute(attribute)) {
+ return true;
+@@ -62,12 +62,11 @@ bool utils::config_filters::int_matches_if_present(const config& filter, const c
+ return false;
+ }
+
+- int value_def = def ? (*def) : 0;
+- return in_ranges<int>(cfg[attribute].to_int(value_def), utils::parse_ranges_int(filter[attribute].str()));
++ return in_ranges<int>(cfg[attribute].to_int(def), utils::parse_ranges_int(filter[attribute].str()));
+ }
+
+ bool utils::config_filters::int_matches_if_present_or_negative(
+- const config& filter, const config& cfg, const std::string& attribute, const std::string& opposite, std::optional<int> def)
++ const config& filter, const config& cfg, const std::string& attribute, const std::string& opposite, int def)
+ {
+ if(int_matches_if_present(filter, cfg, attribute, def)) {
+ return true;
+@@ -79,14 +78,13 @@ bool utils::config_filters::int_matches_if_present_or_negative(
+ if(!cfg.has_attribute(opposite) && !def) {
+ return false;
+ }
+- int value_def = def ? (*def) : 0;
+- return in_ranges<int>(-cfg[opposite].to_int(value_def), utils::parse_ranges_int(filter[attribute].str()));
++ return in_ranges<int>(-cfg[opposite].to_int(def), utils::parse_ranges_int(filter[attribute].str()));
+ }
+
+ return false;
+ }
+
+-bool utils::config_filters::double_matches_if_present(const config& filter, const config& cfg, const std::string& attribute, std::optional<double> def)
++bool utils::config_filters::double_matches_if_present(const config& filter, const config& cfg, const std::string& attribute, double def)
+ {
+ if(!filter.has_attribute(attribute)) {
+ return true;
+@@ -95,8 +93,7 @@ bool utils::config_filters::double_matches_if_present(const config& filter, cons
+ return false;
+ }
+
+- double value_def = def ? (*def) : 1;
+- return in_ranges<double>(cfg[attribute].to_double(value_def), utils::parse_ranges_real(filter[attribute].str()));
++ return in_ranges<double>(cfg[attribute].to_double(def), utils::parse_ranges_real(filter[attribute].str()));
+ }
+
+ bool utils::config_filters::bool_or_empty(const config& filter, const config& cfg, const std::string& attribute)
+diff --git a/src/utils/config_filters.hpp b/src/utils/config_filters.hpp
+index 878042a0..95423353 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, double def = 1);
++bool int_matches_if_present(const config& filter, const config& cfg, const std::string& attribute, 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, 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, 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/srcpkgs/wesnoth/patches/001-disable-audio-test.patch b/srcpkgs/wesnoth/patches/001-disable-audio-test.patch
new file mode 100644
index 00000000000000..0c70f50f6fa4f4
--- /dev/null
+++ b/srcpkgs/wesnoth/patches/001-disable-audio-test.patch
@@ -0,0 +1,25 @@
+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()
+
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 <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);
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 1af59888ab187d..60b0cf3da167f8 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -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/blob/master/changelog.md"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=a60521b1ee1c2ddc7dfde89a038b893a4b43337085bd1478f4bc92dab7da7fc7
+checksum=2cdc75b97c3437e6490f1982c7938e87d5dcbe29ca8aed32a8d13b25e06939c0
replaces="wesnoth-data>=0"
CFLAGS="-UNDEBUG"
From 1e62cea862cea15b014d41262fe74e2a606b8514 Mon Sep 17 00:00:00 2001
From: iFoundSilentHouse <adeptslab@gmail.com>
Date: Wed, 27 Mar 2024 17:12:43 +0600
Subject: [PATCH 2/2] SDL2_image: rebuild for webp support
---
srcpkgs/SDL2_image/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/SDL2_image/template b/srcpkgs/SDL2_image/template
index 9178845cd04142..70bef596f0eb3b 100644
--- a/srcpkgs/SDL2_image/template
+++ b/srcpkgs/SDL2_image/template
@@ -1,8 +1,9 @@
# Template file for 'SDL2_image'
pkgname=SDL2_image
version=2.8.2
-revision=1
+revision=2
build_style=cmake
+configure_args="-DSDL2IMAGE_WEBP=ON"
hostmakedepends="pkg-config"
makedepends="SDL2-devel libjpeg-turbo-devel libpng-devel libwebp-devel
tiff-devel zlib-devel"
next prev parent reply other threads:[~2024-03-28 2:44 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-26 7:52 [PR PATCH] " iFoundSilentHouse
2024-03-26 9:12 ` iFoundSilentHouse
2024-03-26 10:16 ` [PR PATCH] [Updated] " iFoundSilentHouse
2024-03-26 10:30 ` iFoundSilentHouse
2024-03-26 10:40 ` iFoundSilentHouse
2024-03-26 10:46 ` iFoundSilentHouse
2024-03-26 10:58 ` [PR PATCH] [Updated] " iFoundSilentHouse
2024-03-26 11:03 ` iFoundSilentHouse
2024-03-26 11:07 ` iFoundSilentHouse
2024-03-26 11:07 ` iFoundSilentHouse
2024-03-26 11:12 ` [PR PATCH] [Updated] " iFoundSilentHouse
2024-03-26 11:13 ` iFoundSilentHouse
2024-03-26 13:21 ` iFoundSilentHouse
2024-03-26 18:23 ` iFoundSilentHouse
2024-03-26 18:25 ` iFoundSilentHouse
2024-03-26 20:09 ` [PR REVIEW] " classabbyamp
2024-03-26 20:23 ` [PR PATCH] [Updated] " iFoundSilentHouse
2024-03-26 22:56 ` iFoundSilentHouse
2024-03-27 10:05 ` [PR PATCH] [Updated] " iFoundSilentHouse
2024-03-27 10:08 ` iFoundSilentHouse
2024-03-27 10:08 ` iFoundSilentHouse
2024-03-27 10:15 ` iFoundSilentHouse
2024-03-27 10:25 ` iFoundSilentHouse
2024-03-27 11:17 ` [PR PATCH] [Updated] " iFoundSilentHouse
2024-03-27 11:48 ` iFoundSilentHouse
2024-03-28 1:51 ` Jjp137
2024-03-28 1:57 ` iFoundSilentHouse
2024-03-28 2:02 ` [PR REVIEW] " Jjp137
2024-03-28 2:04 ` Jjp137
2024-03-28 2:09 ` iFoundSilentHouse
2024-03-28 2:09 ` iFoundSilentHouse
2024-03-28 2:17 ` [PR REVIEW] " classabbyamp
2024-03-28 2:23 ` [PR PATCH] [Updated] " iFoundSilentHouse
2024-03-28 2:38 ` iFoundSilentHouse
2024-03-28 2:41 ` [PR REVIEW] " classabbyamp
2024-03-28 2:44 ` iFoundSilentHouse [this message]
2024-03-28 2:51 ` [PR PATCH] [Updated] " iFoundSilentHouse
2024-03-28 2:52 ` [PR REVIEW] " iFoundSilentHouse
2024-03-28 5:29 ` [PR PATCH] [Updated] " iFoundSilentHouse
2024-03-28 5:33 ` iFoundSilentHouse
2024-03-31 4:54 ` [PR PATCH] [Updated] " iFoundSilentHouse
2024-05-18 16:36 ` [PR REVIEW] " classabbyamp
2024-05-27 19:23 ` [PR PATCH] [Updated] " iFoundSilentHouse
2024-05-27 19:25 ` [PR REVIEW] " iFoundSilentHouse
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240328024451.B992B21303@inbox.vuxu.org \
--to=ifoundsilenthouse@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).