alignement de SALOME-master-native sur SALOME-9.7.0-native....

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 425aa31ccbdc26a3874ae26cdfb72f1fb017a97c..0f11279c928a4afd1249f3fbf48d4e132229ac34 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -23,6 +23,7 @@ APPLICATION :
         launch : {PYTHONIOENCODING:"UTF_8"} # alternative is to encode every accentued string with .encode('utf-8')
         SALOME_trace : "local" # local/file:.../with_logger
         SALOME_MODULES : "SHAPER,SHAPERSTUDY,GEOM,SMESH,PARAVIS,YACS,JOBMANAGER"  # specify the first modules to display in gui
         launch : {PYTHONIOENCODING:"UTF_8"} # alternative is to encode every accentued string with .encode('utf-8')
         SALOME_trace : "local" # local/file:.../with_logger
         SALOME_MODULES : "SHAPER,SHAPERSTUDY,GEOM,SMESH,PARAVIS,YACS,JOBMANAGER"  # specify the first modules to display in gui

+        SALOME_ACTOR_DELEGATE_TO_VTK : '1'

     }
     products :
     {
     }
     products :
     {


@@ -30,7 +31,7 @@ APPLICATION :
         alabaster : 'native'
         Babel : 'native'
         boost : 'native'
         alabaster : 'native'
         Babel : 'native'
         boost : 'native'

-        CAS : {tag: 'CR750-SALOME-PATCH', section: 'version_V7_5_0'}
+        CAS : {tag: 'V7_5_0p1', section: 'version_V7_5_0'}

         certifi : 'native'
         # Standalone native cgns works well. Unfortunately, it's directly linked to native hdf which uses a higher version than us.
         # Rollback to embedded version to avoid versions mismatch between both of them (see imp_1538_cgns_export_import.py)
         certifi : 'native'
         # Standalone native cgns works well. Unfortunately, it's directly linked to native hdf which uses a higher version than us.
         # Rollback to embedded version to avoid versions mismatch between both of them (see imp_1538_cgns_export_import.py)


@@ -120,7 +121,7 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'

-        'LIBBATCH' : {tag :'V2_4_4'}
+        'LIBBATCH' : {tag :'V2_4_5'}

         'KERNEL'
         'MEDCOUPLING'
         'GUI'
         'KERNEL'
         'MEDCOUPLING'
         'GUI'


@@ -151,7 +152,7 @@ APPLICATION :
         'PYHELLO'
         'EFICAS'
         'EFICAS_TOOLS'
         'PYHELLO'
         'EFICAS'
         'EFICAS_TOOLS'

-       'PY2CPP' : {tag: 'v2.0'}
+       'PY2CPP'

        'ADAO'
        'ADAO_INTERFACE'
         'PARAVISADDONS'
        'ADAO'
        'ADAO_INTERFACE'
         'PARAVISADDONS'


@@ -194,9 +195,11 @@ __overwrite__ :
       __condition__ : "VARS.dist in ['UB20.04', 'CO8', 'FD32']"
       'PRODUCTS.ParaView.version_5_9_0.patches' : ['paraview.0003-ParaViewClient.patch',
                                                    'paraview.0005-ParaView_find_cgns.patch',
       __condition__ : "VARS.dist in ['UB20.04', 'CO8', 'FD32']"
       'PRODUCTS.ParaView.version_5_9_0.patches' : ['paraview.0003-ParaViewClient.patch',
                                                    'paraview.0005-ParaView_find_cgns.patch',

-                                                   'paraview-0012-LATA_64BITS_IDS.patch',
-                                                   'ParaView-5.9.0-CATALYST_cmake.patch',
-                                                   'paraview.0008-ParaView_coincident_rendering.patch']
+                                                   'paraview.0010-ParaView_CATALYST_cmake.patch',
+                                                   'paraview.0008-ParaView_coincident_rendering.patch',
+                                                   'paraview.0017-ParaView_protobuf_crash.patch',
+                                                   'paraview.0015-Paraview_VTKM_ioss.patch'
+                                                  ]

    }
    {
       # On DB10, ParaView fails to find xmlpatterns executable : ParaViewClient.cmake try to find it
    }
    {
       # On DB10, ParaView fails to find xmlpatterns executable : ParaViewClient.cmake try to find it


@@ -207,11 +210,13 @@ __overwrite__ :
       __condition__ : "VARS.dist in ['DB10']"
       'PRODUCTS.ParaView.version_5_9_0.patches' : ['paraview.0003-ParaViewClient.patch',
                                                    'paraview.0005-ParaView_find_cgns.patch',
       __condition__ : "VARS.dist in ['DB10']"
       'PRODUCTS.ParaView.version_5_9_0.patches' : ['paraview.0003-ParaViewClient.patch',
                                                    'paraview.0005-ParaView_find_cgns.patch',

-                                                   'paraview-0012-LATA_64BITS_IDS.patch',

                                                    'paraview-5.9_qt-minimum-version.patch',
                                                    'paraview.0003-ParaViewClient_native.patch',
                                                    'paraview-5.9_qt-minimum-version.patch',
                                                    'paraview.0003-ParaViewClient_native.patch',

-                                                   'ParaView-5.9.0-CATALYST_cmake.patch',
-                                                   'paraview.0008-ParaView_coincident_rendering.patch']
+                                                   'paraview.0010-ParaView_CATALYST_cmake.patch',
+                                                   'paraview.0008-ParaView_coincident_rendering.patch',
+                                                   'paraview.0017-ParaView_protobuf_crash.patch',
+                                                   'paraview.0015-Paraview_VTKM_ioss.patch'
+                                                  ]

    }
    {
       # CentOS 8 repositories don't include sphinxintl package which must be installed through pip.
    }
    {
       # CentOS 8 repositories don't include sphinxintl package which must be installed through pip.