Patch to fix building with gcc-4.3 from Martin Väth, bug #218937

(Portage version: 2.1.5_rc6)

3 files changed, 89 insertions, 5 deletions

diff --git a/games-arcade/briquolo/ChangeLog b/games-arcade/briquolo/ChangeLog
index ffe279ea6923..5f06ae02bd90 100644
--- a/games-arcade/briquolo/ChangeLog
+++ b/games-arcade/briquolo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/briquolo
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/briquolo/ChangeLog,v 1.14 2008/02/29 18:49:15 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/briquolo/ChangeLog,v 1.15 2008/04/30 19:07:25 nyhm Exp $
+
+  30 Apr 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/briquolo-0.5.6-gcc43.patch, briquolo-0.5.6.ebuild:
+  Patch to fix building with gcc-4.3 from Martin Väth, bug #218937
 
   29 Feb 2008; Carsten Lohrke <carlo@gentoo.org> briquolo-0.5.6.ebuild:
   Remove icon extension from desktop entry to match Icon Theme Specification.
diff --git a/games-arcade/briquolo/briquolo-0.5.6.ebuild b/games-arcade/briquolo/briquolo-0.5.6.ebuild
index dad22a7b97be..8d62436a2c97 100644
--- a/games-arcade/briquolo/briquolo-0.5.6.ebuild
+++ b/games-arcade/briquolo/briquolo-0.5.6.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-arcade/briquolo/briquolo-0.5.6.ebuild,v 1.2 2008/02/29 18:49:15 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/briquolo/briquolo-0.5.6.ebuild,v 1.3 2008/04/30 19:07:25 nyhm Exp $
 
 inherit eutils games
 
@@ -25,15 +25,21 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 	# no thanks we'll take care of it.
 	sed -i \
 		-e '/^SUBDIRS/s/desktop//' \
 		Makefile.in \
 		|| die "sed Makefile.in failed"
 	sed -i \
-		-e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \
+		-e "/CXXFLAGS/s:-O3:${CXXFLAGS}:" \
+		-e 's:=.*share/locale:=/usr/share/locale:' \
 		configure \
 		|| die "sed configure failed"
+	sed -i \
+		-e 's:$(datadir)/locale:/usr/share/locale:' \
+		po/Makefile.in.in \
+		|| die "sed Makefile.in.in failed"
 }
 
 src_compile() {
@@ -44,9 +50,9 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog README
 	doicon desktop/briquolo.svg
-	make_desktop_entry briquolo Briquolo briquolo
+	make_desktop_entry briquolo Briquolo
 	prepgamesdirs
 }
diff --git a/games-arcade/briquolo/files/briquolo-0.5.6-gcc43.patch b/games-arcade/briquolo/files/briquolo-0.5.6-gcc43.patch
new file mode 100644
index 000000000000..229e0c80750f
--- /dev/null
+++ b/games-arcade/briquolo/files/briquolo-0.5.6-gcc43.patch
@@ -0,0 +1,74 @@
+--- src/Constante.cpp
++++ src/Constante.cpp
+@@ -27,6 +27,7 @@
+ #define DATADIR_BRIQUOLO "./"
+ #define PACKAGE "briquolo"
+ #endif
++#include <cstdlib>
+ 
+ #ifdef WIN32
+ #define WIN32_LEAN_AND_MEAN
+--- src/MOGL/MOGL_EnsembleObjet.cpp
++++ src/MOGL/MOGL_EnsembleObjet.cpp
+@@ -23,7 +23,8 @@
+ #include "MOGL_Armature.h"
+ #include "MOGL_Peau.h"
+ //#include 
+-#include <stdio.h>
++#include <cstdio>
++#include <cstring>
+ 
+ //#include <mmsystem.h>
+ 
+--- src/MOGL/MOGL_GestionnaireObjet.cpp
++++ src/MOGL/MOGL_GestionnaireObjet.cpp
+@@ -20,6 +20,7 @@
+  *
+  *****************************************************************************/
+ #include "MOGL_GestionnaireObjet.h"
++#include <cstring>
+ 
+ bool MOGL_GestionnaireObjet::ChargerObjetASCTriangle(const char * p_NomFichier, const MOGL_GestionnaireTexture & p_GM,
+                                                      MOGL_Objet & p_Objet)
+--- src/MOGL/MOGL_GestionnaireObjet.h
++++ src/MOGL/MOGL_GestionnaireObjet.h
+@@ -24,7 +24,8 @@
+ 
+ #include <vector>
+ #include <iostream>
+-#include <stdio.h>
++#include <cstdio>
++#include <cstring>
+ 
+ #include "MOGL_Triangle.h"
+ #include "MOGL_Objet.h"
+--- src/MOGL/MOGL_Image.h
++++ src/MOGL/MOGL_Image.h
+@@ -24,6 +24,7 @@
+ 
+ #include "MOGL_Structure.h"
+ #include <string>
++#include <cstring>
+ 
+ using namespace std;
+ 
+--- src/MOGL/MOGL_Objet.cpp
++++ src/MOGL/MOGL_Objet.cpp
+@@ -20,6 +20,7 @@
+  *
+  *****************************************************************************/
+ #include "MOGL_Objet.h"
++#include <cstdlib>
+ 
+ //MOGL_Objet::MOGL_Objet(): MOGL_ObjetAbstrait(), MOGL_ElementArbre()
+ MOGL_Objet::MOGL_Objet(): MOGL_Noeud(), _ModifieTriangle(true), _ModifieStrip(true),
+--- src/MOGL/MOGL_Peau.cpp
++++ src/MOGL/MOGL_Peau.cpp
+@@ -20,6 +20,7 @@
+  *
+  *****************************************************************************/
+ #include "MOGL_Peau.h"
++#include <cstdlib>
+ 
+ MOGL_Peau::MOGL_Peau(): MOGL_Noeud(), _ModifieTriangle(true)
+ {