summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2011-06-01 15:42:19 +0000
committerAlfredo Tupone <tupone@gentoo.org>2011-06-01 15:42:19 +0000
commitd94e593ca712b3856e040b9cf9bd84c8ed2f72d7 (patch)
tree59dd4e3851915020859c52fcef3aa469e2bfc558 /games-engines
parentAdd missing x11-libs/qt-{sql,dbus} dependencies. Bug #369267 (diff)
downloadgentoo-2-d94e593ca712b3856e040b9cf9bd84c8ed2f72d7.tar.gz
gentoo-2-d94e593ca712b3856e040b9cf9bd84c8ed2f72d7.tar.bz2
gentoo-2-d94e593ca712b3856e040b9cf9bd84c8ed2f72d7.zip
Fix build with gcc-4.6 Bug #369445
(Portage version: 2.1.9.50/cvs/Linux x86_64)
Diffstat (limited to 'games-engines')
-rw-r--r--games-engines/gemrb/ChangeLog6
-rw-r--r--games-engines/gemrb/files/gemrb-0.6.4-gcc46.patch22
-rw-r--r--games-engines/gemrb/gemrb-0.6.4.ebuild3
3 files changed, 29 insertions, 2 deletions
diff --git a/games-engines/gemrb/ChangeLog b/games-engines/gemrb/ChangeLog
index 5626e4b35392..5464159ce329 100644
--- a/games-engines/gemrb/ChangeLog
+++ b/games-engines/gemrb/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-engines/gemrb
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/gemrb/ChangeLog,v 1.13 2011/05/31 20:16:24 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/gemrb/ChangeLog,v 1.14 2011/06/01 15:42:19 tupone Exp $
+
+ 01 Jun 2011; Tupone Alfredo <tupone@gentoo.org> gemrb-0.6.4.ebuild,
+ +files/gemrb-0.6.4-gcc46.patch:
+ Fix build with gcc-4.6 Bug #369445 by Diego Elio Pettenò
31 May 2011; Markus Meier <maekke@gentoo.org> gemrb-0.6.4.ebuild:
x86 stable, bug #367127
diff --git a/games-engines/gemrb/files/gemrb-0.6.4-gcc46.patch b/games-engines/gemrb/files/gemrb-0.6.4-gcc46.patch
new file mode 100644
index 000000000000..bb42c1006bd1
--- /dev/null
+++ b/games-engines/gemrb/files/gemrb-0.6.4-gcc46.patch
@@ -0,0 +1,22 @@
+--- gemrb/core/Item.h.old 2011-06-01 17:18:40.106859741 +0200
++++ gemrb/core/Item.h 2011-06-01 17:21:27.123335949 +0200
+@@ -28,6 +28,8 @@
+ #ifndef ITEM_H
+ #define ITEM_H
+
++#include <cstddef>
++
+ #include "exports.h"
+ #include "ie_types.h"
+
+--- gemrb/core/EffectQueue.h.old 2011-06-01 17:24:47.102882668 +0200
++++ gemrb/core/EffectQueue.h 2011-06-01 17:25:07.399156225 +0200
+@@ -28,6 +28,8 @@
+ #ifndef EFFECTQUEUE_H
+ #define EFFECTQUEUE_H
+
++#include <cstddef>
++
+ #include "exports.h"
+
+ #include "Effect.h"
diff --git a/games-engines/gemrb/gemrb-0.6.4.ebuild b/games-engines/gemrb/gemrb-0.6.4.ebuild
index 4d9fb86f8937..125ff9492612 100644
--- a/games-engines/gemrb/gemrb-0.6.4.ebuild
+++ b/games-engines/gemrb/gemrb-0.6.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/gemrb/gemrb-0.6.4.ebuild,v 1.3 2011/05/31 20:16:24 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/gemrb/gemrb-0.6.4.ebuild,v 1.4 2011/06/01 15:42:19 tupone Exp $
PYTHON_DEPEND="2"
EAPI=2
@@ -33,6 +33,7 @@ src_prepare() {
-e '/COPYING/d' \
CMakeLists.txt \
|| die
+ epatch "${FILESDIR}"/${P}-gcc46.patch
}
src_configure() {