* [gentoo-commits] repo/gentoo:master commit in: games-strategy/wesnoth/, games-strategy/wesnoth/files/
@ 2020-11-15 20:03 David Seifert
0 siblings, 0 replies; 8+ messages in thread
From: David Seifert @ 2020-11-15 20:03 UTC (permalink / raw
To: gentoo-commits
commit: 79d173ed34da3b7669cbc945767a57df1f7d50e2
Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Sun Nov 15 20:02:56 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 15 20:02:56 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79d173ed
games-strategy/wesnoth: fix build without native-symlinks
Closes: https://bugs.gentoo.org/732096
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch | 14 ++++++++++++++
games-strategy/wesnoth/wesnoth-1.14.14.ebuild | 4 ++++
games-strategy/wesnoth/wesnoth-1.15.4.ebuild | 4 ++++
3 files changed, 22 insertions(+)
diff --git a/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch b/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch
new file mode 100644
index 00000000000..4a7c8cf41e7
--- /dev/null
+++ b/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch
@@ -0,0 +1,14 @@
+Leave default AR as is, https://bugs.gentoo.org/732096
+
+diff -r 419bf3de54e5 CMakeLists.txt
+--- a/CMakeLists.txt Sat Oct 24 19:50:25 2020 +0000
++++ b/CMakeLists.txt Sat Oct 24 19:50:53 2020 +0000
+@@ -390,8 +390,6 @@
+ MESSAGE("Using ar, ranlib, and default linker")
+ find_program(NON_LTO_AR NAMES ar)
+ find_program(NON_LTO_RANLIB NAMES ranlib)
+- set(CMAKE_AR "${NON_LTO_AR}" CACHE STRING "Does not support LTO" FORCE)
+- set(CMAKE_RANLIB "${NON_LTO_RANLIB}" CACHE STRING "Does not support LTO" FORCE)
+ endif()
+ MARK_AS_ADVANCED(LTO_AR LTO_RANLIB NON_LTO_AR NON_LTO_RANLIB)
+
diff --git a/games-strategy/wesnoth/wesnoth-1.14.14.ebuild b/games-strategy/wesnoth/wesnoth-1.14.14.ebuild
index 407e3840468..e259a887936 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.14.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.14.ebuild
@@ -46,6 +46,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}/wesnoth-1.14.14-ar.patch"
+)
+
src_prepare() {
cmake_src_prepare
diff --git a/games-strategy/wesnoth/wesnoth-1.15.4.ebuild b/games-strategy/wesnoth/wesnoth-1.15.4.ebuild
index 407e3840468..e259a887936 100644
--- a/games-strategy/wesnoth/wesnoth-1.15.4.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.15.4.ebuild
@@ -46,6 +46,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}/wesnoth-1.14.14-ar.patch"
+)
+
src_prepare() {
cmake_src_prepare
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/wesnoth/, games-strategy/wesnoth/files/
@ 2022-12-19 3:01 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2022-12-19 3:01 UTC (permalink / raw
To: gentoo-commits
commit: ae18d0e0a580c608851e25cc1515d8bc13fb1e98
Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be>
AuthorDate: Sun Dec 18 21:58:31 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 02:59:56 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae18d0e0
games-strategy/wesnoth: fix build with boost-1.81
Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be>
Closes: https://bugs.gentoo.org/886575
Closes: https://github.com/gentoo/gentoo/pull/28708
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../wesnoth-1.16.6-fix-build-with-boost-1.81.patch | 49 ++++++++++++++++++++++
games-strategy/wesnoth/wesnoth-1.16.6.ebuild | 2 +
2 files changed, 51 insertions(+)
diff --git a/games-strategy/wesnoth/files/wesnoth-1.16.6-fix-build-with-boost-1.81.patch b/games-strategy/wesnoth/files/wesnoth-1.16.6-fix-build-with-boost-1.81.patch
new file mode 100644
index 000000000000..785a5440cbbf
--- /dev/null
+++ b/games-strategy/wesnoth/files/wesnoth-1.16.6-fix-build-with-boost-1.81.patch
@@ -0,0 +1,49 @@
+https://bugs.gentoo.org/886575
+https://github.com/wesnoth/wesnoth/issues/7215
+
+From d71e90ee50a89673cf9b6748bcb2975071d15445 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Mon, 28 Nov 2022 23:21:38 +0700
+Subject: [PATCH] gettext: fix build with Boost.Locale 1.81
+
+See https://github.com/boostorg/locale/pull/128/
+
+(cherry picked from commit fd96415bdf0a2e3a05e1a587a1c3853847e2c2bc)
+--- a/src/gettext.cpp
++++ b/src/gettext.cpp
+@@ -26,6 +26,7 @@
+ #include <mutex>
+ #include <boost/locale.hpp>
+ #include <set>
++#include <type_traits>
+
+ #if defined(__GNUC__)
+ #pragma GCC diagnostic push
+@@ -224,8 +225,13 @@ namespace
+ }
+
+ generator_.use_ansi_encoding(false);
++#if BOOST_VERSION < 108100
+ generator_.categories(bl::message_facet | bl::information_facet | bl::collation_facet | bl::formatting_facet | bl::convert_facet);
+ generator_.characters(bl::char_facet);
++#else
++ generator_.categories(bl::category_t::message | bl::category_t::information | bl::category_t::collation | bl::category_t::formatting | bl::category_t::convert);
++ generator_.characters(bl::char_facet_t::char_f);
++#endif
+ // We cannot have current_locale_ be a non boost-generated locale since it might not supply
+ // the bl::info facet. As soon as we add message paths, update_locale_internal might fail,
+ // for example because of invalid .mo files. So make sure we call it at least once before adding paths/domains
+@@ -368,7 +374,12 @@ namespace
+ if(std::has_facet<bl::collator<char>>(current_locale_)) {
+ res << "has bl::collator<char> facet, ";
+ }
++#if BOOST_VERSION < 108100
+ res << "generator categories='" << generator_.categories() << "'";
++#else
++ res << "generator categories='" <<
++ static_cast<std::underlying_type<bl::category_t>::type>(generator_.categories()) << "'";
++#endif
+ return res.str();
+ }
+
diff --git a/games-strategy/wesnoth/wesnoth-1.16.6.ebuild b/games-strategy/wesnoth/wesnoth-1.16.6.ebuild
index 1ee6998e389d..ebb79a331120 100644
--- a/games-strategy/wesnoth/wesnoth-1.16.6.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.16.6.ebuild
@@ -43,6 +43,8 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=( "${FILESDIR}/wesnoth-1.16.6-fix-build-with-boost-1.81.patch" )
+
src_prepare() {
cmake_src_prepare
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/wesnoth/, games-strategy/wesnoth/files/
@ 2023-01-27 5:26 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2023-01-27 5:26 UTC (permalink / raw
To: gentoo-commits
commit: ad08b108753d55f6075c0a5cf6bd506f7b34ab4c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 27 04:55:27 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 27 05:23:34 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad08b108
games-strategy/wesnoth: add 1.16.8
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-strategy/wesnoth/Manifest | 1 +
.../wesnoth/files/wesnoth-1.16.8-gcc-13.patch | 32 +++++++
games-strategy/wesnoth/wesnoth-1.16.8.ebuild | 106 +++++++++++++++++++++
3 files changed, 139 insertions(+)
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index a621190038af..9cf9ac6ad743 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,2 +1,3 @@
DIST wesnoth-1.16.6.tar.gz 518250360 BLAKE2B 3fc5f5827beacc309a42d1d135eadefbace57866397eed4e3c5618ba6372ae31fc0350b2180c1323872ae59789ca67cd1b4a973c2257c7fac59508af93e0b758 SHA512 fcf9e50ce065f7c8d2b940eec88de27f18c3adbb9c7ae238bf6821eef233a45c2bdc7a58d5cd2abc4f37bcab6e503aa72d46f623c882c711d9f06b2826340bf5
+DIST wesnoth-1.16.8.tar.gz 518468407 BLAKE2B 9c224757e0d1727acc66a5421266fa6e050bb3727040b457379dd164097c88850f9b2d8b81422ff277548cb8cd51da70f5da63254c2c4ccedc3a45d1789c6037 SHA512 9e41e1c574c9744ba9818298d77df1503d7fc70ee24e4bf9d1f59ef17c2bc123f38f0aa21eddccce88cc28b62f2a2d12133ab25dd111655abf5b620f18457bf7
DIST wesnoth-1.17.11.tar.bz2 421068195 BLAKE2B 43106bb72c6b4a39b4995fb9804733e5420b636db08254e75e7698c58740b84a33c387194bf048247bddf1808f73d0d07b3816f18687390760fb5fab7c2d8449 SHA512 8208ae1c02d5e6a9fe50a2cf533d3b0b207151e5b877c98b003117641ae3c46ad31dbbe4bc46481f4f30382ae65b0183d7636452de5f6d42c8bd48d040f3dd5a
diff --git a/games-strategy/wesnoth/files/wesnoth-1.16.8-gcc-13.patch b/games-strategy/wesnoth/files/wesnoth-1.16.8-gcc-13.patch
new file mode 100644
index 000000000000..f2d79ba6ad06
--- /dev/null
+++ b/games-strategy/wesnoth/files/wesnoth-1.16.8-gcc-13.patch
@@ -0,0 +1,32 @@
+https://github.com/wesnoth/wesnoth/commit/5fa07ea15c1736f74d89786d5ae449ed0f91c8a8
+
+From 5fa07ea15c1736f74d89786d5ae449ed0f91c8a8 Mon Sep 17 00:00:00 2001
+From: Martin Liska <mliska@suse.cz>
+Date: Mon, 23 May 2022 13:44:39 +0200
+Subject: [PATCH] Fix building with GCC 13.
+
+Fixes the following issue:
+base64.hpp:23:49: error: 'uint8_t' was not declared in this scope
+
+and:
+deprecation.hpp:20:22: error: found ':' in nested-name-specifier, expected '::'
+--- a/src/deprecation.hpp
++++ b/src/deprecation.hpp
+@@ -14,6 +14,7 @@
+
+ #pragma once
+
++#include <cstdint>
+ #include <string>
+
+ /** See https://wiki.wesnoth.org/CompatibilityStandards for more info. */
+--- a/src/serialization/base64.hpp
++++ b/src/serialization/base64.hpp
+@@ -15,6 +15,7 @@
+
+ #pragma once
+
++#include <cstdint>
+ #include <string_view>
+ #include <vector>
+
diff --git a/games-strategy/wesnoth/wesnoth-1.16.8.ebuild b/games-strategy/wesnoth/wesnoth-1.16.8.ebuild
new file mode 100644
index 000000000000..7a0223c3d681
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.16.8.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+ https://github.com/wesnoth/wesnoth"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# uneven minor versions are development versions
+if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+IUSE="dbus dedicated doc nls server"
+
+RDEPEND="
+ acct-group/wesnoth
+ acct-user/wesnoth
+ dev-libs/boost:=[bzip2,context,icu,nls]
+ >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
+ !dedicated? (
+ dev-libs/glib:2
+ dev-libs/openssl:0=
+ >=media-libs/fontconfig-2.4.1
+ >=media-libs/sdl2-image-2.0.0[jpeg,png]
+ >=media-libs/sdl2-mixer-2.0.0[vorbis]
+ media-libs/libvorbis
+ >=x11-libs/pango-1.22.0
+ >=x11-libs/cairo-1.10.0
+ sys-libs/readline:0=
+ dbus? ( sys-apps/dbus )
+ )"
+DEPEND="${RDEPEND}
+ x11-libs/libX11
+"
+BDEPEND="
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.16.8-gcc-13.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ if ! use doc ; then
+ sed -i \
+ -e '/manual/d' \
+ doc/CMakeLists.txt || die
+ fi
+
+ # respect LINGUAS (bug #483316)
+ if [[ ${LINGUAS+set} ]] ; then
+ local lang langs=()
+ for lang in $(cat po/LINGUAS) ; do
+ has ${lang} ${LINGUAS} && langs+=( ${lang} )
+ done
+ echo "${langs[@]}" > po/LINGUAS || die
+ fi
+}
+
+src_configure() {
+ filter-flags -ftracer -fomit-frame-pointer
+
+ local mycmakeargs=()
+
+ if use dedicated || use server ; then
+ mycmakeargs+=(
+ -DENABLE_CAMPAIGN_SERVER="ON"
+ -DENABLE_SERVER="ON"
+ -DSERVER_UID="${PN}"
+ -DSERVER_GID="${PN}"
+ -DFIFO_DIR="/run/wesnothd"
+ )
+ else
+ mycmakeargs+=(
+ -DENABLE_CAMPAIGN_SERVER="OFF"
+ -DENABLE_SERVER="OFF"
+ )
+ fi
+ mycmakeargs+=(
+ -Wno-dev
+ -DENABLE_GAME="$(usex !dedicated)"
+ -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+ -DENABLE_NLS="$(usex nls)"
+ -DENABLE_NOTIFICATIONS="$(usex dbus)"
+ -DENABLE_STRICT_COMPILATION="OFF"
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ local DOCS=( README.md changelog.md )
+ cmake_src_install
+ if use dedicated || use server ; then
+ rmdir "${ED}"/run{/wesnothd,} || die
+ newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
+ fi
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/wesnoth/, games-strategy/wesnoth/files/
@ 2023-03-09 20:13 Ionen Wolkens
0 siblings, 0 replies; 8+ messages in thread
From: Ionen Wolkens @ 2023-03-09 20:13 UTC (permalink / raw
To: gentoo-commits
commit: 1529adff6983c98bc94b04f74c0cc0edbe8535ca
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 9 17:52:55 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Mar 9 20:12:42 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1529adff
games-strategy/wesnoth: drop 1.16.6
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-strategy/wesnoth/Manifest | 1 -
.../wesnoth-1.16.6-fix-build-with-boost-1.81.patch | 49 ----------
games-strategy/wesnoth/wesnoth-1.16.6.ebuild | 104 ---------------------
3 files changed, 154 deletions(-)
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 9cf9ac6ad743..899e199d0e98 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,3 +1,2 @@
-DIST wesnoth-1.16.6.tar.gz 518250360 BLAKE2B 3fc5f5827beacc309a42d1d135eadefbace57866397eed4e3c5618ba6372ae31fc0350b2180c1323872ae59789ca67cd1b4a973c2257c7fac59508af93e0b758 SHA512 fcf9e50ce065f7c8d2b940eec88de27f18c3adbb9c7ae238bf6821eef233a45c2bdc7a58d5cd2abc4f37bcab6e503aa72d46f623c882c711d9f06b2826340bf5
DIST wesnoth-1.16.8.tar.gz 518468407 BLAKE2B 9c224757e0d1727acc66a5421266fa6e050bb3727040b457379dd164097c88850f9b2d8b81422ff277548cb8cd51da70f5da63254c2c4ccedc3a45d1789c6037 SHA512 9e41e1c574c9744ba9818298d77df1503d7fc70ee24e4bf9d1f59ef17c2bc123f38f0aa21eddccce88cc28b62f2a2d12133ab25dd111655abf5b620f18457bf7
DIST wesnoth-1.17.11.tar.bz2 421068195 BLAKE2B 43106bb72c6b4a39b4995fb9804733e5420b636db08254e75e7698c58740b84a33c387194bf048247bddf1808f73d0d07b3816f18687390760fb5fab7c2d8449 SHA512 8208ae1c02d5e6a9fe50a2cf533d3b0b207151e5b877c98b003117641ae3c46ad31dbbe4bc46481f4f30382ae65b0183d7636452de5f6d42c8bd48d040f3dd5a
diff --git a/games-strategy/wesnoth/files/wesnoth-1.16.6-fix-build-with-boost-1.81.patch b/games-strategy/wesnoth/files/wesnoth-1.16.6-fix-build-with-boost-1.81.patch
deleted file mode 100644
index 785a5440cbbf..000000000000
--- a/games-strategy/wesnoth/files/wesnoth-1.16.6-fix-build-with-boost-1.81.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-https://bugs.gentoo.org/886575
-https://github.com/wesnoth/wesnoth/issues/7215
-
-From d71e90ee50a89673cf9b6748bcb2975071d15445 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Mon, 28 Nov 2022 23:21:38 +0700
-Subject: [PATCH] gettext: fix build with Boost.Locale 1.81
-
-See https://github.com/boostorg/locale/pull/128/
-
-(cherry picked from commit fd96415bdf0a2e3a05e1a587a1c3853847e2c2bc)
---- a/src/gettext.cpp
-+++ b/src/gettext.cpp
-@@ -26,6 +26,7 @@
- #include <mutex>
- #include <boost/locale.hpp>
- #include <set>
-+#include <type_traits>
-
- #if defined(__GNUC__)
- #pragma GCC diagnostic push
-@@ -224,8 +225,13 @@ namespace
- }
-
- generator_.use_ansi_encoding(false);
-+#if BOOST_VERSION < 108100
- generator_.categories(bl::message_facet | bl::information_facet | bl::collation_facet | bl::formatting_facet | bl::convert_facet);
- generator_.characters(bl::char_facet);
-+#else
-+ generator_.categories(bl::category_t::message | bl::category_t::information | bl::category_t::collation | bl::category_t::formatting | bl::category_t::convert);
-+ generator_.characters(bl::char_facet_t::char_f);
-+#endif
- // We cannot have current_locale_ be a non boost-generated locale since it might not supply
- // the bl::info facet. As soon as we add message paths, update_locale_internal might fail,
- // for example because of invalid .mo files. So make sure we call it at least once before adding paths/domains
-@@ -368,7 +374,12 @@ namespace
- if(std::has_facet<bl::collator<char>>(current_locale_)) {
- res << "has bl::collator<char> facet, ";
- }
-+#if BOOST_VERSION < 108100
- res << "generator categories='" << generator_.categories() << "'";
-+#else
-+ res << "generator categories='" <<
-+ static_cast<std::underlying_type<bl::category_t>::type>(generator_.categories()) << "'";
-+#endif
- return res.str();
- }
-
diff --git a/games-strategy/wesnoth/wesnoth-1.16.6.ebuild b/games-strategy/wesnoth/wesnoth-1.16.6.ebuild
deleted file mode 100644
index f8edac88d9d7..000000000000
--- a/games-strategy/wesnoth/wesnoth-1.16.6.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
- https://github.com/wesnoth/wesnoth"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# uneven minor versions are development versions
-if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-IUSE="dbus dedicated doc nls server"
-
-RDEPEND="
- acct-group/wesnoth
- acct-user/wesnoth
- dev-libs/boost:=[bzip2,context,icu,nls]
- >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
- !dedicated? (
- dev-libs/glib:2
- dev-libs/openssl:0=
- >=media-libs/fontconfig-2.4.1
- >=media-libs/sdl2-image-2.0.0[jpeg,png]
- >=media-libs/sdl2-mixer-2.0.0[vorbis]
- media-libs/libvorbis
- >=x11-libs/pango-1.22.0
- >=x11-libs/cairo-1.10.0
- sys-libs/readline:0=
- dbus? ( sys-apps/dbus )
- )"
-DEPEND="${RDEPEND}
- x11-libs/libX11
-"
-BDEPEND="
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-build-with-boost-1.81.patch )
-
-src_prepare() {
- cmake_src_prepare
-
- if ! use doc ; then
- sed -i \
- -e '/manual/d' \
- doc/CMakeLists.txt || die
- fi
-
- # respect LINGUAS (bug #483316)
- if [[ ${LINGUAS+set} ]] ; then
- local lang langs=()
- for lang in $(cat po/LINGUAS) ; do
- has ${lang} ${LINGUAS} && langs+=( ${lang} )
- done
- echo "${langs[@]}" > po/LINGUAS || die
- fi
-}
-
-src_configure() {
- filter-flags -ftracer -fomit-frame-pointer
-
- local mycmakeargs=()
-
- if use dedicated || use server ; then
- mycmakeargs+=(
- -DENABLE_CAMPAIGN_SERVER="ON"
- -DENABLE_SERVER="ON"
- -DSERVER_UID="${PN}"
- -DSERVER_GID="${PN}"
- -DFIFO_DIR="/run/wesnothd"
- )
- else
- mycmakeargs+=(
- -DENABLE_CAMPAIGN_SERVER="OFF"
- -DENABLE_SERVER="OFF"
- )
- fi
- mycmakeargs+=(
- -Wno-dev
- -DENABLE_GAME="$(usex !dedicated)"
- -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
- -DENABLE_NLS="$(usex nls)"
- -DENABLE_NOTIFICATIONS="$(usex dbus)"
- -DENABLE_STRICT_COMPILATION="OFF"
- )
- cmake_src_configure
-}
-
-src_install() {
- local DOCS=( README.md changelog.md )
- cmake_src_install
- if use dedicated || use server ; then
- rmdir "${ED}"/run{/wesnothd,} || die
- newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
- fi
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/wesnoth/, games-strategy/wesnoth/files/
@ 2023-08-24 14:35 Pacho Ramos
0 siblings, 0 replies; 8+ messages in thread
From: Pacho Ramos @ 2023-08-24 14:35 UTC (permalink / raw
To: gentoo-commits
commit: 71e03c5df298be999546115390312bb25314bef0
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 24 14:32:23 2023 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Aug 24 14:35:07 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71e03c5d
games-strategy/wesnoth: Apply patch fixing boost-1.83 compat
Thanks-to: solpeth
Closes: https://github.com/gentoo/gentoo/pull/32415
Closes: https://bugs.gentoo.org/912385
Closes: https://bugs.gentoo.org/912968
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
.../wesnoth/files/wesnoth-1.16.10-boost-1.83.patch | 26 ++++++++++++++++++++++
games-strategy/wesnoth/wesnoth-1.16.10.ebuild | 4 ++++
2 files changed, 30 insertions(+)
diff --git a/games-strategy/wesnoth/files/wesnoth-1.16.10-boost-1.83.patch b/games-strategy/wesnoth/files/wesnoth-1.16.10-boost-1.83.patch
new file mode 100644
index 000000000000..2c9e55db0472
--- /dev/null
+++ b/games-strategy/wesnoth/files/wesnoth-1.16.10-boost-1.83.patch
@@ -0,0 +1,26 @@
+From 136e651d69fc91fa7a4154f8a4a7e977cc46eca4 Mon Sep 17 00:00:00 2001
+From: Pentarctagon <pentarctagon@tutamail.com>
+Date: Thu, 17 Aug 2023 23:19:21 -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 9888dede35ad..fa9b17ba85b2 100644
+--- a/src/gettext.cpp
++++ b/src/gettext.cpp
+@@ -169,7 +169,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/games-strategy/wesnoth/wesnoth-1.16.10.ebuild b/games-strategy/wesnoth/wesnoth-1.16.10.ebuild
index d3d826ea899c..cb9bc76bf65d 100644
--- a/games-strategy/wesnoth/wesnoth-1.16.10.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.16.10.ebuild
@@ -43,6 +43,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.16.10-boost-1.83.patch #912385
+)
+
src_prepare() {
cmake_src_prepare
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/wesnoth/, games-strategy/wesnoth/files/
@ 2024-05-28 1:45 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2024-05-28 1:45 UTC (permalink / raw
To: gentoo-commits
commit: 768f7595d58ed27e21fea815a52c5ca20c21410a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 28 01:41:33 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 28 01:41:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=768f7595
games-strategy/wesnoth: fix build w/ boost-1.85
Closes: https://bugs.gentoo.org/932255
Thanks-to: Marcin Deranek <marcin.deranek <AT> slonko.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-strategy/wesnoth/files/wesnoth-1.18.0-boost-1.85.patch | 12 ++++++++++++
games-strategy/wesnoth/wesnoth-1.18.0.ebuild | 4 ++++
2 files changed, 16 insertions(+)
diff --git a/games-strategy/wesnoth/files/wesnoth-1.18.0-boost-1.85.patch b/games-strategy/wesnoth/files/wesnoth-1.18.0-boost-1.85.patch
new file mode 100644
index 000000000000..412a4cf8e39d
--- /dev/null
+++ b/games-strategy/wesnoth/files/wesnoth-1.18.0-boost-1.85.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/932255
+--- a/src/filesystem.cpp
++++ b/src/filesystem.cpp
+@@ -30,6 +30,7 @@
+ #include "serialization/unicode.hpp"
+ #include "utils/general.hpp"
+
++#include <boost/filesystem/directory.hpp>
+ #include <boost/filesystem/fstream.hpp>
+ #include <boost/iostreams/device/file_descriptor.hpp>
+ #include <boost/iostreams/stream.hpp>
+
diff --git a/games-strategy/wesnoth/wesnoth-1.18.0.ebuild b/games-strategy/wesnoth/wesnoth-1.18.0.ebuild
index ba33c9b827a8..1843a5985958 100644
--- a/games-strategy/wesnoth/wesnoth-1.18.0.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.18.0.ebuild
@@ -43,6 +43,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/wesnoth-1.18.0-boost-1.85.patch
+)
+
src_prepare() {
cmake_src_prepare
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/wesnoth/, games-strategy/wesnoth/files/
@ 2025-05-15 9:50 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2025-05-15 9:50 UTC (permalink / raw
To: gentoo-commits
commit: 6cc04e3a11fb080eb32634898c28f78981376219
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 15 08:56:25 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 15 09:49:41 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cc04e3a
games-strategy/wesnoth: add 1.18.4
... and conditionally build tests.
Closes: https://bugs.gentoo.org/955590
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-strategy/wesnoth/Manifest | 1 +
.../wesnoth/files/wesnoth-1.18.4-boost-1.88.patch | 72 +++++++++++++
games-strategy/wesnoth/wesnoth-1.18.4.ebuild | 114 +++++++++++++++++++++
3 files changed, 187 insertions(+)
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index e55a0d66875a..49f39d1369e1 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,2 +1,3 @@
DIST wesnoth-1.18.3.tar.bz2 461694247 BLAKE2B 1998e2fdff56271dd86c390e3c25dcbaa98b4f131f15584e5d3f2f5866856a69aebf9c8d97b1126601b3e08467a9410f3ba7b53c253737c6bbf62ccb1e9ba96f SHA512 def324c9ed66ac59e2a9d0ab9ab95f00ddab2d31dacb2d0b5cfba42c5acdba210937f7dd6afde8870a387847a6d021a28dffcb04ce513272df6a4b52a626f30a
+DIST wesnoth-1.18.4.tar.bz2 461847477 BLAKE2B ebeae7c50c3583a16744ad7e36e2330b8babfd323cc152a9001e3f11018447ada64d070506c5d5ebaa2b9041861dc81680354b4f3d55b4eb118f887b4ff5a4f6 SHA512 c86538dae0c5d8c0c7270ab8e13ca2a5b9b6ff44e84789bc803d2135615e55dfdd34fd6b56f325f448940fcc396d884c533d067312b988b27c155157068db3bc
DIST wesnoth-1.19.10.tar.bz2 546744036 BLAKE2B a80fb0bf5b46f3021d4b05d3d4f5aebd3895131dfec14aa9e42cfa12eefaa43d250e09d47d8e21946693366ad1e043188106508013158d39febf1c3708c08d78 SHA512 ed3400053ba3901c450fa9930de27ef0dc4e34c4b1b8b83b60f1ba2547061eb69529ebbee390cd9c471bfff5d11a8aa9a5b67b11339416e52f8269822592f5e9
diff --git a/games-strategy/wesnoth/files/wesnoth-1.18.4-boost-1.88.patch b/games-strategy/wesnoth/files/wesnoth-1.18.4-boost-1.88.patch
new file mode 100644
index 000000000000..6a01897362cd
--- /dev/null
+++ b/games-strategy/wesnoth/files/wesnoth-1.18.4-boost-1.88.patch
@@ -0,0 +1,72 @@
+https://bugs.gentoo.org/955590
+https://github.com/wesnoth/wesnoth/issues/10174
+https://github.com/wesnoth/wesnoth/pull/10202
+
+From ce4f4077494e51ce95d5061582e1be53967d1a07 Mon Sep 17 00:00:00 2001
+From: Gunter Labes <soliton@wesnoth.org>
+Date: Wed, 14 May 2025 21:36:42 +0200
+Subject: [PATCH] Handle boost process defaulting to v2 and add missing include
+
+---
+ src/filesystem.cpp | 10 ++++++++--
+ src/game_launcher.cpp | 12 +++++++++---
+ 2 files changed, 17 insertions(+), 5 deletions(-)
+
+diff --git a/src/filesystem.cpp b/src/filesystem.cpp
+index ab9672a1f7707..bf647d1d3cdcd 100644
+--- a/src/filesystem.cpp
++++ b/src/filesystem.cpp
+@@ -23,6 +23,7 @@
+
+ #include "config.hpp"
+ #include "deprecation.hpp"
++#include "game_config_view.hpp"
+ #include "gettext.hpp"
+ #include "log.hpp"
+ #include "serialization/base64.hpp"
+@@ -30,12 +31,17 @@
+ #include "serialization/unicode.hpp"
+ #include "utils/general.hpp"
+
++#include <boost/algorithm/string/replace.hpp>
+ #include <boost/filesystem.hpp>
+ #include <boost/filesystem/fstream.hpp>
+ #include <boost/iostreams/device/file_descriptor.hpp>
+ #include <boost/iostreams/stream.hpp>
+-#include <boost/process.hpp>
+-#include "game_config_view.hpp"
++#if BOOST_VERSION >= 108800 // v2 is now default
++# define BOOST_PROCESS_VERSION 1
++# include <boost/process/v1/search_path.hpp>
++#else
++# include <boost/process.hpp>
++#endif
+
+ #ifdef _WIN32
+ #include <boost/locale.hpp>
+diff --git a/src/game_launcher.cpp b/src/game_launcher.cpp
+index 42a6f193fbab0..85f937073f5b8 100644
+--- a/src/game_launcher.cpp
++++ b/src/game_launcher.cpp
+@@ -57,11 +57,17 @@
+ #include "wesnothd_connection_error.hpp"
+ #include "wml_exception.hpp" // for wml_exception
+
+-#include <algorithm> // for copy, max, min, stable_sort
+ #ifdef _WIN32
+-#include <boost/process/windows.hpp>
++# include <boost/process/windows.hpp>
++#endif
++#if BOOST_VERSION >= 108800 // v2 is now default
++# define BOOST_PROCESS_VERSION 1
++# include <boost/process/v1/child.hpp>
++#else
++# include <boost/process.hpp>
+ #endif
+-#include <boost/process.hpp>
++
++#include <algorithm> // for copy, max, min, stable_sort
+ #include <cstdlib> // for system
+ #include <new>
+ #include <utility> // for pair
+
diff --git a/games-strategy/wesnoth/wesnoth-1.18.4.ebuild b/games-strategy/wesnoth/wesnoth-1.18.4.ebuild
new file mode 100644
index 000000000000..17707fec3651
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.18.4.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="https://www.wesnoth.org
+ https://github.com/wesnoth/wesnoth"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+# uneven minor versions are development versions
+if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+IUSE="dbus dedicated doc nls server test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ acct-group/wesnoth
+ acct-user/wesnoth
+ dev-libs/boost:=[bzip2,context,icu,nls]
+ >=media-libs/libsdl2-2.0.10:0[joystick,video,X]
+ !dedicated? (
+ dev-libs/glib:2
+ dev-libs/openssl:0=
+ >=media-libs/fontconfig-2.4.1
+ >=media-libs/sdl2-image-2.0.0[jpeg,png,webp]
+ >=media-libs/sdl2-mixer-2.0.0[vorbis]
+ media-libs/libvorbis
+ >=x11-libs/pango-1.22.0
+ >=x11-libs/cairo-1.10.0
+ sys-libs/readline:0=
+ dbus? ( sys-apps/dbus )
+ )"
+DEPEND="${RDEPEND}
+ x11-libs/libX11
+"
+BDEPEND="
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.18.3-gcc15.patch
+ "${FILESDIR}"/${PN}-1.18.4-boost-1.88.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ if ! use doc ; then
+ sed -i \
+ -e '/manual/d' \
+ doc/CMakeLists.txt || die
+ fi
+
+ # respect LINGUAS (bug #483316)
+ if [[ ${LINGUAS+set} ]] ; then
+ local lang langs=()
+ for lang in $(cat po/LINGUAS) ; do
+ has ${lang} ${LINGUAS} && langs+=( ${lang} )
+ done
+ echo "${langs[@]}" > po/LINGUAS || die
+ fi
+}
+
+src_configure() {
+ filter-flags -ftracer -fomit-frame-pointer
+
+ local mycmakeargs=()
+
+ if use dedicated || use server ; then
+ mycmakeargs+=(
+ -DENABLE_CAMPAIGN_SERVER="ON"
+ -DENABLE_SERVER="ON"
+ -DSERVER_UID="${PN}"
+ -DSERVER_GID="${PN}"
+ -DFIFO_DIR="/run/wesnothd"
+ )
+ else
+ mycmakeargs+=(
+ -DENABLE_CAMPAIGN_SERVER="OFF"
+ -DENABLE_SERVER="OFF"
+ )
+ fi
+ mycmakeargs+=(
+ -Wno-dev
+ -DENABLE_GAME="$(usex !dedicated)"
+ -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+ -DENABLE_NLS="$(usex nls)"
+ -DENABLE_NOTIFICATIONS="$(usex dbus)"
+ -DENABLE_STRICT_COMPILATION="OFF"
+ -DENABLE_TESTS="$(usex test)"
+ )
+ cmake_src_configure
+}
+
+src_test() {
+ # Allow SDL_Mixer test to pass, bug #931551
+ SDL_AUDIODRIVER=dummy cmake_src_test
+}
+
+src_install() {
+ local DOCS=( README.md changelog.md )
+ cmake_src_install
+ if use dedicated || use server ; then
+ rmdir "${ED}"/run{/wesnothd,} || die
+ newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
+ fi
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/wesnoth/, games-strategy/wesnoth/files/
@ 2025-05-15 9:50 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2025-05-15 9:50 UTC (permalink / raw
To: gentoo-commits
commit: c4bcc9a34229e27ca9d6f000654bbfbea263e8e0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 15 09:46:38 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 15 09:49:42 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4bcc9a3
games-strategy/wesnoth: add 1.19.11
... and conditionally build tests.
Closes: https://bugs.gentoo.org/941781
Closes: https://bugs.gentoo.org/955590
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-strategy/wesnoth/Manifest | 1 +
.../wesnoth/files/wesnoth-1.19.11-boost-1.88.patch | 456 +++++++++++++++++++++
games-strategy/wesnoth/wesnoth-1.19.11.ebuild | 113 +++++
3 files changed, 570 insertions(+)
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 49f39d1369e1..f9590d989662 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,3 +1,4 @@
DIST wesnoth-1.18.3.tar.bz2 461694247 BLAKE2B 1998e2fdff56271dd86c390e3c25dcbaa98b4f131f15584e5d3f2f5866856a69aebf9c8d97b1126601b3e08467a9410f3ba7b53c253737c6bbf62ccb1e9ba96f SHA512 def324c9ed66ac59e2a9d0ab9ab95f00ddab2d31dacb2d0b5cfba42c5acdba210937f7dd6afde8870a387847a6d021a28dffcb04ce513272df6a4b52a626f30a
DIST wesnoth-1.18.4.tar.bz2 461847477 BLAKE2B ebeae7c50c3583a16744ad7e36e2330b8babfd323cc152a9001e3f11018447ada64d070506c5d5ebaa2b9041861dc81680354b4f3d55b4eb118f887b4ff5a4f6 SHA512 c86538dae0c5d8c0c7270ab8e13ca2a5b9b6ff44e84789bc803d2135615e55dfdd34fd6b56f325f448940fcc396d884c533d067312b988b27c155157068db3bc
DIST wesnoth-1.19.10.tar.bz2 546744036 BLAKE2B a80fb0bf5b46f3021d4b05d3d4f5aebd3895131dfec14aa9e42cfa12eefaa43d250e09d47d8e21946693366ad1e043188106508013158d39febf1c3708c08d78 SHA512 ed3400053ba3901c450fa9930de27ef0dc4e34c4b1b8b83b60f1ba2547061eb69529ebbee390cd9c471bfff5d11a8aa9a5b67b11339416e52f8269822592f5e9
+DIST wesnoth-1.19.11.tar.bz2 547541350 BLAKE2B d1b82cdcfdb15a0a5ac3648a94fb85aee9e2aabdff306c5fb9e19ae2411423e74c6c0218a3d09c66b718371c46bb4a76dd40512b2ead484cc3410fb7980092b7 SHA512 0f782c61c9f2f2193b1462768742488229b93bc95772ad8e434583f605dbed95ab0ccf39f3fc3a39ad35970f3dad84e318f543180795ad3b04c6e6765bfc3d70
diff --git a/games-strategy/wesnoth/files/wesnoth-1.19.11-boost-1.88.patch b/games-strategy/wesnoth/files/wesnoth-1.19.11-boost-1.88.patch
new file mode 100644
index 000000000000..c54c82d217b1
--- /dev/null
+++ b/games-strategy/wesnoth/files/wesnoth-1.19.11-boost-1.88.patch
@@ -0,0 +1,456 @@
+https://bugs.gentoo.org/955590
+https://github.com/wesnoth/wesnoth/issues/10174
+https://github.com/wesnoth/wesnoth/commit/1fa291599cf6fc869799aeaa7d5bdf1f5db7ee76
+https://github.com/wesnoth/wesnoth/pull/10175
+
+From 1fa291599cf6fc869799aeaa7d5bdf1f5db7ee76 Mon Sep 17 00:00:00 2001
+From: smokespren <smokespren@protonmail.com>
+Date: Sat, 3 May 2025 18:00:55 -0400
+Subject: [PATCH] Fixed CMake build failure due to dependency on Boost CharConv
+ (#10167)
+
+---
+ CMakeLists.txt | 13 ++++++++-----
+ src/CMakeLists.txt | 37 ++++---------------------------------
+ 2 files changed, 12 insertions(+), 38 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7ec8fdf8433f3..661daf5a192c6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -53,6 +53,14 @@ option(ENABLE_TESTS "Build unit tests")
+ option(ENABLE_NLS "Enable building of translations" ${ENABLE_GAME})
+
+ set(BOOST_VERSION "1.70")
++set(BOOST_REQ_COMPONENTS iostreams program_options regex system thread random coroutine locale filesystem graph)
++
++if(ENABLE_TESTS)
++ list(APPEND BOOST_REQ_COMPONENTS unit_test_framework)
++endif()
++
++find_package(Boost ${BOOST_VERSION} REQUIRED CONFIG COMPONENTS ${BOOST_REQ_COMPONENTS}
++ OPTIONAL_COMPONENTS charconv)
+
+ if(NOT WIN32)
+ set(Lua_FIND_VERSION_MAJOR 5)
+@@ -93,7 +101,6 @@ if(APPLE)
+ find_library(SECURITY_LIBRARY Security REQUIRED)
+ endif()
+
+-find_package(Boost ${BOOST_VERSION} REQUIRED CONFIG COMPONENTS iostreams program_options regex system thread random coroutine locale filesystem graph)
+ find_package(ICU REQUIRED COMPONENTS data i18n uc)
+
+ # no, gettext executables are not required when NLS is deactivated
+@@ -551,10 +558,6 @@ if(ENABLE_GAME OR ENABLE_TESTS)
+ pkg_check_modules(LIBREADLINE readline)
+ endif()
+
+-if(ENABLE_TESTS)
+- find_package(Boost ${BOOST_VERSION} REQUIRED CONFIG COMPONENTS unit_test_framework)
+-endif()
+-
+ if(ENABLE_GAME)
+ if(ENABLE_NOTIFICATIONS)
+ pkg_check_modules(LIBDBUS dbus-1)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index c3a2c52d7412b..65a9929088275 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -218,14 +218,7 @@ if(ENABLE_GAME)
+ ${game-external-libs}
+ OpenSSL::Crypto
+ OpenSSL::SSL
+- Boost::iostreams
+- Boost::program_options
+- Boost::regex
+- Boost::system
+- Boost::random
+- Boost::coroutine
+- Boost::locale
+- Boost::filesystem
++ ${Boost_LIBRARIES}
+ Fontconfig::Fontconfig
+ SDL2::SDL2
+ SDL2::SDL2main
+@@ -264,15 +257,7 @@ if(ENABLE_TESTS)
+ ${game-external-libs}
+ OpenSSL::Crypto
+ OpenSSL::SSL
+- Boost::iostreams
+- Boost::program_options
+- Boost::regex
+- Boost::system
+- Boost::random
+- Boost::coroutine
+- Boost::locale
+- Boost::filesystem
+- Boost::unit_test_framework
++ ${Boost_LIBRARIES}
+ Fontconfig::Fontconfig
+ SDL2::SDL2
+ SDL2::SDL2main
+@@ -313,14 +298,7 @@ if(ENABLE_SERVER)
+ ${MYSQL_LIBS}
+ OpenSSL::Crypto
+ OpenSSL::SSL
+- Boost::iostreams
+- Boost::program_options
+- Boost::regex
+- Boost::system
+- Boost::random
+- Boost::coroutine
+- Boost::locale
+- Boost::filesystem
++ ${Boost_LIBRARIES}
+ )
+ if(MSVC)
+ target_link_options(wesnothd PRIVATE /WX)
+@@ -354,14 +332,7 @@ if(ENABLE_CAMPAIGN_SERVER)
+ ${MYSQL_LIBS}
+ OpenSSL::Crypto
+ OpenSSL::SSL
+- Boost::iostreams
+- Boost::program_options
+- Boost::regex
+- Boost::system
+- Boost::random
+- Boost::coroutine
+- Boost::locale
+- Boost::filesystem
++ ${Boost_LIBRARIES}
+ )
+ if(MSVC)
+ target_link_options(campaignd PRIVATE /WX)
+
+From e2117f08e1e08130edfce513808af30e598e61c5 Mon Sep 17 00:00:00 2001
+From: Charles Dang <exodia339@gmail.com>
+Date: Sat, 3 May 2025 18:08:22 -0400
+Subject: [PATCH 1/3] Use boost::process::v2 on 1.81 and later
+
+Except on MacOS, since MacCompileStuff needs to be updated manually...
+---
+ CMakeLists.txt | 2 +-
+ SConstruct | 3 ++
+ packaging/flatpak/org.wesnoth.Wesnoth.json | 2 +-
+ src/filesystem.cpp | 31 +++++++++---
+ src/game_launcher.cpp | 48 ++++++++++++++++---
+ utils/dockerbuilds/CI/Dockerfile-base-steamrt | 2 +-
+ 6 files changed, 71 insertions(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 661daf5a192c6..d4cd4806feb06 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -60,7 +60,7 @@ if(ENABLE_TESTS)
+ endif()
+
+ find_package(Boost ${BOOST_VERSION} REQUIRED CONFIG COMPONENTS ${BOOST_REQ_COMPONENTS}
+- OPTIONAL_COMPONENTS charconv)
++ OPTIONAL_COMPONENTS charconv process)
+
+ if(NOT WIN32)
+ set(Lua_FIND_VERSION_MAJOR 5)
+diff --git a/SConstruct b/SConstruct
+index c177f51f02d8c..acca9d2251f74 100755
+--- a/SConstruct
++++ b/SConstruct
+@@ -397,6 +397,9 @@ if env["prereqs"]:
+ conf.CheckBoostLocaleBackends(["icu", "winapi"]) \
+ or Warning("Only icu and winapi backends of Boost Locale are supported. Bugs/crashes are very likely with other backends")
+
++ # Allowed to fail. We only need to link against process when using the v2 API
++ conf.CheckBoost("process", require_version = boost_version)
++
+ if env['harden']:
+ env["have_fortify"] = conf.CheckFortifySource()
+
+diff --git a/packaging/flatpak/org.wesnoth.Wesnoth.json b/packaging/flatpak/org.wesnoth.Wesnoth.json
+index 95275e2bed997..7aba34c87bbb7 100644
+--- a/packaging/flatpak/org.wesnoth.Wesnoth.json
++++ b/packaging/flatpak/org.wesnoth.Wesnoth.json
+@@ -54,7 +54,7 @@
+ }
+ ],
+ "build-commands":[
+- "./bootstrap.sh --prefix=/app --with-libraries=filesystem,locale,iostreams,program_options,regex,random,thread,coroutine,context,graph,charconv",
++ "./bootstrap.sh --prefix=/app --with-libraries=filesystem,locale,iostreams,process,program_options,regex,random,thread,coroutine,context,graph,charconv",
+ "./b2 -j$FLATPAK_BUILDER_N_JOBS install cxxflags='-fPIE -fstack-protector-strong' define=_FORTIFY_SOURCE=2 link=static variant=release address-model=64 --layout=system"
+ ]
+ },
+diff --git a/src/filesystem.cpp b/src/filesystem.cpp
+index d52adc2cc51d3..adfe361ceb613 100644
+--- a/src/filesystem.cpp
++++ b/src/filesystem.cpp
+@@ -22,6 +22,7 @@
+ #include "filesystem.hpp"
+
+ #include "config.hpp"
++#include "game_config_view.hpp"
+ #include "gettext.hpp"
+ #include "log.hpp"
+ #include "serialization/base64.hpp"
+@@ -31,13 +32,22 @@
+ #include "utils/general.hpp"
+
+ #include <boost/algorithm/string/predicate.hpp>
++#include <boost/algorithm/string/replace.hpp>
+ #include <boost/filesystem.hpp>
+ #include <boost/filesystem/fstream.hpp>
+ #include <boost/format.hpp>
+ #include <boost/iostreams/device/file_descriptor.hpp>
+ #include <boost/iostreams/stream.hpp>
+-#include <boost/process.hpp>
+-#include "game_config_view.hpp"
++
++#if !defined(_WIN32) && !defined(__APPLE__)
++
++#if BOOST_VERSION >= 108100
++#include <boost/process/v2/environment.hpp>
++#else
++#include <boost/process/search_path.hpp>
++#endif
++
++#endif
+
+ #ifdef _WIN32
+ #include <boost/locale.hpp>
+@@ -78,7 +88,6 @@ static lg::log_domain log_filesystem("filesystem");
+ #define WRN_FS LOG_STREAM(warn, log_filesystem)
+ #define ERR_FS LOG_STREAM(err, log_filesystem)
+
+-namespace bp = boost::process;
+ namespace bfs = boost::filesystem;
+ using boost::system::error_code;
+
+@@ -1012,15 +1021,23 @@ std::string get_exe_path()
+ // with version
+ std::string version = std::to_string(game_config::wesnoth_version.major_version()) + "." + std::to_string(game_config::wesnoth_version.minor_version());
+ std::string exe = filesystem::get_program_invocation("wesnoth-"+version);
+- bfs::path search = bp::search_path(exe).string();
+- if(!search.string().empty()) {
++#if BOOST_VERSION >= 108600
++ bfs::path search = boost::process::v2::environment::find_executable(exe);
++#else
++ bfs::path search = boost::process::search_path(exe);
++#endif
++ if(!search.empty()) {
+ return search.string();
+ }
+
+ // versionless
+ exe = filesystem::get_program_invocation("wesnoth");
+- search = bp::search_path(exe).string();
+- if(!search.string().empty()) {
++#if BOOST_VERSION >= 108600
++ search = boost::process::v2::environment::find_executable(exe);
++#else
++ search = boost::process::search_path(exe);
++#endif
++ if(!search.empty()) {
+ return search.string();
+ }
+
+diff --git a/src/game_launcher.cpp b/src/game_launcher.cpp
+index 0943ad15c3664..9f1106b89af71 100644
+--- a/src/game_launcher.cpp
++++ b/src/game_launcher.cpp
+@@ -50,11 +50,38 @@
+ #include "wesnothd_connection_error.hpp"
+ #include "wml_exception.hpp" // for wml_exception
+
+-#include <algorithm> // for copy, max, min, stable_sort
++#ifdef __APPLE__
++
++//
++// HACK: MacCompileStuff is currently on 1.86, so it could use the v2 API,
++// but we need to update the libs manually to link against boost::process.
++//
++// -- vultraz, 2025-05-12
++//
++#if BOOST_VERSION > 108600
++#error MacCompileStuff has been updated. Remove this block and the accompanying __APPLE__ checks below.
++#endif
++#include <boost/process/v1/child.hpp>
++
++#elif BOOST_VERSION >= 108100
++
++// boost::asio (via boost::process) complains about winsock.h otherwise
++#ifdef _WIN32
++#define WIN32_LEAN_AND_MEAN
++#endif
++#include <boost/process/v2/process.hpp>
++
++#else
++
++// process::v1 only. The v1 folders do not exist until 1.86
+ #ifdef _WIN32
+ #include <boost/process/windows.hpp>
+ #endif
+-#include <boost/process.hpp>
++#include <boost/process/child.hpp>
++
++#endif
++
++#include <algorithm> // for copy, max, min, stable_sort
+ #include <cstdlib> // for system
+ #include <new>
+ #include <thread>
+@@ -85,8 +112,6 @@ static lg::log_domain log_network("network");
+ static lg::log_domain log_enginerefac("enginerefac");
+ #define LOG_RG LOG_STREAM(info, log_enginerefac)
+
+-namespace bp = boost::process;
+-
+ game_launcher::game_launcher(const commandline_options& cmdline_opts)
+ : cmdline_opts_(cmdline_opts)
+ , font_manager_()
+@@ -783,10 +808,15 @@ void game_launcher::start_wesnothd()
+ LOG_GENERAL << "Starting wesnothd";
+ try
+ {
++#if !defined(__APPLE__) && BOOST_VERSION >= 108100
++ boost::asio::io_context io_context;
++ auto c = boost::process::v2::process{io_context, wesnothd_program, { "-c", config }};
++#else
+ #ifndef _WIN32
+- bp::child c(wesnothd_program, "-c", config);
++ boost::process::child c(wesnothd_program, "-c", config);
+ #else
+- bp::child c(wesnothd_program, "-c", config, bp::windows::create_no_window);
++ boost::process::child c(wesnothd_program, "-c", config, boost::process::windows::create_no_window);
++#endif
+ #endif
+ c.detach();
+ // Give server a moment to start up
+@@ -794,7 +824,11 @@ void game_launcher::start_wesnothd()
+ std::this_thread::sleep_for(50ms);
+ return;
+ }
+- catch(const bp::process_error& e)
++#if defined(__APPLE__) || BOOST_VERSION < 108100
++ catch(const boost::process::process_error& e)
++#else
++ catch(const std::exception& e)
++#endif
+ {
+ prefs::get().set_mp_server_program_name("");
+
+diff --git a/utils/dockerbuilds/CI/Dockerfile-base-steamrt b/utils/dockerbuilds/CI/Dockerfile-base-steamrt
+index b872942a5790b..cc7ca1d66ec30 100644
+--- a/utils/dockerbuilds/CI/Dockerfile-base-steamrt
++++ b/utils/dockerbuilds/CI/Dockerfile-base-steamrt
+@@ -10,7 +10,7 @@ RUN apt-get install -y scons meson libreadline-dev expect-dev
+
+ RUN wget --max-redirect 3 https://archives.boost.io/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_}.tar.gz
+ RUN mkdir -p /src/boost && tar zxf boost_${BOOST_VERSION_}.tar.gz -C /src/boost --strip-components=1
+-RUN cd /src/boost && ./bootstrap.sh --with-libraries=charconv,iostreams,regex,system,filesystem,program_options,random,locale,context,coroutine,graph && ./b2 toolset=gcc-10 --layout=system link=static variant=release cxxflags='-fPIE -fstack-protector-strong' define=_FORTIFY_SOURCE=2 install
++RUN cd /src/boost && ./bootstrap.sh --with-libraries=charconv,iostreams,regex,system,filesystem,process,program_options,random,locale,context,coroutine,graph && ./b2 toolset=gcc-10 --layout=system link=static variant=release cxxflags='-fPIE -fstack-protector-strong' define=_FORTIFY_SOURCE=2 install
+
+ RUN wget --max-redirect 3 https://download.gnome.org/sources/pango/${PANGO_VERSION}/pango-${PANGO_VERSION_FULL}.tar.xz
+ RUN mkdir -p /src/pango && tar xf pango-${PANGO_VERSION_FULL}.tar.xz -C /src/pango --strip-components=1
+
+From 5e25513e6531b0f078800c24eee13fe1c8c2cb0d Mon Sep 17 00:00:00 2001
+From: Charles Dang <exodia339@gmail.com>
+Date: Mon, 12 May 2025 13:13:50 -0400
+Subject: [PATCH 2/3] fixup
+
+---
+ src/filesystem.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/filesystem.cpp b/src/filesystem.cpp
+index adfe361ceb613..759d1395030ed 100644
+--- a/src/filesystem.cpp
++++ b/src/filesystem.cpp
+@@ -1021,7 +1021,7 @@ std::string get_exe_path()
+ // with version
+ std::string version = std::to_string(game_config::wesnoth_version.major_version()) + "." + std::to_string(game_config::wesnoth_version.minor_version());
+ std::string exe = filesystem::get_program_invocation("wesnoth-"+version);
+-#if BOOST_VERSION >= 108600
++#if BOOST_VERSION >= 108100
+ bfs::path search = boost::process::v2::environment::find_executable(exe);
+ #else
+ bfs::path search = boost::process::search_path(exe);
+@@ -1032,7 +1032,7 @@ std::string get_exe_path()
+
+ // versionless
+ exe = filesystem::get_program_invocation("wesnoth");
+-#if BOOST_VERSION >= 108600
++#if BOOST_VERSION >= 108100
+ search = boost::process::v2::environment::find_executable(exe);
+ #else
+ search = boost::process::search_path(exe);
+
+From 8b59674eb64848db47beebd404e579be83c2ee1d Mon Sep 17 00:00:00 2001
+From: Charles Dang <exodia339@gmail.com>
+Date: Mon, 12 May 2025 13:37:53 -0400
+Subject: [PATCH 3/3] let's try 86 again
+
+---
+ src/filesystem.cpp | 6 +++---
+ src/game_launcher.cpp | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/filesystem.cpp b/src/filesystem.cpp
+index 759d1395030ed..5eed05df8d586 100644
+--- a/src/filesystem.cpp
++++ b/src/filesystem.cpp
+@@ -41,7 +41,7 @@
+
+ #if !defined(_WIN32) && !defined(__APPLE__)
+
+-#if BOOST_VERSION >= 108100
++#if BOOST_VERSION >= 108600
+ #include <boost/process/v2/environment.hpp>
+ #else
+ #include <boost/process/search_path.hpp>
+@@ -1021,7 +1021,7 @@ std::string get_exe_path()
+ // with version
+ std::string version = std::to_string(game_config::wesnoth_version.major_version()) + "." + std::to_string(game_config::wesnoth_version.minor_version());
+ std::string exe = filesystem::get_program_invocation("wesnoth-"+version);
+-#if BOOST_VERSION >= 108100
++#if BOOST_VERSION >= 108600
+ bfs::path search = boost::process::v2::environment::find_executable(exe);
+ #else
+ bfs::path search = boost::process::search_path(exe);
+@@ -1032,7 +1032,7 @@ std::string get_exe_path()
+
+ // versionless
+ exe = filesystem::get_program_invocation("wesnoth");
+-#if BOOST_VERSION >= 108100
++#if BOOST_VERSION >= 108600
+ search = boost::process::v2::environment::find_executable(exe);
+ #else
+ search = boost::process::search_path(exe);
+diff --git a/src/game_launcher.cpp b/src/game_launcher.cpp
+index 9f1106b89af71..8a32fac619023 100644
+--- a/src/game_launcher.cpp
++++ b/src/game_launcher.cpp
+@@ -63,7 +63,7 @@
+ #endif
+ #include <boost/process/v1/child.hpp>
+
+-#elif BOOST_VERSION >= 108100
++#elif BOOST_VERSION >= 108600
+
+ // boost::asio (via boost::process) complains about winsock.h otherwise
+ #ifdef _WIN32
+@@ -808,7 +808,7 @@ void game_launcher::start_wesnothd()
+ LOG_GENERAL << "Starting wesnothd";
+ try
+ {
+-#if !defined(__APPLE__) && BOOST_VERSION >= 108100
++#if !defined(__APPLE__) && BOOST_VERSION >= 108600
+ boost::asio::io_context io_context;
+ auto c = boost::process::v2::process{io_context, wesnothd_program, { "-c", config }};
+ #else
+@@ -824,7 +824,7 @@ void game_launcher::start_wesnothd()
+ std::this_thread::sleep_for(50ms);
+ return;
+ }
+-#if defined(__APPLE__) || BOOST_VERSION < 108100
++#if defined(__APPLE__) || BOOST_VERSION < 108600
+ catch(const boost::process::process_error& e)
+ #else
+ catch(const std::exception& e)
+
diff --git a/games-strategy/wesnoth/wesnoth-1.19.11.ebuild b/games-strategy/wesnoth/wesnoth-1.19.11.ebuild
new file mode 100644
index 000000000000..95b0652f1928
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.19.11.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org
+ https://github.com/wesnoth/wesnoth"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+# uneven minor versions are development versions
+if [[ $(( $(ver_cut 2) % 2 )) == 0 ]] ; then
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+IUSE="dbus dedicated doc nls server test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ acct-group/wesnoth
+ acct-user/wesnoth
+ dev-libs/boost:=[bzip2,context,icu,nls]
+ >=media-libs/libsdl2-2.0.18:0[joystick,video,X]
+ !dedicated? (
+ dev-libs/glib:2
+ dev-libs/openssl:0=
+ >=media-libs/fontconfig-2.4.1
+ >=media-libs/sdl2-image-2.0.0[jpeg,png,webp]
+ >=media-libs/sdl2-mixer-2.0.0[vorbis]
+ media-libs/libvorbis
+ >=x11-libs/pango-1.22.0
+ >=x11-libs/cairo-1.10.0
+ sys-libs/readline:0=
+ dbus? ( sys-apps/dbus )
+ )"
+DEPEND="${RDEPEND}
+ x11-libs/libX11
+"
+BDEPEND="
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.19.11-boost-1.88.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ if ! use doc ; then
+ sed -i \
+ -e '/manual/d' \
+ doc/CMakeLists.txt || die
+ fi
+
+ # respect LINGUAS (bug #483316)
+ if [[ ${LINGUAS+set} ]] ; then
+ local lang langs=()
+ for lang in $(cat po/LINGUAS) ; do
+ has ${lang} ${LINGUAS} && langs+=( ${lang} )
+ done
+ echo "${langs[@]}" > po/LINGUAS || die
+ fi
+}
+
+src_configure() {
+ filter-flags -ftracer -fomit-frame-pointer
+
+ local mycmakeargs=()
+
+ if use dedicated || use server ; then
+ mycmakeargs+=(
+ -DENABLE_CAMPAIGN_SERVER="ON"
+ -DENABLE_SERVER="ON"
+ -DSERVER_UID="${PN}"
+ -DSERVER_GID="${PN}"
+ -DFIFO_DIR="/run/wesnothd"
+ )
+ else
+ mycmakeargs+=(
+ -DENABLE_CAMPAIGN_SERVER="OFF"
+ -DENABLE_SERVER="OFF"
+ )
+ fi
+ mycmakeargs+=(
+ -Wno-dev
+ -DENABLE_GAME="$(usex !dedicated)"
+ -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
+ -DENABLE_NLS="$(usex nls)"
+ -DENABLE_NOTIFICATIONS="$(usex dbus)"
+ -DENABLE_STRICT_COMPILATION="OFF"
+ -DENABLE_TESTS="$(usex test)"
+ )
+ cmake_src_configure
+}
+
+src_test() {
+ # Allow SDL_Mixer test to pass, bug #931551
+ SDL_AUDIODRIVER=dummy cmake_src_test
+}
+
+src_install() {
+ local DOCS=( README.md changelog.md )
+ cmake_src_install
+ if use dedicated || use server ; then
+ rmdir "${ED}"/run{/wesnothd,} || die
+ newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
+ fi
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2025-05-15 9:50 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-15 9:50 [gentoo-commits] repo/gentoo:master commit in: games-strategy/wesnoth/, games-strategy/wesnoth/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2025-05-15 9:50 Sam James
2024-05-28 1:45 Sam James
2023-08-24 14:35 Pacho Ramos
2023-03-09 20:13 Ionen Wolkens
2023-01-27 5:26 Sam James
2022-12-19 3:01 Sam James
2020-11-15 20:03 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox