summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2011-04-29 09:53:34 +0000
committerTim Harder <radhermit@gentoo.org>2011-04-29 09:53:34 +0000
commit90bf1aa4f87838677d5a1831fc3460f21f415b0b (patch)
treed87035c52c512143d252891dd29ed94512c8392f /dev-cpp
parentVersion bump, wrt #364999. (diff)
downloadgentoo-2-90bf1aa4f87838677d5a1831fc3460f21f415b0b.tar.gz
gentoo-2-90bf1aa4f87838677d5a1831fc3460f21f415b0b.tar.bz2
gentoo-2-90bf1aa4f87838677d5a1831fc3460f21f415b0b.zip
Fix compile with gcc-4.6 (bug #363229).
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Diffstat (limited to 'dev-cpp')
-rw-r--r--dev-cpp/ctemplate/ChangeLog6
-rw-r--r--dev-cpp/ctemplate/ctemplate-0.99.ebuild8
-rw-r--r--dev-cpp/ctemplate/files/ctemplate-0.99-gcc-4.6.patch10
3 files changed, 21 insertions, 3 deletions
diff --git a/dev-cpp/ctemplate/ChangeLog b/dev-cpp/ctemplate/ChangeLog
index b53f5106194f..16c4fdda191c 100644
--- a/dev-cpp/ctemplate/ChangeLog
+++ b/dev-cpp/ctemplate/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-cpp/ctemplate
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/ctemplate/ChangeLog,v 1.10 2011/04/24 04:47:17 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/ctemplate/ChangeLog,v 1.11 2011/04/29 09:53:34 radhermit Exp $
+
+ 29 Apr 2011; Tim Harder <radhermit@gentoo.org> ctemplate-0.99.ebuild,
+ +files/ctemplate-0.99-gcc-4.6.patch:
+ Fix compile with gcc-4.6 (bug #363229).
24 Apr 2011; Joseph Jezak <josejx@gentoo.org> ctemplate-0.98.ebuild,
ctemplate-0.99.ebuild:
diff --git a/dev-cpp/ctemplate/ctemplate-0.99.ebuild b/dev-cpp/ctemplate/ctemplate-0.99.ebuild
index e88e5c54ff36..a704ef7c0564 100644
--- a/dev-cpp/ctemplate/ctemplate-0.99.ebuild
+++ b/dev-cpp/ctemplate/ctemplate-0.99.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/ctemplate/ctemplate-0.99.ebuild,v 1.2 2011/04/24 04:47:18 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/ctemplate/ctemplate-0.99.ebuild,v 1.3 2011/04/29 09:53:34 radhermit Exp $
EAPI="3"
-inherit elisp-common
+inherit elisp-common eutils
DESCRIPTION="A simple but powerful template language for C++"
HOMEPAGE="http://code.google.com/p/google-ctemplate/"
@@ -21,6 +21,10 @@ RDEPEND="vim-syntax? ( >=app-editors/vim-core-7 )
SITEFILE="70ctemplate-gentoo.el"
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gcc-4.6.patch
+}
+
src_configure() {
econf \
--disable-dependency-tracking \
diff --git a/dev-cpp/ctemplate/files/ctemplate-0.99-gcc-4.6.patch b/dev-cpp/ctemplate/files/ctemplate-0.99-gcc-4.6.patch
new file mode 100644
index 000000000000..8495e7a6e3d1
--- /dev/null
+++ b/dev-cpp/ctemplate/files/ctemplate-0.99-gcc-4.6.patch
@@ -0,0 +1,10 @@
+--- ctemplate-0.99.orig/src/ctemplate/template_dictionary.h.in
++++ ctemplate-0.99/src/ctemplate/template_dictionary.h.in
+@@ -54,6 +54,7 @@
+ #include <map>
+ #include <string>
+ #include <vector>
++#include <cstddef>
+ #include <ctemplate/template_dictionary_interface.h>
+ #include <ctemplate/template_string.h>
+ #include <ctemplate/template_modifiers.h>