commit:     796a527484be683e699232a1a6b6e26d989e87b5
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 28 07:03:51 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Sep 28 12:31:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=796a5274

dev-qt/qtwebengine: add 6.5.3

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qtwebengine/Manifest                 |   1 +
 dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild | 278 ++++++++++++++++++++++++++++
 2 files changed, 279 insertions(+)

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index d752fdb48551..56806e04df28 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -7,4 +7,5 @@ DIST qtwebengine-6.5-patchset-1.tar.xz 12936 BLAKE2B 
f44af36689596da0177f0607cf2
 DIST qtwebengine-6.6-patchset-1.tar.xz 9648 BLAKE2B 
c1bb02662ed5952e22ac3c3ee68f5787503bcc6d12d05c22090cf9ba22511c76308aa1bb751df0a822585de63694f8ce0f254558416e392abe437995e30b7e99
 SHA512 
a634a2976bc19ada61671bc017a4456111214cc47a40c88812465f0ba25d025b3aa4da32467c59f7053d21650f3ac72010118b3b6962d34bb347d42b9109f95f
 DIST qtwebengine-6.6-patchset-2.tar.xz 9248 BLAKE2B 
87934910aff613044771c12e696323808e553e808835255c92676fa50ff54ef67ad5a0ffb5cc22b027e3865d8d3d3011755c1db7f3b709816449cf59ea5cbebf
 SHA512 
564b9fd57e902f4b30f2fbdfa2823e677091c2910e0bf1c8559a6dc4c99500c6b1251d509276870278f78f45f201e0388329c04d7518548f85cefbe1419dffcc
 DIST qtwebengine-everywhere-src-6.5.2.tar.xz 412356700 BLAKE2B 
a48a513cffbf140aab08d748bc7826e841b7e1a87d113abbd0d8e7df5b9eb1ff2a44b89ae341c161eae26fd004699a1392f811252eb25aa13e0ce8e08f6be0a1
 SHA512 
f5791002495ebfa9912477f39a96d28bd4f4329f636f6b2055f1b811503b3c394c3ddd7baed5643f78f1905b1e8f860b4202b5d8e4afe5791e5450b9f46eac12
+DIST qtwebengine-everywhere-src-6.5.3.tar.xz 412372456 BLAKE2B 
131b4baf0267e77e1356568867db26fe86af165ddbd9abb5f2c6121e757011f5e18dfc41b30342eebf5d53f54492a20c1c77309782355b369b73c088d2102814
 SHA512 
8634eac4931fb27a0ded417de901955774d001dc74dc5779b216519b6b79f0a30f0774224abb14dffef779ca9df1cf384f822f9d5190e4d80b9f6ab0d012bc49
 DIST qtwebengine-everywhere-src-6.6.0-rc.tar.xz 421029904 BLAKE2B 
414980115fc97697f54f9becb6dc5e76fe18300067c0d52b8f2b8694864d376a5fb3301fa0f4f421c9c771006d415fa96290f3ad3666ef0b873a9db0d00d4776
 SHA512 
281aa5539940d8a43bbd24bad9420401cc8667e96a5be37d5cbfbad29cb6076c3e0ab4ea1e28b30846c255df2c6dea857d8b14330f1c68eb03e23f1a81c6c185

diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
new file mode 100644
index 000000000000..26cc25ef040a
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
@@ -0,0 +1,278 @@
+# 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.5-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 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/libvpx:=
+       media-libs/libwebp:=
+       media-libs/openjpeg:2=
+       media-libs/opus
+       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:= )
+       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
+       "${FILESDIR}"/${PN}-6.5.2-libcxx17.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)
+
+               -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 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
+
+               # 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)
+
+               # 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_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."
+}

Reply via email to