mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 18:58:08 -07:00
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
This commit is contained in:
committed by
David Seifert
parent
07d085fc16
commit
205a71b38f
39
games-sports/trigger/files/trigger-0.6.1-gcc6.patch
Normal file
39
games-sports/trigger/files/trigger-0.6.1-gcc6.patch
Normal file
@@ -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 ("</");
|
||||
@@ -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...
|
||||
|
||||
Reference in New Issue
Block a user