<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5bfbd58766fda61efdefdd067c926c1090c486d0">https://github.com/macports/macports-ports/commit/5bfbd58766fda61efdefdd067c926c1090c486d0</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 5bfbd58766f vtk: update to 9.1.0
</span>5bfbd58766f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5bfbd58766fda61efdefdd067c926c1090c486d0
</span>Author: David Moxey <dave@xyloid.org>
AuthorDate: Sun Jul 17 15:21:00 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> vtk: update to 9.1.0
</span>---
graphics/vtk/Portfile | 36 ++---
graphics/vtk/files/patch-FT_CALLBACK_DEF.diff | 18 ---
graphics/vtk/files/patch-IOMovie-module.cmake.diff | 12 --
graphics/vtk/files/patch-pugixml.diff | 19 ---
graphics/vtk/files/patch-python38-tp_print.diff | 176 ---------------------
graphics/vtk/files/patch-qpainter.diff | 34 ----
6 files changed, 11 insertions(+), 284 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vtk/Portfile b/graphics/vtk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 546b6190a49..33a3851c83f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/vtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/vtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,8 +14,8 @@ compiler.cxx_standard 2011
</span> compiler.blacklist-append {clang < 900}
name vtk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 8.2.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 9.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories graphics devel
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,9 +35,9 @@ master_sites http://www.vtk.org/files/release/${branch}
</span>
distname VTK-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9c566529757081d65d439d37dadbb533f0b55162 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 34c3dc775261be5e45a8049155f7228b6bd668106c72a3c435d95730d17d57bb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 35511819
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 bfdaaa9ddc5723becf338e1c0374b0acab740ef1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8fed42f4f8f1eb8083107b68eaa9ad71da07110161a3116ad807f43e5ca5ce96 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 47871165
</span>
mpi.setup
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,19 +62,12 @@ depends_lib-append \
</span>
mpi.enforce_variant hdf5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# FT_CALLBACK_DEF: https://gitlab.kitware.com/vtk/vtk/-/issues/18033
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-pugixml.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-IOMovie-module.cmake.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-FT_CALLBACK_DEF.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-qpainter.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.pre_args-delete \
-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON
configure.args-append \
../${distname}/ \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_BUILD_TYPE=Release \
</span> -DBUILD_SHARED_LIBS=ON \
-DBUILD_EXAMPLES:BOOL=OFF \
-DVTK_WRAP_PYTHON:BOOL=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,6 +114,7 @@ foreach pyver ${python_versions} {
</span>
# Get python branch
set python_branch "[string index ${pyver} 0].[string range ${pyver} 1 end]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_major_ver "[string index ${pyver} 0]"
</span>
variant python${pyver} conflicts {*}${other_python_versions} description "Add Python ${python_branch} support" "
depends_lib-append port:python${pyver}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,10 +123,10 @@ foreach pyver ${python_versions} {
</span>
configure.args-append \
-DVTK_WRAP_PYTHON:BOOL=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE:STRING=${prefix}/bin/python${python_branch} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/${python_branch}/Headers/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_LIBRARY=${frameworks_dir}/Python.framework/Versions/${python_branch}/lib/libpython${python_branch}.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DVTK_INSTALL_PYTHON_MODULES_DIR=${frameworks_dir}/Python.framework/Versions/${python_branch}/lib/python${python_branch}/site-packages \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPython${python_major_ver}_EXECUTABLE:STRING=${prefix}/bin/python${python_branch} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPython${python_major_ver}_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/${python_branch}/Headers/ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPython${python_major_ver}_LIBRARY=${frameworks_dir}/Python.framework/Versions/${python_branch}/lib/libpython${python_branch}.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVTK_PYTHON_SITE_PACKAGES_SUFFIX=Library/Frameworks/Python.framework/Versions/${python_branch}/lib/python${python_branch}/site-packages \
</span>
if {[mpi_variant_isset]} {
depends_lib-append port:py${pyver}-mpi4py
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,14 +134,6 @@ foreach pyver ${python_versions} {
</span> -DVTK_USE_SYSTEM_MPI4PY:BOOL=ON
}
"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset python${pyver}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp $pyver 37] > 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://gitlab.kitware.com/vtk/vtk/-/commit/257b9d7b18d5f3db3fe099dc18f230e23f7dfbab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Remove this when upgrading the version, because it was merged for VTK9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-python38-tp_print.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
variant xdmf description {Add XDMF readers} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vtk/files/patch-FT_CALLBACK_DEF.diff b/graphics/vtk/files/patch-FT_CALLBACK_DEF.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 043ee1474c9..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/vtk/files/patch-FT_CALLBACK_DEF.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ThirdParty/freetype/vtk_freetype.h.in.orig 2019-01-30 18:15:13.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ThirdParty/freetype/vtk_freetype.h.in 2020-10-17 00:03:32.730820908 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,6 +20,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef VTK_USE_SYSTEM_FREETYPE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <ft2build.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* FT_CALLBACK_DEF no longer exported since freetype-2.10.3 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* has been moved to <freetype/internal/compiler-macros.h> */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# ifndef FT_CALLBACK_DEF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# ifdef __cplusplus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define FT_CALLBACK_DEF( x ) extern "C" x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define FT_CALLBACK_DEF( x ) static x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif /* FT_CALLBACK_DEF */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <vtkfreetype/include/ft2build.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vtk/files/patch-IOMovie-module.cmake.diff b/graphics/vtk/files/patch-IOMovie-module.cmake.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ba4a2d10a71..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/vtk/files/patch-IOMovie-module.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git IO/Movie/module.cmake IO/Movie/module.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4275171403..88204ad2ca 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- IO/Movie/module.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ IO/Movie/module.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,6 +14,7 @@ vtk_module(vtkIOMovie
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vtkIO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEPENDS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${vtkIOMovie_vtkoggtheora}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vtkogg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vtkCommonExecutionModel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PRIVATE_DEPENDS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vtkCommonCore
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vtk/files/patch-pugixml.diff b/graphics/vtk/files/patch-pugixml.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ccf0319bc9c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/vtk/files/patch-pugixml.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git CMake/Findpugixml.cmake CMake/Findpugixml.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-new file mode 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0000000000..b715568503
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMake/Findpugixml.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+find_path(pugixml_INCLUDE_DIRS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "pugixml.hpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+find_library(pugixml_LIBRARIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NAMES pugixml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+include(FindPackageHandleStandardArgs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+find_package_handle_standard_args(pugixml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ REQUIRED_VARS pugixml_LIBRARIES pugixml_INCLUDE_DIRS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vtk/files/patch-python38-tp_print.diff b/graphics/vtk/files/patch-python38-tp_print.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fe07d5cd846..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/vtk/files/patch-python38-tp_print.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,176 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 257b9d7b18d5f3db3fe099dc18f230e23f7dfbab Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: David Gobbi <david.gobbi@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 20 Aug 2019 17:02:24 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Compatibility for Python 3.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The PyTypeObject struct was modified in Python 3.8, this change is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-required to avoid compile errors.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .../PythonInterpreter/vtkPythonStdStreamCaptureHelper.h | 6 ++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Wrapping/PythonCore/PyVTKMethodDescriptor.cxx | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Wrapping/PythonCore/PyVTKNamespace.cxx | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Wrapping/PythonCore/PyVTKReference.cxx | 8 ++++----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Wrapping/PythonCore/PyVTKTemplate.cxx | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Wrapping/PythonCore/vtkPythonCompatibility.h | 8 +++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Wrapping/Tools/vtkWrapPythonClass.c | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Wrapping/Tools/vtkWrapPythonEnum.c | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Wrapping/Tools/vtkWrapPythonType.c | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 9 files changed, 23 insertions(+), 11 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b1c12c83de..14ccfbe928 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -140,6 +140,12 @@ static PyTypeObject vtkPythonStdStreamCaptureHelperType = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if PY_VERSION_HEX >= 0x03040000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0, // tp_finalize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if PY_VERSION_HEX >= 0x03080000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 0, // tp_vectorcall
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if PY_VERSION_HEX < 0x03090000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 0, // tp_print
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyObject* vtkWrite(PyObject* self, PyObject* args)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Wrapping/PythonCore/PyVTKMethodDescriptor.cxx Wrapping/PythonCore/PyVTKMethodDescriptor.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2b0d443537..3840038498 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Wrapping/PythonCore/PyVTKMethodDescriptor.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Wrapping/PythonCore/PyVTKMethodDescriptor.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -186,7 +186,7 @@ PyTypeObject PyVTKMethodDescriptor_Type = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sizeof(PyMethodDescrObject), // tp_basicsize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0, // tp_itemsize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyVTKMethodDescriptor_Delete, // tp_dealloc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- nullptr, // tp_print
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 0, // tp_vectorcall_offset
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nullptr, // tp_getattr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nullptr, // tp_setattr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nullptr, // tp_compare
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Wrapping/PythonCore/PyVTKNamespace.cxx Wrapping/PythonCore/PyVTKNamespace.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 71ee2a3516..5cf5bfbe6b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Wrapping/PythonCore/PyVTKNamespace.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Wrapping/PythonCore/PyVTKNamespace.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,7 +49,7 @@ PyTypeObject PyVTKNamespace_Type = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0, // tp_basicsize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0, // tp_itemsize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyVTKNamespace_Delete, // tp_dealloc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- nullptr, // tp_print
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 0, // tp_vectorcall_offset
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nullptr, // tp_getattr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nullptr, // tp_setattr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nullptr, // tp_compare
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Wrapping/PythonCore/PyVTKReference.cxx Wrapping/PythonCore/PyVTKReference.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 943ac71080..b7104091c0 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Wrapping/PythonCore/PyVTKReference.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Wrapping/PythonCore/PyVTKReference.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1010,7 +1010,7 @@ PyTypeObject PyVTKReference_Type = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sizeof(PyVTKReference), // tp_basicsize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0, // tp_itemsize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyVTKReference_Delete, // tp_dealloc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- nullptr, // tp_print
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 0, // tp_vectorcall_offset
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nullptr, // tp_getattr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nullptr, // tp_setattr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nullptr, // tp_compare
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1067,7 +1067,7 @@ PyTypeObject PyVTKNumberReference_Type = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sizeof(PyVTKReference), // tp_basicsize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0, // tp_itemsize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyVTKReference_Delete, // tp_dealloc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- nullptr, // tp_print
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 0, // tp_vectorcall_offset
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nullptr, // tp_getattr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nullptr, // tp_setattr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nullptr, // tp_compare
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1124,7 +1124,7 @@ PyTypeObject PyVTKStringReference_Type = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sizeof(PyVTKReference), // tp_basicsize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0, // tp_itemsize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyVTKReference_Delete, // tp_dealloc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- nullptr, // tp_print
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 0, // tp_vectorcall_offset
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nullptr, // tp_getattr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nullptr, // tp_setattr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nullptr, // tp_compare
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1181,7 +1181,7 @@ PyTypeObject PyVTKTupleReference_Type = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sizeof(PyVTKReference), // tp_basicsize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0, // tp_itemsize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyVTKReference_Delete, // tp_dealloc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- nullptr, // tp_print
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 0, // tp_vectorcall_offset
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nullptr, // tp_getattr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nullptr, // tp_setattr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nullptr, // tp_compare
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Wrapping/PythonCore/PyVTKTemplate.cxx Wrapping/PythonCore/PyVTKTemplate.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index be200985b3..340fe7953b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Wrapping/PythonCore/PyVTKTemplate.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Wrapping/PythonCore/PyVTKTemplate.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -268,7 +268,7 @@ PyTypeObject PyVTKTemplate_Type = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0, // tp_basicsize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0, // tp_itemsize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nullptr, // tp_dealloc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- nullptr, // tp_print
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 0, // tp_vectorcall_offset
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nullptr, // tp_getattr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nullptr, // tp_setattr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nullptr, // tp_compare
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Wrapping/PythonCore/vtkPythonCompatibility.h Wrapping/PythonCore/vtkPythonCompatibility.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4a767844a6..be208faeef 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Wrapping/PythonCore/vtkPythonCompatibility.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Wrapping/PythonCore/vtkPythonCompatibility.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -64,7 +64,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // PyTypeObject compatibility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if PY_VERSION_HEX >= 0x03040000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if PY_VERSION_HEX >= 0x03090000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 0, 0, 0, 0,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif PY_VERSION_HEX >= 0x03080000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 0, 0, 0, 0, 0,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif PY_VERSION_HEX >= 0x03040000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0, 0, 0,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Wrapping/Tools/vtkWrapPythonClass.c Wrapping/Tools/vtkWrapPythonClass.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b1e45f8e80..4d558ea081 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Wrapping/Tools/vtkWrapPythonClass.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Wrapping/Tools/vtkWrapPythonClass.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -521,7 +521,7 @@ void vtkWrapPython_GenerateObjectType(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " sizeof(PyVTKObject), // tp_basicsize\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " 0, // tp_itemsize\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " PyVTKObject_Delete, // tp_dealloc\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- " nullptr, // tp_print\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ " 0, // tp_vectorcall_offset\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " nullptr, // tp_getattr\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " nullptr, // tp_setattr\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " nullptr, // tp_compare\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Wrapping/Tools/vtkWrapPythonEnum.c Wrapping/Tools/vtkWrapPythonEnum.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b933702242..1249362854 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Wrapping/Tools/vtkWrapPythonEnum.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Wrapping/Tools/vtkWrapPythonEnum.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -145,7 +145,7 @@ void vtkWrapPython_GenerateEnumType(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " sizeof(PyIntObject), // tp_basicsize\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " 0, // tp_itemsize\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " nullptr, // tp_dealloc\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- " nullptr, // tp_print\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ " 0, // tp_vectorcall_offset\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " nullptr, // tp_getattr\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " nullptr, // tp_setattr\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " nullptr, // tp_compare\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Wrapping/Tools/vtkWrapPythonType.c Wrapping/Tools/vtkWrapPythonType.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 744cb1b9d3..0a1375e541 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Wrapping/Tools/vtkWrapPythonType.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Wrapping/Tools/vtkWrapPythonType.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -709,7 +709,7 @@ void vtkWrapPython_GenerateSpecialType(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " sizeof(PyVTKSpecialObject), // tp_basicsize\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " 0, // tp_itemsize\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " Py%s_Delete, // tp_dealloc\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- " nullptr, // tp_print\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ " 0, // tp_vectorcall_offset\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " nullptr, // tp_getattr\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " nullptr, // tp_setattr\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " nullptr, // tp_compare\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-GitLab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vtk/files/patch-qpainter.diff b/graphics/vtk/files/patch-qpainter.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ff3caecc8b4..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/vtk/files/patch-qpainter.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,34 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 797f28697d5ba50c1fa2bc5596af626a3c277826 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: "Andrew J. P. Maclean" <andrew.amaclean@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 27 May 2020 15:27:15 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Qt 5.15 needs the include file QPainterPath
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Rendering/Qt/vtkQtLabelRenderStrategy.cxx | 1 +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Rendering/Qt/vtkQtStringToImage.cxx | 1 +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 2 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/Rendering/Qt/vtkQtLabelRenderStrategy.cxx b/Rendering/Qt/vtkQtLabelRenderStrategy.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index afda585ccab..eca65c64cd4 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Rendering/Qt/vtkQtLabelRenderStrategy.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Rendering/Qt/vtkQtLabelRenderStrategy.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,6 +41,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QImage>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QMap>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QPainter>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QPainterPath>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QPair>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QPixmap>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QTextDocument>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/Rendering/Qt/vtkQtStringToImage.cxx b/Rendering/Qt/vtkQtStringToImage.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 659c71570ea..fbb9b78f05d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Rendering/Qt/vtkQtStringToImage.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Rendering/Qt/vtkQtStringToImage.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,6 +30,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QFontMetrics>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QImage>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QPainter>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QPainterPath>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QPixmap>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QString>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QTextDocument>
</span></pre><pre style='margin:0'>
</pre>