dev-qt/qtwebengine: drop 6.8.3

Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
This commit is contained in:
Ionen Wolkens
2025-07-10 10:02:26 -04:00
parent 13fa26af1c
commit cc5ccf7dc5
6 changed files with 0 additions and 445 deletions

View File

@@ -1,5 +1,3 @@
DIST qtwebengine-6.8-patchset-7.tar.xz 9096 BLAKE2B 58a95b198a6c8180a71a4365e7c2e3bee2d3798ecff18b01fe23e228a4ceafe2aae43088f503a98fa2d5097271ec442985d993fb24e1b2d2c09014b3309bef4d SHA512 489caa5f7cc3d3091e5896c2eb4d489a40fc220738c2240ec406928c7c948ab8962817024c2fbe3c393294e70ef6ce8c02e47964952a3656ff6ebf7908069fc3
DIST qtwebengine-6.9-patchset-6.tar.xz 8388 BLAKE2B 8e25f92dedfbb5d7dd267f27c1e62dd7d06db0b329f4b0fa13fe7bae6488338e6c93425a940d88333076bba2045df26e89b4ad7a9bb8a0b32d3f7f680cb032f4 SHA512 3eddf281d316967510a498e504d649380771ed39c5042bbf6c913266745bb09acce020416d066809a660a222734e532b4dfafc5750d16ae3069c0dc737871298
DIST qtwebengine-6.9-patchset-7.tar.xz 8160 BLAKE2B 86f0183483fd93fd36103a69aa33ce63db8ff65916fa4e49543e984dbe6b6d63af681da95f03842b7a7697d178ab4bd60abc9a4cb0b024dcebe321c2574be3e2 SHA512 ca8f99890e521ac33701902522b28e47dd0516eaf475fb0277be9c6e3fd3da4dec1c0709a5514f89d785606c7d8872e4b80dfff2d5302d9b4f45d88fc280d40b
DIST qtwebengine-everywhere-src-6.8.3.tar.xz 566553436 BLAKE2B a3188d79f9d3b52423d4578b69c3ccf115a66994fd4f98d82cac2f6f8d443a22e102a53a0d5eb6f985b8ab7ebfe0cc22b8d34c31fbfd83f3a80b0c945b026f2a SHA512 01e8988c76ff40ca5e38f76e90791d7ef708c29f2e9f8e83ca8604b6335fbecdee71473678a63633ec1edec85088256b20e56a618ca95748ccbe1e7b9673c298
DIST qtwebengine-everywhere-src-6.9.1.tar.xz 672204388 BLAKE2B a12e0c76862eff51622c5597c9ca0ca3e3967bc88b3c5cdc03357ba4bf4de14f6122fafb97c1fc80f3f9a3c0359a597afe4940293b0fa0baa0fb6f442dfba62e SHA512 fa1c5219973570ef1644d9bd5b12728056983b15002d08acfc9d76465b9055c3ac01be1f6a4ce4112b896988a4714000cf5353804cdf1af2b803bca962416ca5

View File

@@ -1,32 +0,0 @@
Patch status: fixed in >=chromium-133.0.6892.0
IWYU issue, only manifests with gcc+musl[1] (clang+musl or gcc+glibc are fine).
Backport of [2] (>=chromium-133.0.6892.0) + [3][4] (>=chromium-128.0.6571.0).
TODO: [2] likely needs to be kept Qt6.9.0, but the rest is already present
[1] https://bugs.gentoo.org/950579
[2] https://chromium.googlesource.com/external/webrtc/+/000f04375b67e6139a1dc88d832d2da65c7acb29
[3] https://crrev.com/0d3d5062f7d5ff83f38685bf864c71dd5bd9d460
[4] https://crrev.com/26f3c318377ab31c2b317b656613e2d3c11ce513
--- a/src/3rdparty/chromium/content/public/browser/mhtml_generation_result.h
+++ b/src/3rdparty/chromium/content/public/browser/mhtml_generation_result.h
@@ -7,2 +7,3 @@
+#include <cstdint>
#include <optional>
--- a/src/3rdparty/chromium/extensions/browser/path_util.h
+++ b/src/3rdparty/chromium/extensions/browser/path_util.h
@@ -7,2 +7,5 @@
+#include <cstdint>
+#include <string>
+
#include "base/files/file_path.h"
--- a/src/3rdparty/chromium/third_party/webrtc/modules/audio_coding/neteq/reorder_optimizer.cc
+++ b/src/3rdparty/chromium/third_party/webrtc/modules/audio_coding/neteq/reorder_optimizer.cc
@@ -12,2 +12,4 @@
+#include <stdint.h>
+
#include <algorithm>

