[gentoo-commits] repo/gentoo:master commit in: games-strategy/wesnoth/files/, games-strategy/wesnoth/

[gentoo-commits] repo/gentoo:master commit in: games-strategy/wesnoth/files/, games-strategy/wesnoth/

[Lars Wendler]

commit:     4e4ea8746ff0c79b77dc4326dcd67db3db7eed64
Author:     Matija Skala <mskala <AT> gmx <DOT> com>
AuthorDate: Thu May 17 06:02:28 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu May 31 11:15:29 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e4ea874

games-strategy/wesnoth: new wesnothd.rc file for 1.14

Bug: https://bugs.gentoo.org/654440
Closes: https://github.com/gentoo/gentoo/pull/8440

 games-strategy/wesnoth/files/wesnothd.rc-r1        | 23 ++++++++++++++++++++++
 ...noth-1.14.1.ebuild => wesnoth-1.14.1-r1.ebuild} |  4 ++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/games-strategy/wesnoth/files/wesnothd.rc-r1 b/games-strategy/wesnoth/files/wesnothd.rc-r1
new file mode 100644
index 00000000000..c1a0d9d2016
--- /dev/null
+++ b/games-strategy/wesnoth/files/wesnothd.rc-r1
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use net
+}
+
+start() {
+	checkpath -q -d -m 0750 -o wesnoth:wesnoth /run/wesnothd
+	ebegin "Starting wesnothd"
+	start-stop-daemon --start --quiet -b -m \
+		--pidfile /run/wesnothd/wesnothd.pid \
+		-c wesnoth:wesnoth \
+		--exec /usr/bin/wesnothd
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping wesnothd"
+	start-stop-daemon --stop --quiet --pidfile /run/wesnothd/wesnothd.pid
+	eend $?
+}

