commit: 63e5fbd254535ca8902ae4456b733f782e8cde73 Author: Stephan Hartmann <stha09 <AT> googlemail <DOT> com> AuthorDate: Wed Nov 20 20:24:39 2019 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Fri Nov 22 20:08:50 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63e5fbd2
www-client/chromium: dev channel bump to 80.0.3970.5 Closes: https://bugs.gentoo.org/699776 Closes: https://bugs.gentoo.org/699978 Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Stephan Hartmann <stha09 <AT> googlemail.com> Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> www-client/chromium/Manifest | 2 +- ...0.3962.2.ebuild => chromium-80.0.3970.5.ebuild} | 4 +++ .../chromium/files/chromium-80-gcc-blink.patch | 27 +++++++++++++++++++ .../chromium/files/chromium-80-gcc-quiche.patch | 30 ++++++++++++++++++++++ .../chromium/files/chromium-80-include.patch | 13 ++++++++++ 5 files changed, 75 insertions(+), 1 deletion(-) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 4c29a4c54ac..551d7d72539 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -2,4 +2,4 @@ DIST chromium-78-revert-noexcept-r1.patch.gz 12094 BLAKE2B 1fd0c939af773ed398c9a DIST chromium-78.0.3904.108.tar.xz 742906260 BLAKE2B 4ec325911d502d0832764a2a70a51c680e3c3828127ae06c2cbc6b5604f25d416b4ed2e070054145d6f63605ba0610e8cca7a4d64ee4674abfbc1e2090999740 SHA512 9801634358974dbe61484963599719b7c5571d32c70d7568287ab6b72054ed82afa146a0470c53129266a9fbc4a24dc50a43d552b8f1756776907c2760f15589 DIST chromium-78.0.3904.97.tar.xz 742793812 BLAKE2B e7fada913f5831d805a50445da41ecbca7e27af52574ce242f427c0e4c83a74ae0283eb1667d74d39eb88f05e88e5a389945628666e24e26d635f74c43c8bc55 SHA512 e29312fe5c15eb6888a2e4d7e197c710d53feeecdf4e534c59f3db26973fee13f48880b46a7c3b132bb9989eb617db9c6138b809c3cb762332a9db25ad6d33dc DIST chromium-79.0.3945.36.tar.xz 778020676 BLAKE2B abf0a15f5bea2af0c2b42a6676f5bb3fb0025c1d2644dfc6c1e47e1d65c61607a46eb09877f36cba3936d5df0f993b8a801f10e3111898f93fd85b270c3a7d99 SHA512 9b534ea0bf39cb5dbf5a16e652fb6f06b3f0fa578ae18c06e947927c50d1e4fa663a8341f9ab6d1f914e4822bfec9ea98c05c376b465d61d49ef91186abcded0 -DIST chromium-80.0.3962.2.tar.xz 788407196 BLAKE2B f7ece5f654f7b479ac4aad42e18dc2454c46b39353bdf6057c30aeb30714f033af21228269510ddd4ebb15b570987cdbe0d0ae67824368f205fbdb9308cbed07 SHA512 29460df7e6b8f4b01fea06faad236690739e250170c190ee991090fc300a3cbea034ebee50731485ac578d5f8c83cfc86e9438bd6ba91c686f17bea78dbf1e86 +DIST chromium-80.0.3970.5.tar.xz 789810132 BLAKE2B 400fcefeb58cb784412eca7011267c9224786036494337ecb8dbc7f3f483ec05d6e26c424ef55286cbebdbc872e1c15acfb62413264bb8843334a11bbe73ab4d SHA512 398666d81beaeef3eeb3f00a9a512b2d4c4e74bd9f01f20fab06901eadcb6fdbd345c39c54f2af57c4e485f2cd35700cde6f6a3d6301df7ee920bf067bee31d6 diff --git a/www-client/chromium/chromium-80.0.3962.2.ebuild b/www-client/chromium/chromium-80.0.3970.5.ebuild similarity index 99% rename from www-client/chromium/chromium-80.0.3962.2.ebuild rename to www-client/chromium/chromium-80.0.3970.5.ebuild index 6f34c5068d5..c6af893cb11 100644 --- a/www-client/chromium/chromium-80.0.3962.2.ebuild +++ b/www-client/chromium/chromium-80.0.3970.5.ebuild @@ -147,7 +147,10 @@ PATCHES=( "${FILESDIR}/chromium-78-protobuf-export.patch" "${FILESDIR}/chromium-79-gcc-alignas.patch" "${FILESDIR}/chromium-80-unbundle-libxml.patch" + "${FILESDIR}/chromium-80-include.patch" "${FILESDIR}/chromium-80-gcc-noexcept.patch" + "${FILESDIR}/chromium-80-gcc-quiche.patch" + "${FILESDIR}/chromium-80-gcc-blink.patch" ) pre_build_checks() { @@ -369,6 +372,7 @@ src_prepare() { third_party/webrtc/rtc_base/third_party/sigslot third_party/widevine third_party/woff2 + third_party/wuffs third_party/zlib/google tools/grit/third_party/six url/third_party/mozilla diff --git a/www-client/chromium/files/chromium-80-gcc-blink.patch b/www-client/chromium/files/chromium-80-gcc-blink.patch new file mode 100644 index 00000000000..fdc28f32435 --- /dev/null +++ b/www-client/chromium/files/chromium-80-gcc-blink.patch @@ -0,0 +1,27 @@ +diff --git a/third_party/blink/renderer/core/editing/commands/delete_selection_command.cc b/third_party/blink/renderer/core/editing/commands/delete_selection_command.cc +index 6ff6906..dd531ae 100644 +--- a/third_party/blink/renderer/core/editing/commands/delete_selection_command.cc ++++ b/third_party/blink/renderer/core/editing/commands/delete_selection_command.cc +@@ -224,6 +224,10 @@ static Position TrailingWhitespacePosition(const Position& position, + return Position(); + } + ++static bool IsAHTMLTableRowElement(const Node* node) { ++ return IsA<HTMLTableRowElement>(node); ++} ++ + void DeleteSelectionCommand::InitializePositionData( + EditingState* editing_state) { + DCHECK(!GetDocument().NeedsLayoutTreeUpdate()); +@@ -253,9 +257,9 @@ void DeleteSelectionCommand::InitializePositionData( + end_root_ = RootEditableElementOf(end); + + start_table_row_ = To<HTMLTableRowElement>( +- EnclosingNodeOfType(start, &IsA<HTMLTableRowElement>)); ++ EnclosingNodeOfType(start, &IsAHTMLTableRowElement)); + end_table_row_ = To<HTMLTableRowElement>( +- EnclosingNodeOfType(end, &IsA<HTMLTableRowElement>)); ++ EnclosingNodeOfType(end, &IsAHTMLTableRowElement)); + + // Don't move content out of a table cell. + // If the cell is non-editable, enclosingNodeOfType won't return it by diff --git a/www-client/chromium/files/chromium-80-gcc-quiche.patch b/www-client/chromium/files/chromium-80-gcc-quiche.patch new file mode 100644 index 00000000000..aa3d54126ca --- /dev/null +++ b/www-client/chromium/files/chromium-80-gcc-quiche.patch @@ -0,0 +1,30 @@ +From 00f47df999c9b19e80fdc01db0ae9ca1b6a12b3a Mon Sep 17 00:00:00 2001 +From: vasilvv <[email protected]> +Date: Wed, 03 Apr 2019 13:58:53 -0700 +Subject: [PATCH] GCC: do not delete move constructor of QuicStreamSendBuffer + +QuicStreamSendBuffer constructor is implicitely required in the +initialization of the vector of substreams in QuicCryptoStream. +Though clang apparently ignores that, GCC fails to build. + +BUG=chromium:819294 + +Originally submitted by José Dapena Paz <[email protected]> at https://quiche-review.googlesource.com/c/quiche/+/2420 + +PiperOrigin-RevId: 241800134 +Change-Id: I4e3c97d6e5895d85340e8c1b740e6196d9104066 +--- + +diff --git a/net/third_party/quiche/src/quic/core/quic_stream_send_buffer.h b/net/third_party/quiche/src/quic/core/quic_stream_send_buffer.h +index e34514b..74e9d0d 100644 +--- a/net/third_party/quiche/src/quic/core/quic_stream_send_buffer.h ++++ b/net/third_party/quiche/src/quic/core/quic_stream_send_buffer.h +@@ -62,7 +62,7 @@ + public: + explicit QuicStreamSendBuffer(QuicBufferAllocator* allocator); + QuicStreamSendBuffer(const QuicStreamSendBuffer& other) = delete; +- QuicStreamSendBuffer(QuicStreamSendBuffer&& other) = delete; ++ QuicStreamSendBuffer(QuicStreamSendBuffer&& other) = default; + ~QuicStreamSendBuffer(); + + // Save |data_length| of data starts at |iov_offset| in |iov| to send buffer. diff --git a/www-client/chromium/files/chromium-80-include.patch b/www-client/chromium/files/chromium-80-include.patch new file mode 100644 index 00000000000..a2a00a9d455 --- /dev/null +++ b/www-client/chromium/files/chromium-80-include.patch @@ -0,0 +1,13 @@ +diff --git a/third_party/blink/renderer/core/core_initializer.h b/third_party/blink/renderer/core/core_initializer.h +index 5e67f46..3b750c7 100644 +--- a/third_party/blink/renderer/core/core_initializer.h ++++ b/third_party/blink/renderer/core/core_initializer.h +@@ -36,6 +36,8 @@ + #include "third_party/blink/renderer/core/core_export.h" + #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h" + ++#include <memory> ++ + namespace mojo { + class BinderMap; + }
