[packages/gimp] - added types patch (fixes for gcc 14); release 2

qboosh qboosh at pld-linux.org
Thu Sep 5 22:05:38 CEST 2024


commit 9d90d8ac0ca9d020522ffc9acdbc9d2b8951ba1b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Sep 5 22:02:18 2024 +0200

    - added types patch (fixes for gcc 14); release 2

 gimp-types.patch | 24 ++++++++++++++++++++++++
 gimp.spec        |  4 +++-
 2 files changed, 27 insertions(+), 1 deletion(-)
---
diff --git a/gimp.spec b/gimp.spec
index 33bb82c..1ba3f41 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -24,13 +24,14 @@ Summary(zh_CN.UTF-8):	[图像]GNU图象处理工具
 Summary(zh_TW.UTF-8):	[圖像]GNU圖象處理工具
 Name:		gimp
 Version:	2.10.38
-Release:	1
+Release:	2
 Epoch:		1
 License:	GPL v3+
 Group:		X11/Applications/Graphics
 Source0:	https://download.gimp.org/pub/gimp/v2.10/%{name}-%{version}.tar.bz2
 # Source0-md5:	b5e37c9570a8ee723debe6d3728555ae
 Patch0:		%{name}-home_etc.patch
+Patch1:		%{name}-types.patch
 Patch3:		%{name}-no-checks-for-runtime-deps.patch
 URL:		https://www.gimp.org/
 BuildRequires:	OpenEXR-devel >= 1.6.1
@@ -347,6 +348,7 @@ Wtyczka SVG dla GIMPa.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %patch3 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python,%{__python},' plug-ins/pygimp/plug-ins/gradients-save-as-css.py
diff --git a/gimp-types.patch b/gimp-types.patch
new file mode 100644
index 0000000..161a642
--- /dev/null
+++ b/gimp-types.patch
@@ -0,0 +1,24 @@
+--- gimp-2.10.38/plug-ins/file-tiff/file-tiff-load.c.orig	2024-05-03 02:33:35.000000000 +0200
++++ gimp-2.10.38/plug-ins/file-tiff/file-tiff-load.c	2024-09-05 20:59:10.593974143 +0200
+@@ -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 */
+ 
+--- gimp-2.10.38/plug-ins/metadata/metadata-editor.c.orig	2024-05-03 02:33:35.000000000 +0200
++++ gimp-2.10.38/plug-ins/metadata/metadata-editor.c	2024-09-05 21:43:47.976168927 +0200
+@@ -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;
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gimp.git/commitdiff/9d90d8ac0ca9d020522ffc9acdbc9d2b8951ba1b



More information about the pld-cvs-commit mailing list