From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Mon, 10 May 2021 09:51:25 +0000 (+0200)
Subject: spns #24181: apply patch in release mode as well
X-Git-Tag: V9_7_0~30
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3cbe30d16b28b25b4bee5ed705ce38e4d38ec73f;p=tools%2Fsat_salome.git

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 3df8281..9c983c1 100644
--- 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 f8357c6..3fdf136 100644
--- 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 ce448b4..e6b6fdf 100644
--- 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 7156de0..10e3798 100755
--- 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'
               ]
 }