dev-qt/qtwebengine: update live

Unbundles openh264, only used if webengine_proprietary_codecs
is enabled meaning bindist not being set.

wrt SBOM, cmake files were failing to generate with it and haven't
spent more time on this (it'd likely work if had spdx-tools which
seems unpackaged, this is the fallback path) -- not super important
(for us) so let's just disable for now.

wrt new skipped test, this is a new test that fails only with one
of *-sandbox (haven't narrowed it down given it's tedious with
qtwebengine)

Signed-off-by: Ionen Wolkens <ionen@gentoo.org>

3 files changed, 23 insertions, 11 deletions

diff --git a/dev-qt/qtwebengine/qtwebengine-6.10.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.10.9999.ebuild
index 4776fb8d314c..f0ce2d085399 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.10.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.10.9999.ebuild
@@ -30,7 +30,6 @@ REQUIRED_USE="
 RDEPEND="
 	app-arch/snappy:=
 	dev-libs/expat
-	dev-libs/libevent:=
 	dev-libs/libxml2:=[icu]
 	dev-libs/libxslt
 	dev-libs/nspr
@@ -76,6 +75,7 @@ RDEPEND="
 	)
 	system-icu? ( dev-libs/icu:= )
 	vaapi? ( media-libs/libva:=[X] )
+	!bindist? ( >=media-libs/openh264-2.4.1:= )
 "
 DEPEND="
 	${RDEPEND}
@@ -221,13 +221,16 @@ src_configure() {
 		# not necessary to pass these (default), but in case detection fails
 		# given qtbase's force_system_libs does not affect these right now
 		$(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
-			freetype gbm glib harfbuzz lcms2 libevent libjpeg \
-			libopenjpeg2 libpci libpng libtiff libudev libwebp \
-			libxml minizip opus snappy zlib)
+			freetype gbm glib harfbuzz lcms2 libjpeg libopenjpeg2 \
+			libpci libpng libtiff libudev libwebp libxml minizip \
+			openh264 opus snappy zlib)
 
 		# TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
 		# (see also BUILD_ONLY_GN option added in 6.8+ for the latter)
 		-DINSTALL_GN=OFF
+
+		# TODO: drop this if no longer errors out early during cmake generation
+		-DQT_GENERATE_SBOM=OFF
 	)
 
 	local mygnargs=(
@@ -285,11 +288,12 @@ src_test() {
 	fi
 
 	local CMAKE_SKIP_TESTS=(
-		# fails with network sandbox
+		# fails with *-sandbox
 		tst_certificateerror
 		tst_loadsignals
 		tst_qquickwebengineview
 		tst_qwebengineglobalsettings
+		tst_qwebenginepermission
 		tst_qwebengineview
 		# fails with offscreen rendering, may be worth retrying if the issue
 		# persist given these are rather major tests (or consider virtx)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild
index 8f499444bb1c..7c05e1c18c87 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild
@@ -228,6 +228,9 @@ src_configure() {
 		# TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
 		# (see also BUILD_ONLY_GN option added in 6.8+ for the latter)
 		-DINSTALL_GN=OFF
+
+		# TODO: drop this if no longer errors out early during cmake generation
+		-DQT_GENERATE_SBOM=OFF
 	)
 
 	local mygnargs=(
@@ -285,11 +288,12 @@ src_test() {
 	fi
 
 	local CMAKE_SKIP_TESTS=(
-		# fails with network sandbox
+		# fails with *-sandbox
 		tst_certificateerror
 		tst_loadsignals
 		tst_qquickwebengineview
 		tst_qwebengineglobalsettings
+		tst_qwebenginepermission
 		tst_qwebengineview
 		# fails with offscreen rendering, may be worth retrying if the issue
 		# persist given these are rather major tests (or consider virtx)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 0fcd00d837ce..283d4c583e8d 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -30,7 +30,6 @@ REQUIRED_USE="
 RDEPEND="
 	app-arch/snappy:=
 	dev-libs/expat
-	dev-libs/libevent:=
 	dev-libs/libxml2:=[icu]
 	dev-libs/libxslt
 	dev-libs/nspr
@@ -76,6 +75,7 @@ RDEPEND="
 	)
 	system-icu? ( dev-libs/icu:= )
 	vaapi? ( media-libs/libva:=[X] )
+	!bindist? ( >=media-libs/openh264-2.4.1:= )
 "
 DEPEND="
 	${RDEPEND}
@@ -219,13 +219,16 @@ src_configure() {
 		# not necessary to pass these (default), but in case detection fails
 		# given qtbase's force_system_libs does not affect these right now
 		$(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
-			freetype gbm glib harfbuzz lcms2 libevent libjpeg \
-			libopenjpeg2 libpci libpng libtiff libudev libwebp \
-			libxml minizip opus snappy zlib)
+			freetype gbm glib harfbuzz lcms2 libjpeg libopenjpeg2 \
+			libpci libpng libtiff libudev libwebp libxml minizip \
+			openh264 opus snappy zlib)
 
 		# TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
 		# (see also BUILD_ONLY_GN option added in 6.8+ for the latter)
 		-DINSTALL_GN=OFF
+
+		# TODO: drop this if no longer errors out early during cmake generation
+		-DQT_GENERATE_SBOM=OFF
 	)
 
 	local mygnargs=(
@@ -283,11 +286,12 @@ src_test() {
 	fi
 
 	local CMAKE_SKIP_TESTS=(
-		# fails with network sandbox
+		# fails with *-sandbox
 		tst_certificateerror
 		tst_loadsignals
 		tst_qquickwebengineview
 		tst_qwebengineglobalsettings
+		tst_qwebenginepermission
 		tst_qwebengineview
 		# fails with offscreen rendering, may be worth retrying if the issue
 		# persist given these are rather major tests (or consider virtx)