summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2011-04-27 12:13:07 +0000
committerAlfredo Tupone <tupone@gentoo.org>2011-04-27 12:13:07 +0000
commitc93a0d39919f3f83165845f863f87ade616077af (patch)
treed7f7b84b3822026fa7b826976f262311d849a0f8 /dev-games
parentVersion bump (diff)
downloadhistorical-c93a0d39919f3f83165845f863f87ade616077af.tar.gz
historical-c93a0d39919f3f83165845f863f87ade616077af.tar.bz2
historical-c93a0d39919f3f83165845f863f87ade616077af.zip
Build with gcc-4.6 Bug #362207
Package-Manager: portage-2.1.9.46/cvs/Linux x86_64
Diffstat (limited to 'dev-games')
-rw-r--r--dev-games/ogre/ChangeLog8
-rw-r--r--dev-games/ogre/Manifest15
-rw-r--r--dev-games/ogre/files/ogre-1.6.5-gcc46.patch20
-rw-r--r--dev-games/ogre/ogre-1.6.5.ebuild5
4 files changed, 42 insertions, 6 deletions
diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index e94ae20ae164..37ab9475a72c 100644
--- a/dev-games/ogre/ChangeLog
+++ b/dev-games/ogre/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-games/ogre
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.70 2010/12/01 17:22:21 mr_bones_ Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.71 2011/04/27 12:13:07 tupone Exp $
+
+ 27 Apr 2011; Tupone Alfredo <tupone@gentoo.org> ogre-1.6.5.ebuild,
+ +files/ogre-1.6.5-gcc46.patch:
+ Build with gcc-4.6 Bug #362207 by Diego Elio Pettenò
01 Dec 2010; Michael Sterrett <mr_bones_@gentoo.org> ogre-1.6.5.ebuild,
+files/ogre-1.6.5-as-needed.patch:
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 5db9243330a8..1c11b0af6f78 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX ogre-1.6.5-as-needed.patch 437 RMD160 d5af96318bcb5161189babad19d65df7e72a8a55 SHA1 413bdf7b2a51eac1fc89077f058086549b0d1847 SHA256 729a6d677367b078fc68300baacb94f6de0338241e065c12821acc8413c1294a
AUX ogre-1.6.5-automake.patch 534 RMD160 f576d6a5fbf63fdcd2a7d2d69107968cb995f670 SHA1 6995c8f2283eb5e0a3a2b5666c34046928e1c2eb SHA256 ddbc4250bdce1323f14494cc4baad205a7e184b106f390d811dbbcfad353c45f
AUX ogre-1.6.5-boost.patch 374 RMD160 019a214687e450edf269d3d604fb592f34ee294a SHA1 dfa607c916fb16a6071dd965c23bec4ca72166e2 SHA256 cc989efa68d9421a2d965f7998a5f5bb04cc518bf91e5f0e42ba4300fb7d93fc
AUX ogre-1.6.5-cegui.patch 885 RMD160 0b2252ced3f1f7d3e1f3d429ff75a494d59f1793 SHA1 f94eaf64966efad0592cbb6aa90c1700deadbfc7 SHA256 364739dbc04d99eb4a1fd1faad37079dd9acc60b8181f96a399861d700940d6b
+AUX ogre-1.6.5-gcc46.patch 616 RMD160 505a9cb7c1d151af265ee1f76b12a262dda451c4 SHA1 b6ce9ec164dc1839bee7046110225148690fbe80 SHA256 99b9003f596a17705ee9f861784042d603579dbd99c93adfd8dd0323fce256c3
DIST ogre-v1-6-5.tar.bz2 41785065 RMD160 4d40f9c2b36ec7d587a47114c7951f43f4a5bdbe SHA1 7068578be47f9207882b01790213f7ae8ad6304c SHA256 7fc0e948679c1c1f10751756d267a41d0e3395a6520a23f7853a0ae39a1281f5
-EBUILD ogre-1.6.5.ebuild 2472 RMD160 ab5d9969e9205d6d165ea2371428969eff805d51 SHA1 459e45631c073f2dec1d001f2d6db51fb7db346c SHA256 a290315e9e1a5fd08f7d6ddc2005968458eacad38b5ca7577a365c3d4a148e19
-MISC ChangeLog 10211 RMD160 714f2f5d88119ee445be9223487ff6a592756a67 SHA1 43379eb7b075618dc2a4b5da9efb5f151c4693ac SHA256 3cd55e58d9869e48b419a0b8d27f50be50c020a4157f34d87db45a5605a84bfc
+EBUILD ogre-1.6.5.ebuild 2504 RMD160 e852afbe03157871a9fbb0d48d0b6d5b1bda70f3 SHA1 96c5ebaaca4ee7b08d42829ca7e629b609bb809f SHA256 fe48297dc80227226cd58d90cf66426a70b9e106f41be1dac6d4d4e412a0204f
+MISC ChangeLog 10367 RMD160 6991de21c1f820645cf7bc312befa4598fd5e9c1 SHA1 a7e6a4c86ae736313b939f8baa1d9ca775defac7 SHA256 da658f0613ffd0061597b1c3ae8bc3d014cb6c6ec19678cdf0f9783e4e7c6157
MISC metadata.xml 4514 RMD160 bd36a83acfbf75cac218d035281a0bd6d317837f SHA1 3b1ee9230a5a7781fc76606c6f7ff82c493d80af SHA256 b79edd7807e9b9b13b4d42bd4c37684c106357de9f73b868f871f3c2a8dd0304
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk24CF4ACgkQIY77eQFFFC2PQACgsrektSvLpq5/eMU8t8uz1MSZ
+FUEAnReNk4CDX3eEX1fnZ54SxdOc1+lm
+=D7D/
+-----END PGP SIGNATURE-----
diff --git a/dev-games/ogre/files/ogre-1.6.5-gcc46.patch b/dev-games/ogre/files/ogre-1.6.5-gcc46.patch
new file mode 100644
index 000000000000..ee277e76e172
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.6.5-gcc46.patch
@@ -0,0 +1,20 @@
+--- OgreMain/include/OgreOptimisedUtil.h.old 2011-04-27 12:15:41.957298149 +0200
++++ OgreMain/include/OgreOptimisedUtil.h 2011-04-27 12:16:01.317505414 +0200
+@@ -31,6 +31,7 @@
+
+ #include "OgrePrerequisites.h"
+ #include "OgreEdgeListBuilder.h"
++#include <cstddef>
+
+ namespace Ogre {
+
+--- Tools/XMLConverter/src/OgreXMLMeshSerializer.cpp.old 2011-04-27 14:01:28.271664381 +0200
++++ Tools/XMLConverter/src/OgreXMLMeshSerializer.cpp 2011-04-27 14:01:48.714945677 +0200
+@@ -38,6 +38,7 @@
+ #include "OgreAnimation.h"
+ #include "OgreAnimationTrack.h"
+ #include "OgreKeyFrame.h"
++#include <cstddef>
+
+ namespace Ogre {
+
diff --git a/dev-games/ogre/ogre-1.6.5.ebuild b/dev-games/ogre/ogre-1.6.5.ebuild
index a51260d7ecbf..1e3536201eae 100644
--- a/dev-games/ogre/ogre-1.6.5.ebuild
+++ b/dev-games/ogre/ogre-1.6.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.6.5.ebuild,v 1.8 2010/12/01 17:22:21 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.6.5.ebuild,v 1.9 2011/04/27 12:13:07 tupone Exp $
EAPI=2
inherit multilib eutils autotools flag-o-matic
@@ -51,6 +51,7 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-boost.patch \
"${FILESDIR}"/${P}-automake.patch \
"${FILESDIR}"/${P}-cegui.patch \
+ "${FILESDIR}"/${P}-gcc46.patch \
"${FILESDIR}"/${P}-as-needed.patch
eautoreconf
}