View File

@@ -1,20 +0,0 @@
https://bugs.gentoo.org/949654
https://bugreports.qt.io/browse/QTBUG-134631
--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
@@ -36,4 +36,8 @@
#include "sandbox/linux/system_headers/linux_time.h"
+#if !defined(MAP_DROPPABLE)
+#define MAP_DROPPABLE 0x08 // Zero memory under memory pressure.
+#endif
+
#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
!defined(__arm__) && !defined(__aarch64__) && \
@@ -239,5 +243,5 @@
const uint64_t kAllowedMask = MAP_SHARED | MAP_PRIVATE | MAP_ANONYMOUS |
MAP_STACK | MAP_NORESERVE | MAP_FIXED |
- MAP_DENYWRITE | MAP_LOCKED |
+ MAP_DENYWRITE | MAP_LOCKED | MAP_DROPPABLE |
kArchSpecificAllowedMask;
const Arg<int> flags(3);

View File

@@ -1,22 +0,0 @@
api/candidate.h:96:40: error: 'lifetimebound' attribute cannot be
applied to a parameter of a function that returns void
Hardly know C++, but my "impression" is that this is not needed in
a void function and webrtc was just trying to keep the attributes
matching with other uses of it -- and that it is safe to remove.
Guard behind __clang__ to limit damage in case misunderstanding.
Only a temporary patch given Qt 6.9+ should not be affected as
these types were changed entirely (difficult to backport).
https://forums.gentoo.org/viewtopic-p-8858206.html
--- a/src/3rdparty/chromium/third_party/webrtc/api/candidate.h
+++ b/src/3rdparty/chromium/third_party/webrtc/api/candidate.h
@@ -95,3 +95,7 @@
// things down. See also the `Port` class.
+#ifdef __clang__
+ void set_type(absl::string_view type) {
+#else
void set_type(absl::string_view type ABSL_ATTRIBUTE_LIFETIME_BOUND) {
+#endif
Assign(type_, type);

View File

@@ -1,19 +0,0 @@
https://bugs.gentoo.org/951816
https://issues.webrtc.org/issues/401732633
https://webrtc-review.googlesource.com/c/src/+/380500
--- a/src/3rdparty/chromium/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc
+++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_capture/linux/pipewire_session.cc
@@ -61,5 +61,5 @@
};
- pw_node_add_listener(proxy_, &node_listener_, &node_events, this);
+ pw_node_add_listener(reinterpret_cast<pw_node*>(proxy_), &node_listener_, &node_events, this);
}
@@ -95,5 +95,5 @@
if (id == SPA_PARAM_EnumFormat &&
info->params[i].flags & SPA_PARAM_INFO_READ) {
- pw_node_enum_params(that->proxy_, 0, id, 0, UINT32_MAX, nullptr);
+ pw_node_enum_params(reinterpret_cast<pw_node*>(that->proxy_), 0, id, 0, UINT32_MAX, nullptr);
break;
}

View File

@@ -1,350 +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.8-patchset-7.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, udev
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 )
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 )
opengl? ( media-libs/libglvnd[X] )
screencast? ( media-libs/libepoxy[egl(+)] )
test? (
widgets? ( app-text/poppler[cxx(+)] )
)
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.1-aarch64-xnnpack.patch
"${FILESDIR}"/${PN}-6.8.2-cstdint.patch
"${FILESDIR}"/${PN}-6.8.2-glibc2.41.patch
"${FILESDIR}"/${PN}-6.8.3-clang20.patch
"${FILESDIR}"/${PN}-6.8.3-pipewire1.4.patch
"${FILESDIR}"/${PN}-6.8.3-gperf3.2.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=9G
local CHECKREQS_DISK_USR=360M
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)
-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
$(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
freetype gbm glib harfbuzz lcms2 libevent libjpeg \
libopenjpeg2 libpci libpng libtiff libwebp libxml \
minizip opus poppler 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
# temporary workaround for bug #947356, should be fixed in Qt 6.9.x
append-cppflags -U_GLIBCXX_ASSERTIONS
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."
}