1 |
commit: b0760c366be204811b3a330a8807b92289a7b3c8 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jun 23 10:22:16 2021 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 23 10:22:16 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0760c36 |
7 |
|
8 |
games-strategy/hedgewars: Add patch for fpc 3.2 ICE |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
12 |
|
13 |
.../hedgewars/files/hedgewars-1.0.0-fpc-3.2.patch | 23 ++++++++++++++++++++++ |
14 |
.../hedgewars/hedgewars-1.0.0-r100.ebuild | 2 ++ |
15 |
2 files changed, 25 insertions(+) |
16 |
|
17 |
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 |
18 |
new file mode 100644 |
19 |
index 00000000000..b04dd0b69fa |
20 |
--- /dev/null |
21 |
+++ b/games-strategy/hedgewars/files/hedgewars-1.0.0-fpc-3.2.patch |
22 |
@@ -0,0 +1,23 @@ |
23 |
+ |
24 |
+# HG changeset patch |
25 |
+# User alfadur |
26 |
+# Date 1597053413 -10800 |
27 |
+# Node ID 6832dab555aefa6ef2830d9452a9a88c89299e85 |
28 |
+# Parent eee2b3eff91dec595a7cb486bcfd97036520e971 |
29 |
+workaround for FPC 3.2.0 ICE |
30 |
+ |
31 |
+diff -r eee2b3eff91d -r 6832dab555ae hedgewars/uWorld.pas |
32 |
+--- a/hedgewars/uWorld.pas Sun Aug 09 14:43:02 2020 +0200 |
33 |
++++ b/hedgewars/uWorld.pas Mon Aug 10 12:56:53 2020 +0300 |
34 |
+@@ -1168,8 +1168,8 @@ |
35 |
+ procedure ShiftWorld(Dir: LongInt); inline; |
36 |
+ begin |
37 |
+ preShiftWorldDx:= WorldDx; |
38 |
+- WorldDx:= WorldDx + LongInt(Dir * LongInt(playWidth)); |
39 |
+- |
40 |
++ Dir := Dir * LongInt(playWidth); |
41 |
++ WorldDx:= WorldDx + Dir; |
42 |
+ end; |
43 |
+ |
44 |
+ procedure UnshiftWorld(); inline; |
45 |
+ |
46 |
|
47 |
diff --git a/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild b/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild |
48 |
index 7f1d4b6f7c5..766ec2014dc 100644 |
49 |
--- a/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild |
50 |
+++ b/games-strategy/hedgewars/hedgewars-1.0.0-r100.ebuild |
51 |
@@ -54,6 +54,8 @@ BDEPEND=" |
52 |
PATCHES=( |
53 |
"${FILESDIR}/${P}-qt-5.15.patch" |
54 |
"${FILESDIR}/${PN}-1.0.0-cmake_lua_version.patch" |
55 |
+ # http://hg.hedgewars.org/hedgewars/rev/6832dab555ae |
56 |
+ "${FILESDIR}/${PN}-1.0.0-fpc-3.2.patch" |
57 |
) |
58 |
|
59 |
S="${WORKDIR}"/${MY_P} |