diff --git a/.gitignore b/.gitignore index 323fe9b..b797dc5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ xmountains_2.8.tar.gz /xmountains_2.9-D20170103git3ba444a4f7a6835e4a717c46f95802faea03eaf5.tar.gz +/xmountains-2.11.tar.gz diff --git a/sources b/sources index 4cbf332..59fa754 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmountains_2.9-D20170103git3ba444a4f7a6835e4a717c46f95802faea03eaf5.tar.gz) = fde76ed5dc4461617e548b729d45ddcac186d3078c55837abb5d2629caeaf6b42399dbd34d583583ff5a70f0fb88b67f7a10b66c0649cf435f8630028f1c5115 +SHA512 (xmountains-2.11.tar.gz) = 0c9f9d66d6288ad1bdbc76b0bc35f66f9baa3842da2fd55a434ee9e52d6ac18deb1fb3930456ad45422074814657008471edde5ac42b628b843adf4b794efd33 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-2.9-fno-common.patch b/xmountains-2.9-fno-common.patch deleted file mode 100644 index 330ace2..0000000 --- a/xmountains-2.9-fno-common.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xmountains-2.9/xmountains.c.fnocommon 2020-02-02 09:59:17.097612406 +0900 -+++ xmountains-2.9/xmountains.c 2020-02-02 10:13:25.882374425 +0900 -@@ -17,7 +17,7 @@ - char scroll_Id[]="$Id: xmountains.c,v 1.43 2010/12/17 09:25:36 spb Exp $"; - extern Graph g; - Parm fold_param; --char *display; -+extern char *display; - extern char *geom; - - extern int swosh; diff --git a/xmountains-2.9-implicit.patch b/xmountains-2.9-implicit.patch deleted file mode 100644 index 8f265a9..0000000 --- a/xmountains-2.9-implicit.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- xmountains-2.9/xmountains.c.implicit 2017-01-03 17:25:51.000000000 +0900 -+++ xmountains-2.9/xmountains.c 2020-02-02 09:59:17.097612406 +0900 -@@ -1,6 +1,7 @@ - - #include - #include -+#include - #include - #include - #include -@@ -143,6 +144,7 @@ void print_algorithm(); - void seed_uni(int ijkl); - void plot_column(Graph *g); - -+int - main (argc,argv) - int argc; - char **argv; diff --git a/xmountains.spec b/xmountains.spec index 97a6dae..75fd1b2 100644 --- a/xmountains.spec +++ b/xmountains.spec @@ -1,43 +1,30 @@ -%global usegit 1 -%global mainrel 4 - -%global githash 3ba444a4f7a6835e4a717c46f95802faea03eaf5 -%global shorthash %(TMP=%githash ; echo ${TMP:0:10}) -%global gitdate Tue, 3 Jan 2017 08:25:51 +0000 -%global gitdate_num 20170103 - -%if 0%{?usegit} >= 1 -%global fedorarel %{mainrel}.D%{gitdate_num}git%{shorthash} -%else -%global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} -%endif - Name: xmountains -Version: 2.9 -Release: %{fedorarel}%{?dist}.2 +Version: 2.11 +Release: 8%{?dist} Summary: A fractal terrain generator -License: MIT +# SPDX confirmed +License: HPND URL: https://spbooth.github.io/xmountains/ -%if 0%{?usegit} >= 1 -Source0: https://github.com/spbooth/xmountains/archive/%{githash}/%{name}_%{version}-D%{gitdate_num}git%{githash}.tar.gz -%else -Source0: http://www2.epcc.ed.ac.uk/~spb/xmountains/xmountains_%{version}.tar.gz -%endif +Source0: https://github.com/spbooth/xmountains/archive/v%{version}/%{name}-%{version}.tar.gz Source11: xscreensaver-xmountains.xml Source12: xscreensaver-xmountains.conf -# Support -Werror=impliciti-function-declaration -Patch1: xmountains-2.9-implicit.patch -# Support gcc10 -fno-common -Patch2: xmountains-2.9-fno-common.patch +# Need report to the upstream +# Fix for C23 +Patch0: xmountains-2.11-c23.patch -BuildRequires: make +BuildRequires: make BuildRequires: gcc BuildRequires: xorg-x11-xbitmaps 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. @@ -53,19 +40,14 @@ This package adds XScreenSaver integration. %prep -%if 0%{?usegit} >= 1 -%setup -q -n xmountains-%{githash} -%else -%setup -q -c -%endif -%patch1 -p1 -b .implicit -%patch2 -p1 -b .fnocommon +%setup -q +%patch -P0 -p1 -b .c23 %global optflags %optflags -Werror=implicit-function-declaration %build xmkmf -make %{?_smp_mflags} CCOPTIONS="$RPM_OPT_FLAGS" +make %{?_smp_mflags} CCOPTIONS="$RPM_OPT_FLAGS -DANSI" %install make install \ @@ -102,6 +84,54 @@ 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 + +* 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 + +* 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 + +* Wed Jan 15 2025 Mamoru TASAKA - 2.11-2 +- use C17 for now + +* Wed Jan 15 2025 Mamoru TASAKA - 2.11-1 +- 2.11 + +* Sat Jul 20 2024 Fedora Release Engineering - 2.9-8.D20170103git3ba444a4f7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Mar 22 2024 Mamoru TASAKA - 2.9-7.D20170103git3ba444a4f7 +- SPDX migration + +* Sat Jan 27 2024 Fedora Release Engineering - 2.9-6.D20170103git3ba444a4f7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Mamoru TASAKA - 2.9-5.D20170103git3ba444a4f7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 2.9-4.D20170103git3ba444a4f7.6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 2.9-4.D20170103git3ba444a4f7.5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 2.9-4.D20170103git3ba444a4f7.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 2.9-4.D20170103git3ba444a4f7.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jan 28 2021 Fedora Release Engineering - 2.9-4.D20170103git3ba444a4f7.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild