mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-qt/qtwebengine: drop 6.6.0_rc
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
This commit is contained in:
Ionen Wolkens
@@ -6,8 +6,6 @@ DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3
|
||||
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-6.6-patchset-2.tar.xz 9248 BLAKE2B 87934910aff613044771c12e696323808e553e808835255c92676fa50ff54ef67ad5a0ffb5cc22b027e3865d8d3d3011755c1db7f3b709816449cf59ea5cbebf SHA512 564b9fd57e902f4b30f2fbdfa2823e677091c2910e0bf1c8559a6dc4c99500c6b1251d509276870278f78f45f201e0388329c04d7518548f85cefbe1419dffcc
|
||||
DIST qtwebengine-6.6-patchset-3.tar.xz 9920 BLAKE2B 12b287392dabf1f1e3e99381ab1abf7e8fe44d85fb1b7148bc2d3427ff82d91e0d545955ee7c326f4d5e5af739759df2246173151673dabce3aa8aec28c4ecd8 SHA512 371549b2a2577872700842cc7f93cca900499b99de62f297a012fb16ccbb9d7c1f87a0123996ab14a49adf5604018000615736a8cc728122d37012ec6838211f
|
||||
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
|
||||
|
||||
@@ -1,293 +0,0 @@
|
||||
# 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-2.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
|
||||
"${FILESDIR}"/${PN}-6.6.0-cstdint.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 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
|
||||
)
|
||||
|
||||
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
|
||||
)
|
||||
|
||||
# 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."
|
||||
}
|
||||
Reference in New Issue
Block a user