update ParaView patches

diff --git a/applications/ParaView-5.10.0.pyconf b/applications/ParaView-5.10.0.pyconf
deleted file mode 100644 (file)
index 2bccfbc..0000000
--- a/applications/ParaView-5.10.0.pyconf
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/usr/bin/env python
-#-*- coding:utf-8 -*-
-
-APPLICATION :
-{
-    name : 'ParaView-5.10.0'
-    workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist
-    tag : '5.10.0'
-    dev : 'no'
-    verbose :'no'
-    debug : 'no'
-    base : 'no'
-    python3 : 'yes'
-    environ :
-    {
-        build : 
-        {
-           CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
-           VTK_SMP_IMPLEMENTATION_TYPE : OpenMP
-        }
-        launch :
-        {
-            PYTHONIOENCODING:"UTF_8"
-        }
-        SALOME_trace : "local"
-    }
-    products :
-    {
-        # PREREQUISITES :
-        alabaster : '0.7.6'
-        Babel : '2.7.0'
-        boost : '1.71.0'
-        certifi : '2018.8.24'
-        cgns : '4.1.1'
-        chardet : '3.0.4'
-        click : '6.7'
-        cmake : '3.12.1'
-        cppunit : '1.13.2'
-        cycler : '0.10.0'
-        Cython : '0.25.2'
-        dateutil : '2.4.2'
-        docutils : '0.12'
-        doxygen : '1.8.14'
-        eigen : '3.3.4'
-        embree : '3.12.2'
-        freeimage : '3.16.0'
-        freetype : '2.9.1'
-        graphviz : '2.38.0'
-        hdf5 : '1.10.3'
-        idna : '2.7'
-        imagesize : '1.0.0'
-        ispc : '1.15.0'
-        Jinja2 : '2.7.3'
-        kiwisolver : '1.0.1'
-        lapack : '3.8.0'
-        libxml2 : '2.9.1'
-        llvm : '8.0.1-clang'
-        markupsafe : '0.23'
-        matplotlib : '3.0.3'
-        medfile : {section: 'default_Autotools', tag: '4.1.0'}
-        mesa : '19.0.8'
-        numpy : '1.16.4'
-        opencv : '3.2.0'
-        openVKL: '0.11.0'
-        ospray : '2.4.0'
-        packaging : '17.1'
-        ParaView : '5.10.0'
-        Pillow : '7.1.1'
-        planegcs : '0.18-3cb6890'
-        pockets : '0.6.2'
-        Pygments : '2.0.2'
-        pyparsing : '2.0.3'
-        PyQt : '5.15.3'
-        pyreadline : '2.0'
-        Python : '3.6.5'
-        pytz : '2015.7'
-        qt : '5.12.10'
-        qwt : '6.1.2'
-        requests : '2.19.1'
-        rkCommon : '1.5.1'
-        salome_system : 'native'
-        scipy : '1.4.1'
-        setuptools : '38.4.0'
-        sip : '5.5.0'
-        six : '1.10.0'
-        snowballstemmer : '1.2.1'
-        Sphinx : '1.7.6'
-        sphinxcontrib_websupport : '1.1.0'
-        sphinx_rtd_theme : '0.4.3'
-        sphinxintl: '0.9.10'
-        swig : '3.0.12'
-        tbb : '2019_U8'
-        urllib3 : '1.23'
-
-        # SALOME MODULES :
-        'CONFIGURATION' : 'master'
-    }
-    profile :
-    {
-    }
-    test_base : 
-    {
-    }
-    properties :
-    {
-        repo_dev : "yes"
-        pip : 'yes'
-        pip_install_dir : 'python'
-        single_install_dir : "no"
-    }
-}
-__overwrite__ :
-[
-  {
-   __condition__ : "VARS.dist in ['FD32']"
-   # https://github.com/scipy/scipy/issues/11611
-   'APPLICATION.products.scipy' : '1.5.2'
-  }
-]

