Fix build with gcc-4.6 Bug #362839

Package-Manager: portage-2.1.9.46/cvs/Linux i686

4 files changed, 194 insertions, 4 deletions

diff --git a/games-fps/quakeforge/ChangeLog b/games-fps/quakeforge/ChangeLog
index 550c2ef59447..b93e1022d1d4 100644
--- a/games-fps/quakeforge/ChangeLog
+++ b/games-fps/quakeforge/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/quakeforge
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/ChangeLog,v 1.25 2011/03/08 17:05:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/ChangeLog,v 1.26 2011/04/18 12:14:09 tupone Exp $
+
+  18 Apr 2011; Tupone Alfredo <tupone@gentoo.org> quakeforge-0.5.5-r2.ebuild,
+  +files/quakeforge-0.5.5-gcc46.patch:
+  Fix build with gcc-4.6 Bug #362839 by Diego Elio Pettenò
 
   08 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> quakeforge-0.5.5.ebuild,
   quakeforge-0.5.5-r2.ebuild:
diff --git a/games-fps/quakeforge/Manifest b/games-fps/quakeforge/Manifest
index 68b2c42a483d..d26cbe410c73 100644
--- a/games-fps/quakeforge/Manifest
+++ b/games-fps/quakeforge/Manifest
@@ -1,11 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.5.5-ipv6.patch 302 RMD160 7e1255c42df1c6c6ee59e87fa034324bfe2a83b5 SHA1 d24595bf4feb9e51c69bae9d716370f0262d15bf SHA256 8b473c335e6dc191e4aae7e7ada09ea5fc6d649e1132bb6230c1427fa0692e7a
 AUX quakeforge-0.5.5-amd64.patch 617 RMD160 1a0f3fedc34dfdecb2a3d07d235a7e2a25e0a2f2 SHA1 9b61c7f8f7230b6af083a0d10da7292e92148226 SHA256 75b8e2d329a620f131fbf01ff81211a4985c65e0a1166ccecd618e59b0bfba2a
 AUX quakeforge-0.5.5-gcc41.patch 11887 RMD160 927ccee1af7ce986317c5a865dd67caf1bb2f489 SHA1 e57ad56650cbc80de3b8abfe58127a0ded0f0be5 SHA256 a8409922b14d1690f3a0f58a7961371944f1c96798f5e5f85ee8247ea1bab20d
+AUX quakeforge-0.5.5-gcc46.patch 6321 RMD160 29243f6ce925e6865b652aa51266d6a2bb6d0466 SHA1 c92c406c32326ce1df084e50a12c741dfe0da562 SHA256 5e20ff5cb997788d9ba43183990b30d14b0a8eda2bf7aa765f4d9f2f5d453b9f
 AUX quakeforge-0.5.5-keys.patch 2732 RMD160 e12fe9e7738294130b2efc6f47287e9c0d05b6d1 SHA1 1af9524474c8c4cf00d327c5d741f1c8ec133975 SHA256 4e43f001fdb31822d6c97fb7414f1515c1d1b5f3f92231405df46e7c9bc05acb
 AUX quakeforge-0.5.5-no-page-size.patch 354 RMD160 6e2fc49b4282b3ffe9038dba77eb35be2e461560 SHA1 929c4a27fb9e645bf09f40885abb5b2a8e278d07 SHA256 8ff7557e497cf5e691e9e3707b3615f32111e770e57baf362cec5bed16aba7ab
 AUX quakeforge-0.5.5-noWerror.patch 2413 RMD160 17580a3df00b1464985b79f8609bddcd2cf67839 SHA1 8f40571bd8969cce1edf49b88242ec738d2c9566 SHA256 ade037928aa9a58f99e2e62b4df461365336c595be712cc6697337b20d39258e
 DIST quakeforge-0.5.5.tar.bz2 1954072 RMD160 1caf8d7b272c9e588708ac39841d46aac2c5df79 SHA1 680e47a189de508f8cc7c5c525537f0aa2dafb05 SHA256 9ff29340f571fc26d19992a32f58e767e1b811248688f383083bc2ccb263ec6a
-EBUILD quakeforge-0.5.5-r2.ebuild 3916 RMD160 6788f9e6c6b64cfaf6129f1c151f32c6133f010d SHA1 e29f6bd097106e2c2bbad103d2313bf4251dce70 SHA256 759ee6893da38872640e4429c9e661fd4d5d99321a2ecea5e843bdbe69664fc3
+EBUILD quakeforge-0.5.5-r2.ebuild 3945 RMD160 254cf04258b422214c0c39580a718c1b0379ccfb SHA1 1a375ef2bb470f7c90d9a7ff1cf7f534246e22f2 SHA256 100538d398b2d4d3c21681777e10253c53790a2abde680bd0ff77c181ace0892
 EBUILD quakeforge-0.5.5.ebuild 3766 RMD160 0a839102c8c1bc8f9f701ba63b330f974c47bdc1 SHA1 da0c3d4df9db5ddf8c6e863dbb1501b6dcf7f14e SHA256 fd2442c2bb0d74ad49c3bbb20c5eff324845116f0445b86e5b9187d44f5b51dd
