spns #34373: on centOS 8, ensure that embedded Qt is picked

diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf
index e9108244d01451ff1067d20331cf452ac3b17c51..e09057f443fd8cda517235251b1627b1436f46c9 100755 (executable)
--- a/products/ParaView.pyconf
+++ b/products/ParaView.pyconf
@@ -190,7 +190,9 @@ version_5_11_1_MPI_CO8 :
 {
     compil_script :  'ParaView-5.11.1.sh'
     archive_info : {archive_name : "ParaView-5.11.1.tar.gz"}
-    patches : []
+    patches : [
+               'paraview-5.11.1.p002-ParaViewClient.patch'
+              ]
     depend : [
               'Python',
               'hdf5',

diff --git a/products/patches/paraview-5.11.1.p002-ParaViewClient.patch b/products/patches/paraview-5.11.1.p002-ParaViewClient.patch
new file mode 100644 (file)
index 0000000..68e9337
--- /dev/null
+++ b/products/patches/paraview-5.11.1.p002-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 xmlpatterns-qt5
+     HINTS "${Qt5_DIR}/../../../bin"
+           "${Qt5_DIR}/../../../libexec/qt5/bin"
++    NO_CMAKE_PATH
+     DOC   "Path to xmlpatterns")
+   mark_as_advanced(qt_xmlpatterns_executable)
+