gentoo auto-resync : 15:03:2025 - 00:29:11

2 files changed, 339 insertions, 0 deletions

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 3103bfc33fdd..0380f13cc854 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -12,9 +12,11 @@ DIST qtwebengine-5.15.16_p20241115.tar.xz 301382752 BLAKE2B 08adfae6228a91f1f4b2
 DIST qtwebengine-6.8-patchset-7.tar.xz 9096 BLAKE2B 58a95b198a6c8180a71a4365e7c2e3bee2d3798ecff18b01fe23e228a4ceafe2aae43088f503a98fa2d5097271ec442985d993fb24e1b2d2c09014b3309bef4d SHA512 489caa5f7cc3d3091e5896c2eb4d489a40fc220738c2240ec406928c7c948ab8962817024c2fbe3c393294e70ef6ce8c02e47964952a3656ff6ebf7908069fc3
 DIST qtwebengine-6.9-patchset-3.tar.xz 8152 BLAKE2B 4a1acb8328ae7eedb59fd0c4f721da210eacae9e9faf00a4272c1c376d108c8f996de63aa87b043655bfa0ce3391ad5ff3585512a177310df3990f92e201faf3 SHA512 d89fd2fe3cb441720fdf9cd5701bcdb6cba7677492a2362108b044b60da415a0008efb385f4582d2dea973f04adc5da25fc39ae2fa0a73340da47a3bb2d00dc3
 DIST qtwebengine-everywhere-src-6.8.2.tar.xz 566518084 BLAKE2B 312fda4150bdc1aee25625440baca45b532ecd7a1ce24d3dc3ba990cdf208c3ba42f159e02c881f38b56c29b75677d9001e6222d35b4c96fc39eecf65502e9c7 SHA512 27590ec53845fa36f48a5a0506d505995850027d85bf33fe0413733cbde5c2744e8ea49f445c91d84b8d43454b9f12c1cf7005d614bbcae1a29d432fdacdc0e4
+DIST qtwebengine-everywhere-src-6.9.0-rc.tar.xz 672084252 BLAKE2B b4c6a2f2ee19b00e57ed97948838e963b3d9ed41ecbc292cae262070e0a611c54450b5e01a1e5a590225d298b4432d6b9e6421ea672d509051d8e7cba13e98bb SHA512 fd4985223a90dd512bd97d6c576b2e558f121b489eef4d1c6d2173ddbb2f786c7e593ff336e56aef9a13f68a225ee593f81d5e4f2d112a4935c1d49c82218dcb
 EBUILD qtwebengine-5.15.16_p20241115.ebuild 7879 BLAKE2B ce3061b704385359455c0885efe935b9bf1f8e5627ba06a9fbafb1c95cfccdef6f39331868bbaf3d5794d708e7bb6c01cbef28c1880f45fb60d9e81cc73dcf53 SHA512 c31bca254f0962e39f763f49f22930d7c6d51a68169b72e9bf9afb111a01e40c15c82d86743f185480f092c85e8e17c51dc4e07ee7557ac449a00a8d3952be6f
 EBUILD qtwebengine-6.8.2-r1.ebuild 10408 BLAKE2B 42d215e450b4cc2d22fc4f747f4fe4d236b45532273da4741e9f6d2c6d1847ae1c01fe69dafa77b7175b2e50ae8a19eba61693b24fefadd64fcbee51be96aea7 SHA512 9d7b181cf090f9ecccde4d34fd74d2aba1336793992e001aacf6009c917b9e5489d5e26c8b4228634e8f80c38110aecd71c45846ee9c5c28686a30e7f5c5a0ff
 EBUILD qtwebengine-6.8.9999.ebuild 10527 BLAKE2B 0fb6bab3df9624330d42fe050a86d90d0c4ba62f7e7e3572e9b1d25c71a882f8117d7350c929db293dfcc1c06fd82efcc88cadfd934f15be1c837ca06b4ad642 SHA512 4a386ce71182a10e0ec81ae711f10ba6abde2cc9c646bec366014b2cad9ad7aa426dd0db5c60943d3f5b2457b71dbd4101e9261576690acdd3521e06aaf73657
