From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Wed, 4 Nov 2020 08:11:16 +0000 (+0100)
Subject: FD30 - do not target xmlpattern-qt5 system wide
X-Git-Tag: V9_6_0^2~17
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5416a8975bc16ff0bdce9ac946efe8dedc43600a;p=tools%2Fsat_salome.git

FD30 - do not target xmlpattern-qt5 system wide
---

diff --git a/applications/SALOME-9.6.0.pyconf b/applications/SALOME-9.6.0.pyconf
index bfbeb99..3a9fd71 100644
--- a/applications/SALOME-9.6.0.pyconf
+++ b/applications/SALOME-9.6.0.pyconf
@@ -201,6 +201,18 @@ __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'
+                                                ]
+  }
+
   {
     __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