From 51b1b2c1b0223c075790778a0e7d1270789941f2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 15 Jan 2025 22:37:46 +0900 Subject: [PATCH 1/7] Use C17 for now --- xmountains.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xmountains.spec b/xmountains.spec index c767f29..04f2ddd 100644 --- a/xmountains.spec +++ b/xmountains.spec @@ -1,6 +1,6 @@ Name: xmountains Version: 2.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A fractal terrain generator # SPDX confirmed @@ -38,7 +38,7 @@ This package adds XScreenSaver integration. %build xmkmf -make %{?_smp_mflags} CCOPTIONS="$RPM_OPT_FLAGS" +make %{?_smp_mflags} CCOPTIONS="$RPM_OPT_FLAGS -std=gnu17" %install make install \ @@ -75,6 +75,9 @@ fi %{_datadir}/xscreensaver/*/* %changelog +* Wed Jan 15 2025 Mamoru TASAKA - 2.11-2 +- use C17 for now + * Wed Jan 15 2025 Mamoru TASAKA - 2.11-1 - 2.11 From 2d35c0868e44cf7b2a51a5700018fbdcca4f0525 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 16 Jan 2025 01:03:40 +0900 Subject: [PATCH 2/7] Fix compilation with C23 --- xmountains-2.11-c23.patch | 61 +++++++++++++++++++++++++++++++++++++++ xmountains.spec | 11 +++++-- 2 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 xmountains-2.11-c23.patch diff --git a/xmountains-2.11-c23.patch b/xmountains-2.11-c23.patch new file mode 100644 index 0000000..b0340d4 --- /dev/null +++ b/xmountains-2.11-c23.patch @@ -0,0 +1,61 @@ +diff --git a/X_graphics.c b/X_graphics.c +index 3b5d7b2..ceef856 100644 +--- a/X_graphics.c ++++ b/X_graphics.c +@@ -80,8 +80,7 @@ TRUE, + void finish_artist(); + + /*{{{void zap_events(int snooze)*/ +-void zap_events(snooze) +-int snooze; ++void zap_events() + { + XEvent event; + XExposeEvent *expose = (XExposeEvent *)&event; +@@ -427,7 +426,7 @@ Gun *blue; + XMapWindow(dpy, win ); + } + XClearWindow(dpy,win); +- zap_events(0); ++ zap_events(); + + gptr->graph_width = graph_width; + gptr->graph_height = graph_height; +diff --git a/xmountains.c b/xmountains.c +index 6968b92..108b492 100644 +--- a/xmountains.c ++++ b/xmountains.c +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + #include "crinkle.h" + #include "paint.h" + #include "patchlevel.h" +@@ -78,7 +79,6 @@ int my_getopt (int argc, char **argv, char *pat) + } + /* }}} */ + +-double atof(); + #ifdef ANSI + void init_graphics (int, Window, int,int, Graph *, Gun *, Gun *, Gun *); + void clear_col( int ); +@@ -95,7 +95,7 @@ void scroll_screen (); + void zap_events(); + #endif + +-void finish_prog(); ++void finish_prog(int); + + int s_height=768, s_width=1024; + int mapwid; +@@ -483,7 +483,7 @@ int main (int argc, char **argv) + + extern int quit_xmount; + +-void finish_prog() ++void finish_prog(int) + { + /* The next time zap_events is called the program will quit */ + quit_xmount=TRUE; diff --git a/xmountains.spec b/xmountains.spec index 04f2ddd..38ad7ca 100644 --- a/xmountains.spec +++ b/xmountains.spec @@ -1,6 +1,6 @@ Name: xmountains Version: 2.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A fractal terrain generator # SPDX confirmed @@ -9,6 +9,9 @@ URL: https://spbooth.github.io/xmountains/ Source0: https://github.com/spbooth/xmountains/archive/v%{version}/%{name}-%{version}.tar.gz Source11: xscreensaver-xmountains.xml Source12: xscreensaver-xmountains.conf +# Need report to the upstream +# Fix for C23 +Patch0: xmountains-2.11-c23.patch BuildRequires: make BuildRequires: gcc @@ -33,12 +36,13 @@ This package adds XScreenSaver integration. %prep %setup -q +%patch -P0 -p1 -b .c23 %global optflags %optflags -Werror=implicit-function-declaration %build xmkmf -make %{?_smp_mflags} CCOPTIONS="$RPM_OPT_FLAGS -std=gnu17" +make %{?_smp_mflags} CCOPTIONS="$RPM_OPT_FLAGS -DANSI" %install make install \ @@ -75,6 +79,9 @@ fi %{_datadir}/xscreensaver/*/* %changelog +* Wed Jan 15 2025 Mamoru TASAKA - 2.11-3 +- Port to C23 + * Wed Jan 15 2025 Mamoru TASAKA - 2.11-2 - use C17 for now From 134eb2a65581035dd9d96373a8ef2af3a7eef8f7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:04:28 +0000 Subject: [PATCH 3/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xmountains.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmountains.spec b/xmountains.spec index 38ad7ca..3d9b623 100644 --- a/xmountains.spec +++ b/xmountains.spec @@ -1,6 +1,6 @@ Name: xmountains Version: 2.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A fractal terrain generator # SPDX confirmed @@ -79,6 +79,9 @@ fi %{_datadir}/xscreensaver/*/* %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jan 15 2025 Mamoru TASAKA - 2.11-3 - Port to C23 From 9e78bf3f4b4f493491b2895f7b1c1b3f3dd769fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:57:36 +0000 Subject: [PATCH 4/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xmountains.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmountains.spec b/xmountains.spec index 3d9b623..43c59e2 100644 --- a/xmountains.spec +++ b/xmountains.spec @@ -1,6 +1,6 @@ Name: xmountains Version: 2.11 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A fractal terrain generator # SPDX confirmed @@ -79,6 +79,9 @@ fi %{_datadir}/xscreensaver/*/* %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.11-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 2.11-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 17133e5e4d668d33a1876b81f12f1e111d5e900c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:47:18 +0000 Subject: [PATCH 5/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xmountains.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmountains.spec b/xmountains.spec index 43c59e2..6019cf3 100644 --- a/xmountains.spec +++ b/xmountains.spec @@ -1,6 +1,6 @@ Name: xmountains Version: 2.11 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A fractal terrain generator # SPDX confirmed @@ -79,6 +79,9 @@ fi %{_datadir}/xscreensaver/*/* %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 2.11-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 2.11-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 86811b27c3626b045080b20095e38895e92364a8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:19:57 +0000 Subject: [PATCH 6/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- xmountains.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmountains.spec b/xmountains.spec index 6019cf3..6fd1f8d 100644 --- a/xmountains.spec +++ b/xmountains.spec @@ -1,6 +1,6 @@ Name: xmountains Version: 2.11 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A fractal terrain generator # SPDX confirmed @@ -79,6 +79,9 @@ fi %{_datadir}/xscreensaver/*/* %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 2.11-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 2.11-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 6ed9da79114e283eb6180c449fa939482e414bfd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 18 Jul 2026 23:33:05 +0900 Subject: [PATCH 7/7] Drop ix86 on F45 unavoidably as imake stopped supporting on ix86 --- xmountains.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/xmountains.spec b/xmountains.spec index 6fd1f8d..75fd1b2 100644 --- a/xmountains.spec +++ b/xmountains.spec @@ -1,6 +1,6 @@ Name: xmountains Version: 2.11 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A fractal terrain generator # SPDX confirmed @@ -20,6 +20,11 @@ BuildRequires: xorg-x11-proto-devel BuildRequires: libX11-devel BuildRequires: imake +%if 0%{?fedora} >= 45 +# imake not available on i686 +ExcludeArch: %{ix86} +%endif + %description Xmountains is a fractal terrain generator written by Stephen Booth. @@ -79,6 +84,9 @@ fi %{_datadir}/xscreensaver/*/* %changelog +* Sat Jul 18 2026 Mamoru TASAKA - 2.11-8 +- Drop ix86 on F45 unavoidably as imake stopped supporting on ix86 + * Fri Jul 17 2026 Fedora Release Engineering - 2.11-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild