commit: 840803e11e8265af6e12c375aa9cc05be372e4d8
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 27 06:34:05 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 08:45:45 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=840803e1
dev-qt/qtwebengine: add 6.6.1
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild | 294 ++++++++++++++++++++++++++++
2 files changed, 295 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 73f88b4f97ea..c4859e30f9c3 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -7,3 +7,4 @@ DIST qtwebengine-6.6-patchset-3.tar.xz 9920 BLAKE2B
12b287392dabf1f1e3e99381ab1a
DIST qtwebengine-6.6-patchset-5.tar.xz 9520 BLAKE2B
28d620841613b2cc677f7742c35c6b8ffc533e26cb3fd85edd455a5450344594a75f790402ac5bc8d19e8e8aa788d0a3244a3a81d127dbebd53e8224798382c1
SHA512
c0bc470fd25c5a835000618618aad7db17994863304140e73e8e261c620aad512453bdf6fbecf99dfb2e267590003a9730fa2c102db9dfdbd5e931ec850f9f05
DIST qtwebengine-everywhere-src-6.5.3.tar.xz 412372456 BLAKE2B
131b4baf0267e77e1356568867db26fe86af165ddbd9abb5f2c6121e757011f5e18dfc41b30342eebf5d53f54492a20c1c77309782355b369b73c088d2102814
SHA512
8634eac4931fb27a0ded417de901955774d001dc74dc5779b216519b6b79f0a30f0774224abb14dffef779ca9df1cf384f822f9d5190e4d80b9f6ab0d012bc49
DIST qtwebengine-everywhere-src-6.6.0.tar.xz 421117212 BLAKE2B
b168913644e07d3d649082a78a03ccfb135960ea61907046f3e16c28471a9684aca4685ea907ed47a27719647ae0d9c753d4faa9e24c9897e88dad24b08bd774
SHA512
30469cf50d84e4547f0cf76b78b921fab550958d812cfcb894cf03ffcd0b1cbd3c1dc9314835ca6b5a182cbabdd236cb315bcc288d999f23c10d7ab0763a6366
+DIST qtwebengine-everywhere-src-6.6.1.tar.xz 421042656 BLAKE2B
6982a1884d66162cc3c8518125c655d60ced9ec9e81670fb2e5b193aab655c4516bbc50d3c774764385fbe372863fdbf3e03a3c35f07dd9c3119880266b3131e
SHA512
d1e4f5b664f8aca5e0a5927968be87e29e29172f1256f21dc6a29006258fb2be2be99b5b36c94a08c704580db9fac7defbb37193534129a21ca14a511fcdeea0
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
new file mode 100644
index 000000000000..891fd475a802
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
@@ -0,0 +1,294 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 3.12 needs QTBUG-117979 (see also QTBUG-115512)
+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-5.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, 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[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 ]] || # 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
+ 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
+ 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_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
+}
+
+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."
+}
