Fix for gcc-4.1, bug #133815

Package-Manager: portage-2.1_rc3-r1

4 files changed, 115 insertions, 14 deletions

diff --git a/games-puzzle/quadra/ChangeLog b/games-puzzle/quadra/ChangeLog
index 73362af26ad0..955e13348315 100644
--- a/games-puzzle/quadra/ChangeLog
+++ b/games-puzzle/quadra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/quadra
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/ChangeLog,v 1.12 2006/05/31 18:19:34 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/ChangeLog,v 1.13 2006/05/31 18:55:36 tupone Exp $
+
+  31 May 2006; <Tupone@gentoo.org> +files/quadra-1.1.8-gcc41.patch,
+  quadra-1.1.8.ebuild:
+  Fix for gcc-4.1, bug #133815 by me
 
   31 May 2006; <Tupone@gentoo.org> quadra-1.1.8.ebuild:
   Fix sandbox violation
diff --git a/games-puzzle/quadra/Manifest b/games-puzzle/quadra/Manifest
index 1defb814de7f..7c23d52286db 100644
--- a/games-puzzle/quadra/Manifest
+++ b/games-puzzle/quadra/Manifest
@@ -13,15 +13,19 @@ AUX quadra-1.1.8-gcc3.patch 2830 RMD160 1b39182540f7117c6d55ec409708227c49d7cb87
 MD5 9e774090da8184c5773262c18467cd32 files/quadra-1.1.8-gcc3.patch 2830
 RMD160 1b39182540f7117c6d55ec409708227c49d7cb87 files/quadra-1.1.8-gcc3.patch 2830
 SHA256 eb0e08ab1c31a54837b39ab40fa75eaf586a89d3a41525a0d828f9768df0a9a3 files/quadra-1.1.8-gcc3.patch 2830
+AUX quadra-1.1.8-gcc41.patch 3014 RMD160 cb01d18d84445caff3877888f74e8396cc3819b1 SHA1 5a4a880110491fe23837485f086e465a6a2112b9 SHA256 8831a6ad7baf745acacc6b9d4b08771c4d43c97391d88f674380c6896b0a4266
+MD5 e873928d45db3656c581f2a8be99da1a files/quadra-1.1.8-gcc41.patch 3014
+RMD160 cb01d18d84445caff3877888f74e8396cc3819b1 files/quadra-1.1.8-gcc41.patch 3014
+SHA256 8831a6ad7baf745acacc6b9d4b08771c4d43c97391d88f674380c6896b0a4266 files/quadra-1.1.8-gcc41.patch 3014
 DIST quadra-1.1.8.tar.gz 3379618 RMD160 e57f25a714d5f447f3dcb34c34af9fa22718560d SHA1 3c97ffbbf180b4d952f8aedd183b0fd4a4809957 SHA256 6ebf81d4ffe1cedbebfdcc2cb44fdac875da8ccbd3d113ca5cb62169bf63d201
