Fix override and add patches for ParaView

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 7917370d194d6fdd1b8ac680a6534527770a0a0a..ece8295aaaf2af3035e96bb676363c9205ba1380 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -273,17 +273,17 @@ __overwrite__ :
          'APPLICATION.products.swig'             : '4.0.2'
          'APPLICATION.products.opencv'           : '3.2.0'
          'APPLICATION.products.openmpi'          : '4.1.5'
-         'APPLICATION.products.root'             : {tag: '6.22.02',   base: 'no', section: 'version_6_22_02_CO9' }
-         'APPLICATION.products.qt'               : {tag: '5.12.10', base: 'no', section: 'version_5_12_10_CO9' }
-         'APPLICATION.products.sip'              : {tag: '5.5.0', base: 'no',  section: 'version_5_5_0_CO9' }
-         'APPLICATION.products.sphinxintl'       : {tag: '0.9.10', base: 'no', section: 'version_0_9_10_no_pip'  }
-         'APPLICATION.products.PyFMI'            : {tag: '2.6',    base: 'no', section: 'version_2_6_no_pip'     }   
-         'APPLICATION.products.numpydoc'         : {tag: '0.9.0',  base: 'no', section: 'version_0_9_0_no_pip'   } 
-         'APPLICATION.products.pandas'           : {tag: '1.1.5',  base: 'no', section: 'version_1_1_5_no_pip'   } 
-         'APPLICATION.products.statsmodels'      : {tag: '0.6.1',  base: 'no', section: 'version_0_6_1_no_pip'   }   
-         #'APPLICATION.products.openturns'        : {tag: '1.20.1', base: 'no', section: 'version_1_20_1_CO8'     }   
-         'APPLICATION.products.nose'             : {tag: '1.3.7',  base: 'no', section: 'version_1_3_7_no_pip'   }
-         'APPLICATION.products.ParaView'         : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_CO9', hpc: 'yes'}
+         'APPLICATION.products.root'             : {tag: '6.22.02', base: 'no', section: 'version_6_22_02_CO9'               }
+         'APPLICATION.products.qt'               : {tag: '5.12.10', base: 'no', section: 'version_5_12_10_CO9'               }
+         'APPLICATION.products.sip'              : {tag: '5.5.0',   base: 'no', section: 'version_5_5_0_CO9'                 }
+         'APPLICATION.products.sphinxintl'       : {tag: '0.9.10',  base: 'no', section: 'version_0_9_10_no_pip'             }
+         'APPLICATION.products.PyFMI'            : {tag: '2.6',     base: 'no', section: 'version_2_6_no_pip'                }
+         'APPLICATION.products.numpydoc'         : {tag: '0.9.0',   base: 'no', section: 'version_0_9_0_no_pip'              }
+         'APPLICATION.products.pandas'           : {tag: '1.1.5',   base: 'no', section: 'version_1_1_5_no_pip'              }
+         'APPLICATION.products.statsmodels'      : {tag: '0.6.1',   base: 'no', section: 'version_0_6_1_no_pip'              }
+         'APPLICATION.products.nose'             : {tag: '1.3.7',   base: 'no', section: 'version_1_3_7_no_pip'              }
+         'APPLICATION.products.ParaView'         : {tag: '5.11.0',  base: 'no', section: 'version_5_11_0_MPI_CO9', hpc: 'yes'}
+         'APPLICATION.products.YACS'             : {tag: 'master',  base: 'no', section: 'default_CO9'                       }
     }
     {
         __condition__ : "VARS.dist in ['FD32']"

diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf
index 7ab15e0ffed895b42dbfaf5e7891b07a98b5d618..7d806dd3e6cc911e2d4ad20e49c90dd3df85d340 100755 (executable)
--- a/products/ParaView.pyconf
+++ b/products/ParaView.pyconf
@@ -438,7 +438,8 @@ version_5_11_0_MPI_CO9 :
     patches : ['paraview-5.11.0.p001-FindCGNS.patch',
                'paraview-5.11.0.p002-FindMPI.patch',
                'paraview-5.11.0.p003-ParaViewClient.patch',
-               'paraview-5.11.0.p006-GIL.patch'
+               'paraview-5.11.0.p006-GIL.patch',
+               'paraview-5.11.0.p009-openturns-1.21.patch'
               ]
     depend : [
               'Python',