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 index 4eb6f9553d..642f6ba238 100644 --- 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 @@ -21,27 +21,23 @@ Upstream-Status: Inappropriate [oe-specific] 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 +@@ -1223,7 +1223,7 @@ '''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) +- 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 +@@ -1234,7 +1234,7 @@ 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) +-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_3.2.6.bb b/meta-gnome/recipes-gimp/gimp/gimp_3.2.8.bb similarity index 98% rename from meta-gnome/recipes-gimp/gimp/gimp_3.2.6.bb rename to meta-gnome/recipes-gimp/gimp/gimp_3.2.8.bb index 835a501a92..abc0583778 100644 --- a/meta-gnome/recipes-gimp/gimp/gimp_3.2.6.bb +++ b/meta-gnome/recipes-gimp/gimp/gimp_3.2.8.bb @@ -66,7 +66,7 @@ SRC_URI = "https://download.gimp.org/gimp/v3.2/${BP}.tar.xz \ file://0004-meson.build-dont-check-for-python3-pygobject-gexiv2-.patch \ file://0005-docs-meson.build-disable-gimprc-man-build.patch \ " -SRC_URI[sha256sum] = "40b15e90ad0c0c631b76da3c467ea9847fa5c24f37413ac5b492804860a28cd8" +SRC_URI[sha256sum] = "16a2696cadc9e03a2ef97ccb895e062f654cb2b8211fb57074db85f26646c847" PACKAGECONFIG[aa] = "-Daa=enabled,-Daa=disabled,aalib" PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib"