mirror of
https://github.com/thead-yocto-mirror/meta-qt5
synced 2026-06-21 08:52:35 +02:00
qtwebengine, qtpdf: upgrade to latest 5.15.13
* use latest revision from chromium 87-based repo instead of the revision from submodule, there are couple more security fixes: $ git log --oneline e48df7803c7c98b0b2471c94057d32e44a301ad5..origin/87-based fb66d7ca964 (origin/87-based) [Backport] CVE-2023-1530: Use after free in PDF (1/2) 7d80d640bf7 [Backport] CVE-2023-1531: Use after free in ANGLE 906ec4b3148 [Backport] Security bug 1418734 7acd92df98d [Backport] Security bug 1417585 d4dae0cad19 [Backport] Security bug 1337747 bfc3d37f279 [Backport] CVE-2023-1534: Out of bounds read in ANGLE 6514de99619 [Backport] CVE-2023-1529: Out of bounds memory access in WebHID 799ad56b699 [Backport] CVE-2023-1222: Heap buffer overflow in Web Audio API 9dd9b39ef9d [Backport] CVE-2023-1220: Heap buffer overflow in UMA ca58730e230 [Backport] CVE-2023-1219: Heap buffer overflow in Metrics (3/3) c1d9b7fd4fa [Backport] CVE-2023-1219: Heap buffer overflow in Metrics (2/3) 53d71ca32b1 [Backport] CVE-2023-1219: Heap buffer overflow in Metrics (1/3) bf140f0d01b [Backport] CVE-2023-1217: Stack buffer overflow in Crash reporting aec0b21eb33 [Backport] CVE-2023-1215: Type Confusion in CSS Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
@@ -1,4 +1,4 @@
|
||||
From 8214eac226762702f5a652a07f3b15d60cd09c98 Mon Sep 17 00:00:00 2001
|
||||
From b87860c14637458c5a7f5c1ca6f66f21bb87652e Mon Sep 17 00:00:00 2001
|
||||
From: Leif Middelschulte <Leif.Middelschulte@klsmartin.com>
|
||||
Date: Tue, 8 Feb 2022 14:14:02 +0100
|
||||
Subject: [PATCH] configure.json: remove python2 dependency
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From f98019bb6712fdfa1f3387baefe6b604e6191a88 Mon Sep 17 00:00:00 2001
|
||||
From 6e25650c829bf1052f607b3f3edbdf88f163efe0 Mon Sep 17 00:00:00 2001
|
||||
From: Leif Middelschulte <Leif.Middelschulte@klsmartin.com>
|
||||
Date: Tue, 8 Feb 2022 16:28:14 +0100
|
||||
Subject: [PATCH] gn.pro: do not try to statically link stdc++
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From b9ebaa970dbb050a51021a013e8d5b6d5aac86ab Mon Sep 17 00:00:00 2001
|
||||
From 9e1036a25207f9013a13b23401feacd72866be4c Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 26 Feb 2022 18:15:28 -0800
|
||||
Subject: [PATCH] Fix build with clang
|
||||
@@ -21,9 +21,11 @@ Upstream-Status: Inappropriate [OE-Specific]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
---
|
||||
src/buildtools/gn.pro | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
src/buildtools/gn.pro | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro
|
||||
index 9632f0ef7..5ff50cca1 100644
|
||||
--- a/src/buildtools/gn.pro
|
||||
+++ b/src/buildtools/gn.pro
|
||||
@@ -20,8 +20,7 @@ build_pass|!debug_and_release {
|
||||
|
||||
@@ -130,8 +130,8 @@ RDEPENDS:${PN}-examples += " \
|
||||
|
||||
QT_MODULE_BRANCH_CHROMIUM = "87-based"
|
||||
|
||||
QT_MODULE_BRANCH = "5.15.10"
|
||||
PV = "5.15.10+git${SRCPV}"
|
||||
QT_MODULE_BRANCH = "5.15"
|
||||
PV = "5.15.13+git${SRCPV}"
|
||||
|
||||
# Uses the same repository and couple patches as qtwebengine, but qtwebengine
|
||||
# still depends on python2
|
||||
@@ -139,14 +139,14 @@ QT_MODULE = "qtwebengine"
|
||||
FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtwebengine:"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15-glibc
|
||||
# 5.15-glibc.meta-qt5.15
|
||||
# 5.15-glibc.meta-qt5.17
|
||||
SRC_URI += " \
|
||||
${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
|
||||
file://0001-Force-host-toolchain-configuration.patch \
|
||||
file://0002-qmake.conf-lower-MODULE_VERSION-to-5.15.X.patch \
|
||||
"
|
||||
# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15
|
||||
# 5.15.meta-qt5.15
|
||||
# 5.15.meta-qt5.17
|
||||
SRC_URI:append:libc-musl = "\
|
||||
file://0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \
|
||||
file://0004-musl-link-against-libexecinfo.patch \
|
||||
@@ -154,7 +154,7 @@ SRC_URI:append:libc-musl = "\
|
||||
"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/87-based-glibc
|
||||
# 87-based-glibc.meta-qt5.9
|
||||
# 87-based-glibc.meta-qt5.10
|
||||
SRC_URI += " \
|
||||
file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \
|
||||
file://chromium/0002-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \
|
||||
@@ -166,13 +166,12 @@ SRC_URI += " \
|
||||
file://chromium/0008-chromium-Move-CharAllocator-definition-to-a-header-f.patch;patchdir=src/3rdparty \
|
||||
file://chromium/0009-chromium-Link-v8-with-libatomic-on-x86.patch;patchdir=src/3rdparty \
|
||||
file://chromium/0010-chromium-icu-use-system-library-only-targets.patch;patchdir=src/3rdparty \
|
||||
file://chromium/0011-chromium-Remove-TRUE-to-prep-landing-of-icu68.patch;patchdir=src/3rdparty \
|
||||
file://chromium/0012-chromium-skia-Fix-build-with-gcc-12.patch;patchdir=src/3rdparty \
|
||||
file://chromium/0013-Remove-unsetting-_FILE_OFFSET_BITS.patch;patchdir=src/3rdparty \
|
||||
file://chromium/0011-chromium-skia-Fix-build-with-gcc-12.patch;patchdir=src/3rdparty \
|
||||
file://chromium/0012-Remove-unsetting-_FILE_OFFSET_BITS.patch;patchdir=src/3rdparty \
|
||||
"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/87-based
|
||||
# 87-based.meta-qt5.9
|
||||
# 87-based.meta-qt5.10
|
||||
SRC_URI:append:libc-musl = "\
|
||||
file://chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \
|
||||
file://chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \
|
||||
@@ -187,9 +186,8 @@ SRC_URI:append:libc-musl = "\
|
||||
file://chromium/0023-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \
|
||||
"
|
||||
|
||||
SRCREV_qtwebengine = "c7e716ef1ffd63a8ab1f4dbf879230849eb3b505"
|
||||
# this is 3 commits ahead of what submodule in 5.15.10 uses (caba2fcb0fe8a8d213c4c79d26da3bb88eee61c7), but contains useful fix:
|
||||
SRCREV_chromium = "ecc2bb74f1f7140fc52650042299be18e826b27b"
|
||||
SRCREV_qtwebengine = "d15a42baae7141952e91665bed22a7c7cfb54b95"
|
||||
SRCREV_chromium = "fb66d7ca9641724670c96e999ad5b0fd6eb78d46"
|
||||
SRCREV = "${SRCREV_qtwebengine}"
|
||||
|
||||
SRCREV_FORMAT = "qtwebengine_chromium"
|
||||
@@ -206,7 +204,7 @@ INSANE_SKIP:${PN} += "textrel"
|
||||
# First patch skips "python2" dependency checks for the pdf module
|
||||
# Second patch repairs a failing build of the `gn` buildtool due to missing (host) libstdc++
|
||||
# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15-qtpdf
|
||||
# 5.15-qtpdf.meta-qt5.2
|
||||
# 5.15-qtpdf.meta-qt5.5
|
||||
SRC_URI += " \
|
||||
file://0001-configure.json-remove-python2-dependency.patch \
|
||||
file://0002-gn.pro-do-not-try-to-statically-link-stdc.patch \
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From bae24edf61de8e374a43b7eede7be8c90a2a32e5 Mon Sep 17 00:00:00 2001
|
||||
From ecde45984c610529c25257324252fb2ba01fe4ca Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Wed, 15 Mar 2017 13:53:28 +0200
|
||||
Subject: [PATCH] Force host toolchain configuration
|
||||
@@ -14,10 +14,12 @@ Upstream-Status: Inappropriate [OE specific]
|
||||
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
|
||||
---
|
||||
src/buildtools/config/linux.pri | 2 +-
|
||||
src/buildtools/configure_host.pro | 14 +++++++-------
|
||||
src/buildtools/configure_host.pro | 16 +++++++++-------
|
||||
src/buildtools/gn.pro | 5 ++---
|
||||
3 files changed, 10 insertions(+), 11 deletions(-)
|
||||
3 files changed, 12 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri
|
||||
index 7507d51ef..1e078cbfe 100644
|
||||
--- a/src/buildtools/config/linux.pri
|
||||
+++ b/src/buildtools/config/linux.pri
|
||||
@@ -118,7 +118,7 @@ contains(QT_ARCH, "mips") {
|
||||
@@ -29,6 +31,8 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
|
||||
gn_args += host_cpu=\"$$GN_HOST_CPU\"
|
||||
# Don't bother trying to use system libraries in this case
|
||||
gn_args += use_glib=false
|
||||
diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
|
||||
index dd0d3e327..3d39198f3 100644
|
||||
--- a/src/buildtools/configure_host.pro
|
||||
+++ b/src/buildtools/configure_host.pro
|
||||
@@ -4,7 +4,7 @@ TEMPLATE = aux
|
||||
@@ -40,7 +44,7 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
|
||||
!isEmpty(QT_TARGET_ARCH): GN_TARGET_CPU = $$gnArch($$QT_TARGET_ARCH)
|
||||
else: GN_TARGET_CPU = $$GN_HOST_CPU
|
||||
GN_OS = $$gnOS()
|
||||
@@ -24,6 +24,7 @@ contains(GN_TARGET_CPU, "arm")|contains(
|
||||
@@ -24,6 +24,7 @@ contains(GN_TARGET_CPU, "arm")|contains(GN_TARGET_CPU, "mipsel")|contains(GN_TAR
|
||||
}
|
||||
|
||||
GN_HOST_EXTRA_CPPFLAGS = $$(GN_HOST_TOOLCHAIN_EXTRA_CPPFLAGS)
|
||||
@@ -78,6 +82,8 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
|
||||
" ar = \"$$which(ar)\" " \
|
||||
" nm = \"$$which(nm)\" " \
|
||||
" toolchain_args = { " \
|
||||
diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro
|
||||
index f94694da0..a8ca6567b 100644
|
||||
--- a/src/buildtools/gn.pro
|
||||
+++ b/src/buildtools/gn.pro
|
||||
@@ -19,9 +19,8 @@ build_pass|!debug_and_release {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 8031326dbf1252f76f6aac9dcef5611fd7be5fa4 Mon Sep 17 00:00:00 2001
|
||||
From cf79bf0fbd89a7273420f6dfb7715c18cc56729b Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Fri, 12 Mar 2021 15:47:50 +0100
|
||||
Subject: [PATCH] qmake.conf: lower MODULE_VERSION to 5.15.9
|
||||
Subject: [PATCH] qmake.conf: lower MODULE_VERSION to 5.15.X
|
||||
|
||||
* to avoid incompatibility when searching for qtwebchannel:
|
||||
|
||||
@@ -24,12 +24,12 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/.qmake.conf b/.qmake.conf
|
||||
index 83823ceee..d5e64505d 100644
|
||||
index 461e9c733..1d0279c42 100644
|
||||
--- a/.qmake.conf
|
||||
+++ b/.qmake.conf
|
||||
@@ -5,4 +5,4 @@ QTWEBENGINE_OUT_ROOT = $$shadowed($$PWD)
|
||||
load(qt_build_config)
|
||||
CONFIG += warning_clean
|
||||
|
||||
-MODULE_VERSION = 5.15.10
|
||||
-MODULE_VERSION = 5.15.14
|
||||
+MODULE_VERSION = 5.15.9
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From b136b5999396d4ee3363bfdaee4db7e571ba9aa7 Mon Sep 17 00:00:00 2001
|
||||
From a6c1cdbb588359676888b7961c063d1d13d05a2a Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Tue, 12 Dec 2017 16:06:14 +0200
|
||||
Subject: [PATCH] musl: don't use pvalloc as it's not available on musl
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 9046f8a87da16f3605f600cc6beb039f40bdaa14 Mon Sep 17 00:00:00 2001
|
||||
From 84938d171df35970e3444b8f7b0abc9c2b275f9f Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Thu, 14 Dec 2017 11:28:10 +0200
|
||||
Subject: [PATCH] musl: link against libexecinfo
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 0ffba1b9cba1421c3751b2f20ba84fca356911fb Mon Sep 17 00:00:00 2001
|
||||
From d30d88b852e3b46086ce92f4dfaedfe21ee926a8 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 12 Nov 2019 19:53:59 -0800
|
||||
Subject: [PATCH] mkspecs: Allow builds with libc != glibc
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 8eec6045850c5786b18f89b4444c5e2c68b64a31 Mon Sep 17 00:00:00 2001
|
||||
From ba309beb6cdd4a0cd343cc8043464714cd5e8c3e Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Thu, 30 Mar 2017 11:37:24 +0300
|
||||
Subject: [PATCH] chromium: workaround for too long .rps file name
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From a88d4dfdb0f9d27a0acc8f28167fbb09d913fd75 Mon Sep 17 00:00:00 2001
|
||||
From a67f504fcc2c96ea7e7a57e44dc9c6d559f19838 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 2 Feb 2019 19:28:59 -0800
|
||||
Subject: [PATCH] chromium: fix build with clang
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From b2e7a10448d984eb62810ad5c41720d61599cecc Mon Sep 17 00:00:00 2001
|
||||
From cf19db916e8566a8c19e9a5aeeb6a9e6a7f08111 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 5 Feb 2019 14:32:20 -0800
|
||||
Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm
|
||||
@@ -11,20 +11,20 @@ src/3rdparty/chromium/third_party/zlib/crc32_simd.c:184: undefined reference to
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
chromium/third_party/zlib/BUILD.gn | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
chromium/third_party/zlib/BUILD.gn | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn
|
||||
index 891c2c34bfb..5ab519bd133 100644
|
||||
index 44b827155b2..16892b8d284 100644
|
||||
--- a/chromium/third_party/zlib/BUILD.gn
|
||||
+++ b/chromium/third_party/zlib/BUILD.gn
|
||||
@@ -115,8 +115,11 @@ if (use_arm_neon_optimizations) {
|
||||
@@ -129,8 +129,12 @@ if (use_arm_neon_optimizations) {
|
||||
# Disabled for iPhone, as described in DDI0487C_a_armv8_arm:
|
||||
# "All implementations of the ARMv8.1 architecture are required to
|
||||
# implement the CRC32* instructions. These are optional in ARMv8.0."
|
||||
+ defines = []
|
||||
if (!is_ios) {
|
||||
- defines = [ "CRC32_ARMV8_CRC32" ]
|
||||
if (!is_ios && !use_qt) {
|
||||
defines = [ "CRC32_ARMV8_CRC32" ]
|
||||
+ if (current_cpu == "arm64") {
|
||||
+ defines += [ "CRC32_ARMV8_CRC32" ]
|
||||
+ }
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 6b188e734a8cfa68f5c14e46e90fc89cbcb8313c Mon Sep 17 00:00:00 2001
|
||||
From 1dd881dafa5d61f9a260dd54092689868869f066 Mon Sep 17 00:00:00 2001
|
||||
From: Johannes Pointner <johannes.pointner@br-automation.com>
|
||||
Date: Fri, 3 May 2019 09:12:38 +0200
|
||||
Subject: [PATCH] chromium: Do not try to set the guessed values for
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From e142cbdc339bcc73c3f41f512b67ddf7a694337e Mon Sep 17 00:00:00 2001
|
||||
From 73c864315f3d14ba232657232d145795adf25d89 Mon Sep 17 00:00:00 2001
|
||||
From: Jiri Slaby <jslaby@suse.cz>
|
||||
Date: Thu, 11 Jul 2019 09:35:13 +0200
|
||||
Subject: [PATCH] chromium: fix build after y2038 changes in glibc
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From bcf1d52853fc5e603ff4bca3495f860e81994108 Mon Sep 17 00:00:00 2001
|
||||
From c9c77a6fdd6679815f8c68f1e519a317472e7bc5 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 30 Nov 2019 10:07:43 -0800
|
||||
Subject: [PATCH] chromium: Fix build on 32bit arches with 64bit time_t
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 4b3b7ae386d300f784d44d93c875908e082af154 Mon Sep 17 00:00:00 2001
|
||||
From 851073e7af2c21567e1d8c1a15639fcc6e01be40 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 25 Dec 2019 15:41:16 -0800
|
||||
Subject: [PATCH] chromium: Include cstddef for size_t definition
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From da832c778d013f4217e2d704c27c1d2e19a9364c Mon Sep 17 00:00:00 2001
|
||||
From 50f862c3bed6f13932d43da5c992d3dacfdfe00e Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 2 Jan 2020 17:13:55 -0800
|
||||
Subject: [PATCH] chromium: Move CharAllocator definition to a header file
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 7f9421b4609d8a1f9590152fb3976de22e9a1b12 Mon Sep 17 00:00:00 2001
|
||||
From df7f7525ece62cde56de905098bd6000483f10d2 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 1 Feb 2020 12:17:23 -0800
|
||||
Subject: [PATCH] chromium: Link v8 with libatomic on x86
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 8a0c927cdc9705e2a1c29d63c87d32e8cb089510 Mon Sep 17 00:00:00 2001
|
||||
From 7cc4c3490f01cec09f9ca63e36cf34c9977243f0 Mon Sep 17 00:00:00 2001
|
||||
From: Andrej Valek <andrej.valek@siemens.com>
|
||||
Date: Fri, 17 Apr 2020 09:43:32 +0200
|
||||
Subject: [PATCH] chromium: icu: use system library only targets
|
||||
|
||||
@@ -1,59 +0,0 @@
|
||||
From 308bddc0bfedb6ab222e3b626ef9bb5234c819b4 Mon Sep 17 00:00:00 2001
|
||||
From: Frank Tang <ftang@chromium.org>
|
||||
Date: Tue, 20 Oct 2020 01:09:43 +0000
|
||||
Subject: [PATCH] chromium: Remove TRUE to prep landing of icu68
|
||||
|
||||
ICU 68, to work with C++20, remove the #define of TRUE
|
||||
since the usage in libxml is as an int, use 1 instead.
|
||||
|
||||
Upstream-Status: Backport [https://github.com/chromium/chromium/commit/e8aa87fa88f55e76ce08794690665ce30caa3183]
|
||||
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
|
||||
---
|
||||
chromium/third_party/libxml/README.chromium | 2 ++
|
||||
chromium/third_party/libxml/src/encoding.c | 6 +++---
|
||||
2 files changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/chromium/third_party/libxml/README.chromium b/chromium/third_party/libxml/README.chromium
|
||||
index e1b7e1d8065..5cb589f04fd 100644
|
||||
--- a/chromium/third_party/libxml/README.chromium
|
||||
+++ b/chromium/third_party/libxml/README.chromium
|
||||
@@ -24,6 +24,8 @@ Modifications:
|
||||
non-recursive broke a few web platform tests.
|
||||
- add-fuzz-target.patch: Prevents autoreconf from failing on mac due to a
|
||||
missing makefile for fuzz.
|
||||
+- chromium-issue-1138555.patch: Change TRUE to 1 for ICU68 which remove the
|
||||
+ #define of TRUE.
|
||||
- Add helper classes in the chromium/ subdirectory.
|
||||
- Delete various unused files, see chromium/roll.py
|
||||
|
||||
diff --git a/chromium/third_party/libxml/src/encoding.c b/chromium/third_party/libxml/src/encoding.c
|
||||
index 730e2532e45..f876e0c02de 100644
|
||||
--- a/chromium/third_party/libxml/src/encoding.c
|
||||
+++ b/chromium/third_party/libxml/src/encoding.c
|
||||
@@ -1882,7 +1882,7 @@ xmlIconvWrapper(iconv_t cd, unsigned char *out, int *outlen,
|
||||
* @outlen: the length of @out
|
||||
* @in: a pointer to an array of input bytes
|
||||
* @inlen: the length of @in
|
||||
- * @flush: if true, indicates end of input
|
||||
+ * @flush: if 1, indicates end of input
|
||||
*
|
||||
* Returns 0 if success, or
|
||||
* -1 by lack of space, or
|
||||
@@ -1922,7 +1922,7 @@ xmlUconvWrapper(uconv_t *cd, int toUnicode, unsigned char *out, int *outlen,
|
||||
*inlen = ucv_in - (const char*) in;
|
||||
*outlen = ucv_out - (char *) out;
|
||||
if (U_SUCCESS(err)) {
|
||||
- /* reset pivot buf if this is the last call for input (flush==TRUE) */
|
||||
+ /* reset pivot buf if this is the last call for input (flush==1) */
|
||||
if (flush)
|
||||
cd->pivot_source = cd->pivot_target = cd->pivot_buf;
|
||||
return 0;
|
||||
@@ -2028,7 +2028,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
|
||||
#ifdef LIBXML_ICU_ENABLED
|
||||
else if (handler->uconv_out != NULL) {
|
||||
ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
|
||||
- TRUE);
|
||||
+ 1);
|
||||
}
|
||||
#endif /* LIBXML_ICU_ENABLED */
|
||||
else {
|
||||
@@ -1,4 +1,4 @@
|
||||
From 03e9ff9a00ea85e84faeb6267d60fb9ed7c0a598 Mon Sep 17 00:00:00 2001
|
||||
From ce0d0a3961dafb0e682a47b3cc3963a23bdcea37 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Mon, 16 May 2022 20:01:49 +0000
|
||||
Subject: [PATCH] chromium: skia: Fix build with gcc-12
|
||||
@@ -50,7 +50,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/chromium/third_party/skia/src/utils/SkParseColor.cpp b/chromium/third_party/skia/src/utils/SkParseColor.cpp
|
||||
index 7260365b2c6..cd07eb48650 100644
|
||||
index 0dc3497062f..f63f1800501 100644
|
||||
--- a/chromium/third_party/skia/src/utils/SkParseColor.cpp
|
||||
+++ b/chromium/third_party/skia/src/utils/SkParseColor.cpp
|
||||
@@ -7,6 +7,7 @@
|
||||
@@ -59,5 +59,5 @@ index 7260365b2c6..cd07eb48650 100644
|
||||
#include "include/utils/SkParse.h"
|
||||
+#include <vector>
|
||||
|
||||
static constexpr const char* gColorNames[] = {
|
||||
"aliceblue",
|
||||
#include <algorithm> // std::lower_bound
|
||||
#include <iterator>
|
||||
@@ -1,4 +1,4 @@
|
||||
From a6ed61f9435d25abdb71c2a2b84b204f180eb822 Mon Sep 17 00:00:00 2001
|
||||
From 3332ea15dfd4024eb7b95ebd1b26bf76f592b23f Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 3 Jan 2023 14:10:23 -0800
|
||||
Subject: [PATCH] Remove unsetting _FILE_OFFSET_BITS
|
||||
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
1 file changed, 9 deletions(-)
|
||||
|
||||
diff --git a/chromium/third_party/zlib/gzguts.h b/chromium/third_party/zlib/gzguts.h
|
||||
index 990a4d25149..a03d5005070 100644
|
||||
index 57faf37165a..3747f3c449d 100644
|
||||
--- a/chromium/third_party/zlib/gzguts.h
|
||||
+++ b/chromium/third_party/zlib/gzguts.h
|
||||
@@ -3,15 +3,6 @@
|
||||
@@ -32,6 +32,3 @@ index 990a4d25149..a03d5005070 100644
|
||||
#ifdef HAVE_HIDDEN
|
||||
# define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
|
||||
#else
|
||||
--
|
||||
2.39.0
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From a7bb1b5b26caa4b3c374c3d3f74f0dfe522d854f Mon Sep 17 00:00:00 2001
|
||||
From 4951642cc3b22379211c492759849c79a59938f5 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 7 Jul 2017 14:01:12 -0700
|
||||
Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From e0768318d6289672085b8f8f9a3425178e1475b5 Mon Sep 17 00:00:00 2001
|
||||
From 49c7efab2123eff453df1bd0bdbdc718a8292c58 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 7 Jul 2017 14:09:06 -0700
|
||||
Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From fb0ebec2df9f7fb90d47265db90750a01fa71cbf Mon Sep 17 00:00:00 2001
|
||||
From 1150bddce8d8cb4a691b3197569d304434fa6219 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 7 Jul 2017 14:37:49 -0700
|
||||
Subject: [PATCH] chromium: musl: include fcntl.h for loff_t
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From aef1128c27a1975168bb371337bfd59f49873546 Mon Sep 17 00:00:00 2001
|
||||
From ceb6a8ca7548ef255150e1b8d1e65b40c4949dee Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 7 Jul 2017 14:38:37 -0700
|
||||
Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From bccfc7999135a44fce7473ee8a60333c6d5db746 Mon Sep 17 00:00:00 2001
|
||||
From b59ba5a52e29867f9ebbc4423514d50f4b36b0ae Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 7 Jul 2017 14:54:38 -0700
|
||||
Subject: [PATCH] chromium: musl: linux != glibc, make the distinction
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From db3a551e932481d4ccdd315fb05cd24910807136 Mon Sep 17 00:00:00 2001
|
||||
From f82c828b2c8ffd7c5f0e884132e0f1d721295c36 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 7 Jul 2017 15:27:50 -0700
|
||||
Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 029557f2f50714b2e87aa3c0ad82aaca48f68a50 Mon Sep 17 00:00:00 2001
|
||||
From f4b417ae2878f5ebf8d5a171669f516e1c6d4d9c Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 7 Jul 2017 15:39:57 -0700
|
||||
Subject: [PATCH] chromium: musl: Do not define __sbrk on musl
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 194688cb3ddc3d331b3d254b41cb6ae55d55f0f8 Mon Sep 17 00:00:00 2001
|
||||
From d41fdb34286e134d4ff871943ea54b03b2ab02d6 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 7 Jul 2017 16:41:23 -0700
|
||||
Subject: [PATCH] chromium: musl: Adjust default pthread stack size
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From c151ad89ab323db1730c8b3d77bd72d415c80ca1 Mon Sep 17 00:00:00 2001
|
||||
From 9808a4034b0a6354ecbc2081a2b022614acb392f Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 25 Sep 2018 12:59:05 -0700
|
||||
Subject: [PATCH] chromium: musl: elf_reader.cc: include <sys/reg.h> to get
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 2ee1af42a550fa258a2061452ff2ad2c30c91f9e Mon Sep 17 00:00:00 2001
|
||||
From e0413ce85e22a1a0a83015f22cd850add6250c9c Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sun, 23 Dec 2018 16:58:04 -0800
|
||||
Subject: [PATCH] chromium: musl: pread pwrite
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From e0b5335ced4cbc78847e63cc98e9c1a78f426c99 Mon Sep 17 00:00:00 2001
|
||||
From 78eae00a5c53cd44a4b73e6ba357088a82dd4b84 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sun, 10 May 2020 08:16:01 -0700
|
||||
Subject: [PATCH] chromium: musl: initialize msghdr in a compatible manner
|
||||
|
||||
@@ -148,18 +148,18 @@ RDEPENDS:${PN}-examples += " \
|
||||
|
||||
QT_MODULE_BRANCH_CHROMIUM = "87-based"
|
||||
|
||||
QT_MODULE_BRANCH = "5.15.10"
|
||||
PV = "5.15.10+git${SRCPV}"
|
||||
QT_MODULE_BRANCH = "5.15"
|
||||
PV = "5.15.13+git${SRCPV}"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15-glibc
|
||||
# 5.15-glibc.meta-qt5.15
|
||||
# 5.15-glibc.meta-qt5.17
|
||||
SRC_URI += " \
|
||||
${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
|
||||
file://0001-Force-host-toolchain-configuration.patch \
|
||||
file://0002-qmake.conf-lower-MODULE_VERSION-to-5.15.X.patch \
|
||||
"
|
||||
# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15
|
||||
# 5.15.meta-qt5.15
|
||||
# 5.15.meta-qt5.17
|
||||
SRC_URI:append:libc-musl = "\
|
||||
file://0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \
|
||||
file://0004-musl-link-against-libexecinfo.patch \
|
||||
@@ -167,7 +167,7 @@ SRC_URI:append:libc-musl = "\
|
||||
"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/87-based-glibc
|
||||
# 87-based-glibc.meta-qt5.9
|
||||
# 87-based-glibc.meta-qt5.10
|
||||
SRC_URI += " \
|
||||
file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \
|
||||
file://chromium/0002-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \
|
||||
@@ -179,13 +179,12 @@ SRC_URI += " \
|
||||
file://chromium/0008-chromium-Move-CharAllocator-definition-to-a-header-f.patch;patchdir=src/3rdparty \
|
||||
file://chromium/0009-chromium-Link-v8-with-libatomic-on-x86.patch;patchdir=src/3rdparty \
|
||||
file://chromium/0010-chromium-icu-use-system-library-only-targets.patch;patchdir=src/3rdparty \
|
||||
file://chromium/0011-chromium-Remove-TRUE-to-prep-landing-of-icu68.patch;patchdir=src/3rdparty \
|
||||
file://chromium/0012-chromium-skia-Fix-build-with-gcc-12.patch;patchdir=src/3rdparty \
|
||||
file://chromium/0013-Remove-unsetting-_FILE_OFFSET_BITS.patch;patchdir=src/3rdparty \
|
||||
file://chromium/0011-chromium-skia-Fix-build-with-gcc-12.patch;patchdir=src/3rdparty \
|
||||
file://chromium/0012-Remove-unsetting-_FILE_OFFSET_BITS.patch;patchdir=src/3rdparty \
|
||||
"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/87-based
|
||||
# 87-based.meta-qt5.9
|
||||
# 87-based.meta-qt5.10
|
||||
SRC_URI:append:libc-musl = "\
|
||||
file://chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \
|
||||
file://chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \
|
||||
@@ -200,9 +199,8 @@ SRC_URI:append:libc-musl = "\
|
||||
file://chromium/0023-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \
|
||||
"
|
||||
|
||||
SRCREV_qtwebengine = "4f570bd7add21725d66ac8396dcf21917c3a603f"
|
||||
# this is 3 commits ahead of what submodule in 5.15.10 uses (caba2fcb0fe8a8d213c4c79d26da3bb88eee61c7), but contains useful fix:
|
||||
SRCREV_chromium = "ecc2bb74f1f7140fc52650042299be18e826b27b"
|
||||
SRCREV_qtwebengine = "d15a42baae7141952e91665bed22a7c7cfb54b95"
|
||||
SRCREV_chromium = "fb66d7ca9641724670c96e999ad5b0fd6eb78d46"
|
||||
SRCREV = "${SRCREV_qtwebengine}"
|
||||
|
||||
SRCREV_FORMAT = "qtwebengine_chromium"
|
||||
|
||||
Reference in New Issue
Block a user