Standard paraview.0003 patch is needed to build PARAVIS - rework the additional patch...

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 67c7607be72f847cd223d815b9bcd3d1b748a711..8ab98b8edf83f2774cfcdb857c97599f66edd612 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -185,9 +185,11 @@ __overwrite__ :
    }
    {
       # At least on DB10 (UB20 uses the same path...), ParaView fails to find xmlpatterns executable
-      # ParaViewClient.cmake try to find it from Qt5_DIR, going back from it in filesystem (hardcoded)
+      # ParaViewClient.cmake try to find it from Qt5_DIR, going back from it in filesystem (hardcoded).
+      # The standard patch is also needed to be able to build PARAVIS (same kind of issue).
       __condition__ : "VARS.dist in ['DB10', 'UB20']"
-      'PRODUCTS.ParaView.version_5_8_0.patches' : ['ParaViewClient_native.patch']
+      'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0003-ParaViewClient.patch',
+                                                   'paraview.0003-ParaViewClient_native.patch']
    }
 ]
 

diff --git a/products/patches/ParaViewClient_native.patch b/products/patches/ParaViewClient_native.patch
deleted file mode 100644 (file)
index c1b303e..0000000
--- a/products/patches/ParaViewClient_native.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ParaView/CMake/ParaViewClient.cmake        2020-03-23 22:06:19.000000000 +0100
-+++ ParaView.new/CMake/ParaViewClient.cmake    2020-12-17 11:52:15.201636975 +0100
-@@ -516,6 +516,7 @@
-     NAMES xmlpatterns-qt5 xmlpatterns
-     HINTS "${Qt5_DIR}/../../../bin"
-           "${Qt5_DIR}/../../../libexec/qt5/bin"
-+          "${Qt5_DIR}/../../qt5/bin"
-     DOC   "Path to xmlpatterns")
-   mark_as_advanced(qt_xmlpatterns_executable)
- 

diff --git a/products/patches/paraview.0003-ParaViewClient_native.patch b/products/patches/paraview.0003-ParaViewClient_native.patch
new file mode 100644 (file)
index 0000000..74d8333
--- /dev/null
+++ b/products/patches/paraview.0003-ParaViewClient_native.patch
@@ -0,0 +1,10 @@
+--- ParaView/CMake/ParaViewClient.cmake        2020-12-21 19:28:36.023465845 +0100
++++ ParaView.new/CMake/ParaViewClient.cmake    2020-12-21 19:30:17.073254132 +0100
+@@ -516,6 +516,7 @@
+     NAMES xmlpatterns-qt5 xmlpatterns
+     HINTS "${Qt5_DIR}/../../../bin"
+           "${Qt5_DIR}/../../../libexec/qt5/bin"
++          "${Qt5_DIR}/../../qt5/bin"
+     NO_CMAKE_PATH
+     DOC   "Path to xmlpatterns")
+   mark_as_advanced(qt_xmlpatterns_executable)