| 1 |
commit: 6d82be32bf8c68eb840d79e43fe86b0a1aac604e |
| 2 |
Author: Peter Levine <plevine457 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Aug 5 07:13:55 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 13 11:03:12 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d82be32 |
| 7 |
|
| 8 |
games-strategy/ja2-stracciatella: Fix building with GCC-6 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=600082 |
| 11 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/5300 |
| 13 |
|
| 14 |
.../files/ja2-stracciatella-0.12.1_p7072-gcc6.patch | 13 +++++++++++++ |
| 15 |
.../ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild | 5 +++-- |
| 16 |
2 files changed, 16 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-gcc6.patch b/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-gcc6.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..2661b19d6c7 |
| 21 |
--- /dev/null |
| 22 |
+++ b/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-gcc6.patch |
| 23 |
@@ -0,0 +1,13 @@ |
| 24 |
+Bug: https://bugs.gentoo.org/600082 |
| 25 |
+ |
| 26 |
+--- a/Build/Laptop/BobbyRGuns.cc |
| 27 |
++++ b/Build/Laptop/BobbyRGuns.cc |
| 28 |
+@@ -700,7 +700,7 @@ |
| 29 |
+ //center picture in frame |
| 30 |
+ ETRLEObject const& pTrav = uiImage->SubregionProperties(0); |
| 31 |
+ UINT32 const usWidth = pTrav.usWidth; |
| 32 |
+- INT16 const sCenX = PosX + abs(BOBBYR_GRID_PIC_WIDTH - usWidth) / 2 - pTrav.sOffsetX; |
| 33 |
++ INT16 const sCenX = PosX + (BOBBYR_GRID_PIC_WIDTH - usWidth) / 2 - pTrav.sOffsetX; |
| 34 |
+ INT16 const sCenY = PosY + 8; |
| 35 |
+ |
| 36 |
+ //blt the shadow of the item |
| 37 |
|
| 38 |
diff --git a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild |
| 39 |
index 71242c78998..17c62c2450c 100644 |
| 40 |
--- a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild |
| 41 |
+++ b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild |
| 42 |
@@ -1,11 +1,11 @@ |
| 43 |
-# Copyright 1999-2014 Gentoo Foundation |
| 44 |
+# Copyright 1999-2017 Gentoo Foundation |
| 45 |
# Distributed under the terms of the GNU General Public License v2 |
| 46 |
|
| 47 |
EAPI=5 |
| 48 |
inherit eutils games |
| 49 |
|
| 50 |
DESCRIPTION="A port of Jagged Alliance 2 to SDL" |
| 51 |
-HOMEPAGE="http://tron.homeunix.org/ja2/" |
| 52 |
+HOMEPAGE="https://ja2-stracciatella.github.io/" |
| 53 |
SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz |
| 54 |
http://tron.homeunix.org/ja2/editor.slf.gz" |
| 55 |
|
| 56 |
@@ -25,6 +25,7 @@ REQUIRED_USE="^^ ( ${LANGS//+/} )" |
| 57 |
|
| 58 |
src_prepare() { |
| 59 |
epatch "${FILESDIR}"/${P}-makefile.patch |
| 60 |
+ epatch "${FILESDIR}"/${P}-gcc6.patch |
| 61 |
|
| 62 |
sed \ |
| 63 |
-e "s:/some/place/where/the/data/is:${GAMES_DATADIR}/ja2:" \ |
Archives