Add patch to compile with boost 1.48
This commit is contained in:
parent
c0c478c84f
commit
f089780bd9
31
vtk-boost-1.48.0-bfs.patch
Normal file
31
vtk-boost-1.48.0-bfs.patch
Normal file
@ -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
|
4
vtk.spec
4
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
|
||||
|
Loading…
Reference in New Issue
Block a user