From a93e2818b7422d1d689a9fccb59b537d3e28ba92 Mon Sep 17 00:00:00 2001 From: Tristan Heaven Date: Wed, 30 Apr 2008 19:07:26 +0000 Subject: Patch to fix building with gcc-4.3 from Martin Väth, bug #218937 Package-Manager: portage-2.1.5_rc6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- games-arcade/briquolo/ChangeLog | 6 +- games-arcade/briquolo/Manifest | 15 ++++- games-arcade/briquolo/briquolo-0.5.6.ebuild | 14 ++-- .../briquolo/files/briquolo-0.5.6-gcc43.patch | 74 ++++++++++++++++++++++ 4 files changed, 102 insertions(+), 7 deletions(-) create mode 100644 games-arcade/briquolo/files/briquolo-0.5.6-gcc43.patch (limited to 'games-arcade') 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 + +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 briquolo-0.5.6.ebuild: Remove icon extension from desktop entry to match Icon Theme Specification. diff --git a/games-arcade/briquolo/Manifest b/games-arcade/briquolo/Manifest index bc85111b10de..250f2b0fc395 100644 --- a/games-arcade/briquolo/Manifest +++ b/games-arcade/briquolo/Manifest @@ -1,4 +1,15 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX briquolo-0.5.6-gcc43.patch 1922 RMD160 f10a069eaeb9c9ec649b5f9cd13dbab3248e65c5 SHA1 275e98267f75b0d36259c7757af9fb78f1f7eafb SHA256 1bf4daaaf80506f540b80d632d6fcf662dfc404e47862464d4c237d9d79089c2 DIST briquolo-0.5.6.tar.bz2 2559600 RMD160 bd6ac710fc0beffe72e25b137cde1118cfd82e6b SHA1 0a9b807da78d967b21c71f182e5611ab9705c185 SHA256 e1166a0f0db4b99601dadd47062b239a1a3b9ac7dc996ea582dd8f211e113d9e -EBUILD briquolo-0.5.6.ebuild 1238 RMD160 198b460096465bbafe7d90244e42692b643b1f48 SHA1 31c50ed73e9f4bdad65aa2ee6d216e5399a3b95d SHA256 f271b9d7f8783323694c691fe8229b1e5d79710ae6aaa610b1fb1a4380276581 -MISC ChangeLog 1869 RMD160 b7c28f580f69148d25f0ca5a56213d4371088599 SHA1 2db363569a2c7e88c69a0e2d60a20195b560c350 SHA256 7b6b82a5bc30e16507451edb693abf249541f84ded2ea7c290d9844be82dbb75 +EBUILD briquolo-0.5.6.ebuild 1433 RMD160 769738ed3875c08cc0dfcd4e1e31283722507a91 SHA1 9e87249725c1e59cd31987472bbfd5fde9400b22 SHA256 1ea75a897670cb272cb32d58e41ff7a8b00c22ae8bd222493aabf9ed700a4fc0 +MISC ChangeLog 2045 RMD160 69e7d8fc6689c21a75aa58bac0e2f3a199c0d824 SHA1 211dcb3999338d52b26c086c6014e17caaf67c85 SHA256 8747a0d96b482e8dfef737872f87c9dacec44dbc20a0a02043ae6475f3a78826 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkgYw3MACgkQdz7hIScOURGW/QCgoH0WKReHONl+URN1kg07vuk0 +hqAAoKfZQpW/+Rj02ZHN4iwWAN0kz4/S +=rkuG +-----END PGP SIGNATURE----- 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 + + #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 ++#include ++#include + + //#include + +--- src/MOGL/MOGL_GestionnaireObjet.cpp ++++ src/MOGL/MOGL_GestionnaireObjet.cpp +@@ -20,6 +20,7 @@ + * + *****************************************************************************/ + #include "MOGL_GestionnaireObjet.h" ++#include + + 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 + #include +-#include ++#include ++#include + + #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 ++#include + + using namespace std; + +--- src/MOGL/MOGL_Objet.cpp ++++ src/MOGL/MOGL_Objet.cpp +@@ -20,6 +20,7 @@ + * + *****************************************************************************/ + #include "MOGL_Objet.h" ++#include + + //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 + + MOGL_Peau::MOGL_Peau(): MOGL_Noeud(), _ModifieTriangle(true) + { -- cgit v1.2.3-65-gdbad