From 477e1f82c9b02c3e7e7bd3caaf6082979bf85b4e Mon Sep 17 00:00:00 2001 From: Artur Iwicki Date: Feb 06 2020 23:19:17 +0000 Subject: Fix build failures on Rawhide --- diff --git a/colobot--missing-includes.patch b/colobot--missing-includes.patch new file mode 100644 index 0000000..4b29131 --- /dev/null +++ b/colobot--missing-includes.patch @@ -0,0 +1,12 @@ +--- colobot-colobot-gold-0.1.12-alpha/src/CBot/CBotInstr/CBotExprLitString.cpp 2019-02-23 20:01:33.000000000 +0100 ++++ colobot-colobot-gold-0.1.12-alpha/src/CBot/CBotInstr/CBotExprLitString--patched.cpp 2020-02-06 23:33:22.040518099 +0100 +@@ -15,8 +15,9 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://gnu.org/licenses + */ ++#include + + #include "CBot/CBotInstr/CBotExprLitString.h" + + #include "CBot/CBotStack.h" diff --git a/colobot.spec b/colobot.spec index 29e74f0..825c5ac 100644 --- a/colobot.spec +++ b/colobot.spec @@ -2,7 +2,7 @@ Name: colobot %global orgname info.colobot.Colobot Version: 0.1.12 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A video game that teaches programming in a fun way License: GPLv3 @@ -47,6 +47,8 @@ Source120: %{musicurl}/Prototype.ogg # See: https://github.com/colobot/colobot/issues/1268 Patch0: colobot--do-not-translate-default-player-name.patch +# GCC10 complains about unknown identifiers +Patch1: colobot--missing-includes.patch BuildRequires: boost-devel >= 1.51 BuildRequires: boost-filesystem >= 1.51 @@ -100,6 +102,7 @@ Music files used by Colobot Gold. %prep %setup -q -n colobot-%{gittag} %patch0 -p1 +%patch1 -p1 rm -rf ./data cp %{SOURCE1} ./data.tgz @@ -188,6 +191,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{orgname}.app %changelog +* Fri Feb 07 2020 Artur Iwicki - 0.1.12-6 +- Add a patch to fix build failures in Rawhide + * Tue Jan 28 2020 Fedora Release Engineering - 0.1.12-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild