From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1553209-garchives=archives.gentoo.org@lists.gentoo.org>
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 6C4DD158089
for <garchives@archives.gentoo.org>; Sat, 9 Sep 2023 16:22:52 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id AFC1F2BC040;
Sat, 9 Sep 2023 16:22:51 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.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 9AFCD2BC035
for <gentoo-commits@lists.gentoo.org>; Sat, 9 Sep 2023 16:22:51 +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 E783C335C56
for <gentoo-commits@lists.gentoo.org>; Sat, 9 Sep 2023 16:22:50 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 08DAF1168
for <gentoo-commits@lists.gentoo.org>; Sat, 9 Sep 2023 16:22:48 +0000 (UTC)
From: "Ionen Wolkens" <ionen@gentoo.org>
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" <ionen@gentoo.org>
Message-ID: <1694275592.e9ed045ffa2d1fcd41997826519b0b619c8193b4.ionen@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebchannel/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-qt/qtwebchannel/qtwebchannel-6.5.2-r1.ebuild dev-qt/qtwebchannel/qtwebchannel-6.5.2-r2.ebuild dev-qt/qtwebchannel/qtwebchannel-6.5.9999.ebuild dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild
X-VCS-Directories: dev-qt/qtwebchannel/
X-VCS-Committer: ionen
X-VCS-Committer-Name: Ionen Wolkens
X-VCS-Revision: e9ed045ffa2d1fcd41997826519b0b619c8193b4
X-VCS-Branch: master
Date: Sat, 9 Sep 2023 16:22:48 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: a6506da8-e824-4d21-8bb9-5e967400e057
X-Archives-Hash: 4b476e14e71cbb1522f2de1962199c0d
commit: e9ed045ffa2d1fcd41997826519b0b619c8193b4
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 8 21:59:16 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Sep 9 16:06:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9ed045f
dev-qt/qtwebchannel: adjust qml check again
Package only checks for Quick in top level CMakeLists.txt, but then uses
Qt::Qml (implicit from Quick) anyway. Current disable method does block
Quick target stuff but does not fully prevent from linking with Qt6Qml.
Revert, but do a has_version to avoid noise.
Bug: https://bugs.gentoo.org/913692
Fixes: a2b7cc29cbb6ac57ff4cddbc39c50a060e8cac66
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../{qtwebchannel-6.5.2-r1.ebuild => qtwebchannel-6.5.2-r2.ebuild} | 5 ++---
dev-qt/qtwebchannel/qtwebchannel-6.5.9999.ebuild | 5 ++---
dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild | 5 ++---
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.5.2-r1.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.5.2-r2.ebuild
similarity index 78%
rename from dev-qt/qtwebchannel/qtwebchannel-6.5.2-r1.ebuild
rename to dev-qt/qtwebchannel/qtwebchannel-6.5.2-r2.ebuild
index 94df0371318c..6a2b4df1a5b8 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-6.5.2-r1.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-6.5.2-r2.ebuild
@@ -20,9 +20,8 @@ RDEPEND="
DEPEND="${RDEPEND}"
src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package qml Qt6Quick)
- )
+ has_version dev-qt/qtdeclarative:6 && #913692
+ local mycmakeargs=( $(cmake_use_find_package qml Qt6Qml) )
qt6-build_src_configure
}
diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.5.9999.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.5.9999.ebuild
index 94df0371318c..6a2b4df1a5b8 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-6.5.9999.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-6.5.9999.ebuild
@@ -20,9 +20,8 @@ RDEPEND="
DEPEND="${RDEPEND}"
src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package qml Qt6Quick)
- )
+ has_version dev-qt/qtdeclarative:6 && #913692
+ local mycmakeargs=( $(cmake_use_find_package qml Qt6Qml) )
qt6-build_src_configure
}
diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild
index 94df0371318c..6a2b4df1a5b8 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild
@@ -20,9 +20,8 @@ RDEPEND="
DEPEND="${RDEPEND}"
src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package qml Qt6Quick)
- )
+ has_version dev-qt/qtdeclarative:6 && #913692
+ local mycmakeargs=( $(cmake_use_find_package qml Qt6Qml) )
qt6-build_src_configure
}