From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D2AF0138359 for ; Wed, 25 Nov 2020 16:11:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 088ABE0878; Wed, 25 Nov 2020 16:11:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D0C99E0863 for ; Wed, 25 Nov 2020 16:10:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 958013410D7 for ; Wed, 25 Nov 2020 16:10:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1470846A for ; Wed, 25 Nov 2020 16:10:57 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1606320640.9905e1b6a085a2fe98b550d775b8ba158f76d8fc.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/files/, sci-visualization/paraview/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-visualization/paraview/files/paraview-5.8.1-find-xmlpatterns.patch sci-visualization/paraview/paraview-5.8.1.ebuild X-VCS-Directories: sci-visualization/paraview/files/ sci-visualization/paraview/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 9905e1b6a085a2fe98b550d775b8ba158f76d8fc X-VCS-Branch: master Date: Wed, 25 Nov 2020 16:10:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 631eebe8-e4f9-4c70-8dbd-88aa2d9c2ac3 X-Archives-Hash: dfcf94c34f36770ea4032128dc604223 commit: 9905e1b6a085a2fe98b550d775b8ba158f76d8fc Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Nov 25 15:56:59 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Nov 25 16:10:40 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9905e1b6 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 gentoo.org> .../files/paraview-5.8.1-find-xmlpatterns.patch | 38 ++++++++++++++++++++++ sci-visualization/paraview/paraview-5.8.1.ebuild | 2 ++ 2 files changed, 40 insertions(+) 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 00000000000..b02107bad7a --- /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 +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 +--- + 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 7592f9d169a..d647fcf19ce 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