mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-23 16:49:10 -07:00
dev-qt/qtwebengine: Drop vulnerable 5.13.2
Effectively dropping package without revdeps back to ~arm. Bug: https://bugs.gentoo.org/713900 Bug: https://bugs.gentoo.org/699328 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
@@ -1,3 +1,2 @@
|
||||
DIST qtwebengine-everywhere-src-5.13.2.tar.xz 255593964 BLAKE2B 458f718183aa53376e1aeeb6306b0b3960bd001aebf61e9650d30afd408af003183b7748a87aa0c6a1aa0b3a4be548b417609146b71dc6afa46db49c4b48919f SHA512 10ae5cca36230069ef117cae15b84e29124c43e4864dbfa7a1f99879764b871355281edcb1942e86ec3a4cac12bbfd2749577745c8c7e736eb6a9909876554d0
|
||||
DIST qtwebengine-everywhere-src-5.14.1.tar.xz 242438244 BLAKE2B d24210b2e04522b27409cc5ccfe722114f711c1c5e9aaff76882c178b0c455b475b90fd2acd5f7ba4f5dfba85c228c4baf2c231d3661eadf83e984d7e7b9e30f SHA512 fafa2fbc789941e837e35945857a6da00e73bd2abe512290674b9957719b998d8b8b95a35c709a171c9d0d111e6f418cec630dfcdbe47ecbae25a3b94e4c99f9
|
||||
DIST qtwebengine-everywhere-src-5.14.2.tar.xz 242467568 BLAKE2B 2b69af846d9f6b1b1bd6380f56868e7fe86c88baf00e4b596e6a825d636472f837c1fc3b9ed41182dcc20dc0ba03360182aba39aee4adca66f407a8346f90fbf SHA512 bcfd9ece04bdbfded5272ce1b3ab482e88349b1f5c5a071f58f6e66fcb9604d1fc38fe909ae3d9631bdf0bf7c081d7590620c3388f1a577b5236f68b084699bf
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
From 27947d92157b0987ceef9ae31fe0d3e7f8b653df Mon Sep 17 00:00:00 2001
|
||||
From: Kirill Burtsev <kirill.burtsev@qt.io>
|
||||
Date: Fri, 23 Aug 2019 15:09:25 +0200
|
||||
Subject: Fix compilation with system ICU
|
||||
|
||||
ICU upstream now requires that ICU4C API macros are used with a
|
||||
trailing semicolon.
|
||||
|
||||
- https://unicode-org.atlassian.net/browse/ICU-20601
|
||||
- https://github.com/unicode-org/icu/pull/759
|
||||
|
||||
Change-Id: Ie05c005ebcded9a228386db5d9abe9863787ec2b
|
||||
Fixes: QTBUG-78911
|
||||
Reviewed-by: Jimi Huotari <chiitoo@gentoo.org>
|
||||
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
||||
---
|
||||
.../blink/renderer/core/dom/document.cc | 2 +-
|
||||
chromium/third_party/icu/BUILD.gn | 28 +++++++++++++++-------
|
||||
2 files changed, 21 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/chromium/third_party/blink/renderer/core/dom/document.cc b/chromium/third_party/blink/renderer/core/dom/document.cc
|
||||
index 920dab7c48d..43fd422393c 100644
|
||||
--- a/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc
|
||||
+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc
|
||||
@@ -6065,7 +6065,7 @@ static ParseQualifiedNameResult ParseQualifiedNameInternal(
|
||||
|
||||
for (unsigned i = 0; i < length;) {
|
||||
UChar32 c;
|
||||
- U16_NEXT(characters, i, length, c)
|
||||
+ U16_NEXT(characters, i, length, c);
|
||||
if (c == ':') {
|
||||
if (saw_colon)
|
||||
return ParseQualifiedNameResult(kQNMultipleColons);
|
||||
@@ -1,126 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit multiprocessing python-any-r1 qt5-build
|
||||
|
||||
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
|
||||
|
||||
if [[ ${QT5_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="arm"
|
||||
fi
|
||||
|
||||
IUSE="alsa bindist designer jumbo-build pulseaudio +system-ffmpeg +system-icu widgets"
|
||||
REQUIRED_USE="designer? ( widgets )"
|
||||
|
||||
RDEPEND="
|
||||
app-arch/snappy:=
|
||||
dev-libs/glib:2
|
||||
dev-libs/nspr
|
||||
dev-libs/nss
|
||||
~dev-qt/qtcore-${PV}
|
||||
~dev-qt/qtdeclarative-${PV}
|
||||
~dev-qt/qtgui-${PV}
|
||||
~dev-qt/qtnetwork-${PV}
|
||||
~dev-qt/qtpositioning-${PV}
|
||||
~dev-qt/qtprintsupport-${PV}
|
||||
~dev-qt/qtwebchannel-${PV}[qml]
|
||||
dev-libs/expat
|
||||
dev-libs/libevent:=
|
||||
dev-libs/libxml2[icu]
|
||||
dev-libs/libxslt
|
||||
dev-libs/re2:=
|
||||
media-libs/fontconfig
|
||||
media-libs/freetype
|
||||
media-libs/harfbuzz:=
|
||||
media-libs/lcms:2
|
||||
media-libs/libjpeg-turbo:=
|
||||
media-libs/libpng:0=
|
||||
>=media-libs/libvpx-1.5:=[svc]
|
||||
media-libs/libwebp:=
|
||||
media-libs/mesa[egl,X(+)]
|
||||
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/libXdamage
|
||||
x11-libs/libXext
|
||||
x11-libs/libXfixes
|
||||
x11-libs/libXi
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libXrender
|
||||
x11-libs/libXScrnSaver
|
||||
x11-libs/libXtst
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
designer? ( ~dev-qt/designer-${PV} )
|
||||
pulseaudio? ( media-sound/pulseaudio:= )
|
||||
system-ffmpeg? ( media-video/ffmpeg:0= )
|
||||
system-icu? ( >=dev-libs/icu-60.2:= )
|
||||
widgets? (
|
||||
~dev-qt/qtdeclarative-${PV}[widgets]
|
||||
~dev-qt/qtwidgets-${PV}
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
${PYTHON_DEPS}
|
||||
>=app-arch/gzip-1.7
|
||||
dev-util/gperf
|
||||
dev-util/ninja
|
||||
dev-util/re2c
|
||||
sys-devel/bison
|
||||
"
|
||||
|
||||
PATCHES+=( "${FILESDIR}/${PN}-5.12.5-icu-65.patch" )
|
||||
|
||||
src_prepare() {
|
||||
if ! use jumbo-build; then
|
||||
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
|
||||
src/core/config/common.pri || die
|
||||
fi
|
||||
|
||||
# bug 620444 - ensure local headers are used
|
||||
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
|
||||
|
||||
qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri
|
||||
qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri
|
||||
|
||||
qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
|
||||
|
||||
qt_use_disable_mod widgets widgets src/src.pro
|
||||
|
||||
qt5-build_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
export NINJA_PATH=/usr/bin/ninja
|
||||
export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
|
||||
|
||||
local myqmakeargs=(
|
||||
--
|
||||
-opus
|
||||
-printing-and-pdf
|
||||
-webp
|
||||
$(usex alsa '-alsa' '')
|
||||
$(usex bindist '' '-proprietary-codecs')
|
||||
$(usex pulseaudio '-pulseaudio' '')
|
||||
$(usex system-ffmpeg '-ffmpeg' '')
|
||||
$(usex system-icu '-webengine-icu' '')
|
||||
)
|
||||
qt5-build_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
qt5-build_src_install
|
||||
|
||||
# bug 601472
|
||||
if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
|
||||
die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user