corrections coquilles natif pour UB20 + suppression openssl non utile en natif

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

diff --git a/applications/SALOME-master-int32.pyconf b/applications/SALOME-master-int32.pyconf
index a3a196b4204e8d7da16e775727988fd657c898c2..ade612bcdff34d16e763cfbfec6991a8221fcb7f 100644 (file)
--- a/applications/SALOME-master-int32.pyconf
+++ b/applications/SALOME-master-int32.pyconf
@@ -109,9 +109,9 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : {tag :'V2_4_3'}
+        'LIBBATCH' : {tag :'V2_4_4'}
         'KERNEL'
-        'MEDCOUPLING'
+        'MEDCOUPLING': {section: 'default_32BIT_IDS'}
         'GUI'
         'GEOM'
         'SMESH'
@@ -206,18 +206,11 @@ __overwrite__ :
     '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'
-                                                ]
   }
 
   {
-    __condition__ : "VARS.dist in ['CO8']"
+    # Adapt Paraview CMake files to be compliant with recent distributions
+    __condition__ : "VARS.dist in ['FD30', 'FD32', 'CO8']"
     'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0010-ParaViewClient.patch',
                                                  'paraview.0004-ParaView_hdf5.patch',
                                                  'paraview.0005-ParaView_find_cgns.patch',