[vtk6] 05/05: Remove old patches.
Anton Gladky
gladk at moszumanska.debian.org
Tue Mar 24 19:43:02 UTC 2015
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch experimental
in repository vtk6.
commit eb727c151c62886167b0d9f4f392897b2e2ead29
Author: Anton Gladky <gladk at debian.org>
Date: Tue Mar 24 20:42:38 2015 +0100
Remove old patches.
---
debian/patches/10_Java_Target.patch | 25 --
debian/patches/docs.patch | 30 --
debian/patches/examples-add-shebang.patch | 594 ------------------------------
debian/patches/fix_FTBFS_KWSys.patch | 79 ----
debian/patches/fix_GLintptr_FTBFS.patch | 31 --
debian/patches/fix_libav10.patch | 34 --
debian/patches/freetype-update.patch | 52 ---
debian/patches/use_system_alglib.patch | 88 -----
debian/patches/use_system_xdmf.patch | 66 ----
debian/patches/vtkTclWrapper.patch | 14 -
debian/patches/vtkWrapJava.patch | 228 ------------
debian/patches/wxpython3.0.patch | 79 ----
12 files changed, 1320 deletions(-)
diff --git a/debian/patches/10_Java_Target.patch b/debian/patches/10_Java_Target.patch
deleted file mode 100644
index 5d0fee1..0000000
--- a/debian/patches/10_Java_Target.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Compile java module with -target 1.5
-Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>, Anton Gladky <gladk at debian.org>
-Bug-Debian: http://bugs.debian.org/747108
-Last-Update: 2014-05-09
-
---- a/Wrapping/Java/CMakeLists.txt
-+++ b/Wrapping/Java/CMakeLists.txt
-@@ -309,7 +309,7 @@
- OUTPUT ${VTK_BINARY_DIR}/java/javac_stamp.txt
- DEPENDS ${VTK_JAVA_SOURCE_FILES}
- COMMAND ${JAVA_COMPILE} ${JAVAC_OPTIONS}
-- -source 1.5 -classpath ${JAVA_COMPILATION_CLASSPATH} -sourcepath ${VTK_SOURCE_DIR}/Wrapping/Java/ -d ${VTK_BINARY_DIR}/java
-+ -source 1.5 -target 1.5 -classpath ${JAVA_COMPILATION_CLASSPATH} -sourcepath ${VTK_SOURCE_DIR}/Wrapping/Java/ -d ${VTK_BINARY_DIR}/java
- ${VTK_BINARY_DIR}/java/vtk/*.java ${VTK_BINARY_DIR}/java/vtk/rendering/*.java ${VTK_BINARY_DIR}/java/vtk/rendering/awt/*.java ${VTK_BINARY_DIR}/java/vtk/sample/*.java ${SWT_FILES} ${JOGL_FILES}
- COMMAND ${CMAKE_COMMAND} -E touch ${VTK_BINARY_DIR}/java/javac_stamp.txt
- COMMENT "Compiling Java Classes"
-@@ -341,7 +341,7 @@
- add_custom_command(
- OUTPUT ${VTK_BINARY_DIR}/java/javac_tests_stamp.txt
- COMMAND ${JAVA_COMPILE} ${JAVAC_OPTIONS} -classpath ${VTK_JAR_PATH}/vtk.jar${SEPARATOR}${VTK_BINARY_DIR}/Wrapping/Java
-- -source 1.5 -sourcepath ${VTK_SOURCE_DIR}/Wrapping/Java
-+ -source 1.5 -target 1.5 -sourcepath ${VTK_SOURCE_DIR}/Wrapping/Java
- -d ${VTK_BINARY_DIR}/Wrapping/Java
- ${VTK_JAVA_TESTS}
- COMMAND ${CMAKE_COMMAND} -E touch ${VTK_BINARY_DIR}/java/javac_tests_stamp.txt
diff --git a/debian/patches/docs.patch b/debian/patches/docs.patch
deleted file mode 100644
index 351c6d4..0000000
--- a/debian/patches/docs.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/Utilities/Doxygen/doxyfile.in
-+++ b/Utilities/Doxygen/doxyfile.in
-@@ -12,7 +12,7 @@
- GENERATE_TODOLIST = YES
- GENERATE_BUGLIST = YES
- GENERATE_HTML = YES
--GENERATE_HTMLHELP = YES
-+GENERATE_HTMLHELP = NO
- GENERATE_LATEX = NO
- GENERATE_MAN = NO
- GENERATE_RTF = NO
-@@ -92,14 +92,16 @@
- SORT_MEMBER_DOCS = NO
- DISTRIBUTE_GROUP_DOC = YES
- TAB_SIZE = 3
--DETAILS_AT_TOP = YES
-+#obsolete
-+#DETAILS_AT_TOP = YES
- SHORT_NAMES = @DOXYGEN_SHORT_NAMES@
- # PAPER_TYPE = letter
-
- FILE_PATTERNS = *.h
- RECURSIVE = YES
-
--HTML_ALIGN_MEMBERS = YES
-+#obsolete
-+"HTML_ALIGN_MEMBERS = YES
-
- ALPHABETICAL_INDEX = YES
- COLS_IN_ALPHA_INDEX = 3
diff --git a/debian/patches/examples-add-shebang.patch b/debian/patches/examples-add-shebang.patch
deleted file mode 100644
index 7f50ab7..0000000
--- a/debian/patches/examples-add-shebang.patch
+++ /dev/null
@@ -1,594 +0,0 @@
-Index: vtk-6.0.0/Examples/GUI/Python/OrthogonalPlanesWithTkPhoto.py
-===================================================================
---- vtk-6.0.0.orig/Examples/GUI/Python/OrthogonalPlanesWithTkPhoto.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/GUI/Python/OrthogonalPlanesWithTkPhoto.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- import vtk
- from vtk import *
- import Tkinter
-Index: vtk-6.0.0/Examples/Graphics/Python/SegmentAndBrokenLineSources.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Graphics/Python/SegmentAndBrokenLineSources.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Graphics/Python/SegmentAndBrokenLineSources.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- ############################################################
- from vtk import *
- ############################################################
-Index: vtk-6.0.0/Examples/Graphics/Python/SingleYoungsMaterialInterface.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Graphics/Python/SingleYoungsMaterialInterface.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Graphics/Python/SingleYoungsMaterialInterface.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- ############################################################
- from vtk import *
- from vtk.util.misc import vtkGetDataRoot
-Index: vtk-6.0.0/Examples/Hybrid/Python/CylinderAndPolarAxes.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Hybrid/Python/CylinderAndPolarAxes.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Hybrid/Python/CylinderAndPolarAxes.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- ############################################################
- from vtk import *
- ############################################################
-Index: vtk-6.0.0/Examples/Infovis/Python/Matlab_engine_filter.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/Matlab_engine_filter.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/Matlab_engine_filter.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
-
- # Python example script that uses the Matlab Engine filter to compute the
- # degree centraility for an input graph and display the result.
-Index: vtk-6.0.0/Examples/Infovis/Python/Matlab_engine_interface.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/Matlab_engine_interface.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/Matlab_engine_interface.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
-
- # Python example script that uses the vtkMatlabEngineInterface to perform
- # a calculation (sin(x)^2 + cos(x)^2 = 1) on VTK array data, and pass the
-Index: vtk-6.0.0/Examples/Infovis/Python/Rcalculator_mst.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/Rcalculator_mst.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/Rcalculator_mst.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
-
- # Python examples script that uses the R calculator filter to find the
- # maxiumum spanning tree of a random input graph by inverting the edge
-Index: vtk-6.0.0/Examples/Infovis/Python/Rcalculator_vd.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/Rcalculator_vd.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/Rcalculator_vd.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
-
- # Python example script that uses the RcalculatorFilter to compute the mean
- # vertex degree of the input graph and the distance from the mean for each
-Index: vtk-6.0.0/Examples/Infovis/Python/Rinterface.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/Rinterface.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/Rinterface.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
-
- # Python example script that uses the vtkRIinterface to create an instance of the
- # R interpreter and pass it some data, modify the data in R, and pass the result
-Index: vtk-6.0.0/Examples/Infovis/Python/Rrand_table.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/Rrand_table.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/Rrand_table.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
-
- # Python example script that uses the Gnu R random table source to create an output
- # table with 5 columns and 30 rows. The columns are filled random numbers drawn
-Index: vtk-6.0.0/Examples/Infovis/Python/adjacency_matrix_to_graph.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/adjacency_matrix_to_graph.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/adjacency_matrix_to_graph.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
- import os.path
-
-Index: vtk-6.0.0/Examples/Infovis/Python/aggregate.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/aggregate.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/aggregate.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
- import os.path
-
-Index: vtk-6.0.0/Examples/Infovis/Python/boost_bfs.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/boost_bfs.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/boost_bfs.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
-
- source = vtkRandomGraphSource()
-Index: vtk-6.0.0/Examples/Infovis/Python/boost_centrality.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/boost_centrality.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/boost_centrality.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
-
- source = vtkRandomGraphSource()
-Index: vtk-6.0.0/Examples/Infovis/Python/boost_mst.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/boost_mst.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/boost_mst.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
-
- source = vtkRandomGraphSource()
-Index: vtk-6.0.0/Examples/Infovis/Python/boost_mst_extract_graph.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/boost_mst_extract_graph.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/boost_mst_extract_graph.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
-
- source = vtkRandomGraphSource()
-Index: vtk-6.0.0/Examples/Infovis/Python/boost_mst_with_hgv.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/boost_mst_with_hgv.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/boost_mst_with_hgv.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
-
- source = vtkRandomGraphSource()
-Index: vtk-6.0.0/Examples/Infovis/Python/circular_vertices.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/circular_vertices.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/circular_vertices.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- """
- This file demonstrates drawing graphs using circular vertices via
- vtkRenderedGraphRepresentation.
-Index: vtk-6.0.0/Examples/Infovis/Python/cone_layout.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/cone_layout.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/cone_layout.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
-
-
-Index: vtk-6.0.0/Examples/Infovis/Python/contingency_port_protocol.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/contingency_port_protocol.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/contingency_port_protocol.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
- import os.path
-
-Index: vtk-6.0.0/Examples/Infovis/Python/create_tree.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/create_tree.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/create_tree.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
-
- graph = vtkMutableDirectedGraph()
-Index: vtk-6.0.0/Examples/Infovis/Python/database_query1.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/database_query1.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/database_query1.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
- import os.path
-
-Index: vtk-6.0.0/Examples/Infovis/Python/databases.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/databases.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/databases.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
- import os.path
-
-Index: vtk-6.0.0/Examples/Infovis/Python/databases2.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/databases2.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/databases2.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
- import os.path
-
-Index: vtk-6.0.0/Examples/Infovis/Python/delimited_text_reader1.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/delimited_text_reader1.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/delimited_text_reader1.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
-
- csv_source = vtkDelimitedTextReader()
-Index: vtk-6.0.0/Examples/Infovis/Python/delimited_text_reader2.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/delimited_text_reader2.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/delimited_text_reader2.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
-
- csv_source = vtkDelimitedTextReader()
-Index: vtk-6.0.0/Examples/Infovis/Python/displayVTKHierarchy.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/displayVTKHierarchy.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/displayVTKHierarchy.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- import vtk
- import inspect
- import csv
-Index: vtk-6.0.0/Examples/Infovis/Python/filters.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/filters.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/filters.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
-
- source = vtkRandomGraphSource()
-Index: vtk-6.0.0/Examples/Infovis/Python/geoview.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/geoview.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/geoview.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
- import os.path
-
-Index: vtk-6.0.0/Examples/Infovis/Python/graph1.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/graph1.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/graph1.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- """
- This file demonstrates the creation of a directed graph using the
- Python interface to VTK.
-Index: vtk-6.0.0/Examples/Infovis/Python/graph3d.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/graph3d.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/graph3d.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
- from vtk.util.misc import vtkGetDataRoot
- VTK_DATA_ROOT = vtkGetDataRoot()
-Index: vtk-6.0.0/Examples/Infovis/Python/graph_selection_subtract.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/graph_selection_subtract.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/graph_selection_subtract.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
-
- source = vtkRandomGraphSource()
-Index: vtk-6.0.0/Examples/Infovis/Python/graph_tree_ring.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/graph_tree_ring.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/graph_tree_ring.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
-
- addStringLabel = vtkProgrammableFilter()
-Index: vtk-6.0.0/Examples/Infovis/Python/gui.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/gui.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/gui.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from PyQt4 import QtCore
- from PyQt4 import QtGui
- from PyQt4 import uic
-Index: vtk-6.0.0/Examples/Infovis/Python/hello_world.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/hello_world.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/hello_world.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
-
- from vtk import *
-
-Index: vtk-6.0.0/Examples/Infovis/Python/hierarchical_graph.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/hierarchical_graph.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/hierarchical_graph.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
-
- source = vtkRandomGraphSource()
-Index: vtk-6.0.0/Examples/Infovis/Python/icicle_view.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/icicle_view.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/icicle_view.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
-
- reader2 = vtkXMLTreeReader()
-Index: vtk-6.0.0/Examples/Infovis/Python/icicle_view_simple.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/icicle_view_simple.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/icicle_view_simple.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
-
- reader1 = vtkXMLTreeReader()
-Index: vtk-6.0.0/Examples/Infovis/Python/labels.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/labels.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/labels.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
-
- import random
- from vtk import *
-Index: vtk-6.0.0/Examples/Infovis/Python/merge_graphs.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/merge_graphs.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/merge_graphs.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- """
- This file demonstrates the creation of a directed graph using the
- Python interface to VTK.
-Index: vtk-6.0.0/Examples/Infovis/Python/mysql_database.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/mysql_database.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/mysql_database.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
-
- database = vtkSQLDatabase.CreateFromURL("mysql://enron@vizdb.srn.sandia.gov:3306/enron")
-Index: vtk-6.0.0/Examples/Infovis/Python/programmable_pipeline.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/programmable_pipeline.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/programmable_pipeline.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
-
- source = vtkRandomGraphSource()
-Index: vtk-6.0.0/Examples/Infovis/Python/programmable_pipeline2.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/programmable_pipeline2.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/programmable_pipeline2.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- """
- This file demonstrates the creation of a directed graph using the
- Python interface to VTK.
-Index: vtk-6.0.0/Examples/Infovis/Python/psql_database.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/psql_database.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/psql_database.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
-
- # Network Database
-Index: vtk-6.0.0/Examples/Infovis/Python/random3d.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/random3d.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/random3d.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
-
- source = vtkRandomGraphSource()
-Index: vtk-6.0.0/Examples/Infovis/Python/selection.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/selection.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/selection.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
-
- source = vtkRandomGraphSource()
-Index: vtk-6.0.0/Examples/Infovis/Python/selection_domain.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/selection_domain.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/selection_domain.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
- import os.path
-
-Index: vtk-6.0.0/Examples/Infovis/Python/simple_selection.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/simple_selection.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/simple_selection.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
-
- from vtk import *
-Index: vtk-6.0.0/Examples/Infovis/Python/statistics_temperatures.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/statistics_temperatures.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/statistics_temperatures.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
- import os.path
-
-Index: vtk-6.0.0/Examples/Infovis/Python/streaming_statistics.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/streaming_statistics.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/streaming_statistics.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
- import os.path
-
-Index: vtk-6.0.0/Examples/Infovis/Python/streaming_statistics_pyqt.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/streaming_statistics_pyqt.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/streaming_statistics_pyqt.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
- import os.path
- import sys
-Index: vtk-6.0.0/Examples/Infovis/Python/tables1.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/tables1.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/tables1.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- """
- This file contains Python code illustrating the creation and manipulation of
- vtkTable objects.
-Index: vtk-6.0.0/Examples/Infovis/Python/tables2.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/tables2.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/tables2.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- """
- This file contains Python code illustrating the creation and manipulation of
- vtkTable objects.
-Index: vtk-6.0.0/Examples/Infovis/Python/tables3.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/tables3.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/tables3.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
-
- if __name__ == "__main__":
-Index: vtk-6.0.0/Examples/Infovis/Python/tables4.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/tables4.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/tables4.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- """
- This file provides a more advanced example of vtkTable access and
- manipulation methods.
-Index: vtk-6.0.0/Examples/Infovis/Python/tables_adv.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/tables_adv.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/tables_adv.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- """
- This file contains Python code illustrating the creation and manipulation of
- vtkTable objects.
-Index: vtk-6.0.0/Examples/Infovis/Python/theme.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/theme.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/theme.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
-
- source = vtkRandomGraphSource()
-Index: vtk-6.0.0/Examples/Infovis/Python/tree1.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/tree1.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/tree1.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- """
- This file demonstrates the creation of a tree using the
- Python interface to VTK.
-Index: vtk-6.0.0/Examples/Infovis/Python/tree_map.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/tree_map.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/tree_map.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
- import os.path
-
-Index: vtk-6.0.0/Examples/Infovis/Python/treemap_view.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/treemap_view.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/treemap_view.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
-
- reader1 = vtkXMLTreeReader()
-Index: vtk-6.0.0/Examples/Infovis/Python/treering_hierarchical_view.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/treering_hierarchical_view.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/treering_hierarchical_view.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
-
- from vtk import *
-
-Index: vtk-6.0.0/Examples/Infovis/Python/treering_view.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/treering_view.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/treering_view.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
-
- reader2 = vtkXMLTreeReader()
-Index: vtk-6.0.0/Examples/Infovis/Python/treering_view_simple.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/treering_view_simple.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/treering_view_simple.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
-
- reader1 = vtkXMLTreeReader()
-Index: vtk-6.0.0/Examples/Infovis/Python/vertex_degree_programmable.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/vertex_degree_programmable.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/vertex_degree_programmable.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
-
- vertexDegree = vtkProgrammableFilter()
-Index: vtk-6.0.0/Examples/Infovis/Python/views.py
-===================================================================
---- vtk-6.0.0.orig/Examples/Infovis/Python/views.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/Infovis/Python/views.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
- import os.path
-
-Index: vtk-6.0.0/Examples/ParallelProcessing/MPI/Python/ParallelCone.py
-===================================================================
---- vtk-6.0.0.orig/Examples/ParallelProcessing/MPI/Python/ParallelCone.py 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Examples/ParallelProcessing/MPI/Python/ParallelCone.py 2013-10-18 23:11:25.000000000 +0200
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- from vtk import *
- import sys
- import os
diff --git a/debian/patches/fix_FTBFS_KWSys.patch b/debian/patches/fix_FTBFS_KWSys.patch
deleted file mode 100644
index e82ac2a..0000000
--- a/debian/patches/fix_FTBFS_KWSys.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Description: fix FTBFS on many platforms
-Origin: http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=397bccba
-Bug-Debian: https://bugs.debian.org/748552
-Reviewed-By: Anton Gladky <gladk at debian.org>
-Last-Update: 2014-05-18
-
---- vtk6-6.1.0+dfsg.orig/Utilities/KWSys/vtksys/SystemInformation.cxx
-+++ vtk6-6.1.0+dfsg/Utilities/KWSys/vtksys/SystemInformation.cxx
-@@ -88,15 +88,6 @@ typedef int siginfo_t;
- # include <ifaddrs.h>
- # define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN
- # endif
--# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE)
--# include <execinfo.h>
--# if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE)
--# include <cxxabi.h>
--# endif
--# if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP)
--# include <dlfcn.h>
--# endif
--# endif
- #endif
-
- #if defined(__OpenBSD__) || defined(__NetBSD__)
-@@ -126,16 +117,8 @@ typedef int siginfo_t;
- # include <ifaddrs.h>
- # define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN
- # endif
--# if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0 >= 1050
--# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE)
--# include <execinfo.h>
--# if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE)
--# include <cxxabi.h>
--# endif
--# if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP)
--# include <dlfcn.h>
--# endif
--# endif
-+# if !(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0 >= 1050)
-+# undef KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE
- # endif
- #endif
-
-@@ -150,15 +133,6 @@ typedef int siginfo_t;
- # define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN
- # endif
- # endif
--# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE)
--# include <execinfo.h>
--# if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE)
--# include <cxxabi.h>
--# endif
--# if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP)
--# include <dlfcn.h>
--# endif
--# endif
- # if defined(KWSYS_CXX_HAS_RLIMIT64)
- typedef struct rlimit64 ResourceLimitType;
- # define GetResourceLimit getrlimit64
-@@ -178,6 +152,19 @@ typedef struct rlimit ResourceLimitType;
- # include <OS.h>
- #endif
-
-+#if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE)
-+# include <execinfo.h>
-+# if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE)
-+# include <cxxabi.h>
-+# endif
-+# if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP)
-+# include <dlfcn.h>
-+# endif
-+#else
-+# undef KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE
-+# undef KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP
-+#endif
-+
- #include <memory.h>
- #include <stdlib.h>
- #include <stdio.h>
diff --git a/debian/patches/fix_GLintptr_FTBFS.patch b/debian/patches/fix_GLintptr_FTBFS.patch
deleted file mode 100644
index a3fcc16..0000000
--- a/debian/patches/fix_GLintptr_FTBFS.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: fixes FTBFS against new libjpeg-turbo
-Author: Ondřej Surý <ondrej at debian.org>
-Bug-Debian: https://bugs.debian.org/765938
-Reviewed-By: Anton Gladky <gladk at debian.org>
-Last-Update: 2014-10-22
-
-Index: vtk6-6.1.0+dfsg2/Rendering/OpenGL/vtkOpenGL.h
-===================================================================
---- vtk6-6.1.0+dfsg2.orig/Rendering/OpenGL/vtkOpenGL.h
-+++ vtk6-6.1.0+dfsg2/Rendering/OpenGL/vtkOpenGL.h
-@@ -20,6 +20,7 @@
-
- // To prevent gl.h to include glext.h provided by the system
- #define GL_GLEXT_LEGACY
-+#define GLX_GLEXT_LEGACY
- #if defined(__APPLE__) && (defined(VTK_USE_CARBON) || defined(VTK_USE_COCOA))
- # include <OpenGL/gl.h> // Include OpenGL API.
- #else
-Index: vtk6-6.1.0+dfsg2/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx
-===================================================================
---- vtk6-6.1.0+dfsg2.orig/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx
-+++ vtk6-6.1.0+dfsg2/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx
-@@ -27,7 +27,7 @@
-
- // define GLX_GLXEXT_LEGACY to prevent glx.h to include glxext.h provided by
- // the system
--//#define GLX_GLXEXT_LEGACY
-+#define GLX_GLXEXT_LEGACY
- #include "GL/glx.h"
-
- #include "vtkgl.h"
diff --git a/debian/patches/fix_libav10.patch b/debian/patches/fix_libav10.patch
deleted file mode 100644
index 8057d34..0000000
--- a/debian/patches/fix_libav10.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: fix libav10 compilation
-Author: Anton Khirnov <anton at khirnov.net>
-Applied-Upstream: http://review.source.kitware.com/#/c/14289/
-Reviewed-By: Anton Gladky <gladk at debian.org>
-Last-Update: 2014-03-13
-
---- a/IO/FFMPEG/vtkFFMPEGWriter.cxx
-+++ b/IO/FFMPEG/vtkFFMPEGWriter.cxx
-@@ -38,6 +38,11 @@
-
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-
-+#ifndef VTK_FFMPEG_AVCODECID
-+#define AV_CODEC_ID_MJPEG CODEC_ID_MJPEG
-+#define AV_CODEC_ID_RAWVIDEO CODEC_ID_RAWVIDEO
-+#endif
-+
- //---------------------------------------------------------------------------
- class vtkFFMPEGWriterInternal
- {
-@@ -143,11 +148,11 @@
- if (this->Writer->GetCompression())
- {
- //choose a codec that is easily playable on windows
-- this->avOutputFormat->video_codec = CODEC_ID_MJPEG;
-+ this->avOutputFormat->video_codec = AV_CODEC_ID_MJPEG;
- }
- else
- {
-- this->avOutputFormat->video_codec = CODEC_ID_RAWVIDEO;
-+ this->avOutputFormat->video_codec = AV_CODEC_ID_RAWVIDEO;
- }
-
- //assign the format to the context
diff --git a/debian/patches/freetype-update.patch b/debian/patches/freetype-update.patch
deleted file mode 100644
index 7aa0b8a..0000000
--- a/debian/patches/freetype-update.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 88f5a5bf546f7962089e107f7f1ae444c6d2797c Mon Sep 17 00:00:00 2001
-From: "Marcus D. Hanwell" <marcus.hanwell at kitware.com>
-Date: Thu, 8 Jan 2015 16:49:54 -0500
-Subject: [PATCH] Fix compile failures seen with latest FreeType
-
-Thanks to Oon-Ee Ng for reporting the issue on the VTK users list.
-This makes some minor changes to account for changes in return type
-in the FreeType API. VTK should now compile against the latest release.
-
-Change-Id: I5dcb608573f387a37ebbc2f9621e89c4551d98f2
----
- Rendering/FreeType/vtkFreeTypeTools.cxx | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/Rendering/FreeType/vtkFreeTypeTools.cxx b/Rendering/FreeType/vtkFreeTypeTools.cxx
-index fe0a1c2..84ff0f8 100644
---- a/Rendering/FreeType/vtkFreeTypeTools.cxx
-+++ b/Rendering/FreeType/vtkFreeTypeTools.cxx
-@@ -1198,7 +1198,7 @@ bool vtkFreeTypeTools::CalculateBoundingBox(const T& str,
- if (bitmap)
- {
- metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent);
-- metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)),
-+ metaData.descent = std::min(-static_cast<int>((bitmap->rows - (bitmapGlyph->top - 1))),
- metaData.descent);
- }
- ++heightString;
-@@ -1534,11 +1534,11 @@ bool vtkFreeTypeTools::RenderCharacter(CharType character, int &x, int &y,
- unsigned char *glyphPtr;
- float tpropAlpha = iMetaData->rgba[3] / 255.0;
-
-- for (int j = 0; j < bitmap->rows; ++j)
-+ for (int j = 0; j < static_cast<int>(bitmap->rows); ++j)
- {
- glyphPtr = glyphPtrRow;
-
-- for (int i = 0; i < bitmap->width; ++i)
-+ for (int i = 0; i < static_cast<int>(bitmap->width); ++i)
- {
- if (*glyphPtr == 0)
- {
-@@ -2001,8 +2001,8 @@ void vtkFreeTypeTools::GetLineMetrics(T begin, T end, MetaData &metaData,
- if (bitmap)
- {
- bbox[0] = std::min(bbox[0], pen[0] + bitmapGlyph->left);
-- bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + bitmap->width);
-- bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - bitmap->rows);
-+ bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + static_cast<int>(bitmap->width));
-+ bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - static_cast<int>(bitmap->rows));
- bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1);
- }
- else
diff --git a/debian/patches/use_system_alglib.patch b/debian/patches/use_system_alglib.patch
deleted file mode 100644
index c0e4e1c..0000000
--- a/debian/patches/use_system_alglib.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Description: Use system alglib.
- [UPD] 2014/06/12. After discussing this issue with upstream,
- I decided to disable this patch for the moment.
- There is no backport compatibility between
- Alglib 1.0 and 3.*. This patch compiles, but no
- guarantee, that it works witn 3.x
-
-Author: Anton Gladky <gladk at debian.org>
-Bug-Debian: http://bugs.debian.org/750187
-Last-Update: 2014-06-03
-
-Index: vtk6-6.1.0+dfsg/Filters/Statistics/vtkPCAStatistics.cxx
-===================================================================
---- vtk6-6.1.0+dfsg.orig/Filters/Statistics/vtkPCAStatistics.cxx
-+++ vtk6-6.1.0+dfsg/Filters/Statistics/vtkPCAStatistics.cxx
-@@ -15,7 +15,7 @@
- #include <vector>
- #include <vtksys/ios/sstream>
-
--#include "alglib/svd.h"
-+#include <linalg.h>
-
- // To Do:
- // - Add option to pre-multiply EigenVectors by normalization coeffs
-@@ -494,7 +494,7 @@ int vtkPCAStatistics::FillInputPortInfor
-
- // ----------------------------------------------------------------------
- static void vtkPCAStatisticsNormalizeSpec( vtkVariantArray* normData,
-- ap::real_2d_array& cov,
-+ alglib::real_2d_array& cov,
- vtkTable* normSpec,
- vtkTable* reqModel,
- bool triangle )
-@@ -612,10 +612,10 @@ static void vtkPCAStatisticsNormalizeSpe
-
- // ----------------------------------------------------------------------
- static void vtkPCAStatisticsNormalizeVariance( vtkVariantArray* normData,
-- ap::real_2d_array& cov )
-+ alglib::real_2d_array& cov )
- {
- vtkIdType i, j;
-- vtkIdType m = cov.gethighbound( 0 ) - cov.getlowbound( 0 ) + 1;
-+ vtkIdType m = cov(0, 0) - cov(1, 0) + 1;
- for ( i = 0; i < m; ++ i )
- {
- normData->InsertNextValue( cov( i, i ) );
-@@ -657,8 +657,8 @@ void vtkPCAStatistics::Derive( vtkMultiB
- continue;
- }
- vtkIdType m = reqModel->GetNumberOfColumns() - 2;
-- ap::real_2d_array cov;
-- cov.setbounds( 0, m - 1, 0, m - 1 );
-+ alglib::real_2d_array cov;
-+ cov.setcontent( m - 1, m - 1, 0 );
- // Fill the cov array with values from the vtkTable
- vtkIdType i, j;
- for ( j = 2; j < 2 + m; ++ j )
-@@ -695,9 +695,9 @@ void vtkPCAStatistics::Derive( vtkMultiB
- // do nothing
- break;
- }
-- ap::real_2d_array u;
-- ap::real_1d_array s;
-- ap::real_2d_array vt;
-+ alglib::real_2d_array u;
-+ alglib::real_1d_array s;
-+ alglib::real_2d_array vt;
- // Now that we have the covariance matrix, compute the SVD.
- // Note that vt is not computed since the VtNeeded parameter is 0.
- bool status = rmatrixsvd( cov, m, m, 2, 0, 2, s, u, vt );
-Index: vtk6-6.1.0+dfsg/ThirdParty/alglib/CMakeLists.txt
-===================================================================
---- vtk6-6.1.0+dfsg.orig/ThirdParty/alglib/CMakeLists.txt
-+++ vtk6-6.1.0+dfsg/ThirdParty/alglib/CMakeLists.txt
-@@ -1,9 +1,12 @@
- project( alglib )
-
- set(vtkalglib_THIRD_PARTY 1)
--set(vtkalglib_LIBRARIES vtkalglib)
-+set(vtkalglib_LIBRARIES alglib)
- vtk_module_export_info()
-
-+return()
-+
-+
- set( ALGLIB_SRCS
- ap.cpp
- bdsvd.cpp
diff --git a/debian/patches/use_system_xdmf.patch b/debian/patches/use_system_xdmf.patch
deleted file mode 100644
index afce4c7..0000000
--- a/debian/patches/use_system_xdmf.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Description: Use system xdmf
-Author: Anton Gladky <gladk at debian.org>
-Bug-Debian: http://bugs.debian.org/750182
-Last-Update: 2014-06-02
-
-Index: vtk6-6.1.0+dfsg/ThirdParty/xdmf2/CMakeLists.txt
-===================================================================
---- vtk6-6.1.0+dfsg.orig/ThirdParty/xdmf2/CMakeLists.txt
-+++ vtk6-6.1.0+dfsg/ThirdParty/xdmf2/CMakeLists.txt
-@@ -1,44 +1,7 @@
- vtk_module_third_party(xdmf2
-- LIBRARIES vtkxdmf2
-+ LIBRARIES Xdmf
- INCLUDE_DIRS
- ${CMAKE_CURRENT_SOURCE_DIR}/vtkxdmf2/libsrc
- ${CMAKE_CURRENT_BINARY_DIR}/vtkxdmf2/libsrc
- NO_ADD_SUBDIRECTORY
- )
--
--if(VTK_USE_SYSTEM_XDMF2)
-- return()
--endif()
--
--#########################################################################
--# Set Xdmf build environment options the way VTK wants them
--
--# build options
--option(VTK_XDMF_USE_MPI "Build Xdmf with MPI" OFF)
--mark_as_advanced(VTK_XDMF_USE_MPI)
--set (XDMF_BUILD_MPI ${VTK_XDMF_USE_MPI})
--
--# wrapping
--# VTK doesn't wrap libxdmf itself (either with vtk's wrapping or swig)
--set(XDMF_WRAP_TCL OFF CACHE INTERNAL "")
--set(XDMF_WRAP_PYTHON OFF CACHE INTERNAL "")
--set(XDMF_WRAP_PYTHON_INSTALL_DIR ${VTK_INSTALL_LIBRARY_DIR}/site-packages/Xdmf)
--set(XDMF_WRAP_CSHARP OFF CACHE INTERNAL "")
--set(XDMF_REGENERATE_WRAPPERS OFF CACHE INTERNAL "")
--set(XDMF_REGENERATE_YACCLEX OFF CACHE INTERNAL "")
--
--# packaging
--set(XDMF_INSTALL_LIB_DIR ${VTK_INSTALL_LIBRARY_DIR})
--set(XDMF_INSTALL_BIN_DIR ${VTK_INSTALL_RUNTIME_DIR})
--set(XDMF_INSTALL_INCLUDE_DIR "${VTK_INSTALL_INCLUDE_DIR}/vtkxdmf2")
--set(XDMF_INSTALL_EXPORT_NAME ${VTK_INSTALL_EXPORT_NAME})
--set(XDMF_INSTALL_NO_DEVELOPMENT ${VTK_INSTALL_NO_DEVELOPMENT})
--set(XDMF_INSTALL_NO_RUNTIME ${VTK_INSTALL_NO_RUNTIME})
--
--vtk_module_export_info()
--
--#now configure the libxdmf build per the above settings
--set(XDMF_BUILT_INVTK 1)
--add_subdirectory(vtkxdmf2)
--
--vtk_target(vtkxdmf2 NO_INSTALL)
-Index: vtk6-6.1.0+dfsg/ThirdParty/xdmf2/vtk_xdmf2.h.in
-===================================================================
---- vtk6-6.1.0+dfsg.orig/ThirdParty/xdmf2/vtk_xdmf2.h.in
-+++ vtk6-6.1.0+dfsg/ThirdParty/xdmf2/vtk_xdmf2.h.in
-@@ -15,5 +15,6 @@
- #ifndef __vtk_xdmf2_h
- #define __vtk_xdmf2_h
-
-+# include <Xdmf.h>
-
- #endif
diff --git a/debian/patches/vtkTclWrapper.patch b/debian/patches/vtkTclWrapper.patch
deleted file mode 100644
index 14516ee..0000000
--- a/debian/patches/vtkTclWrapper.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/CMake/vtkTclWrapping.cmake
-+++ b/CMake/vtkTclWrapping.cmake
-@@ -46,6 +46,11 @@
- foreach(dep ${${vtk-module}_LINK_DEPENDS})
- if(NOT "${vtk-module}" STREQUAL "${dep}")
- if(NOT ${dep}_EXCLUDE_FROM_WRAPPING)
-+ if("${${dep}_TCL_NAME}" STREQUAL "")
-+ #message(STATUS "Tcl libdepends for " ${vtk-module} " APPEND extra_links " ${dep} "->" ${${dep}_TCL_NAME}TCL)
-+ #set(${dep}_TCL_NAME "${dep}")
-+ vtk_module(${dep})
-+ endif()
- list(APPEND extra_links ${${dep}_TCL_NAME}TCL)
- endif()
- endif()
diff --git a/debian/patches/vtkWrapJava.patch b/debian/patches/vtkWrapJava.patch
deleted file mode 100644
index 77292c9..0000000
--- a/debian/patches/vtkWrapJava.patch
+++ /dev/null
@@ -1,228 +0,0 @@
---- a/Wrapping/Tools/vtkWrapJava.c
-+++ b/Wrapping/Tools/vtkWrapJava.c
-@@ -1251,8 +1251,31 @@
-
- for (i = 0; i < data->NumberOfSuperClasses; i++)
- {
-+ /* try to find if data->SuperClasses[i] is a template */
-+ int template_class = 0;
-+ int l = strlen(data->SuperClasses[i]);
-+ char * real_superclass = (char*) malloc(l+1);
-+ memcpy(real_superclass, data->SuperClasses[i], l+1);
-+
-+ int c=0;
-+ for (c=0; c<l; c++)
-+ {
-+ char p = data->SuperClasses[i][c];
-+ if (p == '<' || p == '>'){
-+ real_superclass[c] = '_';
-+ template_class = 1;
-+ }
-+ if (p == ',' || p == ' ')
-+ real_superclass[c] = '_';
-+ }
-+
-+ /* if a template class is detected add a typedef */
-+ if (template_class)
-+ fprintf(fp,"typedef %s %s;\n",
-+ data->SuperClasses[i], real_superclass);
-+
- fprintf(fp,"extern \"C\" JNIEXPORT void* %s_Typecast(void *op,char *dType);\n",
-- data->SuperClasses[i]);
-+ real_superclass);
- }
-
- fprintf(fp,"\nextern \"C\" JNIEXPORT void* %s_Typecast(void *me,char *dType)\n{\n",data->Name);
-@@ -1264,8 +1287,22 @@
- /* check our superclasses */
- for (i = 0; i < data->NumberOfSuperClasses; i++)
- {
-+ int l = strlen(data->SuperClasses[i]);
-+ char * real_superclass = (char*) malloc(l+1);
-+ memcpy(real_superclass, data->SuperClasses[i], l+1);
-+
-+ int c=0;
-+ for (c=0; c<l; c++)
-+ {
-+ char p = data->SuperClasses[i][c];
-+ if (p == '<' || p == '>')
-+ real_superclass[c] = '_';
-+ if (p == ',' || p == ' ')
-+ real_superclass[c] = '_';
-+ }
-+
- fprintf(fp," if ((res= %s_Typecast(me,dType)) != NULL)",
-- data->SuperClasses[i]);
-+ real_superclass);
- fprintf(fp," { return res; }\n");
- }
- fprintf(fp," return NULL;\n");
---- a/Wrapping/Tools/vtkWrapTcl.c
-+++ b/Wrapping/Tools/vtkWrapTcl.c
-@@ -1115,7 +1115,30 @@
-
- for (i = 0; i < data->NumberOfSuperClasses; i++)
- {
-- fprintf(fp,"int %sCppCommand(%s *op, Tcl_Interp *interp,\n int argc, char *argv[]);\n",data->SuperClasses[i],data->SuperClasses[i]);
-+ /* try to find if data->SuperClasses[i] is a template */
-+ int template_class = 0;
-+ int l = strlen(data->SuperClasses[i]);
-+ char * real_superclass = (char*) malloc(l+1);
-+ memcpy(real_superclass, data->SuperClasses[i], l+1);
-+
-+ int c=0;
-+ for (c=0; c<l; c++)
-+ {
-+ char p = data->SuperClasses[i][c];
-+ if (p == '<' || p == '>'){
-+ real_superclass[c] = '_';
-+ template_class = 1;
-+ }
-+ if (p == ',' || p == ' ')
-+ real_superclass[c] = '_';
-+ }
-+
-+ /* if a template class is detected add a typedef */
-+ if (template_class)
-+ fprintf(fp,"typedef %s %s;\n",
-+ data->SuperClasses[i], real_superclass);
-+
-+ fprintf(fp,"int %sCppCommand(%s *op, Tcl_Interp *interp,\n int argc, char *argv[]);\n",real_superclass,real_superclass);
- }
- fprintf(fp,"int VTKTCL_EXPORT %sCppCommand(%s *op, Tcl_Interp *interp,\n int argc, char *argv[]);\n",data->Name,data->Name);
- fprintf(fp,"\nint %sCommand(ClientData cd, Tcl_Interp *interp,\n int argc, char *argv[])\n{\n",data->Name);
-@@ -1156,8 +1179,25 @@
- /* check our superclasses */
- for (i = 0; i < data->NumberOfSuperClasses; i++)
- {
-+ /* try to find if data->SuperClasses[i] is a template */
-+ int template_class = 0;
-+ int l = strlen(data->SuperClasses[i]);
-+ char * real_superclass = (char*) malloc(l+1);
-+ memcpy(real_superclass, data->SuperClasses[i], l+1);
-+
-+ int c=0;
-+ for (c=0; c<l; c++)
-+ {
-+ char p = data->SuperClasses[i][c];
-+ if (p == '<' || p == '>'){
-+ real_superclass[c] = '_';
-+ template_class = 1;
-+ }
-+ if (p == ',' || p == ' ')
-+ real_superclass[c] = '_';
-+ }
- fprintf(fp," if (%sCppCommand(static_cast<%s *>(op),interp,argc,argv) == TCL_OK)\n {\n",
-- data->SuperClasses[i],data->SuperClasses[i]);
-+ real_superclass,data->SuperClasses[i]);
- fprintf(fp," return TCL_OK;\n }\n");
- }
- fprintf(fp," }\n return TCL_ERROR;\n }\n\n");
-@@ -1191,8 +1231,25 @@
- /* recurse up the tree */
- for (i = 0; i < data->NumberOfSuperClasses; i++)
- {
-+ /* try to find if data->SuperClasses[i] is a template */
-+ int template_class = 0;
-+ int l = strlen(data->SuperClasses[i]);
-+ char * real_superclass = (char*) malloc(l+1);
-+ memcpy(real_superclass, data->SuperClasses[i], l+1);
-+
-+ int c=0;
-+ for (c=0; c<l; c++)
-+ {
-+ char p = data->SuperClasses[i][c];
-+ if (p == '<' || p == '>'){
-+ real_superclass[c] = '_';
-+ template_class = 1;
-+ }
-+ if (p == ',' || p == ' ')
-+ real_superclass[c] = '_';
-+ }
- fprintf(fp," %sCppCommand(op,interp,argc,argv);\n",
-- data->SuperClasses[i]);
-+ real_superclass);
- }
- /* now list our methods */
- fprintf(fp," Tcl_AppendResult(interp,\"Methods from %s:\\n\",NULL);\n",data->Name);
-@@ -1256,8 +1313,25 @@
- /* recurse up the tree */
- for (i = 0; i < data->NumberOfSuperClasses; i++)
- {
-+ /* try to find if data->SuperClasses[i] is a template */
-+ int template_class = 0;
-+ int l = strlen(data->SuperClasses[i]);
-+ char * real_superclass = (char*) malloc(l+1);
-+ memcpy(real_superclass, data->SuperClasses[i], l+1);
-+
-+ int c=0;
-+ for (c=0; c<l; c++)
-+ {
-+ char p = data->SuperClasses[i][c];
-+ if (p == '<' || p == '>'){
-+ real_superclass[c] = '_';
-+ template_class = 1;
-+ }
-+ if (p == ',' || p == ' ')
-+ real_superclass[c] = '_';
-+ }
- fprintf(fp," %sCppCommand(op,interp,argc,argv);\n",
-- data->SuperClasses[i]);
-+ real_superclass);
- /* append the result to our string */
- fprintf(fp," Tcl_DStringGetResult ( interp, &dStringParent );\n" );
- fprintf(fp," Tcl_DStringAppend ( &dString, Tcl_DStringValue ( &dStringParent ), -1 );\n" );
-@@ -1290,8 +1364,25 @@
- /* recurse up the tree */
- for (i = 0; i < data->NumberOfSuperClasses; i++)
- {
-+ /* try to find if data->SuperClasses[i] is a template */
-+ int template_class = 0;
-+ int l = strlen(data->SuperClasses[i]);
-+ char * real_superclass = (char*) malloc(l+1);
-+ memcpy(real_superclass, data->SuperClasses[i], l+1);
-+
-+ int c=0;
-+ for (c=0; c<l; c++)
-+ {
-+ char p = data->SuperClasses[i][c];
-+ if (p == '<' || p == '>'){
-+ real_superclass[c] = '_';
-+ template_class = 1;
-+ }
-+ if (p == ',' || p == ' ')
-+ real_superclass[c] = '_';
-+ }
- fprintf(fp," SuperClassStatus = %sCppCommand(op,interp,argc,argv);\n",
-- data->SuperClasses[i]);
-+ real_superclass);
- fprintf(fp," if ( SuperClassStatus == TCL_OK ) { return TCL_OK; }\n" );
- }
- /* Now we handle it ourselves */
-@@ -1429,8 +1520,25 @@
- /* try superclasses */
- for (i = 0; i < data->NumberOfSuperClasses; i++)
- {
-+ /* try to find if data->SuperClasses[i] is a template */
-+ int template_class = 0;
-+ int l = strlen(data->SuperClasses[i]);
-+ char * real_superclass = (char*) malloc(l+1);
-+ memcpy(real_superclass, data->SuperClasses[i], l+1);
-+
-+ int c=0;
-+ for (c=0; c<l; c++)
-+ {
-+ char p = data->SuperClasses[i][c];
-+ if (p == '<' || p == '>'){
-+ real_superclass[c] = '_';
-+ template_class = 1;
-+ }
-+ if (p == ',' || p == ' ')
-+ real_superclass[c] = '_';
-+ }
- fprintf(fp,"\n if (%sCppCommand(static_cast<%s *>(op),interp,argc,argv) == TCL_OK)\n",
-- data->SuperClasses[i], data->SuperClasses[i]);
-+ real_superclass, data->SuperClasses[i]);
- fprintf(fp," {\n return TCL_OK;\n }\n");
- }
-
diff --git a/debian/patches/wxpython3.0.patch b/debian/patches/wxpython3.0.patch
deleted file mode 100644
index 1e69a50..0000000
--- a/debian/patches/wxpython3.0.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Description: Update for wxPython 3.0
- These changes should remain compatible with wxPython 2.8.
-Bug-Debian: https://bugs.debian.org/761414
-Forwarded: no
-Last-Update: 2014-09-13
-
---- vtk-5.10.1.orig/Wrapping/Python/vtk/wx/wxVTKRenderWindow.py
-+++ vtk-5.10.1/Wrapping/Python/vtk/wx/wxVTKRenderWindow.py
-@@ -19,7 +19,7 @@ Creation:
-
- wxVTKRenderWindow(parent, ID, stereo=0, [wx keywords]):
-
--You should create a wx.PySimpleApp() or some other wx**App
-+You should create a wx.App(False) or some other wx.App subclass
- before creating the window.
-
- ----------------------------------------
-@@ -190,10 +190,12 @@ class wxVTKRenderWindow(baseClass):
- # initialize the wx.Window
- if baseClass.__name__ == 'GLCanvas':
- # Set the doublebuffer attribute of the GL canvas.
-- baseClass.__init__(self, parent, ID, position, size, style,
-+ baseClass.__init__(self, parent, ID, pos=position, size=size,
-+ style=style,
- attribList=[wx.glcanvas.WX_GL_DOUBLEBUFFER])
- else:
-- baseClass.__init__(self, parent, ID, position, size, style)
-+ baseClass.__init__(self, parent, ID, pos=position, size=size,
-+ style=style)
-
- # create the RenderWindow and initialize it
- self._RenderWindow = vtk.vtkRenderWindow()
-@@ -735,7 +737,7 @@ def wxVTKRenderWindowConeExample():
- """Like it says, just a simple example.
- """
- # every wx app needs an app
-- app = wx.PySimpleApp()
-+ app = wx.App(False)
-
- # create the widget
- frame = wx.Frame(None, -1, "wxVTKRenderWindow", size=(400,400))
---- vtk-5.10.1.orig/Wrapping/Python/vtk/wx/wxVTKRenderWindowInteractor.py
-+++ vtk-5.10.1/Wrapping/Python/vtk/wx/wxVTKRenderWindowInteractor.py
-@@ -21,8 +21,8 @@ Creation:
-
- wxVTKRenderWindowInteractor(parent, ID, stereo=0, [wx keywords]):
-
-- You should create a wx.PySimpleApp() or some other wx**App before
-- creating the window.
-+ You should create a wx.App(False) or some other wx.App subclass
-+ before creating the window.
-
- Behaviour:
-
-@@ -171,11 +171,12 @@ class wxVTKRenderWindowInteractor(baseCl
- attribList.append(wx.glcanvas.WX_GL_STEREO)
-
- try:
-- baseClass.__init__(self, parent, ID, position, size, style,
-- attribList=attribList)
-+ baseClass.__init__(self, parent, ID, pos=position, size=size,
-+ style=style, attribList=attribList)
- except wx.PyAssertionError:
- # visual couldn't be allocated, so we go back to default
-- baseClass.__init__(self, parent, ID, position, size, style)
-+ baseClass.__init__(self, parent, ID, pos=position, size=size,
-+ style=style)
- if stereo:
- # and make sure everyone knows that the stereo
- # visual wasn't set.
-@@ -666,7 +667,7 @@ def wxVTKRenderWindowInteractorConeExamp
- """Like it says, just a simple example
- """
- # every wx app needs an app
-- app = wx.PySimpleApp()
-+ app = wx.App(False)
-
- # create the top-level frame, sizer and wxVTKRWI
- frame = wx.Frame(None, -1, "wxVTKRenderWindowInteractor", size=(400,400))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vtk6.git
More information about the debian-science-commits
mailing list