From 5087ee3bf0055aae666159351774f2fb3610e571 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 3 Jan 2025 06:31:16 +0000 Subject: gentoo auto-resync : 03:01:2025 - 06:31:16 --- dev-qt/Manifest.gz | Bin 11920 -> 11925 bytes dev-qt/qtwebengine/Manifest | 4 +- dev-qt/qtwebengine/qtwebengine-6.8.1-r1.ebuild | 335 +++++++++++++++++++++++++ dev-qt/qtwebengine/qtwebengine-6.8.1.ebuild | 332 ------------------------ dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild | 5 +- 5 files changed, 341 insertions(+), 335 deletions(-) create mode 100644 dev-qt/qtwebengine/qtwebengine-6.8.1-r1.ebuild delete mode 100644 dev-qt/qtwebengine/qtwebengine-6.8.1.ebuild (limited to 'dev-qt') diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz index cecbecefa8ac..80349eac9de6 100644 Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 78f42e5bccc9..0502ab333b17 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -21,8 +21,8 @@ DIST qtwebengine-everywhere-src-6.8.1.tar.xz 566480152 BLAKE2B 6e4137f66363169ae EBUILD qtwebengine-5.15.16_p20241115.ebuild 7879 BLAKE2B ce3061b704385359455c0885efe935b9bf1f8e5627ba06a9fbafb1c95cfccdef6f39331868bbaf3d5794d708e7bb6c01cbef28c1880f45fb60d9e81cc73dcf53 SHA512 c31bca254f0962e39f763f49f22930d7c6d51a68169b72e9bf9afb111a01e40c15c82d86743f185480f092c85e8e17c51dc4e07ee7557ac449a00a8d3952be6f EBUILD qtwebengine-6.7.2.ebuild 10382 BLAKE2B 49f97cc56c893138694a3638bc83b2496cd1708e66de076e015e692db691d0de5907fdaa42abc8b74dfb329ffc8e28cb0f5b1a04cc2848a96909accc8d822b1d SHA512 6c5ff464b522838690881e0f98c1d65294177636590336ab0684b56cfae8b53094d77eace2f738c5576c31dfef81da0cf55d11c898d8c53b92d2443367706ec7 EBUILD qtwebengine-6.7.3.ebuild 9979 BLAKE2B 17fb965f42ceba78dea107944b68141281c164dd4a86d06cbe8f8a62281af044b84d9e249944aa9f0995610010a97ec55b152fda255545f48440be9852fa01c3 SHA512 b08934fba065e79143b804511e871eb32359290b8156343ebc27e019e65c36a4e6eeb1699f57b5b96980a5c52591e11386113913b900fddbb22a53357fccdf62 -EBUILD qtwebengine-6.8.1.ebuild 10206 BLAKE2B 934aca20207acf4e682ba9a0b89f905338c77e9dac4af98e0f568db4032fa853c4220de2072af73c9120e72dc8660ccac8e78ad0836764d9dbab23d51dcab204 SHA512 2e57c0149a3ff3c462fbc4f63caf5c9104dde6c0782b614e3ffe639ca58321c0d7ade386b4e72234df242624ad6fe0f742df941c8932b647956ed2183d8d9bbe -EBUILD qtwebengine-6.8.9999.ebuild 10162 BLAKE2B 781f69ace9e6ade95b80556b126f0648a7fe40a7ea89611aec6fd06ac4a91d9973cdb6438c00211207648cc32b931f8320587fe2af64623c336c38aebe291d6a SHA512 4b778015528c191c22b9472c228ea8cdc3c1f4f064c217d0e889e81abc30096ba2dba847bb9a30c2fa814e1d5ce36230e8428b1eb309a5dfb414a16a90287ddb +EBUILD qtwebengine-6.8.1-r1.ebuild 10317 BLAKE2B 45c7614140e7abd6913cec7b90fa7b2b2f49f83bda533923c1e05b8b3a408fd0b3fdf75a1c4f6b212757efa36528177e50b68480eb203cb2917a8beb6872d1f8 SHA512 df02bcda17d1cfd0d581d8f6d12e66f75f7e26088fd434659abb5a75b079326513508bd65034d5e2c188bcdb36b712a6cb1d04f852725cc9818aad4af42ff261 +EBUILD qtwebengine-6.8.9999.ebuild 10273 BLAKE2B c2ad01b5cd85e89ee63928f9493be225a996899af7d292f8a70fdf0ba7d2494f87d5fa785a93e50bfc519b3347d90f65ba455a7c36cd55f1807d6d7089f16ba6 SHA512 703f2ec148ca41a3a2249140df613801a682f69fbedd73cadb8a4770a06c7df44337dd5c871c0fd882b4117e96a74eb098c09969f0f2be44977c956bff83b328 EBUILD qtwebengine-6.9.9999.ebuild 10122 BLAKE2B 3d8cc9b76bd0bba42c72d66e996ca1ed81d7b122fe0d6bddc023efbf14d9fe945ae8b28341a47a5244453a06f9a671c22dbb09305196611c762aa0602fedd12a SHA512 072fc8e115b88fdccc0aa00a0d61fd070224ee0f95c3c19d8c5287a598b4282846699b142e5edd5b7d55ff9c3862e2f8724459a44464dede903327868ab611c9 EBUILD qtwebengine-6.9999.ebuild 10122 BLAKE2B 3d8cc9b76bd0bba42c72d66e996ca1ed81d7b122fe0d6bddc023efbf14d9fe945ae8b28341a47a5244453a06f9a671c22dbb09305196611c762aa0602fedd12a SHA512 072fc8e115b88fdccc0aa00a0d61fd070224ee0f95c3c19d8c5287a598b4282846699b142e5edd5b7d55ff9c3862e2f8724459a44464dede903327868ab611c9 MISC metadata.xml 1236 BLAKE2B 9a47d6cb2641ee53f22926095457c11f8da65a3705863a3ae0496d5bb656ac65acb744b5420deb95afee6ac9f141933b4f45690459e92c71089fe72727854a28 SHA512 9a640a386cc03804858fc02b24299896c03eff53a07db00862bab9d7dd259ca839e890921fcf222c8275cad16b418e423e7e485c03e74e01ab86979553251b4c diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.1-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.1-r1.ebuild new file mode 100644 index 000000000000..0ae70e897de7 --- /dev/null +++ b/dev-qt/qtwebengine/qtwebengine-6.8.1-r1.ebuild @@ -0,0 +1,335 @@ +# 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.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 ) +" + +# dlopen: krb5, libva, pciutils, udev +# 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 ) + 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 + 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[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-QTBUG-131156.patch + "${FILESDIR}"/${PN}-6.8.1-aarch64-xnnpack.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) + $(qt_feature qml qtpdf_quick_build) + $(qt_feature webdriver webenginedriver) + $(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 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 + strip-flags # fragile + + # 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 + + 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) + 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." +} diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.1.ebuild deleted file mode 100644 index b0261e05d1d0..000000000000 --- a/dev-qt/qtwebengine/qtwebengine-6.8.1.ebuild +++ /dev/null @@ -1,332 +0,0 @@ -# Copyright 2021-2024 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.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 ) -" - -# dlopen: krb5, libva, pciutils, udev -# 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 ) - 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 - 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[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-QTBUG-131156.patch - "${FILESDIR}"/${PN}-6.8.1-aarch64-xnnpack.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) - $(qt_feature qml qtpdf_quick_build) - $(qt_feature webdriver webenginedriver) - $(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 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 - strip-flags # fragile - - 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) - 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." -} diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild index 5272dee74a6a..aabbe2abf000 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2024 Gentoo Authors +# Copyright 2021-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -235,6 +235,9 @@ src_configure() { if use !custom-cflags; then strip-flags # fragile + # 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)" -- cgit v1.2.3