From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3889D1581F0 for ; Fri, 24 Jan 2025 07:43:48 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 23F35343510 for ; Fri, 24 Jan 2025 07:43:48 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id D0668110432; Fri, 24 Jan 2025 07:43:04 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id C5C90110432 for ; Fri, 24 Jan 2025 07:43:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 798FC3434BF for ; Fri, 24 Jan 2025 07:43:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B0EA223F4 for ; Fri, 24 Jan 2025 07:43:01 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1737704412.971b87ad25012f05859c0a08732cca84df539894.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-games/godot/, dev-games/godot/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-games/godot/files/godot-4.3-gcc15.patch dev-games/godot/godot-4.3-r1.ebuild X-VCS-Directories: dev-games/godot/ dev-games/godot/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 971b87ad25012f05859c0a08732cca84df539894 X-VCS-Branch: master Date: Fri, 24 Jan 2025 07:43:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8112054a-fe38-42c5-850a-8b7a4d8a530c X-Archives-Hash: da4ecb9f1ec99e59de0ec8341ff09d84 commit: 971b87ad25012f05859c0a08732cca84df539894 Author: Ionen Wolkens gentoo org> AuthorDate: Fri Jan 24 06:41:04 2025 +0000 Commit: Ionen Wolkens gentoo 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 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 ++#include + #include +--- a/thirdparty/thorvg/inc/thorvg.h ++++ b/thirdparty/thorvg/inc/thorvg.h +@@ -3,2 +3,3 @@ + ++#include + #include 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() {