fix SALOME 9.4, 9.5, 9.6 compilation issues

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

diff --git a/applications/SALOME-9.6.0.pyconf b/applications/SALOME-9.6.0.pyconf
index 189e64c2c3af0e3ad6de0181e9de9db442c96bb9..7164315760f3b96e12ac7969f88bcad25aec0e3b 100644 (file)
--- a/applications/SALOME-9.6.0.pyconf
+++ b/applications/SALOME-9.6.0.pyconf
@@ -176,10 +176,10 @@ __overwrite__ :
    # GTK  compilation issue
     __condition__ : "VARS.dist in ['CO6']"
     'APPLICATION.products.opencv' : '2.4.13.5'
-    'APPLICATION.products.tbb' : '4.4'
-    'APPLICATION.products.llvm' : '3.9.1-clang'
-    'APPLICATION.products.mesa' : '13.0.6'
-    'PRODUCTS.embree.default.patches' : ['embree-3.5.2-centos6.patch']
+    'APPLICATION.products.tbb'    : '4.4'
+    'APPLICATION.products.llvm'   : '3.9.1-clang'
+    'APPLICATION.products.mesa'   : '13.0.6'
+    'APPLICATION.products.embree' : {tag:'3.3.0',   base: 'no', section: 'version_3_3_0_CO6'}
   }
 
   {
@@ -195,55 +195,22 @@ __overwrite__ :
     'APPLICATION.products.embree' : '3.5.2'
   }
 
-  {
-    #
-    __condition__ : "VARS.dist in ['UB20.04']"
-    'PRODUCTS.qt.version_5_9_1.patches' : ['qt-5.9.1-UB20-FD32-socketcanbackend.patch']
-  }
-
   {
     __condition__ : "VARS.dist in ['FD30']"
-    'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0010-ParaViewClient.patch', # xmlpatterns-qt5
-                                                 'paraview.0004-ParaView_hdf5.patch',
-                                                 'paraview.0005-ParaView_find_cgns.patch',
-                                                 'paraview.0006-ParaView_find_libxml2.patch',
-                                                 'paraview.0007-ParaView_find_freetype.patch',
-                                                 'paraview.0009-ParaView_volume_mapper.patch',
-                                                 'pv_coincident.patch',
-                                                 'paraview-0012-LATA_64BITS_IDS.patch'
-                                                ]
+      'APPLICATION.products.ParaView'    : {tag: '5.8.0', base: 'no', section: 'version_5_8_0_FD30' }
   }
 
   {
     __condition__ : "VARS.dist in ['FD32']"
     'APPLICATION.products.scipy' : '1.5.2' # gcc https://github.com/scipy/scipy/issues/11611 - either patch numpy to include -fallow-argument-mismatch or move to that version
     # see https://bugs.gentoo.org/708730
-    'PRODUCTS.llvm.version_8_0_1_clang.patches' : ['llvm-8.0.1-clang-FD32.patch']
-    'PRODUCTS.qt.version_5_9_1.patches' : ['qt-5.9.1-UB20-FD32-socketcanbackend.patch', 'qt-5.9.1-mapbox-FD32.patch']
-    'PRODUCTS.mesa.version_19_0_8.patches' : ['mesa-19.0.8-debug_symbol.patch']
-    'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0010-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.0009-ParaView_volume_mapper.patch',
-                                                 'pv_coincident.patch',
-                                                 'paraview-0012-LATA_64BITS_IDS.patch'
-                                                ]
+    'APPLICATION.products.qt'       : {tag: '5.9.1', base: 'no', section: 'version_5_9_1_FD32' }
+    'APPLICATION.products.ParaView' : {tag: '5.8.0', base: 'no', section: 'version_5_8_0_FD32' }
   }
 
   {
     __condition__ : "VARS.dist in ['CO7'] and APPLICATION.environ.build.VTK_SMP_IMPLEMENTATION_TYPE == 'OpenMP'"
-    'PRODUCTS.ParaView.version_5_8_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.0009-ParaView_volume_mapper.patch',
-                                                 'paraview.0011-vtkSMPSelection.patch',
-                                                 'pv_coincident.patch',
-                                                 'paraview-0012-LATA_64BITS_IDS.patch'
-                                                ]
+    'APPLICATION.products.ParaView' : {tag: '5.8.0', base: 'no', section: 'version_5_8_0_CO7_OpenMP' }
   }
 
   {
@@ -253,14 +220,12 @@ __overwrite__ :
 
   {
     __condition__ : "VARS.dist in ['CO8']"
-    'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0010-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.0009-ParaView_volume_mapper.patch',
-                                                 'pv_coincident.patch',
-                                                 'paraview-0012-LATA_64BITS_IDS.patch'
-                                                ]
+    'APPLICATION.products.ParaView' : {tag: '5.8.0', base: 'no', section: 'version_5_8_0_CO8' }
   }
+
+  {
+    __condition__ : "VARS.dist in ['UB20.04']"
+    'APPLICATION.products.qt'       : {tag: '5.9.1', base: 'no', section: 'version_5_9_1_UB20_0_4' }
+  }
+
 ]