diff options
| author |   Tristan Heaven <tristan@gentoo.org> | 2008-04-30 21:29:02 +0000 |
|---|---|---|
| committer | Tristan Heaven <tristan@gentoo.org> | 2008-04-30 21:29:02 +0000 |
| commit | 8c4f2489326260ed354ff20a53aa6fb8cae2f84c (patch) | |
| tree | db2a05f46dc408b41fd51e033f7dbf0ca7cd75cf /games-action/poopmup | |
| parent | add subversion 1.5 use flags (diff) | |
| download | historical-8c4f2489326260ed354ff20a53aa6fb8cae2f84c.tar.gz historical-8c4f2489326260ed354ff20a53aa6fb8cae2f84c.tar.bz2 historical-8c4f2489326260ed354ff20a53aa6fb8cae2f84c.zip | |
Fix building with gcc-4.3
Package-Manager: portage-2.1.5_rc6
Diffstat (limited to 'games-action/poopmup')
| -rw-r--r-- | games-action/poopmup/ChangeLog | 8 | ||||
| -rw-r--r-- | games-action/poopmup/Manifest | 15 | ||||
| -rw-r--r-- | games-action/poopmup/files/poopmup-1.2-gcc43.patch | 42 | ||||
| -rw-r--r-- | games-action/poopmup/poopmup-1.2.ebuild | 10 |
4 files changed, 67 insertions, 8 deletions
diff --git a/games-action/poopmup/ChangeLog b/games-action/poopmup/ChangeLog index 3cefe7644f63..37e3d7d471e1 100644 --- a/games-action/poopmup/ChangeLog +++ b/games-action/poopmup/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-action/poopmup -# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/poopmup/ChangeLog,v 1.12 2007/06/13 15:16:52 nyhm Exp $ +# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-action/poopmup/ChangeLog,v 1.13 2008/04/30 21:29:02 nyhm Exp $ + + 30 Apr 2008; Tristan Heaven <nyhm@gentoo.org> + +files/poopmup-1.2-gcc43.patch, poopmup-1.2.ebuild: + Fix building with gcc-4.3 13 Jun 2007; Tristan Heaven <nyhm@gentoo.org> poopmup-1.2.ebuild: RESTRICT="test" diff --git a/games-action/poopmup/Manifest b/games-action/poopmup/Manifest index 1e7db85f9d1b..2d56fb5ce8f7 100644 --- a/games-action/poopmup/Manifest +++ b/games-action/poopmup/Manifest @@ -1,5 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX poopmup-1.2-freeglut.patch 245 RMD160 f7f98e107e79e83f78df4186f1ac88f23a0c452e SHA1 35079967586ffa4d421d9580a42dad2a50041bfc SHA256 914b2504fc3e02f62db8f63bc71959af7bdafb5a150c3f9e524aa75a2f617f46 +AUX poopmup-1.2-gcc43.patch 831 RMD160 f969978c869103c60a89f9e92c7fd5687250e491 SHA1 c75942f50b913d100cccb2b61b80f362bcc6a852 SHA256 372179a27405962d21306bb08cfc68c7ad06d188d38cbf8ed1e823ba52bc839a DIST poopmup-1.2.tar.gz 1461794 RMD160 e8efd4af5d62502b289a532ca9698eac598c915a SHA1 efc857c5f6a73bca81ea1f3da2f9a2c24fa748be SHA256 d2f1515c981d49e18fba6f6d7b4ab354d21def62587eab8dcb048c9eb8a7ff3b -EBUILD poopmup-1.2.ebuild 1332 RMD160 d3c0825f6e3fedbd98a49ecccf1e94469fdb87dc SHA1 03ef3d4f63c97db01343d6eb78d069c862997e48 SHA256 f1179f65b1e509fff5a41d129c2d9f820508ac76212b733e5a80483ce68f04ef -MISC ChangeLog 1523 RMD160 62994d6ce58d90252d9ae54c9bec078704d8222c SHA1 091b6db76e771abada0ff6dc89ea1cb4a29419c4 SHA256 f461a50adb0debe75a0aee6c375a1ef73074e64ccd12d451c701cb7217eb5916 +EBUILD poopmup-1.2.ebuild 1357 RMD160 214a80328ccf32413e4a967e2b55b9242331f8e7 SHA1 6964dae36643ebe72d091255d2f2940972d59ac0 SHA256 8074f7f41b8578b9ce5ed801bc399c4932e669a8cafe0657f8ed691742e65a8f +MISC ChangeLog 1654 RMD160 6f11fa0b4b4c82bd960ff80ce394cad590d63733 SHA1 0824de337c8bcad96f12f26a91d735d1dc8827c1 SHA256 4679be87ab025242fd0d88670f9ad0ff06f4723ec9320457077a4bb117339254 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkgY5KMACgkQdz7hIScOURE6MgCgtkm6UVfNPjcMM21hR38V5FSs +0F8AoOjWnxd6fZyEdicMJBu5OvIPGIYN +=4J// +-----END PGP SIGNATURE----- diff --git a/games-action/poopmup/files/poopmup-1.2-gcc43.patch b/games-action/poopmup/files/poopmup-1.2-gcc43.patch new file mode 100644 index 000000000000..da4a455673a4 --- /dev/null +++ b/games-action/poopmup/files/poopmup-1.2-gcc43.patch @@ -0,0 +1,42 @@ +--- common.h ++++ common.h +@@ -38,7 +38,7 @@ + #define STDCALL + #endif + +-#include <iostream.h> ++#include <iostream> + #include "includes/base/myDisplayLists.h" + #include "myTimeStats.h"
+ +--- includes/base/myMatrix.h ++++ includes/base/myMatrix.h +@@ -57,7 +57,7 @@ + #include "my3dPoint.h" + #include "myVector.h" + +-#include <iostream.h> ++#include <iostream> + #include <math.h> + + /** +--- includes/osd/menu.h ++++ includes/osd/menu.h +@@ -21,6 +21,7 @@ + #define POOPMUP_MENU_H + + #include <stdio.h> ++#include <cstring> + #include "../base/myColor.h" + #include "formElem/button.h" + #include "formElem/intSelector.h" +--- includes/osd/onScreenDisplay.h ++++ includes/osd/onScreenDisplay.h +@@ -21,6 +21,7 @@ + #define ONSCREENDISPLAY_H + + #include <stdio.h> ++#include <cstring> + #include "../base/my3dPoint.h" + #include "../base/myColor.h" + diff --git a/games-action/poopmup/poopmup-1.2.ebuild b/games-action/poopmup/poopmup-1.2.ebuild index 4845f75b7468..169fd1eebb5e 100644 --- a/games-action/poopmup/poopmup-1.2.ebuild +++ b/games-action/poopmup/poopmup-1.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/poopmup/poopmup-1.2.ebuild,v 1.15 2007/06/13 15:16:52 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/poopmup/poopmup-1.2.ebuild,v 1.16 2008/04/30 21:29:02 nyhm Exp $ inherit eutils toolchain-funcs games @@ -34,8 +34,10 @@ src_unpack() { -e '/clear/d' \ Makefile || die "sed failed" # bug #120907 - epatch "${FILESDIR}/${P}-freeglut.patch" - rm -rf $(find -name CVS) + epatch \ + "${FILESDIR}"/${P}-freeglut.patch \ + "${FILESDIR}"/${P}-gcc43.patch + ecvs_clean } src_compile() { |