-MISC ChangeLog 4485 RMD160 991f2e2c11c70fbafbe5c82f04f8970522710d36 SHA1 9d532f804a7066d88486f97a88b53f99089313a1 SHA256 d0d9c27a7eafc38abfb9281246f83db89e855050d07cdbb270219075abc087c7
+MISC ChangeLog 4660 RMD160 2d5ab7a793608f3381d67ec91d92f73774538bbc SHA1 f0902938a90d0ea372693399ae380aa107a8b125 SHA256 e76ff22a17ae5cc78b465b2d42fc33cb8b1e430cf1a8f21c5dead48125e7c509
 MISC metadata.xml 1396 RMD160 b7e31184f0351596c32f9014e0c0b6b9a31ad4f1 SHA1 2ff09d93c6d3c1a1f5947ad4039d9160d9b0df48 SHA256 21be4035c9338cf0635afcaf8b23e1a0e98affcabbddd47f6a7663b2afa0d2bb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2sKx8ACgkQIY77eQFFFC0ecgCg3021sFUQWdSz7E9SqVK00WQQ
+jekAoKkSD787CIkG92fGMUsZ3F0K/tj/
+=3SrL
+-----END PGP SIGNATURE-----
diff --git a/games-fps/quakeforge/files/quakeforge-0.5.5-gcc46.patch b/games-fps/quakeforge/files/quakeforge-0.5.5-gcc46.patch
new file mode 100644
index 000000000000..9ce55330c7c1
--- /dev/null
+++ b/games-fps/quakeforge/files/quakeforge-0.5.5-gcc46.patch
@@ -0,0 +1,174 @@
+--- libs/audio/cd/Makefile.am.old	2011-04-18 11:40:51.058924897 +0200
++++ libs/audio/cd/Makefile.am	2011-04-18 12:24:29.486917778 +0200
+@@ -5,13 +5,12 @@
+ SDL_LIBS= @SDL_LIBS@
+ XMMS_LIBS= @XMMS_LIBS@
+ plugin_version= 1:0:0
+-plugin_ldflags= @plugin_ldflags@
++plugin_ldflags= @plugin_ldflags@ -module
+ plugin_libadd= @plugin_libadd@
+ EXEEXT=
+ 
+-plugin_PROGRAMS=	@CD_PLUGIN_TARGETS@
+-noinst_PROGRAMS=	@CD_PLUGIN_STATIC@
+-EXTRA_PROGRAMS=	cd_file.la cd_linux.la cd_sdl.la cd_sgi.la cd_win.la cd_xmms.la
++plugin_LTLIBRARIES=	@CD_PLUGIN_TARGETS@
++EXTRA_LTLIBRARIES=	cd_file.la cd_linux.la cd_sdl.la cd_sgi.la cd_win.la cd_xmms.la
+ 
+ cd_file_la_LDFLAGS= $(plugin_ldflags)
+ cd_file_la_SOURCES= cd_file.c
+@@ -20,19 +19,19 @@
+ cd_linux_la_SOURCES=	cd_linux.c
+ 
+ cd_sdl_la_LDFLAGS=	$(plugin_ldflags)
+-cd_sdl_la_LDADD=	$(SDL_LIBS) $(plugin_libadd)
++cd_sdl_la_LIBADD=	$(SDL_LIBS) $(plugin_libadd)
+ cd_sdl_la_CFLAGS=	$(SDL_CFLAGS)
+ cd_sdl_la_SOURCES=	cd_sdl.c
+ 
+ cd_sgi_la_LDFLAGS=	$(plugin_ldflags)
+-cd_sgi_la_LDADD=	$(SGI_CD_LIBS)
++cd_sgi_la_LIBADD=	$(SGI_CD_LIBS)
+ cd_sgi_la_SOURCES=	cd_sgi.c
+ 
+ cd_win_la_LDFLAGS=	$(plugin_ldflags)
+-cd_win_la_LDADD=	$(plugin_libadd)
++cd_win_la_LIBADD=	$(plugin_libadd)
+ cd_win_la_SOURCES=	cd_win.c
+ 
+ cd_xmms_la_LDFLAGS=	$(plugin_ldflags)
+-cd_xmms_la_LDADD=	$(XMMS_LIBS)
++cd_xmms_la_LIBADD=	$(XMMS_LIBS)
+ cd_xmms_la_CFLAGS=	$(XMMS_CFLAGS)
+ cd_xmms_la_SOURCES=	cd_xmms.c
+--- libs/audio/targets/Makefile.am.old	2011-04-18 12:50:20.674846930 +0200
++++ libs/audio/targets/Makefile.am	2011-04-18 12:53:22.220844800 +0200
+@@ -4,39 +4,38 @@
+ INCLUDES= -I$(top_srcdir)/include
+ SDL_LIBS = @SDL_LIBS@
+ plugin_version= 1:0:0
+-plugin_ldflags= @plugin_ldflags@
++plugin_ldflags= @plugin_ldflags@ -module
+ plugin_libadd= @plugin_libadd@
+ EXEEXT=
+ 
+-plugin_PROGRAMS=	@SND_PLUGIN_TARGETS@
+-noinst_PROGRAMS=	@SND_PLUGIN_STATIC@
+-EXTRA_PROGRAMS= \
++plugin_LTLIBRARIES=	@SND_PLUGIN_TARGETS@
++EXTRA_LTLIBRARIES= \
+ 	snd_output_sdl.la snd_output_alsa.la snd_output_alsa0_9.la\
+ 	snd_output_oss.la snd_output_sgi.la snd_output_sun.la \
+ 	snd_output_win.la snd_output_dx.la snd_output_disk.la
+ 
+ snd_output_sdl_la_LDFLAGS=	$(plugin_ldflags)
+-snd_output_sdl_la_LDADD=	$(SDL_LIBS) $(plugin_libadd)
++snd_output_sdl_la_LIBADD=	$(SDL_LIBS) $(plugin_libadd)
+ snd_output_sdl_la_CFLAGS=	$(SDL_CFLAGS)
+ snd_output_sdl_la_SOURCES=	snd_sdl.c
+ 
+ snd_output_alsa_la_LDFLAGS=	$(plugin_ldflags)
+-snd_output_alsa_la_LDADD=
++snd_output_alsa_la_LIBADD=
+ snd_output_alsa_la_CFLAGS=	$(ALSA_CFLAGS)
+ snd_output_alsa_la_SOURCES=	snd_alsa.c
+ 
+ snd_output_alsa0_9_la_LDFLAGS=	$(plugin_ldflags)
+-snd_output_alsa0_9_la_LDADD=
++snd_output_alsa0_9_la_LIBADD=
+ snd_output_alsa0_9_la_CFLAGS=	$(ALSA_CFLAGS)
+ snd_output_alsa0_9_la_SOURCES=	snd_alsa_0_9.c
+ 
+ snd_output_oss_la_LDFLAGS=	$(plugin_ldflags)
+-snd_output_oss_la_LDADD=	$(OSS_LIBS)
++snd_output_oss_la_LIBADD=	$(OSS_LIBS)
+ snd_output_oss_la_CFLAGS=	$(OSS_CFLAGS)
+ snd_output_oss_la_SOURCES=	snd_oss.c
+ 
+ snd_output_sgi_la_LDFLAGS=	$(plugin_ldflags)
+-snd_output_sgi_la_LDADD=	$(SGISND_LIBS)
++snd_output_sgi_la_LIBADD=	$(SGISND_LIBS)
+ snd_output_sgi_la_CFLAGS=	$(SGISND_CFLAGS)
+ snd_output_sgi_la_SOURCES=	snd_sgi.c
+ 
+@@ -45,16 +44,16 @@
+ snd_output_sun_la_SOURCES=	snd_sun.c
+ 
+ snd_output_win_la_LDFLAGS=	$(plugin_ldflags)
+-snd_output_win_la_LDADD=	$(WINSND_LIBS) $(plugin_libadd)
++snd_output_win_la_LIBADD=	$(WINSND_LIBS) $(plugin_libadd)
+ snd_output_win_la_CFLAGS=	$(WIN32SND_CFLAGS)
+ snd_output_win_la_SOURCES=	snd_win.c
+ 
+ snd_output_dx_la_LDFLAGS=	$(plugin_ldflags)
+-snd_output_dx_la_LDADD=		$(WINSND_LIBS) $(plugin_libadd)
++snd_output_dx_la_LIBADD=	$(WINSND_LIBS) $(plugin_libadd)
+ snd_output_dx_la_CFLAGS=	$(WIN32SND_CFLAGS)
+ snd_output_dx_la_SOURCES=	snd_dx.c
+ 
+ snd_output_disk_la_LDFLAGS=	$(plugin_ldflags)
+-snd_output_disk_la_LDADD=	$(plugin_libadd)
++snd_output_disk_la_LIBADD=	$(plugin_libadd)
+ snd_output_disk_la_CFLAGS=
+ snd_output_disk_la_SOURCES=	snd_disk.c
+--- libs/audio/renderer/Makefile.am.old	2011-04-18 12:54:32.560697490 +0200
++++ libs/audio/renderer/Makefile.am	2011-04-18 12:55:21.157363865 +0200
+@@ -3,21 +3,19 @@
+ AM_CFLAGS= @PREFER_PIC@ @VORBIS_CFLAGS@ @OGG_CFLAGS@
+ INCLUDES= -I$(top_srcdir)/include
+ plugin_version= 1:0:0
+-plugin_ldflags= @plugin_ldflags@
++plugin_ldflags= @plugin_ldflags@ -module
+ plugin_libadd= @plugin_libadd@
+ EXEEXT=
+ 
+-plugin_PROGRAMS=	@SND_REND_TARGETS@
+-EXTRA_PROGRAMS=	snd_render_default.la
+-
+-noinst_PROGRAMS=	@SND_REND_STATIC@
++plugin_LTLIBRARIES=	@SND_REND_TARGETS@
++EXTRA_LTLIBRARIES=	snd_render_default.la
+ 
+ snd_render_default_la_LDFLAGS=	$(plugin_ldflags)
+ snd_render_default_la_SOURCES=	snd_dma.c snd_mem.c snd_mix.c vorbis.c wav.c midi.c
+ if ASM_ARCH
+-snd_render_default_la_LDADD=	$(VORBISFILE_LIBS) $(VORBIS_LIBS) $(OGG_LIBS) $(WM_LIBS)
++snd_render_default_la_LIBADD=	$(VORBISFILE_LIBS) $(VORBIS_LIBS) $(OGG_LIBS) $(WM_LIBS)
+ snd_render_default_la_DEPENDENCIES=
+ else
+-snd_render_default_la_LDADD=	$(VORBISFILE_LIBS) $(VORBIS_LIBS) $(OGG_LIBS) $(WM_LIBS)
++snd_render_default_la_LIBADD=	$(VORBISFILE_LIBS) $(VORBIS_LIBS) $(OGG_LIBS) $(WM_LIBS)
+ snd_render_default_la_DEPENDENCIES=
+ endif
+--- libs/console/Makefile.am.old	2011-04-18 12:56:29.253106265 +0200
++++ libs/console/Makefile.am	2011-04-18 12:57:28.784383855 +0200
+@@ -3,14 +3,13 @@
+ AM_CFLAGS= @PREFER_PIC@
+ INCLUDES= -I$(top_srcdir)/include
+ plugin_version= 1:0:0
+-plugin_ldflags= @plugin_ldflags@
++plugin_ldflags= @plugin_ldflags@ -module
+ plugin_libadd= @plugin_libadd@
+ EXEEXT=
+ 
+ lib_LTLIBRARIES=	libQFconsole.la
+-plugin_PROGRAMS= @SERVER_PLUGIN_TARGETS@ @CLIENT_PLUGIN_TARGETS@
+-noinst_PROGRAMS= @SERVER_PLUGIN_STATIC@ @CLIENT_PLUGIN_STATIC@
+-EXTRA_PROGRAMS=  console_server.la console_client.la
++plugin_LTLIBRARIES= @SERVER_PLUGIN_TARGETS@ @CLIENT_PLUGIN_TARGETS@
++EXTRA_LTLIBRARIES=  console_server.la console_client.la
+ 
+ common_sources= \
+ 	buffer.c complete.c console.c inputline.c list.c filelist.c view.c
+@@ -22,9 +21,9 @@
+ libQFconsole_la_SOURCES=	$(common_sources)
+ 
+ console_client_la_LDFLAGS=	$(plugin_ldflags)
+-console_client_la_LDADD=	$(plugin_libadd)
++console_client_la_LIBADD=	$(plugin_libadd)
+ console_client_la_SOURCES=	$(client_sources)
+ 
+ console_server_la_LDFLAGS=	$(plugin_ldflags)
+-console_server_la_LDADD=	$(CURSES_LIBS) $(plugin_libadd)
++console_server_la_LIBADD=	$(CURSES_LIBS) $(plugin_libadd)
+ console_server_la_SOURCES=	$(server_sources)
diff --git a/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild b/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild
index 40f91f53cead..dd6646b54c8a 100644
--- a/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild
+++ b/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild,v 1.7 2011/03/08 17:05:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/quakeforge-0.5.5-r2.ebuild,v 1.8 2011/04/18 12:14:09 tupone Exp $
 
 EAPI=2
 inherit base eutils autotools games
@@ -46,6 +46,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-keys.patch
 	"${FILESDIR}"/${P}-amd64.patch
 	"${FILESDIR}"/${P}-noWerror.patch
+	"${FILESDIR}"/${P}-gcc46.patch
 )
 
 src_prepare() {