Accepting request 1179604 from home:polslinux:branches:graphics

- Add fix-gcc14-build.patch (fix bsc#1223892)

OBS-URL: https://build.opensuse.org/request/show/1179604
OBS-URL: https://build.opensuse.org/package/show/graphics/gimp?expand=0&rev=71
This commit is contained in:
Michael Vetter 2024-06-10 12:14:01 +00:00 committed by Git OBS Bridge
parent 904cdbbb59
commit f1a242dee3
3 changed files with 34 additions and 2 deletions

26
fix-gcc14-build.patch Normal file
View File

@ -0,0 +1,26 @@
diff -ru orig/plug-ins/file-tiff/file-tiff-load.c mod/plug-ins/file-tiff/file-tiff-load.c
--- orig/plug-ins/file-tiff/file-tiff-load.c 2024-05-03 02:33:35.000000000 +0200
+++ mod/plug-ins/file-tiff/file-tiff-load.c 2024-05-21 13:18:49.443359344 +0200
@@ -1301,8 +1301,8 @@
/* 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 */
diff -ru orig/plug-ins/metadata/metadata-editor.c mod/plug-ins/metadata/metadata-editor.c
--- orig/plug-ins/metadata/metadata-editor.c 2024-05-03 02:33:35.000000000 +0200
+++ mod/plug-ins/metadata/metadata-editor.c 2024-05-21 13:20:13.900525624 +0200
@@ -2140,7 +2140,7 @@
}
else
{
- if (! g_strv_contains (values, equiv_values[evi]))
+ if (! g_strv_contains ((const gchar * const*)values, equiv_values[evi]))
{
gchar *tmpvalue;

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue May 21 08:45:44 UTC 2024 - Paolo Stivanin <info@paolostivanin.com>
- Add fix-gcc14-build.patch (fix bsc#1223892)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 6 07:20:05 UTC 2024 - Paolo Stivanin <info@paolostivanin.com> Mon May 6 07:20:05 UTC 2024 - Paolo Stivanin <info@paolostivanin.com>

View File

@ -42,6 +42,8 @@ Source: https://download.gimp.org/pub/gimp/v2.10/%{name}-%{version}.tar.
Source1: macros.gimp Source1: macros.gimp
# openSUSE palette file # openSUSE palette file
Source2: openSUSE.gpl Source2: openSUSE.gpl
# PATCH-FIX-UPSTREAM fix-gcc14-build.patch bsc#1223892
Patch0: fix-gcc14-build.patch
BuildRequires: aalib-devel BuildRequires: aalib-devel
BuildRequires: alsa-devel >= 1.0.0 BuildRequires: alsa-devel >= 1.0.0
@ -207,8 +209,7 @@ applications that want to make use of the GIMP libraries.
%lang_package %lang_package
%prep %prep
%setup -q %autosetup -p1
%autopatch -p1
export LC_ALL=en_US.UTF-8 export LC_ALL=en_US.UTF-8
export LANG=en_US.UTF-8 export LANG=en_US.UTF-8