[frobtads] Fix FTBFS
commit f6d8b1c3b5deec824e17e8b57a952a29712fe15d
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Tue Mar 17 23:17:01 2020 +0100
Fix FTBFS
frobtads-1.2.3-gcc10-fix.patch | 15 +++++++++++++++
frobtads.spec | 8 ++++++--
2 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/frobtads-1.2.3-gcc10-fix.patch b/frobtads-1.2.3-gcc10-fix.patch
new file mode 100644
index 0000000..ba01499
--- /dev/null
+++ b/frobtads-1.2.3-gcc10-fix.patch
@@ -0,0 +1,15 @@
+diff -up frobtads-1.2.3/tads3/unix/osnetunix.h~ frobtads-1.2.3/tads3/unix/osnetunix.h
+--- frobtads-1.2.3/tads3/unix/osnetunix.h~ 2013-05-17 21:52:27.000000000 +0200
++++ frobtads-1.2.3/tads3/unix/osnetunix.h 2020-03-17 23:00:59.775324251 +0100
+@@ -218,11 +218,6 @@ private:
+ # undef ATOMIC_INC_FETCH
+ # undef ATOMIC_DEC_FETCH
+ #endif
+-#ifndef __clang__
+-# if __has_builtin == 0
+-# undef __has_builtin
+-# endif
+-#endif
+
+ /* ------------------------------------------------------------------------ */
+ /*
diff --git a/frobtads.spec b/frobtads.spec
index 6748e20..d2450da 100644
--- a/frobtads.spec
+++ b/frobtads.spec
@@ -1,11 +1,12 @@
Name: frobtads
Version: 1.2.3
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Text interpreter for Tads games
License: non-commercial
URL: http://www.tads.org/frobtads.htm
Source0: http://www.tads.org/%{name}/%{name}-%{version}.tar.gz
+Patch1: frobtads-1.2.3-gcc10-fix.patch
BuildRequires: gcc-c++
BuildRequires: libcurl-devel
@@ -40,7 +41,7 @@ This package contains Tads 2 and Tads 3 compilers.
%prep
-%setup -q
+%autosetup -p1
%build
@@ -73,6 +74,9 @@ rm -rf %{buildroot}%{_datadir}/frobtads/tads3/doc
%changelog
+* Tue Mar 17 2020 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.2.3-11
+- Fix FTBFS
+
* Wed Feb 05 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> -
1.2.3-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild