| 1 |
commit: 587997a8ddffe39ddb1ce4c3874d6b0d4082f4d9 |
| 2 |
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net> |
| 3 |
AuthorDate: Thu Mar 31 15:36:00 2022 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 2 13:05:39 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=587997a8 |
| 7 |
|
| 8 |
sci-libs/vtk: find qt binaries with qt-5.15.3 |
| 9 |
|
| 10 |
Use the path for qmake as a reference for finding the path to Qt binaries |
| 11 |
with Qt 5.15.3 and no qtchooser installed. |
| 12 |
|
| 13 |
Committer-comment: undo unnecessary revbump for build fix. |
| 14 |
|
| 15 |
Closes: https://bugs.gentoo.org/836343 |
| 16 |
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net> |
| 17 |
Closes: https://github.com/gentoo/gentoo/pull/24831 |
| 18 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 19 |
|
| 20 |
.../files/vtk-9.1.0-adjust-to-find-binaries.patch | 25 ++++++++++++++++++++++ |
| 21 |
sci-libs/vtk/vtk-9.1.0.ebuild | 1 + |
| 22 |
2 files changed, 26 insertions(+) |
| 23 |
|
| 24 |
diff --git a/sci-libs/vtk/files/vtk-9.1.0-adjust-to-find-binaries.patch b/sci-libs/vtk/files/vtk-9.1.0-adjust-to-find-binaries.patch |
| 25 |
new file mode 100644 |
| 26 |
index 000000000000..10d6d251ebf3 |
| 27 |
--- /dev/null |
| 28 |
+++ b/sci-libs/vtk/files/vtk-9.1.0-adjust-to-find-binaries.patch |
| 29 |
@@ -0,0 +1,25 @@ |
| 30 |
+From e59b8ff7b83cd6a58c226cb4f5d9661bcb29002b Mon Sep 17 00:00:00 2001 |
| 31 |
+From: Bernd Waibel <waebbl-gentoo@××××××.net> |
| 32 |
+Date: Thu, 31 Mar 2022 08:05:17 +0200 |
| 33 |
+Subject: [PATCH] adjust to find binaries |
| 34 |
+ |
| 35 |
+Add compatibility for qt-5.15.3 with no qtchooser installed. QtCore exports |
| 36 |
+Qt5::{qmake,moc,rcc} which we use to get the path for binaries. |
| 37 |
+ |
| 38 |
+Signed-off-by: Bernd Waibel <waebbl-gentoo@××××××.net> |
| 39 |
+--- a/GUISupport/QtQuick/qml/CMakeLists.txt |
| 40 |
++++ b/GUISupport/QtQuick/qml/CMakeLists.txt |
| 41 |
+@@ -60,8 +60,8 @@ file(GENERATE |
| 42 |
+ # Generate the qmltypes file for the VTK QML plugin |
| 43 |
+ |
| 44 |
+ # First, find the qmlplugindump executable |
| 45 |
+-get_target_property(qt_core_location "Qt${vtk_qt_major_version}::Core" LOCATION) |
| 46 |
+-get_filename_component(qt_bin_dir "${qt_core_location}" PATH) |
| 47 |
++get_target_property(qt_qmake_location "Qt${vtk_qt_major_version}::qmake" LOCATION) |
| 48 |
++get_filename_component(qt_bin_dir "${qt_qmake_location}" PATH) |
| 49 |
+ if (APPLE) |
| 50 |
+ get_filename_component(qt_bin_dir "${qt_bin_dir}" PATH) |
| 51 |
+ endif () |
| 52 |
+-- |
| 53 |
+2.35.1 |
| 54 |
+ |
| 55 |
|
| 56 |
diff --git a/sci-libs/vtk/vtk-9.1.0.ebuild b/sci-libs/vtk/vtk-9.1.0.ebuild |
| 57 |
index 7be370c13c6a..9a6ebbdaac51 100644 |
| 58 |
--- a/sci-libs/vtk/vtk-9.1.0.ebuild |
| 59 |
+++ b/sci-libs/vtk/vtk-9.1.0.ebuild |
| 60 |
@@ -143,6 +143,7 @@ PATCHES=( |
| 61 |
"${FILESDIR}"/${PN}-9.0.1-0001-fix-kepler-compute_arch-if-CUDA-toolkit-11-is-used.patch |
| 62 |
"${FILESDIR}"/${PN}-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch |
| 63 |
"${FILESDIR}"/${PN}-9.0.3-IO-FFMPEG-support-FFmpeg-5.0-API-changes.patch |
| 64 |
+ "${FILESDIR}"/${P}-adjust-to-find-binaries.patch |
| 65 |
) |
| 66 |
|
| 67 |
DOCS=( CONTRIBUTING.md README.md ) |
Archives