diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2023-09-08 17:59:16 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2023-09-09 12:06:32 -0400 |
| commit | e9ed045ffa2d1fcd41997826519b0b619c8193b4 (patch) | |
| tree | 06e066a99e4ccd2f22721e2165b31db4248e75d3 /dev-qt | |
| parent | dev-qt/qtserialport: remove unnecessary qtbase[gui,widgets] (diff) | |
| download | gentoo-e9ed045ffa2d1fcd41997826519b0b619c8193b4.tar.gz gentoo-e9ed045ffa2d1fcd41997826519b0b619c8193b4.tar.bz2 gentoo-e9ed045ffa2d1fcd41997826519b0b619c8193b4.zip | |
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@gentoo.org>
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/qtwebchannel/qtwebchannel-6.5.2-r2.ebuild (renamed from dev-qt/qtwebchannel/qtwebchannel-6.5.2-r1.ebuild) | 5 | ||||
| -rw-r--r-- | dev-qt/qtwebchannel/qtwebchannel-6.5.9999.ebuild | 5 | ||||
| -rw-r--r-- | 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 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 } |