7 files changed, 271 insertions, 1 deletions
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 3ca50de29d53..23f03cae7eac 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 54be6a10d617..55fd2ebcd208 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,7 +1,10 @@
 AUX wesnoth-1.16.6-fix-build-with-boost-1.81.patch 1907 BLAKE2B 8c98e374f17ceb8afd29aad80ee2e3971d62fcd8b996379b6d198c162fe8376fde7f7d68122a955e65852a40f9712bfdd941630722011a8326c0216eaf73aed2 SHA512 3d930b1de00163e7970c35e80d2c87069050b1a64884cbd5ed7c9e44f47857e070561d0cb31575e7263b4cfd5907d82f067445115acf7a66823a1f5eed752a55
+AUX wesnoth-1.16.8-gcc-13.patch 827 BLAKE2B 5e162b5b23330266f58b05ed71f3faa32ab0dbae4c64606ee77941c20c04c01a439f929847a795750c757f99ab5cc5308e50b952280b547d99c8c6bf4a54ebdc SHA512 635f03af67a51dce5b71581a1d8f427983efc0d9489a9d16ebcbefd47be346b65430a7133dd48769fbac6a71054a99ad5f026db1d70894079ad152120ff96f43
 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab
 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
 EBUILD wesnoth-1.16.6.ebuild 2319 BLAKE2B c86c9cec4ad90a28f213774a1a096b2e2d2390710f53e40e501ba6a0bfa3b7a7784a64bf79b7d864ecfd8fea7c70dfa8d7ddb37a6cdb367f9531a268f9a80bac SHA512 10c1f6aaf81dbb1accf909461a256ba4d2fdea608375802006584d77188a07b67cc5d81528c7174ecdb9329902baf610b789cf3ae56034bbd0414404de92bc84
+EBUILD wesnoth-1.16.8.ebuild 2309 BLAKE2B ae5ef5da2d544367f89753c864149a1d6dfaa6c9ef66056b6e8862ca489736802e18636645ebe8c19ebcbb9e7bb3dd1c5ae84fec64cd28912389cffbb2e6c260 SHA512 9b233db9f0ee9f731d471bf8c0485bf43552b39f834bf40d0b798419c1c9084c83388e0cf61ca457e92e26afa221a8f89cf9a98648e48790445ffb0b599d1653
 EBUILD wesnoth-1.17.11.ebuild 2228 BLAKE2B 8e2bd9e6c1be1fb0e30c554222afcad7ca2cd852b4dfe4dac74f23f081e868a9119813421fb5c82c603dd8c67bdcb90077f8c1efd5923e3ff40267db5ee1c527 SHA512 14e94c5be518cc7d0fa7df9f2f93436e0fae1c402ccb80712b495dd5c5b59f2c46e49b1d08841de08a7472e2970dec82f8686d7003a839be9648a7e429a2e166
 MISC metadata.xml 475 BLAKE2B fe3a0b92f39b2158ec38fe2d7528463bb243cc44df562f7ad450227b35bab1d59a1638fe1d702cd70358a0137851e08be1878d590afbcc28dd19176b2a7df7fd SHA512 6293671db448eef2a211ae8dbb88624a42ac46712331db441a55d44566e7843f820047dde7936d725fea6d24a8196223e30712ffbd3864e63614f7f849cda6b4
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
+}
diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index ad8f2364d747..f3d0a31cd3db 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,4 +1,5 @@
+AUX widelands-1.1-gcc-13.patch 2866 BLAKE2B 5626b8d92838d1cb542b887ff7a5c76a48689d44a16c98d5de3ed34cd7990cdc14563a099e4d1b9826329f78f35ff1ba257f31839877a8d31eb30e336ac4340e SHA512 610ee09525f79a8db2fee2a8fedd06726c149a42af82ac27b707a347ffa87c7c7f704c7dc6498d7548bd44632bcf9132368b1ab0dbf799b1f8a351cec66484ac
 DIST widelands-1.1.tar.gz 416104611 BLAKE2B e217ff5a4e3ba0431b96290dd4908d7ddadaf1850e890cee135a54f88162b30d75dbf5bc5f086d6c5e8c5e4410a0a788201117c3615e15a3e2acfd00e8f01272 SHA512 29dbeae0940468c8aad6f0fa610c8467bdb6ecf2ba5fe9175683b7cdaab5f977fa86beb71de29057c829e9738568d15e10bc22fa7fc9e58132151a1a02d72d9d
