commit:     17e5d1655eb61d138c0ed3a958b0a1c897e555b0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 17 15:51:55 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 17 15:51:55 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17e5d165

games-strategy/s25rttr: fix build w/ gcc-15

Closes: https://bugs.gentoo.org/938228
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../s25rttr/files/s25rttr-0.9.5-gcc15.patch        | 30 ++++++++++++++++++++++
 games-strategy/s25rttr/s25rttr-0.9.5-r1.ebuild     |  3 ++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/games-strategy/s25rttr/files/s25rttr-0.9.5-gcc15.patch 
b/games-strategy/s25rttr/files/s25rttr-0.9.5-gcc15.patch
new file mode 100644
index 000000000000..84c710d16868
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.9.5-gcc15.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/938228
+https://github.com/Return-To-The-Roots/s25client/commit/0d2a837baa3b72c1154940a4ff910f701ca02fa0
+
+From 0d2a837baa3b72c1154940a4ff910f701ca02fa0 Mon Sep 17 00:00:00 2001
+From: Alexander Grund <[email protected]>
+Date: Sun, 4 May 2025 18:09:06 +0200
+Subject: [PATCH] Workaround missing include in kaguya
+
+---
+ libs/libGamedata/lua/LuaInterfaceBase.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/libs/libGamedata/lua/LuaInterfaceBase.h 
b/libs/libGamedata/lua/LuaInterfaceBase.h
+index e5b472c11d..3876f3fefc 100644
+--- a/libs/libGamedata/lua/LuaInterfaceBase.h
++++ b/libs/libGamedata/lua/LuaInterfaceBase.h
+@@ -1,9 +1,11 @@
+-// Copyright (C) 2005 - 2021 Settlers Freaks (sf-team at siedler25.org)
++// Copyright (C) 2005 - 2025 Settlers Freaks (sf-team at siedler25.org)
+ //
+ // SPDX-License-Identifier: GPL-2.0-or-later
+ 
+ #pragma once
+ 
++#include <cstdint> // Required here for missing include in 
kaguya/native_function.hpp
++
+ #include <kaguya/kaguya.hpp>
+ #include <boost/filesystem/path.hpp>
+ #include <map>
+

diff --git a/games-strategy/s25rttr/s25rttr-0.9.5-r1.ebuild 
b/games-strategy/s25rttr/s25rttr-0.9.5-r1.ebuild
index e039a5eebab7..bbbdcb22504d 100644
--- a/games-strategy/s25rttr/s25rttr-0.9.5-r1.ebuild
+++ b/games-strategy/s25rttr/s25rttr-0.9.5-r1.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
@@ -46,6 +46,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-0.9.5-gcc-13.patch
        "${FILESDIR}"/${PN}-0.9.5-boost.patch
        "${FILESDIR}"/${PN}-0.9.5-miniupnpc.patch
+       "${FILESDIR}"/${PN}-0.9.5-gcc15.patch
 )
 
 # Build type is checked but blank is valid.

Reply via email to