From 757eb67b9a439467a0aeda6f8e32b39708c41056 Mon Sep 17 00:00:00 2001
From: Charles Gueunet <charles.gueunet@kitware.com>
Date: Fri, 17 Feb 2023 13:40:50 +0100
Subject: [PATCH] Update to VTK 9.2 in preparation for mangling

---
 CMakeLists.txt                                         |  7 +++----
 tplMirror/VTK-9.1.0-duplicate-points-fix.patch         | 10 ----------
 tplMirror/VTK-9.1.0.tar.gz                             |  3 ---
 ...9.1.0-cmake-fix.patch => VTK-9.2.5-cmake-fix.patch} |  8 --------
 ...ble_traits.patch => VTK-9.2.5-disable_traits.patch} |  0
 tplMirror/VTK-9.2.5.tar.gz                             |  3 +++
 6 files changed, 6 insertions(+), 25 deletions(-)
 delete mode 100644 tplMirror/VTK-9.1.0-duplicate-points-fix.patch
 delete mode 100644 tplMirror/VTK-9.1.0.tar.gz
 rename tplMirror/{VTK-9.1.0-cmake-fix.patch => VTK-9.2.5-cmake-fix.patch} (79%)
 rename tplMirror/{VTK-9.1.0-disable_traits.patch => VTK-9.2.5-disable_traits.patch} (100%)
 create mode 100644 tplMirror/VTK-9.2.5.tar.gz

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98b7663f..d6604dc2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1072,7 +1072,7 @@ endif()
 ################################
 if( ENABLE_VTK )
     set( VTK_DIR "${CMAKE_INSTALL_PREFIX}/vtk" )
-    set( VTK_URL "${TPL_MIRROR_DIR}/VTK-9.1.0.tar.gz" )
+    set( VTK_URL "${TPL_MIRROR_DIR}/VTK-9.2.5.tar.gz" )
 
     message( STATUS "Building VTK found at ${VTK_URL}" )
 
@@ -1100,9 +1100,8 @@ endif( ENABLE_MPI )
                          PREFIX ${PROJECT_BINARY_DIR}/vtk
                          URL ${VTK_URL}
                          INSTALL_DIR ${VTK_DIR}
-                         PATCH_COMMAND patch -p0 < ${TPL_MIRROR_DIR}/VTK-9.1.0-disable_traits.patch
-                               COMMAND patch -p0 < ${TPL_MIRROR_DIR}/VTK-9.1.0-duplicate-points-fix.patch
-                               COMMAND patch -p0 < ${TPL_MIRROR_DIR}/VTK-9.1.0-cmake-fix.patch
+                         PATCH_COMMAND patch -p0 < ${TPL_MIRROR_DIR}/VTK-9.2.5-disable_traits.patch
+                               COMMAND patch -p0 < ${TPL_MIRROR_DIR}/VTK-9.2.5-cmake-fix.patch
                          BUILD_COMMAND ${TPL_BUILD_COMMAND}
                          INSTALL_COMMAND "${TPL_INSTALL_COMMAND}"
                          CMAKE_GENERATOR ${TPL_GENERATOR}
diff --git a/tplMirror/VTK-9.1.0-duplicate-points-fix.patch b/tplMirror/VTK-9.1.0-duplicate-points-fix.patch
deleted file mode 100644
index 5ea9b6ca..00000000
--- a/tplMirror/VTK-9.1.0-duplicate-points-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Filters/ParallelDIY2/vtkRedistributeDataSetFilter.cxx	2022-03-08 00:35:31.589443296 -0800
-+++ Filters/ParallelDIY2/vtkRedistributeDataSetFilter.cxx.patched	2022-03-08 00:36:27.214917422 -0800
-@@ -518,6 +518,7 @@
-   {
-     assert(vtkUnstructuredGrid::SafeDownCast(outputDO) != nullptr);
-     vtkNew<vtkAppendFilter> appender;
-+    appender->MergePointsOn();
- 
-     using Opts = vtk::DataObjectTreeOptions;
-     for (vtkDataObject* part : vtk::Range(result.GetPointer(),
diff --git a/tplMirror/VTK-9.1.0.tar.gz b/tplMirror/VTK-9.1.0.tar.gz
deleted file mode 100644
index 09373933..00000000
--- a/tplMirror/VTK-9.1.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8fed42f4f8f1eb8083107b68eaa9ad71da07110161a3116ad807f43e5ca5ce96
-size 47871165
diff --git a/tplMirror/VTK-9.1.0-cmake-fix.patch b/tplMirror/VTK-9.2.5-cmake-fix.patch
similarity index 79%
rename from tplMirror/VTK-9.1.0-cmake-fix.patch
rename to tplMirror/VTK-9.2.5-cmake-fix.patch
index 7ffc4e06..3e6b6f63 100644
--- a/tplMirror/VTK-9.1.0-cmake-fix.patch
+++ b/tplMirror/VTK-9.2.5-cmake-fix.patch
@@ -19,11 +19,3 @@
        string(APPEND _MPI_${LANG}_LINK_FLAGS ">")
      endif ()
      set_property(TARGET MPI::MPI_${LANG} PROPERTY INTERFACE_LINK_OPTIONS "${_MPI_${LANG}_LINK_FLAGS}")
-@@ -1823,7 +1824,6 @@
- find_package_handle_standard_args(MPI
-     REQUIRED_VARS ${_MPI_REQ_VARS}
-     VERSION_VAR ${_MPI_MIN_VERSION}
--    REASON_FAILURE_MESSAGE "${_MPI_FAIL_REASON}"
-     HANDLE_COMPONENTS)
- 
- #=============================================================================
diff --git a/tplMirror/VTK-9.1.0-disable_traits.patch b/tplMirror/VTK-9.2.5-disable_traits.patch
similarity index 100%
rename from tplMirror/VTK-9.1.0-disable_traits.patch
rename to tplMirror/VTK-9.2.5-disable_traits.patch
diff --git a/tplMirror/VTK-9.2.5.tar.gz b/tplMirror/VTK-9.2.5.tar.gz
new file mode 100644
index 00000000..b46b4a57
--- /dev/null
+++ b/tplMirror/VTK-9.2.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:128d601baa980e98ee034207974b33fb38d2c98ab9cf4a5756efdb09ed6c0949
+size 53807732