-EBUILD widelands-1.1.ebuild 1307 BLAKE2B ae056341dd68ccc35c49287d1bcfcacbb1ba92c82331406a0643a2e6ecd0c3e16652a4d118179cea920fca5348cddceba6f30ec44cd1a9a5ab645f1b88c6c28b SHA512 20e773e823b9b4ef048159fd533bf0618cbcee5c03192d402bfa3832484e5392029a92d074e7e4b77d2f86234269a95f48bf5e6cc9b3dbe5b6614634bafb2412
+EBUILD widelands-1.1.ebuild 1358 BLAKE2B 93020ccaadcee1cc368d8c753828924d2a5b32f683704d79f052d649f024dc94eeb18b86bd25df7381e36bf3b66c59276d9cdde2d470a41384982b0068637c34 SHA512 d0bc5bf2b9a228d46a1d7b55ac158a6555fa3552e80b3217074b9f0c6c6b52d1afc7117ed4fcce0290c5fa59376785c59a7846879daebf9ec1ae80b705781530
 EBUILD widelands-9999.ebuild 1307 BLAKE2B ae056341dd68ccc35c49287d1bcfcacbb1ba92c82331406a0643a2e6ecd0c3e16652a4d118179cea920fca5348cddceba6f30ec44cd1a9a5ab645f1b88c6c28b SHA512 20e773e823b9b4ef048159fd533bf0618cbcee5c03192d402bfa3832484e5392029a92d074e7e4b77d2f86234269a95f48bf5e6cc9b3dbe5b6614634bafb2412
 MISC metadata.xml 390 BLAKE2B 139ecbaa266c6fe37441b3e0dd05692dc9eff8301339b7ed358ff32e17c6a1a14cd52b2cf22f141381bcf76d5e9dd579575d204e5a3c1c3793b49ced61b090af SHA512 ecaa9b97ffb2302a7f356e53393f185b70b83563052066d4dd70ad7b725a9963c46b582e1a438f36d517cc52e0ff56316ea8be6c92b54fcdda1726776845f46f
