apply changes from master

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

diff --git a/applications/SALOME-9.7.0.pyconf b/applications/SALOME-9.7.0.pyconf
index f10453c483da34da4c8c6e5a3dae63fec0681a54..5856fa44f37b6b9d0dad89f846d2c13d588c44fb 100644 (file)
--- a/applications/SALOME-9.7.0.pyconf
+++ b/applications/SALOME-9.7.0.pyconf
@@ -1,4 +1,4 @@
-s#!/usr/bin/env python
+#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 APPLICATION :
@@ -31,7 +31,7 @@ APPLICATION :
         alabaster : '0.7.6'
         Babel : '2.7.0'
         boost : '1.71.0'
-        CAS : {tag: 'CR750-SALOME-PATCH', section: 'version_V7_5_0'}
+        CAS : {tag: 'V7_5_0p1', section: 'version_V7_5_0'}
         certifi : '2018.8.24'
         cgns : '4.1.1'
         chardet : '3.0.4'
@@ -136,7 +136,7 @@ APPLICATION :
         'JOBMANAGER'
         'YACS'
         'YACSGEN'
-        'SOLVERLAB' : {tag: 'master'}
+        'SOLVERLAB'
         'DOCUMENTATION'
         'SAMPLES'
         'COMPONENT'
@@ -150,7 +150,7 @@ APPLICATION :
         'ADAO'
         'ADAO_INTERFACE'
         'PARAVISADDONS'
-        'CEATESTBASE' : {tag: 'SalomeV9'}
+        'CEATESTBASE'
     }
     profile :
     {
@@ -180,12 +180,6 @@ __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.mesa.version_19_0_8.patches' : ['mesa-19.0.8-debug_symbol.patch']
-   #
-    'PRODUCTS.qt.version_5_12_10.patches' : ['qt-mapbox-FD32.patch']
+   'APPLICATION.products.scipy' : '1.5.2'
   }
 ]