r36458 - in /packages/paraview/trunk/debian/patches: series vector_property_map.hpp.patch

Mon May 10 10:06:25 UTC 2010

Author: malat-guest
Date: Mon May 10 10:06:22 2010
New Revision: 36458

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36458
Log:
boost 1.42 API change

Added:
    packages/paraview/trunk/debian/patches/vector_property_map.hpp.patch   (with props)
Modified:
    packages/paraview/trunk/debian/patches/series

Modified: packages/paraview/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/paraview/trunk/debian/patches/series?rev=36458&op=diff
==============================================================================

--- packages/paraview/trunk/debian/patches/series (original)
+++ packages/paraview/trunk/debian/patches/series Mon May 10 10:06:22 2010
@@ -3,3 +3,4 @@
 fix_H5FD_class_t_usage.patch
 icet_cmake.patch
 vtkPVPluginInit.cxx.in.patch
+vector_property_map.hpp.patch

Added: packages/paraview/trunk/debian/patches/vector_property_map.hpp.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/paraview/trunk/debian/patches/vector_property_map.hpp.patch?rev=36458&op=file
==============================================================================
--- packages/paraview/trunk/debian/patches/vector_property_map.hpp.patch (added)
+++ packages/paraview/trunk/debian/patches/vector_property_map.hpp.patch Mon May 10 10:06:22 2010
@@ -1,0 +1,131 @@
+This patch is based on:
+http://vtk.org/gitweb?p=VTK.git;a=commitdiff_plain;h=8b9fd6316c0fbfa4752dbdc425d8ab66d4356839
+
+diff -ru paraview-3.6.2/VTK/Infovis/Testing/Cxx/TestBoostAdapter.cxx paraview-3.6.2.new/VTK/Infovis/Testing/Cxx/TestBoostAdapter.cxx
+--- paraview-3.6.2/VTK/Infovis/Testing/Cxx/TestBoostAdapter.cxx	2008-11-01 20:22:38.000000000 +0100
++++ paraview-3.6.2.new/VTK/Infovis/Testing/Cxx/TestBoostAdapter.cxx	2010-05-10 12:13:29.000000000 +0200
+@@ -36,8 +36,6 @@
+ #include <boost/graph/strong_components.hpp>
+ #include <boost/graph/dijkstra_shortest_paths.hpp>
+ #include <boost/graph/transitive_closure.hpp>
+-#include <boost/property_map.hpp>
+-#include <boost/vector_property_map.hpp>
+ 
+ #include "vtkGraph.h"
+ #include "vtkBoostGraphAdapter.h"
+diff -ru paraview-3.6.2/VTK/Infovis/vtkBoostBiconnectedComponents.cxx paraview-3.6.2.new/VTK/Infovis/vtkBoostBiconnectedComponents.cxx
+--- paraview-3.6.2/VTK/Infovis/vtkBoostBiconnectedComponents.cxx	2008-09-18 16:23:01.000000000 +0200
++++ paraview-3.6.2.new/VTK/Infovis/vtkBoostBiconnectedComponents.cxx	2010-05-10 12:13:29.000000000 +0200
+@@ -32,7 +32,6 @@
+ #include "vtkGraph.h"
+ #include "vtkBoostGraphAdapter.h"
+ #include <boost/graph/biconnected_components.hpp>
+-#include <boost/vector_property_map.hpp>
+ #include <boost/version.hpp>
+ #include <vtksys/stl/vector>
+ #include <vtksys/stl/utility>
+diff -ru paraview-3.6.2/VTK/Infovis/vtkBoostBrandesCentrality.cxx paraview-3.6.2.new/VTK/Infovis/vtkBoostBrandesCentrality.cxx
+--- paraview-3.6.2/VTK/Infovis/vtkBoostBrandesCentrality.cxx	2008-09-12 16:56:50.000000000 +0200
++++ paraview-3.6.2.new/VTK/Infovis/vtkBoostBrandesCentrality.cxx	2010-05-10 12:14:09.000000000 +0200
+@@ -36,7 +36,6 @@
+ 
+ #include <boost/graph/adjacency_list.hpp>
+ #include <boost/graph/betweenness_centrality.hpp>
+-#include <boost/vector_property_map.hpp>
+ 
+ using namespace boost;
+ 
+diff -ru paraview-3.6.2/VTK/Infovis/vtkBoostBreadthFirstSearch.cxx paraview-3.6.2.new/VTK/Infovis/vtkBoostBreadthFirstSearch.cxx
+--- paraview-3.6.2/VTK/Infovis/vtkBoostBreadthFirstSearch.cxx	2009-03-13 17:11:50.000000000 +0100
++++ paraview-3.6.2.new/VTK/Infovis/vtkBoostBreadthFirstSearch.cxx	2010-05-10 12:14:55.000000000 +0200
+@@ -46,8 +46,6 @@
+ 
+ #include <boost/graph/visitors.hpp>
+ #include <boost/graph/breadth_first_search.hpp>
+-#include <boost/property_map.hpp>
+-#include <boost/vector_property_map.hpp>
+ #include <boost/pending/queue.hpp>
+ 
+ #include <vtksys/stl/utility> // for pair
+diff -ru paraview-3.6.2/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx paraview-3.6.2.new/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx
+--- paraview-3.6.2/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx	2008-04-18 19:59:36.000000000 +0200
++++ paraview-3.6.2.new/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx	2010-05-10 12:15:17.000000000 +0200
+@@ -39,7 +39,6 @@
+ #include "vtkTree.h"
+ 
+ #include <boost/graph/breadth_first_search.hpp>
+-#include <boost/vector_property_map.hpp>
+ #include <boost/pending/queue.hpp>
+ 
+ using namespace boost;
+diff -ru paraview-3.6.2/VTK/Infovis/vtkBoostConnectedComponents.cxx paraview-3.6.2.new/VTK/Infovis/vtkBoostConnectedComponents.cxx
+--- paraview-3.6.2/VTK/Infovis/vtkBoostConnectedComponents.cxx	2008-04-18 19:59:37.000000000 +0200
++++ paraview-3.6.2.new/VTK/Infovis/vtkBoostConnectedComponents.cxx	2010-05-10 12:15:32.000000000 +0200
+@@ -33,7 +33,6 @@
+ 
+ #include "vtkBoostGraphAdapter.h"
+ #include <boost/graph/strong_components.hpp>
+-#include <boost/vector_property_map.hpp>
+ 
+ using namespace boost;
+ 
+diff -ru paraview-3.6.2/VTK/Infovis/vtkBoostGraphAdapter.h paraview-3.6.2.new/VTK/Infovis/vtkBoostGraphAdapter.h
+--- paraview-3.6.2/VTK/Infovis/vtkBoostGraphAdapter.h	2008-09-16 18:38:49.000000000 +0200
++++ paraview-3.6.2.new/VTK/Infovis/vtkBoostGraphAdapter.h	2010-05-10 12:13:29.000000000 +0200
+@@ -43,7 +43,13 @@
+ #include "vtkTree.h"
+ #include "vtkUndirectedGraph.h"
+ #include "vtkVariant.h"
+-#include <stddef.h> // for ptrdiff_t
++
++#include <boost/version.hpp>
++#if BOOST_VERSION > 104000
++#include <boost/property_map/vector_property_map.hpp>
++#else
++#include <boost/vector_property_map.hpp>
++#endif
+ 
+ namespace boost {
+   //===========================================================================
+@@ -132,7 +138,7 @@
+   }
+ }
+ 
+-#include <vtksys/stl/utility>
++#include <vtksys/stl/utility> // STL Header
+ 
+ #include <boost/config.hpp>
+ #include <boost/iterator/iterator_facade.hpp>
+diff -ru paraview-3.6.2/VTK/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx paraview-3.6.2.new/VTK/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx
+--- paraview-3.6.2/VTK/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx	2008-12-10 19:18:43.000000000 +0100
++++ paraview-3.6.2.new/VTK/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx	2010-05-10 12:15:48.000000000 +0200
+@@ -40,7 +40,6 @@
+ #include "vtkTree.h"
+ 
+ #include <boost/graph/kruskal_min_spanning_tree.hpp>
+-#include <boost/vector_property_map.hpp>
+ #include <boost/pending/queue.hpp>
+ 
+ using namespace boost;
+diff -ru paraview-3.6.2/VTK/Infovis/vtkBoostPrimMinimumSpanningTree.cxx paraview-3.6.2.new/VTK/Infovis/vtkBoostPrimMinimumSpanningTree.cxx
+--- paraview-3.6.2/VTK/Infovis/vtkBoostPrimMinimumSpanningTree.cxx	2009-01-06 18:08:44.000000000 +0100
++++ paraview-3.6.2.new/VTK/Infovis/vtkBoostPrimMinimumSpanningTree.cxx	2010-05-10 12:16:12.000000000 +0200
+@@ -39,7 +39,6 @@
+ #include "vtkTree.h"
+ 
+ #include <boost/graph/prim_minimum_spanning_tree.hpp>
+-#include <boost/vector_property_map.hpp>
+ #include <boost/pending/queue.hpp>
+ 
+ using namespace boost;
+diff -ru paraview-3.6.2/VTK/Infovis/vtkTreeLayoutStrategy.cxx paraview-3.6.2.new/VTK/Infovis/vtkTreeLayoutStrategy.cxx
+--- paraview-3.6.2/VTK/Infovis/vtkTreeLayoutStrategy.cxx	2008-11-13 00:12:48.000000000 +0100
++++ paraview-3.6.2.new/VTK/Infovis/vtkTreeLayoutStrategy.cxx	2010-05-10 12:13:29.000000000 +0200
+@@ -376,7 +376,6 @@
+ #include <boost/graph/visitors.hpp>
+ #include <boost/graph/depth_first_search.hpp>
+ #include <boost/property_map.hpp>
+-#include <boost/vector_property_map.hpp>
+ #include <boost/pending/queue.hpp>
+ 
+ using namespace boost;

Propchange: packages/paraview/trunk/debian/patches/vector_property_map.hpp.patch
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: packages/paraview/trunk/debian/patches/vector_property_map.hpp.patch
------------------------------------------------------------------------------
    svn:mime-type = text/plain


