Compare commits
No commits in common. "rawhide" and "f41" have entirely different histories.
2 changed files with 2 additions and 93 deletions
|
|
@ -1,61 +0,0 @@
|
|||
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 <signal.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
+#include <X11/Xlib.h>
|
||||
#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;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
Name: xmountains
|
||||
Version: 2.11
|
||||
Release: 8%{?dist}
|
||||
Release: 1%{?dist}
|
||||
Summary: A fractal terrain generator
|
||||
|
||||
# SPDX confirmed
|
||||
|
|
@ -9,9 +9,6 @@ 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
|
||||
|
|
@ -20,11 +17,6 @@ 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.
|
||||
|
||||
|
|
@ -41,13 +33,12 @@ 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 -DANSI"
|
||||
make %{?_smp_mflags} CCOPTIONS="$RPM_OPT_FLAGS"
|
||||
|
||||
%install
|
||||
make install \
|
||||
|
|
@ -84,27 +75,6 @@ fi
|
|||
%{_datadir}/xscreensaver/*/*
|
||||
|
||||
%changelog
|
||||
* Sat Jul 18 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.11-8
|
||||
- Drop ix86 on F45 unavoidably as imake stopped supporting on ix86
|
||||
|
||||
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.11-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
|
||||
|
||||
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.11-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.11-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.11-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Wed Jan 15 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.11-3
|
||||
- Port to C23
|
||||
|
||||
* Wed Jan 15 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.11-2
|
||||
- use C17 for now
|
||||
|
||||
* Wed Jan 15 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.11-1
|
||||
- 2.11
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue