summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Dittrich <markusle@gentoo.org>2008-05-24 18:56:06 +0000
committerMarkus Dittrich <markusle@gentoo.org>2008-05-24 18:56:06 +0000
commit4f8544bc982ebbfd8246b7dab04bb1fa1a694a4d (patch)
tree1f5cb1395487fe85fe1a5f97a40b682476f6c233 /sci-libs/vtk
parentAdded ~ppc wrt bug 219968 (diff)
downloadgentoo-2-4f8544bc982ebbfd8246b7dab04bb1fa1a694a4d.tar.gz
gentoo-2-4f8544bc982ebbfd8246b7dab04bb1fa1a694a4d.tar.bz2
gentoo-2-4f8544bc982ebbfd8246b7dab04bb1fa1a694a4d.zip
Added gcc-4.3 compatibility patch (see bug #223383).
(Portage version: 2.1.5.2)
Diffstat (limited to 'sci-libs/vtk')
-rw-r--r--sci-libs/vtk/ChangeLog7
-rw-r--r--sci-libs/vtk/files/vtk-5.0.4-gcc4.3.patch33
-rw-r--r--sci-libs/vtk/vtk-5.0.4.ebuild3
3 files changed, 41 insertions, 2 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/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() {