Repository navigation
Disable flag_enum import for GIR enumerations (GLib 2.88) - #10
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix GIO build with GLib 2.88 (
G_GNUC_FLAG_ENUM)Problem
GLib 2.88 added
G_GNUC_FLAG_ENUM(__attribute__((flag_enum))) to many enums in its headers. When a C enum has that attribute, Swift imports it as anOptionSetinstead of a plain C enum:That's fine for types the GIR describes as
<bitfield>. However, a few types are<enumeration>in the GIR but flag enums in the C headers. gir2swift generates code for these that uses the global C constants, and that code no longer compiles:Fix
Add
Sources/CGLib/CGLib.apinoteswithFlagEnum: falsefor the affected types. Clang applies API notes when it loads the module, so these enums import the way they did before GLib 2.88. The headers stay unchanged, and there are no Swift source changes.Affected types:
GIOModuleScopeFlagsGTlsCertificateRequestFlagsGTlsDatabaseLookupFlagsWith older GLib releases these types have no
flag_enumattribute, so the notes do nothing there and builds against older GLib are unaffected.Testing