Re: [PR PATCH] [Updated] vtk: update to 9.2.2

[ar-jan <ar-jan@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1655 bytes --]

There is an updated pull request by ar-jan against master on the void-packages repository

https://github.com/ar-jan/void-packages vtk922
https://github.com/void-linux/void-packages/pull/40423

vtk: update to 9.2.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


The `-DVTK_MODULE_USE_EXTERNAL_vtknlohmannjson=OFF` configure arg did not help to avoid `CMake Warning at CMake/vtkModule.cmake:4572 (find_package): By not providing "Findnlohmann_json.cmake" in CMAKE_MODULE_PATH this
project has asked CMake to find a package configuration file provided by "nlohmann_json", but CMake did not find one.`. Used `DVTK_USE_EXTERNAL=OFF` instead. I'm not sure if this is problematic.

A patch file from https://github.com/void-linux/void-packages/pull/40423.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vtk922-40423.patch --]
[-- Type: text/x-diff, Size: 30966 bytes --]

From c6a36baadcb606d0848888758df8415b86869db5 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 16:30:58 +0100
Subject: [PATCH 1/3] vtk: update to 9.2.2

---
 common/shlibs                                 | 214 +++++-----
 srcpkgs/vtk/patches/include.patch             | 396 ------------------
 ...etype-2.10.3-provide-FT_CALLBACK_DEF.patch |  19 -
 .../vtkeigen-disable-build-type-check.patch   |  19 +
 srcpkgs/vtk/patches/vtkioss-unistd.patch      |  25 ++
 srcpkgs/vtk/template                          |  16 +-
 6 files changed, 164 insertions(+), 525 deletions(-)
 delete mode 100644 srcpkgs/vtk/patches/include.patch
 delete mode 100644 srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
 create mode 100644 srcpkgs/vtk/patches/vtkeigen-disable-build-type-check.patch
 create mode 100644 srcpkgs/vtk/patches/vtkioss-unistd.patch

diff --git a/common/shlibs b/common/shlibs
index f064d66c1ba4..d48b1eb8d712 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3259,110 +3259,116 @@ libgnuradio-pdu.so.3.10.3 gnuradio-3.10.3.0_1
 libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
 libflann_cpp.so.1.9 flann-1.9.1_1
 libflann.so.1.9 flann-1.9.1_1
