commit 23496a82795219fb1cacdeb54a8a6ada420c805f Author: Hans de Goede <hdegoede(a)redhat.com&gt; Date: Sun Mar 15 00:37:02 2020 +0100 Fix FTBFS d1x-gcc10.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++ d1x.spec | 7 ++++++- 2 files changed, 51 insertions(+), 1 deletion(-) --- diff --git a/d1x-gcc10.patch b/d1x-gcc10.patch new file mode 100644 index 0000000..bd2ae74 --- /dev/null +++ b/d1x-gcc10.patch @@ -0,0 +1,45 @@ +diff -up dxx-rebirth-af25483d01e444553b70cf70c2c7fb8403875f71/common/3d/clipper.cpp~ dxx-rebirth-af25483d01e444553b70cf70c2c7fb8403875f71/common/3d/clipper.cpp +--- dxx-rebirth-af25483d01e444553b70cf70c2c7fb8403875f71/common/3d/clipper.cpp~ 2018-12-18 05:39:20.000000000 +0100 ++++ dxx-rebirth-af25483d01e444553b70cf70c2c7fb8403875f71/common/3d/clipper.cpp 2020-03-14 22:56:56.867804712 +0100 +@@ -5,6 +5,8 @@ + * terms and a link to the Git history. + */ + ++#include <stdexcept> ++ + #include "3d.h" + #include "globvars.h" + #include "clipper.h" +diff -up dxx-rebirth-af25483d01e444553b70cf70c2c7fb8403875f71/common/include/physfsx.h~ dxx-rebirth-af25483d01e444553b70cf70c2c7fb8403875f71/common/include/physfsx.h +--- dxx-rebirth-af25483d01e444553b70cf70c2c7fb8403875f71/common/include/physfsx.h~ 2018-12-18 05:39:20.000000000 +0100 ++++ dxx-rebirth-af25483d01e444553b70cf70c2c7fb8403875f71/common/include/physfsx.h 2020-03-14 23:01:45.626259926 +0100 +@@ -13,6 +13,7 @@ + + #pragma once + ++#include <stdexcept> + #include <cstddef> + #include <memory> + #include <string.h> +diff -up dxx-rebirth-af25483d01e444553b70cf70c2c7fb8403875f71/common/main/segment.h~ dxx-rebirth-af25483d01e444553b70cf70c2c7fb8403875f71/common/main/segment.h +--- dxx-rebirth-af25483d01e444553b70cf70c2c7fb8403875f71/common/main/segment.h~ 2018-12-18 05:39:20.000000000 +0100 ++++ dxx-rebirth-af25483d01e444553b70cf70c2c7fb8403875f71/common/main/segment.h 2020-03-14 22:56:55.739802933 +0100 +@@ -25,6 +25,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CO + + #pragma once + ++#include <stdexcept> + #include <physfs.h> + #include <type_traits> + #include "pstypes.h" +diff -up dxx-rebirth-af25483d01e444553b70cf70c2c7fb8403875f71/similar/main/ai.cpp~ dxx-rebirth-af25483d01e444553b70cf70c2c7fb8403875f71/similar/main/ai.cpp +--- dxx-rebirth-af25483d01e444553b70cf70c2c7fb8403875f71/similar/main/ai.cpp~ 2018-12-18 05:39:20.000000000 +0100 ++++ dxx-rebirth-af25483d01e444553b70cf70c2c7fb8403875f71/similar/main/ai.cpp 2020-03-14 22:56:57.580805835 +0100 +@@ -24,6 +24,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CO + */ + + #include <algorithm> ++#include <stdexcept> + #include <cstdlib> + #include <stdio.h> + #include <time.h> diff --git a/d1x.spec b/d1x.spec index baf9682..825167c 100644 --- a/d1x.spec +++ b/d1x.spec @@ -8,7 +8,7 @@ Summary: Descent 1 game and shareware data files (d1x-rebirth version) Name: d1x Version: 1.43 -Release: 23.rebirth_v%{rebirth_version}.%{snapshotdate}git%{shortcommit}%{?dist} +Release: 24.rebirth_v%{rebirth_version}.%{snapshotdate}git%{shortcommit}%{?dist} License: non-commercial Source0: https://github.com/dxx-rebirth/dxx-rebirth/archive/%{commit}/dxx-rebirth-... Source1: d1x-rebirth.sh @@ -17,6 +17,7 @@ Source3: d1swdf.tar.gz Source4: https://www.icculus.org/d2x/data/d2shar10.tar.gz Source5: d1x-rebirth.appdata.xml Source6: d2x-rebirth.appdata.xml +Patch0: d1x-gcc10.patch URL: https://www.dxx-rebirth.com/ BuildRequires: gcc gcc-c++ libpng-devel BuildRequires: SDL-devel SDL_mixer-devel mesa-libGL-devel mesa-libGLU-devel @@ -62,6 +63,7 @@ robots-h.mvl files to the dir. %prep %setup -q -n dxx-rebirth-%{commit} -a 3 -a 4 +%patch0 -p1 # Fixup encoding and CTRL+Z at the end of the orderfrm.txt files iconv -f CP850 -t UTF-8 d1shar/ORDERFRM.TXT | head -n-3 > ORDERFRM.TXT touch -r d1shar/ORDERFRM.TXT ORDERFRM.TXT @@ -149,6 +151,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sat Mar 14 2020 Hans de Goede <j.w.r.degoede(a)gmail.com&gt; - 1.43-24.rebirth_v0.60.20181218gitaf25483 +- Fix FTBFS + * Wed Feb 05 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 1.43-23.rebirth_v0.60.20181218gitaf25483 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild