Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions recipes-browser/chromium/chromium-gn.inc
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,10 @@ SRC_URI += " \
file://delete_not_yet_released_clang_warnings.patch \
file://chromium-Move-CharAllocator-definition-to-a-header-f.patch \
file://0003-Fix-sandbox-Aw-snap-for-syscalls-403-and-407.patch \
file://0001-Fix-local-build.patch \
file://0001-IWYU-ui-CursorFactory-is-required-without-Ozone.patch \
file://0001-RandBytes-Stop-including-sys-random.h-on-Linux.patch \
file://0001-Build-fix-for-libstdc.patch \
file://0001-IWYU-add-missing-include-for-std-vector-and-std-uniq.patch \
file://0001-ozone-fix-include.patch \
file://0001-Fix-ill-formed-C-code.patch \
file://0001-link-atomic-for-target-only.patch \
file://0001-Fix-use-of-DCHECK-with-std-unique_ptr.patch \
file://0001-IWYU-add-ctime-for-std-time.patch \
"

SRC_URI_append_libc-musl = "\
Expand Down
30 changes: 21 additions & 9 deletions recipes-browser/chromium/chromium.inc
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ HOMEPAGE = "https://www.chromium.org/Home"
CVE_PRODUCT = "chromium:chromium google:chrome"

SRC_URI = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${PV}.tar.xz"
SRC_URI[md5sum] = "fefdb6206c5335ae1f0505547d18ee8c"
SRC_URI[sha256sum] = "ae12e94392986c6b8ea4413356a49bae0a19356ffe2ea95495303cf2decb38c3"
SRC_URI[md5sum] = "59bed1c878e9b0114a8493c9b7c717a9"
SRC_URI[sha256sum] = "df4914407b68afdc6449cb8e3f1b08d110eb8689ac41f86490e337fa4d1be379"

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

Expand Down Expand Up @@ -71,7 +71,6 @@ LIC_FILES_CHKSUM = "\
file://${S}/net/third_party/nss/LICENSE;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \
file://${S}/net/third_party/quiche/src/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \
file://${S}/net/third_party/uri_template/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/SPIRV-Tools/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/abseil-cpp/LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915 \
file://${S}/third_party/accessibility-audit/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/afl/src/docs/COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57 \
Expand Down Expand Up @@ -142,7 +141,6 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/android_deps/libs/androidx_viewpager2_viewpager2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/android_deps/libs/androidx_viewpager_viewpager/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/android_deps/libs/androidx_webkit_webkit/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/android_deps/libs/androidx_window_window/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/android_deps/libs/com_android_support_animated_vector_drawable/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/android_deps/libs/com_android_support_appcompat_v7/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/android_deps/libs/com_android_support_asynclayoutinflater/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
Expand Down Expand Up @@ -200,11 +198,12 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/android_deps/libs/com_google_dagger_dagger/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/android_deps/libs/com_google_guava_failureaccess/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/android_deps/libs/com_google_guava_guava_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/android_deps/libs/com_google_guava_listenablefuture/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/android_deps/libs/com_google_protobuf_protobuf_javalite/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \
file://${S}/third_party/android_deps/libs/javax_inject_javax_inject/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/android_deps/libs/org_checkerframework_checker_compat_qual/LICENSE;md5=02277660744c7727cbd0342d7ef08ad5 \
file://${S}/third_party/android_deps/libs/org_checkerframework_checker_compat_qual/LICENSE;md5=644e8784644589e748c242139c0a06e9 \
file://${S}/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations/LICENSE;md5=a5dd953e661e22a77f7b8062ae790f6a \
file://${S}/third_party/android_media/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/android_opengl/LICENSE;md5=d10e92761a860d4113a7a525c78daf13 \
Expand Down Expand Up @@ -236,16 +235,20 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/dawn/LICENSE;md5=302a09339e8de37ba06c121279be1707 \
file://${S}/third_party/decklink/LICENSE;md5=85b197f7b7b1ef270b01a1b6377be50e \
file://${S}/third_party/dom_distiller_js/LICENSE;md5=1399a5b89c7ed8167d261770432511e8 \
file://${S}/third_party/eigen3/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/emoji-segmenter/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/expat/src/expat/COPYING;md5=9e2ce3b3c4c0f2670883a23bbd7c37a9 \
file://${S}/third_party/farmhash/LICENSE;md5=7dfaa79e2b070897e495fec386e3acfc \
file://${S}/third_party/ffmpeg/CREDITS.chromium;md5=28c3eb351f68aa1d038e0e299dad5637 \
file://${S}/third_party/fft2d/LICENSE;md5=a062f975da2ca26745be122d5a0b1356 \
file://${S}/third_party/flac/COPYING.Xiph;md5=a2c4b71c0198682376d483eb5bcc9197 \
file://${S}/third_party/flatbuffers/LICENSE;md5=a873c5645c184d51e0f9b34e1d7cf559 \
file://${S}/third_party/fontconfig/src/COPYING;md5=7a0449e9bc5370402a94c00204beca3d \
file://${S}/third_party/fp16/LICENSE;md5=855dd24c28c76c916c5c2301b1958728 \
file://${S}/third_party/freetype/src/docs/FTL.TXT;md5=9f37b4e6afa3fef9dba8932b16bd3f97 \
file://${S}/third_party/fusejs/LICENSE;md5=f61de6d0d3d200550e44d63cc2a4fb67 \
file://${S}/third_party/gemmlowp/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/gif_player/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
file://${S}/third_party/glslang/LICENSE;md5=ce523927d7bcd789d6c3af579d03ad73 \
file://${S}/third_party/google-closure-library/LICENSE;md5=e23fadd6ceef8c618fc1c65191d846fa \
file://${S}/third_party/google_android_play_core/LICENSE;md5=7f7d74108ee1b7a743cca7d9a86784d6 \
file://${S}/third_party/google_input_tools/LICENSE;md5=ff0b0f0202337c9d4ae2d869797049d3 \
Expand Down Expand Up @@ -308,6 +311,7 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/mozilla/LICENSE;md5=822502c0e010ccdbb6a3e681dd47888e \
file://${S}/third_party/nasm/LICENSE;md5=90904486f8fbf1861cf42752e1a39efe \
file://${S}/third_party/nearby/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/neon_2_sse/LICENSE;md5=53abad1ded16f44100126962f4bbef6c \
file://${S}/third_party/one_euro_filter/LICENSE;md5=5b4d092181a412ae42c63e7fc1e53366 \
file://${S}/third_party/opencv/src/LICENSE;md5=19598330421859a6dd353a4318091ac7 \
file://${S}/third_party/openh264/src/LICENSE;md5=bb6d3771da6a07d33fd50d4d9aa73bcf \
Expand All @@ -328,31 +332,39 @@ LIC_FILES_CHKSUM = "\
file://${S}/third_party/qcms/src/COPYING;md5=65636fa951328d3be95f6047ec3936ce \
file://${S}/third_party/re2/LICENSE;md5=3b5c31eb512bdf3cb11ffd5713963760 \
file://${S}/third_party/rnnoise/COPYING;md5=1890bf89a18f8339491894a0b45428bf \
file://${S}/third_party/ruy/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/schema_org/LICENSE;md5=13a870bd7f606a919042749a5f098ac2 \
file://${S}/third_party/securemessage/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/shaka-player/LICENSE;md5=92b1fa01a6465982c12714cf43e6ecd2 \
file://${S}/third_party/shell-encryption/src/LICENSE;md5=c96a2157133614bf8a135bd27cd230d6 \
file://${S}/third_party/simplejson/LICENSE.txt;md5=8a9f8dcfcd28c34daa443e5b1d29813b \
file://${S}/third_party/skia/LICENSE;md5=822f02cc7736281816581cd064afbb1c \
file://${S}/third_party/smhasher/LICENSE;md5=0d948322ab524e2b74f55eb8ef57c74a \
file://${S}/third_party/snappy/src/COPYING;md5=f62f3080324a97b3159a7a7e61812d0c \
file://${S}/third_party/speech-dispatcher/COPYING;md5=5828ebb4b7590269a994ed46b0a70df0 \
file://${S}/third_party/spirv-cross/spirv-cross/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/sqlite/LICENSE;md5=7256769d4613c0af5a72be32ba20ccf7 \
file://${S}/third_party/subresource-filter-ruleset/LICENSE;md5=408c32b7944dedb9d57797eca2447ea1 \
file://${S}/third_party/sudden_motion_sensor/LICENSE;md5=6f89397ba4dda73a940f27f76e9ad9d4 \
file://${S}/third_party/swiftshader/LICENSE.txt;md5=d273d63619c9aeaf15cdaf76422c4f87 \
file://${S}/third_party/tcmalloc/LICENSE;md5=8ecc91ee1a2c17333b40126bfa32b7ca \
file://${S}/third_party/test_fonts/LICENSE;md5=a78e43d492b7bd2ad4a4529c7a6266ca \
file://${S}/third_party/text-fragments-polyfill/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
file://${S}/third_party/tflite/LICENSE;md5=64a34301f8e355f57ec992c2af3e5157 \
file://${S}/third_party/tint/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/tlslite/LICENSE;md5=aab0efc53fd36d5832963dc71fd2316e \
file://${S}/third_party/ukey2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/unrar/src/license.txt;md5=fc9c335ec05a5f36764ef9ce7a79daa1 \
file://${S}/third_party/usb_ids/LICENSE;md5=8f694e3758e3e57a5223bfa2bf29d452 \
file://${S}/third_party/usrsctp/LICENSE;md5=d8ad24c2ddd0e7bc1b0a6e4c7c80443e \
file://${S}/third_party/v4l-utils/COPYING.libv4l;md5=d749e86a105281d7a44c2328acebc4b0 \
file://${S}/third_party/vulkan_headers/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/vulkan-deps/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \
file://${S}/third_party/vulkan-deps/glslang/LICENSE;md5=ce523927d7bcd789d6c3af579d03ad73 \
file://${S}/third_party/vulkan-deps/spirv-cross/src/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/vulkan-deps/spirv-headers/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/vulkan-deps/spirv-tools/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/vulkan-deps/vulkan-headers/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/vulkan-deps/vulkan-loader/src/LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac \
file://${S}/third_party/vulkan-deps/vulkan-tools/src/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://${S}/third_party/vulkan-deps/vulkan-validation-layers/src/LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac \
file://${S}/third_party/vulkan_memory_allocator/LICENSE.txt;md5=bff949090c46187eb309d8a8b19b310c \
file://${S}/third_party/wayland-protocols/src/COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \
file://${S}/third_party/wayland/src/COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \
Expand Down
39 changes: 0 additions & 39 deletions recipes-browser/chromium/files/0001-Build-fix-for-libstdc.patch

