[SCM] Paraview packaging branch, master, updated. upstream/3.12.0-122-g8feea33

[Anton Gladky]

The following commit has been merged in the master branch:
commit 8feea33cd961d8c90a1355ba90cc1342e76911d4
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Mon Dec 19 19:32:32 2011 +0100

    Fix FTBFS with boost 1.48

diff --git a/debian/patches/fix_boost-1.48_compilation.patch b/debian/patches/fix_boost-1.48_compilation.patch
new file mode 100644
index 0000000..c11629e
--- /dev/null
+++ b/debian/patches/fix_boost-1.48_compilation.patch
@@ -0,0 +1,34 @@
+Description: Fix FTBFS with boost 1.48 "VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx:98:5: error: 'class boost::detail::reverse_graph_edge_descriptor<vtkEdgeType>' has no member named 'Id'"
+Author: Orion Poplawski
+Bug: http://www.vtk.org/Bug/view.php?id=12772
+Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2011-12-19
+
+--- a/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx
++++ b/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx
+@@ -46,6 +46,15 @@
+ 
+ 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.
+@@ -95,7 +104,8 @@
+ 
+     // 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 --git a/debian/patches/series b/debian/patches/series
index 429045f..cab3e8c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ kwprocessxml_rpath.patch
 fix_memory_animation_leak.patch
 fix_format_not_a_string_FTBFS.patch
 workaround_strict-aliasing_in_mpi4py_MPI.patch
+fix_boost-1.48_compilation.patch

-- 
Paraview packaging