CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

gimp: Upgrade to 2.10.38

Browse Source 
Fix build with GCC-14 with few backports while here

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2024-05-20 16:33:35 -07:00
parent d6dd4b89b6
commit 7b02f14be9
No known key found for this signature in database
GPG Key ID: BB053355919D3314
3 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
meta-gnome/recipes-gimp/gimp/gimp/0001-file-tiff-load-fix-mismatching-variable-type.patch Normal file
View File

@ -0,0 +1,24 @@
From a2458f1528e5733574bb26ff5452b1329116e6db Mon Sep 17 00:00:00 2001
From: Simon Budig <simon@budig.de>
Date: Sat, 20 May 2023 18:40:41 +0200
Subject: [PATCH] file-tiff-load: fix mismatching variable type
Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gimp/-/commit/a2458f1528e5733574bb26ff5452b1329116e6db]
Signed-off-by: Khem Raj <raj.khem@gmai.com>
---
plug-ins/file-tiff/file-tiff-load.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/plug-ins/file-tiff/file-tiff-load.c
+++ b/plug-ins/file-tiff/file-tiff-load.c
@@ -1301,8 +1301,8 @@ load_image (GFile *file,
/* any resolution info in the file? */
{
- gfloat xres = 72.0;
- gfloat yres = 72.0;
+ gdouble xres = 72.0;
+ gdouble yres = 72.0;
gushort read_unit;
GimpUnit unit = GIMP_UNIT_PIXEL; /* invalid unit */

22
meta-gnome/recipes-gimp/gimp/gimp/0001-metadata-shut-up-a-weird-warning.patch Normal file
View File

@ -0,0 +1,22 @@
From 51311f913d9f417d121f59b83d560c7b4b853d1c Mon Sep 17 00:00:00 2001
From: Simon Budig <simon@budig.de>
Date: Sat, 20 May 2023 22:25:40 +0200
Subject: [PATCH] metadata: shut up a weird warning
Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gimp/-/commit/51311f913d9f417d121f59b83d560c7b4b853d1c]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
plug-ins/metadata/metadata-editor.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/plug-ins/metadata/metadata-editor.c
+++ b/plug-ins/metadata/metadata-editor.c
@@ -2140,7 +2140,7 @@ metadata_dialog_editor_set_metadata (GEx
}
else
{
- if (! g_strv_contains (values, equiv_values[evi]))
+ if (! g_strv_contains ((const gchar * const *) values, equiv_values[evi]))
{
gchar *tmpvalue;

7
meta-gnome/recipes-gimp/gimp/gimp_2.10.36.bb → meta-gnome/recipes-gimp/gimp/gimp_2.10.38.bb
View File

@ -46,8 +46,11 @@ SHPV = "${@gnome_verdir("${PV}")}"
SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2 \
file://0001-configure-Keep-first-line-of-compiler-version-string.patch \
file://0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch"
SRC_URI[sha256sum] = "3d3bc3c69a4bdb3aea9ba2d5385ed98ea03953f3857aafd1d6976011ed7cdbb2"
file://0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch \
file://0001-file-tiff-load-fix-mismatching-variable-type.patch \
file://0001-metadata-shut-up-a-weird-warning.patch \
"
SRC_URI[sha256sum] = "50a845eec11c8831fe8661707950f5b8446e35f30edfb9acf98f85c1133f856e"
EXTRA_OECONF = "--disable-python \
--without-webkit \