diff --git a/games-strategy/wesnoth/wesnoth-1.14.1.ebuild b/games-strategy/wesnoth/wesnoth-1.14.1-r1.ebuild
similarity index 96%
rename from games-strategy/wesnoth/wesnoth-1.14.1.ebuild
rename to games-strategy/wesnoth/wesnoth-1.14.1-r1.ebuild
index 7372ade39d6..5a1f6c5af2e 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.1.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.1-r1.ebuild
@@ -108,7 +108,7 @@ src_configure() {
 src_install() {
 	DOCS="README.md changelog.md players_changelog.md" cmake-utils_src_install
 	if use dedicated || use server; then
-		keepdir "/run/wesnothd"
-		newinitd "${FILESDIR}"/wesnothd.rc wesnothd
+		rmdir "${ED%/}/run/wesnothd" || die
+		newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
 	fi
 }

[gentoo-commits] repo/gentoo:master commit in: games-strategy/wesnoth/files/, games-strategy/wesnoth/

[Andreas Sturmlechner]

commit:     9320a11fecbd758ca073072ebc06750313fbcdbb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  3 13:54:54 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun  6 08:06:03 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9320a11f

games-strategy/wesnoth: Drop old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 games-strategy/wesnoth/Manifest              |   1 -
 games-strategy/wesnoth/files/wesnothd.rc     |  22 -----
 games-strategy/wesnoth/wesnoth-1.12.6.ebuild | 119 ---------------------------
 3 files changed, 142 deletions(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 2a8b2573b38..ecefe36c0dd 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,3 +1,2 @@
-DIST wesnoth-1.12.6.tar.bz2 387869758 BLAKE2B 53328f8ebbaaabb266064fea57c0d28779183ba1b77ae8522c4dbb01c4a9ad9068d76307b48cec6576648132bf34f9a45efdb93ad36e03d035ed06e84711c9b6 SHA512 12ca3b5de8fd385b05cc8e76604f7aed68127a7542599d6e97cce793e10636e00bd65dcb088701e20ccc7191f41b1d67a00b291f885df880fac00d13d6fbde7a
 DIST wesnoth-1.14.1.tar.gz 481355736 BLAKE2B 2cc41a36706919bbc505a9a6726ea9b0fbfd5bfde677da937fdde2645587f4407fb6ed2f7271efaf1763f9ab69a57d153130291d5dc0a79862e554963dd37079 SHA512 0372eb9479d3d24dc4bf692a83fe310d5b4493989f18f0a23070ee19a4bee2672efd38babe1579b08a321e3acba1ede5823376619c8a90102f968e53cc6e3f02
 DIST wesnoth-1.14.2.tar.gz 489041516 BLAKE2B f38f3596edd97096e39ee1e87e13a3d0402d0f9f0f67f25ce1e4a28123abc62ca7b2410c8420a4091d505bf64219cdf92c1cfed562ae2f3705c37685d7c2c20e SHA512 010dcdeaf03d3855192d2480facbfce134459b71acb06515196968dd66b5e1fc40bd75eeeb8b7dd7fc30c9b43af004784d9907893c4b1d61e57436457afc30bb

diff --git a/games-strategy/wesnoth/files/wesnothd.rc b/games-strategy/wesnoth/files/wesnothd.rc
deleted file mode 100644
index f8662b0981f..00000000000
--- a/games-strategy/wesnoth/files/wesnothd.rc
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use net
-}
-
-start() {
-	ebegin "Starting wesnothd"
-	start-stop-daemon --start --quiet -b -m \
-		--pidfile "GAMES_STATEDIR"/run/wesnothd/wesnothd.pid \
-		-c GAMES_USER_DED:GAMES_GROUP \
-		--exec "GAMES_BINDIR"/wesnothd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping wesnothd"
-	start-stop-daemon --stop --quiet --pidfile "GAMES_STATEDIR"/run/wesnothd/wesnothd.pid
-	eend $?
-}

diff --git a/games-strategy/wesnoth/wesnoth-1.12.6.ebuild b/games-strategy/wesnoth/wesnoth-1.12.6.ebuild
deleted file mode 100644
index 3c5d8cf3cf0..00000000000
--- a/games-strategy/wesnoth/wesnoth-1.12.6.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils eutils multilib toolchain-funcs flag-o-matic games
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org/"
-SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dbus dedicated doc fribidi nls server"
-
-RDEPEND=">=media-libs/libsdl-1.2.7:0[joystick,video,X]
-	media-libs/sdl-net
-	!dedicated? (
-		>=media-libs/sdl-ttf-2.0.8
-		>=media-libs/sdl-mixer-1.2[vorbis]
-		>=media-libs/sdl-image-1.2[jpeg,png]
-		fribidi? ( dev-libs/fribidi )
-		dbus? ( sys-apps/dbus )
-		sys-libs/zlib
-		x11-libs/pango
-		dev-lang/lua:0
-		media-libs/fontconfig
-	)
-	>=dev-libs/boost-1.48:=[nls,threads]
-	virtual/libintl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if use dedicated || use server ; then
-		sed \
-			-e "s:GAMES_BINDIR:${GAMES_BINDIR}:" \
-			-e "s:GAMES_STATEDIR:${GAMES_STATEDIR}:" \
-			-e "s/GAMES_USER_DED/${GAMES_USER_DED}/" \
-			-e "s/GAMES_GROUP/${GAMES_GROUP}/" "${FILESDIR}"/wesnothd.rc \
-			> "${T}"/wesnothd || die
-	fi
-	if ! use doc ; then
-		sed -i \
-			-e '/manual/d' \
-			doc/CMakeLists.txt || die
-	fi
-	# bug #472994
-	mv icons/wesnoth-icon-Mac.png icons/wesnoth-icon.png || die
-	mv icons/map-editor-icon-Mac.png icons/wesnoth_editor-icon.png || die
-
-	# respect LINGUAS (bug #483316)
-	if [[ ${LINGUAS+set} ]] ; then
-		local 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
-	if [[ $(gcc-major-version) -eq 3 ]] ; then
-		filter-flags -fstack-protector
-		append-flags -fno-stack-protector
-	fi
-	# Work around eclass
-	append-flags -UNDEBUG
-	if use dedicated || use server ; then
-		mycmakeargs=(
-			"-DENABLE_CAMPAIGN_SERVER=TRUE"
-			"-DENABLE_SERVER=TRUE"
-			"-DSERVER_UID=${GAMES_USER_DED}"
-			"-DSERVER_GID=${GAMES_GROUP}"
-			"-DFIFO_DIR=${GAMES_STATEDIR}/run/wesnothd"
-			)
-	else
-		mycmakeargs=(
-			$(cmake-utils_use_enable fribidi FRIBIDI)
-			"-DENABLE_CAMPAIGN_SERVER=FALSE"
-			"-DENABLE_SERVER=FALSE"
-			)
-	fi
-	mycmakeargs+=(
-		$(cmake-utils_use_enable !dedicated GAME)
-		$(cmake-utils_use_enable !dedicated ENABLE_DESKTOP_ENTRY)
-		$(cmake-utils_use_enable nls NLS)
-		$(cmake-utils_use_enable dbus NOTIFICATIONS)
-		"-DCMAKE_VERBOSE_MAKEFILE=TRUE"
-		"-DENABLE_STRICT_COMPILATION=FALSE"
-		"-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
-		"-DDATAROOTDIR=${GAMES_DATADIR}"
-		"-DBINDIR=${GAMES_BINDIR}"
-		"-DICONDIR=/usr/share/pixmaps"
-		"-DDESKTOPDIR=/usr/share/applications"
-		"-DLOCALEDIR=/usr/share/locale"
-		"-DMANDIR=/usr/share/man"
-		"-DDOCDIR=/usr/share/doc/${PF}"
-		)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	DOCS="README.md changelog players_changelog" cmake-utils_src_install
-	if use dedicated || use server; then
-		keepdir "${GAMES_STATEDIR}/run/wesnothd"
-		doinitd "${T}"/wesnothd
-	fi
-	prepgamesdirs
-}

