gentoo auto-resync : 05:06:2023 - 15:37:05

5 files changed, 30 insertions, 2 deletions

diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest
index e15025189827..99c209526563 100644
--- a/dev-games/godot/Manifest
+++ b/dev-games/godot/Manifest
@@ -1,10 +1,12 @@
 AUX godot-3.5-musl.patch 325 BLAKE2B 6069b159c7844d471ecf79d080cb4b3d5b21cf82093379961e163efe52866e1d25ca8075ee1ba653aabcaf912592968dca6fba43cb4907d703711af237bacf50 SHA512 828e5870fdec8cd4c4f132db24de722f73f330dc278b21020cf38aaf26498c69723e1fc75855dd01683452c3628a782a3957ff47d5ecf2e13da1bd8aee3a5805
 AUX godot-3.5-scons.patch 2568 BLAKE2B 0da3a29689293a0d9681eaa2877c667fbe484e7d479eb7525f3621640f397dc77bd000780a142418a74e671b6f5b241e27898f5cac71376eb684d3e995a9ac33 SHA512 d7f230da26ebcc40ad0c8c59046a863aeca69c314661ccbcab86c49f545df9662c68bc51d72a146033385ed09812ce2de92aae58a32462402f89542a47069202
+AUX godot-3.5.2-gcc13.patch 433 BLAKE2B f9a5e7e700084910ff7c5e5d3d778a6b9f4358e084ae198499626378c99ad6a4cc97941455bba3f1fa74cd80ed570fd855e1665af1260ad861b5ea9b735829c7 SHA512 ade16845dc997850a790ac30f7076f9ffb37a9b586ebc0be3adafc49dd9eace846b56730ee09ff4e7e016ceae345d6b2caa1bb1c55c1cbde680e346dc63b7639
+AUX godot-4.0.3-gcc13.patch 292 BLAKE2B 5f6af5b59779ce6848bb9552674ebf36e43a8ac78cb00e0fe1601af2d0ebc234e71811146b64d7f3f1797a7cfdffdd9e131ab08659897c61f2920adfb39bbc94 SHA512 5edb2d7238ad24ef5ee7f44cb686d7abda6ec7789e648c5ba42176605154084990e453b8f046e2fa4b5e88fd2c10f898e861420cc3a25cfae1ce0e5291853d2e
 AUX godot-4.0_beta3-headless-header.patch 498 BLAKE2B 401942c17829136aace28e34f7c9a4f843457d5a76c8b7035f40894f3d4d06936ddf3f1bcedf81584a65c0bff96e6e556d20ed8856107dd76deb173c98256964 SHA512 f83ec6b0667108b7c8f744b90944cd686de114db5694e09febf20a359a7d3fe11457b0c3279719a1281309a647e856b729354d3bed5f6d5048548b8dd259f63b
 AUX godot-4.0_rc2-musl.patch 878 BLAKE2B d10e22acc29e14df6b42b180ed480908c61e6a9781d81897b1b24a79de792fb967886fa7be6494440fb4e8ab69a83100d455838b986ce195dc30116638db544e SHA512 97b365952a7c1e7e4088ed71d1c98eccca1449b481d05e10fd750a6d29c7635dc6112e0e033ab1555cfe51eda8c0b805df1fbe78e9c54cea2664aed8570fa077
 AUX godot-4.0_rc3-scons.patch 506 BLAKE2B 2fd1421760f082ea65febce90459f8a2d63e06e5b02b5e86e59bbacd14db78f76448ee50d0fa7c935b1a867f528b46a9b82b5bb03765d0b237e9af73d7fd14da SHA512 9ac654edc66a5a330055d1af0b706a5fa143061712146ddc02657add45d4518d96391d9e980c0a6b33d9fa966b5914a3f90a7b333f20885f0a05a7b8985fc667
 DIST godot-3.5.2-stable.tar.xz 24047432 BLAKE2B a4d600cb174b2f79cc91c583b1052db2e7e2921003ffd5a307a2484af9cc050b600e763b6016ba2df043ba5e492f0bdd13c207fd3a3d794b6602f7c574093cb0 SHA512 e9f3c8b23cd69422639fe22948fb1f5f2071dff6e013fee3c08d6d3c1f39de4dfc252d32eb395c847021c9bbc1b2fa320500140ff3e684bf00530889ba48a181
 DIST godot-4.0.3-stable.tar.xz 30203636 BLAKE2B bfdf2f3a349d541039639fbce9d9d10ba6bfc200ae9442900709b1cb3d3c40dcf68b3de10d9ebe7211a1dfc380a5cf8954c5ed1d9a510afaeec8cee2dc4e9123 SHA512 185c3caf99dbfeffc83fa8298c801121ee58c4c6d3854127aeb3cb2128ed08ea1925229b90f08a79e3ea5e674725fe62e219226a58a17789c0e72ae8f27ed576
