* Re: wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
@ 2024-03-26 9:12 ` iFoundSilentHouse
2024-03-26 10:16 ` [PR PATCH] [Updated] " iFoundSilentHouse
` (41 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-26 9:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 287 bytes --]
New comment by iFoundSilentHouse on void-packages repository
https://github.com/void-linux/void-packages/pull/49545#issuecomment-2019892909
Comment:
For x86_64 build is fine locally (I've checked it multiple times). Though for musl some extra patching needs to be done. Working on it.
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
2024-03-26 9:12 ` iFoundSilentHouse
@ 2024-03-26 10:16 ` iFoundSilentHouse
2024-03-26 10:30 ` iFoundSilentHouse
` (40 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-26 10:16 UTC (permalink / raw)
To: ml
[-- 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: 4770 bytes --]
From ee9bee6fd5212c6c50afcbc91470b8df20a296ab Mon Sep 17 00:00:00 2001
From: iFoundSilentHouse <adeptslab@gmail.com>
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 | 7 ++---
3 files changed, 28 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<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 = 0);
++bool int_matches_if_present(const config& filter, const config& cfg, const std::string& attribute, std::optional<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, std::optional<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/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"
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 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
` (39 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-26 10:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 265 bytes --]
New comment by iFoundSilentHouse on void-packages repository
https://github.com/void-linux/void-packages/pull/49545#issuecomment-2020062367
Comment:
I built template successfully on: x86_64, i686, x86_64-musl, aarch64-musl. Will add proofs if CI checks will fail
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (2 preceding siblings ...)
2024-03-26 10:30 ` iFoundSilentHouse
@ 2024-03-26 10:40 ` iFoundSilentHouse
2024-03-26 10:46 ` iFoundSilentHouse
` (38 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-26 10:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 564 bytes --]
New comment by iFoundSilentHouse on void-packages repository
https://github.com/void-linux/void-packages/pull/49545#issuecomment-2020084722
Comment:
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (3 preceding siblings ...)
2024-03-26 10:40 ` iFoundSilentHouse
@ 2024-03-26 10:46 ` iFoundSilentHouse
2024-03-26 10:58 ` [PR PATCH] [Updated] " iFoundSilentHouse
` (37 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-26 10:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 564 bytes --]
New comment by iFoundSilentHouse on void-packages repository
https://github.com/void-linux/void-packages/pull/49545#issuecomment-2020084722
Comment:
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (4 preceding siblings ...)
2024-03-26 10:46 ` iFoundSilentHouse
@ 2024-03-26 10:58 ` iFoundSilentHouse
2024-03-26 11:03 ` iFoundSilentHouse
` (36 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-26 10:58 UTC (permalink / raw)
To: ml
[-- 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: 4959 bytes --]
From 6e589cfc3fb0a12975791e30b5718f605421594f Mon Sep 17 00:00:00 2001
From: iFoundSilentHouse <adeptslab@gmail.com>
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 | 12 ++++++---
3 files changed, 33 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<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 = 0);
++bool int_matches_if_present(const config& filter, const config& cfg, const std::string& attribute, std::optional<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, std::optional<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/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..f2970ef49af72b 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,21 +1,27 @@
# 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"
+# Somehow tests fail on CI environment
+# Needs testing for x86 archs before every update
+case "$XBPS_TARGET_MACHINE" in
+ x86_64*|i686*) make_check=no ;;
+esac
CFLAGS="-UNDEBUG"
CXXFLAGS="-UNDEBUG"
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (5 preceding siblings ...)
2024-03-26 10:58 ` [PR PATCH] [Updated] " iFoundSilentHouse
@ 2024-03-26 11:03 ` iFoundSilentHouse
2024-03-26 11:07 ` iFoundSilentHouse
` (35 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-26 11:03 UTC (permalink / raw)
To: ml
[-- 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: 4959 bytes --]
From e11d74bedbbb1264f319e1f70fa7660cd754c221 Mon Sep 17 00:00:00 2001
From: iFoundSilentHouse <adeptslab@gmail.com>
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 | 12 ++++++---
3 files changed, 33 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<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 = 0);
++bool int_matches_if_present(const config& filter, const config& cfg, const std::string& attribute, std::optional<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, std::optional<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/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..b3d0306e89b548 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,21 +1,27 @@
# 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"
+# Somehow tests fail on CI environment
+# Needs testing for x86 archs before every update
+case "$XBPS_TARGET_MACHINE" in
+ x86_64*|i686*) make_check=no ;;
+esac
CFLAGS="-UNDEBUG"
CXXFLAGS="-UNDEBUG"
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (6 preceding siblings ...)
2024-03-26 11:03 ` iFoundSilentHouse
@ 2024-03-26 11:07 ` iFoundSilentHouse
2024-03-26 11:07 ` iFoundSilentHouse
` (34 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-26 11:07 UTC (permalink / raw)
To: ml
[-- 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: 4958 bytes --]
From a0499138c263733fff84295a6b61e014e1259f82 Mon Sep 17 00:00:00 2001
From: iFoundSilentHouse <adeptslab@gmail.com>
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 | 12 ++++++---
3 files changed, 33 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<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 = 0);
++bool int_matches_if_present(const config& filter, const config& cfg, const std::string& attribute, std::optional<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, std::optional<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/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..57e6134a2c1f32 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,21 +1,27 @@
# 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"
+# Somehow tests fail on CI environment
+# Needs testing for x86 archs before every update
+case "$XBPS_TARGET_MACHINE" in
+ x86_64*|i686*) make_check=no ;;
+esac
CFLAGS="-UNDEBUG"
CXXFLAGS="-UNDEBUG"
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (7 preceding siblings ...)
2024-03-26 11:07 ` iFoundSilentHouse
@ 2024-03-26 11:07 ` iFoundSilentHouse
2024-03-26 11:12 ` [PR PATCH] [Updated] " iFoundSilentHouse
` (33 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-26 11:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 560 bytes --]
New comment by iFoundSilentHouse on void-packages repository
https://github.com/void-linux/void-packages/pull/49545#issuecomment-2020138123
Comment:
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (8 preceding siblings ...)
2024-03-26 11:07 ` iFoundSilentHouse
@ 2024-03-26 11:12 ` iFoundSilentHouse
2024-03-26 11:13 ` iFoundSilentHouse
` (32 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-26 11:12 UTC (permalink / raw)
To: ml
[-- 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: 4959 bytes --]
From 1b625fb75ac2de50a0da044a53345bc515e86328 Mon Sep 17 00:00:00 2001
From: iFoundSilentHouse <adeptslab@gmail.com>
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<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 = 0);
++bool int_matches_if_present(const config& filter, const config& cfg, const std::string& attribute, std::optional<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, std::optional<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/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..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 <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"
+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"
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (9 preceding siblings ...)
2024-03-26 11:12 ` [PR PATCH] [Updated] " iFoundSilentHouse
@ 2024-03-26 11:13 ` iFoundSilentHouse
2024-03-26 13:21 ` iFoundSilentHouse
` (31 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-26 11:13 UTC (permalink / raw)
To: ml
[-- 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: 4952 bytes --]
From 7589dbfc6825a32ada7b4c0ee617bc6f390b29dd Mon Sep 17 00:00:00 2001
From: iFoundSilentHouse <adeptslab@gmail.com>
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<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 = 0);
++bool int_matches_if_present(const config& filter, const config& cfg, const std::string& attribute, std::optional<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, std::optional<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/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..ae2696399dcd3f 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 <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"
+case "$XBPS_TARGET_MACHINE" in
+ x86_64*|i686*) make_check=no ;; # Cannot reproduce fail locally
+ # Needs testing for x86 archs before every update
+esac
CFLAGS="-UNDEBUG"
CXXFLAGS="-UNDEBUG"
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (10 preceding siblings ...)
2024-03-26 11:13 ` iFoundSilentHouse
@ 2024-03-26 13:21 ` iFoundSilentHouse
2024-03-26 18:23 ` iFoundSilentHouse
` (30 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-26 13:21 UTC (permalink / raw)
To: ml
[-- 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: 7541 bytes --]
From d9dfb593bec70384950b1306a5925fe0f62b892d Mon Sep 17 00:00:00 2001
From: iFoundSilentHouse <adeptslab@gmail.com>
Date: Tue, 26 Mar 2024 13:44:06 +0600
Subject: [PATCH] wesnoth: update to 1.18.0.
---
.../wesnoth/patches/000-fix-musl-build.patch | 78 +++++++++++++++++++
srcpkgs/wesnoth/patches/boost-1.83.0.patch | 26 -------
srcpkgs/wesnoth/template | 11 ++-
3 files changed, 86 insertions(+), 29 deletions(-)
create mode 100644 srcpkgs/wesnoth/patches/000-fix-musl-build.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..aa7cf32ccb5f64
--- /dev/null
+++ b/srcpkgs/wesnoth/patches/000-fix-musl-build.patch
@@ -0,0 +1,78 @@
+diff --git a/src/utils/config_filters.cpp b/src/utils/config_filters.cpp
+index f833acd7701..dba7a42c2ff 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,7 +93,7 @@ bool utils::config_filters::double_matches_if_present(const config& filter, cons
+ return false;
+ }
+
+- double value_def = def ? (*def) : 1;
++ double value_def = (def==0) ? 1 : (def);
+ return in_ranges<double>(cfg[attribute].to_double(value_def), utils::parse_ranges_real(filter[attribute].str()));
+ }
+
+diff --git a/src/utils/config_filters.hpp b/src/utils/config_filters.hpp
+index 878042a089e..a01a97f4db3 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 = 0);
++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/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..ae2696399dcd3f 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 <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"
+case "$XBPS_TARGET_MACHINE" in
+ x86_64*|i686*) make_check=no ;; # Cannot reproduce fail locally
+ # Needs testing for x86 archs before every update
+esac
CFLAGS="-UNDEBUG"
CXXFLAGS="-UNDEBUG"
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (11 preceding siblings ...)
2024-03-26 13:21 ` iFoundSilentHouse
@ 2024-03-26 18:23 ` iFoundSilentHouse
2024-03-26 18:25 ` iFoundSilentHouse
` (29 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-26 18:23 UTC (permalink / raw)
To: ml
[-- 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: 7905 bytes --]
From fec994737a934df3d47acc0062279dc98125bb74 Mon Sep 17 00:00:00 2001
From: iFoundSilentHouse <adeptslab@gmail.com>
Date: Wed, 27 Mar 2024 00:22:50 +0600
Subject: [PATCH] wesnoth: update to 1.18.0.
---
.../wesnoth/patches/000-musl-build-fix.patch | 85 +++++++++++++++++++
srcpkgs/wesnoth/patches/boost-1.83.0.patch | 26 ------
srcpkgs/wesnoth/template | 11 ++-
3 files changed, 93 insertions(+), 29 deletions(-)
create mode 100644 srcpkgs/wesnoth/patches/000-musl-build-fix.patch
delete mode 100644 srcpkgs/wesnoth/patches/boost-1.83.0.patch
diff --git a/srcpkgs/wesnoth/patches/000-musl-build-fix.patch b/srcpkgs/wesnoth/patches/000-musl-build-fix.patch
new file mode 100644
index 00000000000000..402293d27ad2d1
--- /dev/null
+++ b/srcpkgs/wesnoth/patches/000-musl-build-fix.patch
@@ -0,0 +1,85 @@
+commit 394eeea3da8080ae911cb7848edbc1a1fdd3e227
+Author: iFoundSilentHouse <adeptslab@gmail.com>
+Date: Tue Mar 26 23:09:43 2024 +0600
+
+ Fix std::optional for musl building
+
+diff --git a/src/utils/config_filters.cpp b/src/utils/config_filters.cpp
+index f833acd7701..dc0cbad5f66 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 878042a089e..95423353b2d 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/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..ae2696399dcd3f 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 <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"
+case "$XBPS_TARGET_MACHINE" in
+ x86_64*|i686*) make_check=no ;; # Cannot reproduce fail locally
+ # Needs testing for x86 archs before every update
+esac
CFLAGS="-UNDEBUG"
CXXFLAGS="-UNDEBUG"
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (12 preceding siblings ...)
2024-03-26 18:23 ` iFoundSilentHouse
@ 2024-03-26 18:25 ` iFoundSilentHouse
2024-03-26 20:09 ` [PR REVIEW] " classabbyamp
` (28 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-26 18:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 384 bytes --]
New comment by iFoundSilentHouse on void-packages repository
https://github.com/void-linux/void-packages/pull/49545#issuecomment-2021180722
Comment:
Added pull request on wesnoth to fix this bug: https://github.com/wesnoth/wesnoth/pull/8628
Patch from https://patch-diff.githubusercontent.com/raw/wesnoth/wesnoth/pull/8628.patch doesn't work, though patch made locally works fine.
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR REVIEW] wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (13 preceding siblings ...)
2024-03-26 18:25 ` iFoundSilentHouse
@ 2024-03-26 20:09 ` classabbyamp
2024-03-26 20:23 ` [PR PATCH] [Updated] " iFoundSilentHouse
` (27 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: classabbyamp @ 2024-03-26 20:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 195 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/49545#discussion_r1540032368
Comment:
if it's only in ci, it should be `ci-skip`
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (14 preceding siblings ...)
2024-03-26 20:09 ` [PR REVIEW] " classabbyamp
@ 2024-03-26 20:23 ` iFoundSilentHouse
2024-03-26 22:56 ` iFoundSilentHouse
` (26 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-26 20:23 UTC (permalink / raw)
To: ml
[-- 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: 7936 bytes --]
From 1fd2b5c006a6279c26a7b40ce5f75d9ebf88648c Mon Sep 17 00:00:00 2001
From: iFoundSilentHouse <adeptslab@gmail.com>
Date: Wed, 27 Mar 2024 02:22:48 +0600
Subject: [PATCH] wesnoth: update to 1.18.0.
wesnoth: update to 1.18.0
---
.../wesnoth/patches/000-musl-build-fix.patch | 85 +++++++++++++++++++
srcpkgs/wesnoth/patches/boost-1.83.0.patch | 26 ------
srcpkgs/wesnoth/template | 11 ++-
3 files changed, 93 insertions(+), 29 deletions(-)
create mode 100644 srcpkgs/wesnoth/patches/000-musl-build-fix.patch
delete mode 100644 srcpkgs/wesnoth/patches/boost-1.83.0.patch
diff --git a/srcpkgs/wesnoth/patches/000-musl-build-fix.patch b/srcpkgs/wesnoth/patches/000-musl-build-fix.patch
new file mode 100644
index 00000000000000..402293d27ad2d1
--- /dev/null
+++ b/srcpkgs/wesnoth/patches/000-musl-build-fix.patch
@@ -0,0 +1,85 @@
+commit 394eeea3da8080ae911cb7848edbc1a1fdd3e227
+Author: iFoundSilentHouse <adeptslab@gmail.com>
+Date: Tue Mar 26 23:09:43 2024 +0600
+
+ Fix std::optional for musl building
+
+diff --git a/src/utils/config_filters.cpp b/src/utils/config_filters.cpp
+index f833acd7701..dc0cbad5f66 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 878042a089e..95423353b2d 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/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..bcfc252c009e8a 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 <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"
+case "$XBPS_TARGET_MACHINE" in
+ x86_64*|i686*) make_check=skip-ci ;; # Cannot reproduce fail locally
+ # Needs testing for x86 archs before every update
+esac
CFLAGS="-UNDEBUG"
CXXFLAGS="-UNDEBUG"
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (15 preceding siblings ...)
2024-03-26 20:23 ` [PR PATCH] [Updated] " iFoundSilentHouse
@ 2024-03-26 22:56 ` iFoundSilentHouse
2024-03-27 10:05 ` [PR PATCH] [Updated] " iFoundSilentHouse
` (25 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-26 22:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 334 bytes --]
New comment by iFoundSilentHouse on void-packages repository
https://github.com/void-linux/void-packages/pull/49545#issuecomment-2021604812
Comment:
```
Start 6: SDL2_WEBP_SUPPORT
6/7 Test #6: SDL2_WEBP_SUPPORT ................***Failed 0.00 sec
```
I don't know what to do. Old SDL2_image version doesn't seem to be a thing
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (16 preceding siblings ...)
2024-03-26 22:56 ` iFoundSilentHouse
@ 2024-03-27 10:05 ` iFoundSilentHouse
2024-03-27 10:08 ` iFoundSilentHouse
` (24 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-27 10:05 UTC (permalink / raw)
To: ml
[-- 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: 9350 bytes --]
From 83c5b3a18a1c00009981ad785f95ea00ffd06b73 Mon Sep 17 00:00:00 2001
From: iFoundSilentHouse <adeptslab@gmail.com>
Date: Wed, 27 Mar 2024 02:22:48 +0600
Subject: [PATCH 1/2] wesnoth: update to 1.18.0.
---
.../wesnoth/patches/000-fix-musl-build.patch | 79 +++++++++++++++++++
srcpkgs/wesnoth/patches/boost-1.83.0.patch | 26 ------
srcpkgs/wesnoth/template | 7 +-
3 files changed, 83 insertions(+), 29 deletions(-)
create mode 100644 srcpkgs/wesnoth/patches/000-fix-musl-build.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/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 20088333087445ac6a13995ecdad3442fbd915d3 Mon Sep 17 00:00:00 2001
From: iFoundSilentHouse <adeptslab@gmail.com>
Date: Wed, 27 Mar 2024 15:55:04 +0600
Subject: [PATCH 2/2] SDL2_image: rebuild to enable webp support.
---
.../SDL2_image/patches/000-add-webp-support.patch | 13 +++++++++++++
srcpkgs/SDL2_image/template | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/SDL2_image/patches/000-add-webp-support.patch
diff --git a/srcpkgs/SDL2_image/patches/000-add-webp-support.patch b/srcpkgs/SDL2_image/patches/000-add-webp-support.patch
new file mode 100644
index 00000000000000..e6bb4711b29fd2
--- /dev/null
+++ b/srcpkgs/SDL2_image/patches/000-add-webp-support.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 65a8811..1c76fad 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -86,7 +86,7 @@ option(SDL2IMAGE_QOI "Support loading QOI images" ON)
+ option(SDL2IMAGE_SVG "Support loading SVG images" ON)
+ option(SDL2IMAGE_TGA "Support loading TGA images" ON)
+ option(SDL2IMAGE_TIF "Support loading TIFF images" OFF)
+-option(SDL2IMAGE_WEBP "Support loading WEBP images" OFF)
++option(SDL2IMAGE_WEBP "Support loading WEBP images" ON)
+ option(SDL2IMAGE_XCF "Support loading XCF images" ON)
+ option(SDL2IMAGE_XPM "Support loading XPM images" ON)
+ option(SDL2IMAGE_XV "Support loading XV images" ON)
diff --git a/srcpkgs/SDL2_image/template b/srcpkgs/SDL2_image/template
index 9178845cd04142..9e01968e7eee6c 100644
--- a/srcpkgs/SDL2_image/template
+++ b/srcpkgs/SDL2_image/template
@@ -1,7 +1,7 @@
# Template file for 'SDL2_image'
pkgname=SDL2_image
version=2.8.2
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="SDL2-devel libjpeg-turbo-devel libpng-devel libwebp-devel
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (17 preceding siblings ...)
2024-03-27 10:05 ` [PR PATCH] [Updated] " iFoundSilentHouse
@ 2024-03-27 10:08 ` iFoundSilentHouse
2024-03-27 10:08 ` iFoundSilentHouse
` (23 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-27 10:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 560 bytes --]
New comment by iFoundSilentHouse on void-packages repository
https://github.com/void-linux/void-packages/pull/49545#issuecomment-2020138123
Comment:
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (18 preceding siblings ...)
2024-03-27 10:08 ` iFoundSilentHouse
@ 2024-03-27 10:08 ` iFoundSilentHouse
2024-03-27 10:15 ` iFoundSilentHouse
` (22 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-27 10:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 390 bytes --]
New comment by iFoundSilentHouse on void-packages repository
https://github.com/void-linux/void-packages/pull/49545#issuecomment-2021180722
Comment:
Added pull request on wesnoth to fix musl build bug: https://github.com/wesnoth/wesnoth/pull/8628
Patch from https://patch-diff.githubusercontent.com/raw/wesnoth/wesnoth/pull/8628.patch doesn't work, though patch made locally works fine.
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (19 preceding siblings ...)
2024-03-27 10:08 ` iFoundSilentHouse
@ 2024-03-27 10:15 ` iFoundSilentHouse
2024-03-27 10:25 ` iFoundSilentHouse
` (21 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-27 10:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 372 bytes --]
New comment by iFoundSilentHouse on void-packages repository
https://github.com/void-linux/void-packages/pull/49545#issuecomment-2022391445
Comment:
I assume that the only way to build wesnoth with webp support (which is neccesary for testing environment) using dynamic linking is to add patch directly to CMakeLists.txt. Other ways of using webp require static linking
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (20 preceding siblings ...)
2024-03-27 10:15 ` iFoundSilentHouse
@ 2024-03-27 10:25 ` iFoundSilentHouse
2024-03-27 11:17 ` [PR PATCH] [Updated] " iFoundSilentHouse
` (20 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-27 10:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 372 bytes --]
New comment by iFoundSilentHouse on void-packages repository
https://github.com/void-linux/void-packages/pull/49545#issuecomment-2022391445
Comment:
I assume that the only way to build wesnoth with webp support (which is neccesary for testing environment) using dynamic linking is to add patch directly to CMakeLists.txt. Other ways of using webp require static linking
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (21 preceding siblings ...)
2024-03-27 10:25 ` iFoundSilentHouse
@ 2024-03-27 11:17 ` iFoundSilentHouse
2024-03-27 11:48 ` iFoundSilentHouse
` (19 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-27 11:17 UTC (permalink / raw)
To: ml
[-- 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: 10797 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 f9bac9fb7c232b91d78f294442455299e075df64 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
---
.../SDL2_image/patches/000-add-webp-support.patch | 13 +++++++++++++
srcpkgs/SDL2_image/template | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/SDL2_image/patches/000-add-webp-support.patch
diff --git a/srcpkgs/SDL2_image/patches/000-add-webp-support.patch b/srcpkgs/SDL2_image/patches/000-add-webp-support.patch
new file mode 100644
index 00000000000000..e6bb4711b29fd2
--- /dev/null
+++ b/srcpkgs/SDL2_image/patches/000-add-webp-support.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 65a8811..1c76fad 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -86,7 +86,7 @@ option(SDL2IMAGE_QOI "Support loading QOI images" ON)
+ option(SDL2IMAGE_SVG "Support loading SVG images" ON)
+ option(SDL2IMAGE_TGA "Support loading TGA images" ON)
+ option(SDL2IMAGE_TIF "Support loading TIFF images" OFF)
+-option(SDL2IMAGE_WEBP "Support loading WEBP images" OFF)
++option(SDL2IMAGE_WEBP "Support loading WEBP images" ON)
+ option(SDL2IMAGE_XCF "Support loading XCF images" ON)
+ option(SDL2IMAGE_XPM "Support loading XPM images" ON)
+ option(SDL2IMAGE_XV "Support loading XV images" ON)
diff --git a/srcpkgs/SDL2_image/template b/srcpkgs/SDL2_image/template
index 9178845cd04142..9e01968e7eee6c 100644
--- a/srcpkgs/SDL2_image/template
+++ b/srcpkgs/SDL2_image/template
@@ -1,7 +1,7 @@
# Template file for 'SDL2_image'
pkgname=SDL2_image
version=2.8.2
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="SDL2-devel libjpeg-turbo-devel libpng-devel libwebp-devel
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (22 preceding siblings ...)
2024-03-27 11:17 ` [PR PATCH] [Updated] " iFoundSilentHouse
@ 2024-03-27 11:48 ` iFoundSilentHouse
2024-03-28 1:51 ` Jjp137
` (18 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-27 11:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 494 bytes --]
New comment by iFoundSilentHouse on void-packages repository
https://github.com/void-linux/void-packages/pull/49545#issuecomment-2022577842
Comment:
Changes:
* SDL2_image: for webp support added patch to SDL2_image as there's no command that worked for build using dynamic linking.
* wesnoth: 1) Added patch that allows musl to build; this code doesn't change functionality 2) Disabled audio test - obviously, virtual environment doesn't have sound card.
Everything works. @classabbyamp
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (23 preceding siblings ...)
2024-03-27 11:48 ` iFoundSilentHouse
@ 2024-03-28 1:51 ` Jjp137
2024-03-28 1:57 ` iFoundSilentHouse
` (17 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: Jjp137 @ 2024-03-28 1:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 623 bytes --]
New comment by Jjp137 on void-packages repository
https://github.com/void-linux/void-packages/pull/49545#issuecomment-2024256894
Comment:
> * SDL2_image: for webp support added patch to SDL2_image as there's no command that worked for build using dynamic linking.
Instead of adding a patch, add ``configure_args="-DSDL2IMAGE_WEBP=ON"`` to SDL2_image's template.
If done correctly, this should be part of the configure step's output for SDL2_image:
```
-- SDL2_image: Using system libwebp
-- Found webp: /usr/lib/libwebp.so
-- Dynamic libwebpdemux: libwebpdemux.so.2
-- Dynamic libwebp: libwebp.so.7
```
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (24 preceding siblings ...)
2024-03-28 1:51 ` Jjp137
@ 2024-03-28 1:57 ` iFoundSilentHouse
2024-03-28 2:02 ` [PR REVIEW] " Jjp137
` (16 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-28 1:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 772 bytes --]
New comment by iFoundSilentHouse on void-packages repository
https://github.com/void-linux/void-packages/pull/49545#issuecomment-2024264791
Comment:
> > * SDL2_image: for webp support added patch to SDL2_image as there's no command that worked for build using dynamic linking.
>
> Instead of adding a patch, add `configure_args="-DSDL2IMAGE_WEBP=ON"` to SDL2_image's template.
>
> If done correctly, this should be part of the configure step's output for SDL2_image:
>
> ```
> -- SDL2_image: Using system libwebp
> -- Found webp: /usr/lib/libwebp.so
> -- Dynamic libwebpdemux: libwebpdemux.so.2
> -- Dynamic libwebp: libwebp.so.7
> ```
I tried it. Didn't work. Maybe I was too tired bruteforcing the answer and did something wrong. I'll try it againg
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR REVIEW] wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (25 preceding siblings ...)
2024-03-28 1:57 ` iFoundSilentHouse
@ 2024-03-28 2:02 ` Jjp137
2024-03-28 2:04 ` Jjp137
` (15 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: Jjp137 @ 2024-03-28 2:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 572 bytes --]
New review comment by Jjp137 on void-packages repository
https://github.com/void-linux/void-packages/pull/49545#discussion_r1542223342
Comment:
```suggestion
changelog="https://github.com/wesnoth/wesnoth/blob/${version}/changelog.md"
```
Wesnoth has both stable and development releases, so it might be a good idea to link directly to the version-specific changelog. The release threads on the Wesnoth forums do this. Otherwise, as 1.19 development progresses, the changelog on the master branch will describe many changes that are not present in the stable version.
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (26 preceding siblings ...)
2024-03-28 2:02 ` [PR REVIEW] " Jjp137
@ 2024-03-28 2:04 ` Jjp137
2024-03-28 2:09 ` iFoundSilentHouse
` (14 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: Jjp137 @ 2024-03-28 2:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 428 bytes --]
New comment by Jjp137 on void-packages repository
https://github.com/void-linux/void-packages/pull/49545#issuecomment-2024269632
Comment:
> I tried it. Didn't work. Maybe I was too tired bruteforcing the answer and did something wrong. I'll try it againg
You might need to ``./xbps-src clean SDL2_image`` first for some reason.
Thanks for working on the update, by the way. I do want to play Wesnoth 1.18 at some point.
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (27 preceding siblings ...)
2024-03-28 2:04 ` Jjp137
@ 2024-03-28 2:09 ` iFoundSilentHouse
2024-03-28 2:09 ` iFoundSilentHouse
` (13 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-28 2:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 484 bytes --]
New comment by iFoundSilentHouse on void-packages repository
https://github.com/void-linux/void-packages/pull/49545#issuecomment-2024272900
Comment:
> > I tried it. Didn't work. Maybe I was too tired bruteforcing the answer and did something wrong. I'll try it againg
>
> You might need to `./xbps-src clean SDL2_image` first for some reason.
>
> Thanks for working on the update, by the way. I do want to play Wesnoth 1.18 at some point.
Thanks for your reviews a lot! :)
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (28 preceding siblings ...)
2024-03-28 2:09 ` iFoundSilentHouse
@ 2024-03-28 2:09 ` iFoundSilentHouse
2024-03-28 2:17 ` [PR REVIEW] " classabbyamp
` (12 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-28 2:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 484 bytes --]
New comment by iFoundSilentHouse on void-packages repository
https://github.com/void-linux/void-packages/pull/49545#issuecomment-2024272900
Comment:
> > I tried it. Didn't work. Maybe I was too tired bruteforcing the answer and did something wrong. I'll try it againg
>
> You might need to `./xbps-src clean SDL2_image` first for some reason.
>
> Thanks for working on the update, by the way. I do want to play Wesnoth 1.18 at some point.
Thanks a lot for your reviews! :)
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR REVIEW] wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (29 preceding siblings ...)
2024-03-28 2:09 ` iFoundSilentHouse
@ 2024-03-28 2:17 ` classabbyamp
2024-03-28 2:23 ` [PR PATCH] [Updated] " iFoundSilentHouse
` (11 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: classabbyamp @ 2024-03-28 2:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 234 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/49545#discussion_r1542231511
Comment:
no, we want the changelog to match the development branch if it's in the git repo
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (30 preceding siblings ...)
2024-03-28 2:17 ` [PR REVIEW] " classabbyamp
@ 2024-03-28 2:23 ` iFoundSilentHouse
2024-03-28 2:38 ` iFoundSilentHouse
` (10 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-28 2:23 UTC (permalink / raw)
To: ml
[-- 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: 11816 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/3] 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 1da37c354f0eddf39d572899e4cb096108dff5b7 Mon Sep 17 00:00:00 2001
From: iFoundSilentHouse <adeptslab@gmail.com>
Date: Wed, 27 Mar 2024 17:12:43 +0600
Subject: [PATCH 2/3] SDL2_image: rebuild for webp support
---
.../SDL2_image/patches/000-add-webp-support.patch | 13 +++++++++++++
srcpkgs/SDL2_image/template | 3 ++-
2 files changed, 15 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/SDL2_image/patches/000-add-webp-support.patch
diff --git a/srcpkgs/SDL2_image/patches/000-add-webp-support.patch b/srcpkgs/SDL2_image/patches/000-add-webp-support.patch
new file mode 100644
index 00000000000000..e6bb4711b29fd2
--- /dev/null
+++ b/srcpkgs/SDL2_image/patches/000-add-webp-support.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 65a8811..1c76fad 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -86,7 +86,7 @@ option(SDL2IMAGE_QOI "Support loading QOI images" ON)
+ option(SDL2IMAGE_SVG "Support loading SVG images" ON)
+ option(SDL2IMAGE_TGA "Support loading TGA images" ON)
+ option(SDL2IMAGE_TIF "Support loading TIFF images" OFF)
+-option(SDL2IMAGE_WEBP "Support loading WEBP images" OFF)
++option(SDL2IMAGE_WEBP "Support loading WEBP images" ON)
+ option(SDL2IMAGE_XCF "Support loading XCF images" ON)
+ option(SDL2IMAGE_XPM "Support loading XPM images" ON)
+ option(SDL2IMAGE_XV "Support loading XV images" ON)
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"
From e3da402a7b630c457e90cd491ecd9877ddd6b1f9 Mon Sep 17 00:00:00 2001
From: iFoundSilentHouse <adeptslab@gmail.com>
Date: Thu, 28 Mar 2024 08:10:05 +0600
Subject: [PATCH 3/3] wesnoth: update to 1.18.0.
---
srcpkgs/wesnoth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 60b0cf3da167f8..64cb40f634c514 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -13,7 +13,7 @@ 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"
+changelog="https://github.com/wesnoth/wesnoth/blob/${version}/changelog"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=2cdc75b97c3437e6490f1982c7938e87d5dcbe29ca8aed32a8d13b25e06939c0
replaces="wesnoth-data>=0"
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (31 preceding siblings ...)
2024-03-28 2:23 ` [PR PATCH] [Updated] " iFoundSilentHouse
@ 2024-03-28 2:38 ` iFoundSilentHouse
2024-03-28 2:41 ` [PR REVIEW] " classabbyamp
` (9 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-28 2:38 UTC (permalink / raw)
To: ml
[-- 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: 10861 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 1da37c354f0eddf39d572899e4cb096108dff5b7 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
---
.../SDL2_image/patches/000-add-webp-support.patch | 13 +++++++++++++
srcpkgs/SDL2_image/template | 3 ++-
2 files changed, 15 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/SDL2_image/patches/000-add-webp-support.patch
diff --git a/srcpkgs/SDL2_image/patches/000-add-webp-support.patch b/srcpkgs/SDL2_image/patches/000-add-webp-support.patch
new file mode 100644
index 00000000000000..e6bb4711b29fd2
--- /dev/null
+++ b/srcpkgs/SDL2_image/patches/000-add-webp-support.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 65a8811..1c76fad 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -86,7 +86,7 @@ option(SDL2IMAGE_QOI "Support loading QOI images" ON)
+ option(SDL2IMAGE_SVG "Support loading SVG images" ON)
+ option(SDL2IMAGE_TGA "Support loading TGA images" ON)
+ option(SDL2IMAGE_TIF "Support loading TIFF images" OFF)
+-option(SDL2IMAGE_WEBP "Support loading WEBP images" OFF)
++option(SDL2IMAGE_WEBP "Support loading WEBP images" ON)
+ option(SDL2IMAGE_XCF "Support loading XCF images" ON)
+ option(SDL2IMAGE_XPM "Support loading XPM images" ON)
+ option(SDL2IMAGE_XV "Support loading XV images" ON)
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"
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR REVIEW] wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (32 preceding siblings ...)
2024-03-28 2:38 ` iFoundSilentHouse
@ 2024-03-28 2:41 ` classabbyamp
2024-03-28 2:44 ` [PR PATCH] [Updated] " iFoundSilentHouse
` (8 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: classabbyamp @ 2024-03-28 2:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 233 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/49545#discussion_r1542243036
Comment:
the change that should be made is switching from the "blob" url to the "raw" url
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (33 preceding siblings ...)
2024-03-28 2:41 ` [PR REVIEW] " classabbyamp
@ 2024-03-28 2:44 ` iFoundSilentHouse
2024-03-28 2:51 ` iFoundSilentHouse
` (7 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-28 2:44 UTC (permalink / raw)
To: ml
[-- 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"
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (34 preceding siblings ...)
2024-03-28 2:44 ` [PR PATCH] [Updated] " iFoundSilentHouse
@ 2024-03-28 2:51 ` iFoundSilentHouse
2024-03-28 2:52 ` [PR REVIEW] " iFoundSilentHouse
` (6 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-28 2:51 UTC (permalink / raw)
To: ml
[-- 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: 9742 bytes --]
From 0206aa4bae96009e36c31693e3f19ce0a880bd81 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/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..34a5b431930dcf 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/raw/master/changelog.md"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=a60521b1ee1c2ddc7dfde89a038b893a4b43337085bd1478f4bc92dab7da7fc7
+checksum=2cdc75b97c3437e6490f1982c7938e87d5dcbe29ca8aed32a8d13b25e06939c0
replaces="wesnoth-data>=0"
CFLAGS="-UNDEBUG"
From 357ced35c96d807336ea4eab0c3fe52795ac2315 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"
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR REVIEW] wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (35 preceding siblings ...)
2024-03-28 2:51 ` iFoundSilentHouse
@ 2024-03-28 2:52 ` iFoundSilentHouse
2024-03-28 5:29 ` [PR PATCH] [Updated] " iFoundSilentHouse
` (5 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-28 2:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 251 bytes --]
New review comment by iFoundSilentHouse on void-packages repository
https://github.com/void-linux/void-packages/pull/49545#discussion_r1542248852
Comment:
> the change that should be made is switching from the "blob" url to the "raw" url
Changed
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (36 preceding siblings ...)
2024-03-28 2:52 ` [PR REVIEW] " iFoundSilentHouse
@ 2024-03-28 5:29 ` iFoundSilentHouse
2024-03-28 5:33 ` iFoundSilentHouse
` (4 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-28 5:29 UTC (permalink / raw)
To: ml
[-- 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: 7076 bytes --]
From 40914e425faf336ff94c5af08371635e6c5ca56b 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/patches/000-fix-musl-build.patch | 26 +++++++++++++++++++
.../patches/001-disable-audio-test.patch | 25 ++++++++++++++++++
srcpkgs/wesnoth/patches/boost-1.83.0.patch | 26 -------------------
srcpkgs/wesnoth/template | 7 ++---
4 files changed, 55 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..7c37332356ed19
--- /dev/null
+++ b/srcpkgs/wesnoth/patches/000-fix-musl-build.patch
@@ -0,0 +1,26 @@
+Source: https://github.com/wesnoth/wesnoth/pull/8649
+
+diff --git a/src/utils/config_filters.hpp b/src/utils/config_filters.hpp
+index 878042a..04ff6d2 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/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..34a5b431930dcf 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/raw/master/changelog.md"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=a60521b1ee1c2ddc7dfde89a038b893a4b43337085bd1478f4bc92dab7da7fc7
+checksum=2cdc75b97c3437e6490f1982c7938e87d5dcbe29ca8aed32a8d13b25e06939c0
replaces="wesnoth-data>=0"
CFLAGS="-UNDEBUG"
From bc6199d878eb11a873bd8f41683a075c84252b27 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"
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (37 preceding siblings ...)
2024-03-28 5:29 ` [PR PATCH] [Updated] " iFoundSilentHouse
@ 2024-03-28 5:33 ` iFoundSilentHouse
2024-03-31 4:54 ` [PR PATCH] [Updated] " iFoundSilentHouse
` (3 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-28 5:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 285 bytes --]
New comment by iFoundSilentHouse on void-packages repository
https://github.com/void-linux/void-packages/pull/49545#issuecomment-2024440907
Comment:
Added wesnoth developers' patch to fix musl instead of mine: https://github.com/wesnoth/wesnoth/pull/8649
This one is more accurate
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (38 preceding siblings ...)
2024-03-28 5:33 ` iFoundSilentHouse
@ 2024-03-31 4:54 ` iFoundSilentHouse
2024-05-18 16:36 ` [PR REVIEW] " classabbyamp
` (2 subsequent siblings)
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-03-31 4:54 UTC (permalink / raw)
To: ml
[-- 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: 7472 bytes --]
From 6e173f3d230be91488799a53f60622950ad2aa28 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/patches/000-fix-musl-build.patch | 34 +++++++++++++++++++
.../patches/001-disable-audio-test.patch | 25 ++++++++++++++
srcpkgs/wesnoth/patches/boost-1.83.0.patch | 26 --------------
srcpkgs/wesnoth/template | 7 ++--
4 files changed, 63 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..cb205e67d8b347
--- /dev/null
+++ b/srcpkgs/wesnoth/patches/000-fix-musl-build.patch
@@ -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);
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..34a5b431930dcf 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/raw/master/changelog.md"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=a60521b1ee1c2ddc7dfde89a038b893a4b43337085bd1478f4bc92dab7da7fc7
+checksum=2cdc75b97c3437e6490f1982c7938e87d5dcbe29ca8aed32a8d13b25e06939c0
replaces="wesnoth-data>=0"
CFLAGS="-UNDEBUG"
From d67d1be2f039ddf5a44cfbea5a458b140edb9f64 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"
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR REVIEW] wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (39 preceding siblings ...)
2024-03-31 4:54 ` [PR PATCH] [Updated] " iFoundSilentHouse
@ 2024-05-18 16:36 ` classabbyamp
2024-05-27 19:23 ` [PR PATCH] [Updated] " iFoundSilentHouse
2024-05-27 19:25 ` [PR REVIEW] " iFoundSilentHouse
42 siblings, 0 replies; 44+ messages in thread
From: classabbyamp @ 2024-05-18 16:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 243 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/49545#discussion_r1605815339
Comment:
why is this patch needed? add some context at the beginning of the patch explaining please
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR PATCH] [Updated] wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (40 preceding siblings ...)
2024-05-18 16:36 ` [PR REVIEW] " classabbyamp
@ 2024-05-27 19:23 ` iFoundSilentHouse
2024-05-27 19:25 ` [PR REVIEW] " iFoundSilentHouse
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-05-27 19:23 UTC (permalink / raw)
To: ml
[-- 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: 7629 bytes --]
From 2fabbdeb6c1764533c44f2368d9beeb30475486e 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/patches/000-fix-musl-build.patch | 34 +++++++++++++++++++
.../patches/001-disable-audio-test.patch | 28 +++++++++++++++
srcpkgs/wesnoth/patches/boost-1.83.0.patch | 26 --------------
srcpkgs/wesnoth/template | 7 ++--
4 files changed, 66 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..cb205e67d8b347
--- /dev/null
+++ b/srcpkgs/wesnoth/patches/000-fix-musl-build.patch
@@ -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);
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..2226cc7aa27c1d
--- /dev/null
+++ b/srcpkgs/wesnoth/patches/001-disable-audio-test.patch
@@ -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()
+
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..34a5b431930dcf 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/raw/master/changelog.md"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=a60521b1ee1c2ddc7dfde89a038b893a4b43337085bd1478f4bc92dab7da7fc7
+checksum=2cdc75b97c3437e6490f1982c7938e87d5dcbe29ca8aed32a8d13b25e06939c0
replaces="wesnoth-data>=0"
CFLAGS="-UNDEBUG"
From 28c5a50bf29310816e4bfce82fb9a2d7950b78ef 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"
^ permalink raw reply [flat|nested] 44+ messages in thread* Re: [PR REVIEW] wesnoth: update to 1.18.0.
2024-03-26 7:52 [PR PATCH] wesnoth: update to 1.18.0 iFoundSilentHouse
` (41 preceding siblings ...)
2024-05-27 19:23 ` [PR PATCH] [Updated] " iFoundSilentHouse
@ 2024-05-27 19:25 ` iFoundSilentHouse
42 siblings, 0 replies; 44+ messages in thread
From: iFoundSilentHouse @ 2024-05-27 19:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 192 bytes --]
New review comment by iFoundSilentHouse on void-packages repository
https://github.com/void-linux/void-packages/pull/49545#discussion_r1616342092
Comment:
Thank you for your attention. done
^ permalink raw reply [flat|nested] 44+ messages in thread