diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2020-11-25 16:56:59 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-11-25 17:10:40 +0100 |
| commit | 9905e1b6a085a2fe98b550d775b8ba158f76d8fc (patch) | |
| tree | 205ca1164568cd3df03bb2a3616c24e517dcf1f8 /sci-visualization | |
| parent | sci-visualization/paraview: Drop CMAKE_MAKEFILE_GENERATOR="emake" (diff) | |
| download | gentoo-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')
| -rw-r--r-- | sci-visualization/paraview/files/paraview-5.8.1-find-xmlpatterns.patch | 38 | ||||
| -rw-r--r-- | sci-visualization/paraview/paraview-5.8.1.ebuild | 2 |
2 files changed, 40 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 + diff --git a/sci-visualization/paraview/paraview-5.8.1.ebuild b/sci-visualization/paraview/paraview-5.8.1.ebuild index 7592f9d169a1..d647fcf19cef 100644 --- a/sci-visualization/paraview/paraview-5.8.1.ebuild +++ b/sci-visualization/paraview/paraview-5.8.1.ebuild @@ -107,6 +107,7 @@ PATCHES=( "${FILESDIR}"/${PN}-5.3.0-fix_buildsystem.patch "${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch "${FILESDIR}"/${PN}-5.8.0-w-vtk-8.2.0-qt-5.15.patch # bug 729348 + "${FILESDIR}"/${P}-find-xmlpatterns.patch # bug 755977, downstream patch ) pkg_setup() { @@ -217,6 +218,7 @@ src_configure() { -DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so -DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so -DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc" + -Dqt_xmlpatterns_executable="$(qt5_get_bindir)/xmlpatterns" ) fi |