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 9FBB115823F for ; Mon, 20 Nov 2023 02:07:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9E6202BC025; Mon, 20 Nov 2023 02:07:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 82CA52BC025 for ; Mon, 20 Nov 2023 02:07:48 +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 67AA4335D1B for ; Mon, 20 Nov 2023 02:07:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6F4C4139E for ; Mon, 20 Nov 2023 02:07:45 +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: <1700445760.8751700cca4cc4a92768639396b1cb5daef9675c.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtdeclarative/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtdeclarative/qtdeclarative-6.5.3.ebuild dev-qt/qtdeclarative/qtdeclarative-6.6.0.ebuild dev-qt/qtdeclarative/qtdeclarative-6.6.9999.ebuild dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild X-VCS-Directories: dev-qt/qtdeclarative/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 8751700cca4cc4a92768639396b1cb5daef9675c X-VCS-Branch: master Date: Mon, 20 Nov 2023 02:07:45 +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: 4334baf7-3a8d-4c97-9be3-22db7b4af2d7 X-Archives-Hash: bb69ba06fa6092dba2e72f95f0a4d1bd commit: 8751700cca4cc4a92768639396b1cb5daef9675c Author: Eli Schwartz gmail com> AuthorDate: Sun Nov 19 21:34:22 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Mon Nov 20 02:02:40 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8751700c dev-qt/qtdeclarative: add missing build dependency for vulkan When vulkan is enabled, qtbase has to be built with vulkan support, and a bunch of private qt headers are poked at. Those headers privately make use of the bdep which qtbase itself has (USE-conditional on vulkan), but since it is only a build time dependency it is not necessarily guaranteed to be installed when building qtdeclarative. Often it will be installed, since qtbase does after all drag it in. But e.g. when building qtdeclarative from source, but getting qtbase via a binpkg, no bdeps for qtbase are available. Since this is private headers stuff, it makes a certain amount of sense that qtdeclarative should be independently responsible for adding the same bdep on its own, rather than forcing qtbase to runtime depend on it. Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Ionen Wolkens gentoo.org> dev-qt/qtdeclarative/qtdeclarative-6.5.3.ebuild | 5 ++++- dev-qt/qtdeclarative/qtdeclarative-6.6.0.ebuild | 5 ++++- dev-qt/qtdeclarative/qtdeclarative-6.6.9999.ebuild | 5 ++++- dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.5.3.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.5.3.ebuild index fd07eb1554d5..6c27a0af036e 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.5.3.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.5.3.ebuild @@ -18,7 +18,10 @@ IUSE="opengl +sql vulkan +widgets" RESTRICT="test" RDEPEND="~dev-qt/qtbase-${PV}:6[network,opengl=,sql?,vulkan=,widgets=]" -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" BDEPEND="~dev-qt/qtshadertools-${PV}:6" src_configure() { diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.6.0.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.6.0.ebuild index 09d9a70c9d08..2b2d23cdc5a7 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.6.0.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.6.0.ebuild @@ -18,7 +18,10 @@ IUSE="opengl +sql vulkan +widgets" RESTRICT="test" RDEPEND="~dev-qt/qtbase-${PV}:6[network,opengl=,sql?,vulkan=,widgets=]" -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" BDEPEND="~dev-qt/qtshadertools-${PV}:6" src_configure() { diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.6.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.6.9999.ebuild index 09d9a70c9d08..2b2d23cdc5a7 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.6.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.6.9999.ebuild @@ -18,7 +18,10 @@ IUSE="opengl +sql vulkan +widgets" RESTRICT="test" RDEPEND="~dev-qt/qtbase-${PV}:6[network,opengl=,sql?,vulkan=,widgets=]" -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" BDEPEND="~dev-qt/qtshadertools-${PV}:6" src_configure() { diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild index 09d9a70c9d08..2b2d23cdc5a7 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild @@ -18,7 +18,10 @@ IUSE="opengl +sql vulkan +widgets" RESTRICT="test" RDEPEND="~dev-qt/qtbase-${PV}:6[network,opengl=,sql?,vulkan=,widgets=]" -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" BDEPEND="~dev-qt/qtshadertools-${PV}:6" src_configure() {