Skip to content

Commit c94253b

Browse files
committed
chromium: update to 96.0.4664.45
Release notes - https://chromereleases.googleblog.com/2021/11/stable-channel-update-for-desktop.html License changes: --------------- Added licenses: * ios/third_party/native_closure_compiler/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/3173692 * third_party/android_deps/libs/org_checkerframework_checker_qual/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/2945894 * third_party/cast_core/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/3161412 * third_party/jinja2/LICENSE.rst - https://chromium-review.googlesource.com/c/chromium/src/+/320516 Removed licenses: * third_party/jinja2/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/3205163 Updated licenses: * third_party/tflite_support/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/3152615 --------------- Test-built with: * chromium-ozone-wayland: * honister, clang, MACHINE="intel-corei7-64" * honister, clang, MACHINE="raspberrypi3 * hardknott, clang, MACHINE="raspberrypi3 * dunfell, clang, MACHINE="qemuarm64" * dunfell, clang, MACHINE="m3ulcb" * chromium-x11 * honister, clang, MACHINE="raspberrypi3" * hardknott, clang, MACHINE="raspberrypi3" * dunfell, clang, MACHINE="raspberrypi3"
1 parent abd2075 commit c94253b

10 files changed

+75
-369
lines changed

meta-chromium/recipes-browser/chromium/chromium-gn.inc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ SRC_URI += " \
2121
file://0011-exception_handler.cc-Match-the-types-for-SIGSTKSZ.patch \
2222
file://0013-Revert-Use-ffile-compilation-dir-instead-of-fdebug-c.patch \
2323
file://0014-ozone-wayland-don-t-build-xcb-for-pure-wayland-build.patch \
24-
file://0016-Make-the-build-linux-unbundle-scripts-run-with-Pytho.patch \
25-
file://jinja-python-3.10.patch \
24+
file://0015-IWYU-add-memory-for-std-unique_ptr-in-base-CommandLi.patch \
2625
"
2726

2827
SRC_URI:append:libc-musl = "\

meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_95.0.4638.69.bb renamed to meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_96.0.4664.45.bb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ DEPENDS += "\
1212

1313
SRC_URI += "\
1414
file://chromium-wayland/0001-ozone-add-va-api-support-to-wayland.patch \
15-
file://chromium-wayland/0001-ozone-wayland-do-not-create-surface-sync-if-buffers-.patch \
1615
"
1716

1817
GN_ARGS += "\

meta-chromium/recipes-browser/chromium/chromium.inc

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ HOMEPAGE = "https://www.chromium.org/Home"
44
CVE_PRODUCT = "chromium:chromium google:chrome"
55

66
SRC_URI = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${PV}.tar.xz"
7-
SRC_URI[md5sum] = "db4d461655a9b9d6b01809531f04cb91"
8-
SRC_URI[sha256sum] = "38a37d737c6c9a7198402ca614746b2dbb7abbb793bb2cb02dc796b62a22efe7"
7+
SRC_URI[md5sum] = "42de983018667ed4233460c040321c81"
8+
SRC_URI[sha256sum] = "488c6ad983ebf7781cb4d704f70496e8aa2165611b46656d7aa62f269c760407"
99

1010
S = "${WORKDIR}/chromium-${PV}"
1111

