FD30 - do not target xmlpattern-qt5 system wide

[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 49e319fedc7d95d5842db3f9834383726683138e..3a9fd71d86ab837958f2b55bf810509d4604b9dd 100644 (file)
--- a/applications/SALOME-9.6.0.pyconf
+++ b/applications/SALOME-9.6.0.pyconf
@@ -111,7 +111,7 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : {tag : 'V2_4_4rc1'}
+        'LIBBATCH' : {tag : 'V2_4_4rc2'}
         'KERNEL'
         'MEDCOUPLING' : {section: 'default_int64'} # this will trigger other modules as int64
         'GUI'
@@ -132,7 +132,7 @@ APPLICATION :
         'JOBMANAGER'
         'YACS'
         'YACSGEN'
-        'SOLVERLAB'
+        'SOLVERLAB': {tag : 'master'}
         'DOCUMENTATION'
         'SAMPLES'
         'COMPONENT'
@@ -140,11 +140,11 @@ APPLICATION :
         'CALCULATOR'
         'HELLO'
         'PYHELLO'
-        'EFICAS' : {tag: 'V9_6_0b1'}
-        'EFICAS_TOOLS' : {tag : 'V9_6_0b1'}
+        'EFICAS' : {tag: 'master'}
+        'EFICAS_TOOLS' : {tag : 'master'}
         'PY2CPP' : {tag: 'v2.0'}
         'ADAO'
-        'ADAO_INTERFACE'
+        'ADAO_INTERFACE': {tag : 'master'}
         'CEATESTBASE' : {tag: 'SalomeV9'}
     }
     profile :
@@ -167,7 +167,7 @@ APPLICATION :
         repo_dev : "yes"
         pip : 'yes'
         pip_install_dir : 'python'
-        single_install_dir : "yes"
+        single_install_dir : "no"
     }
 }
 __overwrite__ :
@@ -201,6 +201,18 @@ __overwrite__ :
     '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'
+                                                ]
+  }
+
   {
     __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