commit:     971b87ad25012f05859c0a08732cca84df539894
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 24 06:41:04 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Jan 24 07:40:12 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=971b87ad

dev-games/godot: fix build with gcc15

Closes: https://bugs.gentoo.org/940190
Closes: https://github.com/gentoo/gentoo/pull/40219
Thanks-to: OldManSeph7818
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-games/godot/files/godot-4.3-gcc15.patch | 20 ++++++++++++++++++++
 dev-games/godot/godot-4.3-r1.ebuild         |  1 +
 2 files changed, 21 insertions(+)

diff --git a/dev-games/godot/files/godot-4.3-gcc15.patch 
b/dev-games/godot/files/godot-4.3-gcc15.patch
new file mode 100644
index 000000000000..40b66a47c92a
--- /dev/null
+++ b/dev-games/godot/files/godot-4.3-gcc15.patch
@@ -0,0 +1,20 @@
+IWYU failure with gcc15[1]. Fixed in both upstreams but bundled
+copies are outdated.
+
+Backport of [2], and partial backport of [3] which added the header.
+
+[1] https://bugs.gentoo.org/940190
+[2] 
https://github.com/KhronosGroup/glslang/commit/e40c14a3e007fac0e4f2e4164fdf14d1712355bd
+[3] 
https://github.com/thorvg/thorvg/commit/ed01ef717e983f7c53e1cdfb0a68b02ae4b19375
+--- a/thirdparty/glslang/SPIRV/SpvBuilder.h
++++ b/thirdparty/glslang/SPIRV/SpvBuilder.h
+@@ -58,2 +58,3 @@
+ #include <algorithm>
++#include <cstdint>
+ #include <map>
+--- a/thirdparty/thorvg/inc/thorvg.h
++++ b/thirdparty/thorvg/inc/thorvg.h
+@@ -3,2 +3,3 @@
+ 
++#include <cstdint>
+ #include <functional>

diff --git a/dev-games/godot/godot-4.3-r1.ebuild 
b/dev-games/godot/godot-4.3-r1.ebuild
index d9431e841a81..3f9da761119c 100644
--- a/dev-games/godot/godot-4.3-r1.ebuild
+++ b/dev-games/godot/godot-4.3-r1.ebuild
@@ -92,6 +92,7 @@ BDEPEND="
 
 PATCHES=(
        "${FILESDIR}"/${PN}-4.3-scons.patch
+       "${FILESDIR}"/${PN}-4.3-gcc15.patch
 )
 
 src_prepare() {

Reply via email to