-EBUILD quadra-1.1.8.ebuild 1717 RMD160 d86bc51b73e06ccebacb1c628c625432f63825b5 SHA1 3eeb29e6488078023956229c9af21ba17fc5bb29 SHA256 5a4cf3d4920e1ddb738895341ba6f757c59f372373d73f73c75b84c7a739350a
-MD5 41d95954cfdcc5de71dc0c0ff5ae4221 quadra-1.1.8.ebuild 1717
-RMD160 d86bc51b73e06ccebacb1c628c625432f63825b5 quadra-1.1.8.ebuild 1717
-SHA256 5a4cf3d4920e1ddb738895341ba6f757c59f372373d73f73c75b84c7a739350a quadra-1.1.8.ebuild 1717
-MISC ChangeLog 1783 RMD160 ffc9d72b85665d020d796e29c191fa33020660dc SHA1 7330ffb20640f3273530dcaff91ffc0126bf7bec SHA256 0a8cd2fe4026c3f968f689e85c0d4645a31ebcb05725fec9c69e1547c031c672
-MD5 3bae5c189cf058e43cfca578c1915668 ChangeLog 1783
-RMD160 ffc9d72b85665d020d796e29c191fa33020660dc ChangeLog 1783
-SHA256 0a8cd2fe4026c3f968f689e85c0d4645a31ebcb05725fec9c69e1547c031c672 ChangeLog 1783
+EBUILD quadra-1.1.8.ebuild 1752 RMD160 3ced862811f8e8f6314c1b8fc4e2a0121a75557f SHA1 d6445a6210bc0b6f536651121484fcc19207d698 SHA256 b74cc700c55da53f9b071cd7dd68f074e5a670d361cc3a22757548a1db5b2c16
+MD5 edad3a6f0e6cdc8fd36ac5903d824450 quadra-1.1.8.ebuild 1752
+RMD160 3ced862811f8e8f6314c1b8fc4e2a0121a75557f quadra-1.1.8.ebuild 1752
+SHA256 b74cc700c55da53f9b071cd7dd68f074e5a670d361cc3a22757548a1db5b2c16 quadra-1.1.8.ebuild 1752
+MISC ChangeLog 1912 RMD160 5e72230ee092fbde54626e2639a2c520d14fced6 SHA1 cebd73d22070e5b58f8d0df88c840c5fb69137cc SHA256 c52e6f4ecab39ab982215276c2964db71f659e72344dc6cdba08b1f6f63be07b
+MD5 8c86a90f956561226b878ebc8bef002a ChangeLog 1912
+RMD160 5e72230ee092fbde54626e2639a2c520d14fced6 ChangeLog 1912
+SHA256 c52e6f4ecab39ab982215276c2964db71f659e72344dc6cdba08b1f6f63be07b ChangeLog 1912
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -32,7 +36,7 @@ SHA256 bedb0acd7b2cc7358e4d769861c5b82b7f8d9a1b4c919aa9b3bf41df076548d5 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEfd5C2CTtIKiFlQIRAnnCAJ95e6zPXySb1yASUYIbf0dZPKNlUQCdFZ/g
-8qE9Z0FZ0A1yKbBieX8nClM=
-=C3h2
+iD8DBQFEfeaz2CTtIKiFlQIRAp5XAKCf+xVA0olKLCNQ5um28NhcB1+qjQCgxdyu
+DRHcaDQpunOWTggJR3AW3T4=
+=FTIG
 -----END PGP SIGNATURE-----
