From f059cef7f5924e03ae8795cc3d8e6867cc343480 Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Sun, 30 Aug 2020 18:41:49 -0400 Subject: [PATCH 1/2] chromium: update to 85.0.4183.83. [ci skip] - Built for i686, x86_64, x86_64-musl. - Tested on x86_64. - Use bundled libvpx (doesn't build with system library). --- .../files/musl-patches/no-mallinfo.patch | 4 +- ...chromium-84-crashpad-include-cstring.patch | 90 ------------------- ...chromium-84-gcc-DCHECK_EQ-unique_ptr.patch | 29 ------ .../patches/chromium-84-mediaalloc.patch | 41 --------- .../chromium-84-std-vector-const.patch | 49 ---------- srcpkgs/chromium/patches/libc_malloc.patch | 12 +-- ...remove-unsupported-compiler-warnings.patch | 19 +++- .../scoped_nss_types-h-compile-fix.patch | 37 -------- .../upstream-AXObject-stl-iterator.patch | 36 -------- ...-ListContainerHelper-include-cstring.patch | 30 ------- ...rbyShareEncryptedMetadataKey-include.patch | 25 ++++++ ...teForCurrentDocument-from-destructor.patch | 71 --------------- ...3-files-to-have-a-start-time-of-zero.patch | 38 -------- ...calls-and-just-send-a-normal-message.patch | 42 --------- .../patches/upstream-sim_hash-include.patch | 25 ++++++ .../patches/xxx-ppc64le-support.patch | 6 +- srcpkgs/chromium/template | 12 +-- 17 files changed, 80 insertions(+), 486 deletions(-) delete mode 100644 srcpkgs/chromium/patches/chromium-84-crashpad-include-cstring.patch delete mode 100644 srcpkgs/chromium/patches/chromium-84-gcc-DCHECK_EQ-unique_ptr.patch delete mode 100644 srcpkgs/chromium/patches/chromium-84-mediaalloc.patch delete mode 100644 srcpkgs/chromium/patches/chromium-84-std-vector-const.patch delete mode 100644 srcpkgs/chromium/patches/scoped_nss_types-h-compile-fix.patch delete mode 100644 srcpkgs/chromium/patches/upstream-AXObject-stl-iterator.patch delete mode 100644 srcpkgs/chromium/patches/upstream-ListContainerHelper-include-cstring.patch create mode 100644 srcpkgs/chromium/patches/upstream-NearbyShareEncryptedMetadataKey-include.patch delete mode 100644 srcpkgs/chromium/patches/upstream-avoid-calling-DeleteForCurrentDocument-from-destructor.patch delete mode 100644 srcpkgs/chromium/patches/upstream-force-mp3-files-to-have-a-start-time-of-zero.patch delete mode 100644 srcpkgs/chromium/patches/upstream-remove-NotifyError-calls-and-just-send-a-normal-message.patch create mode 100644 srcpkgs/chromium/patches/upstream-sim_hash-include.patch diff --git a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch index 23ede1699bf..61d5d7a77ca 100644 --- a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch +++ b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch @@ -40,8 +40,8 @@ mi = ::mallinfo(); return mi.uordblks; ---- third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h.orig 2019-09-30 13:03:42.556880537 -0400 -+++ third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h 2019-09-30 13:07:27.989821227 -0400 +--- third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h.orig 2019-09-30 13:03:42.556880537 -0400 ++++ third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h 2019-09-30 13:07:27.989821227 -0400 @@ -122,7 +122,9 @@ /* #undef HAVE_MALLCTL */ diff --git a/srcpkgs/chromium/patches/chromium-84-crashpad-include-cstring.patch b/srcpkgs/chromium/patches/chromium-84-crashpad-include-cstring.patch deleted file mode 100644 index 2cdd9e702fd..00000000000 --- a/srcpkgs/chromium/patches/chromium-84-crashpad-include-cstring.patch +++ /dev/null @@ -1,90 +0,0 @@ -From effd506ce070d58e731bd6086681b9cded8573ed Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann -Date: Sun, 10 May 2020 07:24:38 +0000 -Subject: [PATCH] IWYU: add a bunch of missing cstring includes - ---- - .../crashpad/snapshot/minidump/minidump_context_converter.cc | 2 ++ - third_party/crashpad/crashpad/util/linux/ptrace_client.cc | 1 + - .../crashpad/crashpad/util/net/http_multipart_builder.cc | 1 + - third_party/crashpad/crashpad/util/net/http_transport_socket.cc | 2 ++ - third_party/crashpad/crashpad/util/process/process_memory.cc | 1 + - third_party/crashpad/crashpad/util/stream/log_output_stream.cc | 1 + - 6 files changed, 8 insertions(+) - -diff --git a/third_party/crashpad/crashpad/snapshot/minidump/minidump_context_converter.cc b/third_party/crashpad/crashpad/snapshot/minidump/minidump_context_converter.cc -index 0c840deac..1d163b42f 100644 ---- third_party/crashpad/crashpad/snapshot/minidump/minidump_context_converter.cc -+++ third_party/crashpad/crashpad/snapshot/minidump/minidump_context_converter.cc -@@ -14,6 +14,8 @@ - - #include "snapshot/minidump/minidump_context_converter.h" - -+#include -+ - #include "base/stl_util.h" - #include "minidump/minidump_context.h" - -diff --git a/third_party/crashpad/crashpad/util/linux/ptrace_client.cc b/third_party/crashpad/crashpad/util/linux/ptrace_client.cc -index f097ad985..e91ce2eca 100644 ---- third_party/crashpad/crashpad/util/linux/ptrace_client.cc -+++ third_party/crashpad/crashpad/util/linux/ptrace_client.cc -@@ -17,6 +17,7 @@ - #include - #include - -+#include - #include - - #include "base/logging.h" -diff --git a/third_party/crashpad/crashpad/util/net/http_multipart_builder.cc b/third_party/crashpad/crashpad/util/net/http_multipart_builder.cc -index 267960b27..8ed7edc2f 100644 ---- third_party/crashpad/crashpad/util/net/http_multipart_builder.cc -+++ third_party/crashpad/crashpad/util/net/http_multipart_builder.cc -@@ -16,6 +16,7 @@ - - #include - -+#include - #include - #include - -diff --git a/third_party/crashpad/crashpad/util/net/http_transport_socket.cc b/third_party/crashpad/crashpad/util/net/http_transport_socket.cc -index 4dd01b6e7..60cd60c17 100644 ---- third_party/crashpad/crashpad/util/net/http_transport_socket.cc -+++ third_party/crashpad/crashpad/util/net/http_transport_socket.cc -@@ -19,6 +19,8 @@ - #include - #include - -+#include -+ - #include "base/logging.h" - #include "base/macros.h" - #include "base/numerics/safe_conversions.h" -diff --git a/third_party/crashpad/crashpad/util/process/process_memory.cc b/third_party/crashpad/crashpad/util/process/process_memory.cc -index ab87b940f..e02bcea81 100644 ---- third_party/crashpad/crashpad/util/process/process_memory.cc -+++ third_party/crashpad/crashpad/util/process/process_memory.cc -@@ -15,6 +15,7 @@ - #include "util/process/process_memory.h" - - #include -+#include - - #include "base/logging.h" - #include "util/numeric/safe_assignment.h" -diff --git a/third_party/crashpad/crashpad/util/stream/log_output_stream.cc b/third_party/crashpad/crashpad/util/stream/log_output_stream.cc -index 03c0a5a02..45d823aa4 100644 ---- third_party/crashpad/crashpad/util/stream/log_output_stream.cc -+++ third_party/crashpad/crashpad/util/stream/log_output_stream.cc -@@ -15,6 +15,7 @@ - #include "util/stream/log_output_stream.h" - - #include -+#include - - #include "base/logging.h" - --- -2.26.2 diff --git a/srcpkgs/chromium/patches/chromium-84-gcc-DCHECK_EQ-unique_ptr.patch b/srcpkgs/chromium/patches/chromium-84-gcc-DCHECK_EQ-unique_ptr.patch deleted file mode 100644 index 3245a0b10de..00000000000 --- a/srcpkgs/chromium/patches/chromium-84-gcc-DCHECK_EQ-unique_ptr.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9b749dc5c7fdb0f4b1bd0df5901beb6af1b81ff1 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann -Date: Sat, 9 May 2020 16:46:07 +0000 -Subject: [PATCH] GCC: fix DCHECK_EQ in NGInlineNode::SegmentScriptRuns - -data->segments is a std::unique_ptr, but underlying CheckOpValueStr -has no overloaded function for std::unique_ptr. -However, overloaded function with const void* exists and can be -used with std::unique_ptr::get(). ---- - .../blink/renderer/core/layout/ng/inline/ng_inline_node.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.cc b/third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.cc -index 55ca9e3..ee691df 100644 ---- third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.cc -+++ third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.cc -@@ -891,7 +891,7 @@ void NGInlineNode::SegmentText(NGInlineNodeData* data) { - - // Segment NGInlineItem by script, Emoji, and orientation using RunSegmenter. - void NGInlineNode::SegmentScriptRuns(NGInlineNodeData* data) { -- DCHECK_EQ(data->segments, nullptr); -+ DCHECK_EQ(data->segments.get(), nullptr); - - String& text_content = data->text_content; - if (text_content.IsEmpty()) { --- -2.26.2 - diff --git a/srcpkgs/chromium/patches/chromium-84-mediaalloc.patch b/srcpkgs/chromium/patches/chromium-84-mediaalloc.patch deleted file mode 100644 index 09b52191f4a..00000000000 --- a/srcpkgs/chromium/patches/chromium-84-mediaalloc.patch +++ /dev/null @@ -1,41 +0,0 @@ -https://bugs.chromium.org/p/chromium/issues/detail?id=1095962 - ---- media/base/media.cc -+++ media/base/media.cc -@@ -2,6 +2,8 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - -+#include -+ - #include "media/base/media.h" - - #include "base/allocator/buildflags.h" -@@ -41,7 +43,7 @@ - - #if BUILDFLAG(USE_ALLOCATOR_SHIM) - // Remove allocation limit from ffmpeg, so calls go down to shim layer. -- av_max_alloc(0); -+ av_max_alloc(std::numeric_limits::max()); - #endif // BUILDFLAG(USE_ALLOCATOR_SHIM) - - #endif // BUILDFLAG(ENABLE_FFMPEG) ---- third_party/ffmpeg/chromium/dllmain.cc -+++ third_party/ffmpeg/chromium/dllmain.cc -@@ -3,6 +3,7 @@ - // found in the LICENSE file. - - #include -+#include - #include - #include - #include -@@ -28,7 +29,7 @@ - if (reason == DLL_PROCESS_ATTACH) { - DisableThreadLibraryCalls(instance); - // Remove allocation limit from ffmpeg, so calls go down to shim layer. -- av_max_alloc(0); -+ av_max_alloc(std::numeric_limits::max()); - // Enable OOM crashes in the shim for all malloc calls that fail. - _set_new_mode(1); - _set_new_handler(&OnNoMemory); diff --git a/srcpkgs/chromium/patches/chromium-84-std-vector-const.patch b/srcpkgs/chromium/patches/chromium-84-std-vector-const.patch deleted file mode 100644 index 9df09f13678..00000000000 --- a/srcpkgs/chromium/patches/chromium-84-std-vector-const.patch +++ /dev/null @@ -1,49 +0,0 @@ -From df982a547c5e88777a6134e5d18a1482d933f1cf Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann -Date: Wed, 27 May 2020 10:38:26 +0000 -Subject: [PATCH] libstdc++: std::vector must have non-const value_type - -Bug: 957519 -Change-Id: I535b3bcf318f98cecbf4be1520ffe4126abcacd8 ---- - -diff --git a/extensions/common/features/feature_flags.cc b/extensions/common/features/feature_flags.cc -index 5b63764..7efa308 100644 ---- extensions/common/features/feature_flags.cc -+++ extensions/common/features/feature_flags.cc -@@ -19,7 +19,7 @@ - constexpr base::Feature kFeatureFlags[] = { - {"DeclarativeNetRequest", base::FEATURE_ENABLED_BY_DEFAULT}}; - --const std::vector* g_feature_flags_test_override = nullptr; -+const std::vector* g_feature_flags_test_override = nullptr; - - template - const base::Feature* GetFeature(T begin, -@@ -52,8 +52,8 @@ - } - - ScopedFeatureFlagsOverride CreateScopedFeatureFlagsOverrideForTesting( -- const std::vector* features) { -- return base::AutoReset*>( -+ const std::vector* features) { -+ return base::AutoReset*>( - &g_feature_flags_test_override, features); - } - -diff --git a/extensions/common/features/feature_flags.h b/extensions/common/features/feature_flags.h -index d1a5dd3..b57740b 100644 ---- extensions/common/features/feature_flags.h -+++ extensions/common/features/feature_flags.h -@@ -25,9 +25,9 @@ - // in scope. Clients must ensure that |features| remains alive (non-dangling) - // while the returned value is in scope. - using ScopedFeatureFlagsOverride = -- base::AutoReset*>; -+ base::AutoReset*>; - ScopedFeatureFlagsOverride CreateScopedFeatureFlagsOverrideForTesting( -- const std::vector* features); -+ const std::vector* features); - - } // namespace extensions - diff --git a/srcpkgs/chromium/patches/libc_malloc.patch b/srcpkgs/chromium/patches/libc_malloc.patch index c25c79486f0..eda11ec8663 100644 --- a/srcpkgs/chromium/patches/libc_malloc.patch +++ b/srcpkgs/chromium/patches/libc_malloc.patch @@ -13,14 +13,14 @@ namespace base { size_t g_oom_size = 0U; ---- base/process/memory_linux.cc.orig 2017-09-15 08:46:55.000000000 +0000 -+++ base/process/memory_linux.cc 2017-09-15 08:51:34.422016858 +0000 -@@ -107,7 +107,7 @@ - (!defined(LIBC_GLIBC) && !defined(USE_TCMALLOC)) +--- base/process/memory_linux.cc.orig 2020-08-30 14:18:35.401132593 -0400 ++++ base/process/memory_linux.cc 2020-08-30 14:19:08.030199189 -0400 +@@ -141,7 +141,7 @@ + (!defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC)) *result = malloc(size); - #elif defined(LIBC_GLIBC) && !defined(USE_TCMALLOC) + #elif defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC) - *result = __libc_malloc(size); + *result = ::__libc_malloc(size); - #elif defined(USE_TCMALLOC) + #elif BUILDFLAG(USE_TCMALLOC) *result = tc_malloc_skip_new_handler(size); #endif diff --git a/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch b/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch index c601f372a86..5268a087189 100644 --- a/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch +++ b/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch @@ -1,6 +1,6 @@ ---- build/config/compiler/BUILD.gn.orig 2020-07-18 09:24:00.272560391 -0400 -+++ build/config/compiler/BUILD.gn 2020-07-18 10:09:09.225465782 -0400 -@@ -1495,9 +1495,6 @@ +--- build/config/compiler/BUILD.gn.orig 2020-08-24 17:40:22.000000000 -0400 ++++ build/config/compiler/BUILD.gn 2020-08-30 13:37:51.834404370 -0400 +@@ -1512,22 +1512,12 @@ # TODO(https://crbug.com/1028110): Evaluate and possible enable. "-Wno-deprecated-copy", @@ -10,3 +10,16 @@ ] cflags_c += [ + # TODO(https://crbug.com/995993): Clean up and enable. + "-Wno-implicit-fallthrough", + ] +- +- if (enable_wmax_tokens) { +- cflags += [ "-Wmax-tokens" ] +- } else { +- # TODO(https://crbug.com/1049569): Remove after Clang 87b235db. +- cflags += [ "-Wno-max-tokens" ] +- } + } + } + } diff --git a/srcpkgs/chromium/patches/scoped_nss_types-h-compile-fix.patch b/srcpkgs/chromium/patches/scoped_nss_types-h-compile-fix.patch deleted file mode 100644 index af3c96dbb73..00000000000 --- a/srcpkgs/chromium/patches/scoped_nss_types-h-compile-fix.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3a3effdd81e97bfc4f2698cd1f41b008355b0469 Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa -Date: Tue, 26 May 2020 16:34:45 +0000 -Subject: [PATCH] scoped_nss_types.h: Include instead of - -Follow-up to commit 701cae5de ("Introduce a function to format a DER-encoded -SPKI for UI"). - -That is the format used by other files that include , and the -pkg-config configuration already passes -I/path/to/nss to the compiler. - -This can potentially fix the non-sysroot build, as the NSS headers might be -installed in e.g. /usr/include/nss3 rather than /usr/include/nss. - -Change-Id: I0461a7a7f8c93459f2281ea71c96434a74687ee8 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2214390 -Auto-Submit: Raphael Kubo da Costa -Commit-Queue: David Benjamin -Reviewed-by: David Benjamin -Cr-Commit-Position: refs/heads/master@{#771840} ---- - -diff --git a/crypto/scoped_nss_types.h b/crypto/scoped_nss_types.h -index 2a3a6e1..0a663ea 100644 ---- crypto/scoped_nss_types.h -+++ crypto/scoped_nss_types.h -@@ -5,9 +5,9 @@ - #ifndef CRYPTO_SCOPED_NSS_TYPES_H_ - #define CRYPTO_SCOPED_NSS_TYPES_H_ - -+#include - #include - #include --#include - #include - #include - diff --git a/srcpkgs/chromium/patches/upstream-AXObject-stl-iterator.patch b/srcpkgs/chromium/patches/upstream-AXObject-stl-iterator.patch deleted file mode 100644 index f0eef29d33b..00000000000 --- a/srcpkgs/chromium/patches/upstream-AXObject-stl-iterator.patch +++ /dev/null @@ -1,36 +0,0 @@ -From f3dfe39f9fd3091cf1a7146b936d9de77a459435 Mon Sep 17 00:00:00 2001 -From: Piotr Tworek -Date: Mon, 18 May 2020 15:24:35 +0000 -Subject: [PATCH] Make blink::AXObject::AncestorsIterator STL compatible. - -Commit 31e5188ffc9a04295997d22bfdb68fc367bef047, "Used some methods from -AXRoleProperties in AXObject" started using std::any_of with this custom -iterator type. Unfortunately this iterator does not provide traits -mandated by the standard. This works fine for libcxx, but fails when -compiling the code against libstdc++. - -Bug: 819294 -Change-Id: I78fe25475593d73ce255f1de955aa41e936dff86 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2207112 -Reviewed-by: Kentaro Hara -Commit-Queue: Piotr Tworek -Cr-Commit-Position: refs/heads/master@{#769713} ---- - -diff --git a/third_party/blink/renderer/modules/accessibility/ax_object.h b/third_party/blink/renderer/modules/accessibility/ax_object.h -index 841715b..fbb87bf 100644 ---- third_party/blink/renderer/modules/accessibility/ax_object.h -+++ third_party/blink/renderer/modules/accessibility/ax_object.h -@@ -274,6 +274,12 @@ - class MODULES_EXPORT AncestorsIterator final - : public GarbageCollected { - public: -+ using iterator_category = std::forward_iterator_tag; -+ using value_type = AXObject; -+ using difference_type = ptrdiff_t; -+ using pointer = value_type*; -+ using reference = value_type&; -+ - ~AncestorsIterator() = default; - - AncestorsIterator(const AncestorsIterator& other) diff --git a/srcpkgs/chromium/patches/upstream-ListContainerHelper-include-cstring.patch b/srcpkgs/chromium/patches/upstream-ListContainerHelper-include-cstring.patch deleted file mode 100644 index 8d605b38d3e..00000000000 --- a/srcpkgs/chromium/patches/upstream-ListContainerHelper-include-cstring.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 408bded3befc625e16ef18f2ff5467e040b203e7 Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa -Date: Wed, 27 May 2020 16:34:56 +0000 -Subject: [PATCH] ListContainerHelper: Include for memcpy() - -IWYU. This fixes the libstdc++ build after commit 41989bd89 ("Remove/replace -unnecessary logging.h includes in .cc files (cc)"). - -Bug: 957519 -Change-Id: I1e782e8310ca548947b2d541af6a2159d928d1f3 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2218090 -Reviewed-by: vmpstr -Commit-Queue: vmpstr -Commit-Queue: Raphael Kubo da Costa -Auto-Submit: Raphael Kubo da Costa -Cr-Commit-Position: refs/heads/master@{#772267} ---- - -diff --git a/cc/base/list_container_helper.cc b/cc/base/list_container_helper.cc -index afd386e..7b594b4 100644 ---- cc/base/list_container_helper.cc -+++ cc/base/list_container_helper.cc -@@ -7,6 +7,7 @@ - #include - - #include -+#include - #include - - #include "base/check_op.h" diff --git a/srcpkgs/chromium/patches/upstream-NearbyShareEncryptedMetadataKey-include.patch b/srcpkgs/chromium/patches/upstream-NearbyShareEncryptedMetadataKey-include.patch new file mode 100644 index 00000000000..f706f3c6b1e --- /dev/null +++ b/srcpkgs/chromium/patches/upstream-NearbyShareEncryptedMetadataKey-include.patch @@ -0,0 +1,25 @@ +From ad1493ec8f5287c5cd10dcb50b741359f7858349 Mon Sep 17 00:00:00 2001 +From: Jose Dapena Paz +Date: Tue, 07 Jul 2020 14:43:40 +0000 +Subject: [PATCH] IWYU: int8_t used in nearby share encrypted metadata key requires cstdint + +Bug: 819294 +Change-Id: I90f88cf35e85a8a0ab1811e5533347d329365b21 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2283508 +Reviewed-by: Alex Chau +Commit-Queue: José Dapena Paz +Cr-Commit-Position: refs/heads/master@{#785727} +--- + +diff --git a/chrome/browser/nearby_sharing/certificates/nearby_share_encrypted_metadata_key.h b/chrome/browser/nearby_sharing/certificates/nearby_share_encrypted_metadata_key.h +index 2893bde..8e1758f 100644 +--- chrome/browser/nearby_sharing/certificates/nearby_share_encrypted_metadata_key.h ++++ chrome/browser/nearby_sharing/certificates/nearby_share_encrypted_metadata_key.h +@@ -5,6 +5,7 @@ + #ifndef CHROME_BROWSER_NEARBY_SHARING_CERTIFICATES_NEARBY_SHARE_ENCRYPTED_METADATA_KEY_H_ + #define CHROME_BROWSER_NEARBY_SHARING_CERTIFICATES_NEARBY_SHARE_ENCRYPTED_METADATA_KEY_H_ + ++#include + #include + + // Holds the encrypted symmetric key--the key used to encrypt user/device diff --git a/srcpkgs/chromium/patches/upstream-avoid-calling-DeleteForCurrentDocument-from-destructor.patch b/srcpkgs/chromium/patches/upstream-avoid-calling-DeleteForCurrentDocument-from-destructor.patch deleted file mode 100644 index 812c9c163b0..00000000000 --- a/srcpkgs/chromium/patches/upstream-avoid-calling-DeleteForCurrentDocument-from-destructor.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 128869693a2519578896b41765df029d7adc4ae0 Mon Sep 17 00:00:00 2001 -From: Yuzu Saijo -Date: Tue, 2 Jun 2020 04:51:11 +0000 -Subject: [PATCH] [content] Avoid calling DeleteForCurrentDocument from - destructor - -This CL removes the call to DeleteForCurrentDocument from the destructor -of ManifestManagerHost. - -This intends to fix a crash which happens from time to time using -RenderDocumentHostUserData. - -Change-Id: I1336fb62328dcb0cf9991499f399bf3665d29b75 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2224737 -Reviewed-by: Rakina Zata Amni -Reviewed-by: Alexander Timin -Reviewed-by: Sreeja Kamishetty -Reviewed-by: Kinuko Yasuda -Commit-Queue: Yuzu Saijo -Cr-Commit-Position: refs/heads/master@{#774006} ---- - content/browser/manifest/manifest_manager_host.cc | 7 +++++-- - content/browser/manifest/manifest_manager_host.h | 2 ++ - 2 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/content/browser/manifest/manifest_manager_host.cc b/content/browser/manifest/manifest_manager_host.cc -index 3a2efba889a..1bd88d91edc 100644 ---- content/browser/manifest/manifest_manager_host.cc -+++ content/browser/manifest/manifest_manager_host.cc -@@ -22,7 +22,7 @@ ManifestManagerHost::ManifestManagerHost(RenderFrameHost* render_frame_host) - } - - ManifestManagerHost::~ManifestManagerHost() { -- OnConnectionError(); -+ DispatchPendingCallbacks(); - } - - void ManifestManagerHost::BindObserver( -@@ -55,7 +55,7 @@ blink::mojom::ManifestManager& ManifestManagerHost::GetManifestManager() { - return *manifest_manager_; - } - --void ManifestManagerHost::OnConnectionError() { -+void ManifestManagerHost::DispatchPendingCallbacks() { - std::vector callbacks; - for (CallbackMap::iterator it(&callbacks_); !it.IsAtEnd(); it.Advance()) { - callbacks.push_back(std::move(*it.GetCurrentValue())); -@@ -63,7 +63,10 @@ void ManifestManagerHost::OnConnectionError() { - callbacks_.Clear(); - for (auto& callback : callbacks) - std::move(callback).Run(GURL(), blink::Manifest()); -+} - -+void ManifestManagerHost::OnConnectionError() { -+ DispatchPendingCallbacks(); - if (GetForCurrentDocument(manifest_manager_frame_)) { - DeleteForCurrentDocument(manifest_manager_frame_); - } -diff --git a/content/browser/manifest/manifest_manager_host.h b/content/browser/manifest/manifest_manager_host.h -index 96951ae30bc..f706c20bdb8 100644 ---- content/browser/manifest/manifest_manager_host.h -+++ content/browser/manifest/manifest_manager_host.h -@@ -55,6 +55,8 @@ class ManifestManagerHost - using CallbackMap = base::IDMap>; - - blink::mojom::ManifestManager& GetManifestManager(); -+ -+ void DispatchPendingCallbacks(); - void OnConnectionError(); - - void OnRequestManifestResponse(int request_id, diff --git a/srcpkgs/chromium/patches/upstream-force-mp3-files-to-have-a-start-time-of-zero.patch b/srcpkgs/chromium/patches/upstream-force-mp3-files-to-have-a-start-time-of-zero.patch deleted file mode 100644 index 7fc433fab8f..00000000000 --- a/srcpkgs/chromium/patches/upstream-force-mp3-files-to-have-a-start-time-of-zero.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 192fc3899f76e9487d77895f31df8d2d13bf9619 Mon Sep 17 00:00:00 2001 -From: Dale Curtis -Date: Fri, 26 Jun 2020 01:10:55 +0000 -Subject: [PATCH] Force mp3 files to have a start time of zero. - -This will allow us to remove our custom patch which breaks upstream -ffmpeg functionality for unknown reasons. - -R=sandersd - -Fixed: 1062037 -Change-Id: I253011843dee4dd6a8c958b14990ad836a9f1dca -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2268221 -Auto-Submit: Dale Curtis -Reviewed-by: Dan Sanders -Commit-Queue: Dale Curtis -Cr-Commit-Position: refs/heads/master@{#782792} ---- - media/filters/ffmpeg_demuxer.cc | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc -index 01266e1a072..a7ed542b5fc 100644 ---- media/filters/ffmpeg_demuxer.cc -+++ media/filters/ffmpeg_demuxer.cc -@@ -1522,6 +1522,12 @@ void FFmpegDemuxer::OnFindStreamInfoDone(int result) { - if (glue_->container() == container_names::CONTAINER_AVI) - format_context->flags |= AVFMT_FLAG_GENPTS; - -+ // FFmpeg will incorrectly adjust the start time of MP3 files into the future -+ // based on discard samples. We were unable to fix this upstream without -+ // breaking ffmpeg functionality. https://crbug.com/1062037 -+ if (glue_->container() == container_names::CONTAINER_MP3) -+ start_time_ = base::TimeDelta(); -+ - // For testing purposes, don't overwrite the timeline offset if set already. - if (timeline_offset_.is_null()) { - timeline_offset_ = diff --git a/srcpkgs/chromium/patches/upstream-remove-NotifyError-calls-and-just-send-a-normal-message.patch b/srcpkgs/chromium/patches/upstream-remove-NotifyError-calls-and-just-send-a-normal-message.patch deleted file mode 100644 index c9d259b0074..00000000000 --- a/srcpkgs/chromium/patches/upstream-remove-NotifyError-calls-and-just-send-a-normal-message.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 3bfec15358b788a2b7e1beefaa177ba84a6da328 Mon Sep 17 00:00:00 2001 -From: Ted Meyer -Date: Mon, 1 Jun 2020 19:31:18 +0000 -Subject: [PATCH] Remove NotifyError calls and just send a normal message - instead - -rewrote the TODO as well. - -Bug: 1088055 -Change-Id: If83ceeb3a786a1813e41bd3ac6c7309791e92400 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2223010 -Auto-Submit: Ted Meyer -Commit-Queue: Dale Curtis -Reviewed-by: Dale Curtis -Cr-Commit-Position: refs/heads/master@{#773776} ---- - media/filters/decoder_selector.cc | 12 +++++------- - 1 file changed, 5 insertions(+), 7 deletions(-) - -diff --git a/media/filters/decoder_selector.cc b/media/filters/decoder_selector.cc -index bb06378b92d..9f510bb578c 100644 ---- media/filters/decoder_selector.cc -+++ media/filters/decoder_selector.cc -@@ -165,13 +165,11 @@ void DecoderSelector::OnDecoderInitializeDone(Status status) { - DCHECK(task_runner_->BelongsToCurrentThread()); - - if (!status.is_ok()) { -- // TODO(tmathmeyer) this might be noisy in media log. Consider batching -- // all failures as causes to a single Status object and only surfacing it if -- // decoder selection fails entirely. -- media_log_->NotifyError( -- Status(StatusCode::kDecoderFailedInitialization) -- .WithData("Decoder name", decoder_->GetDisplayName()) -- .AddCause(std::move(status))); -+ // TODO(tmathmeyer) this was too noisy in media log. Batch all the logs -+ // together and then send them as an informational notice instead of -+ // using NotifyError. -+ MEDIA_LOG(INFO, media_log_) -+ << "Failed to initialize " << decoder_->GetDisplayName(); - - // Try the next decoder on the list. - decoder_.reset(); diff --git a/srcpkgs/chromium/patches/upstream-sim_hash-include.patch b/srcpkgs/chromium/patches/upstream-sim_hash-include.patch new file mode 100644 index 00000000000..277a2020a38 --- /dev/null +++ b/srcpkgs/chromium/patches/upstream-sim_hash-include.patch @@ -0,0 +1,25 @@ +From c0934033a97b61f3177238ff9f842c5a0f5d8faa Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Sun, 28 Jun 2020 18:48:11 +0000 +Subject: [PATCH] IWYU: add includes for uint64_t and std::string + +--- + components/federated_learning/sim_hash.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/components/federated_learning/sim_hash.h b/components/federated_learning/sim_hash.h +index 55030d9..a51dd64 100644 +--- components/federated_learning/sim_hash.h ++++ components/federated_learning/sim_hash.h +@@ -5,6 +5,8 @@ + #ifndef COMPONENTS_FEDERATED_LEARNING_SIM_HASH_H_ + #define COMPONENTS_FEDERATED_LEARNING_SIM_HASH_H_ + ++#include ++#include + #include + #include + +-- +2.26.2 + diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch index 01a695ad658..e89a61251e4 100644 --- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch +++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch @@ -1789,16 +1789,16 @@ diff --git third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc index 43c86314..27325b81 100644 --- third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc +++ third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc -@@ -57,8 +57,9 @@ TEST(PageAllocatorTest, LargeObject) { +@@ -57,8 +57,9 @@ EXPECT_EQ(0U, allocator.pages_allocated()); - uint8_t *p = reinterpret_cast(allocator.Alloc(10000)); + uint8_t* p = reinterpret_cast(allocator.Alloc(10000)); + uint64_t expected_pages = 1 + ((10000 - 1) / getpagesize()); ASSERT_FALSE(p == NULL); - EXPECT_EQ(3U, allocator.pages_allocated()); + EXPECT_EQ(expected_pages, allocator.pages_allocated()); for (unsigned i = 1; i < 10; ++i) { - uint8_t *p = reinterpret_cast(allocator.Alloc(i)); + uint8_t* p = reinterpret_cast(allocator.Alloc(i)); ASSERT_FALSE(p == NULL); diff --git third_party/breakpad/breakpad/src/processor/exploitability_linux.cc third_party/breakpad/breakpad/src/processor/exploitability_linux.cc index ccc9f145..debaed4d 100644 diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index f3b057128b3..eafa0f1ca8c 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -1,7 +1,7 @@ # Template file for 'chromium' pkgname=chromium # See http://www.chromium.org/developers/calendar for the latest version -version=84.0.4147.125 +version=85.0.4183.83 revision=1 archs="i686* x86_64* aarch64* armv7l* ppc64le*" short_desc="Google's attempt at creating a safer, faster, and more stable browser" @@ -9,7 +9,7 @@ maintainer="Enno Boland " license="BSD-3-Clause" homepage="https://www.chromium.org/" distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz" -checksum=98439626cf2d8d3d8f9486d08a99cbc1e4981b3f3427a072d5eaaf6ded4daff5 +checksum=2064aa4502b87c025f2233b59d94e9e3d1c00bfeaf891e1d973687de5740e73b nocross=yes lib32disabled=yes @@ -34,7 +34,7 @@ makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel libjpeg-turbo-devel libevent-devel json-c-devel harfbuzz-devel minizip-devel jsoncpp-devel zlib-devel libcap-devel libXdamage-devel re2-devel fontconfig-devel freetype-devel opus-devel - ffmpeg-devel libvpx-devel libva-devel python-setuptools xcb-proto + ffmpeg-devel libva-devel python-setuptools xcb-proto $(vopt_if sndio sndio-devel)" depends="libexif hwids desktop-file-utils hicolor-icon-theme xdg-utils" @@ -72,9 +72,6 @@ post_patch() { sed -i '/config("compiler")/ a cflags_cc = [ "-fno-delete-null-pointer-checks" ]' \ build/config/linux/BUILD.gn fi - - # Make xcbgen available to ui/gfx/x/gen_xproto.py running under Python 2 - ln -s /usr/lib/python3.*/site-packages/xcbgen "${wrksrc}" } do_configure() { local system="" conf=() @@ -106,7 +103,6 @@ do_configure() { libevent libjpeg libpng - libvpx libwebp libxml libxslt @@ -241,8 +237,6 @@ do_configure() { out/Release/gn gen out/Release --args="${conf[*]}" } do_build() { - export PYTHONPATH=${wrksrc} - if [ "$build_option_clang" ]; then export CC=clang export CXX=clang++ From 685b55fbedb0eed34ec7d9ebe4edb0562ae8a974 Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Sun, 30 Aug 2020 23:40:31 -0400 Subject: [PATCH 2/2] chromium-widevine: update to 85.0.4183.83. [ci skip] --- srcpkgs/chromium-widevine/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/chromium-widevine/template b/srcpkgs/chromium-widevine/template index 230c5aa4392..49be364d47c 100644 --- a/srcpkgs/chromium-widevine/template +++ b/srcpkgs/chromium-widevine/template @@ -6,7 +6,7 @@ _chromeVersion="current" _channel="stable" pkgname=chromium-widevine -version=84.0.4147.125 +version=85.0.4183.83 revision=1 archs="x86_64" create_wrksrc=yes @@ -17,7 +17,7 @@ depends="chromium binutils xz" homepage="https://www.google.com/chrome" repository=nonfree distfiles="https://dl.google.com/linux/direct/google-chrome-${_channel}_${_chromeVersion}_amd64.deb" -checksum=1cb13f135c51a155dd86846457254ebea986a2b34e87b8236cc14df2e74e76b9 +checksum=2f60812b021f1a3f9551544b25ae76442433a0e56b622101e120e36d85a24339 do_extract() { :