From 21e8f82e000474bed2ddd86a6e80bb1e32c8c907 Mon Sep 17 00:00:00 2001
From: jfa <jfa@opencascade.com>
Date: Thu, 27 Jun 2024 19:39:04 +0100
Subject: [PATCH 1/3] Increment version: 9.13.0

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a6a4f30c..290aa7c1c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,7 @@ ENDIF()
 
 # Versioning
 # ===========
-SALOME_SETUP_VERSION(9.12.0)
+SALOME_SETUP_VERSION(9.13.0)
 MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \"${${PROJECT_NAME_UC}_GIT_SHA1}\"")
 
 # Find KERNEL

From 446795b1c1c1996d92936a3f47ab829881d1f31a Mon Sep 17 00:00:00 2001
From: Afeef <afeef.badri@gmail.com>
Date: Fri, 5 Jul 2024 11:24:15 +0200
Subject: [PATCH 2/3] add MMG plugin

---
 src/Tools/smesh_plugins.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Tools/smesh_plugins.py b/src/Tools/smesh_plugins.py
index bb94938ff..83db5cfcc 100644
--- a/src/Tools/smesh_plugins.py
+++ b/src/Tools/smesh_plugins.py
@@ -61,6 +61,15 @@ except Exception as e:
   salome_pluginsmanager.logger.info('ERROR: MGCleaner plug-in is unavailable: {}'.format(e))
   pass
 
+try:
+  from mmgplugin.mmgPlug_plugin import Mmg
+  salome_pluginsmanager.AddFunction('ReMesh with MMG',
+                                    'Run MMG',
+                                    Mmg)
+except Exception as e:
+  salome_pluginsmanager.logger.info('ERROR: MMG plug-in is unavailable: {}'.format(e))
+  pass
+
 try:
   from blocFissure.ihm.fissureCoude_plugin import fissureCoudeDlg
   salome_pluginsmanager.AddFunction('Meshed Pipe with a crack (blocFissure plugin)',
@@ -88,7 +97,7 @@ try:
                                       'Add a crack in a mesh with Zcracks plug-in',
                                       ZcracksLct)
 except Exception as e:
-  #print 'probleme zcracks'
+  #print 'problem zcracks'
   salome_pluginsmanager.logger.info('ERROR: Zcrack plug-in is unavailable: {}'.format(e))
   pass
 
@@ -99,6 +108,5 @@ try:
                                     'run topological volumic mesher',
                                     TopIIVolMeshLct)
 except Exception as e:
-  #print 'probleme zcracks'
   salome_pluginsmanager.logger.info('ERROR: TopIIVolMesh plug-in is unavailable: {}'.format(e))
   pass

From 0e0c07c225e4f408e4a4b9d072d0ef4f495b95e3 Mon Sep 17 00:00:00 2001
From: mbs <martin.bernhard@opencascade.com>
Date: Thu, 1 Aug 2024 10:29:35 +0100
Subject: [PATCH 3/3] support Gmsh v4.0 output format (requires patch in
 meshio)

---
 src/SMESHGUI/SMESHGUI_Meshio.cxx | 5 +++--
 src/SMESH_I/SMESH_Meshio.cxx     | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/SMESHGUI/SMESHGUI_Meshio.cxx b/src/SMESHGUI/SMESHGUI_Meshio.cxx
index 10fb582c2..49e34becc 100644
--- a/src/SMESHGUI/SMESHGUI_Meshio.cxx
+++ b/src/SMESHGUI/SMESHGUI_Meshio.cxx
@@ -142,12 +142,13 @@ const QStringList& SMESHGUI_Meshio::GetExportFileFilter()
 #endif
     "FLAC3D (*.f3grid)",
     "Gmsh 2.2 (*.msh)",
-    "Gmsh 4.0, and 4.1 (*.msh)",
+    "Gmsh 4.0 (*.msh)",
+    //"Gmsh 4.1 (*.msh)",
     "H5M (*.h5m)",
     "Kratos/MDPA (*.mdpa)",
     "MED/Salome (*.med)",
     "Medit (*.mesh *.meshb)",
-    "Nastran (*.bdf *fem *.nas)",
+    "Nastran (*.bdf *.fem *.nas)",
     "Netgen(*.vol *.vol.gz)",
     "OBJ (*.obj)",
     "OFF (*.off)",
diff --git a/src/SMESH_I/SMESH_Meshio.cxx b/src/SMESH_I/SMESH_Meshio.cxx
index 6e744669f..c1f9717d9 100644
--- a/src/SMESH_I/SMESH_Meshio.cxx
+++ b/src/SMESH_I/SMESH_Meshio.cxx
@@ -365,7 +365,9 @@ QString SMESH_Meshio::GetConvertOptArgs() const
     return "-o ansys";
   else if (mySelectedFilter.startsWith("Gmsh 2"))
     return "-o gmsh22";
-  else if (mySelectedFilter.startsWith("Gmsh 4"))
+  else if (mySelectedFilter.startsWith("Gmsh 4.0"))
+    return "-o gmsh40";
+  else if (mySelectedFilter.startsWith("Gmsh 4.1"))
     return "-o gmsh";
 
   return {};