diff --git a/games-strategy/widelands/files/widelands-1.1-gcc-13.patch b/games-strategy/widelands/files/widelands-1.1-gcc-13.patch
new file mode 100644
index 000000000000..c2f2501dff0d
--- /dev/null
+++ b/games-strategy/widelands/files/widelands-1.1-gcc-13.patch
@@ -0,0 +1,124 @@
+https://github.com/widelands/widelands/pull/5765
+
+From 14b9c357073126d11d719fd1a539bb7ef0154791 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Wed, 25 Jan 2023 23:42:42 +0100
+Subject: [PATCH] Fix build with gcc 13 by including <cstdint>
+
+Like other versions before, gcc 13 moved some includes around and as a
+result <cstdint> is no longer transitively included. Explicitly include
+it for uint16_t.
+--- a/src/base/md5.h
++++ b/src/base/md5.h
+@@ -21,6 +21,7 @@
+ #define WL_BASE_MD5_H
+ 
+ #include <cassert>
++#include <cstdint>
+ #include <cstring>
+ #include <string>
+ 
+--- a/src/base/random.h
++++ b/src/base/random.h
+@@ -20,6 +20,7 @@
+ #define WL_BASE_RANDOM_H
+ 
+ #include <cassert>
++#include <cstdint>
+ #include <string>
+ 
+ extern const uint32_t rng_sbox[256];
+--- a/src/base/time_string.h
++++ b/src/base/time_string.h
+@@ -19,6 +19,7 @@
+ #ifndef WL_BASE_TIME_STRING_H
+ #define WL_BASE_TIME_STRING_H
+ 
++#include <cstdint>
+ #include <string>
+ 
+ /// Get a string representation conforming to ISO 8601 of the current time (in
+--- a/src/build_info.h
++++ b/src/build_info.h
+@@ -19,6 +19,7 @@
+ #ifndef WL_BUILD_INFO_H
+ #define WL_BUILD_INFO_H
+ 
++#include <cstdint>
+ #include <string>
+ 
+ constexpr uint16_t kWidelandsCopyrightStart = 2002;
+--- a/src/graphic/align.h
++++ b/src/graphic/align.h
+@@ -19,6 +19,7 @@
+ #ifndef WL_GRAPHIC_ALIGN_H
+ #define WL_GRAPHIC_ALIGN_H
+ 
++#include <cstdint>
+ #include <string>
+ 
+ #include "base/rect.h"
+--- a/src/graphic/text/textstream.h
++++ b/src/graphic/text/textstream.h
+@@ -19,6 +19,7 @@
+ #ifndef WL_GRAPHIC_TEXT_TEXTSTREAM_H
+ #define WL_GRAPHIC_TEXT_TEXTSTREAM_H
+ 
++#include <cstdint>
+ #include <string>
+ 
+ namespace RT {
+--- a/src/logic/generic_save_handler.h
++++ b/src/logic/generic_save_handler.h
+@@ -19,6 +19,7 @@
+ #ifndef WL_LOGIC_GENERIC_SAVE_HANDLER_H
+ #define WL_LOGIC_GENERIC_SAVE_HANDLER_H
+ 
++#include <cstdint>
+ #include <functional>
+ 
+ #include "io/filesystem/filesystem.h"
+--- a/src/logic/map_revision.h
++++ b/src/logic/map_revision.h
+@@ -19,6 +19,7 @@
+ #ifndef WL_LOGIC_MAP_REVISION_H
+ #define WL_LOGIC_MAP_REVISION_H
+ 
++#include <cstdint>
+ #include <string>
+ 
+ namespace Widelands {
+--- a/src/logic/save_handler.h
++++ b/src/logic/save_handler.h
+@@ -19,6 +19,8 @@
+ #ifndef WL_LOGIC_SAVE_HANDLER_H
+ #define WL_LOGIC_SAVE_HANDLER_H
+ 
++#include <cstdint>
++
+ #include "io/filesystem/filesystem.h"
+ 
+ namespace Widelands {
+--- a/src/map_io/map_elemental_packet.h
++++ b/src/map_io/map_elemental_packet.h
+@@ -19,6 +19,7 @@
+ #ifndef WL_MAP_IO_MAP_ELEMENTAL_PACKET_H
+ #define WL_MAP_IO_MAP_ELEMENTAL_PACKET_H
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+--- a/src/scripting/persistence.h
++++ b/src/scripting/persistence.h
+@@ -19,6 +19,8 @@
+ #ifndef WL_SCRIPTING_PERSISTENCE_H
+ #define WL_SCRIPTING_PERSISTENCE_H
+ 
++#include <cstdint>
++
+ #include "scripting/lua.h"
+ 
+ class FileRead;
+-- 
+2.39.1
diff --git a/games-strategy/widelands/widelands-1.1.ebuild b/games-strategy/widelands/widelands-1.1.ebuild
index 694f1e6b01d3..4d2e256576f8 100644
--- a/games-strategy/widelands/widelands-1.1.ebuild
+++ b/games-strategy/widelands/widelands-1.1.ebuild
@@ -40,6 +40,10 @@ BDEPEND="
 	${PYTHON_DEPS}
 	sys-devel/gettext"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1-gcc-13.patch
+)
+
 src_configure() {
 	CMAKE_BUILD_TYPE=Release # disables -Werror