diff options
| author |   Tristan Heaven <nyhm@gentoo.org> | 2008-04-30 23:45:33 +0000 |
|---|---|---|
| committer | Tristan Heaven <nyhm@gentoo.org> | 2008-04-30 23:45:33 +0000 |
| commit | 498b87cc00d20d3f949aa62afb1372f9fa1ec519 (patch) | |
| tree | 5a7fff0c30d66f91dccb6f44e40f2a8e6fb779ee | |
| parent | The 2008.0 sub-profiles should inherit .. before releases/2008.0, so fixing t... (diff) | |
| download | gentoo-2-498b87cc00d20d3f949aa62afb1372f9fa1ec519.tar.gz gentoo-2-498b87cc00d20d3f949aa62afb1372f9fa1ec519.tar.bz2 gentoo-2-498b87cc00d20d3f949aa62afb1372f9fa1ec519.zip | |
Fix building with gcc-4.3
(Portage version: 2.1.5_rc6)
| -rw-r--r-- | games-rpg/openglad/ChangeLog | 6 | ||||
| -rw-r--r-- | games-rpg/openglad/files/openglad-0.98-gcc43.patch | 11 | ||||
| -rw-r--r-- | games-rpg/openglad/openglad-0.98.ebuild | 31 |
3 files changed, 32 insertions, 16 deletions
diff --git a/games-rpg/openglad/ChangeLog b/games-rpg/openglad/ChangeLog index 78095c068947..0b82f5ec407b 100644 --- a/games-rpg/openglad/ChangeLog +++ b/games-rpg/openglad/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-rpg/openglad # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/openglad/ChangeLog,v 1.7 2008/02/29 19:35:54 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-rpg/openglad/ChangeLog,v 1.8 2008/04/30 23:45:33 nyhm Exp $ + + 30 Apr 2008; Tristan Heaven <nyhm@gentoo.org> + +files/openglad-0.98-gcc43.patch, openglad-0.98.ebuild: + Fix building with gcc-4.3 29 Feb 2008; Carsten Lohrke <carlo@gentoo.org> ChangeLog: Remove icon extension from desktop entry to match Icon Theme Specification. diff --git a/games-rpg/openglad/files/openglad-0.98-gcc43.patch b/games-rpg/openglad/files/openglad-0.98-gcc43.patch new file mode 100644 index 000000000000..831bb53671d4 --- /dev/null +++ b/games-rpg/openglad/files/openglad-0.98-gcc43.patch @@ -0,0 +1,11 @@ +--- src/parser.cpp ++++ src/parser.cpp +@@ -23,6 +23,8 @@ + #include <iostream> + #include <fstream> + #include <string> ++#include <cstring> ++#include <cstdlib> + #include "parser.h" + + using namespace std; diff --git a/games-rpg/openglad/openglad-0.98.ebuild b/games-rpg/openglad/openglad-0.98.ebuild index e40b7fd3b160..de44a708fc71 100644 --- a/games-rpg/openglad/openglad-0.98.ebuild +++ b/games-rpg/openglad/openglad-0.98.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/openglad/openglad-0.98.ebuild,v 1.9 2008/02/29 19:35:54 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-rpg/openglad/openglad-0.98.ebuild,v 1.10 2008/04/30 23:45:33 nyhm Exp $ inherit eutils games @@ -11,17 +11,19 @@ SRC_URI="mirror://sourceforge/snowstorm/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="x86 ~amd64 ~ppc" +KEYWORDS="~amd64 ~ppc x86" IUSE="" -DEPEND=">=media-libs/sdl-mixer-1.2.5 - >=media-libs/sdl-image-1.2.2 - >=media-libs/libsdl-1.2.0" +DEPEND="media-libs/sdl-mixer + media-libs/sdl-image + media-libs/libsdl" src_unpack() { unpack ${A} - cd ${S} - epatch ${FILESDIR}/${PV}-gladpack.c.patch + cd "${S}" + epatch \ + "${FILESDIR}"/${PV}-gladpack.c.patch \ + "${FILESDIR}"/${P}-gcc43.patch } src_compile() { @@ -34,13 +36,12 @@ src_compile() { } src_install() { - make install \ - DESTDIR=${D} \ - docdir=${D}/usr/share/doc/${PF} \ - || die "make install failed" + emake install \ + DESTDIR="${D}" \ + docdir="${D}"/usr/share/doc/${PF} \ + || die "emake install failed" prepalldocs + doicon "${DISTDIR}"/${PN}.png + make_desktop_entry openglad OpenGladiator prepgamesdirs - - doicon ${DISTDIR}/${PN}.png - make_desktop_entry openglad "OpenGladiator" ${PN} } |