-EBUILD godot-3.5.2.ebuild 6532 BLAKE2B 7c038530928461f198ce077a6e19e16b2ad3f4f3f144054dabd06e3ea40732099c9fff54cd89eade3470540fe97ed70ffe4f2bc8c187973f0d30b965401967d2 SHA512 2cb4c893c2c85e744f8a6232b4f39bed27123eed4bc3caea52d5daf34a02249ca364a7345d162c43cdaafda91d97c1e85d3c3a4134684dccc55c820da0f94549
-EBUILD godot-4.0.3.ebuild 6893 BLAKE2B ecac277ae967b558c4df500e8b7cb00c4435d70f321ca3f6a5720a00daba13f16c03767be9ee04afd3ff1773fadc06d949579d3ac9790d5cd49f14ec8e88808e SHA512 22e7d5fa229bc7b1637a954658ef7dab1b684ef6c89ceb5612ac941495c7425785d07f2d448bd770278b84b81bf3bb343fc56d51767e8133d0beabca77b69fc0
+EBUILD godot-3.5.2.ebuild 6571 BLAKE2B 93fc5f5c79b4ddcfc53ddc0f3ebe1d5ae1cd0e9c87b268e04085ebbdf7134ef4a2f8c9185dbb76ff43c3d08a6d92a948dd411b3a912bc966bfa54beda2b3be72 SHA512 bcb3e090d1753b5e167e5d00498d39714eeb3f91882f0d9bb4dd258ac155335337119c644cb4864a6a848101384d19036908f253525df703f6b3b035cb178d9c
+EBUILD godot-4.0.3.ebuild 6932 BLAKE2B 1c772a375410a6d869922a74baaf9af69c129073fbc84eee5d4ce0fdf218d84b42b13bc99663b751c4ddb1c242fd3472d88dbd9fc2ff20f013187656c49104d5 SHA512 0312b17d7eea7a42b8a5815fc467983ace1add272483b528bfd1815c192de90c86a686c59aeb39a52a2fe42cad319c09c51f95560dbeb93277a8dfc5a81830a1
 MISC metadata.xml 1551 BLAKE2B 718ca848e6b90fad730ea413ff8d25a9c23836da1ff890d7c93d458a0b46b503a4d1b949742a4a819eb0323eb0626a3541cd35d41f809b600891fa470f565ff6 SHA512 b935ee9256ae07a8f01bc458ee41c46e25be8a38b6921cf353a20332c59b6083bd6f73e2112858827b3b7bccdb256f9122e1d9691d2a3751aba85bbb8c4ab262
diff --git a/dev-games/godot/files/godot-3.5.2-gcc13.patch b/dev-games/godot/files/godot-3.5.2-gcc13.patch
new file mode 100644
index 000000000000..789c78415bcd
--- /dev/null
+++ b/dev-games/godot/files/godot-3.5.2-gcc13.patch
@@ -0,0 +1,15 @@
+Issues seem(?) to only trigger when gcc13 is combined with musl.
+
+https://bugs.gentoo.org/906363
+--- a/modules/fbx/fbx_parser/FBXCommon.h
++++ b/modules/fbx/fbx_parser/FBXCommon.h
+@@ -78,2 +78,3 @@
+ 
++#include <cstdint>
+ #include <string>
+--- a/thirdparty/vhacd/inc/vhacdManifoldMesh.h
++++ b/thirdparty/vhacd/inc/vhacdManifoldMesh.h
+@@ -17,2 +17,3 @@
+ #define VHACD_MANIFOLD_MESH_H
++#include <cstdint>
+ #include "vhacdCircularList.h"
diff --git a/dev-games/godot/files/godot-4.0.3-gcc13.patch b/dev-games/godot/files/godot-4.0.3-gcc13.patch
new file mode 100644
index 000000000000..145303c7ebd5
--- /dev/null
+++ b/dev-games/godot/files/godot-4.0.3-gcc13.patch
@@ -0,0 +1,9 @@
+Issues seem(?) to only trigger when gcc13 is combined with musl.
+
+https://bugs.gentoo.org/906363
+--- a/thirdparty/vhacd/inc/vhacdManifoldMesh.h
++++ b/thirdparty/vhacd/inc/vhacdManifoldMesh.h
+@@ -17,2 +17,3 @@
+ #define VHACD_MANIFOLD_MESH_H
++#include <cstdint>
+ #include "vhacdCircularList.h"
diff --git a/dev-games/godot/godot-3.5.2.ebuild b/dev-games/godot/godot-3.5.2.ebuild
index 9ba59f48b96f..5c1c02778244 100644
--- a/dev-games/godot/godot-3.5.2.ebuild
+++ b/dev-games/godot/godot-3.5.2.ebuild
@@ -69,6 +69,7 @@ BDEPEND="virtual/pkgconfig"
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.5-musl.patch
 	"${FILESDIR}"/${PN}-3.5-scons.patch
+	"${FILESDIR}"/${PN}-3.5.2-gcc13.patch
 )
 
 src_prepare() {
diff --git a/dev-games/godot/godot-4.0.3.ebuild b/dev-games/godot/godot-4.0.3.ebuild
index c3e9af66635c..f66f4be675d0 100644
--- a/dev-games/godot/godot-4.0.3.ebuild
+++ b/dev-games/godot/godot-4.0.3.ebuild
@@ -72,6 +72,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.0_beta3-headless-header.patch
 	"${FILESDIR}"/${PN}-4.0_rc2-musl.patch
 	"${FILESDIR}"/${PN}-4.0_rc3-scons.patch
+	"${FILESDIR}"/${PN}-4.0.3-gcc13.patch
 )
 
 src_prepare() {