From af9afd6f49ee2fb5019cffc0bf4de7ad8c4ad79a Mon Sep 17 00:00:00 2001 From: Kwabena N Amponsah Date: Mon, 13 May 2024 08:41:29 +0000 Subject: [PATCH] #64 update vtk 8.1 patches --- scripts/install_vtk.sh | 47 +- scripts/patches/vtk/8.1/100_javac-heap.patch | 18 + .../vtk/8.1/101_java_install_path.patch | 21 + ...stall_doxygen_scripts_in_nodoc_build.patch | 147 +++++ .../vtk/8.1/108_Doxygen-use-mathjax.patch | 29 + .../vtk/8.1/109_java-jar-nonjavafiles.patch | 28 + scripts/patches/vtk/8.1/111_fix_perl.patch | 66 ++ .../patches/vtk/8.1/112_riscv_support.patch | 15 + .../113_vtk8_fix_python_equal.patch} | 0 .../vtk/8.1/20_soversion-sharedlib.patch | 25 + scripts/patches/vtk/8.1/30_matplotlib.patch | 14 + ...0de2b04ae1e100c229e592d6b9fa94f2915a.patch | 25 + ...9eb874b2b80a3fb21c739a96fa6f955ffb5e.patch | 23 + .../vtk/8.1/60_use_system_mpi4py.patch | 33 + .../vtk/8.1/60_vtk8_use_system_mpi4py.patch | 30 + .../70_vtk8_fix_ftbfs_gcc49.patch} | 0 scripts/patches/vtk/8.1/mysq8_my_bool.patch | 22 + .../patches/vtk/8.1/vtk8-gcc-11-exodus.patch | 22 + scripts/patches/vtk/8.2/100_javac-heap.patch | 18 + .../vtk/8.2/101_java_install_path.patch | 21 + ...stall_doxygen_scripts_in_nodoc_build.patch | 147 +++++ .../vtk/8.2/108_Doxygen-use-mathjax.patch | 29 + .../vtk/8.2/109_java-jar-nonjavafiles.patch | 28 + scripts/patches/vtk/8.2/110_python-371.patch | 16 + scripts/patches/vtk/8.2/111_fix_perl.patch | 66 ++ .../patches/vtk/8.2/112_riscv_support.patch | 15 + .../vtk/8.2/113_vtk8_fix_python_equal.patch | 14 + .../patches/vtk/8.2/115_support-gcc10.patch | 11 + .../vtk/8.2/20_soversion-sharedlib.patch | 25 + scripts/patches/vtk/8.2/30_matplotlib.patch | 14 + ...0de2b04ae1e100c229e592d6b9fa94f2915a.patch | 25 + ...9eb874b2b80a3fb21c739a96fa6f955ffb5e.patch | 23 + .../vtk/8.2/60_vtk8_use_system_mpi4py.patch | 30 + .../70_vtk8_fix_ftbfs_gcc49.patch} | 56 +- scripts/patches/vtk/8.2/mysq8_my_bool.patch | 22 + scripts/patches/vtk/8.2/vtk8.2.patch | 589 ------------------ scripts/patches/vtk/8.2/vtk8.2_patches.sh | 38 -- 37 files changed, 1089 insertions(+), 663 deletions(-) create mode 100644 scripts/patches/vtk/8.1/100_javac-heap.patch create mode 100644 scripts/patches/vtk/8.1/101_java_install_path.patch create mode 100644 scripts/patches/vtk/8.1/106_install_doxygen_scripts_in_nodoc_build.patch create mode 100644 scripts/patches/vtk/8.1/108_Doxygen-use-mathjax.patch create mode 100644 scripts/patches/vtk/8.1/109_java-jar-nonjavafiles.patch create mode 100644 scripts/patches/vtk/8.1/111_fix_perl.patch create mode 100644 scripts/patches/vtk/8.1/112_riscv_support.patch rename scripts/patches/vtk/{8.2/vtk8-113_fix_python_equal.patch => 8.1/113_vtk8_fix_python_equal.patch} (100%) create mode 100644 scripts/patches/vtk/8.1/20_soversion-sharedlib.patch create mode 100644 scripts/patches/vtk/8.1/30_matplotlib.patch create mode 100644 scripts/patches/vtk/8.1/3edc0de2b04ae1e100c229e592d6b9fa94f2915a.patch create mode 100644 scripts/patches/vtk/8.1/581d9eb874b2b80a3fb21c739a96fa6f955ffb5e.patch create mode 100644 scripts/patches/vtk/8.1/60_use_system_mpi4py.patch create mode 100644 scripts/patches/vtk/8.1/60_vtk8_use_system_mpi4py.patch rename scripts/patches/vtk/{8.2/vtk8-70_fix_ftbfs_gcc49.patch => 8.1/70_vtk8_fix_ftbfs_gcc49.patch} (100%) create mode 100644 scripts/patches/vtk/8.1/mysq8_my_bool.patch create mode 100644 scripts/patches/vtk/8.1/vtk8-gcc-11-exodus.patch create mode 100644 scripts/patches/vtk/8.2/100_javac-heap.patch create mode 100644 scripts/patches/vtk/8.2/101_java_install_path.patch create mode 100644 scripts/patches/vtk/8.2/106_install_doxygen_scripts_in_nodoc_build.patch create mode 100644 scripts/patches/vtk/8.2/108_Doxygen-use-mathjax.patch create mode 100644 scripts/patches/vtk/8.2/109_java-jar-nonjavafiles.patch create mode 100644 scripts/patches/vtk/8.2/110_python-371.patch create mode 100644 scripts/patches/vtk/8.2/111_fix_perl.patch create mode 100644 scripts/patches/vtk/8.2/112_riscv_support.patch create mode 100644 scripts/patches/vtk/8.2/113_vtk8_fix_python_equal.patch create mode 100644 scripts/patches/vtk/8.2/115_support-gcc10.patch create mode 100644 scripts/patches/vtk/8.2/20_soversion-sharedlib.patch create mode 100644 scripts/patches/vtk/8.2/30_matplotlib.patch create mode 100644 scripts/patches/vtk/8.2/3edc0de2b04ae1e100c229e592d6b9fa94f2915a.patch create mode 100644 scripts/patches/vtk/8.2/581d9eb874b2b80a3fb21c739a96fa6f955ffb5e.patch create mode 100644 scripts/patches/vtk/8.2/60_vtk8_use_system_mpi4py.patch rename scripts/patches/vtk/{8.1/70_fix_ftbfs_gcc49.patch => 8.2/70_vtk8_fix_ftbfs_gcc49.patch} (80%) create mode 100644 scripts/patches/vtk/8.2/mysq8_my_bool.patch delete mode 100644 scripts/patches/vtk/8.2/vtk8.2.patch delete mode 100755 scripts/patches/vtk/8.2/vtk8.2_patches.sh diff --git a/scripts/install_vtk.sh b/scripts/install_vtk.sh index 1f462b5..4c40b95 100755 --- a/scripts/install_vtk.sh +++ b/scripts/install_vtk.sh @@ -101,7 +101,7 @@ mkdir -p ${src_dir} wget -nc https://github.com/Kitware/VTK/archive/v${version}.tar.gz tar -xzf v${version}.tar.gz -C ${src_dir} --strip-components=1 -# VTK 6.3.x patches: https://sources.debian.org/patches/vtk6/6.3.0%2Bdfsg2-8.1/ +# VTK 6.3.x patches: https://sources.debian.org/patches/vtk6/ if [[ ${major} -eq 6 && ${minor} -eq 3 ]]; then # VTK == 6.3.x cd ${src_dir} patch -t -p1 < ${script_dir}/patches/vtk/6.3/10_allpatches.patch @@ -127,7 +127,7 @@ if [[ ${major} -eq 6 && ${minor} -eq 3 ]]; then # VTK == 6.3.x patch -t -p1 < ${script_dir}/patches/vtk/6.3/vtk6-gcc11-support.patch fi -# VTK 7.1.x patches: https://sources.debian.org/patches/vtk7/7.1.1%2Bdfsg2-10.2/ +# VTK 7.1.x patches: https://sources.debian.org/patches/vtk7/ if [[ ${major} -eq 7 && ${minor} -eq 1 ]]; then # VTK == 7.1.x cd ${src_dir} patch -t -p1 < ${script_dir}/patches/vtk/7.1/10_allpatches.patch @@ -159,16 +159,50 @@ fi # VTK 8.1.x patches if [[ ${major} -eq 8 && ${minor} -eq 1 ]]; then # VTK == 8.1.x cd ${src_dir} + patch -t -p1 < ${script_dir}/patches/vtk/8.1/20_soversion-sharedlib.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.1/30_matplotlib.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.1/60_use_system_mpi4py.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.1/70_vtk8_fix_ftbfs_gcc49.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.1/100_javac-heap.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.1/101_java_install_path.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.1/106_install_doxygen_scripts_in_nodoc_build.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.1/108_Doxygen-use-mathjax.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.1/109_java-jar-nonjavafiles.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.1/110_python-371.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.1/111_fix_perl.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.1/112_riscv_support.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.1/113_vtk8_fix_python_equal.patch patch -t -p1 < ${script_dir}/patches/vtk/8.1/115_support-gcc10.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.1/mysq8_my_bool.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.1/3edc0de2b04ae1e100c229e592d6b9fa94f2915a.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.1/581d9eb874b2b80a3fb21c739a96fa6f955ffb5e.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.1/vtk8-gcc-11-exodus.patch fi # VTK 8.2.x patches if [[ ${major} -eq 8 && ${minor} -eq 2 ]]; then # VTK == 8.2.x cd ${src_dir} - patch -t -p1 < ${script_dir}/patches/vtk/8.2/vtk8.2.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.2/20_soversion-sharedlib.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.2/30_matplotlib.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.2/60_vtk8_use_system_mpi4py.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.2/70_vtk8_fix_ftbfs_gcc49.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.2/100_javac-heap.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.2/101_java_install_path.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.2/106_install_doxygen_scripts_in_nodoc_build.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.2/108_Doxygen-use-mathjax.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.2/109_java-jar-nonjavafiles.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.2/110_python-371.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.2/111_fix_perl.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.2/112_riscv_support.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.2/113_vtk8_fix_python_equal.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.2/115_support-gcc10.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.2/mysq8_my_bool.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.2/3edc0de2b04ae1e100c229e592d6b9fa94f2915a.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.2/581d9eb874b2b80a3fb21c739a96fa6f955ffb5e.patch + patch -t -p1 < ${script_dir}/patches/vtk/8.2/vtk8-gcc-11-exodus.patch fi -# VTK 9.0.x patches: https://sources.debian.org/patches/vtk9/9.0.1%2Bdfsg1-8/ +# VTK 9.0.x patches: https://sources.debian.org/patches/vtk9/ if [[ ${major} -eq 9 && ${minor} -eq 0 ]]; then # VTK == 9.0.x cd ${src_dir} patch -t -p1 < ${script_dir}/patches/vtk/9.0/50_fix_python-modules_path.patch @@ -176,7 +210,7 @@ if [[ ${major} -eq 9 && ${minor} -eq 0 ]]; then # VTK == 9.0.x patch -t -p1 < ${script_dir}/patches/vtk/9.0/fix-limits.patch fi -# VTK 9.1.x patches: https://sources.debian.org/patches/vtk9/9.1.0%2Breally9.1.0%2Bdfsg2-7.1/ +# VTK 9.1.x patches: https://sources.debian.org/patches/vtk9/ if [[ ${major} -eq 9 && ${minor} -eq 1 ]]; then # VTK == 9.1.x cd ${src_dir} patch -t -p1 < ${script_dir}/patches/vtk/9.1/gcc-13.patch @@ -203,9 +237,6 @@ cmake \ -DBUILD_TESTING=OFF \ -DBUILD_DOCUMENTATION=OFF \ -DVTK_INSTALL_NO_DOCUMENTATION=ON \ - -DVTK_WRAP_PYTHON=ON \ - -DVTK_ENABLE_VTKPYTHON=OFF \ - -DVTK_PYTHON_VERSION=3 \ ${src_dir} && \ make -j ${parallel} && \ make install diff --git a/scripts/patches/vtk/8.1/100_javac-heap.patch b/scripts/patches/vtk/8.1/100_javac-heap.patch new file mode 100644 index 0000000..a6e8a7f --- /dev/null +++ b/scripts/patches/vtk/8.1/100_javac-heap.patch @@ -0,0 +1,18 @@ +Description: set JVM max memory to 1024m. +Author: Matthias Klose +Acked-By: Anton Gladky +Last-Update: 2016-02-12 + +Index: VTK-6.3.0/Wrapping/Java/CMakeLists.txt +=================================================================== +--- VTK-6.3.0.orig/Wrapping/Java/CMakeLists.txt ++++ VTK-6.3.0/Wrapping/Java/CMakeLists.txt +@@ -80,6 +80,8 @@ if(APPLE) + set(JAVAC_OPTIONS -J-Xmx512m) + endif() + ++set(JAVAC_OPTIONS -J-Xmx1024m) ++ + get_property(java_modules GLOBAL PROPERTY VTK_JAVA_WRAPPED) + foreach(module IN LISTS java_modules) + if(NOT ${module}_EXCLUDE_FROM_WRAPPING) diff --git a/scripts/patches/vtk/8.1/101_java_install_path.patch b/scripts/patches/vtk/8.1/101_java_install_path.patch new file mode 100644 index 0000000..18af20a --- /dev/null +++ b/scripts/patches/vtk/8.1/101_java_install_path.patch @@ -0,0 +1,21 @@ +Description: Install Java modules in the correct path + This patch corrects the installation of the native Java modules + to go to the path given by the Debian Java Policy. This helps + to later use the simple install file to get them to the right + location in the package. +Author: Gert Wollny +Description: Delete java files before building jar +--- a/Wrapping/Java/CMakeLists.txt ++++ b/Wrapping/Java/CMakeLists.txt +@@ -259,7 +259,7 @@ + if(VTK_JAVA_SWT_COMPONENT) + set(VTK_JAVA_SAMPLE_DEPENDENCIES ${VTK_JAVA_SAMPLE_DEPENDENCIES} + rendering/SwtConeRendering +- ) ++q ) + endif() + endif() + +@@ -358,11 +358,10 @@ + COMMENT "Compiling Java Classes" + ) + +-# Create the JAR file containing all compiled classes and ++ + add_custom_command( +- COMMAND ${JAVA_ARCHIVE} -cvf "${VTK_JAR_PATH}/vtk.jar" +- -C ${VTK_BINARY_DIR}/java +- vtk ++ COMMAND cd ${VTK_BINARY_DIR}/java && find . -name "*.class" -print | sort -u > classes.list ++ COMMAND cd ${VTK_BINARY_DIR}/java && ${JAVA_ARCHIVE} -cvf "${VTK_JAR_PATH}/vtk.jar" @${VTK_BINARY_DIR}/java/classes.list + DEPENDS ${VTK_BINARY_DIR}/java/javac_stamp.txt ${JAVA_LIBRARIES} + OUTPUT ${VTK_JAR_PATH}/vtk.jar + COMMENT "Java Archive" diff --git a/scripts/patches/vtk/8.1/111_fix_perl.patch b/scripts/patches/vtk/8.1/111_fix_perl.patch new file mode 100644 index 0000000..c79c07a --- /dev/null +++ b/scripts/patches/vtk/8.1/111_fix_perl.patch @@ -0,0 +1,66 @@ +Author: Gert Wollny +Description: Fix the perl shebangs (lintian) +--- a/Utilities/Doxygen/doc_class2example.pl ++++ b/Utilities/Doxygen/doc_class2example.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # Time-stamp: <2004-06-09 11:12:38 barre> + # + # Build cross-references between classes and examples +--- a/Utilities/Doxygen/doc_cleanhtml.pl ++++ b/Utilities/Doxygen/doc_cleanhtml.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # Time-stamp: <2002-10-25 20:17:59 barre> + # + # Clean the HTML generated by Doxygen to remove some layout quicks +--- a/Utilities/Doxygen/doc_codematch.pl ++++ b/Utilities/Doxygen/doc_codematch.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # Time-stamp: <2002-01-18 16:17:26 barre> + # + # Summary ? +--- a/Utilities/Doxygen/doc_contributors.pl ++++ b/Utilities/Doxygen/doc_contributors.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # Time-stamp: <2002-11-01 15:33:04 barre> + # + # Get author and contributors. +--- a/Utilities/Doxygen/doc_header2doxygen.pl ++++ b/Utilities/Doxygen/doc_header2doxygen.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # Time-stamp: <2011-01-16 21:15:53 barre> + # + # Convert VTK headers to doxygen format +--- a/Utilities/Doxygen/doc_index.pl ++++ b/Utilities/Doxygen/doc_index.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # Time-stamp: <2001-11-21 17:40:48 barre> + # + # Build full-text index +--- a/Utilities/Doxygen/doc_rmpath.pl ++++ b/Utilities/Doxygen/doc_rmpath.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # Time-stamp: <2001-10-05 11:49:40 barre> + # + # Remove path to intermediate Doxygen dir from html doc +--- a/Utilities/Doxygen/doc_version.pl ++++ b/Utilities/Doxygen/doc_version.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # Time-stamp: <2006-11-15 13:25:02 barre> + # + # Extract VTK version and add it to documentation diff --git a/scripts/patches/vtk/8.1/112_riscv_support.patch b/scripts/patches/vtk/8.1/112_riscv_support.patch new file mode 100644 index 0000000..6b9f4bd --- /dev/null +++ b/scripts/patches/vtk/8.1/112_riscv_support.patch @@ -0,0 +1,15 @@ +Changes taken from https://gitlab.kitware.com/vtk/vtk/blob/master/Utilities/KWIML/vtkkwiml/include/kwiml/abi.h + +--- vtk7-7.1.1+dfsg1.orig/Utilities/KWIML/vtkkwiml/include/kwiml/abi.h ++++ vtk7-7.1.1+dfsg1/Utilities/KWIML/vtkkwiml/include/kwiml/abi.h +@@ -467,6 +467,10 @@ suppression macro KWIML_ABI_NO_VERIFY wa + #elif defined(__XTENSA_EL__) + # define KWIML_ABI_ENDIAN_ID KWIML_ABI_ENDIAN_ID_LITTLE + ++/* RISC-V */ ++#elif defined(__riscv) || defined(__riscv__) ++# define KWIML_ABI_ENDIAN_ID KWIML_ABI_ENDIAN_ID_LITTLE ++ + /* Unknown CPU */ + #elif !defined(KWIML_ABI_NO_ERROR_ENDIAN) + # error "Byte order of target CPU unknown." diff --git a/scripts/patches/vtk/8.2/vtk8-113_fix_python_equal.patch b/scripts/patches/vtk/8.1/113_vtk8_fix_python_equal.patch similarity index 100% rename from scripts/patches/vtk/8.2/vtk8-113_fix_python_equal.patch rename to scripts/patches/vtk/8.1/113_vtk8_fix_python_equal.patch diff --git a/scripts/patches/vtk/8.1/20_soversion-sharedlib.patch b/scripts/patches/vtk/8.1/20_soversion-sharedlib.patch new file mode 100644 index 0000000..dfa6165 --- /dev/null +++ b/scripts/patches/vtk/8.1/20_soversion-sharedlib.patch @@ -0,0 +1,25 @@ +Description: _soversion sharedlib +--- 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) +- set_property(TARGET ${_name} PROPERTY VERSION 1) +- set_property(TARGET ${_name} PROPERTY SOVERSION 1) ++ set_property(TARGET ${_name} PROPERTY VERSION ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION}) ++ set_property(TARGET ${_name} PROPERTY SOVERSION ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}) + endif() + if("${_name}" MATCHES "^[Vv][Tt][Kk]") + set(_vtk "") +--- 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 +- vtkRenderingPythonTkWidgets-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}) ++ vtkRenderingPythonTkWidgets) + + set(Module_PYTHON_LIBS ${VTK_TK_LIBRARIES}) + if(VTK_USE_X) diff --git a/scripts/patches/vtk/8.1/30_matplotlib.patch b/scripts/patches/vtk/8.1/30_matplotlib.patch new file mode 100644 index 0000000..2628a9d --- /dev/null +++ b/scripts/patches/vtk/8.1/30_matplotlib.patch @@ -0,0 +1,14 @@ +Description: _matplotlib +--- 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; ++ }; + + //@{ + /** diff --git a/scripts/patches/vtk/8.1/3edc0de2b04ae1e100c229e592d6b9fa94f2915a.patch b/scripts/patches/vtk/8.1/3edc0de2b04ae1e100c229e592d6b9fa94f2915a.patch new file mode 100644 index 0000000..87f1e8d --- /dev/null +++ b/scripts/patches/vtk/8.1/3edc0de2b04ae1e100c229e592d6b9fa94f2915a.patch @@ -0,0 +1,25 @@ +From dae1718d50bec1b40b860280acafbdd94fc4cd5d Mon Sep 17 00:00:00 2001 +From: Ben Boeckel +Date: Sat, 21 Nov 2020 13:37:34 -0500 +Subject: [PATCH] vtkFreeTypeTools: avoid using an internal macro + +This macro has been removed upstream as it was always intended to be +private. +--- + Rendering/FreeType/vtkFreeTypeTools.cxx | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +Index: vtk7/Rendering/FreeType/vtkFreeTypeTools.cxx +=================================================================== +--- vtk7.orig/Rendering/FreeType/vtkFreeTypeTools.cxx ++++ vtk7/Rendering/FreeType/vtkFreeTypeTools.cxx +@@ -273,8 +273,7 @@ + } + + //---------------------------------------------------------------------------- +-FT_CALLBACK_DEF(FT_Error) +-vtkFreeTypeToolsFaceRequester(FTC_FaceID face_id, ++static FT_Error vtkFreeTypeToolsFaceRequester(FTC_FaceID face_id, + FT_Library lib, + FT_Pointer request_data, + FT_Face* face) diff --git a/scripts/patches/vtk/8.1/581d9eb874b2b80a3fb21c739a96fa6f955ffb5e.patch b/scripts/patches/vtk/8.1/581d9eb874b2b80a3fb21c739a96fa6f955ffb5e.patch new file mode 100644 index 0000000..8267266 --- /dev/null +++ b/scripts/patches/vtk/8.1/581d9eb874b2b80a3fb21c739a96fa6f955ffb5e.patch @@ -0,0 +1,23 @@ +From 31e8e4ebeb3152f7cfdb3f14f24f7e5d31a4f8b5 Mon Sep 17 00:00:00 2001 +From: Ben Boeckel +Date: Sun, 22 Nov 2020 20:04:19 -0500 +Subject: [PATCH] vtkFontConfigFreeTypeTools: remove last FT_CALLBACK_DEF usage + +--- + Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx b/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx +index 5c1908cf24b..818ff058bb9 100644 +--- a/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx ++++ b/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx +@@ -31,8 +31,7 @@ vtkStandardNewMacro(vtkFontConfigFreeTypeTools); + namespace + { + // The FreeType face requester callback: +-FT_CALLBACK_DEF(FT_Error) +-vtkFontConfigFreeTypeToolsFaceRequester(FTC_FaceID face_id, ++static FT_Error vtkFontConfigFreeTypeToolsFaceRequester(FTC_FaceID face_id, + FT_Library lib, + FT_Pointer request_data, + FT_Face* face) diff --git a/scripts/patches/vtk/8.1/60_use_system_mpi4py.patch b/scripts/patches/vtk/8.1/60_use_system_mpi4py.patch new file mode 100644 index 0000000..a7163eb --- /dev/null +++ b/scripts/patches/vtk/8.1/60_use_system_mpi4py.patch @@ -0,0 +1,33 @@ +Description: use system mpi4py +Author: Anton Gladky +Last-Update: 2015-03-24 + +--- a/Parallel/MPI4Py/CMakeLists.txt ++++ b/Parallel/MPI4Py/CMakeLists.txt +@@ -18,7 +18,7 @@ if(VTK_USE_SYSTEM_MPI4PY) + mark_as_advanced(MPI4PY_INCLUDE_DIR) + endif() + else() +- set(MPI4PY_INCLUDE_DIR "${vtkmpi4py_SOURCE_DIR}/vtkmpi4py/src/include") ++ set(MPI4PY_INCLUDE_DIR "/usr/include") + endif() + include_directories("${MPI4PY_INCLUDE_DIR}") + +--- a/Parallel/MPI4Py/module.cmake ++++ b/Parallel/MPI4Py/module.cmake +@@ -5,7 +5,6 @@ if (VTK_WRAP_PYTHON) + DEPENDS + vtkParallelMPI + COMPILE_DEPENDS +- vtkmpi4py + vtkPython + OPTIONAL_PYTHON_LINK + EXCLUDE_FROM_TCL_WRAPPING +@@ -18,4 +17,5 @@ if (VTK_WRAP_PYTHON) + PRIVATE_DEPENDS + vtkParallelMPI + ) +-endif () +\ No newline at end of file ++endif () ++ diff --git a/scripts/patches/vtk/8.1/60_vtk8_use_system_mpi4py.patch b/scripts/patches/vtk/8.1/60_vtk8_use_system_mpi4py.patch new file mode 100644 index 0000000..d22b013 --- /dev/null +++ b/scripts/patches/vtk/8.1/60_vtk8_use_system_mpi4py.patch @@ -0,0 +1,30 @@ +Description: use system mpi4py +Author: Anton Gladky +Last-Update: 2015-03-24 + +--- a/Parallel/MPI4Py/CMakeLists.txt ++++ b/Parallel/MPI4Py/CMakeLists.txt +@@ -18,7 +18,7 @@ + mark_as_advanced(MPI4PY_INCLUDE_DIR) + endif() + else() +- set(MPI4PY_INCLUDE_DIR "${vtkmpi4py_SOURCE_DIR}/vtkmpi4py/src/include") ++ set(MPI4PY_INCLUDE_DIR "/usr/include") + endif() + include_directories("${MPI4PY_INCLUDE_DIR}") + +--- a/Parallel/MPI4Py/module.cmake ++++ b/Parallel/MPI4Py/module.cmake +@@ -5,7 +5,6 @@ if (VTK_WRAP_PYTHON) + DEPENDS + vtkParallelMPI + COMPILE_DEPENDS +- vtkmpi4py + vtkPython + OPTIONAL_PYTHON_LINK + EXCLUDE_FROM_JAVA_WRAPPING +@@ -18,3 +17,4 @@ if (VTK_WRAP_PYTHON) + vtkParallelMPI + ) + endif () ++ diff --git a/scripts/patches/vtk/8.2/vtk8-70_fix_ftbfs_gcc49.patch b/scripts/patches/vtk/8.1/70_vtk8_fix_ftbfs_gcc49.patch similarity index 100% rename from scripts/patches/vtk/8.2/vtk8-70_fix_ftbfs_gcc49.patch rename to scripts/patches/vtk/8.1/70_vtk8_fix_ftbfs_gcc49.patch diff --git a/scripts/patches/vtk/8.1/mysq8_my_bool.patch b/scripts/patches/vtk/8.1/mysq8_my_bool.patch new file mode 100644 index 0000000..0547317 --- /dev/null +++ b/scripts/patches/vtk/8.1/mysq8_my_bool.patch @@ -0,0 +1,22 @@ +Description: Reintroduce my_bool to fix build with MySQL 8 + (patch inspired from the one in cppdb 0.3.1+dfsg-8ubuntu2) +Author: Gianfranco Costamagna , Andreas Hasenack +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1863026 +Forwarded: no +Last-Update: 2020-12-15 + +diff --git a/IO/MySQL/vtkMySQLDatabasePrivate.h b/IO/MySQL/vtkMySQLDatabasePrivate.h +index 4deb747..8e0c9e3 100644 +--- a/IO/MySQL/vtkMySQLDatabasePrivate.h ++++ b/IO/MySQL/vtkMySQLDatabasePrivate.h +@@ -7,6 +7,10 @@ + + #include "vtkIOMySQLModule.h" // For export macro + #include // needed for MYSQL typedefs ++#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID) && \ ++ MYSQL_VERSION_ID >= 80001 && MYSQL_VERSION_ID != 80002 ++typedef bool my_bool; ++#endif + + class VTKIOMYSQL_EXPORT vtkMySQLDatabasePrivate + { diff --git a/scripts/patches/vtk/8.1/vtk8-gcc-11-exodus.patch b/scripts/patches/vtk/8.1/vtk8-gcc-11-exodus.patch new file mode 100644 index 0000000..06e0c03 --- /dev/null +++ b/scripts/patches/vtk/8.1/vtk8-gcc-11-exodus.patch @@ -0,0 +1,22 @@ +diff --git a/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c b/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c +index 8d5d6734f0ad2df04393cf7909ef2c342785e1ac..ef439618dae7b90fdf1057f7051c6a9f0bf1f72d 100644 +--- a/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c ++++ b/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c +@@ -216,5 +216,5 @@ int ex_create_par_int(const char *path, int cmode, int *comp_ws, int *io_ws, MPI + * Prevent warning in some versions of ranlib(1) because the object + * file has no symbols. + */ +-const char exodus_unused_symbol_dummy_1; ++const char exodus_unused_symbol_dummy_ex_create_par; + #endif +diff --git a/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c b/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c +index b2faa22c29489446030f537bb6b3a26feb86c50b..9df4818767d07a3020f1363fe2a8b9f2fcac634a 100644 +--- a/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c ++++ b/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c +@@ -459,5 +459,5 @@ int ex_open_par_int(const char *path, int mode, int *comp_ws, int *io_ws, float + * Prevent warning in some versions of ranlib(1) because the object + * file has no symbols. + */ +-const char exodus_unused_symbol_dummy_1; ++const char exodus_unused_symbol_dummy_ex_open_par; + #endif diff --git a/scripts/patches/vtk/8.2/100_javac-heap.patch b/scripts/patches/vtk/8.2/100_javac-heap.patch new file mode 100644 index 0000000..a6e8a7f --- /dev/null +++ b/scripts/patches/vtk/8.2/100_javac-heap.patch @@ -0,0 +1,18 @@ +Description: set JVM max memory to 1024m. +Author: Matthias Klose +Acked-By: Anton Gladky +Last-Update: 2016-02-12 + +Index: VTK-6.3.0/Wrapping/Java/CMakeLists.txt +=================================================================== +--- VTK-6.3.0.orig/Wrapping/Java/CMakeLists.txt ++++ VTK-6.3.0/Wrapping/Java/CMakeLists.txt +@@ -80,6 +80,8 @@ if(APPLE) + set(JAVAC_OPTIONS -J-Xmx512m) + endif() + ++set(JAVAC_OPTIONS -J-Xmx1024m) ++ + get_property(java_modules GLOBAL PROPERTY VTK_JAVA_WRAPPED) + foreach(module IN LISTS java_modules) + if(NOT ${module}_EXCLUDE_FROM_WRAPPING) diff --git a/scripts/patches/vtk/8.2/101_java_install_path.patch b/scripts/patches/vtk/8.2/101_java_install_path.patch new file mode 100644 index 0000000..18af20a --- /dev/null +++ b/scripts/patches/vtk/8.2/101_java_install_path.patch @@ -0,0 +1,21 @@ +Description: Install Java modules in the correct path + This patch corrects the installation of the native Java modules + to go to the path given by the Debian Java Policy. This helps + to later use the simple install file to get them to the right + location in the package. +Author: Gert Wollny +Description: Delete java files before building jar +--- a/Wrapping/Java/CMakeLists.txt ++++ b/Wrapping/Java/CMakeLists.txt +@@ -259,7 +259,7 @@ + if(VTK_JAVA_SWT_COMPONENT) + set(VTK_JAVA_SAMPLE_DEPENDENCIES ${VTK_JAVA_SAMPLE_DEPENDENCIES} + rendering/SwtConeRendering +- ) ++q ) + endif() + endif() + +@@ -358,11 +358,10 @@ + COMMENT "Compiling Java Classes" + ) + +-# Create the JAR file containing all compiled classes and ++ + add_custom_command( +- COMMAND ${JAVA_ARCHIVE} -cvf "${VTK_JAR_PATH}/vtk.jar" +- -C ${VTK_BINARY_DIR}/java +- vtk ++ COMMAND cd ${VTK_BINARY_DIR}/java && find . -name "*.class" -print | sort -u > classes.list ++ COMMAND cd ${VTK_BINARY_DIR}/java && ${JAVA_ARCHIVE} -cvf "${VTK_JAR_PATH}/vtk.jar" @${VTK_BINARY_DIR}/java/classes.list + DEPENDS ${VTK_BINARY_DIR}/java/javac_stamp.txt ${JAVA_LIBRARIES} + OUTPUT ${VTK_JAR_PATH}/vtk.jar + COMMENT "Java Archive" diff --git a/scripts/patches/vtk/8.2/110_python-371.patch b/scripts/patches/vtk/8.2/110_python-371.patch new file mode 100644 index 0000000..375624e --- /dev/null +++ b/scripts/patches/vtk/8.2/110_python-371.patch @@ -0,0 +1,16 @@ +Author: Gert Wollny +Description: Work around compile bug with python 3.7.1 +Debian-Bug: https://bugs.debian.org/914347 +diff --git a/Wrapping/PythonCore/vtkPythonArgs.cxx b/Wrapping/PythonCore/vtkPythonArgs.cxx +index 1b1e4b9..682f8b8 100644 +--- a/Wrapping/PythonCore/vtkPythonArgs.cxx ++++ b/Wrapping/PythonCore/vtkPythonArgs.cxx +@@ -102,7 +102,7 @@ bool vtkPythonGetStringValue(PyObject *o, T *&a, const char *exctext) + else if (PyUnicode_Check(o)) + { + #if PY_VERSION_HEX >= 0x03030000 +- a = PyUnicode_AsUTF8(o); ++ a = const_cast(PyUnicode_AsUTF8(o)); + return true; + #else + PyObject *s = _PyUnicode_AsDefaultEncodedString(o, NULL); diff --git a/scripts/patches/vtk/8.2/111_fix_perl.patch b/scripts/patches/vtk/8.2/111_fix_perl.patch new file mode 100644 index 0000000..c79c07a --- /dev/null +++ b/scripts/patches/vtk/8.2/111_fix_perl.patch @@ -0,0 +1,66 @@ +Author: Gert Wollny +Description: Fix the perl shebangs (lintian) +--- a/Utilities/Doxygen/doc_class2example.pl ++++ b/Utilities/Doxygen/doc_class2example.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # Time-stamp: <2004-06-09 11:12:38 barre> + # + # Build cross-references between classes and examples +--- a/Utilities/Doxygen/doc_cleanhtml.pl ++++ b/Utilities/Doxygen/doc_cleanhtml.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # Time-stamp: <2002-10-25 20:17:59 barre> + # + # Clean the HTML generated by Doxygen to remove some layout quicks +--- a/Utilities/Doxygen/doc_codematch.pl ++++ b/Utilities/Doxygen/doc_codematch.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # Time-stamp: <2002-01-18 16:17:26 barre> + # + # Summary ? +--- a/Utilities/Doxygen/doc_contributors.pl ++++ b/Utilities/Doxygen/doc_contributors.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # Time-stamp: <2002-11-01 15:33:04 barre> + # + # Get author and contributors. +--- a/Utilities/Doxygen/doc_header2doxygen.pl ++++ b/Utilities/Doxygen/doc_header2doxygen.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # Time-stamp: <2011-01-16 21:15:53 barre> + # + # Convert VTK headers to doxygen format +--- a/Utilities/Doxygen/doc_index.pl ++++ b/Utilities/Doxygen/doc_index.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # Time-stamp: <2001-11-21 17:40:48 barre> + # + # Build full-text index +--- a/Utilities/Doxygen/doc_rmpath.pl ++++ b/Utilities/Doxygen/doc_rmpath.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # Time-stamp: <2001-10-05 11:49:40 barre> + # + # Remove path to intermediate Doxygen dir from html doc +--- a/Utilities/Doxygen/doc_version.pl ++++ b/Utilities/Doxygen/doc_version.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # Time-stamp: <2006-11-15 13:25:02 barre> + # + # Extract VTK version and add it to documentation diff --git a/scripts/patches/vtk/8.2/112_riscv_support.patch b/scripts/patches/vtk/8.2/112_riscv_support.patch new file mode 100644 index 0000000..6b9f4bd --- /dev/null +++ b/scripts/patches/vtk/8.2/112_riscv_support.patch @@ -0,0 +1,15 @@ +Changes taken from https://gitlab.kitware.com/vtk/vtk/blob/master/Utilities/KWIML/vtkkwiml/include/kwiml/abi.h + +--- vtk7-7.1.1+dfsg1.orig/Utilities/KWIML/vtkkwiml/include/kwiml/abi.h ++++ vtk7-7.1.1+dfsg1/Utilities/KWIML/vtkkwiml/include/kwiml/abi.h +@@ -467,6 +467,10 @@ suppression macro KWIML_ABI_NO_VERIFY wa + #elif defined(__XTENSA_EL__) + # define KWIML_ABI_ENDIAN_ID KWIML_ABI_ENDIAN_ID_LITTLE + ++/* RISC-V */ ++#elif defined(__riscv) || defined(__riscv__) ++# define KWIML_ABI_ENDIAN_ID KWIML_ABI_ENDIAN_ID_LITTLE ++ + /* Unknown CPU */ + #elif !defined(KWIML_ABI_NO_ERROR_ENDIAN) + # error "Byte order of target CPU unknown." diff --git a/scripts/patches/vtk/8.2/113_vtk8_fix_python_equal.patch b/scripts/patches/vtk/8.2/113_vtk8_fix_python_equal.patch new file mode 100644 index 0000000..66827c3 --- /dev/null +++ b/scripts/patches/vtk/8.2/113_vtk8_fix_python_equal.patch @@ -0,0 +1,14 @@ +Description: Fix comparison with literal +Author: Gert Wollny +Debian-Bug: https://bugs.debian.org/950539 +--- a/Wrapping/Python/vtkmodules/numpy_interface/algorithms.py ++++ b/Wrapping/Python/vtkmodules/numpy_interface/algorithms.py +@@ -197,7 +197,7 @@ + return dsa.NoneArray; + + if res is dsa.NoneArray: +- if max_dims is 1: ++ if max_dims == 1: + # Weird trick to make the array look like a scalar + max_dims = () + res = numpy.empty(max_dims) diff --git a/scripts/patches/vtk/8.2/115_support-gcc10.patch b/scripts/patches/vtk/8.2/115_support-gcc10.patch new file mode 100644 index 0000000..182d112 --- /dev/null +++ b/scripts/patches/vtk/8.2/115_support-gcc10.patch @@ -0,0 +1,11 @@ +--- a/CMake/VTKGenerateExportHeader.cmake ++++ b/CMake/VTKGenerateExportHeader.cmake +@@ -174,7 +174,7 @@ + execute_process(COMMAND ${CMAKE_C_COMPILER} --version + OUTPUT_VARIABLE _gcc_version_info + ERROR_VARIABLE _gcc_version_info) +- string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*" ++ string(REGEX MATCH "[0-9]*\\.[0-9]\\.[0-9]*" + _gcc_version "${_gcc_version_info}") + # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the + # patch level, handle this here: diff --git a/scripts/patches/vtk/8.2/20_soversion-sharedlib.patch b/scripts/patches/vtk/8.2/20_soversion-sharedlib.patch new file mode 100644 index 0000000..dfa6165 --- /dev/null +++ b/scripts/patches/vtk/8.2/20_soversion-sharedlib.patch @@ -0,0 +1,25 @@ +Description: _soversion sharedlib +--- 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) +- set_property(TARGET ${_name} PROPERTY VERSION 1) +- set_property(TARGET ${_name} PROPERTY SOVERSION 1) ++ set_property(TARGET ${_name} PROPERTY VERSION ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION}) ++ set_property(TARGET ${_name} PROPERTY SOVERSION ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}) + endif() + if("${_name}" MATCHES "^[Vv][Tt][Kk]") + set(_vtk "") +--- 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 +- vtkRenderingPythonTkWidgets-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}) ++ vtkRenderingPythonTkWidgets) + + set(Module_PYTHON_LIBS ${VTK_TK_LIBRARIES}) + if(VTK_USE_X) diff --git a/scripts/patches/vtk/8.2/30_matplotlib.patch b/scripts/patches/vtk/8.2/30_matplotlib.patch new file mode 100644 index 0000000..2628a9d --- /dev/null +++ b/scripts/patches/vtk/8.2/30_matplotlib.patch @@ -0,0 +1,14 @@ +Description: _matplotlib +--- 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; ++ }; + + //@{ + /** diff --git a/scripts/patches/vtk/8.2/3edc0de2b04ae1e100c229e592d6b9fa94f2915a.patch b/scripts/patches/vtk/8.2/3edc0de2b04ae1e100c229e592d6b9fa94f2915a.patch new file mode 100644 index 0000000..87f1e8d --- /dev/null +++ b/scripts/patches/vtk/8.2/3edc0de2b04ae1e100c229e592d6b9fa94f2915a.patch @@ -0,0 +1,25 @@ +From dae1718d50bec1b40b860280acafbdd94fc4cd5d Mon Sep 17 00:00:00 2001 +From: Ben Boeckel +Date: Sat, 21 Nov 2020 13:37:34 -0500 +Subject: [PATCH] vtkFreeTypeTools: avoid using an internal macro + +This macro has been removed upstream as it was always intended to be +private. +--- + Rendering/FreeType/vtkFreeTypeTools.cxx | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +Index: vtk7/Rendering/FreeType/vtkFreeTypeTools.cxx +=================================================================== +--- vtk7.orig/Rendering/FreeType/vtkFreeTypeTools.cxx ++++ vtk7/Rendering/FreeType/vtkFreeTypeTools.cxx +@@ -273,8 +273,7 @@ + } + + //---------------------------------------------------------------------------- +-FT_CALLBACK_DEF(FT_Error) +-vtkFreeTypeToolsFaceRequester(FTC_FaceID face_id, ++static FT_Error vtkFreeTypeToolsFaceRequester(FTC_FaceID face_id, + FT_Library lib, + FT_Pointer request_data, + FT_Face* face) diff --git a/scripts/patches/vtk/8.2/581d9eb874b2b80a3fb21c739a96fa6f955ffb5e.patch b/scripts/patches/vtk/8.2/581d9eb874b2b80a3fb21c739a96fa6f955ffb5e.patch new file mode 100644 index 0000000..8267266 --- /dev/null +++ b/scripts/patches/vtk/8.2/581d9eb874b2b80a3fb21c739a96fa6f955ffb5e.patch @@ -0,0 +1,23 @@ +From 31e8e4ebeb3152f7cfdb3f14f24f7e5d31a4f8b5 Mon Sep 17 00:00:00 2001 +From: Ben Boeckel +Date: Sun, 22 Nov 2020 20:04:19 -0500 +Subject: [PATCH] vtkFontConfigFreeTypeTools: remove last FT_CALLBACK_DEF usage + +--- + Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx b/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx +index 5c1908cf24b..818ff058bb9 100644 +--- a/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx ++++ b/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx +@@ -31,8 +31,7 @@ vtkStandardNewMacro(vtkFontConfigFreeTypeTools); + namespace + { + // The FreeType face requester callback: +-FT_CALLBACK_DEF(FT_Error) +-vtkFontConfigFreeTypeToolsFaceRequester(FTC_FaceID face_id, ++static FT_Error vtkFontConfigFreeTypeToolsFaceRequester(FTC_FaceID face_id, + FT_Library lib, + FT_Pointer request_data, + FT_Face* face) diff --git a/scripts/patches/vtk/8.2/60_vtk8_use_system_mpi4py.patch b/scripts/patches/vtk/8.2/60_vtk8_use_system_mpi4py.patch new file mode 100644 index 0000000..d22b013 --- /dev/null +++ b/scripts/patches/vtk/8.2/60_vtk8_use_system_mpi4py.patch @@ -0,0 +1,30 @@ +Description: use system mpi4py +Author: Anton Gladky +Last-Update: 2015-03-24 + +--- a/Parallel/MPI4Py/CMakeLists.txt ++++ b/Parallel/MPI4Py/CMakeLists.txt +@@ -18,7 +18,7 @@ + mark_as_advanced(MPI4PY_INCLUDE_DIR) + endif() + else() +- set(MPI4PY_INCLUDE_DIR "${vtkmpi4py_SOURCE_DIR}/vtkmpi4py/src/include") ++ set(MPI4PY_INCLUDE_DIR "/usr/include") + endif() + include_directories("${MPI4PY_INCLUDE_DIR}") + +--- a/Parallel/MPI4Py/module.cmake ++++ b/Parallel/MPI4Py/module.cmake +@@ -5,7 +5,6 @@ if (VTK_WRAP_PYTHON) + DEPENDS + vtkParallelMPI + COMPILE_DEPENDS +- vtkmpi4py + vtkPython + OPTIONAL_PYTHON_LINK + EXCLUDE_FROM_JAVA_WRAPPING +@@ -18,3 +17,4 @@ if (VTK_WRAP_PYTHON) + vtkParallelMPI + ) + endif () ++ diff --git a/scripts/patches/vtk/8.1/70_fix_ftbfs_gcc49.patch b/scripts/patches/vtk/8.2/70_vtk8_fix_ftbfs_gcc49.patch similarity index 80% rename from scripts/patches/vtk/8.1/70_fix_ftbfs_gcc49.patch rename to scripts/patches/vtk/8.2/70_vtk8_fix_ftbfs_gcc49.patch index e41874d..cc227fc 100644 --- a/scripts/patches/vtk/8.1/70_fix_ftbfs_gcc49.patch +++ b/scripts/patches/vtk/8.2/70_vtk8_fix_ftbfs_gcc49.patch @@ -5,7 +5,7 @@ Author: Anton Gladky Last-Update: 2014-05-30 --- a/Filters/ParallelMPI/vtkDistributedDataFilter.cxx +++ b/Filters/ParallelMPI/vtkDistributedDataFilter.cxx -@@ -1113,7 +1113,10 @@ +@@ -1206,7 +1206,10 @@ vtkIdType cellsPerNode = numTotalCells / nprocs; vtkIdList **sendCells = new vtkIdList * [ nprocs ]; @@ -17,7 +17,7 @@ Last-Update: 2014-05-30 if (numConsumers == nprocs - 1) { -@@ -1598,7 +1601,9 @@ +@@ -1700,7 +1703,9 @@ // Exchange int arrays float **recvArrays = new float * [nprocs]; @@ -28,7 +28,7 @@ Last-Update: 2014-05-30 if (sendSize[me] > 0) // sent myself an array { -@@ -1720,7 +1725,9 @@ +@@ -1822,7 +1827,9 @@ // Exchange int arrays vtkIdType **recvArrays = new vtkIdType * [nprocs]; @@ -39,29 +39,29 @@ Last-Update: 2014-05-30 if (sendSize[me] > 0) // sent myself an array { -@@ -2789,7 +2796,9 @@ - - unsigned char *vals = new unsigned char [npoints]; - -- memset(vals, val, npoints); -+ if (npoints > 0) { -+ memset(vals, val, npoints); -+ } - - vtkUnsignedCharArray *Array = vtkUnsignedCharArray::New(); - Array->SetName(arrayName); -@@ -2809,7 +2818,9 @@ - - unsigned char *vals = new unsigned char [ncells]; +@@ -2938,7 +2945,9 @@ + if (npoints) + { + unsigned char *vals = new unsigned char [npoints]; +- memset(vals, val, npoints); ++ if (npoints > 0) { ++ memset(vals, val, npoints); ++ } -- memset(vals, val, ncells); -+ if (ncells > 0) { -+ memset(vals, val, ncells); -+ } + Array->SetArray(vals, npoints, 0, + vtkUnsignedCharArray::VTK_DATA_ARRAY_DELETE); +@@ -2960,7 +2969,9 @@ + if (ncells) + { + unsigned char *vals = new unsigned char [ncells]; +- memset(vals, val, ncells); ++ if (ncells > 0) { ++ memset(vals, val, ncells); ++ } - vtkUnsignedCharArray *Array = vtkUnsignedCharArray::New(); - Array->SetName(arrayName); -@@ -3008,7 +3019,9 @@ + Array->SetArray(vals, ncells, 0, vtkUnsignedCharArray::VTK_DATA_ARRAY_DELETE); + } +@@ -3167,7 +3178,9 @@ vtkIdType nGridPoints = grid->GetNumberOfPoints(); vtkIdType *numPointsOutside = new vtkIdType [nprocs]; @@ -72,7 +72,7 @@ Last-Update: 2014-05-30 vtkIdTypeArray *globalIds = vtkIdTypeArray::New(); globalIds->SetNumberOfValues(nGridPoints); -@@ -3090,10 +3103,16 @@ +@@ -3249,10 +3262,16 @@ // global ID back? vtkFloatArray **ptarrayOut = new vtkFloatArray * [nprocs]; @@ -91,7 +91,7 @@ Last-Update: 2014-05-30 vtkIdType *next = new vtkIdType [nprocs]; vtkIdType *next3 = new vtkIdType [nprocs]; -@@ -3268,7 +3287,9 @@ +@@ -3430,7 +3449,9 @@ { // There are no cells in my assigned region @@ -102,7 +102,7 @@ Last-Update: 2014-05-30 return gids; } -@@ -3473,7 +3494,10 @@ +@@ -3641,7 +3662,10 @@ std::multimap::iterator mapIt; vtkIdTypeArray **processList = new vtkIdTypeArray * [nprocs]; @@ -114,7 +114,7 @@ Last-Update: 2014-05-30 for (int i=0; iGetNumberOfPoints(); vtkIdTypeArray **ghostPtIds = new vtkIdTypeArray * [nprocs]; diff --git a/scripts/patches/vtk/8.2/mysq8_my_bool.patch b/scripts/patches/vtk/8.2/mysq8_my_bool.patch new file mode 100644 index 0000000..0547317 --- /dev/null +++ b/scripts/patches/vtk/8.2/mysq8_my_bool.patch @@ -0,0 +1,22 @@ +Description: Reintroduce my_bool to fix build with MySQL 8 + (patch inspired from the one in cppdb 0.3.1+dfsg-8ubuntu2) +Author: Gianfranco Costamagna , Andreas Hasenack +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1863026 +Forwarded: no +Last-Update: 2020-12-15 + +diff --git a/IO/MySQL/vtkMySQLDatabasePrivate.h b/IO/MySQL/vtkMySQLDatabasePrivate.h +index 4deb747..8e0c9e3 100644 +--- a/IO/MySQL/vtkMySQLDatabasePrivate.h ++++ b/IO/MySQL/vtkMySQLDatabasePrivate.h +@@ -7,6 +7,10 @@ + + #include "vtkIOMySQLModule.h" // For export macro + #include // needed for MYSQL typedefs ++#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID) && \ ++ MYSQL_VERSION_ID >= 80001 && MYSQL_VERSION_ID != 80002 ++typedef bool my_bool; ++#endif + + class VTKIOMYSQL_EXPORT vtkMySQLDatabasePrivate + { diff --git a/scripts/patches/vtk/8.2/vtk8.2.patch b/scripts/patches/vtk/8.2/vtk8.2.patch deleted file mode 100644 index 6fd5344..0000000 --- a/scripts/patches/vtk/8.2/vtk8.2.patch +++ /dev/null @@ -1,589 +0,0 @@ -unchanged: ---- 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) -- set_property(TARGET ${_name} PROPERTY VERSION 1) -- set_property(TARGET ${_name} PROPERTY SOVERSION 1) -+ set_property(TARGET ${_name} PROPERTY VERSION ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}p.${VTK_BUILD_VERSION}) -+ set_property(TARGET ${_name} PROPERTY SOVERSION ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}p) - endif() - if("${_name}" MATCHES "^[Vv][Tt][Kk]") - set(_vtk "") -unchanged: ---- 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 -- vtkRenderingPythonTkWidgets-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}) -+ vtkRenderingPythonTkWidgets) - - set(Module_PYTHON_LIBS ${VTK_TK_LIBRARIES}) - if(VTK_USE_X) -unchanged: ---- 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; -+ }; - - //@{ - /** -unchanged: ---- a/Filters/ParallelMPI/vtkDistributedDataFilter.cxx -+++ b/Filters/ParallelMPI/vtkDistributedDataFilter.cxx -@@ -1206,7 +1206,10 @@ - vtkIdType cellsPerNode = numTotalCells / nprocs; - - vtkIdList **sendCells = new vtkIdList * [ nprocs ]; -- memset(sendCells, 0, sizeof(vtkIdList *) * nprocs); -+ -+ if (sizeof(vtkIdList *) * nprocs > 0) { -+ memset(sendCells, 0, sizeof(vtkIdList *) * nprocs); -+ } - - if (numConsumers == nprocs - 1) - { -@@ -1700,7 +1703,9 @@ - // Exchange int arrays - - float **recvArrays = new float * [nprocs]; -- memset(recvArrays, 0, sizeof(float *) * nprocs); -+ if (sizeof(float *) * nprocs > 0) { -+ memset(recvArrays, 0, sizeof(float *) * nprocs); -+ } - - if (sendSize[me] > 0) // sent myself an array - { -@@ -1822,7 +1827,9 @@ - // Exchange int arrays - - vtkIdType **recvArrays = new vtkIdType * [nprocs]; -- memset(recvArrays, 0, sizeof(vtkIdType *) * nprocs); -+ if (sizeof(vtkIdType *) * nprocs > 0) { -+ memset(recvArrays, 0, sizeof(vtkIdType *) * nprocs); -+ } - - if (sendSize[me] > 0) // sent myself an array - { -@@ -2938,7 +2945,9 @@ - if (npoints) - { - unsigned char *vals = new unsigned char [npoints]; -- memset(vals, val, npoints); -+ if (npoints > 0) { -+ memset(vals, val, npoints); -+ } - - Array->SetArray(vals, npoints, 0, - vtkUnsignedCharArray::VTK_DATA_ARRAY_DELETE); -@@ -2960,7 +2969,9 @@ - if (ncells) - { - unsigned char *vals = new unsigned char [ncells]; -- memset(vals, val, ncells); -+ if (ncells > 0) { -+ memset(vals, val, ncells); -+ } - - Array->SetArray(vals, ncells, 0, vtkUnsignedCharArray::VTK_DATA_ARRAY_DELETE); - } -@@ -3167,7 +3178,9 @@ - vtkIdType nGridPoints = grid->GetNumberOfPoints(); - - vtkIdType *numPointsOutside = new vtkIdType [nprocs]; -- memset(numPointsOutside, 0, sizeof(vtkIdType) * nprocs); -+ if (sizeof(vtkIdType) * nprocs > 0) { -+ memset(numPointsOutside, 0, sizeof(vtkIdType) * nprocs); -+ } - - vtkIdTypeArray *globalIds = vtkIdTypeArray::New(); - globalIds->SetNumberOfValues(nGridPoints); -@@ -3249,10 +3262,16 @@ - // global ID back? - - vtkFloatArray **ptarrayOut = new vtkFloatArray * [nprocs]; -- memset(ptarrayOut, 0, sizeof(vtkFloatArray *) * nprocs); -+ -+ if (sizeof(vtkFloatArray *) * nprocs > 0) { -+ memset(ptarrayOut, 0, sizeof(vtkFloatArray *) * nprocs); -+ } - - vtkIdTypeArray **localIds = new vtkIdTypeArray * [nprocs]; -- memset(localIds, 0, sizeof(vtkIdTypeArray *) * nprocs); -+ -+ if (sizeof(vtkIdTypeArray *) * nprocs > 0) { -+ memset(localIds, 0, sizeof(vtkIdTypeArray *) * nprocs); -+ } - - vtkIdType *next = new vtkIdType [nprocs]; - vtkIdType *next3 = new vtkIdType [nprocs]; -@@ -3430,7 +3449,9 @@ - { - // There are no cells in my assigned region - -- memset(gids, 0, sizeof(vtkIdTypeArray *) * nprocs); -+ if (sizeof(vtkIdTypeArray *) * nprocs > 0) { -+ memset(gids, 0, sizeof(vtkIdTypeArray *) * nprocs); -+ } - - return gids; - } -@@ -3641,7 +3662,10 @@ - std::multimap::iterator mapIt; - - vtkIdTypeArray **processList = new vtkIdTypeArray * [nprocs]; -- memset(processList, 0, sizeof (vtkIdTypeArray *) * nprocs); -+ -+ if (sizeof (vtkIdTypeArray *) * nprocs > 0) { -+ memset(processList, 0, sizeof (vtkIdTypeArray *) * nprocs); -+ } - - for (int i=0; iGetNumberOfPoints(); - - vtkIdTypeArray **ghostPtIds = new vtkIdTypeArray * [nprocs]; -- memset(ghostPtIds, 0, sizeof(vtkIdTypeArray *) * nprocs); -+ if (sizeof(vtkIdTypeArray *) * nprocs) { -+ memset(ghostPtIds, 0, sizeof(vtkIdTypeArray *) * nprocs); -+ } - - if (numPoints < 1) - { -unchanged: ---- VTK-6.3.0.orig/Wrapping/Java/CMakeLists.txt -+++ VTK-6.3.0/Wrapping/Java/CMakeLists.txt -@@ -80,6 +80,8 @@ if(APPLE) - set(JAVAC_OPTIONS -J-Xmx512m) - endif() - -+set(JAVAC_OPTIONS -J-Xmx1024m) -+ - get_property(java_modules GLOBAL PROPERTY VTK_JAVA_WRAPPED) - foreach(module IN LISTS java_modules) - if(NOT ${module}_EXCLUDE_FROM_WRAPPING) -unchanged: ---- VTK-6.3.0.orig/CMake/vtkJavaWrapping.cmake -+++ VTK-6.3.0/CMake/vtkJavaWrapping.cmake -@@ -79,7 +79,7 @@ function(vtk_add_java_wrapping module_na - install(TARGETS ${module_name}Java - EXPORT ${VTK_INSTALL_EXPORT_NAME} - RUNTIME DESTINATION ${VTK_INSTALL_RUNTIME_DIR} COMPONENT RuntimeLibraries -- LIBRARY DESTINATION ${VTK_INSTALL_LIBRARY_DIR} COMPONENT RuntimeLibraries -+ LIBRARY DESTINATION ${VTK_INSTALL_LIBRARY_DIR}/jni COMPONENT RuntimeLibraries - ARCHIVE DESTINATION ${VTK_INSTALL_ARCHIVE_DIR} COMPONENT Development) - endif() - endfunction() -unchanged: ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -540,9 +540,7 @@ - - # The doxygen documentation needs to be aware of all modules. - option(BUILD_DOCUMENTATION "Build the VTK documentation" OFF) --if(BUILD_DOCUMENTATION) -- add_subdirectory(Utilities/Doxygen) --endif() -+add_subdirectory(Utilities/Doxygen) - - # If python wrapping and testing is enabled then add driver scripts to run - # tests. Note: Many pythong tests used to be automatically converted from TCL -unchanged: ---- b/Utilities/Doxygen/CMakeLists.txt -+++ b/Utilities/Doxygen/CMakeLists.txt -@@ -1,69 +1,79 @@ - # - # Build the documentation - # --find_package(Doxygen REQUIRED) --find_package(Perl REQUIRED) --find_package(HTMLHelp) -+if (BUILD_DOCUMENTATION) -+ find_package(Doxygen REQUIRED) -+ find_package(Perl REQUIRED) -+ find_package(HTMLHelp) - --option(DOXYGEN_SHORT_NAMES "Build Doxygen of VTK using short file names" OFF) --option(DOXYGEN_KEEP_TEMP "Do not delete the temporary Doxygen headers" OFF) --option(DOXYGEN_GENERATE_HTMLHELP "Generate HTML help (CHM) files" ON) --mark_as_advanced(DOXYGEN_SHORT_NAMES DOXYGEN_KEEP_TEMP DOXYGEN_GENERATE_HTMLHELP) --if(DOXYGEN_SHORT_NAMES) -- set(DOXYGEN_SHORT_NAMES YES) --else() -- set(DOXYGEN_SHORT_NAMES NO) --endif() --if(DOXYGEN_GENERATE_HTMLHELP) -- set(DOXYGEN_GENERATE_HTMLHELP YES) --else() -- set(DOXYGEN_GENERATE_HTMLHELP NO) --endif() -- --# --# Configure the script and the doxyfile, then add target --# --set(HAVE_DOT_YESNO NO) --if(DOT) -- set(HAVE_DOT_YESNO YES) -- if(NOT DOT_PATH) -- get_filename_component(DOT_PATH ${DOT} PATH) -+ option(DOXYGEN_SHORT_NAMES "Build Doxygen of VTK using short file names" OFF) -+ option(DOXYGEN_KEEP_TEMP "Do not delete the temporary Doxygen headers" OFF) -+ option(DOXYGEN_GENERATE_HTMLHELP "Generate HTML help (CHM) files" ON) -+ mark_as_advanced(DOXYGEN_SHORT_NAMES DOXYGEN_KEEP_TEMP DOXYGEN_GENERATE_HTMLHELP) -+ if(DOXYGEN_SHORT_NAMES) -+ set(DOXYGEN_SHORT_NAMES YES) -+ else() -+ set(DOXYGEN_SHORT_NAMES NO) - endif() --endif() -- --# Build up a list of all module source directories. Note that this should be --# all source directories and so does not use the normal variables. --unset(VTK_MODULE_DIRS_DOXYGEN) --file(GLOB src RELATIVE "${VTK_SOURCE_DIR}" "${VTK_SOURCE_DIR}/*/*/module.cmake") --foreach(module ${src}) -- get_filename_component(module_BASE ${module} PATH) -- if("${module_BASE}" MATCHES "^Utilities" OR ${module_BASE} MATCHES "^Third") -- # Skip the utilities and third parties directories. -+ if(DOXYGEN_GENERATE_HTMLHELP) -+ set(DOXYGEN_GENERATE_HTMLHELP YES) - else() -- # Use both the source and binary directories, this ensures that -- # generated files will be included, but they may then be architecture, -- # build configuration and/or compiler specific. All source directories -- # are included whether the module is enabled or not. -- set(VTK_MODULE_DIRS_DOXYGEN -- "${VTK_MODULE_DIRS_DOXYGEN} -+ set(DOXYGEN_GENERATE_HTMLHELP NO) -+ endif() -+ -+ # -+ # Configure the script and the doxyfile, then add target -+ # -+ set(HAVE_DOT_YESNO NO) -+ if(DOT) -+ set(HAVE_DOT_YESNO YES) -+ if(NOT DOT_PATH) -+ get_filename_component(DOT_PATH ${DOT} PATH) -+ endif() -+ endif() -+ -+ # Build up a list of all module source directories. Note that this should be -+ # all source directories and so does not use the normal variables. -+ unset(VTK_MODULE_DIRS_DOXYGEN) -+ file(GLOB src RELATIVE "${VTK_SOURCE_DIR}" "${VTK_SOURCE_DIR}/*/*/module.cmake") -+ foreach(module ${src}) -+ get_filename_component(module_BASE ${module} PATH) -+ if("${module_BASE}" MATCHES "^Utilities" OR ${module_BASE} MATCHES "^Third") -+ # Skip the utilities and third parties directories. -+ else() -+ # Use both the source and binary directories, this ensures that -+ # generated files will be included, but they may then be architecture, -+ # build configuration and/or compiler specific. All source directories -+ # are included whether the module is enabled or not. -+ set(VTK_MODULE_DIRS_DOXYGEN -+ "${VTK_MODULE_DIRS_DOXYGEN} - \"${VTK_SOURCE_DIR}/${module_BASE}\" - \"${VTK_BINARY_DIR}/${module_BASE}\"") -- endif() --endforeach() -+ endif() -+ endforeach() -+ -+ FIND_PATH(MATHJAX_CODEFILE MathJax.js -+ PATHS -+ /usr/share/mathjax/ -+ /usr/share/javascript/ -+ /usr/share/javascript/mathjax/ -+ ) -+ -+ configure_file( -+ ${VTK_SOURCE_DIR}/Utilities/Doxygen/doxyfile.in -+ ${VTK_BINARY_DIR}/Utilities/Doxygen/doxyfile) -+ -+ configure_file( -+ ${VTK_SOURCE_DIR}/Utilities/Doxygen/doc_makeall.cmake.in -+ ${VTK_BINARY_DIR}/Utilities/Doxygen/doc_makeall.cmake -+ @ONLY) -+ -+ add_custom_target(DoxygenDoc -+ ${CMAKE_COMMAND} -+ -P ${VTK_BINARY_DIR}/Utilities/Doxygen/doc_makeall.cmake -+ DEPENDS ${VTK_BINARY_DIR}/Utilities/Doxygen/doc_makeall.cmake) - --configure_file( -- ${VTK_SOURCE_DIR}/Utilities/Doxygen/doxyfile.in -- ${VTK_BINARY_DIR}/Utilities/Doxygen/doxyfile) -- --configure_file( -- ${VTK_SOURCE_DIR}/Utilities/Doxygen/doc_makeall.cmake.in -- ${VTK_BINARY_DIR}/Utilities/Doxygen/doc_makeall.cmake -- @ONLY) -- --add_custom_target(DoxygenDoc -- ${CMAKE_COMMAND} -- -P ${VTK_BINARY_DIR}/Utilities/Doxygen/doc_makeall.cmake -- DEPENDS ${VTK_BINARY_DIR}/Utilities/Doxygen/doc_makeall.cmake) -+endif() - - if(NOT VTK_INSTALL_NO_DOCUMENTATION) - macro(__vtk_install_documentation_files glob) -unchanged: ---- a/Utilities/Doxygen/doxyfile.in -+++ b/Utilities/Doxygen/doxyfile.in -@@ -19,6 +19,9 @@ - GENERATE_TAGFILE = "@VTK_BINARY_DIR@/Utilities/Doxygen/vtk@VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@.tag" - - PDF_HYPERLINKS = YES -+USE_MATHJAX = YES -+MATHJAX_RELPATH = @MATHJAX_CODEFILE@ -+ - - HAVE_DOT = @HAVE_DOT_YESNO@ - DOT_PATH = "@DOT_PATH@" -unchanged: ---- a/Wrapping/Java/CMakeLists.txt -+++ b/Wrapping/Java/CMakeLists.txt -@@ -259,7 +259,7 @@ - if(VTK_JAVA_SWT_COMPONENT) - set(VTK_JAVA_SAMPLE_DEPENDENCIES ${VTK_JAVA_SAMPLE_DEPENDENCIES} - rendering/SwtConeRendering -- ) -+q ) - endif() - endif() - -@@ -358,11 +358,10 @@ - COMMENT "Compiling Java Classes" - ) - --# Create the JAR file containing all compiled classes and -+ - add_custom_command( -- COMMAND ${JAVA_ARCHIVE} -cvf "${VTK_JAR_PATH}/vtk.jar" -- -C ${VTK_BINARY_DIR}/java -- vtk -+ COMMAND cd ${VTK_BINARY_DIR}/java && find . -name "*.class" -print | sort -u > classes.list -+ COMMAND cd ${VTK_BINARY_DIR}/java && ${JAVA_ARCHIVE} -cvf "${VTK_JAR_PATH}/vtk.jar" @${VTK_BINARY_DIR}/java/classes.list - DEPENDS ${VTK_BINARY_DIR}/java/javac_stamp.txt ${JAVA_LIBRARIES} - OUTPUT ${VTK_JAR_PATH}/vtk.jar - COMMENT "Java Archive" -unchanged: ---- a/Wrapping/PythonCore/vtkPythonArgs.cxx -+++ b/Wrapping/PythonCore/vtkPythonArgs.cxx -@@ -102,7 +102,7 @@ bool vtkPythonGetStringValue(PyObject *o, T *&a, const char *exctext) - else if (PyUnicode_Check(o)) - { - #if PY_VERSION_HEX >= 0x03030000 -- a = PyUnicode_AsUTF8(o); -+ a = const_cast(PyUnicode_AsUTF8(o)); - return true; - #else - PyObject *s = _PyUnicode_AsDefaultEncodedString(o, NULL); -unchanged: ---- a/Utilities/Doxygen/doc_class2example.pl -+++ b/Utilities/Doxygen/doc_class2example.pl -@@ -1,4 +1,4 @@ --#!/usr/bin/env perl -+#!/usr/bin/perl - # Time-stamp: <2004-06-09 11:12:38 barre> - # - # Build cross-references between classes and examples -unchanged: ---- a/Utilities/Doxygen/doc_cleanhtml.pl -+++ b/Utilities/Doxygen/doc_cleanhtml.pl -@@ -1,4 +1,4 @@ --#!/usr/bin/env perl -+#!/usr/bin/perl - # Time-stamp: <2002-10-25 20:17:59 barre> - # - # Clean the HTML generated by Doxygen to remove some layout quicks -unchanged: ---- a/Utilities/Doxygen/doc_codematch.pl -+++ b/Utilities/Doxygen/doc_codematch.pl -@@ -1,4 +1,4 @@ --#!/usr/bin/env perl -+#!/usr/bin/perl - # Time-stamp: <2002-01-18 16:17:26 barre> - # - # Summary ? -unchanged: ---- a/Utilities/Doxygen/doc_contributors.pl -+++ b/Utilities/Doxygen/doc_contributors.pl -@@ -1,4 +1,4 @@ --#!/usr/bin/env perl -+#!/usr/bin/perl - # Time-stamp: <2002-11-01 15:33:04 barre> - # - # Get author and contributors. -unchanged: ---- a/Utilities/Doxygen/doc_header2doxygen.pl -+++ b/Utilities/Doxygen/doc_header2doxygen.pl -@@ -1,4 +1,4 @@ --#!/usr/bin/env perl -+#!/usr/bin/perl - # Time-stamp: <2011-01-16 21:15:53 barre> - # - # Convert VTK headers to doxygen format -unchanged: ---- a/Utilities/Doxygen/doc_index.pl -+++ b/Utilities/Doxygen/doc_index.pl -@@ -1,4 +1,4 @@ --#!/usr/bin/env perl -+#!/usr/bin/perl - # Time-stamp: <2001-11-21 17:40:48 barre> - # - # Build full-text index -unchanged: ---- a/Utilities/Doxygen/doc_rmpath.pl -+++ b/Utilities/Doxygen/doc_rmpath.pl -@@ -1,4 +1,4 @@ --#!/usr/bin/env perl -+#!/usr/bin/perl - # Time-stamp: <2001-10-05 11:49:40 barre> - # - # Remove path to intermediate Doxygen dir from html doc -unchanged: ---- a/Utilities/Doxygen/doc_version.pl -+++ b/Utilities/Doxygen/doc_version.pl -@@ -1,4 +1,4 @@ --#!/usr/bin/env perl -+#!/usr/bin/perl - # Time-stamp: <2006-11-15 13:25:02 barre> - # - # Extract VTK version and add it to documentation -unchanged: ---- vtk7-7.1.1+dfsg1.orig/Utilities/KWIML/vtkkwiml/include/kwiml/abi.h -+++ vtk7-7.1.1+dfsg1/Utilities/KWIML/vtkkwiml/include/kwiml/abi.h -@@ -467,6 +467,10 @@ suppression macro KWIML_ABI_NO_VERIFY wa - #elif defined(__XTENSA_EL__) - # define KWIML_ABI_ENDIAN_ID KWIML_ABI_ENDIAN_ID_LITTLE - -+/* RISC-V */ -+#elif defined(__riscv) || defined(__riscv__) -+# define KWIML_ABI_ENDIAN_ID KWIML_ABI_ENDIAN_ID_LITTLE -+ - /* Unknown CPU */ - #elif !defined(KWIML_ABI_NO_ERROR_ENDIAN) - # error "Byte order of target CPU unknown." -unchanged: ---- a/Wrapping/Python/vtkmodules/numpy_interface/algorithms.py -+++ b/Wrapping/Python/vtkmodules/numpy_interface/algorithms.py -@@ -197,7 +197,7 @@ - return dsa.NoneArray; - - if res is dsa.NoneArray: -- if max_dims is 1: -+ if max_dims == 1: - # Weird trick to make the array look like a scalar - max_dims = () - res = numpy.empty(max_dims) -unchanged: ---- a/CMake/VTKGenerateExportHeader.cmake -+++ b/CMake/VTKGenerateExportHeader.cmake -@@ -174,7 +174,7 @@ - execute_process(COMMAND ${CMAKE_C_COMPILER} --version - OUTPUT_VARIABLE _gcc_version_info - ERROR_VARIABLE _gcc_version_info) -- string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*" -+ string(REGEX MATCH "[0-9]*\\.[0-9]\\.[0-9]*" - _gcc_version "${_gcc_version_info}") - # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the - # patch level, handle this here: -unchanged: ---- a/IO/MySQL/vtkMySQLDatabasePrivate.h -+++ b/IO/MySQL/vtkMySQLDatabasePrivate.h -@@ -7,6 +7,10 @@ - - #include "vtkIOMySQLModule.h" // For export macro - #include // needed for MYSQL typedefs -+#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID) && \ -+ MYSQL_VERSION_ID >= 80001 && MYSQL_VERSION_ID != 80002 -+typedef bool my_bool; -+#endif - - class VTKIOMYSQL_EXPORT vtkMySQLDatabasePrivate - { -unchanged: ---- vtk7.orig/Rendering/FreeType/vtkFreeTypeTools.cxx -+++ vtk7/Rendering/FreeType/vtkFreeTypeTools.cxx -@@ -273,8 +273,7 @@ - } - - //---------------------------------------------------------------------------- --FT_CALLBACK_DEF(FT_Error) --vtkFreeTypeToolsFaceRequester(FTC_FaceID face_id, -+static FT_Error vtkFreeTypeToolsFaceRequester(FTC_FaceID face_id, - FT_Library lib, - FT_Pointer request_data, - FT_Face* face) -unchanged: ---- a/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx -+++ b/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx -@@ -31,8 +31,7 @@ vtkStandardNewMacro(vtkFontConfigFreeTypeTools); - namespace - { - // The FreeType face requester callback: --FT_CALLBACK_DEF(FT_Error) --vtkFontConfigFreeTypeToolsFaceRequester(FTC_FaceID face_id, -+static FT_Error vtkFontConfigFreeTypeToolsFaceRequester(FTC_FaceID face_id, - FT_Library lib, - FT_Pointer request_data, - FT_Face* face) -unchanged: ---- vtk7-7.1.1+dfsg2.orig/Rendering/Label/vtkLabelHierarchyPrivate.h -+++ vtk7-7.1.1+dfsg2/Rendering/Label/vtkLabelHierarchyPrivate.h -@@ -66,7 +66,7 @@ - { - } - -- bool operator () ( const vtkIdType& a, const vtkIdType& b ) -+ bool operator () ( const vtkIdType& a, const vtkIdType& b ) const - { - if (0 == this->Hierarchy) - { -unchanged: ---- vtk7-7.1.1+dfsg2.orig/Rendering/Label/vtkLabelHierarchy.cxx -+++ vtk7-7.1.1+dfsg2/Rendering/Label/vtkLabelHierarchy.cxx -@@ -525,7 +525,7 @@ - { - public: - bool operator()(const vtkHierarchyNode & a, -- const vtkHierarchyNode & b) -+ const vtkHierarchyNode & b) const - { - if (a.Level != b.Level) - { -only in patch2: -unchanged: ---- a/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c -+++ b/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c -@@ -216,5 +216,5 @@ int ex_create_par_int(const char *path, int cmode, int *comp_ws, int *io_ws, MPI - * Prevent warning in some versions of ranlib(1) because the object - * file has no symbols. - */ --const char exodus_unused_symbol_dummy_1; -+const char exodus_unused_symbol_dummy_ex_create_par; - #endif -only in patch2: -unchanged: ---- a/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c -+++ b/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c -@@ -459,5 +459,5 @@ int ex_open_par_int(const char *path, int mode, int *comp_ws, int *io_ws, float - * Prevent warning in some versions of ranlib(1) because the object - * file has no symbols. - */ --const char exodus_unused_symbol_dummy_1; -+const char exodus_unused_symbol_dummy_ex_open_par; - #endif diff --git a/scripts/patches/vtk/8.2/vtk8.2_patches.sh b/scripts/patches/vtk/8.2/vtk8.2_patches.sh deleted file mode 100755 index 5cf4b12..0000000 --- a/scripts/patches/vtk/8.2/vtk8.2_patches.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -# https://sources.debian.org/patches/vtk7/7.1.1%2Bdfsg2-10.2/ - -wget -nc https://sources.debian.org/data/main/v/vtk7/7.1.1%2Bdfsg2-10.2/debian/patches/20_soversion-sharedlib.patch -wget -nc https://sources.debian.org/data/main/v/vtk7/7.1.1%2Bdfsg2-10.2/debian/patches/30_matplotlib.patch -wget -nc https://sources.debian.org/data/main/v/vtk7/7.1.1%2Bdfsg2-10.2/debian/patches/70_fix_ftbfs_gcc49.patch -wget -nc https://sources.debian.org/data/main/v/vtk7/7.1.1%2Bdfsg2-10.2/debian/patches/100_javac-heap.patch -wget -nc https://sources.debian.org/data/main/v/vtk7/7.1.1%2Bdfsg2-10.2/debian/patches/101_java_install_path.patch -wget -nc https://sources.debian.org/data/main/v/vtk7/7.1.1%2Bdfsg2-10.2/debian/patches/106_install_doxygen_scripts_in_nodoc_build.patch -wget -nc https://sources.debian.org/data/main/v/vtk7/7.1.1%2Bdfsg2-10.2/debian/patches/108_Doxygen-use-mathjax.patch -wget -nc https://sources.debian.org/data/main/v/vtk7/7.1.1%2Bdfsg2-10.2/debian/patches/109_java-jar-nonjavafiles.patch -wget -nc https://sources.debian.org/data/main/v/vtk7/7.1.1%2Bdfsg2-10.2/debian/patches/110_python-371.patch -wget -nc https://sources.debian.org/data/main/v/vtk7/7.1.1%2Bdfsg2-10.2/debian/patches/111_fix_perl.patch -wget -nc https://sources.debian.org/data/main/v/vtk7/7.1.1%2Bdfsg2-10.2/debian/patches/112_riscv_support.patch -wget -nc https://sources.debian.org/data/main/v/vtk7/7.1.1%2Bdfsg2-10.2/debian/patches/115_support-gcc10.patch -wget -nc https://sources.debian.org/data/main/v/vtk7/7.1.1%2Bdfsg2-10.2/debian/patches/mysq8_my_bool.patch -wget -nc https://sources.debian.org/data/main/v/vtk7/7.1.1%2Bdfsg2-10.2/debian/patches/3edc0de2b04ae1e100c229e592d6b9fa94f2915a.patch -wget -nc https://sources.debian.org/data/main/v/vtk7/7.1.1%2Bdfsg2-10.2/debian/patches/581d9eb874b2b80a3fb21c739a96fa6f955ffb5e.patch - -combinediff 20_soversion-sharedlib.patch 30_matplotlib.patch > tmp1.patch -combinediff tmp1.patch vtk8-70_fix_ftbfs_gcc49.patch > tmp2.patch -combinediff tmp2.patch 100_javac-heap.patch > tmp1.patch -combinediff tmp1.patch 101_java_install_path.patch > tmp2.patch -combinediff tmp2.patch 106_install_doxygen_scripts_in_nodoc_build.patch > tmp1.patch -combinediff tmp1.patch 108_Doxygen-use-mathjax.patch > tmp2.patch -combinediff tmp2.patch 109_java-jar-nonjavafiles.patch > tmp1.patch -combinediff tmp1.patch 110_python-371.patch > tmp2.patch -combinediff tmp2.patch 111_fix_perl.patch > tmp1.patch -combinediff tmp1.patch 112_riscv_support.patch > tmp2.patch -combinediff tmp2.patch vtk8-113_fix_python_equal.patch > tmp1.patch -combinediff tmp1.patch 115_support-gcc10.patch > tmp2.patch -combinediff tmp2.patch mysq8_my_bool.patch > tmp1.patch -combinediff tmp1.patch 3edc0de2b04ae1e100c229e592d6b9fa94f2915a.patch > tmp2.patch -combinediff tmp2.patch 581d9eb874b2b80a3fb21c739a96fa6f955ffb5e.patch > tmp1.patch -combinediff tmp1.patch vtk8-gcc-11-exodus.patch > vtk8.2.patch - -rm tmp1.patch tmp2.patch