Update vtk:9.1 patches

4 files changed, 5 insertions, 64 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f0da9cde8418..19a282c88dcc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -38,16 +38,14 @@ pkgbase = elmerfem-git
 	source = elmerfem.desktop
 	source = arpack.patch
 	source = print_target_properties.patch
-	source = vtk9.cmake.patch
-	source = vtk9.1.patch
+	source = vtk9.1.patch::https://github.com/ElmerCSC/elmerfem/pull/308.patch
 	source = cmake-fix.patch::https://github.com/ElmerCSC/elmerfem/pull/309.patch
 	source = FindMMG.patch
 	sha256sums = SKIP
 	sha256sums = f4b39389e5f258c7860b8d7a6b171fb54bf849dc772f640ac5e7a12c7a384aca
 	sha256sums = 04e73a99d7e8d501a2c7c5211a83257137a30a8b1b5c2f7c7ff6304e0e0a6da9
 	sha256sums = da0245b22e305591913e1f78c5808a2aa33b9380a6052e5596fc16280234aac0
-	sha256sums = 2a8577c6f5f0a44d9d4758dc603b6bc7d4d1e8160d2412370f4ab4e3944766e9
-	sha256sums = f995a09fb8999ccb965c7dfe1de602e99a630b84f6ca260b2bdfece1372aeceb
+	sha256sums = 5b72df017d8a5c1d482798d9fcd72e92c319844123f4a2dab57db56d340f998e
 	sha256sums = 1e2c5b810dc9388f837d79c25a419d3ab250fa084b7b8f1d5b6cbe9b8dd537bf
 	sha256sums = 89b0e79ca1ad8952839d0578cdbce86ea4dad46e3c68aa1ce5b8b83bcff94e57
 
diff --git a/PKGBUILD b/PKGBUILD
index 876fbbf71221..3fd4d54496c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -111,8 +111,7 @@ source=("git+https://github.com/ElmerCSC/elmerfem.git${_fragment}"
         "$_pkgname.desktop"
         "arpack.patch"
         "print_target_properties.patch"
-        "vtk9.cmake.patch"
-        "vtk9.1.patch"
+        "vtk9.1.patch::https://github.com/ElmerCSC/elmerfem/pull/308.patch"
         "cmake-fix.patch::https://github.com/ElmerCSC/elmerfem/pull/309.patch"
         "FindMMG.patch")
 
@@ -120,8 +119,7 @@ sha256sums=('SKIP'
             'f4b39389e5f258c7860b8d7a6b171fb54bf849dc772f640ac5e7a12c7a384aca'
             '04e73a99d7e8d501a2c7c5211a83257137a30a8b1b5c2f7c7ff6304e0e0a6da9'
             'da0245b22e305591913e1f78c5808a2aa33b9380a6052e5596fc16280234aac0'
-            '2a8577c6f5f0a44d9d4758dc603b6bc7d4d1e8160d2412370f4ab4e3944766e9'
-            'f995a09fb8999ccb965c7dfe1de602e99a630b84f6ca260b2bdfece1372aeceb'
+            '5b72df017d8a5c1d482798d9fcd72e92c319844123f4a2dab57db56d340f998e'
             '1e2c5b810dc9388f837d79c25a419d3ab250fa084b7b8f1d5b6cbe9b8dd537bf'
             '89b0e79ca1ad8952839d0578cdbce86ea4dad46e3c68aa1ce5b8b83bcff94e57')
 
@@ -133,7 +131,7 @@ prepare() {
   cd "$srcdir/$_pkgname"
   sed -i 's/1 depth/1 ${depth}/g' fem/tests/CMakeLists.txt
   sed -i 's/FALSE/false/g' ElmerGUI/Application/vtkpost/matc.cpp
-  ((!DISABLE_VTK)) && patch+=(vtk9{.cmake,.1}.patch)
+  ((!DISABLE_VTK)) && patch+=(vtk9.1.patch)
   ((!DISABLE_MMG)) && patch+=({FindMMG,print_target_properties}.patch)
   for patch in "${srcdir}"/{arpack,cmake-fix}.patch "${patch[@]/#/${srcdir}/}"
   do msg2 "Apply: ${patch##*/}"; git apply -v "$patch"
diff --git a/vtk9.1.patch b/vtk9.1.patch
deleted file mode 100644
index a704a26b7651..000000000000
--- a/vtk9.1.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/ElmerGUI/Application/cad/cadview.h b/ElmerGUI/Application/cad/cadview.h
-index c2a474b8..19f90b63 100644
---- a/ElmerGUI/Application/cad/cadview.h
-+++ b/ElmerGUI/Application/cad/cadview.h
-@@ -58,10 +58,7 @@ namespace nglib {
- #include <BRepMesh_IncrementalMesh.hxx>

- #endif

- 

--#include "vtkConfigure.h"

--#ifndef VTK_MAJOR_VERSION

- #include "vtkVersionMacros.h"

--#endif

- 

- class QMenu;

- class QAction;

-diff --git a/ElmerGUI/Application/vtkpost/vtkpost.h b/ElmerGUI/Application/vtkpost/vtkpost.h
-index 83b3574a..55c9c094 100755
---- a/ElmerGUI/Application/vtkpost/vtkpost.h
-+++ b/ElmerGUI/Application/vtkpost/vtkpost.h
-@@ -57,10 +57,7 @@
- #include <gui/PythonQtScriptingConsole.h>

- #endif

- 

--#include "vtkConfigure.h"

--#ifndef VTK_MAJOR_VERSION

- #include "vtkVersionMacros.h"

--#endif

- 

- class EpMesh;

- class ScalarField;

diff --git a/vtk9.cmake.patch b/vtk9.cmake.patch
deleted file mode 100644
index 5676bbc4c0a4..000000000000
--- a/vtk9.cmake.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/ElmerGUI/CMakeLists.txt b/ElmerGUI/CMakeLists.txt
-index 8b520162..68b0a6c3 100644
---- a/ElmerGUI/CMakeLists.txt
-+++ b/ElmerGUI/CMakeLists.txt
-@@ -90,7 +90,7 @@ ENDIF()
- 
- IF(WITH_VTK)
-   # ADD_DEFINITIONS(-DEG_VTK)
--  FIND_PACKAGE(VTK REQUIRED)
-+  FIND_PACKAGE(VTK REQUIRED ViewsQt FiltersParallel RenderingAnnotation RenderingFreeType IOXML IOImage FiltersParallelFlowPaths)
-   INCLUDE(${VTK_USE_FILE})
-   MESSAGE(STATUS "  [ElmerGUI] VTK version:       " ${VTK_VERSION})
-   MESSAGE(STATUS "  [ElmerGUI] VTK_LIBS:          " "${VTK_LIBRARIES}")
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5b8d2abc..e552ece4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -364,6 +364,7 @@ ENDIF(WITH_Zoltan)
- MESSAGE(STATUS "------------------------------------------------")
- MESSAGE(STATUS "Mesh adaptation 2D/3D looking for [Mmg] tools ")
- 
-+FIND_PACKAGE(VTK REQUIRED ViewsQt)
- FIND_PACKAGE(MMG)
- # INCLUDE("cmake/Modules/FindMMG.cmake")
- # INCLUDE_DIRECTORIES(${MMG_INCLUDE_DIR})