diff options
Diffstat (limited to 'dev-qt/qtwebengine')
| -rw-r--r-- | dev-qt/qtwebengine/Manifest | 5 | ||||
| -rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 314 | ||||
| -rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 5 | ||||
| -rw-r--r-- | dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 4 |
4 files changed, 11 insertions, 317 deletions
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 3bf624798893..2f30b9da0640 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -18,8 +18,7 @@ EBUILD qtwebengine-5.15.12_p20240122.ebuild 8737 BLAKE2B bd97671fb3f4434bd649da7 EBUILD qtwebengine-5.15.13_p20240322.ebuild 7287 BLAKE2B 1ad5fd5f92121cb8941a0facf649110ce9cf06de841e8168788b0cd7bfea311834adec4fa87fc3d0561f1aac369d303b79fc54747dc176da8b91a77e8f0cf32f SHA512 84d5dbc13931c158d768a7a07a78ca2383aebf7c7baebdcedf16403a1a48fe37cd9aacb66db76ee57320945fcfe6c8f23abc6d7930de43a1c2e9fbf37c11b47d EBUILD qtwebengine-6.6.2.ebuild 9404 BLAKE2B bada4c8cfbf518a600835b2cc19efb21e3a34909fae7c37814ace181c8312ff2e8ef6cf431fe6a98c73261be29acd4713a7c4d3cae845dca8f1df8a9ce76fd69 SHA512 2d5c4638a51c3a678c45ae98da9a9d0958321e8fd36dc2cf4e0506fcbf104a12969e0c79cd142e8b25e6b8aa642f92cb321ee364121eddffa933410b96cb06bf EBUILD qtwebengine-6.6.3.ebuild 9435 BLAKE2B 7462144a4e4c91f2f7387a036a2c6854a379fff2f03ebee3c41bb04b67cdeb4f27da83d2eb830119583e010a2d53fd219a616adeef5ba95bcd2b8ef5aee1601c SHA512 5163355fa6e5a3c0b7fc2b12af3732a2d16e4840364fcc98cb45264400d96198a883a35ced40ea2f48bc70b963f47263295d2a37353626f4a19784e27760447c -EBUILD qtwebengine-6.6.9999.ebuild 9435 BLAKE2B 7462144a4e4c91f2f7387a036a2c6854a379fff2f03ebee3c41bb04b67cdeb4f27da83d2eb830119583e010a2d53fd219a616adeef5ba95bcd2b8ef5aee1601c SHA512 5163355fa6e5a3c0b7fc2b12af3732a2d16e4840364fcc98cb45264400d96198a883a35ced40ea2f48bc70b963f47263295d2a37353626f4a19784e27760447c EBUILD qtwebengine-6.7.0_rc2.ebuild 9831 BLAKE2B c98e5b9f93a99229e3b05d687991ebbf2ee4109be016aa99303a6eee9162c625db96742199f8f5df4928246f614c268eb26f95ddee4a4fa82d89e102c42100fc SHA512 4cfbd1745bc614c61ed3885a9a3a0c42c00dbc7b88007b1a33b88f78450922cff08001bae0257bd5e1961c3abb734ae7127d414758c5ee217c69f3af074ee3fb -EBUILD qtwebengine-6.7.9999.ebuild 9787 BLAKE2B c0119d3abb55e1c8f91dea8837260dbf1386ed117c881e5525dd720e59e595f91fc167901e26c57f5fc0b96777cbe18a89070e6c99ba9629c8f34c607b0e57dd SHA512 bd5f1465a3271b0a5f01f089e94b2ec497f63284fe810cc3e5153d81aefb1aa25e706874215308c0c4448139ef7efedbe0331579ea870229087daae6583672c6 -EBUILD qtwebengine-6.9999.ebuild 9746 BLAKE2B 2a4bfdb5dd0ed4b638fa80f74f6706b830f3d7e7a8298491ca1b7a8f4a3c836d02b388236c707111166d659f8845707f00e93ccd3369c6fba91f076e35a793b1 SHA512 e5a9ed64389bb1fb45e593ed9448ce8ab3526c9f1421f81e82b2e7510263c1fcdcdb35d3dbf8052cd11339e203b1809e6d3b88041ef38f859e2d8d33bac4b84a +EBUILD qtwebengine-6.7.9999.ebuild 9919 BLAKE2B e0422e8752bca5d665b3688e9360e1842eb5aeac9fa988c90a2a6a983150b4493cbf34a2500bb1a4ff138aab5461857210b009bd978a8e8feb84211b80a1a2e2 SHA512 5866b5a6aa7db1711d0fd04878ff567772d808201ecc9da707d1b73384d51d7e6a77965e2864a7f47391b540ceb7295552d15e0bae75f01c1763d92fba866813 +EBUILD qtwebengine-6.9999.ebuild 9834 BLAKE2B f58f17fe7553e5bc766c114bfbd42db1192ba7d7d664d4ed4c4e8a0b13cc4c42dca3596968c6d5b7b72bd6c2a3c6ea30dea0d63de54c7de032c0ecb16c279864 SHA512 fea4b0b4e5330ff441b2d1bf8857e24881201e0dceaac8e89a9e7226e46576555ff93081f72710aca13fb9f75ecb769445c933c58c94acb3409052578bda4afb MISC metadata.xml 1236 BLAKE2B 9a47d6cb2641ee53f22926095457c11f8da65a3705863a3ae0496d5bb656ac65acb744b5420deb95afee6ac9f141933b4f45690459e92c71089fe72727854a28 SHA512 9a640a386cc03804858fc02b24299896c03eff53a07db00862bab9d7dd259ca839e890921fcf222c8275cad16b418e423e7e485c03e74e01ab86979553251b4c diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild deleted file mode 100644 index 378b562a6fb0..000000000000 --- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild +++ /dev/null @@ -1,314 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -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-9.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 +widgets -" -REQUIRED_USE=" - designer? ( qml 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/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(+)] ) - ) - 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.6.2-clang18.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=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) - $(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 - -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 - - # use bundled re2 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 - ) - - 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 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_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_loadsignals - tst_qquickwebengineview - tst_qwebengineglobalsettings - tst_qwebengineview - # certs verfication seems flaky and gives expiration warnings - tst_qwebengineclientcertificatestore - # test is misperformed when qtbase is built USE=-test? - tst_touchinput - ) - - # 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/" -} - -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.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild index dcc7ec6d9b87..e8636461bcc4 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild @@ -113,6 +113,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} ) PATCHES+=( # add extras as needed here, may merge in set if carries across versions "${FILESDIR}"/${PN}-6.7.0-clang18.patch + "${FILESDIR}"/${PN}-6.7.0-x11-header.patch ) python_check_deps() { @@ -302,6 +303,10 @@ 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() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild index 1e77e0077e41..a7523d65072f 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild @@ -301,6 +301,10 @@ 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() { |