[gentoo-commits] repo/gentoo:master commit in: games-strategy/wesnoth/files/, games-strategy/wesnoth/

[Andreas Sturmlechner]

commit:     428d22aca09a7b9fda1bab325ef24642d3e07448
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 26 18:21:23 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 18:23:30 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=428d22ac

games-strategy/wesnoth: Fix build with boost-1.70

Closes: https://bugs.gentoo.org/690772
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../wesnoth/files/wesnoth-1.14.7-boost-1.70.patch  | 24 ++++++++++++++++++++++
 games-strategy/wesnoth/wesnoth-1.14.7.ebuild       |  2 ++
 2 files changed, 26 insertions(+)

diff --git a/games-strategy/wesnoth/files/wesnoth-1.14.7-boost-1.70.patch b/games-strategy/wesnoth/files/wesnoth-1.14.7-boost-1.70.patch
new file mode 100644
index 00000000000..90c526789c5
--- /dev/null
+++ b/games-strategy/wesnoth/files/wesnoth-1.14.7-boost-1.70.patch
@@ -0,0 +1,24 @@
+From 9d0e3bae096563297c9f51355968f27a67dbfdec Mon Sep 17 00:00:00 2001
+From: Charles Dang <exodia339@gmail.com>
+Date: Mon, 15 Jul 2019 03:18:31 +1100
+Subject: [PATCH] Removed redundant std::ref causing problems with Boost 1.70
+ (fixes #3990)
+
+The asio socket ctor already takes a reference.
+---
+ src/server/server_base.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/server/server_base.cpp b/src/server/server_base.cpp
+index 82b46e912025..8bcf974a62d1 100644
+--- a/src/server/server_base.cpp
++++ b/src/server/server_base.cpp
+@@ -65,7 +65,7 @@ void server_base::start_server()
+ 
+ void server_base::serve()
+ {
+-	socket_ptr socket = std::make_shared<boost::asio::ip::tcp::socket>(std::ref(io_service_));
++	socket_ptr socket = std::make_shared<boost::asio::ip::tcp::socket>(io_service_);
+ 	acceptor_.async_accept(*socket, std::bind(&server_base::accept_connection, this, _1, socket));
+ }
+ 

diff --git a/games-strategy/wesnoth/wesnoth-1.14.7.ebuild b/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
index 971ba1f87a9..e0b1b37602e 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
@@ -40,6 +40,8 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}"/${P}-boost-1.70.patch )
+
 pkg_setup() {
 	if use openmp; then
 		tc-has-openmp || die "Please switch to an openmp compatible compiler"

[gentoo-commits] repo/gentoo:master commit in: games-strategy/wesnoth/files/, games-strategy/wesnoth/

[Pacho Ramos]

commit:     67175eea75b5169e347d5e6c1a62c7a1fd47e2ef
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  9 09:36:31 2024 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 09:41:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67175eea

games-strategy/wesnoth: drop 1.16.10, 1.18.0

Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 games-strategy/wesnoth/Manifest                    |   2 -
 .../wesnoth/files/wesnoth-1.16.10-boost-1.83.patch |  26 -----
 .../wesnoth/files/wesnoth-1.18.0-boost-1.85.patch  |  12 ---
 games-strategy/wesnoth/wesnoth-1.16.10.ebuild      | 106 --------------------
 games-strategy/wesnoth/wesnoth-1.18.0.ebuild       | 111 ---------------------
 5 files changed, 257 deletions(-)

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 9dd0fb2d2380..f396b6286ee7 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,5 +1,3 @@
-DIST wesnoth-1.16.10.tar.gz 518628374 BLAKE2B 7aaed481607bc58e9d0f22e4c4a36f24f19b4fc522ce3c1eb6366e70e3bd901a10f055d2add9dc1c73519368fd4a31cd6b326e42b1be0023eeda370076db0742 SHA512 0473ec4e4b7a33a37c2ff52b4e0c3dccec2e58a087517566967409dda03952127bf560b09cfccc7243f506201d98980aafdf289b7f1e5345a7e3b4316a908240
-DIST wesnoth-1.18.0.tar.bz2 460686063 BLAKE2B 9dd898a6b430999873ae001dad47b2bcadcbbfc4672bf4489533c0268a4bf982a4e4451f79bf62bb1ac66d4ba2f06b62484b2b1b1fccb2e434c4ceef95a2c2bc SHA512 7c7cd1021d9af2e790f3973ae258d7e401b665102cfcdb9e7fb400471d8488b7fa3f35a17a32c53b646d707dcc0508fef379ae6ce2dc79f1d675a7b2ec0e50c2
 DIST wesnoth-1.18.2.tar.bz2 461290798 BLAKE2B 6ff9538eca7f65e7413d9b220b07b5f76ad14b7853cb2b33195098f01544a6e3ba2603f927c55c2f5a42a4b3c148655483610beab985332737c4e0cf54be15df SHA512 de4d8ceaf29a93c174e9f832825542885bb90c4f481b6b248cc875cb0b1054435df3c2080c7693842b5e857af091e9219fa10b702d4fe63757f3d28871b63d4c
 DIST wesnoth-1.18.3.tar.bz2 461694247 BLAKE2B 1998e2fdff56271dd86c390e3c25dcbaa98b4f131f15584e5d3f2f5866856a69aebf9c8d97b1126601b3e08467a9410f3ba7b53c253737c6bbf62ccb1e9ba96f SHA512 def324c9ed66ac59e2a9d0ab9ab95f00ddab2d31dacb2d0b5cfba42c5acdba210937f7dd6afde8870a387847a6d021a28dffcb04ce513272df6a4b52a626f30a
 DIST wesnoth-1.19.1.tar.bz2 461918324 BLAKE2B 8fa97526831e14957449a0b33909b7d155be00659d9543efbea34bd7935fb05b4e99a419dcc2e9c426a2e0fb4fb1d40c2972236d0da5a1661970eb80103f04fc SHA512 73ab7d474b01ac753224f0c694a86679a28160e340a07d87b8f96398df2c39c39df95098b750516e7e69851843e68954b5939ae68dc3a232ec2e9cad256d1113

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
deleted file mode 100644
index 2c9e55db0472..000000000000
--- a/games-strategy/wesnoth/files/wesnoth-1.16.10-boost-1.83.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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/files/wesnoth-1.18.0-boost-1.85.patch b/games-strategy/wesnoth/files/wesnoth-1.18.0-boost-1.85.patch
deleted file mode 100644
index 412a4cf8e39d..000000000000
--- a/games-strategy/wesnoth/files/wesnoth-1.18.0-boost-1.85.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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.16.10.ebuild b/games-strategy/wesnoth/wesnoth-1.16.10.ebuild
deleted file mode 100644
index cb9bc76bf65d..000000000000
--- a/games-strategy/wesnoth/wesnoth-1.16.10.ebuild
+++ /dev/null
@@ -1,106 +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}"/${PN}-1.16.10-boost-1.83.patch #912385
-)
-
-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
-}

