[CGNS/ParaView] Add new ports (#9960)

* [cgns] add port cgns

* [paraview] add new port

* [paraview] correct dependencies; disable catalyst

* [VTK/ParaView] Make ParaView build

* [paraview] add missing patch

* [paraview] add cgns patch

* [paraview] add qt plugin patches back in. Remove in the future

* [vtk] slightly improved patches

* [vtk] don't disable findPython

* [paraview] add more features

* [paraview] remove X11Extras from OSX

* [vtk] make vtk workcorrectly with python and prepare for paraview with python

* [paraview] Python fixes

* [paraview] small bin -> lib replacement fix for static builds

* [vtk] fix patch path

* update baseline to exclude paraview for the time being on osx and linux.
requires a fix in qt5-base linkage of libpq.

* [paraview]try setting LD_LIBRARY_PATH for unix systems

* [paraview] a bit of cleanup

* update baseline

* fix typo in baseline

* [paraview] remove unnecessary patch

* [vtk] replace custom patch with upstream patch

* [paraview] cleanup in the portfile.

* Update ports/paraview/CONTROL

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

9 files changed, 136 insertions, 110 deletions

diff --git a/ports/vtk/6890.diff b/ports/vtk/6890.diff
new file mode 100644
index 000000000..632e5f366
--- /dev/null
+++ b/ports/vtk/6890.diff
@@ -0,0 +1,74 @@
+diff --git a/CMake/FindFreetype.cmake b/CMake/FindFreetype.cmake
+index 41029f461330ab23e185ca91a4a8c093944b2d54..7b3b8026383e13b5c6387f176a191dd520da1ada 100644
+--- a/CMake/FindFreetype.cmake
++++ b/CMake/FindFreetype.cmake
+@@ -174,17 +174,27 @@ mark_as_advanced(
+ if(Freetype_FOUND)
+   if(NOT TARGET Freetype::Freetype)
+     include(vtkDetectLibraryType)
++    set(freetype_library_type UNKNOWN)
+     if (FREETYPE_LIBRARY_RELEASE)
+-      set(_freetype_library_path "${FREETYPE_LIBRARY_RELEASE}")
+-    elseif (FREETYPE_LIBRARY_DEBUG)
+-      set(_freetype_library_path "${FREETYPE_LIBRARY_DEBUG}")
+-    else ()
+-      set(_freetype_library_path "${FREETYPE_LIBRARY}")
++      vtk_detect_library_type(freetype_release_library_type
++        PATH "${FREETYPE_LIBRARY_RELEASE}")
++    endif ()
++    if (FREETYPE_LIBRARY_DEBUG)
++      vtk_detect_library_type(freetype_debug_library_type
++        PATH "${FREETYPE_LIBRARY_DEBUG}")
++    endif ()
++    if (freetype_release_library_type AND freetype_debug_library_type)
++      if (freetype_release_library_type STREQUAL freetype_debug_library_type)
++        set(freetype_library_type "${freetype_release_library_type}")
++      endif ()
++    elseif (freetype_release_library_type)
++      set(freetype_library_type "${freetype_release_library_type}")
++    elseif (freetype_debug_library_type)
++      set(freetype_library_type "${freetype_debug_library_type}")
+     endif ()
+-    vtk_detect_library_type(freetype_library_type
+-      PATH "${_freetype_library_path}")
+-    unset(_freetype_library_path)
+     add_library(Freetype::Freetype "${freetype_library_type}" IMPORTED)
++    unset(freetype_release_library_type)
++    unset(freetype_debug_library_type)
+     unset(freetype_library_type)
+     set_target_properties(Freetype::Freetype PROPERTIES
+       INTERFACE_INCLUDE_DIRECTORIES "${FREETYPE_INCLUDE_DIRS}")
+diff --git a/CMake/FindLibHaru.cmake b/CMake/FindLibHaru.cmake
+index 7ef877a49307309232c932576f1641b9ae28564d..1f5b881facca745910c7d1223e6f737b157424d7 100644
+--- a/CMake/FindLibHaru.cmake
++++ b/CMake/FindLibHaru.cmake
+@@ -45,9 +45,27 @@ if (LibHaru_FOUND)
+ 
+   if (NOT TARGET LibHaru::LibHaru)
+     include(vtkDetectLibraryType)
+-    vtk_detect_library_type(libharu_library_type
+-      PATH "${LibHaru_LIBRARY}")
++    set(libharu_library_type UNKNOWN)
++    if (LibHaru_LIBRARY_RELEASE)
++      vtk_detect_library_type(libharu_release_library_type
++        PATH "${LibHaru_LIBRARY_RELEASE}")
++    endif ()
++    if (LibHaru_LIBRARY_DEBUG)
++      vtk_detect_library_type(libharu_debug_library_type
++        PATH "${LibHaru_LIBRARY_DEBUG}")
++    endif ()
++    if (libharu_release_library_type AND libharu_debug_library_type)
++      if (libharu_release_library_type STREQUAL libharu_debug_library_type)
++        set(libharu_library_type "${libharu_release_library_type}")
++      endif ()
++    elseif (libharu_release_library_type)
++      set(libharu_library_type "${libharu_release_library_type}")
++    elseif (libharu_debug_library_type)
++      set(libharu_library_type "${libharu_debug_library_type}")
++    endif ()
+     add_library(LibHaru::LibHaru "${libharu_library_type}" IMPORTED)
++    unset(libharu_release_library_type)
++    unset(libharu_debug_library_type)
+     unset(libharu_library_type)
+     set_target_properties(LibHaru::LibHaru PROPERTIES
+       INTERFACE_INCLUDE_DIRECTORIES "${LibHaru_INCLUDE_DIR}")
diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL
index 1a3d93815..412869822 100644
--- a/ports/vtk/CONTROL
+++ b/ports/vtk/CONTROL
@@ -1,5 +1,5 @@
 Source: vtk
-Version: 9.0-2
+Version: 9.0-3
 Description: Software system for 3D computer graphics, image processing, and visualization
 Homepage: https://github.com/Kitware/VTK
 Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5[core], libjpeg-turbo, proj4, lz4, liblzma, libtheora, eigen3, double-conversion, pugixml, libharu[notiffsymbols], sqlite3, netcdf-c, utfcpp, libogg, pegtl-2
diff --git a/ports/vtk/FindLZMA.patch b/ports/vtk/FindLZMA.patch
index 8da36b06b..cb7f80963 100644
--- a/ports/vtk/FindLZMA.patch
+++ b/ports/vtk/FindLZMA.patch
@@ -70,7 +70,7 @@ index 0c8c7943c..d60669484 100644
 +          IMPORTED_IMPLIB_DEBUG "${LZMA_LIBRARY_DEBUG}")

 +    endif()

 +  

-+    # Guard against possible stupidity of VTK reading only LOCATION without configuration

++    # Guard against possible stupidity of depending projects reading only LOCATION without configuration

 +    if(CMAKE_BUILD_TYPE MATCHES "Debug") 

 +      set_target_properties(LZMA::LZMA PROPERTIES

 +          IMPORTED_LOCATION "${LZMA_LIBRARY_DEBUG}"

diff --git a/ports/vtk/FindLibHaru.patch b/ports/vtk/FindLibHaru.patch
deleted file mode 100644
index 1b47a14b7..000000000
--- a/ports/vtk/FindLibHaru.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/CMake/FindLibHaru.cmake b/CMake/FindLibHaru.cmake

-index 7ef877a49..2a18e0694 100644

---- a/CMake/FindLibHaru.cmake

-+++ b/CMake/FindLibHaru.cmake

-@@ -43,6 +43,31 @@ if (LibHaru_FOUND)

-   set(LibHaru_INCLUDE_DIRS "${LibHaru_INCLUDE_DIR}")

-   set(LibHaru_LIBRARIES "${LibHaru_LIBRARY}")

- 

-+  add_library(LibHaru::LibHaru UNKNOWN IMPORTED)

-+    set_target_properties(LibHaru::LibHaru PROPERTIES

-+      INTERFACE_INCLUDE_DIRECTORIES "${LibHaru_INCLUDE_DIR}")

-+  if(LZMA_LIBRARY_RELEASE)

-+    set_target_properties(LibHaru::LibHaru PROPERTIES

-+        IMPORTED_LOCATION_RELEASE "${LibHaru_LIBRARY_RELEASE}"

-+        IMPORTED_IMPLIB_RELEASE "${LibHaru_LIBRARY_RELEASE}")

-+  endif()

-+  if(LZMA_LIBRARY_DEBUG)

-+    set_target_properties(LibHaru::LibHaru PROPERTIES

-+        IMPORTED_LOCATION_DEBUG "${LibHaru_LIBRARY_DEBUG}"

-+        IMPORTED_IMPLIB_DEBUG "${LibHaru_LIBRARY_DEBUG}")

-+  endif()

-+  

-+  # Guard against possible stupidity of VTK reading only LOCATION without configuration

-+  if(CMAKE_BUILD_TYPE MATCHES "Debug") 

-+    set_target_properties(LibHaru::LibHaru PROPERTIES

-+        IMPORTED_LOCATION "${LibHaru_LIBRARY_DEBUG}"

-+        IMPORTED_IMPLIB "${LibHaru_LIBRARY_DEBUG}")

-+  else()

-+    set_target_properties(LibHaru::LibHaru PROPERTIES

-+        IMPORTED_LOCATION "${LibHaru_LIBRARY_RELEASE}"

-+        IMPORTED_IMPLIB "${LibHaru_LIBRARY_RELEASE}")

-+  endif()

-+  

-   if (NOT TARGET LibHaru::LibHaru)

-     include(vtkDetectLibraryType)

-     vtk_detect_library_type(libharu_library_type

- 
\ No newline at end of file
diff --git a/ports/vtk/NoUndefDebug.patch b/ports/vtk/NoUndefDebug.patch
index 3fc8f5de8..a7bb750e7 100644
--- a/ports/vtk/NoUndefDebug.patch
+++ b/ports/vtk/NoUndefDebug.patch
@@ -2,12 +2,12 @@ diff --git a/Utilities/Python/vtkPython.h b/Utilities/Python/vtkPython.h
 index 166f24104..79ae1d371 100644
 --- a/Utilities/Python/vtkPython.h
 +++ b/Utilities/Python/vtkPython.h
-@@ -50,7 +50,7 @@
- # include <sys/stat.h>
- # include <time.h>
- # include <wchar.h>
--# undef _DEBUG
+@@ -53,7 +53,7 @@
+ #include <sys/stat.h>
+ #include <time.h>
+ #include <wchar.h>
+-#undef _DEBUG
 +
- # if defined(_MSC_VER)
- #  define _CRT_NOFORCE_MANIFEST 1
- # endif
+ #if defined(_MSC_VER)
+ #define _CRT_NOFORCE_MANIFEST 1
+ #endif
diff --git a/ports/vtk/SplitLibraryConfigurations.cmake b/ports/vtk/SplitLibraryConfigurations.cmake
deleted file mode 100644
index fc4d87ec8..000000000
--- a/ports/vtk/SplitLibraryConfigurations.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-
-cmake_minimum_required(VERSION 3.2.0)
-
-function(split_library_configurations LIBRARIES OPTIMIZED_OUT_VAR DEBUG_OUT_VAR GENERAL_OUT_VAR)
-  set(OPTIMIZED_LIBRARIES)
-  set(DEBUG_LIBRARIES)
-  set(GENERAL_LIBRARIES)
-
-  set(CURRENT_TYPE)
-  foreach(LIBRARY ${LIBRARIES})
-    if("${LIBRARY}" STREQUAL "optimized" OR "${LIBRARY}" STREQUAL "debug" OR "${LIBRARY}" STREQUAL "general")
-      set(CURRENT_TYPE "${LIBRARY}")
-    else()
-      if("${CURRENT_TYPE}" STREQUAL "optimized")
-        list(APPEND OPTIMIZED_LIBRARIES "${LIBRARY}")
-      elseif("${CURRENT_TYPE}" STREQUAL "debug")
-        list(APPEND DEBUG_LIBRARIES "${LIBRARY}")
-      else()
-        list(APPEND GENERAL_LIBRARIES "${LIBRARY}")
-      endif()
-      set(CURRENT_TYPE)
-    endif()
-  endforeach()
-
-  set(${OPTIMIZED_OUT_VAR} "${OPTIMIZED_LIBRARIES}" PARENT_SCOPE)
-  set(${DEBUG_OUT_VAR} "${DEBUG_LIBRARIES}" PARENT_SCOPE)
-  set(${GENERAL_OUT_VAR} "${GENERAL_LIBRARIES}" PARENT_SCOPE)
-endfunction()
\ No newline at end of file
diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake
index 99d332e59..ecc9176ce 100644
--- a/ports/vtk/portfile.cmake
+++ b/ports/vtk/portfile.cmake
@@ -16,8 +16,13 @@ if("qt" IN_LIST FEATURES)
         -DVTK_MODULE_ENABLE_VTK_RenderingQt=YES
         -DVTK_MODULE_ENABLE_VTK_ViewsQt=YES
     )
-endif()
 
+endif()
+if("atlmfc" IN_LIST FEATURES)
+    list(APPEND ADDITIONAL_OPTIONS
+        -DVTK_MODULE_ENABLE_VTK_GUISupportMFC=YES
+    )
+endif()
 if("vtkm" IN_LIST FEATURES)
     list(APPEND ADDITIONAL_OPTIONS
         -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKm=YES
@@ -31,20 +36,9 @@ if("python" IN_LIST FEATURES)
         -DVTK_WRAP_PYTHON=ON
         -DVTK_PYTHON_VERSION=3
         -DPython3_FIND_REGISTRY=NEVER
-        -DCMAKE_DISABLE_FIND_PACKAGE_Python3=TRUE
         "-DPython3_EXECUTABLE:PATH=${PYTHON3}"
     )
 
-    if(VCPKG_TARGET_IS_WINDOWS)
-        list(APPEND ADDITIONAL_OPTIONS  "-DPython3_LIBRARY:PATH=${CURRENT_INSTALLED_DIR}/lib/python38.lib"
-                                        "-DPython3_INCLUDE_DIR:PATH=${CURRENT_INSTALLED_DIR}/include/python3.8")
-    elseif(VCPKG_TARGET_IS_LINUX)
-        list(APPEND ADDITIONAL_OPTIONS  "-DPython3_LIBRARY:PATH=${CURRENT_INSTALLED_DIR}/lib/libpython38.a"
-                                        "-DPython3_INCLUDE_DIR:PATH=${CURRENT_INSTALLED_DIR}/include/python3.8")
-    elseif(VCPKG_TARGET_IS_OSX)
-        #Need Python3 information on OSX within VCPKG
-    endif()    
-    
     #VTK_PYTHON_SITE_PACKAGES_SUFFIX should be set to the install dir of the site-packages
 endif()
 
@@ -62,6 +56,7 @@ if("paraview" IN_LIST FEATURES)
         -DVTK_MODULE_ENABLE_VTK_IOVPIC=YES
         -DVTK_MODULE_ENABLE_VTK_RenderingLICOpenGL2=YES
         -DVTK_MODULE_ENABLE_VTK_RenderingAnnotation=YES
+        -DVTK_MODULE_ENABLE_VTK_DomainsChemistryOpenGL2=YES
     )
     if("python" IN_LIST FEATURES)
         list(APPEND ADDITIONAL_OPTIONS
@@ -97,21 +92,22 @@ vcpkg_from_github(
     SHA512 50a324f55b58bc4415f972f711420e83b41a100b27729266db4541c24bc7d7bcd27d9158ce2588178b9b2e43c20b9695ffe382605f5cde331e8371e213655164
     HEAD_REF master
     PATCHES
-        FindLibHaru.patch
-        FindLZMA.patch
+        6890.diff         # already merged upstream
+        FindLZMA.patch    # Will be fixed in 9.1?
         FindLZ4.patch
         Findproj.patch
         vtkm.patch # To include an external VTKm build (v.1.5 required)
         pegtl.patch
-        ##pythonwrapper.patch # needs checking with paraview PR if still required
-        ##NoUndefDebug.patch # needs checking with paraview PR if still required
+        pythonwrapper.patch # Required by ParaView to Wrap required classes
+        NoUndefDebug.patch # Required to link against correct Python library depending on build type. 
+        python_debug.patch
         # Last patch TODO: Patch out internal loguru
 )
 
 # =============================================================================
 #Overwrite outdated modules if they have not been patched:
-file(COPY "${CURRENT_PORT_DIR}/FindPostgreSQL.cmake" DESTINATION "${SOURCE_PATH}/CMake")
-file(COPY "${CURRENT_PORT_DIR}/FindHDF5.cmake" DESTINATION "${SOURCE_PATH}/CMake/patches/99")
+file(COPY "${CURRENT_PORT_DIR}/FindPostgreSQL.cmake" DESTINATION "${SOURCE_PATH}/CMake") # will be backported from CMake in VTK in a future release
+file(COPY "${CURRENT_PORT_DIR}/FindHDF5.cmake" DESTINATION "${SOURCE_PATH}/CMake/patches/99") # due to usage of targets in netcdf-c
 # =============================================================================
 
 # =============================================================================
@@ -140,7 +136,6 @@ vcpkg_configure_cmake(
         # Select modules / groups to install
         -DVTK_USE_EXTERNAL:BOOL=ON
         -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=OFF # Not yet in VCPKG
-
         ${ADDITIONAL_OPTIONS}
 )
 
@@ -258,22 +253,31 @@ vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/vtk")
 
 ## Files Modules needed by ParaView
 if("paraview" IN_LIST FEATURES)
-    set(VTK_CMAKE_NEEDED vtkCompilerChecks vtkCompilerPlatformFlags vtkCompilerExtraFlags vtkInitializeBuildType vtkSupportMacros vtkDirectories vtkVersion FindPythonModules)
+    set(VTK_CMAKE_NEEDED vtkCompilerChecks vtkCompilerPlatformFlags vtkCompilerExtraFlags vtkInitializeBuildType 
+                         vtkSupportMacros vtkDirectories vtkVersion FindPythonModules vtkModuleDebugging vtkExternalData)
     foreach(module ${VTK_CMAKE_NEEDED})
-        file(INSTALL "${SOURCE_PATH}/CMake/${module}.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk)
+        file(INSTALL "${SOURCE_PATH}/CMake/${module}.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/vtk")
     endforeach()
-    file(INSTALL "${SOURCE_PATH}/CMake/vtkRequireLargeFilesSupport.cxx" DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk)
+        
+    ## Check List on UPDATE !!
+    file(INSTALL "${SOURCE_PATH}/CMake/vtkRequireLargeFilesSupport.cxx" DESTINATION "${CURRENT_PACKAGES_DIR}/share/vtk")
+
+    file(INSTALL "${SOURCE_PATH}/GUISupport/Qt/QVTKOpenGLWidget.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") # Legacy header
     
-    #ParaView requires some internal headers
-    file(INSTALL ${SOURCE_PATH}/Rendering/Annotation/vtkScalarBarActorInternal.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION})
-    file(INSTALL ${SOURCE_PATH}/Filters/Statistics/vtkStatisticsAlgorithmPrivate.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION})
-    file(INSTALL ${SOURCE_PATH}/Rendering/OpenGL2/vtkCompositePolyDataMapper2Internal.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION})
-    file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Rendering/OpenGL2/vtkTextureObjectVS.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION})
+    file(INSTALL "${SOURCE_PATH}/Common/Core/vtkRange.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") # this should get installed by VTK
+    file(INSTALL "${SOURCE_PATH}/Common/Core/vtkRangeIterableTraits.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") # this should get installed by VTK
+    file(INSTALL "${SOURCE_PATH}/Common/DataModel/vtkCompositeDataSetNodeReference.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") # this should get installed by VTK
+    #ParaView requires some internal headers 
+    file(INSTALL "${SOURCE_PATH}/Rendering/Annotation/vtkScalarBarActorInternal.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}")
+    file(INSTALL "${SOURCE_PATH}/Filters/Statistics/vtkStatisticsAlgorithmPrivate.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}")
+    file(INSTALL "${SOURCE_PATH}/Rendering/OpenGL2/vtkCompositePolyDataMapper2Internal.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}")
+    file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Rendering/OpenGL2/vtkTextureObjectVS.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}")
 endif()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/CMakeFiles/static_python) #python headers