diff --git a/applications/ParaView-5.9.1.pyconf b/applications/ParaView-5.9.1.pyconf
deleted file mode 100644 (file)
index d1b43fc..0000000
--- a/applications/ParaView-5.9.1.pyconf
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/usr/bin/env python
-#-*- coding:utf-8 -*-
-
-APPLICATION :
-{
-    name : 'ParaView-5.9.1'
-    workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist
-    tag : '5.9.1'
-    dev : 'no'
-    verbose :'no'
-    debug : 'no'
-    base : 'no'
-    python3 : 'yes'
-    environ :
-    {
-        build : 
-        {
-           CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
-           VTK_SMP_IMPLEMENTATION_TYPE : OpenMP
-        }
-        launch :
-        {
-            PYTHONIOENCODING:"UTF_8"
-        }
-        SALOME_trace : "local"
-    }
-    products :
-    {
-        # PREREQUISITES :
-        alabaster : '0.7.6'
-        Babel : '2.7.0'
-        boost : '1.71.0'
-        certifi : '2018.8.24'
-        cgns : '4.1.1'
-        chardet : '3.0.4'
-        click : '6.7'
-        cmake : '3.12.1'
-        cppunit : '1.13.2'
-        cycler : '0.10.0'
-        Cython : '0.25.2'
-        dateutil : '2.4.2'
-        docutils : '0.12'
-        doxygen : '1.8.14'
-        eigen : '3.3.4'
-        embree : '3.12.2'
-        freeimage : '3.16.0'
-        freetype : '2.9.1'
-        graphviz : '2.38.0'
-        hdf5 : '1.10.3'
-        idna : '2.7'
-        imagesize : '1.0.0'
-        ispc : '1.15.0'
-        Jinja2 : '2.7.3'
-        kiwisolver : '1.0.1'
-        lapack : '3.8.0'
-        libxml2 : '2.9.1'
-        llvm : '8.0.1-clang'
-        markupsafe : '0.23'
-        matplotlib : '3.0.3'
-        medfile : {section: 'default_Autotools', tag: '4.1.0'}
-        mesa : '19.0.8'
-        numpy : '1.16.4'
-        opencv : '3.2.0'
-        openVKL: '0.11.0'
-        ospray : '2.4.0'
-        packaging : '17.1'
-        ParaView : '5.9.1'
-        Pillow : '7.1.1'
-        planegcs : '0.18-3cb6890'
-        pockets : '0.6.2'
-        Pygments : '2.0.2'
-        pyparsing : '2.0.3'
-        PyQt : '5.15.3'
-        pyreadline : '2.0'
-        Python : '3.6.5'
-        pytz : '2015.7'
-        qt : '5.12.10'
-        qwt : '6.1.2'
-        requests : '2.19.1'
-        rkCommon : '1.5.1'
-        salome_system : 'native'
-        scipy : '1.4.1'
-        setuptools : '38.4.0'
-        sip : '5.5.0'
-        six : '1.10.0'
-        snowballstemmer : '1.2.1'
-        Sphinx : '1.7.6'
-        sphinxcontrib_websupport : '1.1.0'
-        sphinx_rtd_theme : '0.4.3'
-        sphinxintl: '0.9.10'
-        swig : '3.0.12'
-        tbb : '2019_U8'
-        urllib3 : '1.23'
-
-        # SALOME MODULES :
-        'CONFIGURATION' : 'master'
-    }
-    profile :
-    {
-    }
-    test_base : 
-    {
-    }
-    properties :
-    {
-        repo_dev : "yes"
-        pip : 'yes'
-        pip_install_dir : 'python'
-        single_install_dir : "no"
-    }
-}
-__overwrite__ :
-[
-  {
-   __condition__ : "VARS.dist in ['FD32']"
-   # https://github.com/scipy/scipy/issues/11611
-   'APPLICATION.products.scipy' : '1.5.2'
-  }
-]

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 191d97f980fcc1821d01a642fe4c49ccae7e6971..7d039bdbc98e53dfd7f3afb417b14597050e48c6 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -244,6 +244,7 @@ __overwrite__ :
         'APPLICATION.products.qwt'     : '6.1.2'
         'APPLICATION.products.PyQt'    : '5.15.3'
         'APPLICATION.products.sip'     : '5.5.0'
+        'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no',  section: 'version_5_11_0_MPI_DB10', hpc: 'yes'}
     }
     {
         __condition__ : "VARS.dist in ['DB11']"

diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf
index b1d1eabdc83eb823c3da412c8899192fa6c3d20b..dcb69ebfdeac2f2e66d012ac6bc3500518554af1 100755 (executable)
--- a/products/ParaView.pyconf
+++ b/products/ParaView.pyconf
@@ -35,20 +35,7 @@ version_5_11_0 :
     opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf']
     compil_script :  'ParaView-5.11.0.sh'
     archive_info : {archive_name : "ParaView-5.11.0-08c5d057a8.tar.gz"}
-    # two other LATA patches already included in archive
-    patches : ['paraview.0003-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.0010-ParaView_CATALYST_cmake.patch',
-               'paraview.0008-ParaView_coincident_rendering.patch',
-               'paraview.0011-ParaView_protobuf_crash.patch',
-               'paraview.0015-Paraview_VTKM_ioss.patch',
-               'paraview-5.9.0-gcc.11.0.patch',
-               'paraview.0018-spns-26351-autoconvert.patch',
-               'paraview.0019-spns-26344-VTK-OpenMP.patch'
-              ]
+    patches : []
 }
 
 version_5_11_0_int32 :
