diff --git a/meta-gnome/recipes-gimp/gimp/gimp/85bdad2b2ca7ba36a01bef945b1c4b193a2fa9d0.patch b/meta-gnome/recipes-gimp/gimp/gimp/85bdad2b2ca7ba36a01bef945b1c4b193a2fa9d0.patch deleted file mode 100644 index 3a2bf27616..0000000000 --- a/meta-gnome/recipes-gimp/gimp/gimp/85bdad2b2ca7ba36a01bef945b1c4b193a2fa9d0.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 85bdad2b2ca7ba36a01bef945b1c4b193a2fa9d0 Mon Sep 17 00:00:00 2001 -From: Nils Philippsen -Date: Wed, 29 Jan 2025 12:51:53 +0100 -Subject: [PATCH] Avoid type names and keywords - -This fixes various errors when compiling with current toolchains and/or --std=c23. - -Signed-off-by: Nils Philippsen - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gimp/-/commit/85bdad2b2ca7ba36a01bef945b1c4b193a2fa9d0.patch] -Signed-off-by: Markus Volk ---- - libgimpconfig/gimpconfig-serialize.c | 6 +++--- - plug-ins/selection-to-path/types.h | 13 ++++--------- - 2 files changed, 7 insertions(+), 12 deletions(-) - -diff --git a/libgimpconfig/gimpconfig-serialize.c b/libgimpconfig/gimpconfig-serialize.c -index 377b2371630..b3abca229d1 100644 ---- a/libgimpconfig/gimpconfig-serialize.c -+++ b/libgimpconfig/gimpconfig-serialize.c -@@ -522,10 +522,10 @@ gimp_config_serialize_value (const GValue *value, - - if (G_VALUE_HOLDS_BOOLEAN (value)) - { -- gboolean bool; -+ gboolean boolean; - -- bool = g_value_get_boolean (value); -- g_string_append (str, bool ? "yes" : "no"); -+ boolean = g_value_get_boolean (value); -+ g_string_append (str, boolean ? "yes" : "no"); - return TRUE; - } - -diff --git a/plug-ins/selection-to-path/types.h b/plug-ins/selection-to-path/types.h -index 9b040fa3a19..1521937b15e 100644 ---- a/plug-ins/selection-to-path/types.h -+++ b/plug-ins/selection-to-path/types.h -@@ -19,15 +19,10 @@ - #ifndef TYPES_H - #define TYPES_H - --/* Booleans. */ --typedef enum { false = 0, true = 1 } boolean; -- --/* The X11 library defines `FALSE' and `TRUE', and so we only want to -- define them if necessary. */ --#ifndef FALSE --#define FALSE false --#define TRUE true --#endif /* FALSE */ -+/* Cope with C23 */ -+typedef int boolean; -+#define false FALSE -+#define true TRUE - - /* The usual null-terminated string. */ - typedef char *string; --- -GitLab - diff --git a/meta-gnome/recipes-gimp/gimp/gimp_3.0.2.bb b/meta-gnome/recipes-gimp/gimp/gimp_3.0.4.bb similarity index 94% rename from meta-gnome/recipes-gimp/gimp/gimp_3.0.2.bb rename to meta-gnome/recipes-gimp/gimp/gimp_3.0.4.bb index 25a91ed1a5..32603af310 100644 --- a/meta-gnome/recipes-gimp/gimp/gimp_3.0.2.bb +++ b/meta-gnome/recipes-gimp/gimp/gimp_3.0.4.bb @@ -56,13 +56,14 @@ GIDOCGEN_MESON_OPTION = "gi-docgen" GIDOCGEN_MESON_ENABLE_FLAG = "enabled" GIDOCGEN_MESON_DISABLE_FLAG = "disabled" -SRC_URI = "https://download.gimp.org/gimp/v${@oe.utils.trim_version('${PV}', 2)}/gimp-${PV}.tar.xz" +SRC_URI = "gitsm://gitlab.gnome.org/GNOME/gimp.git;protocol=https;branch=master" SRC_URI += "file://0001-gimp-cross-compile-fix-for-bz2.patch" SRC_URI += "file://0002-meson.build-reproducibility-fix.patch" SRC_URI += "file://0001-meson.build-dont-check-for-lgi.patch" SRC_URI += "file://0001-meson.build-require-iso-codes-native.patch" -SRC_URI += "file://85bdad2b2ca7ba36a01bef945b1c4b193a2fa9d0.patch" -SRC_URI[sha256sum] = "546ddc30cb2d0e79123c7fcb4d78211e1ee7a6aace91a6a0ad8cbcbf6ea571a2" +SRCREV = "c1901c5be644ab8dcaf779b1f383bf5370bc90c6" + +S = "${WORKDIR}/git" PACKAGECONFIG[aa] = "-Daa=enabled,-Daa=disabled,aalib" PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib"