rpms/paraview/devel paraview-3.2.1-gcc43.patch, NONE, 1.1 paraview.spec, 1.20, 1.21

Mon Feb 18 20:15:32 UTC 2008

Author: orion

Update of /cvs/pkgs/rpms/paraview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16076

Modified Files:
	paraview.spec 
Added Files:
	paraview-3.2.1-gcc43.patch 
Log Message:
* Mon Feb 18 2008 - Orion Poplawski <orion at cora.nwra.com> - 3.2.1-4
- Add patch to compile with gcc 4.3


paraview-3.2.1-gcc43.patch:

--- NEW FILE paraview-3.2.1-gcc43.patch ---
--- ParaView3.2.1/VTK/Utilities/DICOMParser/DICOMAppHelper.cxx.gcc43	2007-11-07 13:51:57.000000000 -0700
+++ ParaView3.2.1/VTK/Utilities/DICOMParser/DICOMAppHelper.cxx	2008-02-14 15:57:15.000000000 -0700
@@ -29,6 +29,7 @@
 #include "DICOMAppHelper.h"
 #include "DICOMCallback.h"
 
+#include <cstring>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string>
--- ParaView3.2.1/VTK/Utilities/DICOMParser/DICOMFile.cxx.gcc43	2007-11-07 13:51:57.000000000 -0700
+++ ParaView3.2.1/VTK/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()
 {
--- ParaView3.2.1/VTK/Utilities/DICOMParser/DICOMParser.cxx.gcc43	2007-11-07 13:51:57.000000000 -0700
+++ ParaView3.2.1/VTK/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
--- ParaView3.2.1/VTK/Utilities/vtkmetaio/metaUtils.cxx.gcc43	2007-11-07 13:52:00.000000000 -0700
+++ ParaView3.2.1/VTK/Utilities/vtkmetaio/metaUtils.cxx	2008-02-18 10:34:46.000000000 -0700
@@ -34,7 +34,7 @@
 #endif
 
 #include <stdlib.h>
-#include <string>
+#include <cstring>
 
 #if defined (__BORLANDC__) && (__BORLANDC__ >= 0x0580)
 #include <mem.h>
--- ParaView3.2.1/VTK/Utilities/vtkmetaio/metaUtils.h.gcc43	2007-11-07 13:52:00.000000000 -0700
+++ ParaView3.2.1/VTK/Utilities/vtkmetaio/metaUtils.h	2008-02-18 10:36:19.000000000 -0700
@@ -51,7 +51,7 @@
 #endif
 
 #include <vector>
-#include <string>
+#include <cstring>
 #include <typeinfo>
 
 
--- ParaView3.2.1/VTK/Utilities/vtkmetaio/metaCommand.cxx.gcc43	2007-11-07 13:52:00.000000000 -0700
+++ ParaView3.2.1/VTK/Utilities/vtkmetaio/metaCommand.cxx	2008-02-18 10:41:22.000000000 -0700
@@ -21,7 +21,7 @@
 #include "metaCommand.h"
 
 #include <stdio.h>
-#include <string>
+#include <cstring>
 
 #if (METAIO_USE_NAMESPACE)
 namespace METAIO_NAMESPACE {
--- ParaView3.2.1/VTK/Utilities/vtkmetaio/metaImage.cxx.gcc43	2007-11-07 13:52:00.000000000 -0700
+++ ParaView3.2.1/VTK/Utilities/vtkmetaio/metaImage.cxx	2008-02-18 10:44:29.000000000 -0700
@@ -18,7 +18,8 @@
 
 #include <stdio.h>
 #include <ctype.h>
-#include <string>
+#include <cstring>
+#include <cstdlib>
 #include <string.h> // for memcpy
 #include <math.h>
 
--- ParaView3.2.1/VTK/Utilities/vtkmetaio/metaOutput.cxx.gcc43	2007-11-07 13:52:00.000000000 -0700
+++ ParaView3.2.1/VTK/Utilities/vtkmetaio/metaOutput.cxx	2008-02-18 10:47:24.000000000 -0700
@@ -32,6 +32,7 @@
 #include <arpa/inet.h>
 #endif
 
+#include <cstring>
 #include <typeinfo>
 
 #if (METAIO_USE_NAMESPACE)
--- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfArray.h.gcc43	2007-11-07 13:51:40.000000000 -0700
+++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfArray.h	2008-02-18 11:36:36.000000000 -0700
@@ -26,6 +26,7 @@
 #define __XdmfArray_h
 
 #include "XdmfDataDesc.h"
+#include <cstdlib>
 
 #define XDMF_LONGEST_LENGTH     (XdmfInt64)~0
 #define XDMF_ARRAY_TAG_LENGTH  80
--- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfLightData.h.gcc43	2007-11-07 13:51:40.000000000 -0700
+++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfLightData.h	2008-02-18 11:38:06.000000000 -0700
@@ -26,7 +26,7 @@
 #define __XdmfLightData_h
 
 #include "XdmfObject.h"
-
+#include <cstring>
 
 // typedef XdmfPointer XdmfXmlNode;
 struct _xmlNode;
--- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx.gcc43	2007-11-07 13:51:40.000000000 -0700
+++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx	2008-02-18 11:40:41.000000000 -0700
@@ -23,6 +23,7 @@
 /*                                                                 */
 /*******************************************************************/
 #include "XdmfDataDesc.h"
+#include <cstdlib>
 
 XdmfDataDesc::XdmfDataDesc() {
   H5dont_atexit();
--- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfObject.cxx.gcc43	2007-11-07 13:51:40.000000000 -0700
+++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfObject.cxx	2008-02-18 11:42:04.000000000 -0700
@@ -23,6 +23,7 @@
 /*                                                                 */
 /*******************************************************************/
 #include "XdmfObject.h"
+#include <cstring>
 
 static XdmfInt32 GlobalDebugFlag = 0;
 static XdmfInt64 NameCntr = 0;
--- ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfRoot.cxx.gcc43	2007-11-07 13:51:40.000000000 -0700
+++ ParaView3.2.1/Utilities/Xdmf2/libsrc/XdmfRoot.cxx	2008-02-18 11:43:10.000000000 -0700
@@ -24,6 +24,7 @@
 /*******************************************************************/
 #include "XdmfRoot.h"
 #include "XdmfDOM.h"
+#include <cstdlib>
 
 XdmfRoot::XdmfRoot() {
     this->SetElementName("Xdmf");


Index: paraview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- paraview.spec	18 Jan 2008 22:40:06 -0000	1.20
+++ paraview.spec	18 Feb 2008 20:14:53 -0000	1.21
@@ -6,7 +6,7 @@
 
 Name:           paraview
 Version:        %{pv_majmin}.%{pv_patch}
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -21,6 +21,7 @@
 Patch3:         paraview-3.2.1-doc.patch
 Patch4:         paraview-3.2.1-assistant-qt4.patch
 Patch5:         paraview-3.2.1-make.patch
+Patch6:         paraview-3.2.1-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -124,6 +125,7 @@
 %patch3 -p1 -b .doc
 %patch4 -p1 -b .assistant-qt4
 %patch5 -p0 -b .make
+%patch6 -p1 -b .gcc43
 
 
 %build
@@ -366,6 +368,9 @@
 
 
 %changelog
+* Mon Feb 18 2008 - Orion Poplawski <orion at cora.nwra.com> - 3.2.1-4
+- Add patch to compile with gcc 4.3
+
 * Fri Jan 18 2008 - Orion Poplawski <orion at cora.nwra.com> - 3.2.1-3
 - Add patch to fix parallel make
 - Obsolete demos package (bug #428528)


