Fix for gcc-4.1, bug #131689

Package-Manager: portage-2.1_pre10-r2

6 files changed, 129 insertions, 19 deletions

diff --git a/games-fps/alephone/ChangeLog b/games-fps/alephone/ChangeLog
index ea8f63342484..fbd9745caa9d 100644
--- a/games-fps/alephone/ChangeLog
+++ b/games-fps/alephone/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/alephone
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/alephone/ChangeLog,v 1.8 2006/03/30 01:31:27 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/alephone/ChangeLog,v 1.9 2006/05/05 20:52:03 tupone Exp $
+
+  05 May 2006; <Tupone@gentoo.org> +files/alephone-20051119-gcc41.patch,
+  alephone-20051119.ebuild:
+  Fix for gcc-4.1, bug #131689 by Charlie Shepherd
+  Patch by Mark Loeser
 
   30 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   -files/20040417-gcc34.patch, -alephone-20040417.ebuild:
diff --git a/games-fps/alephone/Manifest b/games-fps/alephone/Manifest
index 702c35193689..2e0ecfe5c6c9 100644
--- a/games-fps/alephone/Manifest
+++ b/games-fps/alephone/Manifest
@@ -1,21 +1,42 @@
-MD5 8e4977d69a972af2e6d82d613c87a227 ChangeLog 1315
-RMD160 83e793526a35733f16ca9c62fc5661ac33f30ecc ChangeLog 1315
-SHA256 906fb3b6e159ce0c90ed1372aa725305296b2ba31c01a98000448ddff7864f2b ChangeLog 1315
-MD5 7dd98ee7fc44a716dd68698c889b7d0a alephone-20050118.ebuild 1439
-RMD160 f5adeda643a218830188ef6c2c6226ab3f3388ca alephone-20050118.ebuild 1439
-SHA256 e27e407fbf4fdf069468f337e3a723648e5b00988636426166224aa664a110ed alephone-20050118.ebuild 1439
-MD5 b6ad2864f44c3542a9d1422a7460ae10 alephone-20051119.ebuild 2818
-RMD160 8e10e132a42e8b569c97df479848ca0ba3ec09e5 alephone-20051119.ebuild 2818
-SHA256 d76c18416f2b9de78926c3fc1c08357571ab088f1fcee8f2940a359dfafa9137 alephone-20051119.ebuild 2818
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX alephone-20051119-gcc41.patch 2902 RMD160 1ae391f8f92dbe4ff13f499c799f6a3750a63d85 SHA1 1c8d89bdcdd24cd3268df312fd163f60b4ad918c SHA256 2733129800587614d06a97fd7d70f26541e3561ac33fdbfa9b0b07421cfe8035 size 2902
+MD5 b714317e6de940ce69d396a29ee34d3e files/alephone-20051119-gcc41.patch 2902
+RMD160 1ae391f8f92dbe4ff13f499c799f6a3750a63d85 files/alephone-20051119-gcc41.patch 2902
+SHA256 2733129800587614d06a97fd7d70f26541e3561ac33fdbfa9b0b07421cfe8035 files/alephone-20051119-gcc41.patch 2902
+AUX alephone.png 13265 RMD160 8ca279c5728cf4bfc921ec73ed6f71f3c702e143 SHA1 ec248a7ab2dbaf31c9921477ec700c1f14e67597 SHA256 7dedb153b22827d64c1f3462fa6646eb9bd7b8ec1feb1a2e34be2f74e81b42af size 13265
 MD5 b3bde37a338d65ac0dec3aa0ac7c2c22 files/alephone.png 13265
 RMD160 8ca279c5728cf4bfc921ec73ed6f71f3c702e143 files/alephone.png 13265
 SHA256 7dedb153b22827d64c1f3462fa6646eb9bd7b8ec1feb1a2e34be2f74e81b42af files/alephone.png 13265
