diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-09-13 22:45:20 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-09-13 22:45:20 +0100 |
commit | ab7810b87f5bb33b3ed5edd0dbda7f4bcd0cf70d (patch) | |
tree | f102e6ba13816f35c909cda970653f5422ee1b0d /dev-qt/qtwebengine | |
parent | 6d478a9cbbd774e9d2743701d0931416e3ab9371 (diff) |
gentoo auto-resync : 13:09:2023 - 22:45:20
Diffstat (limited to 'dev-qt/qtwebengine')
-rw-r--r-- | dev-qt/qtwebengine/Manifest | 5 | ||||
-rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.5.2.ebuild | 275 | ||||
-rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 279 | ||||
-rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 23 |
4 files changed, 299 insertions, 283 deletions
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 52a725ececf2..026e818ccb19 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -9,11 +9,12 @@ DIST qtwebengine-5.15.10_p20230815.tar.xz 299275336 BLAKE2B 9c64f09d982086d51af7 DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e DIST qtwebengine-5.15.8_p20230313-patchset.tar.xz 45904 BLAKE2B 9f58b9808fd445a06e6a2cd6d5f7bc9782bd6de13138fdebc9e81bd9f69e7ae673a71bd3ed6b011a47e84cc64b5b703a7cfc8d5f740eaaa663da1db8ef9ef05b SHA512 21b0b853358260fa1bdc96c97c5b2af7007c744d10abeebf9f0e708a0cd7dece583d86c0554a4e327a0d615bb403b0d328acaa6622b50d7a8059bc0802edbcec DIST qtwebengine-6.5-patchset-1.tar.xz 12936 BLAKE2B f44af36689596da0177f0607cf242d9cce3c376f4a5c28d7902a6b44651ce9272d745a824580268e999c2d58b72424d72eb6027d7461184bf7f04e0223e5195f SHA512 f639eb09d18c19c7b0d422d6acdce62404be0fcce905374c5d47266340191f7ca66875680bb09d80e72db718e34b7dc6e7db5f2f16407a0edb892930513ea407 +DIST qtwebengine-6.6-patchset-1.tar.xz 9648 BLAKE2B c1bb02662ed5952e22ac3c3ee68f5787503bcc6d12d05c22090cf9ba22511c76308aa1bb751df0a822585de63694f8ce0f254558416e392abe437995e30b7e99 SHA512 a634a2976bc19ada61671bc017a4456111214cc47a40c88812465f0ba25d025b3aa4da32467c59f7053d21650f3ac72010118b3b6962d34bb347d42b9109f95f DIST qtwebengine-everywhere-src-6.5.2.tar.xz 412356700 BLAKE2B a48a513cffbf140aab08d748bc7826e841b7e1a87d113abbd0d8e7df5b9eb1ff2a44b89ae341c161eae26fd004699a1392f811252eb25aa13e0ce8e08f6be0a1 SHA512 f5791002495ebfa9912477f39a96d28bd4f4329f636f6b2055f1b811503b3c394c3ddd7baed5643f78f1905b1e8f860b4202b5d8e4afe5791e5450b9f46eac12 EBUILD qtwebengine-5.15.10_p20230623.ebuild 8524 BLAKE2B cce6249550a5574ab7763c042117186201da9c006982eb99efc1da72d1d339e90f9c6e9a60371a25d314f3372234e9d976d2cd292d0abcc08a4442a699a95495 SHA512 95138584a3644d86b9835288446dd2d01997379f894a38f101bbf899e853235600c9c80b571ed8380a15d179cb72fb0b68324e83b1b230847325ff476fa992e3 EBUILD qtwebengine-5.15.10_p20230815.ebuild 8258 BLAKE2B 766d6ad760f73e66d9a7f0ee52c3916e14b7f640e26784abf0866b039aecbf809c9e21a00b13d030311fa1ab91360aacd837e1257474800732a5598c3910c646 SHA512 c2d9534d452db6f53238faa05f6b454c4daeb6fcf683997d5095f4a9b777248e8d7f67ba4203a4b26457782817b887ca0cce36fb8d14f887e1b9772e78173140 EBUILD qtwebengine-6.5.2-r1.ebuild 8083 BLAKE2B 3c16c2ee3141c8fe6be62f1bd25923dc851430d30b4ce0760e1b4fd0a857cd498f1aab4c1e04293af6d6eea48f5c7fa88e18ef8d9e7fb153de6cfff16f5c013a SHA512 c9e2ca65cf4961ae4e9cb9cba649705a28b5d705fbce46cfa2aa07232e1a5948857db03964be85f0fe3c2cccb85980c5642a22d222dd9b69f5cb614e9c12dd3d -EBUILD qtwebengine-6.5.2.ebuild 8559 BLAKE2B afcca72bb25aab65e617a033bc7b4eb47241c86307184417151522da586fe38e9485151f139fed68b365061dbfd6d19a99ae8296507109e8ab71b8879da2d9de SHA512 4e53155411b17bd1ba2800b2a265a2d117d64d62b20a7c5f275cb08d1a6a3da3aa5646933a386020bfd09b6ef82763e4cae48644db0e6b5123a0314fa904a0ba EBUILD qtwebengine-6.5.9999.ebuild 8120 BLAKE2B 0399b10325436c6ac9580b7fd289a07f36d88d9b465c6832c7600d9000f9e21caf9da11e3bae39a9251fe02ccec23d796b0ca174d1070cc3458e3f6d31fde12c SHA512 e661f0d4ef4ad258b826fcca095f2ad8eedd9afb2877a1cdcf4bd78df47380935ade33fb7c870c52cdef7b9409de032fbe11c64b30b86bed6249dab3b9aaea26 -EBUILD qtwebengine-6.9999.ebuild 8078 BLAKE2B 6c036279e09ef0b6562d52b99ae3c5b8ad1282c3cb6110ee389c3ca3403f18a8a50f3e7b34b884a30852252fe6aa243a1b41710dd74332bb19b097e0f7937bca SHA512 7376659bcbb56efec57d883ebe21e211f6461c3fb443a9ba36fd563a3be133a3275c804d314ca726fe8b5aaae2e25a08bfdb711a4fcb757a17796c02b7c6ff99 +EBUILD qtwebengine-6.6.9999.ebuild 8355 BLAKE2B 3796e80b79236e1b9543e19d8345dcddd19f3edf6626460e2e6717832a50094f8ffdb9e66eebdd2b8f4d5215a8aac68acdd838657ad026bc6919d84200dcb7ef SHA512 0040f8900688c5252a901024fa7d2f4ac4a61b5da698976d2c729ecf2d72baae390129a679f3176fbcea63c62fff6f06532af08ce0928a56b94ad31c13346029 +EBUILD qtwebengine-6.9999.ebuild 8355 BLAKE2B 3796e80b79236e1b9543e19d8345dcddd19f3edf6626460e2e6717832a50094f8ffdb9e66eebdd2b8f4d5215a8aac68acdd838657ad026bc6919d84200dcb7ef SHA512 0040f8900688c5252a901024fa7d2f4ac4a61b5da698976d2c729ecf2d72baae390129a679f3176fbcea63c62fff6f06532af08ce0928a56b94ad31c13346029 MISC metadata.xml 1312 BLAKE2B 4473aad7240926735bbabbeaeff862f3bc253c3e79e09086c17fb9b603ba5e9dc25ecbbc423a60a344bf471e11634c9b4728222e66f3d19022e3f3d2c9cc2f60 SHA512 797e67cf05a37dcb5ad5712cabef051b4a8f5dcb9601b627bcf029e4c99d0a09fa62b03cb9dcb64b5b6e5f29104e72711136d4c9aa79928c34f6bfe212742e2d diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.2.ebuild deleted file mode 100644 index 67509126a0c5..000000000000 --- a/dev-qt/qtwebengine/qtwebengine-6.5.2.ebuild +++ /dev/null @@ -1,275 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -PYTHON_REQ_USE="xml(+)" -inherit check-reqs estack flag-o-matic multiprocessing -inherit prefix python-any-r1 qt6-build toolchain-funcs - -DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" -fi - -IUSE=" - alsa bindist designer geolocation +jumbo-build kerberos - pulseaudio screencast +system-icu widgets -" -REQUIRED_USE="designer? ( widgets )" - -RDEPEND=" - app-arch/snappy:= - dev-libs/glib:2 - dev-libs/nspr - dev-libs/nss - dev-libs/expat - dev-libs/libevent:= - dev-libs/libxml2[icu] - dev-libs/libxslt - dev-libs/re2:= - ~dev-qt/qtdeclarative-${PV}:6 - ~dev-qt/qtwebchannel-${PV}:6 - media-libs/fontconfig - media-libs/freetype - media-libs/harfbuzz:= - media-libs/lcms:2 - media-libs/libjpeg-turbo:= - media-libs/libpng:= - >=media-libs/libvpx-1.5:=[svc(+)] - media-libs/libwebp:= - media-libs/openjpeg:2= - media-libs/opus - sys-apps/dbus - sys-apps/pciutils - sys-libs/zlib[minizip] - virtual/libudev - x11-libs/libdrm - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libxcb:= - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libxkbcommon - x11-libs/libxkbfile - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXScrnSaver - x11-libs/libxshmfence:= - x11-libs/libXtst - alsa? ( media-libs/alsa-lib ) - geolocation? ( ~dev-qt/qtpositioning-${PV}:6 ) - kerberos? ( virtual/krb5 ) - pulseaudio? ( media-libs/libpulse:= ) - screencast? ( media-video/pipewire:= ) - system-icu? ( >=dev-libs/icu-69.1:= ) - widgets? ( - ~dev-qt/qtbase-${PV}:6[widgets] - ) -" -DEPEND=" - ${RDEPEND} - media-libs/libglvnd -" -BDEPEND=" - $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]') - dev-util/gperf - dev-util/ninja - dev-util/re2c - net-libs/nodejs[ssl] - sys-devel/bison - sys-devel/flex -" - -PATCHES=( - "${FILESDIR}"/${PN}-5.15.10_p20230623-ffmpeg-binutils-2.41.patch -) - -python_check_deps() { - python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]" -} - -qtwebengine_check-reqs() { - [[ ${MERGE_TYPE} == binary ]] && return - - # bug #307861 - eshopts_push -s extglob - if is-flagq '-g?(gdb)?([1-9])'; then - ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)." - ewarn "You may experience really long compilation times and/or increased memory usage." - ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug." - fi - eshopts_pop - - # (check-reqs added for bug #570534) - # - # Estimate the amount of RAM required - # Multiplier is *10 because Bash doesn't do floating point maths. - # Let's crudely assume ~2GB per compiler job for GCC. - local multiplier=20 - - # And call it ~1.5GB for Clang. - if tc-is-clang ; then - multiplier=15 - fi - - local CHECKREQS_DISK_BUILD="7G" - local CHECKREQS_DISK_USR="150M" - if ! has "distcc" ${FEATURES} ; then - # bug #830661 - # Not super realistic to come up with good estimates for distcc right now - local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G - fi - - check-reqs_${EBUILD_PHASE_FUNC} -} - -pkg_pretend() { - qtwebengine_check-reqs -} - -pkg_setup() { - qtwebengine_check-reqs - python-any-r1_pkg_setup -} - -src_prepare() { - qt6-build_src_prepare - - # bug 620444 - ensure local headers are used - find . -type f -name "*.pr[fio]" -exec \ - sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' {} + || die - - if use system-icu; then - # Sanity check to ensure that bundled copy of ICU is not used. - # Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because - # src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system. - # If usage of headers of bundled copy of ICU occurs, then lists of shim headers in - # shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in - # src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated. - local file - while read file; do - echo "#error This file should not be used!" > "${file}" || die - done < <( - find src/3rdparty/chromium/third_party/icu -type f \ - \( -name '*.c' -o -name '*.cpp' -o -name '*.h' \) 2>/dev/null - ) - fi - - # 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() { - export NINJA_PATH=${BROOT}/usr/bin/ninja - export NINJAFLAGS=${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v} - - local mycmakeargs=( - #-DQT_FEATURE_accessibility=off - #-DQT_FEATURE_force_asserts=off - #-DQT_FEATURE_opengl=off - #-DQT_FEATURE_printer=off - -DQT_FEATURE_qtpdf_build=off - -DQT_FEATURE_qtpdf_quick_build=off - -DQT_FEATURE_qtpdf_widgets_build=off - -DQT_FEATURE_qtwebengine_build=on - -DQT_FEATURE_qtwebengine_quick_build=on - -DQT_FEATURE_qtwebengine_widgets_build=on - #-DQT_FEATURE_ssl=off - #-DQT_FEATURE_static=off - #-DQT_FEATURE_system_zlib=off - #-DQT_FEATURE_system_png=off - #-DQT_FEATURE_system_jpeg=off - #-DQT_FEATURE_system_freetype=off - #-DQT_FEATURE_system_harfbuzz=off - #-DQT_FEATURE_use_gold_linker=off - #-DQT_FEATURE_use_lld_linker=off - -DQT_FEATURE_webengine_embedded_build=off - -DQT_FEATURE_webengine_extensions=on - #-DQT_FEATURE_webengine_full_debug_info=$(usex debug) - -DQT_FEATURE_webengine_geolocation=$(usex geolocation on off) - -DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build) - #-DQT_FEATURE_webengine_jumbo_file_merge_limit - -DQT_FEATURE_webengine_kerberos=$(usex kerberos on off) - -DQT_FEATURE_webengine_native_spellchecker=off - -DQT_FEATURE_webengine_ozone_x11=on - -DQT_FEATURE_webengine_pepper_plugins=on - -DQT_FEATURE_webengine_proprietary_codecs=$(usex bindist off on) - -DQT_FEATURE_webengine_printing_and_pdf=on - -DQT_FEATURE_webengine_sanitizer=on - -DQT_FEATURE_webengine_spellchecker=on - -DQT_FEATURE_webengine_system_opus=on - -DQT_FEATURE_webengine_system_libwebp=on - -DQT_FEATURE_webengine_system_alsa=$(usex alsa on off) - -DQT_FEATURE_webengine_system_ffmpeg=off # https://bugs.gentoo.org/831487 - -DQT_FEATURE_webengine_system_icu=$(usex system-icu) - -DQT_FEATURE_webengine_system_libevent=on - -DQT_FEATURE_webengine_system_libopenjpeg2=on - -DQT_FEATURE_webengine_system_libpci=on - -DQT_FEATURE_webengine_system_libpng=on - -DQT_FEATURE_webengine_system_pulseaudio=$(usex pulseaudio on off) - -DQT_FEATURE_webengine_system_zlib=on - -DQT_FEATURE_webengine_webchannel=on - -DQT_FEATURE_webengine_webrtc=on - -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off) - #-DQT_FEATURE_xcb=off - - # TODO: fix gn cross build or split + depend on dev-qt/qtwebengine-gn - -DINSTALL_GN=off - ) - - qt6-build_src_configure -} - -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_loadsignals - tst_qquickwebengineview - tst_qwebengineview - # certs verfication seems flaky and gives expiration warnings - tst_qwebengineclientcertificatestore - ) - - # 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 -} - -pkg_postinst() { - 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.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild new file mode 100644 index 000000000000..34cc431d2a98 --- /dev/null +++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild @@ -0,0 +1,279 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# py3.12: uses imp and distutils among potentially more issues, refer to +# www-client/chromium for when adding/backporting support may be viable +PYTHON_COMPAT=( python3_{10..11} ) +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.6-patchset-1.tar.xz +" + +if [[ ${QT6_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64" +fi + +IUSE=" + +alsa bindist custom-cflags designer geolocation +jumbo-build + kerberos opengl pdfium pulseaudio qml screencast +system-icu + vaapi vulkan +widgets +" +REQUIRED_USE=" + designer? ( qml widgets ) +" + +# dlopen: krb5, 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[gui,opengl=,vulkan?,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/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/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] ) + qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) + screencast? ( + dev-libs/glib:2 + media-libs/mesa[gbm(+)] + media-video/pipewire:= + x11-libs/libdrm + ) + system-icu? ( dev-libs/icu:= ) + vaapi? ( + media-libs/libva:=[X] + media-libs/mesa[gbm(+)] + x11-libs/libdrm + ) + !vaapi? ( media-libs/libvpx:= ) + widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] ) +" +DEPEND=" + ${RDEPEND} + media-libs/libglvnd + x11-base/xorg-proto + x11-libs/libxshmfence + screencast? ( media-libs/libepoxy[egl(+)] ) + pdfium? ( net-print/cups ) + test? ( + widgets? ( app-text/poppler[cxx(+)] ) + ) +" +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 ]] || # keep for 6.x.9999 + PATCHES+=( "${WORKDIR}"/patches/chromium ) + +PATCHES+=( + # add extras as needed here, may merge in set if carries across versions +) + +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 "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb)," + ewarn "which is non-trivial with ${PN}. May experience extended" + ewarn "compilation times and increased disk/memory usage. If run into" + ewarn "issues, please disable before reporting a bug." + fi + + local CHECKREQS_DISK_BUILD=7G + local CHECKREQS_DISK_USR=220M + + 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 widgets qtpdf_widgets_build) + + -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 + -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet + -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, and even then it may not + # cooperate with new major ffmpeg versions (bug #831487) + -DQT_FEATURE_webengine_system_ffmpeg=OFF + + # preemptively using bundled to avoid complications, may revisit + # (see discussions in https://github.com/gentoo/gentoo/pull/32281) + -DQT_FEATURE_webengine_system_re2=OFF + + # bundled is currently required when using vaapi (forced regardless) + $(qt_feature !vaapi webengine_system_libvpx) + + # not necessary to pass these (default), but in case detection fails + $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \ + freetype 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 + -DINSTALL_GN=OFF + ) + + local mygnargs=( + # prefer no dlopen where possible + link_pulseaudio=true + rtc_link_pipewire=true + ) + + use custom-cflags || strip-flags # fragile + + export NINJA 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_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_loadsignals + tst_qquickwebengineview + tst_qwebengineview + # certs verfication seems flaky and gives expiration warnings + tst_qwebengineclientcertificatestore + ) + + # 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 +} + +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.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild index f4d5c7bf79a9..34cc431d2a98 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild @@ -12,7 +12,7 @@ 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.5-patchset-1.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.6-patchset-1.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then @@ -20,8 +20,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then fi IUSE=" - +alsa bindist custom-cflags designer geolocation +jumbo-build kerberos - opengl pdfium pulseaudio qml screencast +system-icu vulkan +widgets + +alsa bindist custom-cflags designer geolocation +jumbo-build + kerberos opengl pdfium pulseaudio qml screencast +system-icu + vaapi vulkan +widgets " REQUIRED_USE=" designer? ( qml widgets ) @@ -44,10 +45,10 @@ RDEPEND=" media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:= - media-libs/libvpx:= media-libs/libwebp:= media-libs/openjpeg:2= media-libs/opus + media-libs/tiff:= sys-apps/dbus sys-apps/pciutils sys-libs/zlib:=[minizip] @@ -75,6 +76,12 @@ RDEPEND=" x11-libs/libdrm ) system-icu? ( dev-libs/icu:= ) + vaapi? ( + media-libs/libva:=[X] + media-libs/mesa[gbm(+)] + x11-libs/libdrm + ) + !vaapi? ( media-libs/libvpx:= ) widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] ) " DEPEND=" @@ -176,6 +183,7 @@ src_configure() { $(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 @@ -194,11 +202,14 @@ src_configure() { # (see discussions in https://github.com/gentoo/gentoo/pull/32281) -DQT_FEATURE_webengine_system_re2=OFF + # bundled is currently required when using vaapi (forced regardless) + $(qt_feature !vaapi webengine_system_libvpx) + # not necessary to pass these (default), but in case detection fails $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \ freetype glib harfbuzz lcms2 libevent libjpeg \ - libopenjpeg2 libpci libpng libvpx libwebp libxml \ - minizip opus poppler snappy zlib) + libopenjpeg2 libpci libpng libtiff libwebp \ + libxml minizip opus poppler snappy zlib) # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON -DINSTALL_GN=OFF |