diff options
| -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-gcc-11-r987566.patch | 34 | ||||
| -rw-r--r-- | chromium/chromium/chromium-gcc-12-r991529.patch | 31 | ||||
| -rw-r--r-- | chromium/chromium/chromium-libxml2-r995726.patch | 87 | ||||
| -rw-r--r-- | chromium/chromium/chromium.spec | 11 |
7 files changed, 159 insertions, 186 deletions
diff --git a/chromium/chromium/chromium-gcc-11-r972974.patch b/chromium/chromium/chromium-gcc-11-r972974.patch deleted file mode 100644 index bbe7385..0000000 --- a/chromium/chromium/chromium-gcc-11-r972974.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 deleted file mode 100644 index d10353e..0000000 --- a/chromium/chromium/chromium-gcc-11-r975992.patch +++ /dev/null @@ -1,100 +0,0 @@ -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 deleted file mode 100644 index 0ef7df7..0000000 --- a/chromium/chromium/chromium-gcc-11-r976299.patch +++ /dev/null @@ -1,48 +0,0 @@ -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-gcc-11-r987566.patch b/chromium/chromium/chromium-gcc-11-r987566.patch new file mode 100644 index 0000000..3ea8af3 --- /dev/null +++ b/chromium/chromium/chromium-gcc-11-r987566.patch @@ -0,0 +1,34 @@ +From 54f1e01311592927ddd23ec18ae5276b0e355f3e Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann <stha09@googlemail.com> +Date: Thu, 31 Mar 2022 18:53:50 +0000 +Subject: [PATCH] libstdc++: fix incomplete type of ModelProvider + +Destructor of std::unique_ptr in libstdc++ uses sizeof() which +requires full definition of segmentation_platform::ModelProvider +in segmentation_platform::GetSegmentationDefaultModelProvider(). + +Bug: 957519 +Change-Id: Icf70536550f962702be827ad2676e5d3e5d9d489 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3563162 +Reviewed-by: Shakti Sahu <shaktisahu@chromium.org> +Commit-Queue: Stephan Hartmann <stha09@googlemail.com> +Cr-Commit-Position: refs/heads/main@{#987566} +--- + .../segmentation_platform/segmentation_platform_config.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/chrome/browser/segmentation_platform/segmentation_platform_config.cc b/chrome/browser/segmentation_platform/segmentation_platform_config.cc +index b2bf48ed30aa2..1c817aeb91761 100644 +--- a/chrome/browser/segmentation_platform/segmentation_platform_config.cc ++++ b/chrome/browser/segmentation_platform/segmentation_platform_config.cc +@@ -12,6 +12,7 @@ + #include "components/optimization_guide/proto/models.pb.h" + #include "components/segmentation_platform/public/config.h" + #include "components/segmentation_platform/public/features.h" ++#include "components/segmentation_platform/public/model_provider.h" + + #if BUILDFLAG(IS_ANDROID) + #include "base/metrics/field_trial_params.h" +-- +2.35.1 + diff --git a/chromium/chromium/chromium-gcc-12-r991529.patch b/chromium/chromium/chromium-gcc-12-r991529.patch new file mode 100644 index 0000000..cb033ff --- /dev/null +++ b/chromium/chromium/chromium-gcc-12-r991529.patch @@ -0,0 +1,31 @@ +From 68c9c63c0b148ff5246a0cdad59000697bbd8645 Mon Sep 17 00:00:00 2001 +From: Maksim Sisov <msisov@igalia.com> +Date: Tue, 12 Apr 2022 15:11:34 +0000 +Subject: [PATCH] Fix no member named 'tie' in namespace 'std' + +Bug: None +Change-Id: I8a097af2b16b738fa9bbb8231536bca85522f350 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3581869 +Auto-Submit: Maksim Sisov <msisov@igalia.com> +Reviewed-by: Matt Menke <mmenke@chromium.org> +Commit-Queue: Matt Menke <mmenke@chromium.org> +Cr-Commit-Position: refs/heads/main@{#991529} +--- + net/base/address_list.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/net/base/address_list.h b/net/base/address_list.h +index 029af1aded312..a93093e41f3c6 100644 +--- a/net/base/address_list.h ++++ b/net/base/address_list.h +@@ -8,6 +8,7 @@ + #include <stdint.h> + + #include <string> ++#include <tuple> + #include <utility> + #include <vector> + +-- +2.35.1 + diff --git a/chromium/chromium/chromium-libxml2-r995726.patch b/chromium/chromium/chromium-libxml2-r995726.patch new file mode 100644 index 0000000..a0dd416 --- /dev/null +++ b/chromium/chromium/chromium-libxml2-r995726.patch @@ -0,0 +1,87 @@ +From e67b31a6d61ec67c3cd89832a96e266f3470b5f0 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann <stha09@googlemail.com> +Date: Mon, 25 Apr 2022 20:20:08 +0000 +Subject: [PATCH] unbundle: add //services/data_decoder:lib to libxml_utils + visibility + +Also add a note to keep original and unbundle BUILD.gn files in sync. + +Bug: 1306942 +Change-Id: I83a57abfd7f2390232b1cf81060d79595f2aec55 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3488058 +Reviewed-by: Lei Zhang <thestig@chromium.org> +Reviewed-by: Daniel Cheng <dcheng@chromium.org> +Commit-Queue: Stephan Hartmann <stha09@googlemail.com> +Cr-Commit-Position: refs/heads/main@{#995726} +--- + build/linux/unbundle/libxml.gn | 4 ++++ + third_party/libxml/BUILD.gn | 3 +++ + 2 files changed, 7 insertions(+) + +diff --git a/build/linux/unbundle/libxml.gn b/build/linux/unbundle/libxml.gn +index 243b62984fcb0..42f1aac867f49 100644 +--- a/build/linux/unbundle/libxml.gn ++++ b/build/linux/unbundle/libxml.gn +@@ -12,6 +12,7 @@ source_set("libxml") { + public_configs = [ ":system_libxml" ] + } + ++# Please keep in sync with //third_party/libxml/BUILD.gn. + static_library("libxml_utils") { + # Do not expand this visibility list without first consulting with the + # Security Team. +@@ -19,6 +20,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 = [ +@@ -28,6 +30,7 @@ static_library("libxml_utils") { + public_configs = [ ":system_libxml" ] + } + ++# Please keep in sync with //third_party/libxml/BUILD.gn. + static_library("xml_reader") { + # Do not expand this visibility list without first consulting with the + # Security Team. +@@ -44,6 +47,7 @@ static_library("xml_reader") { + deps = [ ":libxml_utils" ] + } + ++# Please keep in sync with //third_party/libxml/BUILD.gn. + static_library("xml_writer") { + # The XmlWriter is considered safe to use from any target. + visibility = [ "*" ] +diff --git a/third_party/libxml/BUILD.gn b/third_party/libxml/BUILD.gn +index 24688c1643c77..f408123aeb7f9 100644 +--- a/third_party/libxml/BUILD.gn ++++ b/third_party/libxml/BUILD.gn +@@ -75,6 +75,7 @@ config("libxml_warnings") { + } + } + ++# Please keep in sync with //build/linux/unbundle/libxml.gn. + static_library("xml_reader") { + # Do not expand this visibility list without first consulting with the + # Security Team. +@@ -98,6 +99,7 @@ static_library("xml_reader") { + configs += [ ":libxml_config" ] + } + ++# Please keep in sync with //build/linux/unbundle/libxml.gn. + static_library("xml_writer") { + # The XmlWriter is considered safe to use from any target. + visibility = [ "*" ] +@@ -112,6 +114,7 @@ static_library("xml_writer") { + configs += [ ":libxml_config" ] + } + ++# Please keep in sync with //build/linux/unbundle/libxml.gn. + static_library("libxml_utils") { + # Do not expand this visibility list without first consulting with the + # Security Team. +-- +2.35.1 + diff --git a/chromium/chromium/chromium.spec b/chromium/chromium/chromium.spec index bd258b4..87197a6 100644 --- a/chromium/chromium/chromium.spec +++ b/chromium/chromium/chromium.spec @@ -56,7 +56,7 @@ %bcond_with fedora_compilation_flags Name: chromium -Version: 100.0.4896.127 +Version: 101.0.4951.41 Release: 100%{?dist} Summary: A WebKit (Blink) powered web browser @@ -113,9 +113,9 @@ Patch20: chromium-base-v8-utility.patch Patch21: chromium-gcc-12-subzero-undefined-reference.patch # Pull upstream patches -Patch40: chromium-gcc-11-r972974.patch -Patch41: chromium-gcc-11-r975992.patch -Patch42: chromium-gcc-11-r976299.patch +Patch40: chromium-gcc-11-r987566.patch +Patch41: chromium-gcc-12-r991529.patch +Patch42: chromium-libxml2-r995726.patch # I don't have time to test whether it work on other architectures ExclusiveArch: x86_64 @@ -738,6 +738,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sat Apr 30 2022 - Ting-Wei Lan <lantw44@gmail.com> - 101.0.4951.41-100 +- Update to 101.0.4951.41 + * Sat Apr 16 2022 - Ting-Wei Lan <lantw44@gmail.com> - 100.0.4896.127-100 - Update to 100.0.4896.127 |