summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-11-25 16:56:59 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2020-11-25 17:10:40 +0100
commit9905e1b6a085a2fe98b550d775b8ba158f76d8fc (patch)
tree205ca1164568cd3df03bb2a3616c24e517dcf1f8 /sci-visualization/paraview/files
parentsci-visualization/paraview: Drop CMAKE_MAKEFILE_GENERATOR="emake" (diff)
downloadgentoo-9905e1b6a085a2fe98b550d775b8ba158f76d8fc.tar.gz
gentoo-9905e1b6a085a2fe98b550d775b8ba158f76d8fc.tar.bz2
gentoo-9905e1b6a085a2fe98b550d775b8ba158f76d8fc.zip
sci-visualization/paraview: Inject path to xmlpatterns, drop QT_SELECT
Closes: https://bugs.gentoo.org/755977 Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'sci-visualization/paraview/files')
-rw-r--r--sci-visualization/paraview/files/paraview-5.8.1-find-xmlpatterns.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/sci-visualization/paraview/files/paraview-5.8.1-find-xmlpatterns.patch b/sci-visualization/paraview/files/paraview-5.8.1-find-xmlpatterns.patch
new file mode 100644
index 000000000000..b02107bad7a7
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-5.8.1-find-xmlpatterns.patch
@@ -0,0 +1,38 @@
+From 7fe2ebc709ecb3e7f3b2aa6fc124dda0622541d4 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 25 Nov 2020 16:32:56 +0100
+Subject: [PATCH] Make qt_xmlpatterns_executable overridable
+
+So far this relies on fragile guessing of path or binary being in PATH.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMake/ParaViewClient.cmake | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/CMake/ParaViewClient.cmake b/CMake/ParaViewClient.cmake
+index b0dea2b328..13b59cd744 100644
+--- a/CMake/ParaViewClient.cmake
++++ b/CMake/ParaViewClient.cmake
+@@ -512,11 +512,13 @@ function (paraview_client_documentation)
+ endif ()
+
+ include("${_ParaViewClient_cmake_dir}/paraview-find-package-helpers.cmake" OPTIONAL)
+- find_program(qt_xmlpatterns_executable
+- NAMES xmlpatterns-qt5 xmlpatterns
+- HINTS "${Qt5_DIR}/../../../bin"
+- "${Qt5_DIR}/../../../libexec/qt5/bin"
+- DOC "Path to xmlpatterns")
++ if (NOT qt_xmlpatterns_executable)
++ find_program(qt_xmlpatterns_executable
++ NAMES xmlpatterns-qt5 xmlpatterns
++ HINTS "${Qt5_DIR}/../../../bin"
++ "${Qt5_DIR}/../../../libexec/qt5/bin"
++ DOC "Path to xmlpatterns")
++ endif ()
+ mark_as_advanced(qt_xmlpatterns_executable)
+
+ if (NOT qt_xmlpatterns_executable)
+--
+2.29.2
+