Add fix from Debian for building with gcc-4.3 #218833 by Peter Alfredsen.

(Portage version: 2.2_pre5)

3 files changed, 77 insertions, 4 deletions

diff --git a/games-server/monopd/ChangeLog b/games-server/monopd/ChangeLog
index 83fcc9c2f78c..d44d46b28e73 100644
--- a/games-server/monopd/ChangeLog
+++ b/games-server/monopd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-server/monopd
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/monopd/ChangeLog,v 1.19 2008/02/09 04:30:00 mr_bones_ Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-server/monopd/ChangeLog,v 1.20 2008/05/10 11:12:08 vapier Exp $
+
+  10 May 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/monopd-0.9.3-gcc43.patch, monopd-0.9.3-r1.ebuild:
+  Add fix from Debian for building with gcc-4.3 #218833 by Peter Alfredsen.
 
   09 Feb 2008; Michael Sterrett <mr_bones_@gentoo.org>
   files/monopd-0.9.3-dosfix.patch:
diff --git a/games-server/monopd/files/monopd-0.9.3-gcc43.patch b/games-server/monopd/files/monopd-0.9.3-gcc43.patch
new file mode 100644
index 000000000000..553e17c81870
--- /dev/null
+++ b/games-server/monopd/files/monopd-0.9.3-gcc43.patch
@@ -0,0 +1,68 @@
+http://bugs.gentoo.org/218833
+
+fix building with gcc-4.3
+
+--- monopd-0.9.3/src/cardgroup.cpp
++++ monopd-0.9.3/src/cardgroup.cpp
+@@ -14,7 +14,7 @@
+ // the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ // Boston, MA 02111-1307, USA.
+ 
+-#include <algo.h>
++#include <algorithm>
+ 
+ #include "card.h"
+ #include "cardgroup.h"
+--- monopd-0.9.3/src/estategroup.cpp
++++ monopd-0.9.3/src/estategroup.cpp
+@@ -14,6 +14,7 @@
+ // the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ // Boston, MA 02111-1307, USA.
+ 
++#include <stdlib.h>
+ #include <iostream>
+ 
+ #include <math++/nodes.h>
+--- monopd-0.9.3/src/game.cpp
++++ monopd-0.9.3/src/game.cpp
+@@ -20,7 +20,8 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <syslog.h>
+-#include <algo.h> // libstdc++ from the gcc 2.95 has no #include <algo> yet :(
++#include <string.h>
++#include <algorithm> // libstdc++ from the gcc 2.95 has no #include <algo> yet :(
+ 
+ #include <map>
+ #include <string>
+--- monopd-0.9.3/src/main.cpp
++++ monopd-0.9.3/src/main.cpp
+@@ -18,6 +18,7 @@
+ #include <signal.h>
+ #include <syslog.h>
+ #include <unistd.h>
++#include <stdlib.h>
+ 
+ #include <iostream>
+ #include <string>
+--- monopd-0.9.3/src/player.cpp
++++ monopd-0.9.3/src/player.cpp
+@@ -18,6 +18,7 @@
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #include <string>
+ 
+--- monopd-0.9.3/src/server.cpp
++++ monopd-0.9.3/src/server.cpp
+@@ -25,6 +25,8 @@
+ #include <netinet/in.h>
+ #include <syslog.h>
+ #include <unistd.h>
++#include <stdlib.h>
++#include <string.h>
+ 
+ #include <string>
+ 
diff --git a/games-server/monopd/monopd-0.9.3-r1.ebuild b/games-server/monopd/monopd-0.9.3-r1.ebuild
index b5971f76e8dd..63e50542465b 100644
--- a/games-server/monopd/monopd-0.9.3-r1.ebuild
+++ b/games-server/monopd/monopd-0.9.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/monopd/monopd-0.9.3-r1.ebuild,v 1.2 2008/01/24 06:08:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/monopd/monopd-0.9.3-r1.ebuild,v 1.3 2008/05/10 11:12:08 vapier Exp $
 
 inherit eutils games
 
@@ -19,7 +19,8 @@ DEPEND=">=net-libs/libcapsinetwork-0.3.0
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${P}-dosfix.patch"
+	epatch "${FILESDIR}"/${P}-gcc43.patch #218833
+	epatch "${FILESDIR}"/${P}-dosfix.patch
 	# make the example config better (bug #206740)
 	sed -i \
 		-e '/gatorhost/s/=.*/=monopd-gator.kde.org/' \