From d0fb2b8b29fe0428d9dd8aa790b0d6e45c8a9516 Mon Sep 17 00:00:00 2001
From: Adrian Insaurralde Avalos <adrianinsaval@gmail.com>
Date: Wed, 22 Nov 2023 16:42:06 -0300
Subject: [PATCH] 3rdPart/salomesmesh - fix for vtk 9.3 compatibility

minimum required version is 7.1
---
 src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx                 | 4 ----
 src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx b/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx
index 7f89573efd0d..47a52fe585fe 100644
--- a/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx
+++ b/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx
@@ -39,10 +39,6 @@
  #define SMDS_EXPORT
 #endif
 
-#ifdef VTK_HAS_MTIME_TYPE
 #define VTK_MTIME_TYPE vtkMTimeType
-#else
-#define VTK_MTIME_TYPE unsigned long
-#endif
 
 #endif
diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
index 7e3de0070a02..e9895d615717 100644
--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
+++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
@@ -1026,7 +1026,12 @@ void SMDS_UnstructuredGrid::BuildLinks()
   GetLinks()->Allocate(this->GetNumberOfPoints());
   GetLinks()->Register(this);
 //FIXME: vtk9
+  #if VTK_VERSION_NUMBER < VTK_VERSION_CHECK(9,3,0)
   GetLinks()->BuildLinks(this);
+  #else
+  GetLinks()->SetDataSet(this);
+  GetLinks()->BuildLinks();
+  #endif
   GetLinks()->Delete();
 #else
   this->Links = SMDS_CellLinks::New();class='form'><form class='right' method='get' action='/guix/log/nix/libstore/worker-protocol.hh'>
<input type='hidden' name='id' value='8f36612d5b94616a7fbc3ae65b5cf331b2853e2c'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=8f36612d5b94616a7fbc3ae65b5cf331b2853e2c'>root</a>/<a href='/guix/log/nix?id=8f36612d5b94616a7fbc3ae65b5cf331b2853e2c'>nix</a>/<a href='/guix/log/nix/libstore?id=8f36612d5b94616a7fbc3ae65b5cf331b2853e2c'>libstore</a>/<a href='/guix/log/nix/libstore/worker-protocol.hh?id=8f36612d5b94616a7fbc3ae65b5cf331b2853e2c'>worker-protocol.hh</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/nix/libstore/worker-protocol.hh?id=8f36612d5b94616a7fbc3ae65b5cf331b2853e2c&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-12-11 23:18:53 +0100'>2023-12-11</span></td><td><a href='/guix/commit/nix/libstore/worker-protocol.hh?id=1e47148f46e31eb99ce8ec7bc12232cf50d0ebec'>daemon: Implement ‘substitute-urls’ RPC.</a><span class='msg-avail'>...<span class='msg-tooltip'>* nix/libstore/worker-protocol.hh (PROTOCOL_VERSION): Bump.
(WorkerOp): Add ‘wopSubstituteURLs’.
* nix/nix-daemon/nix-daemon.cc (performOp): Implement it.
* guix/store.scm (%protocol-version): Bump.
(operation-id): Add ‘substitute-urls’.
(substitute-urls): New procedure.
* tests/store.scm ("substitute-urls, default")
("substitute-urls, client-specified URLs")
("substitute-urls, disabled"): New tests.

Change-Id: I2c0119500c3a1eecfa5ebf32463ffb0f173161de
</span></span></td><td>Ludovic Courtès</td></tr>