@@ -88,6 +88,7 @@ LIC_FILES_CHKSUM = "\
8888
file://${S}/ios/third_party/motion_animator_objc/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
8989
file://${S}/ios/third_party/motion_interchange_objc/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
9090
file://${S}/ios/third_party/motion_transitioning_objc/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
91+
file://${S}/ios/third_party/native_closure_compiler/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
9192
file://${S}/native_client/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \
9293
file://${S}/native_client_sdk/src/libraries/third_party/newlib-extras/README;md5=e944d73ca3817b7ca8656eafb9497fed \
9394
file://${S}/net/third_party/mozilla_win/LICENSE;md5=9b13a17f35cae227ee726ee0108d72a2 \
@@ -184,6 +185,7 @@ LIC_FILES_CHKSUM = "\
184185
file://${S}/third_party/android_deps/libs/com_google_protobuf_protobuf_javalite/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \
185186
file://${S}/third_party/android_deps/libs/javax_inject_javax_inject/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
186187
file://${S}/third_party/android_deps/libs/org_checkerframework_checker_compat_qual/LICENSE;md5=f32f668c1f4eea36fb53fc4cc7d96385 \
188+
file://${S}/third_party/android_deps/libs/org_checkerframework_checker_qual/LICENSE;md5=f32f668c1f4eea36fb53fc4cc7d96385 \
187189
file://${S}/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations/LICENSE;md5=a5dd953e661e22a77f7b8062ae790f6a \
188190
file://${S}/third_party/android_deps/libs/org_jetbrains_annotations/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
189191
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -210,6 +212,7 @@ LIC_FILES_CHKSUM = "\
210212
file://${S}/third_party/breakpad/LICENSE;md5=828152b41153892a725f0e7f56faff73 \
211213
file://${S}/third_party/brotli/LICENSE;md5=941ee9cd1609382f946352712a319b4b \
212214
file://${S}/third_party/bspatch/LICENSE;md5=3e837ede9697ce4c789c3ca32aabe003 \
215+
file://${S}/third_party/cast_core/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \
213216
file://${S}/third_party/ced/LICENSE;md5=3947f60c9d4b1ba51d193af511855a55 \
214217
file://${S}/third_party/chromevox/LICENSE;md5=45739090b454125d851ac7bb1bbd23a2 \
215218
file://${S}/third_party/cld_3/LICENSE;md5=d8b32ba83f8b11e4badd979f4319e706 \
@@ -257,7 +260,7 @@ LIC_FILES_CHKSUM = "\
257260
file://${S}/third_party/icu/LICENSE;md5=002d2fdc32d17f0ec06e9a47f2c0c8d0 \
258261
file://${S}/third_party/inspector_protocol/LICENSE;md5=db90dcb101891a7285d25f2fbceca752 \
259262
file://${S}/third_party/isimpledom/LICENSE;md5=822502c0e010ccdbb6a3e681dd47888e \
260-
file://${S}/third_party/jinja2/LICENSE;md5=7baa781602629654eb2f98ebd8487d8c \
263+
file://${S}/third_party/jinja2/LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462 \
261264
file://${S}/third_party/jsoncpp/LICENSE;md5=c56ee55c03a55f8105b969d8270632ce \
262265
file://${S}/third_party/jstemplate/COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57 \
263266
file://${S}/third_party/khronos/LICENSE;md5=1d2ef853a9ae7ace4e16fda0d48f597b \
@@ -345,8 +348,8 @@ LIC_FILES_CHKSUM = "\
345348
file://${S}/third_party/tensorflow-text/LICENSE;md5=01e86893010a1b87e69a213faa753ebd \
346349
file://${S}/third_party/test_fonts/LICENSE;md5=a78e43d492b7bd2ad4a4529c7a6266ca \
347350
file://${S}/third_party/text-fragments-polyfill/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
348-
file://${S}/third_party/tflite-support/LICENSE;md5=e03a906d141508f60cbe30013b8d064b \
349351
file://${S}/third_party/tflite/LICENSE;md5=64a34301f8e355f57ec992c2af3e5157 \
352+
file://${S}/third_party/tflite_support/LICENSE;md5=e03a906d141508f60cbe30013b8d064b \
350353
file://${S}/third_party/tlslite/LICENSE;md5=aab0efc53fd36d5832963dc71fd2316e \
351354
file://${S}/third_party/ukey2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
352355
file://${S}/third_party/unrar/src/license.txt;md5=fc9c335ec05a5f36764ef9ce7a79daa1 \
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
Upstream-Status: Backport
2+
3+
Signed-off-by: Maksim Sisov <msisov@igalia.com>
4+
---
5+
From 4b55a9df52c9d56640732b6404b3de58a179a869 Mon Sep 17 00:00:00 2001
6+
From: Stephan Hartmann <stha09@googlemail.com>
7+
Date: Tue, 12 Oct 2021 18:49:23 +0000
8+
Subject: [PATCH] IWYU: add memory for std::unique_ptr in base::CommandLine
9+
10+
Bug: None
11+
Change-Id: I55328bdbbdcd82f09a852b400b93ec8027cbdb03
12+
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3214337
13+
Commit-Queue: Lei Zhang <thestig@chromium.org>
14+
Reviewed-by: Lei Zhang <thestig@chromium.org>
15+
Cr-Commit-Position: refs/heads/main@{#930696}
16+
---
17+
base/command_line.h | 1 +
18+
1 file changed, 1 insertion(+)
19+
20+
diff --git a/base/command_line.h b/base/command_line.h
21+
index 706726a73eb1c..ad0281283a29b 100644
22+
--- a/base/command_line.h
23+
+++ b/base/command_line.h
24+
@@ -19,6 +19,7 @@
25+
#include <stddef.h>
26+
#include <functional>
27+
#include <map>
28+
+#include <memory>
29+
#include <string>
30+
#include <vector>
31+
32+
--
33+
2.25.1
34+

meta-chromium/recipes-browser/chromium/files/0016-Make-the-build-linux-unbundle-scripts-run-with-Pytho.patch

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)