From 27fead082a147cc4c02e67b199706706f22fa0a5 Mon Sep 17 00:00:00 2001 From: Jacob Boerema Date: Sat, 9 Aug 2025 11:18:25 -0400 Subject: [PATCH] libgimp: fix #14641 After new metadata code, all edge builds are failing... at devel-docs Due to me using an enum name that only ended in one word instead of the other enums also adding `SAVE_`, the enum values in the gir scanner were assigned a double name, causing API breakage and a failure to build the documentation. So, let's conform to the other enums and change the name of our enum to `GIMP_METADATA_SAVE_UPDATE`. --- libgimp/gimpimagemetadata-save.c | 4 ++-- libgimpbase/gimpmetadata.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libgimp/gimpimagemetadata-save.c b/libgimp/gimpimagemetadata-save.c index ae384bc8b7..d639685917 100644 --- a/libgimp/gimpimagemetadata-save.c +++ b/libgimp/gimpimagemetadata-save.c @@ -133,7 +133,7 @@ gimp_image_metadata_save_prepare (GimpImage *image, } if (! gimp_update_metadata ()) - *suggested_flags &= ~GIMP_METADATA_UPDATE; + *suggested_flags &= ~GIMP_METADATA_SAVE_UPDATE; /* Exif */ @@ -334,7 +334,7 @@ gimp_image_metadata_save_prepare (GimpImage *image, *suggested_flags &= ~GIMP_METADATA_SAVE_THUMBNAIL; if (! gimp_update_metadata ()) - *suggested_flags &= ~GIMP_METADATA_UPDATE; + *suggested_flags &= ~GIMP_METADATA_SAVE_UPDATE; } /* Color profile */ diff --git a/libgimpbase/gimpmetadata.h b/libgimpbase/gimpmetadata.h index 5f37292c9d..bb94cb71e4 100644 --- a/libgimpbase/gimpmetadata.h +++ b/libgimpbase/gimpmetadata.h @@ -65,7 +65,7 @@ typedef enum * Since: 2.10.10 * @GIMP_METADATA_SAVE_COMMENT: Save the image's comment * Since: 3.0 - * @GIMP_METADATA_UPDATE: Update metadata automatically + * @GIMP_METADATA_SAVE_UPDATE: Update metadata automatically * Since: 3.1 * @GIMP_METADATA_SAVE_ALL: Save all of the above * @@ -79,7 +79,7 @@ typedef enum GIMP_METADATA_SAVE_THUMBNAIL = 1 << 3, GIMP_METADATA_SAVE_COLOR_PROFILE = 1 << 4, GIMP_METADATA_SAVE_COMMENT = 1 << 5, - GIMP_METADATA_UPDATE = 1 << 6, + GIMP_METADATA_SAVE_UPDATE = 1 << 6, GIMP_METADATA_SAVE_ALL = 0xffffffff } GimpMetadataSaveFlags;