summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Levine <plevine457@gmail.com>2017-08-05 03:13:55 -0400
committerDavid Seifert <soap@gentoo.org>2017-08-13 13:03:12 +0200
commit6d82be32bf8c68eb840d79e43fe86b0a1aac604e (patch)
treea7394a1cfb6cf60f6c5dff417f27284e1368d7f1 /games-strategy
parentmedia-tv/kodi: 17.4_rc1 version bump, update -9999 (diff)
downloadgentoo-6d82be32bf8c68eb840d79e43fe86b0a1aac604e.tar.gz
gentoo-6d82be32bf8c68eb840d79e43fe86b0a1aac604e.tar.bz2
gentoo-6d82be32bf8c68eb840d79e43fe86b0a1aac604e.zip
games-strategy/ja2-stracciatella: Fix building with GCC-6
Bug: https://bugs.gentoo.org/show_bug.cgi?id=600082 Package-Manager: Portage-2.3.6, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/5300
Diffstat (limited to 'games-strategy')
-rw-r--r--games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-gcc6.patch13
-rw-r--r--games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild5
2 files changed, 16 insertions, 2 deletions
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
new file mode 100644
index 00000000000..2661b19d6c7
--- /dev/null
+++ b/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-gcc6.patch
@@ -0,0 +1,13 @@
+Bug: https://bugs.gentoo.org/600082
+
+--- a/Build/Laptop/BobbyRGuns.cc
++++ b/Build/Laptop/BobbyRGuns.cc
+@@ -700,7 +700,7 @@
+ //center picture in frame
+ ETRLEObject const& pTrav = uiImage->SubregionProperties(0);
+ UINT32 const usWidth = pTrav.usWidth;
+- INT16 const sCenX = PosX + abs(BOBBYR_GRID_PIC_WIDTH - usWidth) / 2 - pTrav.sOffsetX;
++ INT16 const sCenX = PosX + (BOBBYR_GRID_PIC_WIDTH - usWidth) / 2 - pTrav.sOffsetX;
+ INT16 const sCenY = PosY + 8;
+
+ //blt the shadow of the item
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
index 71242c78998..17c62c2450c 100644
--- a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild
+++ b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit eutils games
DESCRIPTION="A port of Jagged Alliance 2 to SDL"
-HOMEPAGE="http://tron.homeunix.org/ja2/"
+HOMEPAGE="https://ja2-stracciatella.github.io/"
SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz
http://tron.homeunix.org/ja2/editor.slf.gz"
@@ -25,6 +25,7 @@ REQUIRED_USE="^^ ( ${LANGS//+/} )"
src_prepare() {
epatch "${FILESDIR}"/${P}-makefile.patch
+ epatch "${FILESDIR}"/${P}-gcc6.patch
sed \
-e "s:/some/place/where/the/data/is:${GAMES_DATADIR}/ja2:" \