diff --git a/games-puzzle/quadra/files/quadra-1.1.8-gcc41.patch b/games-puzzle/quadra/files/quadra-1.1.8-gcc41.patch
new file mode 100644
index 000000000000..02ede4884ec8
--- /dev/null
+++ b/games-puzzle/quadra/files/quadra-1.1.8-gcc41.patch
@@ -0,0 +1,92 @@
+diff -ur quadra-1.1.8-orig/skelton/include/array.h quadra-1.1.8/skelton/include/array.h
+--- quadra-1.1.8-orig/skelton/include/array.h	2006-05-21 16:35:30.000000000 -0400
++++ quadra-1.1.8/skelton/include/array.h	2006-05-21 16:53:06.000000000 -0400
+@@ -21,6 +21,7 @@
+ #ifndef _HEADER_ARRAY
+ #define _HEADER_ARRAY
+ #include <vector>
++#include <algorithm>
+ 
+ #ifndef max
+ #define max(a,b) (((a) > (b)) ? (a) : (b))
+@@ -37,7 +38,9 @@
+ 		v.push_back(t);
+ 	}
+ 	void add_before(const T& t, int i) {
+-		v.insert(&v[i], t);
++		typename std::vector<T>::iterator iter = v.begin();
++		std::advance(iter, i);
++		v.insert(iter, t);
+ 	}
+ 	bool remove_item(const T& t) {
+ 		for(int i=0; i<size(); i++)
+@@ -51,7 +54,9 @@
+ 		v.pop_back();
+ 	}
+ 	void remove(int i) {
+-		v.erase(&v[i]);
++		typename std::vector<T>::iterator iter = v.begin();
++		std::advance(iter, i);
++		v.erase(iter);
+ 	}
+ 	int size() const {
+ 		return v.size();
+diff -ur quadra-1.1.8-orig/source/net_server.cpp quadra-1.1.8/source/net_server.cpp
+--- quadra-1.1.8-orig/source/net_server.cpp	2006-05-21 16:35:30.000000000 -0400
++++ quadra-1.1.8/source/net_server.cpp	2006-05-21 16:54:27.000000000 -0400
+@@ -400,13 +400,14 @@
+ 				}
+ 			}
+ 		}
++		unsigned i;
+ 		if(playeraccepted.accepted == 0) {
+ 			if(game->net_list.size() == MAXPLAYERS)
+ 				playeraccepted.accepted = 5; // game is full, can't join
+ 			if(game->server_max_players && game->net_list.size() >= game->server_max_players)
+ 				playeraccepted.accepted = 5; // game is full, can't join
+ 			if(game->server_max_teams && game->net_list.count_teams() >= game->server_max_teams) {
+-				for(unsigned i=0; i<MAXPLAYERS; ++i) {
++				for(i=0; i<MAXPLAYERS; ++i) {
+ 					Canvas* c=game->net_list.get(i);
+ 					if(c && c->color==p->team)
+ 						break;
+diff -ur quadra-1.1.8-orig/source/net_stuff.cpp quadra-1.1.8/source/net_stuff.cpp
+--- quadra-1.1.8-orig/source/net_stuff.cpp	2006-05-21 16:35:30.000000000 -0400
++++ quadra-1.1.8/source/net_stuff.cpp	2006-05-21 16:55:03.000000000 -0400
+@@ -29,6 +29,7 @@
+ #include "texte.h"
+ #include "video.h"
+ #include "nglog.h"
++#include <stdarg.h>
+ 
+ RCSID("$Id: quadra-1.1.8-gcc41.patch,v 1.1 2006/05/31 18:55:36 tupone Exp $")
+ 
+diff -ur quadra-1.1.8-orig/source/quadra.cpp quadra-1.1.8/source/quadra.cpp
+--- quadra-1.1.8-orig/source/quadra.cpp	2006-05-21 16:35:30.000000000 -0400
++++ quadra-1.1.8/source/quadra.cpp	2006-05-21 16:56:12.000000000 -0400
+@@ -65,6 +65,7 @@
+ #include "clock.h"
+ #include "net_server.h"
+ #include "quadra.h"
++#include <exception>
+ 
+ RCSID("$Id: quadra-1.1.8-gcc41.patch,v 1.1 2006/05/31 18:55:36 tupone Exp $")
+ 
+@@ -2387,7 +2388,7 @@
+ 				try {
+ 					overmind.step();
+ 				}
+-				catch(exception *e) {
++				catch(std::exception *e) {
+ 					msgbox("Exception caught from overmind.step(): %s\n", e->what());
+ 				}
+ 				#ifdef PAINTDETECTOR2000
+@@ -2406,7 +2407,7 @@
+ 			try {
+ 				ecran->draw_zone();
+ 			}
+-			catch(exception *e) {
++			catch(std::exception *e) {
+ 				msgbox("Exception caught from ecran->draw_zone(): %s\n", e->what());
+ 			}
+ 
diff --git a/games-puzzle/quadra/quadra-1.1.8.ebuild b/games-puzzle/quadra/quadra-1.1.8.ebuild
index dc3fa95ae47b..5051c4f814e0 100644
--- a/games-puzzle/quadra/quadra-1.1.8.ebuild
+++ b/games-puzzle/quadra/quadra-1.1.8.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-puzzle/quadra/quadra-1.1.8.ebuild,v 1.12 2006/05/31 18:19:34 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/quadra-1.1.8.ebuild,v 1.13 2006/05/31 18:55:36 tupone Exp $
 
 inherit eutils toolchain-funcs games
 
@@ -23,7 +23,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	[ $(gcc-major-version) == 3 ] && epatch "${FILESDIR}/${P}-gcc3.patch"
-	epatch "${FILESDIR}/libpng-1.2.5.patch"
+	epatch "${FILESDIR}/libpng-1.2.5.patch" \
+		"${FILESDIR}/${P}"-gcc41.patch
 	use amd64 && epatch "${FILESDIR}/${P}-amd64.patch"
 	sed -i \
 		-e 's:-pedantic::' config/vars.mk \