This file was deleted.

44 changes: 0 additions & 44 deletions recipes-browser/chromium/files/0001-Fix-ill-formed-C-code.patch

This file was deleted.

36 changes: 0 additions & 36 deletions recipes-browser/chromium/files/0001-Fix-local-build.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
Upstream-Status: Backport

Backported from https://quiche.googlesource.com/quiche/+/4f43a02b2a83a0d836f8fdd6863bb9523f9c1748

Signed-off-by: Maksim Sisov <msisov@igalia.com>
---
From c4da3cf60dcf6854804ed6652665497da6ca8b63 Mon Sep 17 00:00:00 2001
From: Maksim Sisov <msisov@igalia.com>
Date: Wed, 10 Mar 2021 11:12:22 +0200
Subject: [PATCH] Fix use of DCHECK with std::unique_ptr

DCHECK_NE comparison requires CheckOpValueStr to be defined for the
type, or providing an output stream operator. A unique_ptr does not
provide any. USE DCHECK instead.

This change was originally written by Stephan Hartmann <https://quiche-review.googlesource.com/c/quiche/+/10680>.

PiperOrigin-RevId: 353340281
Change-Id: I0bf24145007ba7e7ae2bc8a04301ec9a300e335c
---
net/third_party/quiche/src/quic/core/quic_path_validator.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/third_party/quiche/src/quic/core/quic_path_validator.cc b/net/third_party/quiche/src/quic/core/quic_path_validator.cc
index ee446cc2..0cc387f6 100644
--- a/net/third_party/quiche/src/quic/core/quic_path_validator.cc
+++ b/net/third_party/quiche/src/quic/core/quic_path_validator.cc
@@ -68,7 +68,7 @@ void QuicPathValidator::OnPathResponse(const QuicPathFrameBuffer& probing_data,
void QuicPathValidator::StartPathValidation(
std::unique_ptr<QuicPathValidationContext> context,
std::unique_ptr<ResultDelegate> result_delegate) {
- DCHECK_NE(nullptr, context);
+ DCHECK(context);
QUIC_DLOG(INFO) << "Start validating path " << *context
<< " via writer: " << context->WriterToUse();
if (path_context_ != nullptr) {
--
2.25.1

Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
Upstream-Status: Backport

Signed-off-by: Maksim Sisov <msisov@igalia.com>
---
From 6faebbea4d1058b1c3feeb7e336e1dc273cd9c65 Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <stha09@googlemail.com>
Date: Tue, 9 Feb 2021 19:22:57 +0000
Subject: [PATCH] IWYU: add ctime for std::time

Bug: None
Change-Id: I8bdae43209984242b9f5e538d74ece4409b65e3c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2679610
Reviewed-by: Katie Dektar <katie@chromium.org>
Commit-Queue: Katie Dektar <katie@chromium.org>
Cr-Commit-Position: refs/heads/master@{#852287}
---
ui/accessibility/ax_tree_serializer.h | 1 +
1 file changed, 1 insertion(+)

diff --git a/ui/accessibility/ax_tree_serializer.h b/ui/accessibility/ax_tree_serializer.h
index 70a444668248..e1f80f508819 100644
--- a/ui/accessibility/ax_tree_serializer.h
+++ b/ui/accessibility/ax_tree_serializer.h
@@ -8,6 +8,7 @@
#include <stddef.h>
#include <stdint.h>

+#include <ctime>
#include <ostream>
#include <unordered_map>
#include <unordered_set>
--
2.25.1

This file was deleted.

Loading