move to SALOME-9.7.0 rc2 tag

[tools/sat_salome.git] / applications / SALOME-master.pyconf

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index c3c598183211250dcb954a13e39f635ff5dc3362..133fbae2e96690f2f96c8e997b192d8231a32aee 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -64,8 +64,8 @@ APPLICATION :
         MeshGems : '2.12-1'
         metis : '5.1.0'
         netgen : '5.3.1_with_CAS_7.2'
-        nlopt : '2.4.2'
-        numpy : '1.15.1'
+        nlopt : '2.5.0'
+        numpy : '1.16.4'
         omniORB : '4.2.2'
         omniORBpy : '4.2.2'
         opencv : '3.2.0'
@@ -75,7 +75,7 @@ APPLICATION :
         ospray : '2.4.0'
         packaging : '17.1'
         ParaView : '5.9.0'
-        petsc : '3.14.0'
+        petsc : {tag : '3.15.0', section: 'version_3_15_0'}
         Pillow : '7.1.1'
         planegcs : '0.18-3cb6890'
         psutil : '5.7.2'
@@ -91,7 +91,7 @@ APPLICATION :
         requests : '2.19.1'
         rkCommon : '1.5.1'
         root: '6.22.02'
-        scipy : '0.19.1'
+        scipy : '1.4.1'
         scotch : '6.0.4'
         setuptools : '38.4.0'
         sip : '5.5.0'
@@ -101,7 +101,6 @@ APPLICATION :
         sphinxcontrib_websupport : '1.1.0'
         sphinx_rtd_theme : '0.4.3'
         sphinxintl: '0.9.10'
-        StaticMeshPlugin : '5.8.0'
         swig : '3.0.12'
         tbb : '2019_U8'
         tcl : '8.6.0'
@@ -135,7 +134,7 @@ APPLICATION :
         'JOBMANAGER'
         'YACS'
         'YACSGEN'
-#        'SOLVERLAB'
+        'SOLVERLAB'
         'DOCUMENTATION'
         'SAMPLES'
         'COMPONENT'
@@ -177,7 +176,27 @@ APPLICATION :
 __overwrite__ :
 [
   {
+   __condition__ : "VARS.dist in ['FD32']"
+   # https://github.com/scipy/scipy/issues/11611
+    'APPLICATION.products.scipy' : '1.5.2'
+   # https://bugs.gentoo.org/708730 : llvm 8.0.1 build issue with gcc/clang 10.X
+    'PRODUCTS.llvm.version_8_0_1_clang.patches' : ['llvm-8.0.1-clang-FD32.patch']
    #
-    'PRODUCTS.PARAVISADDONS.default.patches' : ['paraview-5.9_PARAVISADDONS.patch']
+    'PRODUCTS.mesa.version_19_0_8.patches' : ['mesa-19.0.8-debug_symbol.patch']
+   #
+    'PRODUCTS.qt.version_5_12_10.patches' : ['qt-mapbox-FD32.patch']
+  }
+  {
+   __condition__ : "APPLICATION.debug == 'yes'"
+   # https://cplusplus.com/forum/general/250854 : DEBUG symbol is defined twice, need an additional patch
+    'PRODUCTS.ParaView.version_5_9_0.patches' : ['paraview.0003-ParaViewClient.patch',
+                                                 'paraview.0004-ParaView_hdf5.patch',
+                                                 'paraview.0005-ParaView_find_cgns.patch',
+                                                 'paraview.0006-ParaView_find_libxml2.patch',
+                                                 'paraview.0007-ParaView_find_freetype.patch',
+                                                 'paraview-0012-LATA_64BITS_IDS.patch',
+                                                 'ParaView-5.9.0-CATALYST_cmake.patch',
+                                                 'paraview.0008-ParaView_coincident_rendering.patch',
+                                                 'paraview.0015-Paraview_VTKM_ioss.patch']
   }
 ]