diff options
| author |   Tristan Heaven <tristan@gentoo.org> | 2008-04-30 23:45:33 +0000 |
|---|---|---|
| committer | Tristan Heaven <tristan@gentoo.org> | 2008-04-30 23:45:33 +0000 |
| commit | a3ba35af0e65a3fe386376dd986ebe39eb1521e1 (patch) | |
| tree | 4ff0375e58cfc7b9a1586375c30ff3960a447ca0 | |
| parent | The 2008.0 sub-profiles should inherit .. before releases/2008.0, so fixing t... (diff) | |
| download | historical-a3ba35af0e65a3fe386376dd986ebe39eb1521e1.tar.gz historical-a3ba35af0e65a3fe386376dd986ebe39eb1521e1.tar.bz2 historical-a3ba35af0e65a3fe386376dd986ebe39eb1521e1.zip | |
Fix building with gcc-4.3
Package-Manager: portage-2.1.5_rc6
| -rw-r--r-- | games-rpg/openglad/ChangeLog | 6 | ||||
| -rw-r--r-- | games-rpg/openglad/Manifest | 15 | ||||
| -rw-r--r-- | games-rpg/openglad/files/openglad-0.98-gcc43.patch | 11 | ||||
| -rw-r--r-- | games-rpg/openglad/openglad-0.98.ebuild | 31 |
4 files changed, 45 insertions, 18 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/Manifest b/games-rpg/openglad/Manifest index 7c35fcd4daa5..1630ccd2e1f2 100644 --- a/games-rpg/openglad/Manifest +++ b/games-rpg/openglad/Manifest @@ -1,6 +1,17 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 0.98-gladpack.c.patch 516 RMD160 8c5e0359889d7db0f4d9d355c68667fc0536f4ff SHA1 ae74f298c8380c49a0c7ba0e3f23b0574da8627e SHA256 d48cdfbd330c938ec645133cee074cb3e7203f12836f0a4718f63c8e1db00910 +AUX openglad-0.98-gcc43.patch 201 RMD160 792bac0b475a895d5b24fea0a959adef0eca1d06 SHA1 1d1340588c8154b8cb82e829ae76228e1ea5d2bb SHA256 73c4c1c3a1e3f663a7cd7a8149a68e683a9b5b95672aca0eac5bd6c6a453298c DIST openglad-0.98.tar.gz 724106 RMD160 1dd11933885ab73fb374c341d69d3d96878db548 SHA1 795b2f83cb965b655107e5b798e9000f9f113250 SHA256 a3df9f8ea8827f56a9b38611c3f5c3a11aaec865a95d37cef90617d6b6efb844 DIST openglad.png 5593 RMD160 5adc86eef27628bb151c2cbb9936b7a51ebcd34b SHA1 d2c8e82e1bb15e42225db7e97014dfd83e8dc3b3 SHA256 04fd6707bda5a7f42e11f1f441a6410709d38f5f6d5d124bf1ab0bb44fad5f1c -EBUILD openglad-0.98.ebuild 1056 RMD160 68dc42749aa9896f6ca18bd808f41acbd1ef70e6 SHA1 a026ba0b69edf45eadfee7de9d7351d61b46951b SHA256 9d2d1035f3264a0ca25c3fbe100b3161b765e6d51a482432ef6e1d881acc30ab -MISC ChangeLog 881 RMD160 b2fd53c4d4e12c1cdb0ec18f7128bbf26f2b714c SHA1 b5c0be9352d05056e0ac074550172f6bb8906cb1 SHA256 6504841bb5d9a011ca18d35def58458b5c85f957dc4cbbff1c616ca0ad5476c1 +EBUILD openglad-0.98.ebuild 1074 RMD160 f82fd5fafc30c1a73d31e0a6063fa7fb9449fc01 SHA1 2b4e88eb7c8c9611f4819e4a5c40b9d980eaca3d SHA256 5b7a79c918766556a4290be4a0be8b436d593557e02f94502095b19faca4fe4f +MISC ChangeLog 1015 RMD160 1b7c04c44b4285fb414bf6cec8c21507f0288297 SHA1 5c26a9fedd22dde37ef439abdea69c011768d0ea SHA256 6180aec4a042b249d4fab7b61cbecd17366c75f997e0a80ed37ce1f5cea99e05 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkgZBKMACgkQdz7hIScOUREejACeL0yXgoCV4WYqhMqt7xoWe4zE +/dsAoLeiCbDCB9GqgZ6LHfRMryhM+VzI +=4nph +-----END PGP SIGNATURE----- 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} } |