mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-20 22:27:17 -08:00
dev-qt/qt5compat: tighten deps a bit (qt6)
* qtbase[icu=]: links directly with it depending on qtbase, so we need to match and bind := for rebuilds * qtbase[xml]: bug #911927 * IUSE=qml: can be optional, and will also use shadertools with qml is found In theory we could add IUSE="gui xml" too but not convinced it's worth worrying about on a compat library, imagine roughly all revdeps will need IUSE="gui" too (unlike qml). Closes: https://bugs.gentoo.org/911927 Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
This commit is contained in:
@@ -5,6 +5,9 @@
|
||||
<email>qt@gentoo.org</email>
|
||||
<name>Gentoo Qt Project</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="qml">Build QML/QtQuick bindings and imports</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<bugs-to>https://bugreports.qt.io/</bugs-to>
|
||||
<doc>https://doc.qt.io/</doc>
|
||||
|
||||
+16
-2
@@ -11,12 +11,26 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
IUSE="icu qml"
|
||||
|
||||
RDEPEND="
|
||||
=dev-qt/qtbase-${PV}*:6[gui,network]
|
||||
=dev-qt/qtdeclarative-${PV}*:6
|
||||
=dev-qt/qtbase-${PV}*:6[gui,icu=,network,xml]
|
||||
icu? ( dev-libs/icu:= )
|
||||
qml? (
|
||||
=dev-qt/qtdeclarative-${PV}*:6
|
||||
=dev-qt/qtshadertools-${PV}*:6
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
$(cmake_use_find_package qml Qt6Qml)
|
||||
)
|
||||
|
||||
qt6-build_src_configure
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# tst_qxmlinputsource sometimes hang without -j1
|
||||
qt6-build_src_test -j1
|
||||
@@ -11,12 +11,26 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
IUSE="icu qml"
|
||||
|
||||
RDEPEND="
|
||||
=dev-qt/qtbase-${PV}*:6[gui,network]
|
||||
=dev-qt/qtdeclarative-${PV}*:6
|
||||
=dev-qt/qtbase-${PV}*:6[gui,icu=,network,xml]
|
||||
icu? ( dev-libs/icu:= )
|
||||
qml? (
|
||||
=dev-qt/qtdeclarative-${PV}*:6
|
||||
=dev-qt/qtshadertools-${PV}*:6
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
$(cmake_use_find_package qml Qt6Qml)
|
||||
)
|
||||
|
||||
qt6-build_src_configure
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# tst_qxmlinputsource sometimes hang without -j1
|
||||
qt6-build_src_test -j1
|
||||
|
||||
@@ -11,12 +11,26 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
IUSE="icu qml"
|
||||
|
||||
RDEPEND="
|
||||
=dev-qt/qtbase-${PV}*:6[gui,network]
|
||||
=dev-qt/qtdeclarative-${PV}*:6
|
||||
=dev-qt/qtbase-${PV}*:6[gui,icu=,network,xml]
|
||||
icu? ( dev-libs/icu:= )
|
||||
qml? (
|
||||
=dev-qt/qtdeclarative-${PV}*:6
|
||||
=dev-qt/qtshadertools-${PV}*:6
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
$(cmake_use_find_package qml Qt6Qml)
|
||||
)
|
||||
|
||||
qt6-build_src_configure
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# tst_qxmlinputsource sometimes hang without -j1
|
||||
qt6-build_src_test -j1
|
||||
|
||||
Reference in New Issue
Block a user