Accepting request 1267695 from devel:tools

OBS-URL: https://build.opensuse.org/request/show/1267695
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/unifdef?expand=0&rev=23

constexpr.patch

@@ -0,0 +1,59 @@
+
+https://github.com/fanf2/unifdef/pull/19
+
+
+From d616741e6b0d5b57b66447e85ad32b283b28adde Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 17 Nov 2024 01:26:27 +0000
+Subject: [PATCH] Don't use C23 constexpr keyword
+
+This fixes building with upcoming GCC 15 which defaults to -std=gnu23.
+---
+ unifdef.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/unifdef.c b/unifdef.c
+index dc145a2..4bd3bda 100644
+--- a/unifdef.c
++++ b/unifdef.c
+@@ -202,7 +202,7 @@ static int              depth;			/* current #if nesting */
+ static int              delcount;		/* count of deleted lines */
+ static unsigned         blankcount;		/* count of blank lines */
+ static unsigned         blankmax;		/* maximum recent blankcount */
+-static bool             constexpr;		/* constant #if expression */
++static bool             is_constexpr;		/* constant #if expression */
+ static bool             zerosyms;		/* to format symdepth output */
+ static bool             firstsym;		/* ditto */
+ 
+@@ -1086,7 +1086,7 @@ eval_unary(const struct ops *ops, long *valp, const char **cpp)
+ 			*valp = (value[sym] != NULL);
+ 			lt = *valp ? LT_TRUE : LT_FALSE;
+ 		}
+-		constexpr = false;
++		is_constexpr = false;
+ 	} else if (!endsym(*cp)) {
+ 		debug("eval%d symbol", prec(ops));
+ 		sym = findsym(&cp);
+@@ -1103,7 +1103,7 @@ eval_unary(const struct ops *ops, long *valp, const char **cpp)
+ 			lt = *valp ? LT_TRUE : LT_FALSE;
+ 			cp = skipargs(cp);
+ 		}
+-		constexpr = false;
++		is_constexpr = false;
+ 	} else {
+ 		debug("eval%d bad expr", prec(ops));
+ 		return (LT_ERROR);
+@@ -1170,10 +1170,10 @@ ifeval(const char **cpp)
+ 	long val = 0;
+ 
+ 	debug("eval %s", *cpp);
+-	constexpr = killconsts ? false : true;
++	is_constexpr = killconsts ? false : true;
+ 	ret = eval_table(eval_ops, &val, cpp);
+ 	debug("eval = %d", val);
+-	return (constexpr ? LT_IF : ret == LT_ERROR ? LT_IF : ret);
++	return (is_constexpr ? LT_IF : ret == LT_ERROR ? LT_IF : ret);
+ }
+ 
+ /*
+

unifdef.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Apr  5 15:02:48 UTC 2025 - Friedrich Haubensak <hsk17@mail.de>
+
+- Add constexpr.patch to fix gcc-15 compile time error
+  (https://github.com/fanf2/unifdef/pull/19)
+
 -------------------------------------------------------------------
 Wed Aug 10 08:15:05 UTC 2022 - Martin Liška <mliska@suse.cz>
 

unifdef.spec

@@ -25,6 +25,7 @@ Release:        0
 URL:            https://dotat.at/prog/unifdef/
 Source:         https://dotat.at/prog/unifdef/unifdef-%{version}.tar.xz
 Patch0:         fix-fgets-.-size-1.patch
+Patch1:         constexpr.patch
 BuildRequires:  xz
 
 %description