diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0004-meson.build-dont-check-for-python3-pygobject-gexiv2-.patch b/meta-gnome/recipes-gimp/gimp/gimp/0004-meson.build-dont-check-for-python3-pygobject-gexiv2-.patch new file mode 100644 index 0000000000..4eb6f9553d --- /dev/null +++ b/meta-gnome/recipes-gimp/gimp/gimp/0004-meson.build-dont-check-for-python3-pygobject-gexiv2-.patch @@ -0,0 +1,47 @@ +From d00c3c9fb8267f53cf730b8441a7d7f904af5215 Mon Sep 17 00:00:00 2001 +From: Markus Volk +Date: Mon, 20 Apr 2026 09:14:50 +0200 +Subject: [PATCH] meson.build: dont check for python3-pygobject gexiv2 support +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We only provide support for gexiv2 in python3-pygobject for the target, but +unfortunately this feature is being requested for the native version, which +would require gexiv2-native to be compilable — something I consider quite +hard to achieve and maybe also not desirable at all. + +Remove the test for this feature, since we know that our target provides it. + +Signed-off-by: Markus Volk + +Upstream-Status: Inappropriate [oe-specific] +--- + meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 4f6f8ce9a4..4509cd2c39 100644 +--- a/meson.build ++++ b/meson.build +@@ -1224,7 +1224,7 @@ foreach py : py_candidates + '''except (ImportError):''', + ''' sys.exit(1)''']), + check: false).returncode() == 0 +- if pygobject_found.returncode() == 0 and pygobject_found.stdout().strip().version_compare(pygobject_minver) and pygobject_gexiv2_found ++ if pygobject_found.returncode() == 0 and pygobject_found.stdout().strip().version_compare(pygobject_minver) + break + endif + endif +@@ -1235,7 +1235,7 @@ if not python.found() or not python.language_version().version_compare(python3_m + endif + message('Found Python @0@'.format(python.language_version())) + +-if pygobject_found.returncode() != 0 or not pygobject_found.stdout().strip().version_compare(pygobject_minver) or not pygobject_gexiv2_found ++if pygobject_found.returncode() != 0 or not pygobject_found.stdout().strip().version_compare(pygobject_minver) + error('No suitable PyGObject (with GExiv2 submodule) found. Minimum supported version: @0@'.format(pygobject_minver)) + endif + message('Found PyGObject: @0@'.format(pygobject_found.stdout().strip())) +-- +2.53.0 + diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0005-docs-meson.build-disable-gimprc-man-build.patch b/meta-gnome/recipes-gimp/gimp/gimp/0005-docs-meson.build-disable-gimprc-man-build.patch new file mode 100644 index 0000000000..91e7f92336 --- /dev/null +++ b/meta-gnome/recipes-gimp/gimp/gimp/0005-docs-meson.build-disable-gimprc-man-build.patch @@ -0,0 +1,33 @@ +From 47948d14777438ca5e8619a1f9293db28af88305 Mon Sep 17 00:00:00 2001 +From: Markus Volk +Date: Mon, 20 Apr 2026 09:24:38 +0200 +Subject: [PATCH] docs/meson.build: disable gimprc man build + +This would require a native variant of gimp-console + +Signed-off-by: Markus Volk + +Upstream-Status: Inappropriate [oe-specific] +--- + docs/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/docs/meson.build b/docs/meson.build +index 70b57b52ef..d36e47dbb5 100644 +--- a/docs/meson.build ++++ b/docs/meson.build +@@ -16,9 +16,9 @@ gimprc_man = custom_target('gimprc-' + gimp_app_version + '.5', + command: [ gimp_exe, '--no-interface', + '--dump-gimprc-manpage' ], + capture: true, +- build_by_default: true, ++ build_by_default: false, + env: gimp_run_env, +- install: true, ++ install: false, + install_dir: get_option('mandir') / 'man5') + + gimptool_man = configure_file(input : 'gimptool.1.in', +-- +2.53.0 + diff --git a/meta-gnome/recipes-gimp/gimp/gimp_3.2.0.bb b/meta-gnome/recipes-gimp/gimp/gimp_3.2.4.bb similarity index 93% rename from meta-gnome/recipes-gimp/gimp/gimp_3.2.0.bb rename to meta-gnome/recipes-gimp/gimp/gimp_3.2.4.bb index 1b092eb7e5..82c68346eb 100644 --- a/meta-gnome/recipes-gimp/gimp/gimp_3.2.0.bb +++ b/meta-gnome/recipes-gimp/gimp/gimp_3.2.4.bb @@ -37,6 +37,7 @@ DEPENDS = " \ poppler \ poppler-data \ python3-pygobject-native \ + python3-pycairo-native \ tiff \ xz \ zlib \ @@ -62,8 +63,10 @@ SRC_URI = "https://download.gimp.org/gimp/v3.2/${BP}.tar.xz \ file://0001-meson.build-dont-check-for-lgi.patch \ file://0002-meson.build-use-relative-path-for-ISO_CODES_LOCATION.patch \ file://0003-meson.build-reproducibility-fix.patch \ + file://0004-meson.build-dont-check-for-python3-pygobject-gexiv2-.patch \ + file://0005-docs-meson.build-disable-gimprc-man-build.patch \ " -SRC_URI[sha256sum] = "2618391416e51be3c693df9ef90e3860ed72ab3d36363ea1f196e30b75b2e083" +SRC_URI[sha256sum] = "7312bc53e9c6d2d0056ca7b93f1c6b98707946dd934f714c21b8746ecb601588" PACKAGECONFIG[aa] = "-Daa=enabled,-Daa=disabled,aalib" PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib" @@ -132,7 +135,7 @@ do_install:prepend() { FILES:${PN} += "${datadir}/metainfo" -RDEPENDS:${PN} = "mypaint-brushes glib-networking python3-pygobject" +RDEPENDS:${PN} = "mypaint-brushes glib-networking python3-pygobject python3-pycairo" CVE_STATUS[CVE-2007-3741] = "not-applicable-platform: This only applies for Mandriva Linux" CVE_STATUS[CVE-2025-8672] = "not-applicable-config: the vulnerability only affects MacOS"