summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Levine <plevine457@gmail.com>2017-07-07 03:02:29 -0400
committerDavid Seifert <soap@gentoo.org>2017-07-30 11:08:42 +0200
commit205a71b38f3f2e18a0bc5f7dc3031b2ff8ad3156 (patch)
tree2b5924a5a3e97ea139d851fd15ef81961eb13580 /games-sports
parentnet-analyzer/sinfo: Fix building with GCC-6 (diff)
downloadgentoo-205a71b38f3f2e18a0bc5f7dc3031b2ff8ad3156.tar.gz
gentoo-205a71b38f3f2e18a0bc5f7dc3031b2ff8ad3156.tar.bz2
gentoo-205a71b38f3f2e18a0bc5f7dc3031b2ff8ad3156.zip
games-sports/trigger: Fix building with GCC-6
Bug: https://bugs.gentoo.org/show_bug.cgi?id=617886 Package-Manager: Portage-2.3.6, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/5059
Diffstat (limited to 'games-sports')
-rw-r--r--games-sports/trigger/files/trigger-0.6.1-gcc6.patch39
-rw-r--r--games-sports/trigger/trigger-0.6.1-r1.ebuild6
2 files changed, 43 insertions, 2 deletions
diff --git a/games-sports/trigger/files/trigger-0.6.1-gcc6.patch b/games-sports/trigger/files/trigger-0.6.1-gcc6.patch
new file mode 100644
index 00000000000..38822287c61
--- /dev/null
+++ b/games-sports/trigger/files/trigger-0.6.1-gcc6.patch
@@ -0,0 +1,39 @@
+Bug: https://bugs.gentoo.org/617886
+
+--- a/src/pengine/tinyxmlparser.cpp
++++ b/src/pengine/tinyxmlparser.cpp
+@@ -326,14 +326,14 @@
+ if ( !p || !*p )
+ {
+ SetError( TIXML_ERROR_DOCUMENT_EMPTY );
+- return false;
++ return NULL;
+ }
+
+ p = SkipWhiteSpace( p );
+ if ( !p )
+ {
+ SetError( TIXML_ERROR_DOCUMENT_EMPTY );
+- return false;
++ return NULL;
+ }
+
+ while ( p && *p )
+@@ -541,7 +541,7 @@
+ if ( !p || !*p || *p != '<' )
+ {
+ if ( document ) document->SetError( TIXML_ERROR_PARSING_ELEMENT );
+- return false;
++ return NULL;
+ }
+
+ p = SkipWhiteSpace( p+1 );
+@@ -551,7 +551,7 @@
+ if ( !p || !*p )
+ {
+ if ( document ) document->SetError( TIXML_ERROR_FAILED_TO_READ_ELEMENT_NAME );
+- return false;
++ return NULL;
+ }
+
+ TIXML_STRING endTag ("</");
diff --git a/games-sports/trigger/trigger-0.6.1-r1.ebuild b/games-sports/trigger/trigger-0.6.1-r1.ebuild
index 88ead4153a0..0b608391997 100644
--- a/games-sports/trigger/trigger-0.6.1-r1.ebuild
+++ b/games-sports/trigger/trigger-0.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,7 +7,7 @@ inherit eutils
MY_PN=${PN}-rally
MY_P=${MY_PN}-${PV}
DESCRIPTION="Free OpenGL rally car racing game"
-HOMEPAGE="http://www.positro.net/trigger/"
+HOMEPAGE="http://trigger-rally.sourceforge.net/"
SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.bz2"
LICENSE="GPL-2"
@@ -29,6 +29,8 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${MY_P}
+PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
+
pkg_setup() {
# Otherwise build fails with:
# ...skipped trigger for lack of libpengine.a...