From 94b32ce3d51be375220b61369af0e00db623b0c3daeacee10e9c860e1127eb07 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 11 Mar 2025 14:42:56 +0000 Subject: [PATCH] Accepting request 1252075 from home:pgajdos - added patches fix build with gcc15 + plotutils-gcc15.patch OBS-URL: https://build.opensuse.org/request/show/1252075 OBS-URL: https://build.opensuse.org/package/show/Publishing/plotutils?expand=0&rev=29 --- plotutils-gcc15.patch | 26 ++++++++++++++++++++++++++ plotutils.changes | 7 +++++++ plotutils.spec | 5 ++++- 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 plotutils-gcc15.patch diff --git a/plotutils-gcc15.patch b/plotutils-gcc15.patch new file mode 100644 index 0000000..981a178 --- /dev/null +++ b/plotutils-gcc15.patch @@ -0,0 +1,26 @@ +Index: plotutils-2.6/include/sys-defines.h +=================================================================== +--- plotutils-2.6.orig/include/sys-defines.h ++++ plotutils-2.6/include/sys-defines.h +@@ -255,7 +255,7 @@ extern __C_LINKAGE void free (void * ptr + + #ifndef __cplusplus + #ifdef __STDC__ +-typedef enum { false = 0, true = 1 } bool; ++# include + #else /* not __STDC__, do things the old-fashioned way */ + typedef int bool; + #define false 0 +Index: plotutils-2.6/libxmi/sys-defines.h +=================================================================== +--- plotutils-2.6.orig/libxmi/sys-defines.h ++++ plotutils-2.6/libxmi/sys-defines.h +@@ -169,7 +169,7 @@ extern __C_LINKAGE void free (void * ptr + #ifndef __cplusplus + #ifndef HAVE_BOOL_IN_CC + #ifdef __STDC__ +-typedef enum { false = 0, true = 1 } bool; ++# include + #else /* not __STDC__, do things the old-fashioned way */ + typedef int bool; + #define false 0 diff --git a/plotutils.changes b/plotutils.changes index 24a259f..582ad11 100644 --- a/plotutils.changes +++ b/plotutils.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Mar 11 13:59:12 UTC 2025 - pgajdos@suse.com + +- added patches + fix build with gcc15 + + plotutils-gcc15.patch + ------------------------------------------------------------------- Thu Feb 29 14:35:45 UTC 2024 - Dominique Leuenberger diff --git a/plotutils.spec b/plotutils.spec index fc06a3d..2bf1bfc 100644 --- a/plotutils.spec +++ b/plotutils.spec @@ -1,7 +1,7 @@ # # spec file for package plotutils # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -38,6 +38,8 @@ Patch5: plotutils-hershey_glyphs.patch Patch6: plotutils-man-spline.patch # PATCH-FIX-UPSTREAM repairs postscript output Patch7: plotutils-postscript.patch +# build with gcc15 +Patch8: plotutils-gcc15.patch BuildRequires: bison BuildRequires: flex BuildRequires: fontpackages-devel @@ -156,6 +158,7 @@ graphics animations under the X Window System. %patch -P 5 -p0 %patch -P 6 -p0 %patch -P 7 -p0 +%patch -P 8 -p1 # Avoid update lex and bison code as otherwise we may see broken code (bnc#829479) # that is do *not* remove any lex\yacc code grep -rslE '(made by GNU Bison|A Bison parser, made from|"lex.yy.c")' . | xargs -r touch