summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-05-03 07:41:02 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-05-03 07:41:02 +0000
commit9bc735a68f1d7827359073be3059b3edb9549ec0 (patch)
tree6cf032bbaf6b1b30fbe99e9d3c63bc7d5ad524c1 /media-libs/vigra
parentNon-Maintainer Version Bump (diff)
downloadgentoo-2-9bc735a68f1d7827359073be3059b3edb9549ec0.tar.gz
gentoo-2-9bc735a68f1d7827359073be3059b3edb9549ec0.tar.bz2
gentoo-2-9bc735a68f1d7827359073be3059b3edb9549ec0.zip
Add gcc-4.6 support. Per bug #362863.
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/vigra')
-rw-r--r--media-libs/vigra/ChangeLog6
-rw-r--r--media-libs/vigra/files/1.7.1-gcc4.6.patch10
-rw-r--r--media-libs/vigra/vigra-1.7.1.ebuild3
3 files changed, 17 insertions, 2 deletions
diff --git a/media-libs/vigra/ChangeLog b/media-libs/vigra/ChangeLog
index 1be0d1ffc07f..35e35fba7f0c 100644
--- a/media-libs/vigra/ChangeLog
+++ b/media-libs/vigra/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/vigra
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.29 2011/04/05 18:50:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.30 2011/05/03 07:41:02 scarabeus Exp $
+
+ 03 May 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ +files/1.7.1-gcc4.6.patch, vigra-1.7.1.ebuild:
+ Add gcc-4.6 support. Per bug #362863.
05 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+files/1.7.1-png-1.5.patch, vigra-1.7.1.ebuild:
diff --git a/media-libs/vigra/files/1.7.1-gcc4.6.patch b/media-libs/vigra/files/1.7.1-gcc4.6.patch
new file mode 100644
index 000000000000..9ff02ffbf8cb
--- /dev/null
+++ b/media-libs/vigra/files/1.7.1-gcc4.6.patch
@@ -0,0 +1,10 @@
+--- a/include/vigra/sifImport.hxx 2011-04-10 09:36:12.735845000 -0500
++++ b/include/vigra/sifImport.hxx 2011-04-10 09:36:41.805845002 -0500
+@@ -58,6 +58,7 @@
+ #include <cstring>
+ #include <vector>
+ #include "vigra/multi_array.hxx"
++#include <cstddef>
+
+ namespace vigra {
+
diff --git a/media-libs/vigra/vigra-1.7.1.ebuild b/media-libs/vigra/vigra-1.7.1.ebuild
index 5fade157d8c1..bc2683e231b2 100644
--- a/media-libs/vigra/vigra-1.7.1.ebuild
+++ b/media-libs/vigra/vigra-1.7.1.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/media-libs/vigra/vigra-1.7.1.ebuild,v 1.3 2011/04/05 18:50:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.7.1.ebuild,v 1.4 2011/05/03 07:41:02 scarabeus Exp $
EAPI=4
@@ -29,6 +29,7 @@ PATCHES=(
"${FILESDIR}/1.7.1-png-1.5.patch"
"${FILESDIR}/1.7.1-automagicness.patch"
"${FILESDIR}/1.7.1-hdf5.patch"
+ "${FILESDIR}/1.7.1-gcc4.6.patch"
)
# Tests fail because they have hardcoded dependencies on those