From b6b6967abf2aad785a656cbf66c4660d35e0b0c6 Mon Sep 17 00:00:00 2001 From: Stephan Hartmann Date: Wed, 26 Feb 2020 16:51:10 +0100 Subject: [PATCH] www-client/chromium: dev channel bump to 82.0.4068.4 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Stephan Hartmann Signed-off-by: Mike Gilbert Closes: https://github.com/gentoo/gentoo/pull/14789 --- www-client/chromium/Manifest | 2 +- ...6.3.ebuild => chromium-82.0.4068.4.ebuild} | 7 ++- .../files/chromium-82-gcc-constexpr.patch | 34 ++++++++++++++ .../files/chromium-82-gcc-default.patch | 35 -------------- .../files/chromium-82-gcc-has-feature.patch | 35 -------------- .../files/chromium-82-gcc-noexcept.patch | 13 ----- .../files/chromium-82-gcc-private.patch | 47 +++++++++++++++++++ .../chromium/files/chromium-82-include.patch | 28 +++++++++++ 8 files changed, 113 insertions(+), 88 deletions(-) rename www-client/chromium/{chromium-82.0.4056.3.ebuild => chromium-82.0.4068.4.ebuild} (99%) create mode 100644 www-client/chromium/files/chromium-82-gcc-constexpr.patch delete mode 100644 www-client/chromium/files/chromium-82-gcc-default.patch delete mode 100644 www-client/chromium/files/chromium-82-gcc-has-feature.patch delete mode 100644 www-client/chromium/files/chromium-82-gcc-noexcept.patch create mode 100644 www-client/chromium/files/chromium-82-gcc-private.patch create mode 100644 www-client/chromium/files/chromium-82-include.patch diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index e6fe40004766..57544bd002f2 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,4 +1,4 @@ DIST chromium-80.0.3987.100.tar.xz 801377116 BLAKE2B 0c99b78794a0c04bcc45fd423d0fabb7db4c9e37ae446b46c33a7b4a98ecc1af9302680e84118809f01dd3bee50b68a301ff0bdd72c5704c028c7984bac812f3 SHA512 b8612693158f9a497723391ed80dd06b152ed71b29e2722a751f94b297e184f09f786405d2c5b460aff6f62c9c6292c673b36019ff72f1fb662cc418cc26127d DIST chromium-80.0.3987.122.tar.xz 801340492 BLAKE2B 3f3015346120735c0d04268606fd61ddf57d63e042efe77d7e701fdc9609038a06cbc9380c6d90cb7324dc1679e62c86d971f36bd66f676bd2b16bc4c391bd0f SHA512 3a022c55f5745f2cfb7e28efb113f78ff686da638cd02f0585ef1ae8620f81ece864bc27b4e0a88daf3f409ff565a9b80b8859d1fd7d62c8b1d26cb8b311acc5 DIST chromium-81.0.4044.26.tar.xz 791360936 BLAKE2B e7364ba1c3e1a586224fd2b15d5942f992d9b1a765a595225e985f273d33a784a1c67d613da842dd35021d3791bd34087073e50f122386c2d5ae23c4b320e0e8 SHA512 62884b6247d070e05e6e588d39b7a0f6027c3073d464fce9ca810df42f8c26d2d387479ab84d55ef6fd5c24e3311e299c3a0760497f48f528b7b288edc8878d4 -DIST chromium-82.0.4056.3.tar.xz 796919020 BLAKE2B 89d010fef567b3b3f76614f8097697f71b5b1222faaa9738c639001748d8fc103eef0c6b0c90154be36e2deeb5b7c2b1b5a61c9fe7c11836d8723819466c265e SHA512 83a160ffad9f9b10fb498b61e0f6427ee88fe73928d5956b60e7bd0690bb279c1fa749105c4996da67d1ade80d62e9ccad0b9a8bfb3691a17574ad22399ae55d +DIST chromium-82.0.4068.4.tar.xz 803352676 BLAKE2B 64356b7c840d6ba955d2b7aced1faf85e05f19c9c0b39e8bf86529b86bba2e162404820f5710e9962c4d5e1325086becc3aebb0fdc2683b06231a2a0e8d7a6ae SHA512 ceb3b50ad4b38e969cf27c386d696665d773e73c000a1cd1ee158bbff86ae94b09a5fbe128547ed496e258ce8bfaf9bbf28b0d229254400c86afbe49fc7e8d8b diff --git a/www-client/chromium/chromium-82.0.4056.3.ebuild b/www-client/chromium/chromium-82.0.4068.4.ebuild similarity index 99% rename from www-client/chromium/chromium-82.0.4056.3.ebuild rename to www-client/chromium/chromium-82.0.4068.4.ebuild index af1778f7e9b7..a056ee3c4d4f 100644 --- a/www-client/chromium/chromium-82.0.4056.3.ebuild +++ b/www-client/chromium/chromium-82.0.4068.4.ebuild @@ -145,10 +145,9 @@ PATCHES=( "${FILESDIR}/chromium-79-gcc-alignas.patch" "${FILESDIR}/chromium-80-gcc-quiche.patch" "${FILESDIR}/chromium-80-gcc-blink.patch" - "${FILESDIR}/chromium-81-gcc-constexpr.patch" - "${FILESDIR}/chromium-82-gcc-noexcept.patch" - "${FILESDIR}/chromium-82-gcc-has-feature.patch" - "${FILESDIR}/chromium-82-gcc-default.patch" + "${FILESDIR}/chromium-82-gcc-constexpr.patch" + "${FILESDIR}/chromium-82-gcc-private.patch" + "${FILESDIR}/chromium-82-include.patch" ) pre_build_checks() { diff --git a/www-client/chromium/files/chromium-82-gcc-constexpr.patch b/www-client/chromium/files/chromium-82-gcc-constexpr.patch new file mode 100644 index 000000000000..139b458c1969 --- /dev/null +++ b/www-client/chromium/files/chromium-82-gcc-constexpr.patch @@ -0,0 +1,34 @@ +From 5812cd9bc2c15a034db24e0d2a43cc923d8a66cc Mon Sep 17 00:00:00 2001 +From: Jose Dapena Paz +Date: Thu, 20 Feb 2020 13:00:16 +0100 +Subject: [PATCH] GCC: DOMRect constexpr equal operator depends on non constexpr operators + +Make accessors of DOMRectReadOnly constexpr so the equal operator can be +also constexpr. + +../../third_party/blink/renderer/core/geometry/dom_rect.h: In function ‘constexpr bool blink::operator==(const blink::DOMRect&, const blink::DOMRect&)’: +../../third_party/blink/renderer/core/geometry/dom_rect.h:38:15: error: call to non-‘constexpr’ function ‘double blink::DOMRectReadOnly::x() const’ + +Bug: 819294 +Change-Id: Ic1fed89c5480ce4eedaaf7add2779d000b77cc48 +--- + +diff --git a/third_party/blink/renderer/core/geometry/dom_rect_read_only.h b/third_party/blink/renderer/core/geometry/dom_rect_read_only.h +index 77398f0..dda1f33 100644 +--- a/third_party/blink/renderer/core/geometry/dom_rect_read_only.h ++++ b/third_party/blink/renderer/core/geometry/dom_rect_read_only.h +@@ -30,10 +30,10 @@ + + DOMRectReadOnly(double x, double y, double width, double height); + +- double x() const { return x_; } +- double y() const { return y_; } +- double width() const { return width_; } +- double height() const { return height_; } ++ constexpr double x() const { return x_; } ++ constexpr double y() const { return y_; } ++ constexpr double width() const { return width_; } ++ constexpr double height() const { return height_; } + + double top() const { return std::min(y_, y_ + height_); } + double right() const { return std::max(x_, x_ + width_); } diff --git a/www-client/chromium/files/chromium-82-gcc-default.patch b/www-client/chromium/files/chromium-82-gcc-default.patch deleted file mode 100644 index 2195a1d2923a..000000000000 --- a/www-client/chromium/files/chromium-82-gcc-default.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a089aa8aafa2cabc331df6ea450fb75b77e75ff7 Mon Sep 17 00:00:00 2001 -From: Jose Dapena Paz -Date: Wed, 12 Feb 2020 22:03:05 +0000 -Subject: [PATCH] libstdc++: explicitly declare default constructor of WTF::DequeIterator - -Using std::minmax_element on a WTF::Deque iterator with libstdc++ from -GCC 5+ fails to compile: -/usr/include/c++/9/bits/stl_algo.h:3334:24: error: no matching function for call to ‘WTF::DequeIterator::DequeIterator()’ - 3334 | _ForwardIterator __min{}, __max{}; - -This is because it will try to create an iterator of the DequeIterator -type with no parameters (or with an empty list of initializers), but -that constructor is not available. So this changeset adds it. - -Bug: 957519 - -Change-Id: I95e54a2fd95b19c0d439e9067105b7e388bdea61 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2051932 -Reviewed-by: Kentaro Hara -Commit-Queue: José Dapena Paz -Cr-Commit-Position: refs/heads/master@{#740842} ---- - -diff --git a/third_party/blink/renderer/platform/wtf/deque.h b/third_party/blink/renderer/platform/wtf/deque.h -index 29cce7c57..07233c4 100644 ---- a/third_party/blink/renderer/platform/wtf/deque.h -+++ b/third_party/blink/renderer/platform/wtf/deque.h -@@ -236,6 +236,7 @@ - typedef T& reference; - typedef std::bidirectional_iterator_tag iterator_category; - -+ DequeIterator() = default; - DequeIterator(Deque* deque, wtf_size_t index) - : Base(deque, index) {} - diff --git a/www-client/chromium/files/chromium-82-gcc-has-feature.patch b/www-client/chromium/files/chromium-82-gcc-has-feature.patch deleted file mode 100644 index 592d0cdb3b96..000000000000 --- a/www-client/chromium/files/chromium-82-gcc-has-feature.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a148e5ed2151c6458f8c4cff44634146f803afe5 Mon Sep 17 00:00:00 2001 -From: Jose Dapena Paz -Date: Wed, 12 Feb 2020 22:00:35 +0000 -Subject: [PATCH] GCC: do not use __has_feature in UnsanitizedAtomic - -GCC fails to build as unsanitized_atomic.cc is using a Clang only -compiler macro: __has_feature: - - ../../third_party/blink/renderer/platform/heap/unsanitized_atomic.cc:9:18: error: missing binary operator before token "(" - 9 | #if __has_feature(address_sanitizer) - | ^ - -Bug: 819294 -Change-Id: Id1ef4972e61d82739b115398458fd238736de4a9 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2052106 -Reviewed-by: Anton Bikineev -Commit-Queue: José Dapena Paz -Cr-Commit-Position: refs/heads/master@{#740841} ---- - -diff --git a/third_party/blink/renderer/platform/heap/unsanitized_atomic.cc b/third_party/blink/renderer/platform/heap/unsanitized_atomic.cc -index 8481d63..5ed251d 100644 ---- a/third_party/blink/renderer/platform/heap/unsanitized_atomic.cc -+++ b/third_party/blink/renderer/platform/heap/unsanitized_atomic.cc -@@ -6,7 +6,9 @@ - - #include "cstdint" - --#if __has_feature(address_sanitizer) -+#include "base/compiler_specific.h" -+ -+#if HAS_FEATURE(address_sanitizer) - #error "Must be built without asan." - #endif - diff --git a/www-client/chromium/files/chromium-82-gcc-noexcept.patch b/www-client/chromium/files/chromium-82-gcc-noexcept.patch deleted file mode 100644 index ee7d65537fc0..000000000000 --- a/www-client/chromium/files/chromium-82-gcc-noexcept.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/components/paint_preview/browser/paint_preview_client.cc b/components/paint_preview/browser/paint_preview_client.cc -index a02605a..abe0e3a 100644 ---- a/components/paint_preview/browser/paint_preview_client.cc -+++ b/components/paint_preview/browser/paint_preview_client.cc -@@ -98,7 +98,7 @@ PaintPreviewClient::PaintPreviewData::PaintPreviewData() = default; - PaintPreviewClient::PaintPreviewData::~PaintPreviewData() = default; - - PaintPreviewClient::PaintPreviewData& PaintPreviewClient::PaintPreviewData:: --operator=(PaintPreviewData&& rhs) noexcept = default; -+operator=(PaintPreviewData&& rhs) = default; - - PaintPreviewClient::PaintPreviewData::PaintPreviewData( - PaintPreviewData&& other) noexcept = default; diff --git a/www-client/chromium/files/chromium-82-gcc-private.patch b/www-client/chromium/files/chromium-82-gcc-private.patch new file mode 100644 index 000000000000..278f5b1d97a9 --- /dev/null +++ b/www-client/chromium/files/chromium-82-gcc-private.patch @@ -0,0 +1,47 @@ +From 1931db04cf4b3737adfb99edf86cbf68d740511b Mon Sep 17 00:00:00 2001 +From: Jose Dapena Paz +Date: Thu, 20 Feb 2020 11:41:29 +0100 +Subject: [PATCH] GNU stdc++: media::MediaError default constructor should be public + +On building with GNU stdc++ we get this error building: + gen/media/mojo/mojom/media_types.mojom.cc:1161:55: required from here + /usr/include/c++/9/bits/stl_construct.h:75:7: error: ‘media::MediaError::MediaError()’ is private within this context + +This is because the serialization code will eventually call, in this case, +the default constructor because of the implementation of stl_uninitialized +that is used to create an std::vector. This is invoked from +static bool mojo::ArrayTraits >::Resize(std::vector<_Tp>&, size_t) +and what it does is constructing a temporary vector like this: + std::vector temp(size); + +But this is requiring calling the default constructor of T (in this case +MediaError) for all the elements up to size-1. + +Bug: 957519 +Change-Id: Ie3a28b9734f16c5155b9500003838510be0a748d +--- + +diff --git a/media/base/media_error.h b/media/base/media_error.h +index d3ba96c..56daaec 100644 +--- a/media/base/media_error.h ++++ b/media/base/media_error.h +@@ -40,6 +40,9 @@ + // successful returns. + class MEDIA_EXPORT MediaError { + public: ++ // Default constructor can be used for MediaError::Ok(); ++ MediaError(); ++ + // Convenience function to return |kOk|. + // OK won't have a message, trace, or data associated with them, and DCHECK + // if they are added. +@@ -110,9 +113,6 @@ + } + + private: +- // Default constructor can be used for MediaError::Ok(); +- MediaError(); +- + // Private helper to add the current stack frame to the error trace. + void AddFrame(const base::Location& location); + diff --git a/www-client/chromium/files/chromium-82-include.patch b/www-client/chromium/files/chromium-82-include.patch new file mode 100644 index 000000000000..9a39ae2e8d56 --- /dev/null +++ b/www-client/chromium/files/chromium-82-include.patch @@ -0,0 +1,28 @@ +From 046deafc60a31f485a96773dc5ea5b0eb2ed15f1 Mon Sep 17 00:00:00 2001 +From: Jose Dapena Paz +Date: Mon, 24 Feb 2020 16:24:33 +0000 +Subject: [PATCH] IWYU: missing include for std::string in csp_source_list.h + +Build error in GCC: +../../services/network/public/cpp/content_security_policy/csp_source_list.h:19:6: error: ‘string’ in namespace ‘std’ does not name a type + +Bug: 819294 +Change-Id: I9c8665050cae038530a79323b65932a124adf2a1 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2067074 +Commit-Queue: Lucas Gadani +Reviewed-by: Lucas Gadani +Cr-Commit-Position: refs/heads/master@{#743946} +--- + +diff --git a/services/network/public/cpp/content_security_policy/csp_source_list.h b/services/network/public/cpp/content_security_policy/csp_source_list.h +index 0cd3971..6df1891 100644 +--- a/services/network/public/cpp/content_security_policy/csp_source_list.h ++++ b/services/network/public/cpp/content_security_policy/csp_source_list.h +@@ -5,6 +5,7 @@ + #ifndef SERVICES_NETWORK_PUBLIC_CPP_CONTENT_SECURITY_POLICY_CSP_SOURCE_LIST_H_ + #define SERVICES_NETWORK_PUBLIC_CPP_CONTENT_SECURITY_POLICY_CSP_SOURCE_LIST_H_ + ++#include + #include + + #include "base/component_export.h" -- 2.26.2