diff options
Diffstat (limited to 'chromium')
-rw-r--r-- | chromium/chromium/chromium-base-v8-utility.patch | 11 | ||||
-rw-r--r-- | chromium/chromium/chromium-gcc-11-r962407.patch | 45 | ||||
-rw-r--r-- | chromium/chromium/chromium-gcc-11-r963119.patch | 65 | ||||
-rw-r--r-- | chromium/chromium/chromium-gcc-11-r972974.patch | 34 | ||||
-rw-r--r-- | chromium/chromium/chromium-gcc-11-r975992.patch | 100 | ||||
-rw-r--r-- | chromium/chromium/chromium-gcc-11-r976299.patch | 48 | ||||
-rw-r--r-- | chromium/chromium/chromium.spec | 12 |
7 files changed, 189 insertions, 126 deletions
diff --git a/chromium/chromium/chromium-base-v8-utility.patch b/chromium/chromium/chromium-base-v8-utility.patch index 1f6c7e8..0bcd6c0 100644 --- a/chromium/chromium/chromium-base-v8-utility.patch +++ b/chromium/chromium/chromium-base-v8-utility.patch @@ -10,14 +10,3 @@ diff -up chromium-98.0.4758.102/base/third_party/symbolize/symbolize.h.missing-u #ifdef HAVE_SYMBOLIZE #include <algorithm> -diff -up chromium-98.0.4758.102/v8/src/heap/cppgc/prefinalizer-handler.h.missing-utility-for-std-exchange chromium-98.0.4758.102/v8/src/heap/cppgc/prefinalizer-handler.h ---- chromium-98.0.4758.102/v8/src/heap/cppgc/prefinalizer-handler.h.missing-utility-for-std-exchange 2022-02-27 20:08:40.027930037 +0000 -+++ chromium-98.0.4758.102/v8/src/heap/cppgc/prefinalizer-handler.h 2022-02-27 20:08:52.945490126 +0000 -@@ -5,6 +5,7 @@ - #ifndef V8_HEAP_CPPGC_PREFINALIZER_HANDLER_H_ - #define V8_HEAP_CPPGC_PREFINALIZER_HANDLER_H_ - -+#include <utility> - #include <vector> - - #include "include/cppgc/prefinalizer.h" diff --git a/chromium/chromium/chromium-gcc-11-r962407.patch b/chromium/chromium/chromium-gcc-11-r962407.patch deleted file mode 100644 index b8ccec0..0000000 --- a/chromium/chromium/chromium-gcc-11-r962407.patch +++ /dev/null @@ -1,45 +0,0 @@ -From c1414b910b1f36de06a5f3a73095d05f2a62ad60 Mon Sep 17 00:00:00 2001 -From: Jose Dapena Paz <jdapena@igalia.com> -Date: Mon, 24 Jan 2022 09:38:04 +0000 -Subject: [PATCH] GCC: use braces initialization for NoDestructor in - AutofillAssistantModelExecutor -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fix build with GCC failing to resolve initialization of NoDestructor -with initializer list. - -Bug: 819294 -Change-Id: I5fe8d30b4aefdddd71ff7b220eeffcd838308f5a -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3403712 -Reviewed-by: Sandro Maggi <sandromaggi@google.com> -Commit-Queue: José Dapena Paz <jdapena@igalia.com> -Cr-Commit-Position: refs/heads/main@{#962407} ---- - .../content/renderer/autofill_assistant_model_executor.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/components/autofill_assistant/content/renderer/autofill_assistant_model_executor.cc b/components/autofill_assistant/content/renderer/autofill_assistant_model_executor.cc -index 033205bc22106..670376eb91046 100644 ---- a/components/autofill_assistant/content/renderer/autofill_assistant_model_executor.cc -+++ b/components/autofill_assistant/content/renderer/autofill_assistant_model_executor.cc -@@ -156,13 +156,13 @@ bool AutofillAssistantModelExecutor::Preprocess( - // TODO(b/204841212): Implement this with use of ModelMetadata. - absl::optional<std::string> AutofillAssistantModelExecutor::Postprocess( - const std::vector<const TfLiteTensor*>& output_tensors) { -- static const base::NoDestructor<std::vector<std::string>> output_roles( -+ static const base::NoDestructor<std::vector<std::string>> output_roles{ - {"UNKNOWN_ROLE", "NAME_FIRST", "NAME_LAST", "NAME_FULL", "ADDRESS_LINE1", - "ADDRESS_LINE2", "CITY", "STATE", "COUNTRY", "POSTAL_CODE", - "CREDIT_CARD_NUMBER", "CREDIT_CARD_EXP_MONTH", - "CREDIT_CARD_VERIFICATION_CODE", "ORGANIZATION", - "CREDIT_CARD_EXPIRATION", "PHONE_NUMBER", "USERNAME_OR_EMAIL", -- "CREDIT_CARD_EXP_YEAR"}); -+ "CREDIT_CARD_EXP_YEAR"}}; - - DCHECK_GE(output_tensors.size(), 1u); - std::vector<float> data; --- -2.35.1 - diff --git a/chromium/chromium/chromium-gcc-11-r963119.patch b/chromium/chromium/chromium-gcc-11-r963119.patch deleted file mode 100644 index f4f4c1b..0000000 --- a/chromium/chromium/chromium-gcc-11-r963119.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 5b287e0be8d8d8475ec6ef81b16eaa61e19db078 Mon Sep 17 00:00:00 2001 -From: "Steinar H. Gunderson" <sesse@chromium.org> -Date: Tue, 25 Jan 2022 19:14:53 +0000 -Subject: [PATCH] Fix build break with system libdrm. - -This patch is submitted on behalf of Andres Salomon -<dilinger@queued.net> (on Cc). Also adding him to src/AUTHORS -per policy, as he has signed the CLA. - -Original patch: -https://salsa.debian.org/dilinger/chromium/-/commit/2333c2fb985ac1ef3d7331776a7833d965c63302 - -Change-Id: I18bd60e2e80f2b9181e74ee7972c3f457ab33b10 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3401704 -Reviewed-by: Andres Calderon Jaramillo <andrescj@chromium.org> -Commit-Queue: Steinar H Gunderson <sesse@chromium.org> -Auto-Submit: Steinar H Gunderson <sesse@chromium.org> -Cr-Commit-Position: refs/heads/main@{#963119} ---- - AUTHORS | 1 + - media/gpu/chromeos/BUILD.gn | 1 + - media/gpu/chromeos/video_decoder_pipeline.cc | 2 +- - 3 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/AUTHORS b/AUTHORS -index 0eba3de50659c..50edd3f6b385c 100644 ---- a/AUTHORS -+++ b/AUTHORS -@@ -93,6 +93,7 @@ Andreas Papacharalampous <andreas@apap04.com> - Andrei Borza <andrei.borza@gmail.com> - Andrei Parvu <andrei.prv@gmail.com> - Andrei Parvu <parvu@adobe.com> -+Andres Salomon <dilinger@queued.net> - Andreu Botella <andreu@andreubotella.com> - Andrew Boyarshin <andrew.boyarshin@gmail.com> - Andrew Brampton <me@bramp.net> -diff --git a/media/gpu/chromeos/BUILD.gn b/media/gpu/chromeos/BUILD.gn -index 7cb4c3ea39a16..6fe21c15ecc1b 100644 ---- a/media/gpu/chromeos/BUILD.gn -+++ b/media/gpu/chromeos/BUILD.gn -@@ -25,6 +25,7 @@ source_set("chromeos") { - - deps = [ - "//base", -+ "//build/config/linux/libdrm", - "//media", - "//media/gpu:buildflags", - "//media/gpu:command_buffer_helper", -diff --git a/media/gpu/chromeos/video_decoder_pipeline.cc b/media/gpu/chromeos/video_decoder_pipeline.cc -index d2f154ea0d87c..416b9434a8d70 100644 ---- a/media/gpu/chromeos/video_decoder_pipeline.cc -+++ b/media/gpu/chromeos/video_decoder_pipeline.cc -@@ -28,8 +28,8 @@ - #include "third_party/abseil-cpp/absl/types/optional.h" - - #if BUILDFLAG(USE_VAAPI) -+#include <drm_fourcc.h> - #include "media/gpu/vaapi/vaapi_video_decoder.h" --#include "third_party/libdrm/src/include/drm/drm_fourcc.h" - #elif BUILDFLAG(USE_V4L2_CODEC) - #include "media/gpu/v4l2/v4l2_video_decoder.h" - #else --- -2.34.1 - diff --git a/chromium/chromium/chromium-gcc-11-r972974.patch b/chromium/chromium/chromium-gcc-11-r972974.patch new file mode 100644 index 0000000..bbe7385 --- /dev/null +++ b/chromium/chromium/chromium-gcc-11-r972974.patch @@ -0,0 +1,34 @@ +From 1183b14db8bd08d731ff3433c436887de00be3aa Mon Sep 17 00:00:00 2001 +From: Jose Dapena Paz <jdapena@igalia.com> +Date: Fri, 18 Feb 2022 16:28:25 +0000 +Subject: [PATCH] Fix typo in non-clang GSL_OWNER macro + +GCC build fails because GSL_OWNER is not defined (GSL_OWNER_ was +the one actually declared). + +Bug: 819294 +Change-Id: I1c3d17cb1c08b9bc0e8a888452da9868c308ddb5 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3472080 +Reviewed-by: Daniel Cheng <dcheng@chromium.org> +Commit-Queue: Daniel Cheng <dcheng@chromium.org> +Cr-Commit-Position: refs/heads/main@{#972974} +--- + base/compiler_specific.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/base/compiler_specific.h b/base/compiler_specific.h +index eec581050d8a5..1ee80743e2f48 100644 +--- a/base/compiler_specific.h ++++ b/base/compiler_specific.h +@@ -386,7 +386,7 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) { + #define GSL_OWNER [[gsl::Owner]] + #define GSL_POINTER [[gsl::Pointer]] + #else +-#define GSL_OWNER_ ++#define GSL_OWNER + #define GSL_POINTER + #endif + +-- +2.35.1 + diff --git a/chromium/chromium/chromium-gcc-11-r975992.patch b/chromium/chromium/chromium-gcc-11-r975992.patch new file mode 100644 index 0000000..d10353e --- /dev/null +++ b/chromium/chromium/chromium-gcc-11-r975992.patch @@ -0,0 +1,100 @@ +From b4b867fb95e4f185d388b242876ca3dd365e16ac Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann <stha09@googlemail.com> +Date: Mon, 28 Feb 2022 23:11:04 +0000 +Subject: [PATCH] GCC: make GLImplementationParts constructors constexpr + +Fix build error in GCC, as the constexpr operator== requires its +invocations to be also constexpr. + +Bug: 819294 +Change-Id: I5397a6de278f6e0c4192e9cff49d172a752a4850 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3473377 +Commit-Queue: Stephan Hartmann <stha09@googlemail.com> +Reviewed-by: Sunny Sachanandani <sunnyps@chromium.org> +Commit-Queue: Sunny Sachanandani <sunnyps@chromium.org> +Cr-Commit-Position: refs/heads/main@{#975992} +--- + ui/gl/gl_implementation.cc | 23 ----------------------- + ui/gl/gl_implementation.h | 25 +++++++++++++++++++++++-- + 2 files changed, 23 insertions(+), 25 deletions(-) + +diff --git a/ui/gl/gl_implementation.cc b/ui/gl/gl_implementation.cc +index 1d6c410316e75..2a752bff6ceaa 100644 +--- a/ui/gl/gl_implementation.cc ++++ b/ui/gl/gl_implementation.cc +@@ -26,29 +26,6 @@ + + namespace gl { + +-ANGLEImplementation MakeANGLEImplementation( +- const GLImplementation gl_impl, +- const ANGLEImplementation angle_impl) { +- if (gl_impl == kGLImplementationEGLANGLE) { +- if (angle_impl == ANGLEImplementation::kNone) { +- return ANGLEImplementation::kDefault; +- } else { +- return angle_impl; +- } +- } else { +- return ANGLEImplementation::kNone; +- } +-} +- +-GLImplementationParts::GLImplementationParts( +- const ANGLEImplementation angle_impl) +- : gl(kGLImplementationEGLANGLE), +- angle(MakeANGLEImplementation(kGLImplementationEGLANGLE, angle_impl)) {} +- +-GLImplementationParts::GLImplementationParts(const GLImplementation gl_impl) +- : gl(gl_impl), +- angle(MakeANGLEImplementation(gl_impl, ANGLEImplementation::kDefault)) {} +- + bool GLImplementationParts::IsValid() const { + if (angle == ANGLEImplementation::kNone) { + return (gl != kGLImplementationEGLANGLE); +diff --git a/ui/gl/gl_implementation.h b/ui/gl/gl_implementation.h +index dffa099497cc6..c4e6aae257bc8 100644 +--- a/ui/gl/gl_implementation.h ++++ b/ui/gl/gl_implementation.h +@@ -59,8 +59,14 @@ enum class ANGLEImplementation { + }; + + struct GL_EXPORT GLImplementationParts { +- explicit GLImplementationParts(const ANGLEImplementation angle_impl); +- explicit GLImplementationParts(const GLImplementation gl_impl); ++ constexpr explicit GLImplementationParts(const ANGLEImplementation angle_impl) ++ : gl(kGLImplementationEGLANGLE), ++ angle(MakeANGLEImplementation(kGLImplementationEGLANGLE, angle_impl)) {} ++ ++ constexpr explicit GLImplementationParts(const GLImplementation gl_impl) ++ : gl(gl_impl), ++ angle(MakeANGLEImplementation(gl_impl, ANGLEImplementation::kDefault)) { ++ } + + GLImplementation gl = kGLImplementationNone; + ANGLEImplementation angle = ANGLEImplementation::kNone; +@@ -80,6 +86,21 @@ struct GL_EXPORT GLImplementationParts { + bool IsValid() const; + bool IsAllowed(const std::vector<GLImplementationParts>& allowed_impls) const; + std::string ToString() const; ++ ++ private: ++ static constexpr ANGLEImplementation MakeANGLEImplementation( ++ const GLImplementation gl_impl, ++ const ANGLEImplementation angle_impl) { ++ if (gl_impl == kGLImplementationEGLANGLE) { ++ if (angle_impl == ANGLEImplementation::kNone) { ++ return ANGLEImplementation::kDefault; ++ } else { ++ return angle_impl; ++ } ++ } else { ++ return ANGLEImplementation::kNone; ++ } ++ } + }; + + struct GL_EXPORT GLWindowSystemBindingInfo { +-- +2.35.1 + diff --git a/chromium/chromium/chromium-gcc-11-r976299.patch b/chromium/chromium/chromium-gcc-11-r976299.patch new file mode 100644 index 0000000..0ef7df7 --- /dev/null +++ b/chromium/chromium/chromium-gcc-11-r976299.patch @@ -0,0 +1,48 @@ +From 2c9bf9f58b6237942960d2cd4f1fc91a2e6beb37 Mon Sep 17 00:00:00 2001 +From: Jose Dapena Paz <jdapena@igalia.com> +Date: Tue, 1 Mar 2022 18:06:38 +0000 +Subject: [PATCH] GCC: explicitely move return value of + SCTHashdanceMetadata::ToValue +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3488747 +Reviewed-by: Chris Thompson <cthomp@chromium.org> +Commit-Queue: José Dapena Paz <jdapena@igalia.com> +Cr-Commit-Position: refs/heads/main@{#976299} +--- + services/network/sct_auditing/sct_auditing_reporter.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/services/network/sct_auditing/sct_auditing_reporter.cc b/services/network/sct_auditing/sct_auditing_reporter.cc +index 900a05dc81b0b..bec982d487428 100644 +--- a/services/network/sct_auditing/sct_auditing_reporter.cc ++++ b/services/network/sct_auditing/sct_auditing_reporter.cc +@@ -194,7 +194,7 @@ base::Value SCTAuditingReporter::SCTHashdanceMetadata::ToValue() const { + 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 +-- +2.35.1 + diff --git a/chromium/chromium/chromium.spec b/chromium/chromium/chromium.spec index 18a3ea9..82e2b14 100644 --- a/chromium/chromium/chromium.spec +++ b/chromium/chromium/chromium.spec @@ -56,7 +56,7 @@ %bcond_with fedora_compilation_flags Name: chromium -Version: 99.0.4844.84 +Version: 100.0.4896.60 Release: 100%{?dist} Summary: A WebKit (Blink) powered web browser @@ -113,8 +113,9 @@ Patch20: chromium-base-v8-utility.patch Patch21: chromium-gcc-12-subzero-undefined-reference.patch # Pull upstream patches -Patch40: chromium-gcc-11-r962407.patch -Patch41: chromium-gcc-11-r963119.patch +Patch40: chromium-gcc-11-r972974.patch +Patch41: chromium-gcc-11-r975992.patch +Patch42: chromium-gcc-11-r976299.patch # I don't have time to test whether it work on other architectures ExclusiveArch: x86_64 @@ -436,12 +437,10 @@ find -type f -exec \ third_party/swiftshader/third_party/marl \ third_party/swiftshader/third_party/subzero \ third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1 \ - third_party/tcmalloc \ third_party/tensorflow-text \ third_party/tflite \ third_party/tflite/src/third_party/eigen3 \ third_party/tflite/src/third_party/fft2d \ - third_party/tcmalloc \ third_party/ruy \ third_party/six \ third_party/ukey2 \ @@ -739,6 +738,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sun Apr 10 2022 - Ting-Wei Lan <lantw44@gmail.com> - 100.0.4896.60-100 +- Update to 100.0.4896.60 + * Thu Mar 31 2022 - Ting-Wei Lan <lantw44@gmail.com> - 99.0.4844.84-100 - Update to 99.0.4844.84 |