From b618c3d0693aec564c6746238fd05d94e31d3b76 Mon Sep 17 00:00:00 2001
From: Parabola <dev@list.parabolagnulinux.org>
Date: Tue, 3 Apr 2012 14:54:55 +0000
Subject: Tue Apr  3 14:54:45 UTC 2012

---
 .../12859-VisItBrige-external-tiff-support.diff    | 32 -----------------
 .../paraview/fix-boost-graph-api-changes.diff      | 42 ----------------------
 2 files changed, 74 deletions(-)
 delete mode 100644 community/paraview/12859-VisItBrige-external-tiff-support.diff
 delete mode 100644 community/paraview/fix-boost-graph-api-changes.diff

(limited to 'community/paraview')

diff --git a/community/paraview/12859-VisItBrige-external-tiff-support.diff b/community/paraview/12859-VisItBrige-external-tiff-support.diff
deleted file mode 100644
index 1901d0146..000000000
--- a/community/paraview/12859-VisItBrige-external-tiff-support.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-commit c69690edb180b96081f3e75d0c23bbd5abcb3d65
-Author: Robert Maynard <robert.maynard@kitware.com>
-Date:   Mon Jan 9 12:50:32 2012 -0500
-
-    Corrected build issues when using system tiff library.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0b2ee9e..a83beb7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -216,6 +216,9 @@ VISIT_VTK_THIRD_PARTY_INCLUDE(NETCDF vtknetcdf/include)
- #setup png
- VISIT_VTK_THIRD_PARTY_INCLUDE(PNG vtkpng)
- 
-+#setup tiff
-+VISIT_VTK_THIRD_PARTY_INCLUDE(TIFF vtktiff)
-+
- 
- #-----------------------------------------------------------------------------
- # Detect packages here. We could probably write macros that we can include from
-diff --git a/visit_vtk/full/CMakeLists.txt b/visit_vtk/full/CMakeLists.txt
-index e83e041..532dc62 100644
---- a/visit_vtk/full/CMakeLists.txt
-+++ b/visit_vtk/full/CMakeLists.txt
-@@ -115,6 +115,6 @@ set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES
-   "${VISIT_SOURCE_DIR}/parser;${tmp_include_dirs}")
- 
- VTK_ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES})
--TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkGraphics vtkImaging vtktiff)
-+TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkGraphics vtkImaging ${VTK_TIFF_LIBRARIES})
- 
- VISIT_INSTALL_TARGETS(visit_vtk)
diff --git a/community/paraview/fix-boost-graph-api-changes.diff b/community/paraview/fix-boost-graph-api-changes.diff
deleted file mode 100644
index 37d78665b..000000000
--- a/community/paraview/fix-boost-graph-api-changes.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-commit d3ecc2c459dd1df937fc97887581ace1036da533
-Author: Marcus D. Hanwell <marcus.hanwell@kitware.com>
-Date:   Tue Dec 13 15:36:06 2011 -0500
-
-    BUG: 12772 fixes for change in Boost graph API
-
-    This fixes bug 12772, where an API change in Boost was causing
-    compilation failures using Boost 1.38. Thanks to Orion Poplawski for
-    reporting the issue and posting the patch.
-
-    Change-Id: I491b0f1650c0be19319533306eb10597dc96fa06
-
-diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx
-index c789f6b..cf7cd47 100644
---- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx
-+++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx
-@@ -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:
-- 
cgit v1.2.3-54-g00ecf