Update the gcc-4.6 patch.

Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64

diff --git a/media-libs/vigra/ChangeLog b/media-libs/vigra/ChangeLog
index 628660a98444c06cb4883f00a1a99727fde41f7e..6864dfd2dd4e664f63577d1e93f9487a29652d1c 100644 (file)
--- 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/Manifest b/media-libs/vigra/Manifest
index 7c68ca144e765670a6a25a08a7e41795256df472..a6149a4b16b8e957e071c2cdc742417ce8874236 100644 (file)
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA1
 
 AUX 1.7.1-automagicness.patch 1608 RMD160 caa7ccad70104818b326b40c02e3f35797de4b10 SHA1 fbb5b7843c17a8a5f55db13d458eef444cc5adbe SHA256 8d6d73ff40155cd34eff25ff8f32c8bd25f32d63264548b3262fb8b788526957
-AUX 1.7.1-gcc4.6.patch 276 RMD160 f828fbc62d4dcd2125ea7850c51ee5503c2025f0 SHA1 9608a6a313dc2fa1a26adb6d0439d422307890c5 SHA256 d495cd36fc37de7997e2791dfd5259195f1bda424a9195064b70f9920b77a6c7
+AUX 1.7.1-gcc4.6.patch 1296 RMD160 ae867a0c7a38ca256b035eb3473df922fc8d927c SHA1 d094c17b0d54df1de9ae5338e328bf8916cf77d9 SHA256 321c50a65c6a7d94706e5018ccb2efd3aacd754910401e13b62590e7e7c0ee23
 AUX 1.7.1-hdf5.patch 1290 RMD160 c9dd4347ce5f289fe0389a0ab1b8f55f102b3d87 SHA1 16d7596331f0a3836e286265377a3907f7cdd9b8 SHA256 ec366d57999b7353fd57c9095c4bf88323639195ba5edd6c67a0ebb7b42a50f0
 AUX 1.7.1-png-1.5.patch 1259 RMD160 782a8a41a8a6bc5433c98ef39a190bfe1eb7d57a SHA1 15370e3151eb84281b35d2bac97054662dc2bab9 SHA256 28e1fa88143bdda03dadde5dfa43e1c86e38e338907e12d0e7cb23d5c6b85c68
 AUX vigra-1.6.0-gcc44.patch 635 RMD160 2d787b30517e501f9eb97f9c83e5b8697f6598c2 SHA1 21600a4fae903e3b34e1c869f01b4de1c1c2bdd3 SHA256 800afef55c0e390f831207c98f047bccd80c3538ad998ff0dc8bc9269e98a277
@@ -12,12 +12,12 @@ DIST vigra1.6.0.tar.gz 16525605 RMD160 cc9f6626801182a0ee71ec9eb8fa34c38f8777a7
 EBUILD vigra-1.6.0-r1.ebuild 1868 RMD160 08c8f8cf69882a08bf592338e21fd9d217f8ec1f SHA1 ee0998c032b980d83ba22c87d4529baf038f8528 SHA256 ca2a73b0793148da0324090b88c116b3a0980aa86638ade881f4d8dfa700303c
 EBUILD vigra-1.6.0.ebuild 1789 RMD160 69179708fa9529d8f407c287387074ba1919114e SHA1 9cc802878bdfdf969565d4206d8608445163f554 SHA256 3b65150bb7c379a9c2c84e7c8801a70f612dbb5e3d01e86a95874badc958a5aa
 EBUILD vigra-1.7.1.ebuild 2036 RMD160 66ff252603f5a013aa71e0b087db023619b7037e SHA1 c6f0b40ebd92a02c34a415f038f94d92b688b238 SHA256 b5ddcb8ffe3676835b94a970adb6cfa33020b9db4402b524c66d495543444b6c
-MISC ChangeLog 4302 RMD160 1975a3bc32248cf003d3362b1b3c654f03284957 SHA1 77247fe2005dbc8929db1b22adccb1654ea60715 SHA256 49be56736a19b95e7256ee4e4af59958b3b42e985820fd440b393475b962ab5a
+MISC ChangeLog 4414 RMD160 cd19a94e20b67785e5412252a6aa701e740ab64e SHA1 3c38c02352f64e4dde1b8892a928cdad2ac29b41 SHA256 531a3c087c389212ff088be8ca9a54b114a34655ec74faed55c934fe1750a88a
 MISC metadata.xml 187 RMD160 9c8b8edd91cb93979173540d1df3d264539f1f94 SHA1 c1f16177a9daf628b0fe0dcc6f8e694111d2a578 SHA256 6f9a63412850ecb6e6c0d6989f6ebe6dffe84bbb1bf3038cf8a0491b7c819161
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4ynkIACgkQHB6c3gNBRYfABQCfUwiM40RzRRex7p4lvKZPEx4B
-Q1AAoIFRdFoEhubjAmLNiV/VugUHtAWE
-=chxb
+iEYEARECAAYFAk49FBoACgkQHB6c3gNBRYeaIQCgxfXy5g/SgPY6jAUjji1g8XxZ
+B20AniYCnVcD+pLHLa74OH3n0YJ76xB0
+=3HOs
 -----END PGP SIGNATURE-----

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 9ff02ffbf8cb7d01ee00c3f8f4f4ab3479bc2943..e8959860035a9b7d512ffcfee6339fd5f13bbd7c 100644 (file)
--- 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"
+