rpms/vtk/devel vtk-5.0.4-gcc43.patch,NONE,1.1 vtk.spec,1.8,1.9

[Axel Thimm (athimm)]

Author: athimm

Update of /cvs/extras/rpms/vtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27083

Modified Files:
	vtk.spec 
Added Files:
	vtk-5.0.4-gcc43.patch 
Log Message:
Fixes by Orion Poplawski for gcc 4.3

vtk-5.0.4-gcc43.patch:

--- NEW FILE vtk-5.0.4-gcc43.patch ---
--- VTK-5.0.4/Utilities/DICOMParser/DICOMAppHelper.cxx.gcc43	2007-05-03 11:12:13.000000000 -0600
+++ VTK-5.0.4/Utilities/DICOMParser/DICOMAppHelper.cxx	2008-04-11 13:52:05.000000000 -0600
@@ -31,7 +31,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <string>
+#include <cstring>
 #include <math.h>
 #include <algorithm>
 #if defined(__BORLANDC__)
--- VTK-5.0.4/Utilities/DICOMParser/DICOMFile.cxx.gcc43	2007-11-07 13:51:57.000000000 -0700
+++ VTK-5.0.4/Utilities/DICOMParser/DICOMFile.cxx	2008-02-18 10:31:08.000000000 -0700
@@ -26,7 +26,7 @@
 #include "DICOMFile.h"
 
 #include <stdio.h>
-#include <string>
+#include <cstring>
 
 DICOMFile::DICOMFile() : InputStream()
 {
--- VTK-5.0.4/Utilities/DICOMParser/DICOMParser.cxx.gcc43	2007-11-07 13:51:57.000000000 -0700
+++ VTK-5.0.4/Utilities/DICOMParser/DICOMParser.cxx	2008-02-18 10:33:07.000000000 -0700
@@ -39,7 +39,7 @@
 #include <sys/types.h>
 #endif
 
-#include <string>
+#include <cstring>
 
 // Define DEBUG_DICOM to get debug messages sent to dicom_stream::cerr
 // #define DEBUG_DICOM


Index: vtk.spec
===================================================================
RCS file: /cvs/extras/rpms/vtk/devel/vtk.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vtk.spec	5 Apr 2008 10:44:02 -0000	1.8
+++ vtk.spec	12 Apr 2008 05:42:05 -0000	1.9
@@ -7,11 +7,12 @@
 Summary: The Visualization Toolkit - A high level 3D visualization library
 Name: vtk
 Version: 5.0.4
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: BSD-like
 Group: System Environment/Libraries
 Source: http://www.vtk.org/files/release/5.0/%{name}-%{version}.tar.gz
 Patch0: vtk-5.0.0-pythondestdir.patch
+Patch1: vtk-5.0.4-gcc43.patch
 URL: http://vtk.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: cmake >= 2.0.4
@@ -101,6 +102,7 @@
 %prep
 %setup -q -n VTK
 %patch0 -p1
+%patch1 -p1
 
 # Replace relative path ../../../VTKData with %{_datadir}/vtkdata-%{version}
 # otherwise it will break on symlinks.
@@ -367,6 +369,9 @@
 %{_libdir}/vtk-examples-5.0
 
 %changelog
+* Sat Apr 12 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 5.0.4-21
+- Fixes for gcc 4.3 by Orion Poplawski.
+
 * Sat Apr  5 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 5.0.4-20
 - Change BR to qt-devel to qt3-devel.