summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-08-06 10:14:44 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-08-06 10:14:44 +0000
commit1c11953e826f389fb16ed5e455224f0463f20918 (patch)
treeb13c573665c9b48a7e80389f6189a8a80ccd65a9
parentAdd ~x86-linux keyword. (diff)
downloadgentoo-2-1c11953e826f389fb16ed5e455224f0463f20918.tar.gz
gentoo-2-1c11953e826f389fb16ed5e455224f0463f20918.tar.bz2
gentoo-2-1c11953e826f389fb16ed5e455224f0463f20918.zip
Update the gcc-4.6 patch.
(Portage version: 2.2.0_alpha50/cvs/Linux x86_64)
-rw-r--r--media-libs/vigra/ChangeLog6
-rw-r--r--media-libs/vigra/files/1.7.1-gcc4.6.patch30
2 files changed, 35 insertions, 1 deletions
diff --git a/media-libs/vigra/ChangeLog b/media-libs/vigra/ChangeLog
index 628660a98444..6864dfd2dd4e 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.31 2011/07/29 11:49:33 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.32 2011/08/06 10:14:44 scarabeus Exp $
+
+ 06 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ files/1.7.1-gcc4.6.patch:
+ Update the gcc-4.6 patch.
29 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org> vigra-1.7.1.ebuild:
Add doc support for the vigra package.
diff --git a/media-libs/vigra/files/1.7.1-gcc4.6.patch b/media-libs/vigra/files/1.7.1-gcc4.6.patch
index 9ff02ffbf8cb..e8959860035a 100644
--- a/media-libs/vigra/files/1.7.1-gcc4.6.patch
+++ b/media-libs/vigra/files/1.7.1-gcc4.6.patch
@@ -8,3 +8,33 @@
namespace vigra {
+@ -43,6 +43,7 @@
+ #include <set>
+ #include <list>
+ #include <numeric>
++#include <stddef.h>
+ #include "mathutil.hxx"
+ #include "array_vector.hxx"
+ #include "sized_int.hxx"
+diff -baur vigra-1.7.1.old/include/vigra/sifImport.hxx vigra-1.7.1/include/vigra/sifImport.hxx
+--- vigra-1.7.1.old/include/vigra/sifImport.hxx 2010-12-03 17:40:34.000000000 +0000
++++ vigra-1.7.1/include/vigra/sifImport.hxx 2011-01-28 00:23:31.000000000 +0000
+@@ -57,6 +57,7 @@
+ #include <fstream>
+ #include <cstring>
+ #include <vector>
++#include <stddef.h>
+ #include "vigra/multi_array.hxx"
+
+ namespace vigra {
+diff -baur vigra-1.7.1.old/include/vigra/multi_iterator.hxx vigra-1.7.1/include/vigra/multi_iterator.hxx
+--- vigra-1.7.1.old/include/vigra/multi_iterator.hxx 2010-12-03 17:40:34.000000000 +0000
++++ vigra-1.7.1/include/vigra/multi_iterator.hxx 2011-01-28 00:23:31.000000000 +0000
+@@ -41,6 +41,7 @@
+ #define VIGRA_MULTI_ITERATOR_HXX
+
+ #include <sys/types.h>
++#include <stddef.h>
+ #include "tinyvector.hxx"
+ #include "iteratortags.hxx"
+