[vtk7] 02/24: refresh patches 10-30

[Gert Wollny]

This is an automated email from the git hooks/post-receive script.

gewo pushed a commit to branch master
in repository vtk7.

commit 02a80dc411bcd71e090bd99a2d7a0d5327e31da1
Author: Gert Wollny <gewo at debian.org>
Date:   Sat Jul 8 10:04:23 2017 +0000

    refresh patches 10-30
---
 debian/patches/20_soversion-sharedlib.patch | 16 ++++++----------
 debian/patches/30_matplotlib.patch          | 16 +++++++---------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/debian/patches/20_soversion-sharedlib.patch b/debian/patches/20_soversion-sharedlib.patch
index a503d49..c7cb1e7 100644
--- a/debian/patches/20_soversion-sharedlib.patch
+++ b/debian/patches/20_soversion-sharedlib.patch
@@ -1,8 +1,6 @@
-Index: VTK-6.3.0/CMake/vtkModuleMacros.cmake
-===================================================================
---- VTK-6.3.0.orig/CMake/vtkModuleMacros.cmake
-+++ VTK-6.3.0/CMake/vtkModuleMacros.cmake
-@@ -401,8 +401,8 @@ endfunction()
+--- a/CMake/vtkModuleMacros.cmake
++++ b/CMake/vtkModuleMacros.cmake
+@@ -417,8 +417,8 @@
  function(vtk_target_name _name)
    get_property(_type TARGET ${_name} PROPERTY TYPE)
    if(NOT "${_type}" STREQUAL EXECUTABLE AND NOT VTK_JAVA_INSTALL)
@@ -13,11 +11,9 @@ Index: VTK-6.3.0/CMake/vtkModuleMacros.cmake
    endif()
    if("${_name}" MATCHES "^[Vv][Tt][Kk]")
      set(_vtk "")
-Index: VTK-6.3.0/Rendering/Tk/CMakeLists.txt
-===================================================================
---- VTK-6.3.0.orig/Rendering/Tk/CMakeLists.txt
-+++ VTK-6.3.0/Rendering/Tk/CMakeLists.txt
-@@ -122,7 +122,7 @@ if(TK_FOUND AND VTK_USE_TK)
+--- a/Rendering/Tk/CMakeLists.txt
++++ b/Rendering/Tk/CMakeLists.txt
+@@ -118,7 +118,7 @@
      vtk_target_install(vtkRenderingPythonTkWidgets)
  
      set_property(TARGET vtkRenderingPythonTkWidgets PROPERTY OUTPUT_NAME
diff --git a/debian/patches/30_matplotlib.patch b/debian/patches/30_matplotlib.patch
index cac3abd..6888f1c 100644
--- a/debian/patches/30_matplotlib.patch
+++ b/debian/patches/30_matplotlib.patch
@@ -1,15 +1,13 @@
-Index: VTK-6.3.0/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
-===================================================================
---- VTK-6.3.0.orig/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
-+++ VTK-6.3.0/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
-@@ -143,6 +143,10 @@ private:
-   // is called internally when matplotlib rendering is first needed and is used
-   // to implement IsAvailable.
+--- a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
++++ b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
+@@ -156,6 +156,10 @@
+    * to implement IsAvailable.
+    */
    static Availability CheckMPLAvailability();
 +  static void DisableMPL()
 +    {
 +    MPLMathTextAvailable = UNAVAILABLE;
 +    };
  
-   // Description:
-   // Cache the availability of matplotlib in the current python session.
+   //@{
+   /**

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vtk7.git