summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <tristan@gentoo.org>2009-06-18 01:48:48 +0000
committerTristan Heaven <tristan@gentoo.org>2009-06-18 01:48:48 +0000
commit5cba41ac171677770a93d4945f6e43f18dc7f000 (patch)
treeec0f87d3eb60375f67b663ae06bb1b24028e9659 /games-board
parentMarking mozilla-firefox-3.0.11 ppc64 and ppc for bug 273918 (diff)
downloadhistorical-5cba41ac171677770a93d4945f6e43f18dc7f000.tar.gz
historical-5cba41ac171677770a93d4945f6e43f18dc7f000.tar.bz2
historical-5cba41ac171677770a93d4945f6e43f18dc7f000.zip
Fix building with gcc-4.4, bug #273400
Package-Manager: portage-2.2_rc33/cvs/Linux i686
Diffstat (limited to 'games-board')
-rw-r--r--games-board/eboard/ChangeLog8
-rw-r--r--games-board/eboard/Manifest15
-rw-r--r--games-board/eboard/eboard-1.1.1.ebuild7
-rw-r--r--games-board/eboard/files/eboard-1.1.1-gcc44.patch11
4 files changed, 35 insertions, 6 deletions
diff --git a/games-board/eboard/ChangeLog b/games-board/eboard/ChangeLog
index ebfb942d862f..fbbd8517d2c4 100644
--- a/games-board/eboard/ChangeLog
+++ b/games-board/eboard/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-board/eboard
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/ChangeLog,v 1.24 2009/05/20 16:35:15 nixnut Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/ChangeLog,v 1.25 2009/06/18 01:48:47 nyhm Exp $
+
+ 18 Jun 2009; Tristan Heaven <nyhm@gentoo.org> eboard-1.1.1.ebuild,
+ +files/eboard-1.1.1-gcc44.patch:
+ Fix building with gcc-4.4, bug #273400
20 May 2009; nixnut <nixnut@gentoo.org> eboard-1.1.1.ebuild:
ppc stable #266562
diff --git a/games-board/eboard/Manifest b/games-board/eboard/Manifest
index 4199d1ab2c60..a8c34b15528a 100644
--- a/games-board/eboard/Manifest
+++ b/games-board/eboard/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX eboard-1.1.1-as-needed.patch 726 RMD160 9c7451fdc76d8d1599c6fae35aa2b6335493de0a SHA1 59307c52cc7be479dcffaf070c2334912e908900 SHA256 2a4831e85706579059886baa73e87561dae2af87a280e7cb8d0e905227347008
+AUX eboard-1.1.1-gcc44.patch 182 RMD160 ee62e6285e3b1d59474103a82a6bd1cfc1462168 SHA1 c913f0645a201028a5bd469b195b037e73d3835b SHA256 f8da530fd5db4fdac4b0d09f8fedc31f412d3851708e1c2cc37874c1a1fa97a6
DIST eboard-1.1.1.tar.bz2 462386 RMD160 13bdfe6d33a143d619c6c5be8d849ced9b95e2c4 SHA1 029cf1e7503fc2a862b9880da9ea6ab91e5614cd SHA256 ad971086697c0d5a1c8a64401f6675339e832acb386dc96fa4e17da1832ca26e
DIST eboard-extras-1pl2.tar.gz 361237 RMD160 342b1b48091958f5b0e4613e1c9de8b6c23d5b67 SHA1 aac0f4ec4cc83f2e76726fcbe54c707bd0ebe44a SHA256 6849cc104e454167db8b8e9ae0573accade5c941a140b47e58b601164e99fcc3
DIST eboard-extras-2.tar.gz 598909 RMD160 d6b7b9f39167752301018048010fee312acb97c0 SHA1 6b2a88ada8a5b009e7fb97950c0596e23030d161 SHA256 0b98bd4c90b2e275f8535186c3e7cbeeef9c9bb611a7febfcd866486a9f41a9c
-EBUILD eboard-1.1.1.ebuild 1761 RMD160 bddf1d67fe13a4ddf2fc88dac1ebdcdf3933764c SHA1 368e35d39e9455dd69ef6413e1e066f12e34b23a SHA256 6468739c694a59063cab1145c311296a82c20fec438956fec16724430e32d484
-MISC ChangeLog 4454 RMD160 22107af921103416882f7686cb4c4d2b14f903e8 SHA1 5f4fff899c8a9c1e95bfc962b9ce58d5fbe81377 SHA256 9c32eabdf199f072f55d59c5d99dc008bb6a9e18067bfb84a0cfe1a4fa009d1a
+EBUILD eboard-1.1.1.ebuild 1822 RMD160 7c85ebda3f3fd0c53cd4886e9dea4c15e4d19b5b SHA1 a86a7db22c9385d9fb5665e78184103b3afbdd42 SHA256 afdaf5c85665246f9ee32c554fbf7ec5c5618901cad13a18727775018b5e8e94
+MISC ChangeLog 4598 RMD160 1548ae4cdda31e2c659659d6d970451bed150136 SHA1 41cdddd64666118ffb4344a380844a4f568a6c5f SHA256 ad0f89939566d3ef7497e8590a93d46b13bd43230721842e93a623dbd1486c3a
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAko5nQUACgkQdz7hIScOURFSAwCgkDGjyTI+Kqdycc203wxTCKyx
+lgAAoLE3e10HshszIAcSQXgCf54tVe3n
+=s93L
+-----END PGP SIGNATURE-----
diff --git a/games-board/eboard/eboard-1.1.1.ebuild b/games-board/eboard/eboard-1.1.1.ebuild
index 740df032fcbc..2a4b19bc3c22 100644
--- a/games-board/eboard/eboard-1.1.1.ebuild
+++ b/games-board/eboard/eboard-1.1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/eboard-1.1.1.ebuild,v 1.6 2009/05/20 16:35:15 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/eboard-1.1.1.ebuild,v 1.7 2009/06/18 01:48:47 nyhm Exp $
EAPI=2
inherit eutils games
@@ -31,12 +31,15 @@ src_prepare() {
-e "s:(\"-O6\"):split(' ', \"${CXXFLAGS}\"):" \
configure \
|| die "sed configure failed"
- epatch "${FILESDIR}"/${P}-as-needed.patch
+ epatch \
+ "${FILESDIR}"/${P}-as-needed.patch \
+ "${FILESDIR}"/${P}-gcc44.patch
}
src_configure() {
# not an autoconf script
./configure \
+ --compiler="${CXX}" \
--prefix="${GAMES_PREFIX}" \
--data-prefix="${GAMES_DATADIR}" \
--man-prefix="/usr/share/man" \
diff --git a/games-board/eboard/files/eboard-1.1.1-gcc44.patch b/games-board/eboard/files/eboard-1.1.1-gcc44.patch
new file mode 100644
index 000000000000..43a26393d4f4
--- /dev/null
+++ b/games-board/eboard/files/eboard-1.1.1-gcc44.patch
@@ -0,0 +1,11 @@
+--- ntext.cc
++++ ntext.cc
+@@ -244,7 +244,7 @@
+ return;
+ }
+
+- p = strchr(text, '\n');
++ p = strchr((char *)text, '\n');
+ if (p!=NULL) {
+ *p = 0;
+ i = strlen(text);