Skip to content

Commit e940c1c

Browse files
author
Raphael Kubo da Costa
committed
chromium: Backport upstream patch to fix the build with LLVM 12 and later.
Thanks to Zoltán Böszörményi for pointing to the upstream fix. Fixes #461. Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
1 parent dcfb4ce commit e940c1c

File tree

2 files changed

+45
-0
lines changed

2 files changed

+45
-0
lines changed

recipes-browser/chromium/chromium-gn.inc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ SRC_URI += " \
2323
file://0001-Build-fix-for-libstdc.patch \
2424
file://0001-IWYU-add-missing-include-for-std-vector-and-std-uniq.patch \
2525
file://0001-ozone-fix-include.patch \
26+
file://0001-Fix-ill-formed-C-code.patch \
2627
"
2728

2829
SRC_URI_append_libc-musl = "\
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
Upstream-Status: Backport
2+
3+
This allows the recipe to build with LLVM 12+.
4+
5+
Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
6+
---
7+
From d62de64e2fd20a4811593cb2248bb476aebfadf5 Mon Sep 17 00:00:00 2001
8+
From: Arthur Eubanks <aeubanks@google.com>
9+
Date: Sat, 2 Jan 2021 08:11:55 +0000
10+
Subject: [PATCH] Fix ill-formed C++ code
11+
12+
See https://reviews.llvm.org/D92936.
13+
14+
Bug: 1162717
15+
Change-Id: Ia44176774dbb4b1d90db08afbe95994c57f8387d
16+
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2608756
17+
Reviewed-by: Kentaro Hara <haraken@chromium.org>
18+
Commit-Queue: Arthur Eubanks <aeubanks@google.com>
19+
Cr-Commit-Position: refs/heads/master@{#839931}
20+
---
21+
third_party/blink/renderer/platform/disk_data_metadata.h | 2 +-
22+
1 file changed, 1 insertion(+), 1 deletion(-)
23+
24+
diff --git a/third_party/blink/renderer/platform/disk_data_metadata.h b/third_party/blink/renderer/platform/disk_data_metadata.h
25+
index 7c66cff4773c..94d62b3f7a58 100644
26+
--- a/third_party/blink/renderer/platform/disk_data_metadata.h
27+
+++ b/third_party/blink/renderer/platform/disk_data_metadata.h
28+
@@ -14,12 +14,12 @@ class DiskDataMetadata {
29+
public:
30+
int64_t start_offset() const { return start_offset_; }
31+
size_t size() const { return size_; }
32+
- DiskDataMetadata(DiskDataMetadata&& other) = delete;
33+
34+
private:
35+
DiskDataMetadata(int64_t start_offset, size_t size)
36+
: start_offset_(start_offset), size_(size) {}
37+
DiskDataMetadata(const DiskDataMetadata& other) = default;
38+
+ DiskDataMetadata(DiskDataMetadata&& other) = default;
39+
DiskDataMetadata& operator=(const DiskDataMetadata& other) = default;
40+
41+
int64_t start_offset_;
42+
--
43+
2.29.2
44+

0 commit comments

Comments
 (0)