gnu: vtk: Update to 9.6.0 and add vtk-9.5.

* gnu/packages/image-processing.scm (vtk): Update to 9.6.0.
[origin]: Adapt snippet.
(vtk-9.5): Add back the previous version.
* gnu/packages/graphics.scm (f3d)[inputs],
* gnu/packages/engineering.scm (freecad)[inputs],
* gnu/packages/image-processing.scm (itk-snap)[inputs]:
Replace vtk by vtk-9.5.

Change-Id: I5f5d519b876b525f6a99c39b3453bbb677c01e95

3 files changed, 31 insertions, 6 deletions

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 340b5834bcd..a9cc5011a94 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -3334,7 +3334,7 @@ dynamics is used by FreeCAD 1.0.0 for its new Assembly workbench.")
            qtxmlpatterns-5
            sqlite
            onetbb                       ;same version as opencascade-occt
-           vtk
+           vtk-9.5
            xerces-c
            yaml-cpp
            zlib))
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 732213336f4..2d209eb4ad7 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -3389,7 +3389,7 @@ desired local properties.")
            netcdf
            opencascade-occt
            openexr
-           vtk
+           vtk-9.5
            zlib))
     (home-page "https://f3d.app/")
     (synopsis "VTK-based 3D viewer")
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index 77b3a5cb8a9..5938f3961f9 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -353,7 +353,7 @@ many popular formats.")
 (define-public vtk
   (package
     (name "vtk")
-    (version "9.5.2")
+    (version "9.6.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://vtk.org/files/release/"
@@ -361,7 +361,7 @@ many popular formats.")
                                   "/VTK-" version ".tar.gz"))
               (sha256
                (base32
-                "12f9cbazgxrm71r4fpdlxk0mlpgzim2i7vziv8177zvhsac4prnf"))
+                "1wmq7cd6c60hp7xip08mjrwhwygna4vabfbqcn0xrbzsjh31hzfp"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -370,7 +370,7 @@ many popular formats.")
                      (delete-file-recursively
                       (string-append "ThirdParty/" dir "/vtk" dir)))
                    ;; pugixml depended upon unconditionally
-                   '("doubleconversion" "eigen" "expat" "freetype" "gl2ps"
+                   '("eigen" "expat" "freetype" "gl2ps"
                      "hdf5" "jpeg" "jsoncpp" "libharu" "libproj"
                      "libxml2" "lz4" "netcdf" "ogg" "png" "sqlite" "theora"
                      "tiff" "zlib"))))))
@@ -482,6 +482,31 @@ a suite of 3D interaction widgets, supports parallel processing, and
 integrates with various databases on GUI toolkits such as Qt and Tk.")
     (license license:bsd-3)))
 
+(define-public vtk-9.5
+  (package
+    (inherit vtk)
+    (version "9.5.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://vtk.org/files/release/"
+                                  (version-major+minor version)
+                                  "/VTK-" version ".tar.gz"))
+              (sha256
+               (base32
+                "12f9cbazgxrm71r4fpdlxk0mlpgzim2i7vziv8177zvhsac4prnf"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  (for-each
+                   (lambda (dir)
+                     (delete-file-recursively
+                      (string-append "ThirdParty/" dir "/vtk" dir)))
+                   ;; pugixml depended upon unconditionally
+                   '("doubleconversion" "eigen" "expat" "freetype" "gl2ps"
+                     "hdf5" "jpeg" "jsoncpp" "libharu" "libproj"
+                     "libxml2" "lz4" "netcdf" "ogg" "png" "sqlite" "theora"
+                     "tiff" "zlib"))))))))
+
 (define-public vtk-9.4
   (package
     (inherit vtk)
@@ -1727,7 +1752,7 @@ combine the information contained in both.")
            qtbase
            qtdeclarative
            qtwayland
-           vtk))
+           vtk-9.5))
     (native-inputs
      (list
       doxygen