r36459 - /packages/paraview/trunk/debian/patches/vector_property_map.hpp.patch

[malat-guest at users.alioth.debian.org]

Author: malat-guest
Date: Mon May 10 11:52:31 2010
New Revision: 36459

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36459
Log:
merge another patch

Modified:
    packages/paraview/trunk/debian/patches/vector_property_map.hpp.patch

Modified: 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=36459&op=diff
==============================================================================
--- packages/paraview/trunk/debian/patches/vector_property_map.hpp.patch (original)
+++ packages/paraview/trunk/debian/patches/vector_property_map.hpp.patch Mon May 10 11:52:31 2010
@@ -1,6 +1,7 @@
 This patch is based on:
 http://vtk.org/gitweb?p=VTK.git;a=commitdiff_plain;h=8b9fd6316c0fbfa4752dbdc425d8ab66d4356839
-
+and
+http://vtk.org/gitweb?p=VTK.git;a=patch;h=c472134a61d70cd0df2c27ea2bff737f76d19bdb
 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
@@ -71,23 +72,16 @@
  
 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 @@
++++ paraview-3.6.2.new/VTK/Infovis/vtkBoostGraphAdapter.h	2010-05-10 14:01:51.000000000 +0200
+@@ -43,7 +43,6 @@
  #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 @@
+@@ -132,7 +131,7 @@
    }
  }
  
@@ -96,6 +90,19 @@
  
  #include <boost/config.hpp>
  #include <boost/iterator/iterator_facade.hpp>
+@@ -913,5 +912,12 @@
+ 
+ } // namespace boost
+ 
++#include <boost/version.hpp>
++#if BOOST_VERSION > 104000
++#include <boost/property_map/vector_property_map.hpp>
++#else
++#include <boost/vector_property_map.hpp>
++#endif
++
+ 
+ #endif // __vtkBoostGraphAdapter_h
 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