branch master updated: gnu: ogs-serial: Use vtk instead of vtk-9.3.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

guix_mirror_bot pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 4b5932da6d gnu: ogs-serial: Use vtk instead of vtk-9.3.
4b5932da6d is described below

commit 4b5932da6d0bf3f8987643f8c1271d1816cba698
Author: Lars Bilke <lars.bi...@ufz.de>
AuthorDate: Mon Feb 16 09:27:06 2026 +0100

    gnu: ogs-serial: Use vtk instead of vtk-9.3.
    
    * gnu/packages/geo.scm (ogs-serial)[source]: Add patch.
    * gnu/packages/patches/ogs-6.5.7-netcdfconverter.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Register patch.
    
    Change-Id: I1301a2d77e2e30317c96947d3d37324df7489718
    Signed-off-by: Andreas Enge <andr...@enge.fr>
---
 gnu/local.mk                                       |  1 +
 gnu/packages/geo.scm                               |  6 ++++--
 .../patches/ogs-6.5.7-netcdfconverter.patch        | 23 ++++++++++++++++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 850abf21a4..2c303b0575 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1996,6 +1996,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/ocaml-4.07-dynamically-allocate-signal-stack.patch      
\
   %D%/packages/patches/ocaml-4.09-dynamically-allocate-signal-stack.patch      
\
   %D%/packages/patches/ocaml-4.09-multiple-definitions.patch   \
+  %D%/packages/patches/ogs-6.5.7-netcdfconverter.patch \
   %D%/packages/patches/omake-fix-non-determinism.patch \
   %D%/packages/patches/oneko-remove-nonfree-characters.patch   \
   %D%/packages/patches/onetbb-other-arches.patch       \
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index f532ac5222..fdec1f424f 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -901,7 +901,9 @@ OpenGeoSys")
               (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1wflgkbcsa4sr8g63img0ld6h4jm1b7hjzsa2m4gsbzc6j7kd41w"))))
+        (base32 "1wflgkbcsa4sr8g63img0ld6h4jm1b7hjzsa2m4gsbzc6j7kd41w"))
+       ;; Remove patch on next release, likely 6.5.8
+       (patches (search-patches "ogs-6.5.7-netcdfconverter.patch"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -955,7 +957,7 @@ OpenGeoSys")
            spdlog
            tclap
            tfel
-           vtk-9.3
+           vtk
            xmlpatch
            zlib))
     (propagated-inputs
diff --git a/gnu/packages/patches/ogs-6.5.7-netcdfconverter.patch 
b/gnu/packages/patches/ogs-6.5.7-netcdfconverter.patch
new file mode 100644
index 0000000000..bc64a44993
--- /dev/null
+++ b/gnu/packages/patches/ogs-6.5.7-netcdfconverter.patch
@@ -0,0 +1,23 @@
+Upstream fix
+
+https://gitlab.opengeosys.org/ogs/ogs/-/commit/9a8399b0d3cff032e70fe79a85dc35c4e7c662f2
+
+diff --git a/Applications/Utils/FileConverter/NetCdfConverter.cpp 
b/Applications/Utils/FileConverter/NetCdfConverter.cpp
+index c6fb9f151d..622bd2cd54 100644
+--- a/Applications/Utils/FileConverter/NetCdfConverter.cpp
++++ b/Applications/Utils/FileConverter/NetCdfConverter.cpp
+@@ -232,11 +232,12 @@ static bool dimensionSelectionLoop(NcVar const& var,
+     if (n_dims > 1)
+     {
+         std::string temp_str("");
+-        cout << "Is the parameter time-dependent?\n";
++        std::cout << "Is the parameter time-dependent?\n";
+         while (dim_idx_map[0] == std::numeric_limits<std::size_t>::max() &&
+                is_time_dep == true)
+         {
+-            cout << "Enter ID for temporal dimension or \"c\" to continue: ";
++            std::cout
++                << "Enter ID for temporal dimension or \"c\" to continue: ";
+             std::getline(std::cin, temp_str);
+             std::stringstream str_stream(temp_str);
+             if (str_stream.str() == "c" || str_stream.str() == "continue")