[paraview] - Add patch to support gcc 4.7 - Build with new libOSMesa

Orion Poplawski orion at fedoraproject.org
Fri Jan 27 16:32:15 UTC 2012


commit 42214fc0c45d264c2f4911d220504f1415d8b00a
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Fri Jan 27 09:32:09 2012 -0700

    - Add patch to support gcc 4.7
    - Build with new libOSMesa

 paraview-gcc47.patch |   12 ++++++++++++
 paraview.spec        |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/paraview-gcc47.patch b/paraview-gcc47.patch
new file mode 100644
index 0000000..36f7756
--- /dev/null
+++ b/paraview-gcc47.patch
@@ -0,0 +1,12 @@
+diff -up ParaView-3.12.0/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx.gcc47 ParaView-3.12.0/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx
+--- ParaView-3.12.0/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx.gcc47	2011-11-08 13:56:29.000000000 -0700
++++ ParaView-3.12.0/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx	2012-01-27 09:30:00.088542888 -0700
+@@ -37,6 +37,8 @@
+ #include "vtkTimeSourceExample.h"
+ #include "vtkXdmfReader.h"
+ 
++#include <unistd.h>
++
+ #define NUMTESTS 20
+ 
+ const char testobject[NUMTESTS][40] = {
diff --git a/paraview.spec b/paraview.spec
index a51d8ef..7f81425 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -27,6 +27,8 @@ Patch1:         paraview-3.8.0-include.patch
 #Patch to build with boost 1.48
 #Reported upstream: http://paraview.org/Bug/view.php?id=12772
 Patch2:         paraview-3.12.0-boost-1.48.0-bfs.patch
+#Patch to build with gcc 4.7
+Patch3:         paraview-gcc47.patch
 #Reported upstream: http://public.kitware.com/mantis/view.php?id=7023
 Patch7:         paraview-3.2.2-hdf5.patch
 
@@ -221,6 +223,7 @@ developing applications that use %{name}-mpich2.
 %setup -q -n ParaView-%{version}%{?rcver}
 %patch1 -p1 -b .include
 %patch2 -p1 -b .boost
+%patch3 -p1 -b .gcc47
 %patch7 -p1 -b .hdf5
 #Remove included hdf5 just to be sure
 rm -r VTK/Utilities/vtkhdf5
@@ -457,8 +460,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
-* Sun Jan 8 2012 Orion Poplawski <orion at cora.nwra.com> - 3.12.0-7
+* Thu Jan 27 2012 Orion Poplawski <orion at cora.nwra.com> - 3.12.0-7
 - Build with gcc 4.7
+- Add patch to support gcc 4.7
+- Build with new libOSMesa
 
 * Tue Dec 27 2011 Orion Poplawski <orion at cora.nwra.com> - 3.12.0-6
 - vtkPV*Python.so needs to go into the paraview python dir


More information about the scm-commits mailing list