diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2006-05-06 10:15:39 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2006-05-06 10:15:39 +0000 |
| commit | cd6ecf1cf67018fe0bb5eb256ce665c46133d0b3 (patch) | |
| tree | 1e49f84b2fe3a132cebb8000c357e741d904e1d2 /games-fps/quake2-icculus | |
| parent | Version bump (bug #132357) (diff) | |
| download | gentoo-2-cd6ecf1cf67018fe0bb5eb256ce665c46133d0b3.tar.gz gentoo-2-cd6ecf1cf67018fe0bb5eb256ce665c46133d0b3.tar.bz2 gentoo-2-cd6ecf1cf67018fe0bb5eb256ce665c46133d0b3.zip | |
Fix build with gcc-4.1 and xatrix, bug #118299
(Portage version: 2.1_pre10-r3)
Diffstat (limited to 'games-fps/quake2-icculus')
4 files changed, 32 insertions, 3 deletions
diff --git a/games-fps/quake2-icculus/ChangeLog b/games-fps/quake2-icculus/ChangeLog index cd432b3ecaf6..60ee64951e7b 100644 --- a/games-fps/quake2-icculus/ChangeLog +++ b/games-fps/quake2-icculus/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-fps/quake2-icculus # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.18 2006/03/15 22:15:36 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.19 2006/05/06 10:15:39 tupone Exp $ + + 06 May 2006; <Tupone@gentoo.org> +files/quake2-icculus-0.16.1-gcc41.patch, + quake2-icculus-0.16.1.ebuild: + Fixing build with xatrix and gcc-4.1, bug #118299 by Adomas Jackevicius 15 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org> quake2-icculus-0.16.1.ebuild: diff --git a/games-fps/quake2-icculus/files/digest-quake2-icculus-0.16.1 b/games-fps/quake2-icculus/files/digest-quake2-icculus-0.16.1 index c85d15d16e9b..505b44fc5c95 100644 --- a/games-fps/quake2-icculus/files/digest-quake2-icculus-0.16.1 +++ b/games-fps/quake2-icculus/files/digest-quake2-icculus-0.16.1 @@ -1,4 +1,12 @@ -MD5 6b0e3fff324a5db58a8f8309dcabb47a quake2-r0.16.1.tar.gz 1525384 MD5 04d3f1fb7fb4dada7175a41f4595c7eb maxpak.pak 3282742 +RMD160 6b5223fee63dbb2c886e3c1e39d9e157d65f589f maxpak.pak 3282742 +SHA256 653569fe880f1ed5f7529483ac961b22078482e6ff0e83f4d9d1bc503c866770 maxpak.pak 3282742 +MD5 6b0e3fff324a5db58a8f8309dcabb47a quake2-r0.16.1.tar.gz 1525384 +RMD160 dbbf9cad08ab381e0c2cd037e317104085455c23 quake2-r0.16.1.tar.gz 1525384 +SHA256 49f4d3d53772b6ffd7733506f5d121c7893bfd8884133bfc36a28039c0744642 quake2-r0.16.1.tar.gz 1525384 MD5 7d5e052839c9e629bad0a6570aa70554 roguesrc320.shar.Z 626769 +RMD160 767c5b1a7a1123370e9c924282656dfdcc6cebba roguesrc320.shar.Z 626769 +SHA256 ceefb2fd748961cb0bc3244220f3eb09d8f7b8ca2eb32cdf9b284727a2fdc919 roguesrc320.shar.Z 626769 MD5 41fc4ecc4f25c068e7d1f488bd4a1e1a xatrixsrc320.shar.Z 455917 +RMD160 357182dcd760a95b27942cdf807ba1242bcb1160 xatrixsrc320.shar.Z 455917 +SHA256 94bf596cd85d38ea294b99ccb0ebb5e4b9776cca335001b3803e2d8407395589 xatrixsrc320.shar.Z 455917 diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch new file mode 100644 index 000000000000..2afa968d23f0 --- /dev/null +++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch @@ -0,0 +1,14 @@ +--- src/xatrix/g_local.h.old 2006-05-06 11:58:32.000000000 +0200 ++++ src/xatrix/g_local.h 2006-05-06 11:58:52.000000000 +0200 +@@ -446,11 +446,6 @@ + extern int sm_meat_index; + extern int snd_fry; + +-extern int jacket_armor_index; +-extern int combat_armor_index; +-extern int body_armor_index; +- +- + // means of death + #define MOD_UNKNOWN 0 + #define MOD_BLASTER 1 diff --git a/games-fps/quake2-icculus/quake2-icculus-0.16.1.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.16.1.ebuild index f27d763aa433..fe55b19ceab8 100644 --- a/games-fps/quake2-icculus/quake2-icculus-0.16.1.ebuild +++ b/games-fps/quake2-icculus/quake2-icculus-0.16.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1.ebuild,v 1.12 2006/03/15 22:15:36 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1.ebuild,v 1.13 2006/05/06 10:15:39 tupone Exp $ inherit eutils games @@ -59,6 +59,9 @@ src_unpack() { env PATH=${T}:${PATH} unshar ${shar} || die "unpacking ${shar} failed" rm ${shar} done + if use xatrix ; then + epatch "${FILESDIR}/${P}"-gcc41.patch + fi if use rogue ; then cd "${S}"/src epatch "${FILESDIR}"/0.16-rogue-nan.patch |