-MD5 adc3c7e48da56c50654521b80fe2f0e2 files/digest-alephone-20050118 68
-RMD160 0244db88e33a2598b49993990ffac9ef30a69e47 files/digest-alephone-20050118 68
-SHA256 bd995147bc19f839b13bd22c5f9ee7cd7c84daefd5815f5679ff3f0cbb5f523b files/digest-alephone-20050118 68
-MD5 e24c7221989a38e3bf31e9bd2bbeeb29 files/digest-alephone-20051119 70
-RMD160 814297781ead8dc48f0c595bd5948f24a49534ea files/digest-alephone-20051119 70
-SHA256 a27d67728bc181f0b501b2d748873625d583934e1eb89afbcb9fdf654f5eb31e files/digest-alephone-20051119 70
+DIST AlephOne-20051119.tar.gz 6519469 RMD160 0675864a66e0e945e6909291dd3a40fe6af35045 SHA256 0f6dcb1acd153babc3905b18bf460eca7a62a29ba963a812015510d0fa9d9752 size 6519469
+DIST aleph-20050118.tar.bz2 2324962 RMD160 663e3923e261a28af1dac6c25f37c44be8e0e941 SHA256 5b648a629ecf47474c86147f4a60810b0903ce75895ca2ec7b23439069ea9c0b size 2324962
+EBUILD alephone-20050118.ebuild 1439 RMD160 f5adeda643a218830188ef6c2c6226ab3f3388ca SHA1 4f837b9cb730dff987c02843f60ce9b2b051417e SHA256 e27e407fbf4fdf069468f337e3a723648e5b00988636426166224aa664a110ed size 1439
+MD5 7dd98ee7fc44a716dd68698c889b7d0a alephone-20050118.ebuild 1439
+RMD160 f5adeda643a218830188ef6c2c6226ab3f3388ca alephone-20050118.ebuild 1439
+SHA256 e27e407fbf4fdf069468f337e3a723648e5b00988636426166224aa664a110ed alephone-20050118.ebuild 1439
+EBUILD alephone-20051119.ebuild 2859 RMD160 bb61b93fcee1f69ffe50a47994a2724614bd315e SHA1 9604ce1d2fe3c82a8f2f91ced59bccebe9cb6674 SHA256 bff27e1ce64876aa854da53d82ce1fd390a8b0301c0a1964a68b54521f22d188 size 2859
+MD5 7dd1b5e286010443f49627e2007aa568 alephone-20051119.ebuild 2859
+RMD160 bb61b93fcee1f69ffe50a47994a2724614bd315e alephone-20051119.ebuild 2859
+SHA256 bff27e1ce64876aa854da53d82ce1fd390a8b0301c0a1964a68b54521f22d188 alephone-20051119.ebuild 2859
+MISC ChangeLog 1489 RMD160 a8f171468349638cdfba77b71fee23e586dd060b SHA1 0d7728a409319593ec4b81ddbf74977f194f5657 SHA256 a363a808ba4f6d29ba2b70a67978a1fc9f4840d74536dacd00a2633b884d9713 size 1489
+MD5 6052281386594e33c365f653a371575d ChangeLog 1489
+RMD160 a8f171468349638cdfba77b71fee23e586dd060b ChangeLog 1489
+SHA256 a363a808ba4f6d29ba2b70a67978a1fc9f4840d74536dacd00a2633b884d9713 ChangeLog 1489
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 59e7eae56f56adc242322fbf55b4186c files/digest-alephone-20050118 250
+RMD160 7a79ce6baa9f66dfdf70d0b6fc6aacdac7e3728c files/digest-alephone-20050118 250
+SHA256 15fc2fea6a7204ef059254e050c6093e707ffd503fb55075667bba19651400de files/digest-alephone-20050118 250
+MD5 0b1e4502fa97900e81975778fe933ad2 files/digest-alephone-20051119 256
+RMD160 bb44d28899bdb21a71978684b4c38ba5346bdc21 files/digest-alephone-20051119 256
+SHA256 4bb5f1386c728f28029361ce055c6ec31d0ca1a12e02ae431699e4671d2456b0 files/digest-alephone-20051119 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEW7r/2CTtIKiFlQIRAvFVAJ9FrQUvdshNTF7a3W64mmXh9lnGpACgkNV1
+/cgPAsgAYyvf3fdVfn0TTeE=
+=rwBZ
+-----END PGP SIGNATURE-----
diff --git a/games-fps/alephone/alephone-20051119.ebuild b/games-fps/alephone/alephone-20051119.ebuild
index 993051d88312..71380bdf65b8 100644
--- a/games-fps/alephone/alephone-20051119.ebuild
+++ b/games-fps/alephone/alephone-20051119.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/alephone/alephone-20051119.ebuild,v 1.2 2006/03/20 22:07:29 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/alephone/alephone-20051119.ebuild,v 1.3 2006/05/05 20:52:03 tupone Exp $
 
 inherit eutils games
 
