summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIonen Wolkens <ionen@gentoo.org>2024-04-13 13:43:15 -0400
committerIonen Wolkens <ionen@gentoo.org>2024-04-13 14:03:21 -0400
commitc3c8c1ae09b1837167a653c5075be851adf04630 (patch)
tree6e7b8ff05823a2f3253c698b2d8d36c60507cceb
parentdev-qt/qtwebview: Stabilize 6.7.0 amd64, #929242 (diff)
downloadgentoo-c3c8c1ae09b1837167a653c5075be851adf04630.tar.gz
gentoo-c3c8c1ae09b1837167a653c5075be851adf04630.tar.bz2
gentoo-c3c8c1ae09b1837167a653c5075be851adf04630.zip
dev-qt/qtwebengine: hard require qtdeclarative (Qt6)
"May" be possible to do without, but configure.cmake has an assert that prevents progressing if Quick+Qml is not found (even if disabled qml components, not to say something else may not genuinely need it), but for now hard depend on it. In that context it may not be super worth keeping USE=qml, albeit if unneeded it's still a bit less to build/install. May revisit, but keeping is convenient for webchannel[qml?]. Skip revbump, not worth rebuilds and USE=widgets (default and rarely disabled) is already pulling qtdeclarative. Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
-rw-r--r--dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild3
-rw-r--r--dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild3
-rw-r--r--dev-qt/qtwebengine/qtwebengine-6.9999.ebuild3
3 files changed, 3 insertions, 6 deletions
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
index 8e84a585dca0..8f64365294d5 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
@@ -37,6 +37,7 @@ RDEPEND="
dev-libs/nspr
dev-libs/nss
~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl=,vulkan?,widgets?]
+ ~dev-qt/qtdeclarative-${PV}:6[widgets?]
~dev-qt/qtwebchannel-${PV}:6[qml?]
media-libs/fontconfig
media-libs/freetype
@@ -68,7 +69,6 @@ RDEPEND="
geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
kerberos? ( virtual/krb5 )
pulseaudio? ( media-libs/libpulse[glib] )
- qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
screencast? (
dev-libs/glib:2
media-libs/mesa[gbm(+)]
@@ -82,7 +82,6 @@ RDEPEND="
x11-libs/libdrm
)
!vaapi? ( media-libs/libvpx:= )
- widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] )
"
DEPEND="
${RDEPEND}
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index 259833ebd793..69e355090337 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -37,6 +37,7 @@ RDEPEND="
dev-libs/nspr
dev-libs/nss
~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl=,vulkan?,widgets?]
+ ~dev-qt/qtdeclarative-${PV}:6[widgets?]
~dev-qt/qtwebchannel-${PV}:6[qml?]
media-libs/fontconfig
media-libs/freetype
@@ -68,7 +69,6 @@ RDEPEND="
geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
kerberos? ( virtual/krb5 )
pulseaudio? ( media-libs/libpulse[glib] )
- qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
screencast? (
dev-libs/glib:2
media-libs/mesa[gbm(+)]
@@ -82,7 +82,6 @@ RDEPEND="
x11-libs/libdrm
)
!vaapi? ( media-libs/libvpx:= )
- widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] )
"
DEPEND="
${RDEPEND}
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index faf29365b925..311a9544dc48 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -37,6 +37,7 @@ RDEPEND="
dev-libs/nspr
dev-libs/nss
~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl=,vulkan?,widgets?]
+ ~dev-qt/qtdeclarative-${PV}:6[widgets?]
~dev-qt/qtwebchannel-${PV}:6[qml?]
media-libs/fontconfig
media-libs/freetype
@@ -68,7 +69,6 @@ RDEPEND="
geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
kerberos? ( virtual/krb5 )
pulseaudio? ( media-libs/libpulse[glib] )
- qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
screencast? (
dev-libs/glib:2
media-libs/mesa[gbm(+)]
@@ -82,7 +82,6 @@ RDEPEND="
x11-libs/libdrm
)
!vaapi? ( media-libs/libvpx:= )
- widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] )
"
DEPEND="
${RDEPEND}