From f1a242dee3607dfe1a18c1b0b8cccf7a5923d8490d992d5efaf14065446fb816 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Mon, 10 Jun 2024 12:14:01 +0000 Subject: [PATCH] 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 --- fix-gcc14-build.patch | 26 ++++++++++++++++++++++++++ gimp.changes | 5 +++++ gimp.spec | 5 +++-- 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 fix-gcc14-build.patch diff --git a/fix-gcc14-build.patch b/fix-gcc14-build.patch new file mode 100644 index 0000000..21c7fea --- /dev/null +++ b/fix-gcc14-build.patch @@ -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; + diff --git a/gimp.changes b/gimp.changes index 3342721..fa8301b 100644 --- a/gimp.changes +++ b/gimp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 21 08:45:44 UTC 2024 - Paolo Stivanin + +- Add fix-gcc14-build.patch (fix bsc#1223892) + ------------------------------------------------------------------- Mon May 6 07:20:05 UTC 2024 - Paolo Stivanin diff --git a/gimp.spec b/gimp.spec index c2cfd2f..6c8eeb2 100644 --- a/gimp.spec +++ b/gimp.spec @@ -42,6 +42,8 @@ Source: https://download.gimp.org/pub/gimp/v2.10/%{name}-%{version}.tar. Source1: macros.gimp # openSUSE palette file Source2: openSUSE.gpl +# PATCH-FIX-UPSTREAM fix-gcc14-build.patch bsc#1223892 +Patch0: fix-gcc14-build.patch BuildRequires: aalib-devel BuildRequires: alsa-devel >= 1.0.0 @@ -207,8 +209,7 @@ applications that want to make use of the GIMP libraries. %lang_package %prep -%setup -q -%autopatch -p1 +%autosetup -p1 export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8