diff --git a/pioneers-15.5-gcc10.patch b/pioneers-15.5-gcc10.patch new file mode 100644 index 0000000..91fbbe7 --- /dev/null +++ b/pioneers-15.5-gcc10.patch @@ -0,0 +1,12 @@ +diff -up pioneers-15.5/common/game.h.me pioneers-15.5/common/game.h +--- pioneers-15.5/common/game.h.me 2020-02-06 12:05:24.472403768 +0100 ++++ pioneers-15.5/common/game.h 2020-02-06 12:05:45.662644226 +0100 +@@ -137,7 +137,7 @@ typedef enum { + typedef void (*WriteLineFunc) (gpointer user_data, const gchar *); + + /** Default style for a player. */ +-const gchar *default_player_style; ++extern const gchar *default_player_style; + + GameParams *params_new(void); + GameParams *params_copy(const GameParams * params); diff --git a/pioneers.spec b/pioneers.spec index a0ab909..ce549ff 100644 --- a/pioneers.spec +++ b/pioneers.spec @@ -1,11 +1,12 @@ Name: pioneers Version: 15.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Turnbased board strategy game (colonize an island) License: GPLv2+ URL: http://pio.sourceforge.net/ Source0: http://downloads.sourceforge.net/pio/%{name}-%{version}.tar.gz Patch0: pioneers-15.5-sanitize.patch +Patch1: pioneers-15.5-gcc10.patch BuildRequires: gcc BuildRequires: libgnome-devel gtk2-devel gettext scrollkeeper intltool BuildRequires: itstool @@ -39,7 +40,7 @@ edited graphically. %prep %setup -q %patch0 -p1 -z .sanitize - +%patch1 -p1 -b .gcc10 %build # pioneers uses some GNU extensions @@ -142,6 +143,9 @@ scrollkeeper-update -q || : %{_datadir}/icons/hicolor/scalable/apps/%{name}-editor.svg %changelog +* Thu Feb 06 2020 Than Ngo - 15.5-3 +- fix FTBFS against gcc10 + * Thu Jan 30 2020 Fedora Release Engineering - 15.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild