Accepting request 1275086 from multimedia:apps

OBS-URL: https://build.opensuse.org/request/show/1275086 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/abcm2ps?expand=0&rev=20
- added patches
2025-05-07 17:19:51 +00:00 · 2025-05-07 06:42:21 +00:00
3 changed files with 57 additions and 1 deletions
--- a/abcm2ps-gcc15.patch
+++ b/abcm2ps-gcc15.patch
@@ -0,0 +1,47 @@
+--- abcm2ps-8.14.15.orig/format.c	2025-05-05 13:58:05.664883076 +0000
+++ abcm2ps-8.14.15/format.c	2025-05-05 14:00:01.506923468 +0000
+@@ -1158,13 +1158,13 @@ void interpret_fmt_line(char *w,		/* key
+ 		}
+ 		if (strcmp(w, "writehistory") == 0) {	/* compatibility */
+ 			struct SYMBOL *s;
+-			int bool;
+			int bool_val;
+ 			unsigned u;
+ 
+-			bool = get_bool(p);
+			bool_val = get_bool(p);
+ 			for (s = info['I' - 'A']; s != 0; s = s->next) {
+ 				u = s->text[0] - 'A';
+-				if (bool)
+				if (bool_val)
+ 					cfmt.fields[0] |= (1 << u);
+ 				else
+ 					cfmt.fields[0] &= ~(1 << u);
+@@ -1215,7 +1215,7 @@ void interpret_fmt_line(char *w,		/* key
+ 			}
+ 			break;
+ 		case 1:	{			/* %%writefields */
+-			int bool;
+			int bool_val;
+ 			unsigned u;
+ 
+ 			q = p;
+@@ -1223,7 +1223,7 @@ void interpret_fmt_line(char *w,		/* key
+ 				p++;
+ 			while (isspace((unsigned char) *p))
+ 				p++;
+-			bool = get_bool(p);
+			bool_val = get_bool(p);
+ 			while (*q != '\0' && !isspace((unsigned char) *q)) {
+ 				u = *q - 'A';
+ 				if (u < 26) {
+@@ -1235,7 +1235,7 @@ void interpret_fmt_line(char *w,		/* key
+ 					else
+ 						break;	/*fixme: error */
+ 				}
+-				if (bool)
+				if (bool_val)
+ 					cfmt.fields[i] |= (1 << u);
+ 				else
+ 					cfmt.fields[i] &= ~(1 << u);
+
--- a/abcm2ps.changes
+++ b/abcm2ps.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon May  5 14:04:42 UTC 2025 - pgajdos@suse.com
+
+- added patches
+  build with gcc15
+  + abcm2ps-gcc15.patch
+
 -------------------------------------------------------------------
 Tue Feb 20 09:57:06 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>

--- a/abcm2ps.spec
+++ b/abcm2ps.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package abcm2ps
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 # Copyright (c) 2007 by Edgar Aichinger
 #
 # All modifications and additions to the file contributed by third parties
@@ -33,6 +33,8 @@ Source4:        renaissance.fmt
 Source5:        thinlines.fmt
 # PATCH-FIX-OPENSUSE compiler_flags.patch -- aloisio@gmx.com
 Patch0:         compiler_flags.patch
+# build with gcc15
+Patch1:         abcm2ps-gcc15.patch
 BuildRequires:  pkgconfig
 # for rst2man
 BuildRequires:  python3-docutils