diff options
| -rw-r--r-- | dev-games/ogre/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-games/ogre/files/ogre-1.6.5-gcc46.patch | 20 | ||||
| -rw-r--r-- | dev-games/ogre/ogre-1.6.5.ebuild | 5 |
3 files changed, 29 insertions, 4 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/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 } |