@@ -25,8 +25,10 @@ S=${WORKDIR}/AlephOne-${PV}
 
 src_unpack() {
 	unpack ${A}
-	cp ${FILESDIR}/alephone.png ${S}
-	cat > ${S}/alephone.sh << EOF
+	cd "${S}"
+	cp ${FILESDIR}/alephone.png ./
+	epatch "${FILESDIR}/${P}"-gcc41.patch
+	cat > alephone.sh << EOF
 #!/bin/sh
 
 DATADIRS="
diff --git a/games-fps/alephone/files/alephone-20051119-gcc41.patch b/games-fps/alephone/files/alephone-20051119-gcc41.patch
new file mode 100644
index 000000000000..4d3712e40179
--- /dev/null
+++ b/games-fps/alephone/files/alephone-20051119-gcc41.patch
@@ -0,0 +1,78 @@
+--- Source_Files/Misc/sdl_widgets.h.old	2006-05-05 22:25:11.000000000 +0200
++++ Source_Files/Misc/sdl_widgets.h	2006-05-05 22:25:55.000000000 +0200
+@@ -944,7 +944,7 @@
+ 	virtual ~SelectorWidget () {}
+ 
+ protected:
+-	SelectorWidget::SelectorWidget (widget* in_widget)
++	SelectorWidget (widget* in_widget)
+ 		: SDLWidgetWidget (in_widget)
+ 		, m_callback (NULL)
+ 		{}
+@@ -955,7 +955,7 @@
+ class PopupSelectorWidget : public SelectorWidget
+ {
+ public:
+-	PopupSelectorWidget::PopupSelectorWidget (w_select_popup* select_popup_w)
++	PopupSelectorWidget (w_select_popup* select_popup_w)
+ 		: SelectorWidget (select_popup_w)
+ 		, m_select_popup (select_popup_w)
+ 		{ select_popup_w->set_popup_callback (boost::bind(&PopupSelectorWidget::massage_callback, this, _1), NULL); }
+@@ -974,7 +974,7 @@
+ class SelectSelectorWidget : public SelectorWidget
+ {
+ public:
+-	SelectSelectorWidget::SelectSelectorWidget (w_select* select_w)
++	SelectSelectorWidget (w_select* select_w)
+ 		: SelectorWidget (select_w)
+ 		, m_select (select_w)
+ 		{ m_select->set_selection_changed_callback (boost::bind(&SelectSelectorWidget::massage_callback, this, _1)); }
+@@ -996,7 +996,7 @@
+ class ColourSelectorWidget : public SelectSelectorWidget
+ {
+ public:
+-	ColourSelectorWidget::ColourSelectorWidget (w_player_color* player_color_w)
++	ColourSelectorWidget (w_player_color* player_color_w)
+ 		: SelectSelectorWidget (player_color_w) {}
+ 
+ 	// We ignore the labels and use swatches of colour instead
+@@ -1028,7 +1028,7 @@
+ class StaticTextWidget : public SDLWidgetWidget
+ {
+ public:
+-	StaticTextWidget::StaticTextWidget (w_static_text* static_text_w)
++	StaticTextWidget (w_static_text* static_text_w)
+ 		: SDLWidgetWidget (static_text_w)
+ 		, m_static_text (static_text_w)
+ 		{}
+--- Source_Files/TCPMess/CommunicationsChannel.h.old	2006-05-05 22:34:47.000000000 +0200
++++ Source_Files/TCPMess/CommunicationsChannel.h	2006-05-05 22:34:58.000000000 +0200
+@@ -95,7 +95,7 @@
+ 	// Calls back message handlers (if appropriate)
+ 	void		dispatchIncomingMessages();
+ 
+-	bool		CommunicationsChannel::isMessageAvailable();
++	bool		isMessageAvailable();
+ 
+ 	// Call does not return unless (1) times out (NULL); (2) disconnected (NULL); or
+ 	// (3) some message received (pointer to inflated message object).
+--- Source_Files/Network/network_dialogs_sdl.cpp.old	2006-05-05 22:38:31.000000000 +0200
++++ Source_Files/Network/network_dialogs_sdl.cpp	2006-05-05 22:39:01.000000000 +0200
+@@ -838,7 +838,7 @@
+ class SdlGatherDialog : public GatherDialog
+ {
+ public:
+-	SdlGatherDialog::SdlGatherDialog()
++	SdlGatherDialog()
+ 	{
+ 		m_dialog.add(new w_static_text("GATHER NETWORK GAME", TITLE_FONT, TITLE_COLOR));
+ 	
+@@ -921,7 +921,7 @@
+ class SdlJoinDialog : public JoinDialog
+ {
+ public:
+-	SdlJoinDialog::SdlJoinDialog()
++	SdlJoinDialog()
+ 	{
+ 		m_dialog.add(new w_static_text("JOIN NETWORK GAME", TITLE_FONT, TITLE_COLOR));
+ 		m_dialog.add(new w_spacer());
diff --git a/games-fps/alephone/files/digest-alephone-20050118 b/games-fps/alephone/files/digest-alephone-20050118
index 9e044d5d5151..e94d26612286 100644
--- a/games-fps/alephone/files/digest-alephone-20050118
+++ b/games-fps/alephone/files/digest-alephone-20050118
@@ -1 +1,3 @@
 MD5 789f7fe1f67b60f31aab75bb48ecf552 aleph-20050118.tar.bz2 2324962
+RMD160 663e3923e261a28af1dac6c25f37c44be8e0e941 aleph-20050118.tar.bz2 2324962
+SHA256 5b648a629ecf47474c86147f4a60810b0903ce75895ca2ec7b23439069ea9c0b aleph-20050118.tar.bz2 2324962
diff --git a/games-fps/alephone/files/digest-alephone-20051119 b/games-fps/alephone/files/digest-alephone-20051119
index f750b4136b10..830b80708acf 100644
--- a/games-fps/alephone/files/digest-alephone-20051119
+++ b/games-fps/alephone/files/digest-alephone-20051119
@@ -1 +1,3 @@
 MD5 35d42aa80d3d2ab54b5ec5015e5ddcf4 AlephOne-20051119.tar.gz 6519469
+RMD160 0675864a66e0e945e6909291dd3a40fe6af35045 AlephOne-20051119.tar.gz 6519469
+SHA256 0f6dcb1acd153babc3905b18bf460eca7a62a29ba963a812015510d0fa9d9752 AlephOne-20051119.tar.gz 6519469