From f089780bd910ca18404aba014e231f6a9334aee8 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Thu, 24 May 2012 15:36:16 -0600
Subject: [PATCH] Add patch to compile with boost 1.48

---
 vtk-boost-1.48.0-bfs.patch | 31 +++++++++++++++++++++++++++++++
 vtk.spec                   |  4 ++++
 2 files changed, 35 insertions(+)
 create mode 100644 vtk-boost-1.48.0-bfs.patch

diff --git a/vtk-boost-1.48.0-bfs.patch b/vtk-boost-1.48.0-bfs.patch
new file mode 100644
index 0000000..74aed8e
--- /dev/null
+++ b/vtk-boost-1.48.0-bfs.patch
@@ -0,0 +1,31 @@
+diff -up VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx\~ ParaView-3.12.0/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx
+--- VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx~	2011-11-08 21:56:37.000000000 +0100
++++ 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/vtk.spec b/vtk.spec
index b40b90e..b5cd9cb 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -18,6 +18,8 @@ Patch1: vtk-5.2.0-gcc43.patch
 # Add soname to libvtkNetCDF_cxx
 # http://vtk.org/Bug/view.php?id=12207
 Patch2: vtk-soname.patch
+# Patch to fix compilation with boost 1.48
+Patch3: vtk-boost-1.48.0-bfs.patch
 # Use system libraries
 # http://public.kitware.com/Bug/view.php?id=11823
 Patch5: vtk-5.6.1-system.patch
@@ -134,6 +136,7 @@ programming languages.
 %setup -q -n VTK
 %patch1 -p1 -b .gcc43
 %patch2 -p1 -b .soname
+%patch3 -p1 -b .boost
 %patch5 -p1 -b .system
 
 # Replace relative path ../../../VTKData with %{_datadir}/vtkdata-%{version}
@@ -396,6 +399,7 @@ rm -rf %{buildroot}
 %changelog
 * Thu May 24 2012 Orion Poplawski <orion@cora.nwra.com> - 5.8.0-6
 - Add patch to add soname to libvtkNetCDF_cxx
+- Add patch to compile with boost 1.48
 
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.8.0-5
 - Rebuilt for c++ ABI breakage