diff --git a/games-strategy/wesnoth/wesnoth-1.18.0.ebuild b/games-strategy/wesnoth/wesnoth-1.18.0.ebuild
deleted file mode 100644
index 1843a5985958..000000000000
--- a/games-strategy/wesnoth/wesnoth-1.18.0.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2024 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"
-
-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,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}"/wesnoth-1.18.0-boost-1.85.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_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
-}

[gentoo-commits] repo/gentoo:master commit in: games-strategy/wesnoth/files/, games-strategy/wesnoth/

[Sam James]

commit:     ccc8abc95f8e4d8d3f69025c940eb791a13d2e7f
Author:     Jack Todaro <solpeth <AT> posteo <DOT> org>
AuthorDate: Sat Jan 25 07:09:33 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar  8 23:16:23 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccc8abc9

games-strategy/wesnoth: fix build with boost-1.87

The patch included herein is based upon the upstream patch at commit
782ab2df3efd4abc1fbab416b9a87d50cc5d066d. The upstream patch did not
cleanly apply due to other repository changes since the release of
this version of wesnoth.

No revbump has been applied in accordance with the devmanual, i.e.
it fixes a build-time issue.

The homepage has also been adjusted to point to the https url.

Closes: https://bugs.gentoo.org/949211
Signed-off-by: Jack Todaro <solpeth <AT> posteo.org>
Closes: https://github.com/gentoo/gentoo/pull/40296
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../wesnoth/files/wesnoth-1.18.3-boost-1.87.patch  | 175 +++++++++++++++++++++
 games-strategy/wesnoth/wesnoth-1.18.3.ebuild       |   6 +-
 2 files changed, 179 insertions(+), 2 deletions(-)

