summaryrefslogtreecommitdiff
path: root/dev-qt/qtwebengine
diff options
context:
space:
mode:
Diffstat (limited to 'dev-qt/qtwebengine')
-rw-r--r--dev-qt/qtwebengine/Manifest2
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-6.8.3-gperf3.2.patch26
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-6.9.1-CVE-2025-5419.patch36
-rw-r--r--dev-qt/qtwebengine/qtwebengine-6.9.1-r1.ebuild345
4 files changed, 0 insertions, 409 deletions
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index ccffb0d4c272..55697fbc22ab 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,8 +1,6 @@
DIST qtwebengine-6.10-patchset-3.tar.xz 8824 BLAKE2B 2a613340478db3a258f29fb182ef161d3597d041b17a42598425a68366652f9c4233a02c7d103d46ce21bebbf2cb9db3e4064301f05608c260c94aeef6bb3299 SHA512 ec2a5303031a739cc9855f80e63c45e956caaa66ba3a672568e50174aade33c47478ba2026f4bac871b1b20e79552f0a85a06a743e6936840f2182a08cbe8dec
DIST qtwebengine-6.10-patchset-6.tar.xz 8488 BLAKE2B 547448e8cc07f74556e1f8a153fda2531721c2bba3dd817087252bce1e15add56a92c6646c60b6c18fa05a17ae8e671f79c76abed98b823431223227fe636c95 SHA512 c3146cfbf9f5593631e4faa9b2733f8312be41f75cf1cad77b8f4dcd7c3de4e06a4b33f9a608841ad09ce323bc9dde119487e8465d06665a8230f3723fad74ef
DIST qtwebengine-6.9-patchset-10.tar.xz 9012 BLAKE2B 272bd27cf4dc32fca12c526862c050763e625c353cfb91bf4d5e79ea44b4194d70fb71954341889f3ef2a411264e4c0eb6739020a29d37b642752cf5d3bb32c6 SHA512 27e03d90b04bacb59de19911ea550163070f7aacab620d3851a57670012f93384f7bf9b2f7e8807ec4026ec71db84e68d4d09f7b3724f74483d8703cc07e30a4
-DIST qtwebengine-6.9-patchset-6.tar.xz 8388 BLAKE2B 8e25f92dedfbb5d7dd267f27c1e62dd7d06db0b329f4b0fa13fe7bae6488338e6c93425a940d88333076bba2045df26e89b4ad7a9bb8a0b32d3f7f680cb032f4 SHA512 3eddf281d316967510a498e504d649380771ed39c5042bbf6c913266745bb09acce020416d066809a660a222734e532b4dfafc5750d16ae3069c0dc737871298
DIST qtwebengine-6.9-patchset-9.tar.xz 9380 BLAKE2B 328af192a73e75f42628c51ade567886a5f7fb6b4000be1dd65c9e5b21e3e7d8f3d96a75e7e6808917819477a36eede61387a6ffa4d6995b3becbbb4fcf1353d SHA512 7cc8415be54518a96db29515d8572bb55fcb85a1ca5ea71cb9261546d9ef22aa768c7cd35801d62cff86504e6d8d7631d7e71e49dfb2b280872b0493d691d72e
DIST qtwebengine-everywhere-src-6.10.0-rc.tar.xz 881149300 BLAKE2B d3b68eecc093ed6bd7888054732e6c5b115f0818d79ca7d2974eb917087623b7ad41577265eacdbd49ec81c98408ca140e4bac2769b0e6cf6cea83f53eda7a0b SHA512 a684ac6d956e84957931ade3ffc5ee49c160878866ce13d0e960dec5e0627104474a64c5f87a1ee91ebf90c8a8f29e5c8c764d56203ac998d5899890fdf471c2
-DIST qtwebengine-everywhere-src-6.9.1.tar.xz 672204388 BLAKE2B a12e0c76862eff51622c5597c9ca0ca3e3967bc88b3c5cdc03357ba4bf4de14f6122fafb97c1fc80f3f9a3c0359a597afe4940293b0fa0baa0fb6f442dfba62e SHA512 fa1c5219973570ef1644d9bd5b12728056983b15002d08acfc9d76465b9055c3ac01be1f6a4ce4112b896988a4714000cf5353804cdf1af2b803bca962416ca5
DIST qtwebengine-everywhere-src-6.9.2.tar.xz 672191852 BLAKE2B 52c1537cffdc3d0b303252bc4bf00574122f8c06e5205fa0b2569287ef38d6799039672fabda907a73aa2240e34f0000d6da094221a749ec55cb237a64b9d3be SHA512 bcb5899170051e6e7f51e95a0a175f99eae26db393d674e8d1670e895ea75d2a7adda647c3ce1ff213c02a92062d164ddff6774f7d872e0762accedc28272e27
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.8.3-gperf3.2.patch b/dev-qt/qtwebengine/files/qtwebengine-6.8.3-gperf3.2.patch
deleted file mode 100644
index b44934ab59d3..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.8.3-gperf3.2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Patch status: fixed in >=chromium-137.0.7126.0
-
-A old workaround for a gperf-3.1 issue[1] breaks building with the
-now fixed gperf-3.2, backport the conditional check[2] which should
-work with either.
-
-[1] https://savannah.gnu.org/bugs/index.php?53029
-[2] https://crrev.com/f8f21fb4aa01f75acbb12abf5ea8c263c6817141
---- a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py
-@@ -36,8 +36,11 @@
- gperf_output = re.sub(r'\bregister ', '', gperf_output)
- # -Wimplicit-fallthrough needs an explicit fallthrough statement,
-- # so replace gperf's /*FALLTHROUGH*/ comment with the statement.
-- # https://savannah.gnu.org/bugs/index.php?53029
-- gperf_output = gperf_output.replace('/*FALLTHROUGH*/',
-- ' [[fallthrough]];')
-+ # so replace gperf 3.1's /*FALLTHROUGH*/ comment with the statement.
-+ # https://savannah.gnu.org/bugs/index.php?53029 (fixed in 3.2)
-+ if re.search(
-+ r'/\* C\+\+ code produced by gperf version 3\.[01](\.\d+)? \*/',
-+ gperf_output):
-+ gperf_output = gperf_output.replace('/*FALLTHROUGH*/',
-+ ' [[fallthrough]];')
- # -Wpointer-to-int-cast warns about casting pointers to smaller ints
- # Replace {(int)(long)&(foo), bar} with
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.9.1-CVE-2025-5419.patch b/dev-qt/qtwebengine/files/qtwebengine-6.9.1-CVE-2025-5419.patch
deleted file mode 100644
index f42c854f46ca..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.9.1-CVE-2025-5419.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://bugs.gentoo.org/957076
-https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/650558
---- a/src/3rdparty/chromium/v8/src/compiler/turboshaft/store-store-elimination-reducer-inl.h
-+++ b/src/3rdparty/chromium/v8/src/compiler/turboshaft/store-store-elimination-reducer-inl.h
-@@ -325,8 +325,9 @@
- // access once available.
- const bool is_on_heap_store = store.kind.tagged_base;
-- const bool is_field_store = !store.index().valid();
-+ const bool is_fixed_offset_store = !store.index().valid();
- const uint8_t size = store.stored_rep.SizeInBytes();
-- // For now we consider only stores of fields of objects on the heap.
-- if (is_on_heap_store && is_field_store) {
-+ // For now we consider only stores of fixed offsets of objects on the
-+ // heap.
-+ if (is_on_heap_store && is_fixed_offset_store) {
- bool is_eliminable_store = false;
- switch (table_.GetObservability(store.base(), store.offset, size)) {
-@@ -415,9 +416,14 @@
- // access once available.
- const bool is_on_heap_load = load.kind.tagged_base;
-- const bool is_field_load = !load.index().valid();
-+ const bool is_fixed_offset_load = !load.index().valid();
- // For now we consider only loads of fields of objects on the heap.
-- if (is_on_heap_load && is_field_load) {
-- table_.MarkPotentiallyAliasingStoresAsObservable(load.base(),
-- load.offset);
-+ if (is_on_heap_load) {
-+ if (is_fixed_offset_load) {
-+ table_.MarkPotentiallyAliasingStoresAsObservable(load.base(),
-+ load.offset);
-+ } else {
-+ // A dynamically indexed load might alias any fixed offset.
-+ table_.MarkAllStoresAsObservable();
-+ }
- }
- break;
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9.1-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9.1-r1.ebuild
deleted file mode 100644
index 78695a9a5175..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-6.9.1-r1.ebuild
+++ /dev/null
@@ -1,345 +0,0 @@
-# Copyright 2021-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..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-6.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
-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-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}
- || (
- sys-devel/gcc:*
- llvm-runtimes/libatomic-stub
- )
- media-libs/libglvnd
- x11-base/xorg-proto
- x11-libs/libXcursor
- x11-libs/libXi
- x11-libs/libxshmfence
- elibc_musl? ( sys-libs/queue-standalone )
- 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.3-gperf3.2.patch
- "${FILESDIR}"/${PN}-6.9.1-CVE-2025-5419.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
-
- # chromium passes this by default, but qtwebengine does not and it may
- # "possibly" get enabled by some paths and cause issues (bug #953111)
- append-ldflags -Wl,-z,noexecstack
-
- 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."
-}