summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2021-06-23 12:22:16 +0200
committerDavid Seifert <soap@gentoo.org>2021-06-23 12:22:16 +0200
commitb0760c366be204811b3a330a8807b92289a7b3c8 (patch)
treee8597d0ff5c7ee2e4f5528b779c6238e439ec63a
parentapp-doc/pms: Bump live ebuild to EAPI 8 (diff)
downloadgentoo-b0760c366be204811b3a330a8807b92289a7b3c8.tar.gz
gentoo-b0760c366be204811b3a330a8807b92289a7b3c8.tar.bz2
gentoo-b0760c366be204811b3a330a8807b92289a7b3c8.zip
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@gentoo.org>
-rw-r--r--games-strategy/hedgewars/files/hedgewars-1.0.0-fpc-3.2.patch23
-rw-r--r--games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild2
2 files changed, 25 insertions, 0 deletions
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 000000000000..b04dd0b69fa4
--- /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 7f1d4b6f7c5b..766ec2014dc9 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}