Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing cstdint includes for GCC 15 #102022

Merged
merged 1 commit into from
Jan 27, 2025

Conversation

akien-mga
Copy link
Member

@akien-mga akien-mga commented Jan 25, 2025

For glslang, that fix was already made upstream with KhronosGroup/glslang@e40c14a, but we're still on an older version.

For thorvg, the fix was made in their main branch but not in the v0.15.x branch.

I've confirmed that this fixes building Godot on Fedora 42 with GCC 15: https://bugzilla.redhat.com/show_bug.cgi?id=2340256

@akien-mga akien-mga added bug topic:thirdparty cherrypick:4.1 cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release cherrypick:4.3 Considered for cherry-picking into a future 4.3.x release labels Jan 25, 2025
@akien-mga akien-mga added this to the 4.4 milestone Jan 25, 2025
@akien-mga akien-mga requested a review from a team as a code owner January 25, 2025 13:56
@akien-mga akien-mga changed the title glslang: Add missing cstdint include for GCC 15 Add missing cstdint includes for GCC 15 Jan 25, 2025
@@ -1,6 +1,7 @@
#ifndef _THORVG_H_
#define _THORVG_H_

#include <cstdint>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CC @mgrudzinska
This seems to be included already in thorvg main but not in v0.15.x, would be good if it was included in 0.15.10 or 0.16.0 if such releases are planned.
https://github.com/thorvg/thorvg/blob/v0.15.x/inc/thorvg.h

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ofc, I'll let you know!

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@akien-mga #include <cstdint> has been included in v0.15.10, Thanks.
https://github.com/thorvg/thorvg/releases/tag/v0.15.10

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@Repiteo Repiteo merged commit 1a2ad2f into godotengine:master Jan 27, 2025
19 checks passed
@Repiteo
Copy link
Contributor

Repiteo commented Jan 27, 2025

Thanks!

@akien-mga akien-mga deleted the glslang-fix-gcc15 branch January 30, 2025 07:28
@akien-mga
Copy link
Member Author

Cherry-picked for 4.3, 4.2, 4.1, and 4.0 branches.

@akien-mga akien-mga removed cherrypick:4.1 cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release cherrypick:4.3 Considered for cherry-picking into a future 4.3.x release labels Jan 30, 2025
hermet added a commit to thorvg/thorvg that referenced this pull request Jan 30, 2025
gcc15 is more strict at the header inclusion,
thorvg header should specify it since it reply on it.

issue: godotengine/godot#102022 (comment)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants