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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 70BCA15808B for ; Sun, 6 Mar 2022 00:00:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8661EE07C7; Sun, 6 Mar 2022 00:00:23 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1AF72E07C7 for ; Sun, 6 Mar 2022 00:00:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EA9DC3430E4 for ; Sun, 6 Mar 2022 00:00:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 23A23303 for ; Sun, 6 Mar 2022 00:00:20 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1646524605.643ee5d9612eb37bf71c05f0d08da9834acf50fa.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/vtk/vtk-9.1.0.ebuild X-VCS-Directories: sci-libs/vtk/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 643ee5d9612eb37bf71c05f0d08da9834acf50fa X-VCS-Branch: master Date: Sun, 6 Mar 2022 00:00:20 +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: 44d9487f-4ba9-4fbc-8970-c19ee014f860 X-Archives-Hash: 18ab8dba1823c7420ca8cb24e8712b24 commit: 643ee5d9612eb37bf71c05f0d08da9834acf50fa Author: Bernd Waibel posteo net> AuthorDate: Sat Mar 5 01:46:01 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Mar 5 23:56:45 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=643ee5d9 sci-libs/vtk: select desired Qt version If both, Qt5 and Qt6 are installed and found, Qt6 is preferred. The ebuild, however, does not build against Qt6. To ensure Qt5 is selected we pass VTK_QT_VERSION to cmake. Closes: https://bugs.gentoo.org/834595 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Bernd Waibel posteo.net> Closes: https://github.com/gentoo/gentoo/pull/24405 Signed-off-by: Sam James gentoo.org> sci-libs/vtk/vtk-9.1.0.ebuild | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sci-libs/vtk/vtk-9.1.0.ebuild b/sci-libs/vtk/vtk-9.1.0.ebuild index ee1a824bac00..7be370c13c6a 100644 --- a/sci-libs/vtk/vtk-9.1.0.ebuild +++ b/sci-libs/vtk/vtk-9.1.0.ebuild @@ -457,7 +457,10 @@ src_configure() { fi if use qt5; then - mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_GUISupportQt="WANT" ) + mycmakeargs+=( + -DVTK_MODULE_ENABLE_VTK_GUISupportQt="WANT" + -DVTK_QT_VERSION="5" + ) if use mysql || use postgres; then mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_GUISupportQtSQL="WANT" ) fi