guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 06f79dc2bd44ca292dade633d344c3f70749b9e7
Author: Liliana Marie Prikler <[email protected]>
AuthorDate: Tue Aug 26 18:21:50 2025 +0200
gnu: gimp-2: Fix build.
* gnu/packages/patches/gimp-fix-metadata-editor.patch: New file.
* gnu/packages/patches/gimp-fix-tiff-load.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register them here.
* gnu/packages/gimp.scm (gimp-2) [source] <patches>: Apply them.
Fixes: #1676
Change-Id: I6524d7e4f90f56d75f69a3b65e0ee6627924258c
Signed-off-by: Maxim Cournoyer <[email protected]>
---
gnu/local.mk | 2 ++
gnu/packages/gimp.scm | 4 +++-
.../patches/gimp-fix-metadata-editor.patch | 25 ++++++++++++++++++++++
gnu/packages/patches/gimp-fix-tiff-load.patch | 25 ++++++++++++++++++++++
4 files changed, 55 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index dc31d028db..abaf016c8c 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1439,6 +1439,8 @@ dist_patch_DATA =
\
%D%/packages/patches/ghostscript-no-header-id.patch \
%D%/packages/patches/ghostscript-no-header-uuid.patch \
%D%/packages/patches/ghostscript-no-header-creationdate.patch \
+ %D%/packages/patches/gimp-fix-metadata-editor.patch \
+ %D%/packages/patches/gimp-fix-tiff-load.patch \
%D%/packages/patches/git-filter-repo-generate-doc.patch \
%D%/packages/patches/gklib-suitesparse.patch \
%D%/packages/patches/glib-appinfo-watch.patch \
diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index 4a0fa38f0c..2a662752ba 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -349,7 +349,9 @@ buffers.")
(version-major+minor version)
"/gimp-" version ".tar.bz2"))
(sha256
- (base32 "0vl57w9w31cgz6nbkpqfycsnwi5qym87jw31hvz3320wq7p4ba2h"))))
+ (base32 "0vl57w9w31cgz6nbkpqfycsnwi5qym87jw31hvz3320wq7p4ba2h"))
+ (patches (search-patches "gimp-fix-tiff-load.patch"
+ "gimp-fix-metadata-editor.patch"))))
(build-system gnu-build-system)
(outputs '("out"
"doc")) ; 9 MiB of gtk-doc HTML
diff --git a/gnu/packages/patches/gimp-fix-metadata-editor.patch
b/gnu/packages/patches/gimp-fix-metadata-editor.patch
new file mode 100644
index 0000000000..848227ff4b
--- /dev/null
+++ b/gnu/packages/patches/gimp-fix-metadata-editor.patch
@@ -0,0 +1,25 @@
+From 51311f913d9f417d121f59b83d560c7b4b853d1c Mon Sep 17 00:00:00 2001
+From: Simon Budig <[email protected]>
+Date: Sat, 20 May 2023 22:25:40 +0200
+Subject: [PATCH] metadata: shut up a weird warning
+
+---
+ plug-ins/metadata/metadata-editor.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plug-ins/metadata/metadata-editor.c
b/plug-ins/metadata/metadata-editor.c
+index a3992e40ddc..5bf6ef709f1 100644
+--- a/plug-ins/metadata/metadata-editor.c
++++ b/plug-ins/metadata/metadata-editor.c
+@@ -2846,7 +2846,7 @@ metadata_dialog_editor_set_metadata (GExiv2Metadata
*metadata,
+ }
+ else
+ {
+- if (! g_strv_contains (values,
equiv_values[evi]))
++ if (! g_strv_contains ((const gchar * const *)
values, equiv_values[evi]))
+ {
+ gchar *tmpvalue;
+
+--
+GitLab
+
diff --git a/gnu/packages/patches/gimp-fix-tiff-load.patch
b/gnu/packages/patches/gimp-fix-tiff-load.patch
new file mode 100644
index 0000000000..ba12d0892f
--- /dev/null
+++ b/gnu/packages/patches/gimp-fix-tiff-load.patch
@@ -0,0 +1,25 @@
+From a2458f1528e5733574bb26ff5452b1329116e6db Mon Sep 17 00:00:00 2001
+From: Simon Budig <[email protected]>
+Date: Sat, 20 May 2023 18:40:41 +0200
+Subject: [PATCH] file-tiff-load: fix mismatching variable type
+
+---
+ plug-ins/file-tiff/file-tiff-load.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/plug-ins/file-tiff/file-tiff-load.c
b/plug-ins/file-tiff/file-tiff-load.c
+index 0aafbaec5fd..a26e7af2752 100644
+--- a/plug-ins/file-tiff/file-tiff-load.c
++++ b/plug-ins/file-tiff/file-tiff-load.c
+@@ -1297,8 +1297,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 */
+
+
