[paraview: 3/3] Add patch from Petr Machata to build with boost 1.48.0

[Orion Poplawski]

commit 748d4ae038f06dd2c2d9ed0cb5617eeb97ed0098
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Fri Dec 9 12:37:02 2011 -0700

    Add patch from Petr Machata to build with boost 1.48.0

 paraview-3.12.0-boost-1.48.0-bfs.patch |   31 +++++++++++++++++++++++++++++++
 paraview.spec                          |    7 +++++++
 2 files changed, 38 insertions(+), 0 deletions(-)
---
diff --git a/paraview-3.12.0-boost-1.48.0-bfs.patch b/paraview-3.12.0-boost-1.48.0-bfs.patch
new file mode 100644
index 0000000..5cc2217
--- /dev/null
+++ b/paraview-3.12.0-boost-1.48.0-bfs.patch
@@ -0,0 +1,31 @@
+diff -up ParaView-3.12.0/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx\~ ParaView-3.12.0/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx
+--- ParaView-3.12.0/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx~	2011-11-08 21:56:37.000000000 +0100
++++ ParaView-3.12.0/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx	2011-12-06 01:11:42.487760688 +0100
+@@ -47,6 +47,15 @@ using namespace boost;
+ vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree);
+ 
+ 
++namespace {
++  vtkIdType unwrap_edge_id(vtkEdgeType const &e) {
++    return e.Id;
++  }
++  vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) {
++    return e.underlying_desc.Id;
++  }
++}
++
+ // Redefine the bfs visitor, the only visitor we
+ // are using is the tree_edge visitor.
+ template <typename IdMap>
+@@ -95,7 +104,8 @@ public:
+ 
+     // Copy the vertex and edge data from the graph to the tree.
+     tree->GetVertexData()->CopyData(graph->GetVertexData(), v, tree_v);
+-    tree->GetEdgeData()->CopyData(graph->GetEdgeData(), e.Id, tree_e.Id);
++    tree->GetEdgeData()->CopyData(graph->GetEdgeData(),
++				  unwrap_edge_id(e), tree_e.Id);
+   }
+ 
+ private:
+
+Diff finished.  Tue Dec  6 01:13:13 2011
diff --git a/paraview.spec b/paraview.spec
index a751691..6ab531f 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -24,6 +24,9 @@ Source1:        paraview_22x22.png
 Source2:        paraview.xml
 #Add some needed includes
 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
 #Reported upstream: http://public.kitware.com/mantis/view.php?id=7023
 Patch7:         paraview-3.2.2-hdf5.patch
 
@@ -191,6 +194,7 @@ BuildArch:      noarch
 %prep
 %setup -q -n ParaView-%{version}%{?rcver}
 %patch1 -p1 -b .include
+%patch2 -p1 -b .boost
 %patch7 -p1 -b .hdf5
 #Remove included hdf5 just to be sure
 rm -r VTK/Utilities/vtkhdf5
@@ -414,6 +418,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Fri Dec 9 2011 Orion Poplawski <orion at cora.nwra.com> - 3.12.0-3
+- Add patch from Petr Machata to build with boost 1.48.0
+
 * Thu Dec 1 2011 Orion Poplawski <orion at cora.nwra.com> - 3.12.0-2
 - Enable PARAVIEW_INSTALL_DEVELOPMENT and re-add -devel sub-package
 - Install libvtk*Python.so by hand for now