+EBUILD qtwebengine-6.9.0_rc.ebuild 10590 BLAKE2B fb37158162da5f5940b847981023b63bef8084f62044bbb24fe8b1618b28333dc8bf059a9f7da04952100ce767b7125dd00eab4961e3ce87214bc212b94a7fbb SHA512 3028141e0468be622447a3c748ece70b1bfb8641008e427761a2d7e2f2fd1f68d71c712cf963214810353a10fa77d3138a0cb1ad5c3d28305417efff9a6559fe
 EBUILD qtwebengine-6.9.9999.ebuild 10590 BLAKE2B fb37158162da5f5940b847981023b63bef8084f62044bbb24fe8b1618b28333dc8bf059a9f7da04952100ce767b7125dd00eab4961e3ce87214bc212b94a7fbb SHA512 3028141e0468be622447a3c748ece70b1bfb8641008e427761a2d7e2f2fd1f68d71c712cf963214810353a10fa77d3138a0cb1ad5c3d28305417efff9a6559fe
 EBUILD qtwebengine-6.9999.ebuild 10547 BLAKE2B 72d7672f73e5afca70621c9db51ff4ab1f9ba2d7594ffb4adee018fe5844a117de00e2d7c651ab0fbef66514b180a1a5c779df4a5b2758dd983194c5edd0ead8 SHA512 ed5e4abe5473ac99f0eeef999e9ee26305a9ea78519fea07494812bdc6ae91ed3ffe1fd9f22a890f35ec1ae292168db08f56242fef218f39ce77cdd0adebac6d
 MISC metadata.xml 1236 BLAKE2B 9a47d6cb2641ee53f22926095457c11f8da65a3705863a3ae0496d5bb656ac65acb744b5420deb95afee6ac9f141933b4f45690459e92c71089fe72727854a28 SHA512 9a640a386cc03804858fc02b24299896c03eff53a07db00862bab9d7dd259ca839e890921fcf222c8275cad16b418e423e7e485c03e74e01ab86979553251b4c
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9.0_rc.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9.0_rc.ebuild
new file mode 100644
index 000000000000..3cbb787dc5e8
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.9.0_rc.ebuild
@@ -0,0 +1,337 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="xml(+)"
+inherit check-reqs flag-o-matic multiprocessing optfeature
+inherit prefix python-any-r1 qt6-build toolchain-funcs
+
+DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
+SRC_URI+="
+	https://dev.gentoo.org/~ionen/distfiles/${PN}-6.9-patchset-3.tar.xz
+"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+IUSE="
+	accessibility +alsa bindist custom-cflags designer geolocation
+	+jumbo-build kerberos opengl +pdfium pulseaudio qml screencast
+	+system-icu vaapi vulkan webdriver +widgets
+"
+REQUIRED_USE="
+	designer? ( qml widgets )
+	test? ( widgets )
+"
+
+# dlopen: krb5, libva, pciutils
+# gcc: for -latomic
+RDEPEND="
+	app-arch/snappy:=
+	dev-libs/expat
+	dev-libs/libevent:=
+	dev-libs/libxml2[icu]
+	dev-libs/libxslt
+	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
+	media-libs/harfbuzz:=
+	media-libs/lcms:2
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/libwebp:=
+	media-libs/mesa[gbm(+)]
+	media-libs/openjpeg:2=
+	media-libs/opus
+	media-libs/tiff:=
+	sys-apps/dbus
+	sys-apps/pciutils
+	sys-devel/gcc:*
+	sys-libs/zlib:=[minizip]
+	virtual/libudev:=
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	x11-libs/libdrm
+	x11-libs/libxcb:=
+	x11-libs/libxkbcommon
+	x11-libs/libxkbfile
+	alsa? ( media-libs/alsa-lib )
+	designer? ( ~dev-qt/qttools-${PV}:6[designer] )
+	geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
+	kerberos? ( virtual/krb5 )
+	opengl? ( media-libs/libglvnd[X] )
+	pulseaudio? ( media-libs/libpulse[glib] )
+	screencast? (
+		dev-libs/glib:2
+		media-video/pipewire:=
+	)
+	system-icu? ( dev-libs/icu:= )
+	vaapi? ( media-libs/libva:=[X] )
+"
+DEPEND="
+	${RDEPEND}
+	media-libs/libglvnd
+	x11-base/xorg-proto
+	x11-libs/libXcursor
+	x11-libs/libXi
+	x11-libs/libxshmfence
+	screencast? ( media-libs/libepoxy[egl(+)] )
+	vaapi? (
+		vulkan? ( dev-util/vulkan-headers )
+	)
+"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
+	dev-util/gperf
+	net-libs/nodejs[icu,ssl]
+	sys-devel/bison
+	sys-devel/flex
+"
+
+PATCHES=( "${WORKDIR}"/patches/${PN} )
+[[ ${PV} == 6.9999 ]] || # too fragile for 6.9999, but keep for 6.x.9999
+	PATCHES+=( "${WORKDIR}"/patches/chromium )
+
+PATCHES+=(
+	# add extras as needed here, may merge in set if carries across versions
+	"${FILESDIR}"/${PN}-6.8.2-glibc2.41.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+qtwebengine_check-reqs() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if is-flagq '-g?(gdb)?([1-9])'; then #307861
+		ewarn
+		ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
+		ewarn "is non-trivial with ${PN}. May experience extended compilation"
+		ewarn "times, increased disk/memory usage, and potentially link failure."
+		ewarn
+		ewarn "If run into issues, please try disabling before reporting a bug."
+	fi
+
+	local CHECKREQS_DISK_BUILD=10G
+	local CHECKREQS_DISK_USR=400M
+
+	if ! has distcc ${FEATURES}; then #830661
+		# assume ~2GB per job or 1.5GB if clang, possible with less
+		# depending on free memory and *FLAGS, but prefer being safe as
+		# users having OOM issues with qtwebengine been rather common
+		tc-is-clang && : 15 || : 20
+		local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
+	fi
+
+	check-reqs_${EBUILD_PHASE_FUNC} #570534
+}
+
+pkg_pretend() {
+	qtwebengine_check-reqs
+}
+
+pkg_setup() {
+	qtwebengine_check-reqs
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	qt6-build_src_prepare
+
+	# for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
+	hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
+
+	# store chromium versions, only used in postinst for a warning
+	local chromium
+	mapfile -t chromium < CHROMIUM_VERSION || die
+	[[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] &&
+		QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die
+	[[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] &&
+		QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(qt_feature pdfium qtpdf_build)
+		$(use pdfium && qt_feature qml qtpdf_quick_build)
+		$(use pdfium && qt_feature widgets qtpdf_widgets_build)
+		$(usev pdfium -DQT_FEATURE_pdf_v8=ON)
+
+		# TODO?: since 6.9.0, dependency checks have been adjusted to make it
+		# easier for webengine to be optional which could be useful if *only*
+		# need QtPdf (rare at the moment), would require all revdeps to depend
+		# on qtwebengine[webengine(+)]
+		-DQT_FEATURE_qtwebengine_build=ON
+		$(qt_feature qml qtwebengine_quick_build)
+		$(qt_feature webdriver webenginedriver)
+		$(qt_feature widgets qtwebengine_widgets_build)
+
+		$(cmake_use_find_package designer Qt6Designer)
+
+		$(qt_feature alsa webengine_system_alsa)
+		$(qt_feature !bindist webengine_proprietary_codecs)
+		$(qt_feature geolocation webengine_geolocation)
+		$(qt_feature jumbo-build webengine_jumbo_build)
+		$(qt_feature kerberos webengine_kerberos)
+		$(qt_feature pulseaudio webengine_system_pulseaudio)
+		$(qt_feature screencast webengine_webrtc_pipewire)
+		$(qt_feature system-icu webengine_system_icu)
+		$(qt_feature vaapi webengine_vaapi)
+		$(qt_feature vulkan webengine_vulkan)
+		-DQT_FEATURE_webengine_embedded_build=OFF
+		-DQT_FEATURE_webengine_extensions=ON
+		# TODO: it may be possible to make x11 optional since 6.8+
+		-DQT_FEATURE_webengine_ozone_x11=ON
+		-DQT_FEATURE_webengine_pepper_plugins=ON
+		-DQT_FEATURE_webengine_printing_and_pdf=ON
+		-DQT_FEATURE_webengine_spellchecker=ON
+		-DQT_FEATURE_webengine_webchannel=ON
+		-DQT_FEATURE_webengine_webrtc=ON
+
+		# needs a modified ffmpeg to be usable (bug #831487), and even then
+		# it is picky about codecs/version and system's can lead to unexpected
+		# issues (e.g. builds but some files don't play even with support)
+		-DQT_FEATURE_webengine_system_ffmpeg=OFF
+
+		# use bundled re2 to avoid complications, Qt has also disabled
+		# this by default in 6.7.3+ (bug #913923)
+		-DQT_FEATURE_webengine_system_re2=OFF
+
+		# system_libvpx=ON is intentionally ignored with USE=vaapi which leads
+		# to using system's being less tested, prefer disabling for now until
+		# vaapi can use it as well
+		-DQT_FEATURE_webengine_system_libvpx=OFF
+
+		# 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)
+
+		# 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
+	)
+
+	local mygnargs=(
+		# prefer no dlopen where possible
+		$(usev pulseaudio link_pulseaudio=true)
+		$(usev screencast rtc_link_pipewire=true)
+		# reduce default disk space usage
+		symbol_level=0
+	)
+
+	if use !custom-cflags; then
+		# qtwebengine can be rather fragile with *FLAGS
+		filter-lto
+		strip-flags
+
+		if is-flagq '-g?(gdb)?([2-9])'; then #914475
+			replace-flags '-g?(gdb)?([2-9])' -g1
+			ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
+		fi
+
+		# Built helpers segfault when using (at least) -march=armv8-a+pauth
+		# (bug #920555, #920568 -- suspected gcc bug). For now, filter all
+		# for simplicity. Override with USE=custom-cflags if wanted, please
+		# report if above -march works again so can cleanup.
+		use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
+	fi
+
+	export NINJAFLAGS=$(get_NINJAOPTS)
+	[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
+
+	local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
+	einfo "Extra Gn args: ${EXTRA_GN}"
+
+	qt6-build_src_configure
+}
+
+src_compile() {
+	# tentatively work around a possible (rare) race condition (bug #921680),
+	# has good chances to be obsolete but keep for now as a safety
+	cmake_build WebEngineCore_sync_all_public_headers
+
+	cmake_src_compile
+}
+
+src_test() {
+	if [[ ${EUID} == 0 ]]; then
+		# almost every tests fail, so skip entirely
+		ewarn "Skipping tests due to running as root (chromium refuses this configuration)."
+		return
+	fi
+
+	local CMAKE_SKIP_TESTS=(
+		# fails with network sandbox
+		tst_certificateerror
+		tst_loadsignals
+		tst_qquickwebengineview
+		tst_qwebengineglobalsettings
+		tst_qwebengineview
+		# fails with offscreen rendering, may be worth retrying if the issue
+		# persist given these are rather major tests (or consider virtx)
+		tst_qmltests
+		tst_qwebenginepage
+		# certs verfication seems flaky and gives expiration warnings
+		tst_qwebengineclientcertificatestore
+		# test is misperformed when qtbase is built USE=-test?
+		tst_touchinput
+		# currently requires webenginedriver to be already installed
+		tst_webenginedriver
+	)
+
+	# prevent using the system's qtwebengine
+	# (use glob to avoid unnecessary complications with arch dir)
+	local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* )
+	[[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}"
+	local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess
+	local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales
+	local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]}
+
+	# random failures in several tests without -j1
+	qt6-build_src_test -j1
+}
+
+src_install() {
+	qt6-build_src_install
+
+	[[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
+		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+
+	if use test && use webdriver; then
+		rm -- "${D}${QT6_BINDIR}"/testbrowser || die
+	fi
+}
+
+pkg_postinst() {
+	# plugin may also be found in $HOME if provided by chrome or firefox
+	use amd64 &&
+		optfeature "Widevine DRM support (protected media playback)" \
+			www-plugins/chrome-binary-plugins
+
+	elog
+	elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
+	elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. Extensive as it is, the"
+	elog "list of backports is impossible to evaluate, but always bound to be behind"
+	elog "Chromium's release schedule."
+	elog
+	elog "In addition, various online services may deny service based on an outdated"
+	elog "user agent version (and/or other checks). Google is already known to do so."
+	elog
+	elog "tl;dr your web browsing experience will be compromised."
+}