diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2006-05-06 22:51:12 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2006-05-06 22:51:12 +0000 |
| commit | 243a5a19a92c6a77b4a31419beb04de83ca51907 (patch) | |
| tree | 9895d285fc3587752784751769705376e7d24ecd | |
| parent | as-needed patch per bug #131849. Version bump to 1.2.3 also done. (diff) | |
| download | gentoo-2-243a5a19a92c6a77b4a31419beb04de83ca51907.tar.gz gentoo-2-243a5a19a92c6a77b4a31419beb04de83ca51907.tar.bz2 gentoo-2-243a5a19a92c6a77b4a31419beb04de83ca51907.zip | |
Fix for gcc-4.1
(Portage version: 2.1_pre10-r3)
4 files changed, 52 insertions, 3 deletions
diff --git a/games-fps/red-blue-quake2/ChangeLog b/games-fps/red-blue-quake2/ChangeLog index 5d2e74e839f3..3bfbc0f3beb7 100644 --- a/games-fps/red-blue-quake2/ChangeLog +++ b/games-fps/red-blue-quake2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-fps/red-blue-quake2 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/red-blue-quake2/ChangeLog,v 1.5 2006/03/15 22:30:47 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/red-blue-quake2/ChangeLog,v 1.6 2006/05/06 22:51:12 tupone Exp $ + + 06 May 2006; <Tupone@gentoo.org> +files/red-blue-quake2-0.1-gcc41.patch, + red-blue-quake2-0.1.ebuild: + Fix for gcc-4.1 15 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org> red-blue-quake2-0.1.ebuild: diff --git a/games-fps/red-blue-quake2/files/digest-red-blue-quake2-0.1 b/games-fps/red-blue-quake2/files/digest-red-blue-quake2-0.1 index 7dd7369aada1..d3d226a5ff85 100644 --- a/games-fps/red-blue-quake2/files/digest-red-blue-quake2-0.1 +++ b/games-fps/red-blue-quake2/files/digest-red-blue-quake2-0.1 @@ -1,2 +1,6 @@ MD5 3ac9ac6a833b9c049a9f763c3137b86f q2source-3.21.zip 1477764 +RMD160 c23beea8062c94ef5d45f9acf3d884961b8d8564 q2source-3.21.zip 1477764 +SHA256 c9200316de189638d0d997a0092f36b85f2c3f9e4ebe30f4b1c356745ad676ca q2source-3.21.zip 1477764 MD5 b80542d7977ecaa36799c479a6557069 red-blue-quake2-0.1.tar.gz 34874 +RMD160 4e7d9c46e3e20266565f9b08f4a4f8dd92ae5540 red-blue-quake2-0.1.tar.gz 34874 +SHA256 65a0f2552f537e494f05f573e54faff7cf08d22276307e6c69eb314c2f3dac17 red-blue-quake2-0.1.tar.gz 34874 diff --git a/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-gcc41.patch b/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-gcc41.patch new file mode 100644 index 000000000000..1090c306069f --- /dev/null +++ b/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-gcc41.patch @@ -0,0 +1,39 @@ +--- game/g_local.h.old 2006-05-07 00:27:45.000000000 +0200 ++++ game/g_local.h 2006-05-07 00:28:06.000000000 +0200 +@@ -458,11 +458,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
+--- ctf/g_local.h.old 2006-05-07 00:36:21.000000000 +0200 ++++ ctf/g_local.h 2006-05-07 00:36:38.000000000 +0200 +@@ -466,11 +466,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
+@@ -556,10 +556,6 @@ +
+ extern cvar_t *sv_maplist;
+
+-//ZOID
+-extern qboolean is_quad;
+-//ZOID
+-
+ #define world (&g_edicts[0])
+
+ // item spawnflags
diff --git a/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild b/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild index 707286d94e60..1c4043c9c6d6 100644 --- a/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild +++ b/games-fps/red-blue-quake2/red-blue-quake2-0.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/red-blue-quake2/red-blue-quake2-0.1.ebuild,v 1.8 2006/03/15 22:30:47 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild,v 1.9 2006/05/06 22:51:12 tupone Exp $ inherit eutils games @@ -25,7 +25,9 @@ S=${WORKDIR}/quake2-3.21/linux src_unpack() { unpack ${A} epatch ${FILESDIR}/${PV}-gentoo.patch - cd quake2-3.21/linux + cd quake2-3.21 + epatch "${FILESDIR}/${P}"-gcc41.patch + cd linux sed -i "s:GENTOO_DIR:${GAMES_LIBDIR}/${PN}:" sys_linux.c sed -i "s:/etc/quake2.conf:${GAMES_SYSCONFDIR}/${PN}.conf:" sys_linux.c vid_so.c } |