Fixes by Orion Poplawski for gcc 4.3

This commit is contained in:
athimm 2008-04-12 05:42:05 +00:00
parent 25c9402d1b
commit 8f6f96977b
2 changed files with 39 additions and 1 deletions

33
vtk-5.0.4-gcc43.patch Normal file
View File

@ -0,0 +1,33 @@
--- 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

View File

@ -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 @@ programming languages.
%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 @@ rm -rf %{buildroot}
%{_libdir}/vtk-examples-5.0
%changelog
* Sat Apr 12 2008 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.0.4-21
- Fixes for gcc 4.3 by Orion Poplawski.
* Sat Apr 5 2008 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.0.4-20
- Change BR to qt-devel to qt3-devel.