X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=applications%2FSALOME-9.6.0.pyconf;h=189e64c2c3af0e3ad6de0181e9de9db442c96bb9;hb=1bb6c8a88112c4ecf2bb109262dc1ed7a568556f;hp=4b45fffc23a6e9446313c1820e9cb6ad65b344c7;hpb=f28f83426bc59d5e3b48b425826df101227b4b9a;p=tools%2Fsat_salome.git

diff --git a/applications/SALOME-9.6.0.pyconf b/applications/SALOME-9.6.0.pyconf
index 4b45fff..189e64c 100644
--- a/applications/SALOME-9.6.0.pyconf
+++ b/applications/SALOME-9.6.0.pyconf
@@ -5,7 +5,7 @@ APPLICATION :
 {
     name : 'SALOME-9.6.0'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist
-    tag : 'V9_6_BR'
+    tag : 'V9_6_0'
     dev : 'no'
     verbose :'no'
     debug : 'no'
@@ -30,7 +30,7 @@ APPLICATION :
         alabaster : '0.7.6'
         Babel : '2.7.0'
         boost : '1.58.0'
-        CAS : 'CR740-SALOME-PATCH'
+        CAS : 'V7_4_0p2'
         certifi : '2018.8.24'
         cgns : '3.3.1'
         chardet : '3.0.4'
@@ -111,9 +111,9 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : {tag : 'V2_4_4rc2'}
+        'LIBBATCH' : {tag : 'V2_4_4'}
         'KERNEL'
-        'MEDCOUPLING' : {section: 'default_int64'} # this will trigger other modules as int64
+        'MEDCOUPLING'
         'GUI'
         'GEOM'
         'SMESH'
@@ -140,12 +140,12 @@ APPLICATION :
         'CALCULATOR'
         'HELLO'
         'PYHELLO'
-        'EFICAS' : {tag: 'master'}
-        'EFICAS_TOOLS' : {tag : 'master'}
+        'EFICAS'
+        'EFICAS_TOOLS'
         'PY2CPP' : {tag: 'v2.0'}
         'ADAO'
         'ADAO_INTERFACE'
-        'CEATESTBASE' : {tag: 'SalomeV9'}
+        'CEATESTBASE'
     }
     profile :
     {
@@ -201,6 +201,19 @@ __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',
+                                                 'paraview-0012-LATA_64BITS_IDS.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
@@ -214,7 +227,8 @@ __overwrite__ :
                                                  'paraview.0006-ParaView_find_libxml2.patch',
                                                  'paraview.0007-ParaView_find_freetype.patch',
                                                  'paraview.0009-ParaView_volume_mapper.patch',
-                                                 'pv_coincident.patch'
+                                                 'pv_coincident.patch',
+                                                 'paraview-0012-LATA_64BITS_IDS.patch'
                                                 ]
   }
 
@@ -227,7 +241,8 @@ __overwrite__ :
                                                  'paraview.0007-ParaView_find_freetype.patch',
                                                  'paraview.0009-ParaView_volume_mapper.patch',
                                                  'paraview.0011-vtkSMPSelection.patch',
-                                                 'pv_coincident.patch'
+                                                 'pv_coincident.patch',
+                                                 'paraview-0012-LATA_64BITS_IDS.patch'
                                                 ]
   }
 
@@ -244,7 +259,8 @@ __overwrite__ :
                                                  'paraview.0006-ParaView_find_libxml2.patch',
                                                  'paraview.0007-ParaView_find_freetype.patch',
                                                  'paraview.0009-ParaView_volume_mapper.patch',
-                                                 'pv_coincident.patch'
+                                                 'pv_coincident.patch',
+                                                 'paraview-0012-LATA_64BITS_IDS.patch'
                                                 ]
   }
 ]