@@ -56,18 +43,7 @@ version_5_11_0_int32 :
     compil_script :  'ParaView-5.11.0.sh'
     archive_info : {archive_name : "ParaView-5.11.0-08c5d057a8.tar.gz"}
     # two other LATA patches already included in archive
-    patches : ['paraview.0003-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.0010-ParaView_CATALYST_cmake.patch',
-               'paraview.0008-ParaView_coincident_rendering.patch',
-               'paraview.0011-ParaView_protobuf_crash.patch',
-               'paraview.0015-Paraview_VTKM_ioss.patch',
-               'paraview.0018-spns-26351-autoconvert.patch',
-               'paraview.0019-spns-26344-VTK-OpenMP.patch'
-              ]
+    patches : []
 }
 
 version_5_11_0_win :
@@ -141,145 +117,36 @@ version_5_11_0_MPI_LATA_64BITS_IDS :
 {
     compil_script :  'ParaView-5.11.0.sh'
     archive_info : {archive_name : "ParaView-5.11.0-08c5d057a8.tar.gz"}
-    patches : ['paraview.0003-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-5.9-VTKM_MPI.patch',
-               'paraview.0010-ParaView_CATALYST_cmake.patch',
-               'paraview.0008-ParaView_coincident_rendering.patch',
-               'paraview.0011-ParaView_protobuf_crash.patch',
-               'paraview.0015-Paraview_VTKM_ioss.patch',
-               'paraview-5.9.0-gcc.11.0.patch',
-               'paraview.0017-VTK-openMPI-if-devtoolset.patch',
-               'paraview.0018-spns-26351-autoconvert.patch',
-               'paraview.0019-spns-26344-VTK-OpenMP.patch',
-               'paraview.0020.findMPI.patch',
-               'paraview.0021-FindGDAL.patch',
+    patches : ['paraview-5.11.0.p001-FindCGNS.patch',
+               'paraview-5.11.0.p002-FindMPI.patch',
                'paraview-0012-LATA_64BITS_IDS.patch'
               ]
 }
 
-version_5_10_0 :
-{
-    compil_script :  'ParaView-5.10.0.sh'
-    archive_info : {archive_name : "ParaView-5.10.0-lata.tar.gz"}
-    # two other LATA patches already included in archive
-    patches : ['paraview.0003-ParaViewClient.patch',
-               'paraview.0004-ParaView_hdf5.patch',
-               'paraview.0006-ParaView_find_libxml2.patch',
-               'paraview.0007-ParaView_find_freetype.patch',
-               'paraview.0011-ParaView_protobuf_crash.patch'
-              ]
-}
-
-version_5_10_0_win :
-{
-    compil_script :  'ParaView-5.10.0.bat'
-    archive_info : {archive_name : "ParaView-5.10.0-lata.tar.gz"}
-    depend : [
-              'Python',
-              'hdf5',
-              'qt',
-              'boost',
-              'libxml2',
-              'freetype',
-              'cgns',
-              'Pygments',
-              'pthreads',
-              'zlib'
-             ]
-   opt_depend: ['matplotlib']
-   patches : ['paraview.0003-ParaViewClient.patch',
-               'paraview.0004-ParaView_hdf5.patch',
-               'paraview.0006-ParaView_find_libxml2.patch',
-               'paraview.0007-ParaView_find_freetype.patch',
-               'paraview.0009-ParaView_find_zlib.patch',
-               'paraview.0011-ParaView_protobuf_crash.patch'
-              ]
-}
-
-version_5_10_0_MPI :
+version_5_11_0_MPI_DB10 :
 {
-    compil_script :  'ParaView-5.10.0.sh'
-    archive_info : {archive_name : "ParaView-5.10.0-lata.tar.gz"}
-    patches : ['paraview.0003-ParaViewClient.patch',
-               'paraview.0004-ParaView_hdf5.patch',
-               'paraview.0006-ParaView_find_libxml2.patch',
-               'paraview.0007-ParaView_find_freetype.patch',
-               'paraview-5.9-VTKM_MPI.patch',
-               'paraview.0011-ParaView_protobuf_crash.patch',
-               'paraview.0017-VTK-openMPI-if-devtoolset.patch'
-              ]
-}
-
-version_5_9_1 :
-{
-    compil_script :  'ParaView-5.9.1.sh'
-    archive_info : {archive_name : "ParaView-5.9.1-lata.tar.gz"}
-    # two other LATA patches already included in archive
-    patches : ['paraview.0003-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.0010-ParaView_CATALYST_cmake.patch',
-               'paraview.0008-ParaView_coincident_rendering.patch',
-               'paraview.0011-ParaView_protobuf_crash.patch',
-               'paraview.0015-Paraview_VTKM_ioss.patch'
-              ]
-}
-
-version_5_9_1_win :
-{
-    compil_script :  'ParaView-5.9.1.bat'
-    archive_info : {archive_name : "ParaView-5.9.1-lata.tar.gz"}
+    compil_script :  'ParaView-5.11.0.sh'
+    archive_info : {archive_name : "ParaView-5.11.0-08c5d057a8.tar.gz"}
+    patches : ['paraview-5.11.0.p001-FindCGNS.patch',
+               'paraview-5.11.0.p002-FindMPI.patch',
+               'paraview-5.11.0.p003-ParaViewClient.patch'
+                ]
     depend : [
               'Python',
               'hdf5',
               'qt',
+              'PyQt',
+              'sip',
               'boost',
               'libxml2',
               'freetype',
+              'matplotlib',
               'cgns',
-              'Pygments',
-              'pthreads',
-              'zlib'
-             ]
-    opt_depend: ['matplotlib'] # in debug mode, do not build this product
-    patches : ['paraview.0003-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_find_zlib.patch',
-               'paraview.0010-ParaView_CATALYST_cmake.patch',
-               'paraview.1001-ParaView_windows_catalyst_cmake.patch',
-               'paraview.0008-ParaView_coincident_rendering.patch',
-               'paraview.0011-ParaView_protobuf_crash.patch'
-              ]
-}
-
-version_5_9_1_MPI :
-{
-    compil_script :  'ParaView-5.9.1.sh'
-    archive_info : {archive_name : "ParaView-5.9.1-lata.tar.gz"}
-    patches : ['paraview.0003-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-5.9-VTKM_MPI.patch',
-               'paraview.0010-ParaView_CATALYST_cmake.patch',
-               'paraview.0008-ParaView_coincident_rendering.patch',
-               'paraview.0011-ParaView_protobuf_crash.patch',
-               'paraview.0015-Paraview_VTKM_ioss.patch',
-               'paraview.0017-VTK-openMPI-if-devtoolset.patch'
+              'Pygments'
               ]
+    opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst']
 }
 
-
 version_5_9_0 :
 {
     opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf']

diff --git a/products/patches/paraview-5.11.0.p003-ParaViewClient.patch b/products/patches/paraview-5.11.0.p003-ParaViewClient.patch
new file mode 100644 (file)
index 0000000..db39096
--- /dev/null
+++ b/products/patches/paraview-5.11.0.p003-ParaViewClient.patch
@@ -0,0 +1,15 @@
+diff -Naur ParaView_ref/CMake/ParaViewClient.cmake ParaView_new/CMake/ParaViewClient.cmake
+--- ParaView_ref/CMake/ParaViewClient.cmake    2022-10-03 13:05:55.166123287 +0200
++++ ParaView_new/CMake/ParaViewClient.cmake    2022-10-03 13:06:42.918566468 +0200
+@@ -518,9 +518,10 @@
+ 
+   include("${_ParaViewClient_cmake_dir}/paraview-find-package-helpers.cmake" OPTIONAL)
+   find_program(qt_xmlpatterns_executable
+-    NAMES xmlpatterns-qt5 xmlpatterns
++    NAMES xmlpatterns-qt5 xmlpatterns-qt5
+     HINTS "${Qt5_DIR}/../../../bin"
+           "${Qt5_DIR}/../../../libexec/qt5/bin"
++    NO_CMAKE_PATH
+     DOC   "Path to xmlpatterns")
+   mark_as_advanced(qt_xmlpatterns_executable)
+