xmbdfed-4.7-gcc10.patch

@@ -1,11 +0,0 @@
-diff -up xmbdfed-4.7/setup.c.gcc10 xmbdfed-4.7/setup.c
---- xmbdfed-4.7/setup.c.gcc10	2020-02-01 05:51:05.788798755 -0500
-+++ xmbdfed-4.7/setup.c	2020-02-01 05:51:15.643593665 -0500
-@@ -92,7 +92,6 @@ typedef struct {
-     Boolean saved;
- } MXFEditorSetup;
- 
--unsigned long active_editor;
- static MXFEditorSetup setup;
- static MXFEditorOtherOptions other;
- 

xmbdfed-4.7-gcc15.patch

@@ -1,12 +0,0 @@
-diff -up xmbdfed-4.7/bdfgrab.c.c23 xmbdfed-4.7/bdfgrab.c
---- xmbdfed-4.7/bdfgrab.c.c23	2025-02-21 18:20:45.990604573 -0500
-+++ xmbdfed-4.7/bdfgrab.c	2025-02-21 18:21:00.166078557 -0500
-@@ -276,7 +276,7 @@ void *data;
-     XCharStruct *cp;
-     bdf_property_t *pp, prop;
-     bdf_callback_struct_t cb;
--    int (*old_error_handler)();
-+    int (*old_error_handler)(Display *d, XErrorEvent *event);
- 
-     if (f == 0)
-       return 0;

xmbdfed.spec

@@ -1,8 +1,9 @@
 Name:		xmbdfed
 Summary: 	Bitmap Font Editor
 Version:	4.7
-Release:	42%{?dist}
+Release:	24%{?dist}
 License:	MIT
+Group:		Applications/System
 Source0:	http://crl.nmsu.edu/~mleisher/%{name}-%{version}.tar.bz2
 Source1:	http://crl.nmsu.edu/~mleisher/%{name}.png
 Source2:	xmbdfed.desktop
@@ -11,10 +12,7 @@ Patch1:		xmbdfed-4.7-linux.patch
 Patch2:		xmbdfed-4.7-staticfix.patch
 Patch3:		xmbdfed-4.7-getline.patch
 Patch4:		xmbdfed-4.7-format-security.patch
-Patch5:		xmbdfed-4.7-gcc10.patch
-Patch6:		xmbdfed-4.7-gcc15.patch
 URL:		http://crl.nmsu.edu/~mleisher/xmbdfed.html
-BuildRequires: make
 BuildRequires:  gcc
 BuildRequires:	freetype-devel, libXpm-devel, libXmu-devel
 %if 0%{?fedora} >= 24
@@ -34,13 +32,11 @@ editing font properties. The editor works natively with BDF fonts.
 
 %prep
 %setup -q 
-%patch -P0 -p0 -b .patch1
-%patch -P1 -p1 -b .linux
-%patch -P2 -p1 -b .staticfix
-%patch -P3 -p1 -b .getline
-%patch -P4 -p1 -b .format-security
-%patch -P5 -p1 -b .gcc10
-%patch -P6 -p1 -b .gcc15
+%patch0 -p0 -b .patch1
+%patch1 -p1 -b .linux
+%patch2 -p1 -b .staticfix
+%patch3 -p1 -b .getline
+%patch4 -p1 -b .format-security
 
 %build
 make %{?_smp_mflags} CFLAGS="%{optflags}"
@@ -66,61 +62,6 @@ desktop-file-install					\
 %{_mandir}/man1/xmbdfed*
 
 %changelog
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.7-42
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.7-41
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.7-40
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Fri Feb 21 2025 Tom Callaway <spot@fedoraproject.org> - 4.7-39
-- am i wrong for keeping a motif app alive in 2025? No, it is the kids who are wrong.
-- uh, apply fix for compiling with c23 (gcc15)
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.7-38
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.7-37
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.7-36
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.7-35
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.7-34
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.7-33
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.7-32
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.7-31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.7-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.7-29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat Feb  1 2020 Tom Callaway <spot@fedoraproject.org> - 4.7-28
-- fix FTBFS
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.7-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.7-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.7-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.7-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild