Added gcc-4.3 compatibility patch (see bug #223383).

Package-Manager: portage-2.1.5.2

4 files changed, 44 insertions, 4 deletions

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index 428442adc099..599d04ad51c0 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/vtk
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.43 2008/03/09 15:13:54 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.44 2008/05/24 18:56:05 markusle Exp $
+
+  24 May 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/vtk-5.0.4-gcc4.3.patch, vtk-5.0.4.ebuild:
+  Added gcc-4.3 compatibility patch (see bug #223383). Thanks much to 
+  Bert Karwatzki <spasswolf@web.de> for his patch.
 
   09 Mar 2008; Markus Dittrich <markusle@gentoo.org> vtk-5.0.4.ebuild:
   Backported support for tcl/tk-8.5 from cvs head (fixes bug 212700). 
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index f14a15b0329a..6e0604243ec3 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,10 +1,11 @@
 AUX vtk-5.0.3-mpi.patch 2653 RMD160 16c80c11c88cd4a671968da9ef3a29c67a979648 SHA1 c1979686901883aa05091845c05235ce8e24e89f SHA256 dd03a1e55674e6f0c3740b996e6a81a68a6e253c5dac60cf0f2fd2e3ead1dcf3
+AUX vtk-5.0.4-gcc4.3.patch 1222 RMD160 28a724ce4e999e68482bfcadc3e776ef37a1e6a6 SHA1 5db37dabd42dca1d93e483e2fd3356fb5a2c653e SHA256 66627b05fd0f71a51b1f5645edaaa369d11896245598acdb3a30818ec716806f
 DIST vtk-5.0.3.tar.gz 8324346 RMD160 bc844d562d69bb8e74452ba238986522de9fea9e SHA1 a0c514f6a2b3735e779b1eb5d53b27ae9ef129b6 SHA256 3ba05f6cb33cfcfb9d448c332b9292d6fca836fd979249d086762a7ac1c65d5c
 DIST vtk-5.0.4-tcl8.5.patch.bz2 92930 RMD160 2fabbddda92f359204b830816b04a18bff553b87 SHA1 8be5de85b75241529b6c44d0197766db0f5d8ffa SHA256 b7125e09689a267334fbf89c173a9f5c6cc4e279baa6f00e11cbd2036afc101e
 DIST vtk-5.0.4.tar.gz 8344794 RMD160 9c9b3eb43c7425ba2e4fd40b75caae100c49a12c SHA1 da881bcb3e4cb6675cde00c4fe10e1dde81909c3 SHA256 f95f181d61b4af37157e733b4dee4f47c39804e987c2d033ecb81a82e53ecf84
 DIST vtkdata-5.0.3.tar.gz 22399159 RMD160 574afa369e58448641ec418bc4a046cb6c895eb9 SHA1 2fa9d63f95c6b294365b04912a780865f1eae9a8 SHA256 c46e6ac5728b44df3a150faf47cf3c144a3284e15bb29ff685bf4b182b1db32a
 DIST vtkdata-5.0.4.tar.gz 22403386 RMD160 af1fcadc568f15c230756bb9ee939159294b0c53 SHA1 18cccb3fdd2b78e505831b52317ec93eef42d5aa SHA256 030c4dcb5fe79ded8f046a5403a41c1f63884a6de1872c227faed5ad9a28ba99
 EBUILD vtk-5.0.3.ebuild 9115 RMD160 da8ef8fb2d3dcc2270e6b61ea6fbe1048d4cd07e SHA1 9f80346437e0a8264c1b4bf6dc65b4298fa27c98 SHA256 b67e1fc4f7c5a9ea9db9c8f52ee50d1c0467bfa493f7cb656db989a9f8a0fbdc
-EBUILD vtk-5.0.4.ebuild 9204 RMD160 f691f8c4c17a5e20b7edcf525084ff5484cc3441 SHA1 f28da3e2cd46559d010fe188e4523706d59cc2b3 SHA256 c4d0abd7f7d9e89e280dcd4c4d3ba3d7da9b1ba95a4a01aa72197f9d883094fb
-MISC ChangeLog 7571 RMD160 11d1767802f42aa0b4dbc0fd52aff14c16de9d78 SHA1 05358db655ba073ba86699d81fc9710a4b290eec SHA256 fd4a28d19632347a68034dacf83a471352e16d593a6c160a20d0e5be2a47195b
+EBUILD vtk-5.0.4.ebuild 9244 RMD160 c058e85d300d585e5a02ba8710befff9cfe92b31 SHA1 0a7be6c543bde365083efe56b9e7053b1e097dc0 SHA256 1cb056d33f8c31d01f4a2314b280e0ef57d0472dfe25f91b2a6ed7be0f87c640
+MISC ChangeLog 7798 RMD160 02b42afceb54aa43a99ca20e124938c0aefbd864 SHA1 df6ef86d3dff8a97d1cf41fc5828545dab59a358 SHA256 e57801a48785bd356150901c8d90a19a9c1183259847f335105ac0594e2bb35e
 MISC metadata.xml 273 RMD160 813d00f411ea6b62bca9352968caa1c05daaaeec SHA1 852b5371f1bb0b4d5c4934f75b434e8f252533b7 SHA256 b930aead56cb1a6abb648c097836b6e8bf08c1ffa2038ad071aa1c98d1602e56
diff --git a/sci-libs/vtk/files/vtk-5.0.4-gcc4.3.patch b/sci-libs/vtk/files/vtk-5.0.4-gcc4.3.patch
new file mode 100644
index 000000000000..f921ee3196d5
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-5.0.4-gcc4.3.patch
@@ -0,0 +1,33 @@
+diff -Naur VTK/Utilities/DICOMParser/DICOMAppHelper.cxx VTK.new/Utilities/DICOMParser/DICOMAppHelper.cxx
+--- VTK/Utilities/DICOMParser/DICOMAppHelper.cxx	2007-05-03 13:12:13.000000000 -0400
++++ VTK.new/Utilities/DICOMParser/DICOMAppHelper.cxx	2008-05-24 13:44:18.000000000 -0400
+@@ -34,6 +34,7 @@
+ #include <string>
+ #include <math.h>
+ #include <algorithm>
++#include <cstring>
+ #if defined(__BORLANDC__)
+ #include <mem.h> // for memcpy
+ #endif
+diff -Naur VTK/Utilities/DICOMParser/DICOMFile.cxx VTK.new/Utilities/DICOMParser/DICOMFile.cxx
+--- VTK/Utilities/DICOMParser/DICOMFile.cxx	2005-07-26 16:02:22.000000000 -0400
++++ VTK.new/Utilities/DICOMParser/DICOMFile.cxx	2008-05-24 13:44:18.000000000 -0400
+@@ -24,6 +24,7 @@
+ 
+ #include <stdio.h>
+ #include <string>
++#include <cstring>
+ 
+ #include "DICOMConfig.h"
+ #include "DICOMFile.h"
+diff -Naur VTK/Utilities/DICOMParser/DICOMParser.cxx VTK.new/Utilities/DICOMParser/DICOMParser.cxx
+--- VTK/Utilities/DICOMParser/DICOMParser.cxx	2006-03-24 10:59:50.000000000 -0500
++++ VTK.new/Utilities/DICOMParser/DICOMParser.cxx	2008-05-24 13:44:19.000000000 -0400
+@@ -37,6 +37,7 @@
+ #endif
+ 
+ #include <string>
++#include <cstring>
+ 
+ #include "DICOMConfig.h"
+ #include "DICOMParser.h"
diff --git a/sci-libs/vtk/vtk-5.0.4.ebuild b/sci-libs/vtk/vtk-5.0.4.ebuild
index 3306b8c2618a..7581c869648f 100644
--- a/sci-libs/vtk/vtk-5.0.4.ebuild
+++ b/sci-libs/vtk/vtk-5.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.0.4.ebuild,v 1.2 2008/03/09 15:13:54 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.0.4.ebuild,v 1.3 2008/05/24 18:56:05 markusle Exp $
 
 EAPI="1"
 
@@ -75,6 +75,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${DISTDIR}"/${P}-tcl8.5.patch.bz2
 	epatch "${FILESDIR}"/${PN}-5.0.3-mpi.patch
+	epatch "${FILESDIR}"/${P}-gcc4.3.patch
 }
 
 src_compile() {