spns #24181: apply patch in release mode as well

diff --git a/applications/SALOME-9.7.0-MPI.pyconf b/applications/SALOME-9.7.0-MPI.pyconf
index 3df8281ffbd70be7ef3515b11361e6fdfc67850c..9c983c1cacc965a75ed3c67fe2c96341170fde36 100644 (file)
--- a/applications/SALOME-9.7.0-MPI.pyconf
+++ b/applications/SALOME-9.7.0-MPI.pyconf
@@ -178,19 +178,5 @@ APPLICATION :
 }
 __overwrite__ :
 [
-  {
-   __condition__ : "APPLICATION.debug == 'yes'"
-   # https://cplusplus.com/forum/general/250854 : DEBUG symbol is defined twice, need an additional patch
-    'PRODUCTS.ParaView.version_5_9_0.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-0012-LATA_64BITS_IDS.patch',
-                                                 'ParaView-5.9.0-CATALYST_cmake.patch',
-                                                 'paraview.0008-ParaView_coincident_rendering.patch',
-                                                 'paraview.0015-Paraview_VTKM_ioss.patch',
-                                                 'paraview.0017-ParaView_protobuf_crash.patch']
-  }
 ]
 

diff --git a/applications/SALOME-9.7.0-native.pyconf b/applications/SALOME-9.7.0-native.pyconf
index f8357c620a4108d3dad483e04001d8d14bf558ae..3fdf136918be153889bcbb09d0ddaf3265ca0773 100644 (file)
--- a/applications/SALOME-9.7.0-native.pyconf
+++ b/applications/SALOME-9.7.0-native.pyconf
@@ -213,7 +213,9 @@ __overwrite__ :
                                                    'paraview.0003-ParaViewClient_native.patch',
                                                    'ParaView-5.9.0-CATALYST_cmake.patch',
                                                    'paraview.0008-ParaView_coincident_rendering.patch',
-                                                   'paraview.0017-ParaView_protobuf_crash.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.

diff --git a/applications/SALOME-9.7.0.pyconf b/applications/SALOME-9.7.0.pyconf
index ce448b40fe071a71d481f099722aabe57934a371..e6b6fdfcd9617ff4e67951607b1987e471f083aa 100644 (file)
--- a/applications/SALOME-9.7.0.pyconf
+++ b/applications/SALOME-9.7.0.pyconf
@@ -188,17 +188,4 @@ __overwrite__ :
    #
     'PRODUCTS.qt.version_5_12_10.patches' : ['qt-mapbox-FD32.patch']
   }
-  {
-   __condition__ : "APPLICATION.debug == 'yes'"
-   # https://cplusplus.com/forum/general/250854 : DEBUG symbol is defined twice, need an additional patch
-    'PRODUCTS.ParaView.version_5_9_0.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.0015-Paraview_VTKM_ioss.patch',
-                                                 'paraview.0011-ParaView_protobuf_crash.patch']
-  }
 ]

diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf
index 7156de09022adb246a8840e6cdeb5c2e74df3b44..10e379846a17253fd707ed743422ca293b333aba 100755 (executable)
--- a/products/ParaView.pyconf
+++ b/products/ParaView.pyconf
@@ -42,7 +42,8 @@ version_5_9_0 :
                '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.0011-ParaView_protobuf_crash.patch',
+               'paraview.0015-Paraview_VTKM_ioss.patch'
               ]
 }
 
@@ -58,7 +59,8 @@ version_5_9_0_int32 :
                '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.0011-ParaView_protobuf_crash.patch',
+               'paraview.0015-Paraview_VTKM_ioss.patch'
               ]
 }
 
@@ -134,7 +136,8 @@ version_5_9_0_MPI :
                '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.0011-ParaView_protobuf_crash.patch',
+               'paraview.0015-Paraview_VTKM_ioss.patch'
               ]
 }
 
@@ -150,7 +153,8 @@ version_5_9_0_MPI_int32 :
                '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.0011-ParaView_protobuf_crash.patch',
+               'paraview.0015-Paraview_VTKM_ioss.patch'
               ]
 }