-        file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/CMakeFiles/static_python DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION})
+    if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/CMakeFiles/vtkpythonmodules/static_python) #python headers
+        file(GLOB_RECURSE STATIC_PYTHON_FILES "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/CMakeFiles/*/static_python/*.h")
+        file(INSTALL ${STATIC_PYTHON_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION})
     endif()
 endif()
     
diff --git a/ports/vtk/python_debug.patch b/ports/vtk/python_debug.patch
new file mode 100644
index 000000000..6b69d8094
--- /dev/null
+++ b/ports/vtk/python_debug.patch
@@ -0,0 +1,13 @@
+diff --git a/CMake/patches/3.18/FindPython/Support.cmake b/CMake/patches/3.18/FindPython/Support.cmake
+index 0879537ed..122e7228d 100644
+--- a/CMake/patches/3.18/FindPython/Support.cmake	
++++ b/CMake/patches/3.18/FindPython/Support.cmake
+@@ -2253,7 +2257,7 @@ if (("Development.Module" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS
+                   NAMES ${_${_PYTHON_PREFIX}_LIB_NAMES_DEBUG}
+                   NAMES_PER_DIR
+                   HINTS "${_${_PYTHON_PREFIX}_PATH}" ${_${_PYTHON_PREFIX}_HINTS}
+-                  NO_DEFAULT_PATH)
++                  )
+   endif()
+ 
+   # retrieve runtime libraries
diff --git a/ports/vtk/pythonwrapper.patch b/ports/vtk/pythonwrapper.patch
index d7585cf0f..6cdd4162a 100644
--- a/ports/vtk/pythonwrapper.patch
+++ b/ports/vtk/pythonwrapper.patch
@@ -2,7 +2,8 @@ diff --git a/CMake/vtkModuleWrapPython.cmake b/CMake/vtkModuleWrapPython.cmake
 index 5d2c2e1bf..e33a16d68 100644

 --- a/CMake/vtkModuleWrapPython.cmake

 +++ b/CMake/vtkModuleWrapPython.cmake

-@@ -75,10 +75,13 @@ function (_vtk_module_wrap_python_sources module sources classes)

+@@ -152,11 +152,14 @@ function (_vtk_module_wrap_python_sources module sources classes)

+   set(_vtk_python_genex_compile_definitions

      "$<TARGET_PROPERTY:${_vtk_python_target_name},COMPILE_DEFINITIONS>")

    set(_vtk_python_genex_include_directories

      "$<TARGET_PROPERTY:${_vtk_python_target_name},INCLUDE_DIRECTORIES>")

@@ -11,9 +12,8 @@ index 5d2c2e1bf..e33a16d68 100644
    file(GENERATE

      OUTPUT  "${_vtk_python_args_file}"

      CONTENT "$<$<BOOL:${_vtk_python_genex_compile_definitions}>:\n-D\'$<JOIN:${_vtk_python_genex_compile_definitions},\'\n-D\'>\'>\n

--$<$<BOOL:${_vtk_python_genex_include_directories}>:\n-I\'$<JOIN:${_vtk_python_genex_include_directories},\'\n-I\'>\'>\n")

-+$<$<BOOL:${_vtk_python_genex_include_directories}>:\n-I\'$<JOIN:${_vtk_python_genex_include_directories},\'\n-I\'>\'>\n

-+$<$<BOOL:${_vtk_python_genex_interface_include_directories}>:\n-I\'$<JOIN:${_vtk_python_genex_interface_include_directories},\'\n-I\'>\'>\n")

+ $<$<BOOL:${_vtk_python_genex_include_directories}>:\n-I\'$<JOIN:${_vtk_python_genex_include_directories},\'\n-I\'>\'>\n

++$<$<BOOL:${_vtk_python_genex_interface_include_directories}>:\n-I\'$<JOIN:${_vtk_python_genex_interface_include_directories},\'\n-I\'>\'>\n

+ $<$<BOOL:${_vtk_python_hierarchy_files}>:\n--types \'$<JOIN:${_vtk_python_hierarchy_files},\'\n--types \'>\'>\n")

  

-   _vtk_module_get_module_property("${module}"

-     PROPERTY  "hierarchy"

+   set(_vtk_python_sources)