From 0cb6b9a5a530b7fa3506bf9de05d09b1e6d556c9 Mon Sep 17 00:00:00 2001
From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Wed, 10 May 2023 13:21:17 +0200
Subject: [PATCH] FD38: gmsh fix

---
 applications/SALOME-master-native.pyconf     |  3 ++-
 products/gmsh.pyconf                         |  7 ++++++
 products/patches/gmsh-4.10.3-gc13-fc38.patch | 23 ++++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 products/patches/gmsh-4.10.3-gc13-fc38.patch

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 2bdadee..1ea1cc3 100644
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -332,8 +332,9 @@ __overwrite__ :
         'APPLICATION.products.PyFMI'            : {tag: '2.6',       base: 'no', section: 'version_2_6_FD38'                    }
         'APPLICATION.products.medfile'          : {tag: '4.1.1',     base: 'no', section: 'version_4_1_1_FD38'                  }
         'APPLICATION.products.catalyst'         : {tag: '2.0',       base: 'no', section: 'version_2_0_FD38'                    }
+        'APPLICATION.products.gmsh'             : {tag: '4.10.3',    base: 'no', section: 'version_4_10_3_FD38'                 }
         'APPLICATION.products.ParaView'         : {tag: '5.11.0',    base: 'no', section: 'version_5_11_0_MPI_FD38', hpc: 'yes' }
         'APPLICATION.products.CONFIGURATION'    : {tag:'master',     base: 'no', section: 'default'                             }
-        'APPLICATION.products.SHAPER'           : {tag:'master',     base: 'no', section: 'default',                  hpc: 'no' }
+        'APPLICATION.products.SHAPER'           : {tag:'master',     base: 'no', section: 'default',                 hpc: 'no'  }
     }
 ]
diff --git a/products/gmsh.pyconf b/products/gmsh.pyconf
index 29a1712..8b18cdc 100644
--- a/products/gmsh.pyconf
+++ b/products/gmsh.pyconf
@@ -37,6 +37,13 @@ version_4_10_3:
   depend : ["CAS","lapack","hdf5","medfile", "cgns"]
 }
 
+version_4_10_3_FD38:
+{
+  compil_script : "gmsh-4.10.3.sh"
+  depend : ["CAS","lapack","hdf5","medfile", "cgns"]
+  patches  : ["gmsh-4.10.3-gc13-fc38.patch"]
+}
+
 version_4_10_3_win:
 {
   compil_script : "gmsh-4.10.3.bat"
diff --git a/products/patches/gmsh-4.10.3-gc13-fc38.patch b/products/patches/gmsh-4.10.3-gc13-fc38.patch
new file mode 100644
index 0000000..49f71c3
--- /dev/null
+++ b/products/patches/gmsh-4.10.3-gc13-fc38.patch
@@ -0,0 +1,23 @@
+diff -Naur gmsh_ref/src/mesh/meshGFacePack.cpp gmsh_dev/src/mesh/meshGFacePack.cpp
+--- gmsh_ref/src/mesh/meshGFacePack.cpp	2023-05-10 12:26:30.747582324 +0200
++++ gmsh_dev/src/mesh/meshGFacePack.cpp	2023-05-10 12:27:38.508438549 +0200
+@@ -5,6 +5,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <cstdint>
+ #include <queue>
+ #include <map>
+ #include <vector>
+diff -Naur gmsh_ref/contrib/QuadMeshingTools/qmtMeshGeometryOptimization.h  gmsh_dev/contrib/QuadMeshingTools/qmtMeshGeometryOptimization.h
+--- gmsh_ref/contrib/QuadMeshingTools/qmtMeshGeometryOptimization.h	2023-05-10 12:26:30.587580303 +0200
++++ gmsh_dev/contrib/QuadMeshingTools/qmtMeshGeometryOptimization.h	2023-05-10 13:19:26.051591778 +0200
+@@ -9,7 +9,7 @@
+ 
+ #include <float.h>
+ #include "qmtMeshUtils.h"
+-
++#include <cstdint>
+ class SurfaceProjector;
+ 
+ /**
-- 
2.39.2