-libvtkChartsCore-9.0.so.1 vtk-9.0.1_1
-libvtkCommonColor-9.0.so.1 vtk-9.0.1_1
-libvtkCommonComputationalGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkCommonCore-9.0.so.1 vtk-9.0.1_1
-libvtkCommonDataModel-9.0.so.1 vtk-9.0.1_1
-libvtkCommonExecutionModel-9.0.so.1 vtk-9.0.1_1
-libvtkCommonMath-9.0.so.1 vtk-9.0.1_1
-libvtkCommonMisc-9.0.so.1 vtk-9.0.1_1
-libvtkCommonSystem-9.0.so.1 vtk-9.0.1_1
-libvtkCommonTransforms-9.0.so.1 vtk-9.0.1_1
-libvtkDICOMParser-9.0.so.1 vtk-9.0.1_1
-libvtkDomainsChemistry-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersAMR-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersCore-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersExtraction-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersFlowPaths-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeneral-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeneric-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersHybrid-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersHyperTree-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersImaging-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersModeling-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersParallel-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersParallelImaging-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersPoints-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersProgrammable-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSMP-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSelection-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersSources-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersStatistics-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersTexture-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersTopology-9.0.so.1 vtk-9.0.1_1
-libvtkFiltersVerdict-9.0.so.1 vtk-9.0.1_1
-libvtkGeovisCore-9.0.so.1 vtk-9.0.1_1
-libvtkIOAMR-9.0.so.1 vtk-9.0.1_1
-libvtkIOAsynchronous-9.0.so.1 vtk-9.0.1_1
-libvtkIOCityGML-9.0.so.1 vtk-9.0.1_1
-libvtkIOCore-9.0.so.1 vtk-9.0.1_1
-libvtkIOEnSight-9.0.so.1 vtk-9.0.1_1
-libvtkIOExodus-9.0.so.1 vtk-9.0.1_1
-libvtkIOExport-9.0.so.1 vtk-9.0.1_1
-libvtkIOExportGL2PS-9.0.so.1 vtk-9.0.1_1
-libvtkIOExportPDF-9.0.so.1 vtk-9.0.1_1
-libvtkIOGeometry-9.0.so.1 vtk-9.0.1_1
-libvtkIOImage-9.0.so.1 vtk-9.0.1_1
-libvtkIOImport-9.0.so.1 vtk-9.0.1_1
-libvtkIOInfovis-9.0.so.1 vtk-9.0.1_1
-libvtkIOLSDyna-9.0.so.1 vtk-9.0.1_1
-libvtkIOLegacy-9.0.so.1 vtk-9.0.1_1
-libvtkIOMotionFX-9.0.so.1 vtk-9.0.1_1
-libvtkIOMINC-9.0.so.1 vtk-9.0.1_1
-libvtkIOMovie-9.0.so.1 vtk-9.0.1_1
-libvtkIONetCDF-9.0.so.1 vtk-9.0.1_1
-libvtkIOOggTheora-9.0.so.1 vtk-9.0.1_1
-libvtkIOPLY-9.0.so.1 vtk-9.0.1_1
-libvtkIOParallel-9.0.so.1 vtk-9.0.1_1
-libvtkIOParallelXML-9.0.so.1 vtk-9.0.1_1
-libvtkIOSQL-9.0.so.1 vtk-9.0.1_1
-libvtkIOSegY-9.0.so.1 vtk-9.0.1_1
-libvtkIOTecplotTable-9.0.so.1 vtk-9.0.1_1
-libvtkIOVeraOut-9.0.so.1 vtk-9.0.1_1
-libvtkIOVideo-9.0.so.1 vtk-9.0.1_1
-libvtkIOXML-9.0.so.1 vtk-9.0.1_1
-libvtkIOXMLParser-9.0.so.1 vtk-9.0.1_1
-libvtkImagingColor-9.0.so.1 vtk-9.0.1_1
-libvtkImagingCore-9.0.so.1 vtk-9.0.1_1
-libvtkImagingFourier-9.0.so.1 vtk-9.0.1_1
-libvtkImagingGeneral-9.0.so.1 vtk-9.0.1_1
-libvtkImagingHybrid-9.0.so.1 vtk-9.0.1_1
-libvtkImagingMath-9.0.so.1 vtk-9.0.1_1
-libvtkImagingMorphological-9.0.so.1 vtk-9.0.1_1
-libvtkImagingSources-9.0.so.1 vtk-9.0.1_1
-libvtkImagingStatistics-9.0.so.1 vtk-9.0.1_1
-libvtkImagingStencil-9.0.so.1 vtk-9.0.1_1
-libvtkInfovisCore-9.0.so.1 vtk-9.0.1_1
-libvtkInfovisLayout-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionImage-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionStyle-9.0.so.1 vtk-9.0.1_1
-libvtkInteractionWidgets-9.0.so.1 vtk-9.0.1_1
-libvtkParallelCore-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingAnnotation-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingContext2D-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingCore-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingFreeType-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingGL2PSOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingImage-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingLOD-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingLabel-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingSceneGraph-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingUI-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVolume-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVolumeOpenGL2-9.0.so.1 vtk-9.0.1_1
-libvtkRenderingVtkJS-9.0.so.1 vtk-9.0.1_1
-libvtkTestingRendering-9.0.so.1 vtk-9.0.1_1
-libvtkViewsContext2D-9.0.so.1 vtk-9.0.1_1
-libvtkViewsCore-9.0.so.1 vtk-9.0.1_1
-libvtkViewsInfovis-9.0.so.1 vtk-9.0.1_1
-libvtkexodusII-9.0.so.1 vtk-9.0.1_1
-libvtklibharu-9.0.so.1 vtk-9.0.1_1
-libvtkmetaio-9.0.so.1 vtk-9.0.1_1
-libvtksys-9.0.so.1 vtk-9.0.1_1
-libvtkverdict-9.0.so.1 vtk-9.0.1_1
+libvtkChartsCore-9.2.so.1 vtk-9.2.2_1
+libvtkCommonColor-9.2.so.1 vtk-9.2.2_1
+libvtkCommonComputationalGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkCommonCore-9.2.so.1 vtk-9.2.2_1
+libvtkCommonDataModel-9.2.so.1 vtk-9.2.2_1
+libvtkCommonExecutionModel-9.2.so.1 vtk-9.2.2_1
+libvtkCommonMath-9.2.so.1 vtk-9.2.2_1
+libvtkCommonMisc-9.2.so.1 vtk-9.2.2_1
+libvtkCommonSystem-9.2.so.1 vtk-9.2.2_1
+libvtkCommonTransforms-9.2.so.1 vtk-9.2.2_1
+libvtkDomainsChemistry-9.2.so.1 vtk-9.2.2_1
+libvtkDomainsChemistryOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersAMR-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersCore-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersExtraction-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersFlowPaths-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeneral-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeneric-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersHybrid-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersHyperTree-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersImaging-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersModeling-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersParallel-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersParallelImaging-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersPoints-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersProgrammable-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSelection-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSMP-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersSources-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersStatistics-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersTexture-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersTopology-9.2.so.1 vtk-9.2.2_1
+libvtkFiltersVerdict-9.2.so.1 vtk-9.2.2_1
+libvtkGeovisCore-9.2.so.1 vtk-9.2.2_1
+libvtkImagingColor-9.2.so.1 vtk-9.2.2_1
+libvtkImagingCore-9.2.so.1 vtk-9.2.2_1
+libvtkImagingFourier-9.2.so.1 vtk-9.2.2_1
+libvtkImagingGeneral-9.2.so.1 vtk-9.2.2_1
+libvtkImagingHybrid-9.2.so.1 vtk-9.2.2_1
+libvtkImagingMath-9.2.so.1 vtk-9.2.2_1
+libvtkImagingMorphological-9.2.so.1 vtk-9.2.2_1
+libvtkImagingSources-9.2.so.1 vtk-9.2.2_1
+libvtkImagingStatistics-9.2.so.1 vtk-9.2.2_1
+libvtkImagingStencil-9.2.so.1 vtk-9.2.2_1
+libvtkInfovisCore-9.2.so.1 vtk-9.2.2_1
+libvtkInfovisLayout-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionImage-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionStyle-9.2.so.1 vtk-9.2.2_1
+libvtkInteractionWidgets-9.2.so.1 vtk-9.2.2_1
+libvtkIOAMR-9.2.so.1 vtk-9.2.2_1
+libvtkIOAsynchronous-9.2.so.1 vtk-9.2.2_1
+libvtkIOCesium3DTiles-9.2.so.1 vtk-9.2.2_1
+libvtkIOCGNSReader-9.2.so.1 vtk-9.2.2_1
+libvtkIOChemistry-9.2.so.1 vtk-9.2.2_1
+libvtkIOCityGML-9.2.so.1 vtk-9.2.2_1
+libvtkIOCONVERGECFD-9.2.so.1 vtk-9.2.2_1
+libvtkIOCore-9.2.so.1 vtk-9.2.2_1
+libvtkIOEnSight-9.2.so.1 vtk-9.2.2_1
+libvtkIOExodus-9.2.so.1 vtk-9.2.2_1
+libvtkIOExport-9.2.so.1 vtk-9.2.2_1
+libvtkIOExportGL2PS-9.2.so.1 vtk-9.2.2_1
+libvtkIOExportPDF-9.2.so.1 vtk-9.2.2_1
+libvtkIOGeometry-9.2.so.1 vtk-9.2.2_1
+libvtkIOHDF-9.2.so.1 vtk-9.2.2_1
+libvtkIOImage-9.2.so.1 vtk-9.2.2_1
+libvtkIOImport-9.2.so.1 vtk-9.2.2_1
+libvtkIOInfovis-9.2.so.1 vtk-9.2.2_1
+libvtkIOIOSS-9.2.so.1 vtk-9.2.2_1
+libvtkIOLegacy-9.2.so.1 vtk-9.2.2_1
+libvtkIOLSDyna-9.2.so.1 vtk-9.2.2_1
+libvtkIOMINC-9.2.so.1 vtk-9.2.2_1
+libvtkIOMotionFX-9.2.so.1 vtk-9.2.2_1
+libvtkIOMovie-9.2.so.1 vtk-9.2.2_1
+libvtkIONetCDF-9.2.so.1 vtk-9.2.2_1
+libvtkIOOggTheora-9.2.so.1 vtk-9.2.2_1
+libvtkIOParallel-9.2.so.1 vtk-9.2.2_1
+libvtkIOParallelXML-9.2.so.1 vtk-9.2.2_1
+libvtkIOPLY-9.2.so.1 vtk-9.2.2_1
+libvtkIOSegY-9.2.so.1 vtk-9.2.2_1
+libvtkIOSQL-9.2.so.1 vtk-9.2.2_1
+libvtkIOTecplotTable-9.2.so.1 vtk-9.2.2_1
+libvtkIOVeraOut-9.2.so.1 vtk-9.2.2_1
+libvtkIOVideo-9.2.so.1 vtk-9.2.2_1
+libvtkIOXML-9.2.so.1 vtk-9.2.2_1
+libvtkIOXMLParser-9.2.so.1 vtk-9.2.2_1
+libvtkkissfft-9.2.so.1 vtk-9.2.2_1
+libvtkParallelCore-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingAnnotation-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingContext2D-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingContextOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingCore-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingFreeType-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingGL2PSOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingHyperTreeGrid-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingImage-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLabel-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLICOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingLOD-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingSceneGraph-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingUI-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVolume-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVolumeOpenGL2-9.2.so.1 vtk-9.2.2_1
+libvtkRenderingVtkJS-9.2.so.1 vtk-9.2.2_1
+libvtksys-9.2.so.1 vtk-9.2.2_1
+libvtkTestingRendering-9.2.so.1 vtk-9.2.2_1
+libvtkViewsContext2D-9.2.so.1 vtk-9.2.2_1
+libvtkViewsCore-9.2.so.1 vtk-9.2.2_1
+libvtkViewsInfovis-9.2.so.1 vtk-9.2.2_1
 libvolume_key.so.1 volume_key-0.3.9_1
 librand48_r.so.0 rand48_r-0.1_1
 libxxhash.so.0 libxxHash-0.6.5_2
