diff --git a/paraview-vtkboost.patch b/paraview-vtkboost.patch new file mode 100644 index 0000000..0a45842 --- /dev/null +++ b/paraview-vtkboost.patch @@ -0,0 +1,22 @@ +--- ParaView-3.14.1-Source/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx 2012-04-02 10:57:30.000000000 -0600 ++++ VTK5.10.1/Infovis/vtkBoostBreadthFirstSearchTree.cxx 2012-10-15 14:33:21.000000000 -0600 +@@ -49,11 +49,17 @@ + + #if BOOST_VERSION >= 104800 // Boost 1.48.x + namespace { +- vtkIdType unwrap_edge_id(vtkEdgeType const &e) { ++ vtkIdType unwrap_edge_id(vtkEdgeType const &e) ++ { + return e.Id; + } +- vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor const &e) { ++ vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor const &e) ++ { ++# if BOOST_VERSION == 104800 + return e.underlying_desc.Id; ++# else ++ return e.underlying_descx.Id; ++# endif + } + } + #endif diff --git a/paraview.spec b/paraview.spec index b46a7fd..2cfe2d5 100644 --- a/paraview.spec +++ b/paraview.spec @@ -33,6 +33,8 @@ Patch3: paraview-gcc47.patch #https://bugzilla.redhat.com/show_bug.cgi?id=808490 #http://paraview.org/Bug/view.php?id=13054 Patch4: paraview-kwprocessxml_rpath.patch +#Patch vtkBoostBreadthFirstSearchTree.cxx to vtk 5.10.1 version to compile with current boost +Patch5: paraview-vtkboost.patch #Reported upstream: http://public.kitware.com/mantis/view.php?id=7023 Patch7: paraview-3.2.2-hdf5.patch @@ -227,6 +229,7 @@ developing applications that use %{name}-mpich2. %patch2 -p0 -b .system %patch3 -p1 -b .gcc47 %patch4 -p1 -b .kwprocessxml_rpath +%patch5 -p1 -b .vtkboost %patch7 -p1 -b .hdf5 #Remove included hdf5 just to be sure rm -r VTK/Utilities/vtkhdf5 @@ -478,6 +481,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog * Thu Nov 1 2012 Orion Poplawski - 3.14.1-5 - Rebuild for mpich2 1.5 +- Add patch to compile with current boost * Fri Jul 20 2012 Fedora Release Engineering - 3.14.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild