From 378db3cf5087877588aebaaa8ca3c9d94dfb54e0 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 27 Apr 2022 20:18:58 +0200 Subject: [PATCH] chromium: update to 101.0.4951.41. Co-Authored-By: q66 Closes https://github.com/void-linux/void-packages/pull/36887 --- ...romium-100-SCTHashdanceMetadata-move.patch | 35 ------------- .../patches/chromium-libxml-unbundle.patch | 10 ++++ .../fix-missing-cstdint-include-musl.patch | 10 ++++ ...ebcodecs-stop-using-AudioOpusEncoder.patch | 49 ------------------- .../patches/xxx-ppc64le-support.patch | 6 +-- srcpkgs/chromium/template | 4 +- 6 files changed, 25 insertions(+), 89 deletions(-) delete mode 100644 srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch create mode 100644 srcpkgs/chromium/patches/chromium-libxml-unbundle.patch create mode 100644 srcpkgs/chromium/patches/fix-missing-cstdint-include-musl.patch delete mode 100644 srcpkgs/chromium/patches/webcodecs-stop-using-AudioOpusEncoder.patch diff --git a/srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch b/srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch deleted file mode 100644 index 903942906c7..00000000000 --- a/srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 364dc0067d1c20c7a2d21277a7ec0c4419d9bc11 Mon Sep 17 00:00:00 2001 -From: Jose Dapena Paz -Date: Wed, 23 Feb 2022 12:18:57 +0100 -Subject: [PATCH] GCC: explicitely move return value of SCTHashdanceMetadata::ToValue - -GCC rejects to do Return Value Optimization in -SCTHashdanceMetadata::ToValue, because the copy constructor is -deleted, and in that scenario RVO is rejected in GCC: - ../../services/network/sct_auditing/sct_auditing_reporter.cc: In member function ‘base::Value network::SCTAuditingReporter::SCTHashdanceMetadata::ToValue() const’: - ../../services/network/sct_auditing/sct_auditing_reporter.cc:191:10: error: use of deleted function ‘base::Value::Value(const base::Value&)’ - 191 | return value; - | ^~~~~ - In file included from ../../services/network/sct_auditing/sct_auditing_reporter.h:14, - from ../../services/network/sct_auditing/sct_auditing_reporter.cc:5: - ../../base/values.h:254:3: note: declared here - 254 | Value(const Value&) = delete; - | ^~~~~ - -Bug: 819294 -Change-Id: I111e51dd10eee7b909d4ac3c0911aac18a589166 ---- - -diff --git a/services/network/sct_auditing/sct_auditing_reporter.cc b/services/network/sct_auditing/sct_auditing_reporter.cc -index a057e8e..365527b 100644 ---- a/services/network/sct_auditing/sct_auditing_reporter.cc -+++ b/services/network/sct_auditing/sct_auditing_reporter.cc -@@ -188,7 +188,7 @@ - kLogIdKey, base::Base64Encode(base::as_bytes(base::make_span(log_id)))); - value.SetKey(kLogMMDKey, base::TimeDeltaToValue(log_mmd)); - value.SetKey(kCertificateExpiry, base::TimeToValue(certificate_expiry)); -- return value; -+ return std::move(value); - } - - // static diff --git a/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch b/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch new file mode 100644 index 00000000000..5699bc8f8ea --- /dev/null +++ b/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch @@ -0,0 +1,10 @@ +--- a/build/linux/unbundle/libxml.gn ++++ b/build/linux/unbundle/libxml.gn +@@ -19,6 +19,7 @@ static_library("libxml_utils") { + ":xml_reader", + ":xml_writer", + "//base/test:test_support", ++ "//services/data_decoder:lib", + "//services/data_decoder:xml_parser_fuzzer_deps", + ] + sources = [ diff --git a/srcpkgs/chromium/patches/fix-missing-cstdint-include-musl.patch b/srcpkgs/chromium/patches/fix-missing-cstdint-include-musl.patch new file mode 100644 index 00000000000..baa48c8f2a7 --- /dev/null +++ b/srcpkgs/chromium/patches/fix-missing-cstdint-include-musl.patch @@ -0,0 +1,10 @@ +--- a/net/third_party/quiche/src/http2/adapter/window_manager.h ++++ b/net/third_party/quiche/src/http2/adapter/window_manager.h +@@ -3,6 +3,7 @@ + + #include + ++#include + #include + + #include "common/platform/api/quiche_export.h" diff --git a/srcpkgs/chromium/patches/webcodecs-stop-using-AudioOpusEncoder.patch b/srcpkgs/chromium/patches/webcodecs-stop-using-AudioOpusEncoder.patch deleted file mode 100644 index 32957d32fa3..00000000000 --- a/srcpkgs/chromium/patches/webcodecs-stop-using-AudioOpusEncoder.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 3bd46cb9a51773f103ef52b39d6407740eb0d60a Mon Sep 17 00:00:00 2001 -From: Eugene Zemtsov -Date: Thu, 24 Feb 2022 23:17:20 +0000 -Subject: [PATCH] webcodecs: Stop using AudioOpusEncoder as backed for mojo - audio encoder - -AudioOpusEncoder was only used here for testing. Let's not let it get -comfortable. We'll use MF AAC encoder here when we have it. (Soon...) - -Bug: 1259883 -Change-Id: Ia1819395c8c8fd6d403d4b8558c12f9a1bf7e761 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3489449 -Commit-Queue: Eugene Zemtsov -Auto-Submit: Eugene Zemtsov -Reviewed-by: Dale Curtis -Commit-Queue: Dale Curtis -Cr-Commit-Position: refs/heads/main@{#974895} ---- - media/mojo/services/gpu_mojo_media_client.cc | 10 +--------- - 1 file changed, 1 insertion(+), 9 deletions(-) - -diff --git a/media/mojo/services/gpu_mojo_media_client.cc b/media/mojo/services/gpu_mojo_media_client.cc -index 8f83a4d6cf6..40cdaff8d3a 100644 ---- a/media/mojo/services/gpu_mojo_media_client.cc -+++ b/media/mojo/services/gpu_mojo_media_client.cc -@@ -13,7 +13,6 @@ - #include "build/chromeos_buildflags.h" - #include "gpu/ipc/service/gpu_channel.h" - #include "media/audio/audio_features.h" --#include "media/audio/audio_opus_encoder.h" - #include "media/base/audio_decoder.h" - #include "media/base/cdm_factory.h" - #include "media/base/media_switches.h" -@@ -119,14 +118,7 @@ std::unique_ptr GpuMojoMediaClient::CreateAudioEncoder( - scoped_refptr task_runner) { - if (!base::FeatureList::IsEnabled(features::kPlatformAudioEncoder)) - return nullptr; -- // TODO(crbug.com/1259883) Right now Opus encoder is all we have, later on -- // we'll create a real platform encoder here. -- auto opus_encoder = std::make_unique(); -- auto encoding_runner = base::ThreadPool::CreateSequencedTaskRunner( -- {base::TaskPriority::USER_BLOCKING}); -- return std::make_unique(std::move(opus_encoder), -- std::move(encoding_runner), -- std::move(task_runner)); -+ return nullptr; - } - - VideoDecoderType GpuMojoMediaClient::GetDecoderImplementationType() { diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch index 0be29c1a4ee..79a1e2a1756 100644 --- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch +++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch @@ -2248,12 +2248,12 @@ index 7a1b2763c..beda8da9e 100644 --- a/third_party/crashpad/crashpad/snapshot/capture_memory.cc +++ b/third_party/crashpad/crashpad/snapshot/capture_memory.cc @@ -112,6 +112,11 @@ void CaptureMemory::PointedToByContext(const CPUContext& context, - for (size_t i = 0; i < base::size(context.mipsel->regs); ++i) { + for (size_t i = 0; i < std::size(context.mipsel->regs); ++i) { MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]); } +#elif defined(ARCH_CPU_PPC64_FAMILY) + MaybeCaptureMemoryAround(delegate, context.ppc64->nip); -+ for (size_t i = 0; i < base::size(context.ppc64->regs); ++i) { ++ for (size_t i = 0; i < std::size(context.ppc64->regs); ++i) { + MaybeCaptureMemoryAround(delegate, context.ppc64->regs[i]); + } #else @@ -3527,7 +3527,7 @@ index ec3e56964..4cf8999a2 100644 - return buffer.str(); + + std::string ret(buffer.str()); -+ if (signbit(value) && ret[0] == '.') { ++ if (std::signbit(value) && ret[0] == '.') { + ret[0] = '-'; + } + return ret; diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index f655d29f3ba..0dce8772fdb 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -1,7 +1,7 @@ # Template file for 'chromium' pkgname=chromium # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version -version=100.0.4896.127 +version=101.0.4951.41 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="Duncaen " license="BSD-3-Clause" homepage="https://www.chromium.org/" distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz" -checksum=4710e3453c972c91e68a21f6b0b76ba73d4d617f299a5208615ed6e41b1af84d +checksum=099863882e88b9a035fcb6b63dd5288554f6b27558e0ebce93e0d804465efa37 lib32disabled=yes