diff --git a/games-strategy/wesnoth/files/wesnoth-1.18.3-boost-1.87.patch b/games-strategy/wesnoth/files/wesnoth-1.18.3-boost-1.87.patch
new file mode 100644
index 000000000000..cba83d57afac
--- /dev/null
+++ b/games-strategy/wesnoth/files/wesnoth-1.18.3-boost-1.87.patch
@@ -0,0 +1,175 @@
+diff --git a/src/server/campaignd/server.cpp b/src/server/campaignd/server.cpp
+index 31a7df8..88a141a 100644
+--- a/src/server/campaignd/server.cpp
++++ b/src/server/campaignd/server.cpp
+@@ -735,7 +735,7 @@ void server::handle_sighup(const boost::system::error_code&, int)
+ 
+ void server::flush_cfg()
+ {
+-	flush_timer_.expires_from_now(std::chrono::minutes(10));
++	flush_timer_.expires_after(std::chrono::minutes(10));
+ 	flush_timer_.async_wait(std::bind(&server::handle_flush, this, std::placeholders::_1));
+ }
+ 
+diff --git a/src/server/common/forum_user_handler.cpp b/src/server/common/forum_user_handler.cpp
+index ed689cb..1fbac6e 100644
+--- a/src/server/common/forum_user_handler.cpp
++++ b/src/server/common/forum_user_handler.cpp
+@@ -207,7 +207,7 @@ std::string fuh::get_tournaments(){
+ 	return conn_.get_tournaments();
+ }
+ 
+-void fuh::async_get_and_send_game_history(boost::asio::io_service& io_service, wesnothd::server& s, wesnothd::player_iterator player, int player_id, int offset, std::string& search_game_name, int search_content_type, std::string& search_content) {
++void fuh::async_get_and_send_game_history(boost::asio::io_context& io_service, wesnothd::server& s, wesnothd::player_iterator player, int player_id, int offset, std::string& search_game_name, int search_content_type, std::string& search_content) {
+ 	boost::asio::post([this, &s, player, player_id, offset, &io_service, search_game_name, search_content_type, search_content] {
+ 		boost::asio::post(io_service, [player, &s, doc = conn_.get_game_history(player_id, offset, search_game_name, search_content_type, search_content)]{
+ 			s.send_to_player(player, *doc);
+@@ -235,7 +235,7 @@ void fuh::db_set_oos_flag(const std::string& uuid, int game_id){
+ 	conn_.set_oos_flag(uuid, game_id);
+ }
+ 
+-void fuh::async_test_query(boost::asio::io_service& io_service, int limit) {
++void fuh::async_test_query(boost::asio::io_context& io_service, int limit) {
+ 	boost::asio::post([this, limit, &io_service] {
+ 		ERR_UH << "async test query starts!";
+ 		int i = conn_.async_test_query(limit);
+diff --git a/src/server/common/forum_user_handler.hpp b/src/server/common/forum_user_handler.hpp
+index d050f90..f8c2b01 100644
+--- a/src/server/common/forum_user_handler.hpp
++++ b/src/server/common/forum_user_handler.hpp
+@@ -133,7 +133,7 @@ public:
+ 	 * @param search_content_type The content type to query for (ie: scenario)
+ 	 * @param search_content Query for games using this content ID. Supports leading and/or trailing wildcards.
+ 	 */
+-	void async_get_and_send_game_history(boost::asio::io_service& io_service, wesnothd::server& s, wesnothd::player_iterator player, int player_id, int offset, std::string& search_game_name, int search_content_type, std::string& search_content);
++	void async_get_and_send_game_history(boost::asio::io_context& io_service, wesnothd::server& s, wesnothd::player_iterator player, int player_id, int offset, std::string& search_game_name, int search_content_type, std::string& search_content);
+ 
+ 	/**
+ 	 * Inserts game related information.
+@@ -203,7 +203,7 @@ public:
+ 	 * @param io_service The boost io_service to use to post the query results back to the main boost::asio thread.
+ 	 * @param limit How many recursions to make in the query.
+ 	 */
+-	void async_test_query(boost::asio::io_service& io_service, int limit);
++	void async_test_query(boost::asio::io_context& io_service, int limit);
+ 
+ 	/**
+ 	 * Checks whether a forum thread with @a topic_id exists.
+diff --git a/src/server/common/server_base.cpp b/src/server/common/server_base.cpp
+index 2c1a581..0aca915 100644
+--- a/src/server/common/server_base.cpp
++++ b/src/server/common/server_base.cpp
+@@ -41,6 +41,10 @@
+ #ifndef _WIN32
+ #include <boost/asio/read_until.hpp>
+ #endif
++#ifndef BOOST_NO_EXCEPTIONS
++#include <boost/exception/diagnostic_information.hpp>
++#endif
++
+ #include <boost/asio/write.hpp>
+ 
+ #include <array>
+diff --git a/src/server/common/server_base.hpp b/src/server/common/server_base.hpp
+index 94aac7e..e40b6ca 100644
+--- a/src/server/common/server_base.hpp
++++ b/src/server/common/server_base.hpp
+@@ -30,7 +30,7 @@
+ #include "serialization/unicode_cast.hpp"
+ #endif
+ 
+-#include <boost/asio/io_service.hpp>
++#include <boost/asio/io_context.hpp>
+ #include <boost/asio/ip/tcp.hpp>
+ #ifndef _WIN32
+ #include <boost/asio/posix/stream_descriptor.hpp>
+@@ -150,7 +150,7 @@ public:
+ protected:
+ 	unsigned short port_;
+ 	bool keep_alive_;
+-	boost::asio::io_service io_service_;
++	boost::asio::io_context io_service_;
+ 	boost::asio::ssl::context tls_context_ { boost::asio::ssl::context::sslv23 };
+ 	bool tls_enabled_ { false };
+ 	boost::asio::ip::tcp::acceptor acceptor_v6_;
+diff --git a/src/server/common/user_handler.hpp b/src/server/common/user_handler.hpp
+index d8e72f1..24b727f 100644
+--- a/src/server/common/user_handler.hpp
++++ b/src/server/common/user_handler.hpp
+@@ -22,7 +22,7 @@ class config;
+ #include <ctime>
+ #include <string>
+ 
+-#include <boost/asio/io_service.hpp>
++#include <boost/asio/io_context.hpp>
+ 
+ #include "server/wesnothd/player_connection.hpp"
+ 
+@@ -139,13 +139,13 @@ public:
+ 
+ 	virtual std::string get_uuid() = 0;
+ 	virtual std::string get_tournaments() = 0;
+-	virtual void async_get_and_send_game_history(boost::asio::io_service& io_service, wesnothd::server& s, wesnothd::player_iterator player, int player_id, int offset, std::string& search_game_name, int search_content_type, std::string& search_content) =0;
++	virtual void async_get_and_send_game_history(boost::asio::io_context& io_service, wesnothd::server& s, wesnothd::player_iterator player, int player_id, int offset, std::string& search_game_name, int search_content_type, std::string& search_content) =0;
+ 	virtual void db_insert_game_info(const std::string& uuid, int game_id, const std::string& version, const std::string& name, int reload, int observers, int is_public, int has_password) = 0;
+ 	virtual void db_update_game_end(const std::string& uuid, int game_id, const std::string& replay_location) = 0;
+ 	virtual void db_insert_game_player_info(const std::string& uuid, int game_id, const std::string& username, int side_number, int is_host, const std::string& faction, const std::string& version, const std::string& source, const std::string& current_user, const std::string& leaders) = 0;
+ 	virtual unsigned long long db_insert_game_content_info(const std::string& uuid, int game_id, const std::string& type, const std::string& name, const std::string& id, const std::string& addon_id, const std::string& addon_version) = 0;
+ 	virtual void db_set_oos_flag(const std::string& uuid, int game_id) = 0;
+-	virtual void async_test_query(boost::asio::io_service& io_service, int limit) = 0;
++	virtual void async_test_query(boost::asio::io_context& io_service, int limit) = 0;
+ 	virtual bool db_topic_id_exists(int topic_id) = 0;
+ 	virtual void db_insert_addon_info(const std::string& instance_version, const std::string& id, const std::string& name, const std::string& type, const std::string& version, bool forum_auth, int topic_id, const std::string uploader) = 0;
+ 	virtual unsigned long long db_insert_login(const std::string& username, const std::string& ip, const std::string& version) = 0;
+diff --git a/src/server/wesnothd/game.cpp b/src/server/wesnothd/game.cpp
+index faeb255..ec95bd4 100644
+--- a/src/server/wesnothd/game.cpp
++++ b/src/server/wesnothd/game.cpp
+@@ -27,6 +27,8 @@
+ #include <iomanip>
+ #include <sstream>
+ 
++#include <boost/coroutine/exceptions.hpp>
++
+ static lg::log_domain log_server("server");
+ #define ERR_GAME LOG_STREAM(err, log_server)
+ #define WRN_GAME LOG_STREAM(warn, log_server)
+diff --git a/src/server/wesnothd/server.cpp b/src/server/wesnothd/server.cpp
+index 7c4b2a0..587b02a 100644
+--- a/src/server/wesnothd/server.cpp
++++ b/src/server/wesnothd/server.cpp
+@@ -293,14 +293,14 @@ void server::handle_graceful_timeout(const boost::system::error_code& error)
+ 		process_command("msg All games ended. Shutting down now. Reconnect to the new server instance.", "system");
+ 		BOOST_THROW_EXCEPTION(server_shutdown("graceful shutdown timeout"));
+ 	} else {
+-		timer_.expires_from_now(std::chrono::seconds(1));
++		timer_.expires_after(std::chrono::seconds(1));
+ 		timer_.async_wait(std::bind(&server::handle_graceful_timeout, this, std::placeholders::_1));
+ 	}
+ }
+ 
+ void server::start_lan_server_timer()
+ {
+-	lan_server_timer_.expires_from_now(std::chrono::seconds(lan_server_));
++	lan_server_timer_.expires_after(std::chrono::seconds(lan_server_));
+ 	lan_server_timer_.async_wait([this](const boost::system::error_code& ec) { handle_lan_server_shutdown(ec); });
+ }
+ 
+@@ -2120,7 +2120,7 @@ void server::shut_down_handler(
+ 		acceptor_v6_.close();
+ 		acceptor_v4_.close();
+ 
+-		timer_.expires_from_now(std::chrono::seconds(10));
++		timer_.expires_after(std::chrono::seconds(10));
+ 		timer_.async_wait(std::bind(&server::handle_graceful_timeout, this, std::placeholders::_1));
+ 
+ 		process_command(
+@@ -2151,7 +2151,7 @@ void server::restart_handler(const std::string& issuer_name,
+ 		graceful_restart = true;
+ 		acceptor_v6_.close();
+ 		acceptor_v4_.close();
+-		timer_.expires_from_now(std::chrono::seconds(10));
++		timer_.expires_after(std::chrono::seconds(10));
+ 		timer_.async_wait(std::bind(&server::handle_graceful_timeout, this, std::placeholders::_1));
+ 
+ 		start_new_server();

diff --git a/games-strategy/wesnoth/wesnoth-1.18.3.ebuild b/games-strategy/wesnoth/wesnoth-1.18.3.ebuild
index 4b40f0539945..f12b18fb00fc 100644
--- a/games-strategy/wesnoth/wesnoth-1.18.3.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.18.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 inherit cmake flag-o-matic xdg
 
 DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
+HOMEPAGE="https://www.wesnoth.org
 	https://github.com/wesnoth/wesnoth"
 SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
 
@@ -43,6 +43,8 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-1.18.3-boost-1.87.patch )
+
 src_prepare() {
 	cmake_src_prepare
 

[gentoo-commits] repo/gentoo:master commit in: games-strategy/wesnoth/files/, games-strategy/wesnoth/

[Sam James]

commit:     42a569143b23ca59301ba828816f980ccfbb4ec4
Author:     Kostadin Shishmanov <kostadinshishmanov <AT> protonmail <DOT> com>
AuthorDate: Thu Mar 13 14:34:06 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 13 14:57:34 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42a56914

games-strategy/wesnoth: fix build with gcc 15

Closes: https://bugs.gentoo.org/938229
Signed-off-by: Kostadin Shishmanov <kostadinshishmanov <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/41061
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../wesnoth/files/wesnoth-1.18.3-gcc15.patch       | 29 ++++++++++++++++++++++
 games-strategy/wesnoth/wesnoth-1.18.3.ebuild       |  5 +++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/games-strategy/wesnoth/files/wesnoth-1.18.3-gcc15.patch b/games-strategy/wesnoth/files/wesnoth-1.18.3-gcc15.patch
new file mode 100644
index 000000000000..37cf8e731a55
--- /dev/null
+++ b/games-strategy/wesnoth/files/wesnoth-1.18.3-gcc15.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/938229
+
+From 1fb93b68d15c7c039f04d0145ad47fb3102ec359 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sat, 24 Aug 2024 22:21:47 +0100
+Subject: [PATCH] filesystem.hpp: include missing <cstdint>
+
+Without the change build fails on upcoming `gcc-15` as:
+
+    In file included from src/desktop/paths.cpp:20:
+    src/filesystem.hpp:232:13: error: 'uint8_t' was not declared in this scope
+      232 | std::vector<uint8_t> read_file_binary(const std::string& fname);
+          |             ^~~~~~~
+---
+ src/filesystem.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/filesystem.hpp b/src/filesystem.hpp
+index 38bf6952b452c..3cdb4b6ae7120 100644
+--- a/src/filesystem.hpp
++++ b/src/filesystem.hpp
+@@ -21,6 +21,7 @@
+ #pragma once
+ 
+ #include <ctime>
++#include <cstdint>
+ #include <fstream>
+ #include <iosfwd>
+ #include <memory>

diff --git a/games-strategy/wesnoth/wesnoth-1.18.3.ebuild b/games-strategy/wesnoth/wesnoth-1.18.3.ebuild
index f12b18fb00fc..3f4d36f79c73 100644
--- a/games-strategy/wesnoth/wesnoth-1.18.3.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.18.3.ebuild
@@ -43,7 +43,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-1.18.3-boost-1.87.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.18.3-boost-1.87.patch
+	"${FILESDIR}"/${PN}-1.18.3-gcc15.patch
+)
 
 src_prepare() {
 	cmake_src_prepare