diff --git a/srcpkgs/vtk/patches/include.patch b/srcpkgs/vtk/patches/include.patch
deleted file mode 100644
index 008068b4deb8..000000000000
--- a/srcpkgs/vtk/patches/include.patch
+++ /dev/null
@@ -1,396 +0,0 @@
-Index: VTK-9.0.1/Common/Core/vtkGenericDataArrayLookupHelper.h
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkGenericDataArrayLookupHelper.h
-+++ VTK-9.0.1/Common/Core/vtkGenericDataArrayLookupHelper.h
-@@ -25,6 +25,7 @@
- #include "vtkIdList.h"
- #include <algorithm>
- #include <cmath>
-+#include <limits>
- #include <unordered_map>
- #include <vector>
- 
-Index: VTK-9.0.1/Common/DataModel/vtkPiecewiseFunction.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/vtkPiecewiseFunction.cxx
-+++ VTK-9.0.1/Common/DataModel/vtkPiecewiseFunction.cxx
-@@ -22,6 +22,7 @@
- #include <cassert>
- #include <cmath>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <vector>
- 
-Index: VTK-9.0.1/Rendering/Core/vtkColorTransferFunction.cxx
-===================================================================
---- VTK-9.0.1.orig/Rendering/Core/vtkColorTransferFunction.cxx
-+++ VTK-9.0.1/Rendering/Core/vtkColorTransferFunction.cxx
-@@ -21,6 +21,7 @@
- #include <algorithm>
- #include <cmath>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <vector>
- 
-Index: VTK-9.0.1/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-+++ VTK-9.0.1/Common/ComputationalGeometry/Testing/Cxx/UnitTestParametricSpline.cxx
-@@ -22,6 +22,7 @@
- #include "vtkSmartPointer.h"
- 
- #include <cmath>
-+#include <limits>
- 
- #include "vtkTestErrorObserver.h"
- 
-Index: VTK-9.0.1/Common/Core/Testing/Cxx/UnitTestMath.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Core/Testing/Cxx/UnitTestMath.cxx
-+++ VTK-9.0.1/Common/Core/Testing/Cxx/UnitTestMath.cxx
-@@ -24,6 +24,7 @@
- #include "vtkUnsignedCharArray.h"
- #include "vtkUnsignedShortArray.h"
- 
-+#include <limits>
- #include <vector>
- 
- static int TestPi();
-Index: VTK-9.0.1/Common/Core/vtkMersenneTwister.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Core/vtkMersenneTwister.cxx
-+++ VTK-9.0.1/Common/Core/vtkMersenneTwister.cxx
-@@ -28,6 +28,7 @@
- #include "vtkMultiThreader.h"
- #include "vtkNew.h"
- 
-+#include <limits>
- #include <map>
- 
- namespace
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/TestPentagonalPrism.cxx
-@@ -22,6 +22,7 @@
- #include "vtkCellArray.h"
- #include "vtkMathUtilities.h"
- #include "vtkPoints.h"
-+#include <limits>
- #include <map>
- #include <sstream>
- #include <string>
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestCells.cxx
-@@ -58,6 +58,7 @@
- #include "vtkMath.h"
- #include "vtkMathUtilities.h"
- #include "vtkPoints.h"
-+#include <limits>
- #include <map>
- #include <sstream>
- #include <string>
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitDataSet.cxx
-@@ -20,6 +20,7 @@
- #include "vtkTestErrorObserver.h"
- 
- #include <cstdio>
-+#include <limits>
- #include <sstream>
- 
- static vtkSmartPointer<vtkImageData> MakeVolume(int, int, int);
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestImplicitVolume.cxx
-@@ -20,6 +20,7 @@
- #include "vtkTestErrorObserver.h"
- 
- #include <cstdio>
-+#include <limits>
- #include <sstream>
- 
- static vtkSmartPointer<vtkImageData> MakeVolume(int, int, int);
-Index: VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-+++ VTK-9.0.1/Common/DataModel/Testing/Cxx/UnitTestLine.cxx
-@@ -19,6 +19,7 @@
- #include "vtkMath.h"
- #include "vtkMinimalStandardRandomSequence.h"
- #include "vtkSmartPointer.h"
-+#include <limits>
- 
- namespace
- {
-Index: VTK-9.0.1/Common/DataModel/vtkPolyhedron.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/DataModel/vtkPolyhedron.cxx
-+++ VTK-9.0.1/Common/DataModel/vtkPolyhedron.cxx
-@@ -33,6 +33,7 @@ PURPOSE.  See the above copyright notice
- #include "vtkVector.h"
- 
- #include <functional>
-+#include <limits>
- #include <map>
- #include <set>
- #include <unordered_map>
-Index: VTK-9.0.1/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-===================================================================
---- VTK-9.0.1.orig/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-+++ VTK-9.0.1/Common/Misc/Testing/Cxx/UnitTestFunctionParser.cxx
-@@ -22,6 +22,7 @@
- #include "vtkTestErrorObserver.h"
- 
- #include <algorithm>
-+#include <limits>
- #include <sstream>
- #include <string>
- #include <vector>
-Index: VTK-9.0.1/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-+++ VTK-9.0.1/Filters/FlowPaths/vtkEvenlySpacedStreamlines2D.cxx
-@@ -55,6 +55,7 @@ PURPOSE.  See the above copyright notice
- #include <array>
- #include <iostream>
- #include <iterator>
-+#include <limits>
- #include <vector>
- 
- vtkObjectFactoryNewMacro(vtkEvenlySpacedStreamlines2D);
-Index: VTK-9.0.1/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-+++ VTK-9.0.1/Filters/FlowPaths/vtkLagrangianMatidaIntegrationModel.cxx
-@@ -25,6 +25,7 @@
- #include "vtkStringArray.h"
- 
- #include <cstring>
-+#include <limits>
- 
- vtkObjectFactoryNewMacro(vtkLagrangianMatidaIntegrationModel);
- 
-Index: VTK-9.0.1/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-+++ VTK-9.0.1/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
-@@ -28,6 +28,7 @@
- #include "vtkHyperTreeGridNonOrientedCursor.h"
- 
- #include <cmath>
-+#include <limits>
- 
- vtkStandardNewMacro(vtkHyperTreeGridThreshold);
- 
-Index: VTK-9.0.1/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-+++ VTK-9.0.1/Filters/ParallelMPI/vtkDistributedPointCloudFilter.cxx
-@@ -31,6 +31,7 @@
- #include "vtkSmartPointer.h"
- 
- #include <algorithm>
-+#include <limits>
- 
- // Histogram precision to divide space in two
- static const int HISTOGRAM_SIZE = 1024;
-Index: VTK-9.0.1/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-+++ VTK-9.0.1/Filters/Points/Testing/Cxx/UnitTestKernels.cxx
-@@ -30,6 +30,7 @@
- #include "vtkVoronoiKernel.h"
- 
- #include <cmath>
-+#include <limits>
- #include <sstream>
- #include <string>
- 
-Index: VTK-9.0.1/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkEllipsoidalGaussianKernel.cxx
-@@ -22,6 +22,7 @@
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
- 
-+#include <limits>
- vtkStandardNewMacro(vtkEllipsoidalGaussianKernel);
- 
- //----------------------------------------------------------------------------
-Index: VTK-9.0.1/Filters/Points/vtkGaussianKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkGaussianKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkGaussianKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
- 
- vtkStandardNewMacro(vtkGaussianKernel);
- 
-Index: VTK-9.0.1/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkProbabilisticVoronoiKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
- 
- vtkStandardNewMacro(vtkProbabilisticVoronoiKernel);
- 
-Index: VTK-9.0.1/Filters/Points/vtkShepardKernel.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Points/vtkShepardKernel.cxx
-+++ VTK-9.0.1/Filters/Points/vtkShepardKernel.cxx
-@@ -21,6 +21,7 @@
- #include "vtkMathUtilities.h"
- #include "vtkObjectFactory.h"
- #include "vtkPointData.h"
-+#include <limits>
- 
- vtkStandardNewMacro(vtkShepardKernel);
- 
-Index: VTK-9.0.1/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-===================================================================
---- VTK-9.0.1.orig/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-+++ VTK-9.0.1/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx
-@@ -22,6 +22,7 @@
- #include "vtkTestUtilities.h"
- 
- #include "vtksys/SystemTools.hxx"
-+#include <limits>
- 
- // Perform a fuzzy compare of floats/doubles
- template <class A>
-Index: VTK-9.0.1/IO/CityGML/vtkCityGMLReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/CityGML/vtkCityGMLReader.cxx
-+++ VTK-9.0.1/IO/CityGML/vtkCityGMLReader.cxx
-@@ -46,6 +46,7 @@
- #include <cstdlib>
- #include <cstring>
- #include <iostream>
-+#include <limits>
- #include <sstream>
- #include <stdexcept>
- #include <string>
-Index: VTK-9.0.1/IO/GDAL/vtkGDALRasterReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/GDAL/vtkGDALRasterReader.cxx
-+++ VTK-9.0.1/IO/GDAL/vtkGDALRasterReader.cxx
-@@ -48,6 +48,7 @@
- #include <cassert>
- #include <cmath>
- #include <iostream>
-+#include <limits>
- #include <sstream>
- #include <vector>
- 
-Index: VTK-9.0.1/IO/Geometry/vtkSTLWriter.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/Geometry/vtkSTLWriter.cxx
-+++ VTK-9.0.1/IO/Geometry/vtkSTLWriter.cxx
-@@ -34,6 +34,7 @@
- #include <io.h> /* unlink */
- #endif
- 
-+#include <limits>
- namespace
- {
- // For C format strings
-Index: VTK-9.0.1/IO/NetCDF/vtkNetCDFCAMReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/NetCDF/vtkNetCDFCAMReader.cxx
-+++ VTK-9.0.1/IO/NetCDF/vtkNetCDFCAMReader.cxx
-@@ -32,6 +32,7 @@
- #include "vtkStreamingDemandDrivenPipeline.h"
- #include "vtkUnstructuredGrid.h"
- 
-+#include <limits>
- #include <set>
- #include <sstream>
- #include <vector>
-Index: VTK-9.0.1/IO/TecplotTable/vtkTecplotTableReader.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/TecplotTable/vtkTecplotTableReader.cxx
-+++ VTK-9.0.1/IO/TecplotTable/vtkTecplotTableReader.cxx
-@@ -35,6 +35,7 @@
- #include <algorithm>
- #include <iostream>
- #include <iterator>
-+#include <limits>
- #include <set>
- #include <sstream>
- #include <stdexcept>
-Index: VTK-9.0.1/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-===================================================================
---- VTK-9.0.1.orig/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-+++ VTK-9.0.1/IO/XML/Testing/Cxx/TestXMLWriteRead.cxx
-@@ -20,6 +20,7 @@
- #include "vtkPoints.h"
- 
- #include "vtkTestUtilities.h"
-+#include <limits>
- #include <string>
- 
- namespace
-Index: VTK-9.0.1/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-===================================================================
---- VTK-9.0.1.orig/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-+++ VTK-9.0.1/Rendering/OpenGL2/vtkOpenGLInstanceCulling.cxx
-@@ -31,6 +31,7 @@
- 
- #include <algorithm>
- #include <array>
-+#include <limits>
- #include <sstream>
- 
- vtkStandardNewMacro(vtkOpenGLInstanceCulling);
-Index: VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-===================================================================
---- VTK-9.0.1.orig/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-+++ VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/StorageBasic.cxx
-@@ -35,6 +35,7 @@
- 
- #include <cstddef>
- #include <cstdlib>
-+#include <limits>
- 
- namespace vtkm
- {
-Index: VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-===================================================================
---- VTK-9.0.1.orig/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-+++ VTK-9.0.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/worklet/testing/UnitTestKdTreeBuildNNS.cxx
-@@ -11,6 +11,7 @@
- #include <random>
- #include <vtkm/cont/Algorithm.h>
- #include <vtkm/worklet/KdTree3D.h>
-+#include <limits>
- 
- namespace
- {
-Index: VTK-9.0.1/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-===================================================================
---- VTK-9.0.1.orig/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-+++ VTK-9.0.1/Utilities/MetaIO/vtkmetaio/metaObject.cxx
-@@ -19,6 +19,7 @@
- #if defined (__BORLANDC__) && (__BORLANDC__ >= 0x0580)
- #include <mem.h>
- #endif
-+#include <limits>
- 
- #if (METAIO_USE_NAMESPACE)
- namespace METAIO_NAMESPACE {
diff --git a/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch b/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
deleted file mode 100644
index b95015c859cf..000000000000
--- a/srcpkgs/vtk/patches/vtk-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
+++ /dev/null
@@ -1,19 +0,0 @@
- https://gitlab.kitware.com/vtk/vtk/-/issues/18033
---- VTK/ThirdParty/freetype/vtk_freetype.h.in.orig
-+++ VTK/ThirdParty/freetype/vtk_freetype.h.in
-@@ -20,6 +20,15 @@
- 
- #ifdef VTK_USE_SYSTEM_FREETYPE
- # include <ft2build.h>
-+/* FT_CALLBACK_DEF no longer exported since freetype-2.10.3 */
-+/* has been moved to <freetype/internal/compiler-macros.h> */
-+# ifndef FT_CALLBACK_DEF
-+#  ifdef __cplusplus
-+#   define FT_CALLBACK_DEF( x )  extern "C"  x
-+#  else
-+#   define FT_CALLBACK_DEF( x )  static  x
-+#  endif
-+# endif /* FT_CALLBACK_DEF */
- #else
- # include <vtkfreetype/include/ft2build.h>
- #endif
diff --git a/srcpkgs/vtk/patches/vtkeigen-disable-build-type-check.patch b/srcpkgs/vtk/patches/vtkeigen-disable-build-type-check.patch
new file mode 100644
index 000000000000..a89ee8ffd21c
--- /dev/null
+++ b/srcpkgs/vtk/patches/vtkeigen-disable-build-type-check.patch
@@ -0,0 +1,19 @@
+"CMake Error at ThirdParty/eigen/vtkeigen/CMakeLists.txt:28 (message): Unknown build type "None".  Allowed values are Debug, Release, RelWithDebInfo (case-insensitive)."
+
+diff --git a/ThirdParty/eigen/vtkeigen/CMakeLists.txt b/ThirdParty/eigen/vtkeigen/CMakeLists.txt
+index 1f97f20a..10173ad4 100644
+--- a/ThirdParty/eigen/vtkeigen/CMakeLists.txt
++++ b/ThirdParty/eigen/vtkeigen/CMakeLists.txt
+@@ -21,12 +21,6 @@ if (NOT CMAKE_BUILD_TYPE)
+   set(CMAKE_BUILD_TYPE "Release")
+ endif()
+
+-string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_tolower)
+-if(    NOT cmake_build_type_tolower STREQUAL "debug"
+-   AND NOT cmake_build_type_tolower STREQUAL "release"
+-   AND NOT cmake_build_type_tolower STREQUAL "relwithdebinfo")
+-  message(FATAL_ERROR "Unknown build type \"${CMAKE_BUILD_TYPE}\". Allowed values are Debug, Release, RelWithDebInfo (case-insensitive).")
+-endif()
+
+
+ #############################################################################
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
new file mode 100644
index 000000000000..24820d76c17b
--- /dev/null
+++ b/srcpkgs/vtk/patches/vtkioss-unistd.patch
@@ -0,0 +1,25 @@
+Build fails on musl-based Linux distributions.
+
+diff --git a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
+index ca5f15de..99c2bbdd 100644
+--- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
++++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
+@@ -26,7 +26,7 @@
+ #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
+ #endif
+ #else
+-#include <sys/unistd.h>
++#include <unistd.h>
+ #endif
+ 
+ #ifdef SEACAS_HAVE_MPI
+@@ -35,9 +35,6 @@
+ 
+ #include <cstdio>
+ #include <sys/stat.h>
+-#ifndef _MSC_VER
+-#include <unistd.h>
+-#endif
+ 
+ namespace {
+   bool internal_access(const std::string &name, int mode);
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index eff6e114c7b6..824ba4c91a85 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,15 +1,19 @@
 # Template file for 'vtk'
 pkgname=vtk
-version=9.0.1
-revision=8
+version=9.2.2
+revision=1
 build_style=cmake
 # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
 # Build only the core modules plus python bindings for now
 configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
- -DVTK_USE_EXTERNAL=ON
+ -DVTK_USE_EXTERNAL=OFF
  -DVTK_MODULE_USE_EXTERNAL_VTK_utf8=OFF
  -DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF
  -DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_fmt=OFF
+ -DVTK_MODULE_USE_EXTERNAL_vtknlohmannjson=OFF
+ -DVTK_MODULE_USE_EXTERNAL_vtkeigen=OFF
  -DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
 # vtk forks libharu, bumps to v2.4.0, and requires libharu>=2.4.0
 makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
@@ -22,7 +26,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="BSD-3-Clause"
 homepage="https://www.vtk.org"
 distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=1b39a5e191c282861e7af4101eaa8585969a2de05f5646c9199a161213a622c7
+checksum=1c5b0a2be71fac96ff4831af69e350f7a0ea3168981f790c000709dcf9121075
 nocross="hdf5 is nocross"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
@@ -46,7 +50,7 @@ post_install() {
 
 	# Mangle CPython extension names in CMake like xbps-src will do
 	vsed -e 's,\(vtkmodules/vtk.*\)\.cpython-.*\.so,\1.so,' \
-		-i "${DESTDIR}/usr/lib/cmake/vtk-9.0/VTKPython-targets-none.cmake"
+		-i "${DESTDIR}/usr/lib/cmake/vtk-9.2/VTKPython-targets-none.cmake"
 }
 
 vtk-devel_package() {
@@ -66,6 +70,6 @@ vtk-python3_package() {
 		vmove usr/bin/vtkpython
 		vmove "${py3_sitelib}"
 		vmove "usr/lib/lib*Python*.so.*"
-		vmove "usr/lib/vtk/hierarchy/VTK/vtk*Python*.txt"
+		vmove "usr/lib/vtk-9.2/hierarchy/VTK/vtk*Python*.txt"
 	}
 }

From d60ef17e20a8bb9d1051a4f3c5d98c2a4dbe60b8 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Thu, 10 Nov 2022 00:36:56 +0100
Subject: [PATCH 2/3] freecad: rebuild for vtk 9.2.2

---
 srcpkgs/freecad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 822c07ed0afc..be1fbfde6483 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
 # Template file for 'freecad'
 pkgname=freecad
 version=0.20.1
-revision=5
+revision=6
 build_style=cmake
 
 _inst_prefix=/usr/lib/${pkgname}

From e620c9fbd9a908846e213d2fd9bfb5672b7ad14b Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Thu, 10 Nov 2022 00:37:27 +0100
Subject: [PATCH 3/3] opencamlib: rebuild for vtk 9.2.2

---
 srcpkgs/opencamlib/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opencamlib/template b/srcpkgs/opencamlib/template
index 162a97304c26..2536d57764f1 100644
--- a/srcpkgs/opencamlib/template
+++ b/srcpkgs/opencamlib/template
@@ -1,7 +1,7 @@
 # Template file for 'opencamlib'
 pkgname=opencamlib
 version=2019.07
-revision=6
+revision=7
 build_style=cmake
 configure_args="-DBUILD_PY_LIB=ON -DUSE_PY_3=ON -DVERSION_STRING=${version}"
 hostmakedepends="python3"