[gentoo-commits] repo/gentoo:master commit in: games-strategy/hedgewars/files/, games-strategy/hedgewars/

[David Seifert]

commit:     b0760c366be204811b3a330a8807b92289a7b3c8
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 23 10:22:16 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jun 23 10:22:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0760c36

games-strategy/hedgewars: Add patch for fpc 3.2 ICE

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../hedgewars/files/hedgewars-1.0.0-fpc-3.2.patch  | 23 ++++++++++++++++++++++
 .../hedgewars/hedgewars-1.0.0-r100.ebuild          |  2 ++
 2 files changed, 25 insertions(+)

diff --git a/games-strategy/hedgewars/files/hedgewars-1.0.0-fpc-3.2.patch 
b/games-strategy/hedgewars/files/hedgewars-1.0.0-fpc-3.2.patch
new file mode 100644
index 00000000000..b04dd0b69fa
--- /dev/null
+++ b/games-strategy/hedgewars/files/hedgewars-1.0.0-fpc-3.2.patch
@@ -0,0 +1,23 @@
+
+# HG changeset patch
+# User alfadur
+# Date 1597053413 -10800
+# Node ID 6832dab555aefa6ef2830d9452a9a88c89299e85
+# Parent  eee2b3eff91dec595a7cb486bcfd97036520e971
+workaround for FPC 3.2.0 ICE
+
+diff -r eee2b3eff91d -r 6832dab555ae hedgewars/uWorld.pas
+--- a/hedgewars/uWorld.pas     Sun Aug 09 14:43:02 2020 +0200
++++ b/hedgewars/uWorld.pas     Mon Aug 10 12:56:53 2020 +0300
+@@ -1168,8 +1168,8 @@
+ procedure ShiftWorld(Dir: LongInt); inline;
+ begin
+     preShiftWorldDx:= WorldDx;
+-    WorldDx:= WorldDx + LongInt(Dir * LongInt(playWidth));
+-
++    Dir := Dir * LongInt(playWidth);
++    WorldDx:= WorldDx + Dir;
+ end;
+ 
+ procedure UnshiftWorld(); inline;
+

diff --git a/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild 
b/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild
index 7f1d4b6f7c5..766ec2014dc 100644
--- a/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild
+++ b/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild
@@ -54,6 +54,8 @@ BDEPEND="
 PATCHES=(
        "${FILESDIR}/${P}-qt-5.15.patch"
        "${FILESDIR}/${PN}-1.0.0-cmake_lua_version.patch"
+       # http://hg.hedgewars.org/hedgewars/rev/6832dab555ae
+       "${FILESDIR}/${PN}-1.0.0-fpc-3.2.patch"
 )
 
 S="${WORKDIR}"/${MY_P}