commit: c8d7b970259552249853a4c59424c3c91773ce14
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 20 17:15:52 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Apr 20 17:30:52 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8d7b970
dev-qt/qtwebchannel: adjust version check for qtdeclarative (qt6)
To recap, this checks for Quick, and then implicitly uses Qml in
a different file. Normally would disable Qt6Qml to disable both
but that gives an "unused option" warning if a *matching version*
qtdeclarative does not exist (and tinderbox automated report).
However, noticed that qtwebchannel-6.7.0 installed some Quick files
and that's because upgraded from 6.7.0_rc2 to 6.7.0 and internally
that's both 6.7.0.
This also shouldn't be using >=, but rather =$(ver_cut 1-3)*.
It'd be simpler+safer to just ignore the unused option warning and
always pass it though (it'd also work for 9999 ebuilds more properly),
but it's not a big enough deal to be worth the noise.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../{qtwebchannel-6.7.0.ebuild => qtwebchannel-6.7.0-r1.ebuild} | 2 +-
dev-qt/qtwebchannel/qtwebchannel-6.7.9999.ebuild | 2 +-
dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.7.0.ebuild
b/dev-qt/qtwebchannel/qtwebchannel-6.7.0-r1.ebuild
similarity index 88%
rename from dev-qt/qtwebchannel/qtwebchannel-6.7.0.ebuild
rename to dev-qt/qtwebchannel/qtwebchannel-6.7.0-r1.ebuild
index 0ef32e10921e..14c71fa0c22a 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-6.7.0.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-6.7.0-r1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
src_configure() {
- has_version ">=dev-qt/qtdeclarative-${PV}:6" && #913692
+ has_version "=dev-qt/qtdeclarative-$(ver_cut 1-3)*:6" && #913692
local mycmakeargs=( $(cmake_use_find_package qml Qt6Qml) )
qt6-build_src_configure
diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.7.9999.ebuild
b/dev-qt/qtwebchannel/qtwebchannel-6.7.9999.ebuild
index 7d637d64ccb2..aef8086235b6 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-6.7.9999.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-6.7.9999.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
src_configure() {
- has_version ">=dev-qt/qtdeclarative-${PV}:6" && #913692
+ has_version "=dev-qt/qtdeclarative-$(ver_cut 1-3)*: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 7d637d64ccb2..aef8086235b6 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-6.9999.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
src_configure() {
- has_version ">=dev-qt/qtdeclarative-${PV}:6" && #913692
+ has_version "=dev-qt/qtdeclarative-$(ver_cut 1-3)*:6" && #913692
local mycmakeargs=( $(cmake_use_find_package qml Qt6Qml) )
qt6-build_src_configure
