| 1 |
ssuominen 10/05/06 10:55:02 |
| 2 |
|
| 3 |
Modified: njam-1.25.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix building with GCC 4.5+ wrt #318411 by Kacper Kowalik. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.4 games-arcade/njam/njam-1.25.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/njam/njam-1.25.ebuild?rev=1.4&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/njam/njam-1.25.ebuild?rev=1.4&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/njam/njam-1.25.ebuild?r1=1.3&r2=1.4 |
| 14 |
|
| 15 |
Index: njam-1.25.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/games-arcade/njam/njam-1.25.ebuild,v |
| 18 |
retrieving revision 1.3 |
| 19 |
retrieving revision 1.4 |
| 20 |
diff -u -r1.3 -r1.4 |
| 21 |
--- njam-1.25.ebuild 20 Apr 2007 05:54:12 -0000 1.3 |
| 22 |
+++ njam-1.25.ebuild 6 May 2010 10:55:02 -0000 1.4 |
| 23 |
@@ -1,10 +1,11 @@ |
| 24 |
-# Copyright 1999-2007 Gentoo Foundation |
| 25 |
+# Copyright 1999-2010 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/njam/njam-1.25.ebuild,v 1.3 2007/04/20 05:54:12 opfer Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/njam/njam-1.25.ebuild,v 1.4 2010/05/06 10:55:02 ssuominen Exp $ |
| 29 |
|
| 30 |
+EAPI=2 |
| 31 |
inherit eutils flag-o-matic games |
| 32 |
|
| 33 |
-MY_P="${P}-src" |
| 34 |
+MY_P=${P}-src |
| 35 |
DESCRIPTION="Multi or single-player network Pacman-like game in SDL" |
| 36 |
HOMEPAGE="http://njam.sourceforge.net/" |
| 37 |
SRC_URI="mirror://sourceforge/njam/${MY_P}.tar.gz" |
| 38 |
@@ -21,9 +22,7 @@ |
| 39 |
|
| 40 |
S=${WORKDIR}/${MY_P} |
| 41 |
|
| 42 |
-src_unpack() { |
| 43 |
- unpack ${A} |
| 44 |
- cd "${S}" |
| 45 |
+src_prepare() { |
| 46 |
sed -i \ |
| 47 |
-e "s:hiscore.dat:${GAMES_STATEDIR}/${PN}/\0:" \ |
| 48 |
src/njam.cpp \ |
| 49 |
@@ -32,13 +31,14 @@ |
| 50 |
-e "/hiscore.dat/ s:\$(DEFAULT_LIBDIR):${GAMES_STATEDIR}:" \ |
| 51 |
Makefile.in \ |
| 52 |
|| die "sed failed" |
| 53 |
+ epatch "${FILESDIR}"/${P}-gcc45.patch |
| 54 |
# njam segfaults on startup with -Os |
| 55 |
replace-flags "-Os" "-O2" |
| 56 |
} |
| 57 |
|
| 58 |
src_install() { |
| 59 |
dodir "${GAMES_STATEDIR}/${PN}" |
| 60 |
- make DESTDIR="${D}" install || die "make install failed" |
| 61 |
+ emake DESTDIR="${D}" install || die |
| 62 |
dohtml -r "${D}${GAMES_DATADIR}/njam/html/"* |
| 63 |
rm -rf "${D}${GAMES_DATADIR}/njam/html/" |
| 64 |
newicon data/njamicon.bmp njam.bmp |
| 65 |
|
| 66 |
|
| 67 |
|
| 68 |
1.11 games-arcade/njam/ChangeLog |
| 69 |
|
| 70 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/njam/ChangeLog?rev=1.11&view=markup |
| 71 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/njam/ChangeLog?rev=1.11&content-type=text/plain |
| 72 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/njam/ChangeLog?r1=1.10&r2=1.11 |
| 73 |
|
| 74 |
Index: ChangeLog |
| 75 |
=================================================================== |
| 76 |
RCS file: /var/cvsroot/gentoo-x86/games-arcade/njam/ChangeLog,v |
| 77 |
retrieving revision 1.10 |
| 78 |
retrieving revision 1.11 |
| 79 |
diff -u -r1.10 -r1.11 |
| 80 |
--- ChangeLog 20 Apr 2007 05:54:12 -0000 1.10 |
| 81 |
+++ ChangeLog 6 May 2010 10:55:02 -0000 1.11 |
| 82 |
@@ -1,6 +1,10 @@ |
| 83 |
# ChangeLog for games-arcade/njam |
| 84 |
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 85 |
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/njam/ChangeLog,v 1.10 2007/04/20 05:54:12 opfer Exp $ |
| 86 |
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 87 |
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/njam/ChangeLog,v 1.11 2010/05/06 10:55:02 ssuominen Exp $ |
| 88 |
+ |
| 89 |
+ 06 May 2010; Samuli Suominen <ssuominen@g.o> njam-1.25.ebuild, |
| 90 |
+ +files/njam-1.25-gcc45.patch: |
| 91 |
+ Fix building with GCC 4.5+ wrt #318411 by Kacper Kowalik. |
| 92 |
|
| 93 |
20 Apr 2007; Christian Faulhammer <opfer@g.o> njam-1.25.ebuild: |
| 94 |
stable amd64, bug 174569 |
Archives