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 46BC0158089 for ; Tue, 5 Sep 2023 15:28:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89C982BC02C; Tue, 5 Sep 2023 15:28:49 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 762952BC02C for ; Tue, 5 Sep 2023 15:28:49 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BEE04335C8E for ; Tue, 5 Sep 2023 15:28:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 64C921126 for ; Tue, 5 Sep 2023 15:28:47 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1693927706.46d578c01178e7992c5142b965db04183f4202d4.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qt5compat/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qt5compat/qt5compat-6.5.2-r1.ebuild dev-qt/qt5compat/qt5compat-6.5.9999.ebuild dev-qt/qt5compat/qt5compat-6.9999.ebuild X-VCS-Directories: dev-qt/qt5compat/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 46d578c01178e7992c5142b965db04183f4202d4 X-VCS-Branch: master Date: Tue, 5 Sep 2023 15:28:47 +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: 0e34576d-ba90-4541-9cb1-16683a827db2 X-Archives-Hash: 86d0904a46a02e623d19e45eefad6792 commit: 46d578c01178e7992c5142b965db04183f4202d4 Author: Ionen Wolkens gentoo org> AuthorDate: Tue Sep 5 15:12:07 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Sep 5 15:28:26 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46d578c0 dev-qt/qt5compat: adjust qml check Works either way but Qt6Qml produces cmake noise if qtdeclarative is not installed. Bug: https://bugs.gentoo.org/913692 Signed-off-by: Ionen Wolkens gentoo.org> dev-qt/qt5compat/qt5compat-6.5.2-r1.ebuild | 2 +- dev-qt/qt5compat/qt5compat-6.5.9999.ebuild | 2 +- dev-qt/qt5compat/qt5compat-6.9999.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-qt/qt5compat/qt5compat-6.5.2-r1.ebuild b/dev-qt/qt5compat/qt5compat-6.5.2-r1.ebuild index 46743a4d8f24..f7beee148ed0 100644 --- a/dev-qt/qt5compat/qt5compat-6.5.2-r1.ebuild +++ b/dev-qt/qt5compat/qt5compat-6.5.2-r1.ebuild @@ -25,7 +25,7 @@ DEPEND="${RDEPEND}" src_configure() { local mycmakeargs=( - $(cmake_use_find_package qml Qt6Qml) + $(cmake_use_find_package qml Qt6Quick) ) qt6-build_src_configure diff --git a/dev-qt/qt5compat/qt5compat-6.5.9999.ebuild b/dev-qt/qt5compat/qt5compat-6.5.9999.ebuild index 46743a4d8f24..f7beee148ed0 100644 --- a/dev-qt/qt5compat/qt5compat-6.5.9999.ebuild +++ b/dev-qt/qt5compat/qt5compat-6.5.9999.ebuild @@ -25,7 +25,7 @@ DEPEND="${RDEPEND}" src_configure() { local mycmakeargs=( - $(cmake_use_find_package qml Qt6Qml) + $(cmake_use_find_package qml Qt6Quick) ) qt6-build_src_configure diff --git a/dev-qt/qt5compat/qt5compat-6.9999.ebuild b/dev-qt/qt5compat/qt5compat-6.9999.ebuild index 46743a4d8f24..f7beee148ed0 100644 --- a/dev-qt/qt5compat/qt5compat-6.9999.ebuild +++ b/dev-qt/qt5compat/qt5compat-6.9999.ebuild @@ -25,7 +25,7 @@ DEPEND="${RDEPEND}" src_configure() { local mycmakeargs=( - $(cmake_use_find_package qml Qt6Qml) + $(cmake_use_find_package qml Qt6Quick) ) qt6-build_src_configure