summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2009-11-18 14:15:44 +0000
committerAlfredo Tupone <tupone@gentoo.org>2009-11-18 14:15:44 +0000
commit61937cbc0998b37a444273df0d2a300859298b5f (patch)
treef09005230fd5238a40c3340ae5183079074ce2f8 /dev-games
parentStable for ppc. (diff)
downloadgentoo-2-61937cbc0998b37a444273df0d2a300859298b5f.tar.gz
gentoo-2-61937cbc0998b37a444273df0d2a300859298b5f.tar.bz2
gentoo-2-61937cbc0998b37a444273df0d2a300859298b5f.zip
Fix build with dev-libs/boost-1.40 Bug #292874
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'dev-games')
-rw-r--r--dev-games/ogre/ChangeLog6
-rw-r--r--dev-games/ogre/files/ogre-1.6.3-boost.patch10
-rw-r--r--dev-games/ogre/ogre-1.6.3.ebuild3
3 files changed, 17 insertions, 2 deletions
diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index 9e0f51be68c0..ebbc4fc812dd 100644
--- a/dev-games/ogre/ChangeLog
+++ b/dev-games/ogre/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-games/ogre
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.58 2009/11/05 01:42:23 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.59 2009/11/18 14:15:44 tupone Exp $
+
+ 18 Nov 2009; Alfredo Tupone <tupone@gentoo.org> ogre-1.6.3.ebuild,
+ +files/ogre-1.6.3-boost.patch:
+ Fix build with dev-libs/boost-1.40 Bug #292874 by Sebastian Mingramm
05 Nov 2009; Tristan Heaven <nyhm@gentoo.org> ogre-1.6.3.ebuild,
metadata.xml:
diff --git a/dev-games/ogre/files/ogre-1.6.3-boost.patch b/dev-games/ogre/files/ogre-1.6.3-boost.patch
new file mode 100644
index 000000000000..9f1784c558cd
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.6.3-boost.patch
@@ -0,0 +1,10 @@
+--- OgreMain/include/OgreStdHeaders.h.old 2009-11-18 14:08:48.000000000 +0100
++++ OgreMain/include/OgreStdHeaders.h 2009-11-18 14:09:59.000000000 +0100
+@@ -110,6 +110,7 @@
+ # include <boost/thread/recursive_mutex.hpp>
+ # include <boost/thread/condition.hpp>
+ # include <boost/thread/thread.hpp>
++# include <boost/function.hpp>
+ #endif
+
+ #if defined ( OGRE_GCC_VISIBILITY )
diff --git a/dev-games/ogre/ogre-1.6.3.ebuild b/dev-games/ogre/ogre-1.6.3.ebuild
index d89cae4ac471..d369d64bcf06 100644
--- a/dev-games/ogre/ogre-1.6.3.ebuild
+++ b/dev-games/ogre/ogre-1.6.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.6.3.ebuild,v 1.2 2009/11/05 01:42:23 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.6.3.ebuild,v 1.3 2009/11/18 14:15:44 tupone Exp $
EAPI=2
inherit multilib eutils autotools flag-o-matic
@@ -47,6 +47,7 @@ src_prepare() {
|| die "sed failed"
fi
sed -i -e '/CPPUNIT/d' configure.in || die "sed failed"
+ epatch "${FILESDIR}"/${P}-boost.patch
eautoreconf
}