}
{
__condition__ : "VARS.dist in ['FD36']"
- 'APPLICATION.products.opencv' : {tag: '3.2.0', base: 'no', section: 'version_3_2_0_FD36'}
- 'APPLICATION.products.omniORB' : '4.2.5'
- 'APPLICATION.products.omniORBpy' : '4.2.5'
- 'APPLICATION.products.qwt' : '6.1.6'
- 'APPLICATION.products.nlopt' : '2.6.0'
- 'APPLICATION.products.numpy' : {tag: '1.22.2', base: 'no', section: 'version_1_22_2' }
- 'APPLICATION.products.PyFMI' : {tag: '2.5', base: 'no', section: 'version_2_5_no_pip' }
- 'APPLICATION.products.netcdf' : '4.6.2'
- 'APPLICATION.products.ParaView' : {tag: '5.9.0', base: 'no', section: 'version_5_9_0_FD36', hpc: 'yes'}
- 'APPLICATION.products.root' : {tag: '6.22.02', base: 'no', section: 'version_6_22_02_FD36'}
- 'APPLICATION.products.medfile' : {tag: '4.1.1', base: 'no', section: 'version_4_1_1_FD36'}
- 'APPLICATION.products.MEDCOUPLING' : {tag:'V9_9_0', base: 'no', section: 'version_V9_9_0_MPI_FD36', hpc: 'yes'}
- 'APPLICATION.products.HEXABLOCK' : {tag:'V9_9_0', base: 'no', section: 'version_V9_9_0_FD36', hpc: 'no'}
- 'APPLICATION.products.SHAPER' : {tag:'V9_9_0', base: 'no', section: 'version_V9_9_0_FD36', hpc: 'no'}
+ 'APPLICATION.products.opencv' : {tag: '3.2.0', base: 'no', section: 'version_3_2_0_FD36' }
+ 'APPLICATION.products.omniORB' : '4.2.5'
+ 'APPLICATION.products.omniORBpy' : '4.2.5'
+ 'APPLICATION.products.qwt' : '6.1.6'
+ 'APPLICATION.products.nlopt' : '2.6.0'
+ 'APPLICATION.products.netcdf' : '4.6.2'
+ 'APPLICATION.products.numpy' : {tag: '1.22.2', base: 'no', section: 'version_1_22_2' }
+ 'APPLICATION.products.PyFMI' : {tag: '2.5', base: 'no', section: 'version_2_5_no_pip' }
+ 'APPLICATION.products.ParaView' : {tag: '5.9.0', base: 'no', section: 'version_5_9_0_FD36', hpc: 'yes'}
+ 'APPLICATION.products.root' : {tag: '6.22.02', base: 'no', section: 'version_6_22_02_FD36' }
+ 'APPLICATION.products.medfile' : {tag: '4.1.1', base: 'no', section: 'version_4_1_1_FD36' }
+ 'APPLICATION.products.CONFIGURATION' : {tag:'V9_9_0', base: 'no', section: 'version_V9_9_0_FD36' }
+ 'APPLICATION.products.MEDCOUPLING ' : {tag:'V9_9_0', base: 'no', section: 'version_V9_9_0_MPI_FD36', hpc: 'yes'}
+ 'APPLICATION.products.HEXABLOCK' : {tag:'V9_9_0', base: 'no', section: 'version_V9_9_0_FD36', hpc: 'no' }
+ 'APPLICATION.products.SHAPER' : {tag:'V9_9_0', base: 'no', section: 'version_V9_9_0_FD36', hpc: 'no' }
+ 'APPLICATION.products.SMESH' : {tag:'V9_9_0', base: 'no', section: 'version_V9_9_0_FD36', hpc: 'no' }
}
]
'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_no_pip' }
'APPLICATION.products.root' : {tag: '6.22.02', base: 'no', section: 'version_6_22_02_FD36' }
'APPLICATION.products.medfile' : {tag: '4.1.1', base: 'no', section: 'version_4_1_1_FD36' }
+ 'APPLICATION.products.SMESH' : {tag:'master', base: 'no', section: 'version_V9_9_0_FD36', hpc: 'no' }
'APPLICATION.products.HEXABLOCK' : {tag:'master', base: 'no', section: 'version_V9_9_0_FD36', hpc: 'no' }
'APPLICATION.products.SHAPER' : {tag:'master', base: 'no', section: 'version_V9_9_0_FD36', hpc: 'no' }
'APPLICATION.products.StaticMeshPlugin' : {tag:'5.11.0', base: 'no', section: 'version_5_11_0_FD36' }
configure_dependency : "yes" # the source of this module is required for the configuration of salome
is_SALOME_module : "yes"
sources_in_package : "yes"
+ incremental: "yes"
}
patches : []
}
+
+version_V9_9_0_FD36 :
+{
+ patches: ['SPNS-29988-CONFIGURATION-V9_9_0.patch']
+}
"openmpi"
]
opt_depend : ["ParMetis", "metis"]
- patches: ['SPNS-29880-MEDCOUPLING-V9_9_0.patch']
+ patches: ['SPNS-29888-MEDCOUPLING-V9_9_0.patch']
}
version_V9_9_0_MPI_STD:
version_V9_9_0_FD36:
{
- patches : ['SPNS-29880-SHAPER-V9_9_0.patch']
+ patches : ['SPNS-29988-SHAPER-V9_9_0.patch']
}
version_9_5_0_to_9_8_0 :
]
}
+version_V9_9_0_FD36:
+{
+ patches : ['SPNS-29988-SMESH_V9_9_0.patch']
+}
+
version_V9_3_0 :
{
cmake_options : "-DSALOME_SMESH_USE_CGNS:BOOL=ON -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DSALOME_SMESH_DYNLOAD_LOCAL:BOOL=ON -DSALOME_SMESH_BUILD_FRENCH_DOC=OFF"
--- /dev/null
+diff --git a/doc/conf.py.in b/doc/conf.py.in
+index ba7daa4..f958234 100644
+--- a/doc/conf.py.in
++++ b/doc/conf.py.in
+@@ -201,8 +201,8 @@ htmlhelp_basename = 'HexaBlockdoc'
+ # Grouping the document tree into LaTeX files. List of tuples
+ # (source start file, target name, title, author, document class [howto/manual]).
+ latex_documents = [
+- ('index', 'HexaBlock.tex', ur'HexaBlock Documentation',
+- ur'CS', 'manual'),
++ ('index', 'HexaBlock.tex', 'HexaBlock Documentation',
++ 'CS', 'manual'),
+ ]
+
+ # The name of an image file (relative to this directory) to place at the top of
--- /dev/null
+diff --git a/cmake/FindPyQt5.cmake b/cmake/FindPyQt5.cmake
+index 3cdcb8e..565e594 100644
+--- a/cmake/FindPyQt5.cmake
++++ b/cmake/FindPyQt5.cmake
+@@ -56,7 +56,7 @@ GET_FILENAME_COMPONENT(_tmp_ROOT_DIR "${_tmp_ROOT_DIR}" PATH)
+ # - /usr/share/sip/PyQt5/QtCore, for a system install
+ # - or <xyz>/sip/QtCore, for a custom install
+ # - or <xyz>/share/sip/QtCore, for a custom install
+-FIND_FILE(PYQT_SIP_MAIN_FILE qobject.sip PATH_SUFFIXES share/sip/QtCore sip/QtCore share/sip/PyQt5/QtCore lib/python3/dist-packages/PyQt5/bindings/QtCore)
++FIND_FILE(PYQT_SIP_MAIN_FILE qobject.sip PATH_SUFFIXES share/sip/QtCore sip/QtCore share/sip/PyQt5/QtCore lib/python3/dist-packages/PyQt5/bindings/QtCore lib64/python3.10/site-packages/PyQt5/bindings/QtCore)
+
+ IF(PYQT_SIP_MAIN_FILE)
+ GET_FILENAME_COMPONENT(PYQT_SIPS_DIR "${PYQT_SIP_MAIN_FILE}" PATH)
--- /dev/null
+diff --git a/doc/developer/doxygen/doxfiles/reference/medloader/MEDLoader.dox b/doc/developer/doxygen/doxfiles/reference/medloader/MEDLoader.dox
+index c19d0c1c..ebb8d1a2 100644
+--- a/doc/developer/doxygen/doxfiles/reference/medloader/MEDLoader.dox
++++ b/doc/developer/doxygen/doxfiles/reference/medloader/MEDLoader.dox
+@@ -1,4 +1,4 @@
+-/* \page MEDLoader Static functions offering the "basic" API to read and write MED files
++/*! \page MEDLoader Static functions offering the "basic" API to read and write MED files
+
+ A set of static methods is available at the MEDCoupling namespace level and offers the
+ high level API to access MED files. Take a look at \ref medloader for more details.
+diff --git a/doc/tutorial/conf.py.in b/doc/tutorial/conf.py.in
+index 1f16fab3..36e47695 100644
+--- a/doc/tutorial/conf.py.in
++++ b/doc/tutorial/conf.py.in
+@@ -183,8 +183,8 @@ htmlhelp_basename = 'MEDCouplingTutorial'
+ # Grouping the document tree into LaTeX files. List of tuples
+ # (source start file, target name, title, author, document class [howto/manual]).
+ latex_documents = [
+- ('index', 'MEDCouplingTutorial.tex', ur'MEDCoupling tutorial',
+- ur'A. Geay, A. Bruneton', 'manual'),
++ ('index', 'MEDCouplingTutorial.tex', 'MEDCoupling tutorial',
++ 'A. Geay, A. Bruneton', 'manual'),
+ ]
+
+ # The name of an image file (relative to this directory) to place at the top of
+diff --git a/doc/user/conf.py.in b/doc/user/conf.py.in
+index 412d8866..4507f304 100644
+--- a/doc/user/conf.py.in
++++ b/doc/user/conf.py.in
+@@ -185,8 +185,8 @@ htmlhelp_basename = 'MEDCouplingUsersGuide'
+ # Grouping the document tree into LaTeX files. List of tuples
+ # (source start file, target name, title, author, document class [howto/manual]).
+ latex_documents = [
+- ('index', 'MEDCouplingUserGuide.tex', ur"MEDCoupling User's Guide",
+- ur'A. Geay, A. Bruneton', 'manual'),
++ ('index', 'MEDCouplingUserGuide.tex', "MEDCoupling User's Guide",
++ 'A. Geay, A. Bruneton', 'manual'),
+ ]
+
+ # The name of an image file (relative to this directory) to place at the top of
--- /dev/null
+diff --git a/src/FeaturesPlugin/FeaturesPlugin_Measurement.cpp b/src/FeaturesPlugin/FeaturesPlugin_Measurement.cpp
+index 9f3f9f003..3d0fe58e6 100644
+--- a/src/FeaturesPlugin/FeaturesPlugin_Measurement.cpp
++++ b/src/FeaturesPlugin/FeaturesPlugin_Measurement.cpp
+@@ -49,6 +49,7 @@
+
+ #include <iomanip>
+ #include <sstream>
++#include <array>
+
+ FeaturesPlugin_Measurement::FeaturesPlugin_Measurement() : mySceenScale(1)
+ {
+diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.cpp
+index f95671f3e..6d4de8e6f 100644
+--- a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.cpp
++++ b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.cpp
+@@ -16,7 +16,6 @@
+ //
+ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+ //
+-
+ #include "GeomAlgoAPI_ShapeTools.h"
+
+ #include "GeomAlgoAPI_SketchBuilder.h"
+@@ -101,6 +100,7 @@
+ #include <NCollection_Vector.hxx>
+
+ #include <LocalAnalysis_SurfaceContinuity.hxx>
++#include<array>
+
+ //==================================================================================================
+ static GProp_GProps props(const TopoDS_Shape& theShape)
+diff --git a/src/ModelHighAPI/ModelHighAPI_Tools.cpp b/src/ModelHighAPI/ModelHighAPI_Tools.cpp
+index 65f536b38..87f24f815 100644
+--- a/src/ModelHighAPI/ModelHighAPI_Tools.cpp
++++ b/src/ModelHighAPI/ModelHighAPI_Tools.cpp
+@@ -559,7 +559,7 @@ static bool checkDump(SessionPtr theSession,
+ // execute the dumped
+ PyGILState_STATE gstate = PyGILState_Ensure(); /* acquire python thread */
+ static char aReadMode[] = "r";
+- FILE* PyFileObject = _Py_fopen(theFilename, aReadMode);
++ FILE* PyFileObject = fopen(theFilename, aReadMode);
+ PyRun_SimpleFileEx(PyFileObject, theFilename, 1);
+ PyGILState_Release(gstate); /* release python thread */
+
--- /dev/null
+diff --git a/src/SMESH/SMESH_MeshEditor.cxx b/src/SMESH/SMESH_MeshEditor.cxx
+index be874359b..efa01a4c2 100644
+--- a/src/SMESH/SMESH_MeshEditor.cxx
++++ b/src/SMESH/SMESH_MeshEditor.cxx
+@@ -4636,7 +4636,7 @@ void SMESH_MeshEditor::sweepElement(const SMDS_MeshElement* elem,
+ std::swap( itNN[0], itNN[1] );
+ std::swap( prevNod[0], prevNod[1] );
+ std::swap( nextNod[0], nextNod[1] );
+- std::swap( isSingleNode[0], isSingleNode[1] );
++ std::vector<bool>::swap(isSingleNode[0], isSingleNode[1]);
+ if ( nbSame > 0 )
+ sames[0] = 1 - sames[0];
+ iNotSameNode = 1 - iNotSameNode;
