>From 88a4375bbc5e9bfb81a0573f1f2ec902b8ce23e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= Date: Wed, 4 Oct 2017 13:17:40 +0200 Subject: [PATCH] chromium: Backport patch to fix gcc build error This is a compilation error that doesn't seem to manifest on gcc6 or clang toolchains, but it affects gcc5 which is used, for example, by R-Car gen 3 devices. Patch: https://chromium-review.googlesource.com/645549 --- recipes-browser/chromium/chromium_61.0.3163.100.bb | 1 + ...rename-ArrayBufferContents-AllocationKind.patch | 35 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 recipes-browser/chromium/files/rename-ArrayBufferContents-AllocationKind.patch diff --git a/recipes-browser/chromium/chromium_61.0.3163.100.bb b/recipes-browser/chromium/chromium_61.0.3163.100.bb index 87f6fdb..4bf1b0d 100644 --- a/recipes-browser/chromium/chromium_61.0.3163.100.bb +++ b/recipes-browser/chromium/chromium_61.0.3163.100.bb @@ -13,6 +13,7 @@ SRC_URI += " \ file://0001-Make-base-numerics-build-with-GCC.patch \ file://0001-Fix-compilation-for-ATK-accessibility.patch \ file://0001-Replace-remaining-references-to-struct-ucontext-with.patch \ + file://rename-ArrayBufferContents-AllocationKind.patch \ ${@bb.utils.contains('PACKAGECONFIG', 'root-profile', 'file://root-user-profile.patch', '', d)} \ " diff --git a/recipes-browser/chromium/files/rename-ArrayBufferContents-AllocationKind.patch b/recipes-browser/chromium/files/rename-ArrayBufferContents-AllocationKind.patch new file mode 100644 index 0000000..f47b54e --- /dev/null +++ b/recipes-browser/chromium/files/rename-ArrayBufferContents-AllocationKind.patch @@ -0,0 +1,35 @@ +From ec0d7abe5c1520464ff0ea2405b2c59d51b0b775 Mon Sep 17 00:00:00 2001 +From: Piotr Tworek +Date: Fri, 1 Sep 2017 12:20:03 +0000 +Subject: [PATCH] Rename ArrayBufferContents::AllocationKind to + GetAllocationKind. + +Current name clashes with the name of the enum class the function is +supposed to return. Clang does not care, but gcc fails to compile the +code. + +Bug: 760070 +Change-Id: I935d91493a3fc7b289d03f776c14b6ec4f3f622a +Reviewed-on: https://chromium-review.googlesource.com/645549 +Reviewed-by: Yuta Kitamura +Commit-Queue: Yuta Kitamura +Cr-Commit-Position: refs/heads/master@{#499171} +--- + .../WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h +index 94bb9161ec85..0671c471cbe0 100644 +--- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h ++++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h +@@ -122,7 +122,9 @@ class WTF_EXPORT ArrayBufferContents { + void* Data() const { return data_; } + size_t DataLength() const { return data_length_; } + +- ArrayBufferContents::AllocationKind AllocationKind() const { return kind_; } ++ ArrayBufferContents::AllocationKind GetAllocationKind() const { ++ return kind_; ++ } + + operator bool() const { return allocation_base_; } + -- 2.11.0