Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sci-libs/vtk: find qt binaries with qt-5.15.3 #24831

Closed
wants to merge 1 commit into from
Closed

sci-libs/vtk: find qt binaries with qt-5.15.3 #24831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 25 additions & 0 deletions sci-libs/vtk/files/vtk-9.1.0-adjust-to-find-binaries.patch
View file
Open in desktop
@@ -0,0 +1,25 @@
From e59b8ff7b83cd6a58c226cb4f5d9661bcb29002b Mon Sep 17 00:00:00 2001
From: Bernd Waibel <waebbl-gentoo@posteo.net>
Date: Thu, 31 Mar 2022 08:05:17 +0200
Subject: [PATCH] adjust to find binaries

Add compatibility for qt-5.15.3 with no qtchooser installed. QtCore exports
Qt5::{qmake,moc,rcc} which we use to get the path for binaries.

Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
--- a/GUISupport/QtQuick/qml/CMakeLists.txt
+++ b/GUISupport/QtQuick/qml/CMakeLists.txt
@@ -60,8 +60,8 @@ file(GENERATE
# Generate the qmltypes file for the VTK QML plugin

# First, find the qmlplugindump executable
-get_target_property(qt_core_location "Qt${vtk_qt_major_version}::Core" LOCATION)
-get_filename_component(qt_bin_dir "${qt_core_location}" PATH)
+get_target_property(qt_qmake_location "Qt${vtk_qt_major_version}::qmake" LOCATION)
+get_filename_component(qt_bin_dir "${qt_qmake_location}" PATH)
if (APPLE)
get_filename_component(qt_bin_dir "${qt_bin_dir}" PATH)
endif ()
--
2.35.1

1 change: 1 addition & 0 deletions sci-libs/vtk/vtk-9.1.0.ebuild → sci-libs/vtk/vtk-9.1.0-r1.ebuild
View file
Open in desktop
Expand Up @@ -143,6 +143,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-9.0.1-0001-fix-kepler-compute_arch-if-CUDA-toolkit-11-is-used.patch
"${FILESDIR}"/${PN}-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
"${FILESDIR}"/${PN}-9.0.3-IO-FFMPEG-support-FFmpeg-5.0-API-changes.patch
"${FILESDIR}"/${P}-adjust-to-find-binaries.patch
)

DOCS=( CONTRIBUTING.md README.md )
Expand Down