summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2011-07-13 13:34:58 +0000
committerAlfredo Tupone <tupone@gentoo.org>2011-07-13 13:34:58 +0000
commitc5967ac9644aaf733b666d9642316b2fd4a33c4c (patch)
tree5e0184a961f87e2f80988a087ba94eb7dc7fb7de /dev-games/cegui
parentamd64/ppc/ppc64 stable wrt #359333 (diff)
downloadgentoo-2-c5967ac9644aaf733b666d9642316b2fd4a33c4c.tar.gz
gentoo-2-c5967ac9644aaf733b666d9642316b2fd4a33c4c.tar.bz2
gentoo-2-c5967ac9644aaf733b666d9642316b2fd4a33c4c.zip
Fix 0.6.2b version on gcc-4.6
(Portage version: 2.1.10.5/cvs/Linux i686)
Diffstat (limited to 'dev-games/cegui')
-rw-r--r--dev-games/cegui/ChangeLog6
-rw-r--r--dev-games/cegui/cegui-0.6.2b.ebuild7
-rw-r--r--dev-games/cegui/files/cegui-0.6.2b-gcc46.patch10
3 files changed, 19 insertions, 4 deletions
diff --git a/dev-games/cegui/ChangeLog b/dev-games/cegui/ChangeLog
index daaf2f1d3d0f..0b375d716208 100644
--- a/dev-games/cegui/ChangeLog
+++ b/dev-games/cegui/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-games/cegui
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v 1.35 2011/04/27 13:34:13 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v 1.36 2011/07/13 13:34:58 tupone Exp $
+
+ 13 Jul 2011; Tupone Alfredo <tupone@gentoo.org> cegui-0.6.2b.ebuild,
+ +files/cegui-0.6.2b-gcc46.patch:
+ Fix 0.6.2b version on gcc-4.6 Bug #374501 by fkhp
27 Apr 2011; Tupone Alfredo <tupone@gentoo.org> cegui-0.7.5-r1.ebuild,
+files/cegui-0.7.5-gcc46.patch:
diff --git a/dev-games/cegui/cegui-0.6.2b.ebuild b/dev-games/cegui/cegui-0.6.2b.ebuild
index fd6b4807800d..7e7bd7ee8e2b 100644
--- a/dev-games/cegui/cegui-0.6.2b.ebuild
+++ b/dev-games/cegui/cegui-0.6.2b.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/cegui/cegui-0.6.2b.ebuild,v 1.10 2010/11/06 01:45:36 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.6.2b.ebuild,v 1.11 2011/07/13 13:34:58 tupone Exp $
EAPI=2
inherit autotools eutils
@@ -41,7 +41,8 @@ S=${WORKDIR}/${MY_P}
src_prepare() {
epatch \
"${FILESDIR}"/${P}-gcc43.patch \
- "${FILESDIR}"/${P}-dups.patch
+ "${FILESDIR}"/${P}-dups.patch \
+ "${FILESDIR}"/${P}-gcc46.patch
sed -i \
-e 's/ILvoid/void/g' \
ImageCodecModules/DevILImageCodec/CEGUIDevILImageCodec.cpp \
diff --git a/dev-games/cegui/files/cegui-0.6.2b-gcc46.patch b/dev-games/cegui/files/cegui-0.6.2b-gcc46.patch
new file mode 100644
index 000000000000..88f8fccfc206
--- /dev/null
+++ b/dev-games/cegui/files/cegui-0.6.2b-gcc46.patch
@@ -0,0 +1,10 @@
+--- cegui/include/CEGUIString.h.old 2011-04-27 14:33:25.862856070 +0200
++++ cegui/include/CEGUIString.h 2011-04-27 14:33:49.780351908 +0200
+@@ -34,6 +34,7 @@
+ #include <string>
+ #include <string.h>
+ #include <stdexcept>
++#include <cstddef>
+
+ // Start of CEGUI namespace section
+ namespace CEGUI