amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gimp-2: Fix build.

Browse source 
* 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 <maxim@guixotic.coop>
This commit is contained in:
Liliana Marie Prikler 2025-08-26 18:21:50 +02:00 • committed by Maxim Cournoyer
parent 7527222a27
commit 06f79dc2bd
No known key found for this signature in database
GPG key ID: 1260E46482E63562
4 changed files with 55 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gnu/local.mk
View file

@ -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 \

4
gnu/packages/gimp.scm
View file

@ -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

25
gnu/packages/patches/gimp-fix-metadata-editor.patch Normal file
View file

@ -0,0 +1,25 @@
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
---
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

25
gnu/packages/patches/gimp-fix-tiff-load.patch Normal file
View file

@ -0,0 +1,25 @@
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
---
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 */