chromium: Chromium 95.0.4638.69 -> 96.0.4664.45

Re-enable the use of ld.gold for Fedora 35 and later versions because
the segfault issue seems to be fixed.

10 files changed, 162 insertions, 269 deletions

diff --git a/chromium/chromium/chromium-gcc-11-r921717.patch b/chromium/chromium/chromium-gcc-11-r921717.patch
deleted file mode 100644
index 75bae80..0000000
--- a/chromium/chromium/chromium-gcc-11-r921717.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0aa878b7839141077071db97ba1cd30edf486827 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Wed, 15 Sep 2021 17:14:14 +0000
-Subject: [PATCH] maldoca: depend on zlib instead of headers only
-
-There is no zlib_common_headers target for unbundled zlib
-and in the end code links against zlib static library anyways.
-
-Bug: None
-Change-Id: I50b8bb5b480770b637904de00aecc3a629f09471
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3162976
-Reviewed-by: Daniel Rubery <drubery@chromium.org>
-Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
-Cr-Commit-Position: refs/heads/main@{#921717}
----
- third_party/maldoca/BUILD.gn | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/third_party/maldoca/BUILD.gn b/third_party/maldoca/BUILD.gn
-index eeab2056b5fb8..29a0a2ca492a5 100644
---- a/third_party/maldoca/BUILD.gn
-+++ b/third_party/maldoca/BUILD.gn
-@@ -224,7 +224,7 @@ source_set("maldoca-ole") {
-     "//third_party/libxml",
-     "//third_party/protobuf:protobuf_lite",
-     "//third_party/re2",
--    "//third_party/zlib:zlib_common_headers",
-+    "//third_party/zlib:zlib",
-     "//third_party/zlib/google:zip",
-   ]
- 
--- 
-2.31.1
-
diff --git a/chromium/chromium/chromium-gcc-11-r925776.patch b/chromium/chromium/chromium-gcc-11-r925776.patch
deleted file mode 100644
index 76e5834..0000000
--- a/chromium/chromium/chromium-gcc-11-r925776.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From 9e00e702633c47c590a869bc66b5c2ceec09da50 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dominik=20R=C3=B6ttsches?= <drott@chromium.org>
-Date: Tue, 28 Sep 2021 15:31:50 +0000
-Subject: [PATCH] Roll src/third_party/harfbuzz-ng/src/ 6602cbb70..a52c6df38
- (80 commits)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes an issue with subsetting of the DFKai font on Windows.
-
-https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git/+log/6602cbb7062b..a52c6df38a38
-
-$ git log 6602cbb70..a52c6df38 --date=short --no-merges --format='%ad %ae %s'
-2021-09-27 grieger [subset] Fix bug in composite operation counting.
-2021-09-24 grieger [repacker] fix bug in subgraph isolation.
-2021-09-23 behdad [getn-hb-version.py] Open old output in UTF-8 mode as well
-2021-09-22 grieger [repacker] s/0/HB_TAG_NONE
-2021-09-10 grieger [repacker] handle a couple of duplication edge cases.
-2021-09-09 grieger [repacker] reduce the bits used by order by 2 to give more bits to distance.
-2021-09-09 grieger [repacker] add repacker isolation test on real font.
-2021-09-09 grieger [repacker] add a couple more complex isolation tests.
-2021-09-09 grieger [repacker] correctly update incoming_edges in duplicate.
-2021-09-08 grieger [repacker] default space to 0.
-2021-09-08 grieger [repacker] put each 32 bit subgraph into it's own packing space.
-2021-09-08 grieger [repacker] Add repacker test for subgraph isolation.
-2021-09-08 grieger [repacker] recursively duplicate nodes during isolation.
-2021-09-08 grieger [repacker] do extension subtable isolation before starting resolution attempts.
-2021-09-07 grieger [repacker] extract overflows processing into its own method.
-2021-09-07 grieger [repacker] begin implementing the ability to isolate extension subtables.
-2021-09-07 grieger Add a debug message when offset overflow resolution fails.
-2021-07-30 bungeman [mutex] Add hb_mutex_t std::mutex implementation
-2021-09-22 behdad [atomic] Cannot fail anymore
-2021-09-20 qxliu [subset] subset MATH table
-2021-09-22 grieger [subset] Fix subset_offset_array adding unused space to serializer.
-2021-09-12 qxliu [subset] fix find_duplicate_features
-2021-09-19 qxliu [subset] add closure_glyphs () method for MATH table
-2021-09-21 behdad [set-digest] Use using instead of typedef
-2021-09-20 simon Add support for Pwo Karen / Ason Chin medial la
-2021-09-20 behdad [khmer] Towards separating Khmer from Indic table
-2021-09-20 behdad [myanmar] Towards separating Myanmar from Indic table
-2021-09-20 khaled Make the file UTF-8 again
-2021-09-19 behdad Add stub HBUINT15
-2021-09-19 behdad Rename HBGlyphID to HBGlyphID16
-2021-09-17 grieger [repacker] fix heap use after free in repacker.
-2021-09-18 ActuallyaDeviloper Make the code able to compile with MSVC++ from Visual Studio 2015 (Version 14.0.25431.01, Update 3) sucessfully again.
-2021-09-18 khaled [doc] Add missing version tags
-2021-09-17 khaled 3.0.0
-2021-09-17 behdad Centralize math include
-2021-09-15 khaled [ci] meson 0.55.0 didn’t work for harfbuzz
-2021-09-15 khaled [ci] Ragel subproject requires meson 0.55.0
-2021-09-15 khaled [ci] Build ragel on the Linux CI job
-2021-09-15 khaled [meson] Add ragel_subproject option
-2021-09-16 grieger [subset] restore hb_subset_input_unicode/glyph_set () to documentation.
-2021-09-16 grieger [subset] In preperation for 3.0.0 release remove legacy subsetting api methods.
-2021-09-15 nfeodonit CMake: Detect pthread with module FindThread
-2021-09-15 behdad [style] Change tag type to hb_style_tag_t
-2021-09-14 corbett.dav [USE] Send Khitan Small Script and Yezidi to USE
-2021-09-14 khaled [meson] Add ragel subproject
-2021-09-14 khaled [ragel] Regenerate state machine files with 6.10
-2021-09-14 khaled [meson] Require ragel 6.10
-2021-09-14 corbett.dav [Unicode 14] Update the Arabic joining script list
-2021-09-14 corbett.dav [Unicode 14] Add tests
-2021-09-14 corbett.dav [Unicode 14] Send all the new scripts to USE
-2021-09-14 corbett.dav [Unicode 14] Update the USE table
-2021-09-14 corbett.dav [Unicode 14] Update the emoji table
-2021-09-14 corbett.dav [Unicode 14] Update the vowel constraint table
-2021-09-14 corbett.dav [Unicode 14] Update the Indic table
-2021-09-14 corbett.dav [Unicode 14] Update the Arabic table
-2021-09-14 corbett.dav [Unicode 14] Update the script direction list
-2021-09-14 corbett.dav [Unicode 14] Update the UCD table
-2021-09-14 corbett.dav [Unicode 14] Add new `hb_script_t` values
-2021-09-14 behdad [util] Fix leak of an hb_font_t
-2021-09-14 behdad [util/shape-consumer] Simplify font tracking
-2021-09-14 behdad Add fallback atexit implementation using template descrutors
-2021-09-14 behdad [style] Fix another float conversion warning
-2021-09-14 behdad [ot-shape] Enabled two more features: 'Harf' and 'Buzz'
-2021-09-14 behdad Call atexit() via hb_atexit()
-2021-09-14 behdad [style] Fix float conversion warning
-2021-09-13 behdad [style] Change private slant tag
-2021-09-11 khaled [style] Try harder to fix MSVC build
-2021-09-11 khaled [style] Try to fix MSVC build
-2021-09-11 khaled [style] Fix documentation
-2021-09-11 khaled [style] Prepare for release
-2021-09-11 khaled Fix build with -Dexperimental_api=true
-2021-09-09 behdad [style] Add HB_STYLE_TAG_SLANT_RATIO
-2021-09-09 behdad [style] Rename HB_STYLE_TAG_SLANT to HB_STYLE_TAG_SLANT_ANGLE
-2021-09-09 behdad [style] Fall back to GPOS 'size' feature for optical size in style API
-2021-09-02 qxliu [subset] fox for (Chain)ContextFormat3: subset lookupRecord
-2021-09-08 khaled [subset] Improve alignment of --help-all message
-2021-09-07 khaled [docs] Fix subset documentation
-2021-09-07 khaled [ci] Use different executer for win64 jobs
-2021-09-07 khaled Typo
-2021-09-07 khaled 2.9.1
-
-Created with:
-  roll-dep src/third_party/harfbuzz-ng/src
-R=bashi@chromium.org,behdad@chromium.org,bungeman@chromium.org,drott@chromium.org,jshin@chromium.org,kojii@chromium.org
-
-Fixed: 1252284
-Change-Id: Ie2ff99da5e41ca97b8881e1bd3e158881f4d5a8e
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3190252
-Commit-Queue: Dominik Röttsches <drott@chromium.org>
-Commit-Queue: Calder Kitagawa <ckitagawa@chromium.org>
-Auto-Submit: Dominik Röttsches <drott@chromium.org>
-Reviewed-by: Calder Kitagawa <ckitagawa@chromium.org>
-Reviewed-by: Anders Hartvoll Ruud <andruud@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#925776}
----
- DEPS                                             | 2 +-
- components/paint_preview/common/subset_font.cc   | 2 +-
- third_party/harfbuzz-ng/README.chromium          | 8 ++++----
- third_party/harfbuzz-ng/fuzz/hb_subset_fuzzer.cc | 6 +++---
- 4 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/components/paint_preview/common/subset_font.cc b/components/paint_preview/common/subset_font.cc
-index 45daea7b1529d..43a448ec10191 100644
---- a/components/paint_preview/common/subset_font.cc
-+++ b/components/paint_preview/common/subset_font.cc
-@@ -79,7 +79,7 @@ sk_sp<SkData> SubsetFont(SkTypeface* typeface, const GlyphUsage& usage) {
-   // Retain all variation information for OpenType variation fonts. See:
-   // https://docs.microsoft.com/en-us/typography/opentype/spec/otvaroverview
-   hb_set_t* skip_subset =
--      hb_subset_input_no_subset_tables_set(input.get());  // Owned by |input|.
-+      hb_subset_input_set(input.get(), HB_SUBSET_SETS_NO_SUBSET_TABLE_TAG);
-   hb_set_add(skip_subset, HB_TAG('a', 'v', 'a', 'r'));
-   hb_set_add(skip_subset, HB_TAG('c', 'v', 'a', 'r'));
-   hb_set_add(skip_subset, HB_TAG('f', 'v', 'a', 'r'));
--- 
-2.31.1
-
diff --git a/chromium/chromium/chromium-gcc-11-r929597.patch b/chromium/chromium/chromium-gcc-11-r929597.patch
new file mode 100644
index 0000000..89bc882
--- /dev/null
+++ b/chromium/chromium/chromium-gcc-11-r929597.patch
@@ -0,0 +1,40 @@
+From 86b1886673c3e75d3a7b8c802b3e9fa6ea945a1e Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jdapena@igalia.com>
+Date: Fri, 8 Oct 2021 06:32:55 +0000
+Subject: [PATCH] libstdc++: no implicit conversion from tuple created with
+ std::tie to an std::pair in restricted cookie manager.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix compilation error:
+    ../../services/network/restricted_cookie_manager.cc:164:30: error: no match for ‘operator[]’ (operand types are ‘network::CookieAccessesByURLAndSite’ {aka ‘std::map<std::pair<GURL, net::SiteForCookies>, std::unique_ptr<std::set<net::CookieWithAccessResult, network::CookieWithAccessResultComparer> > >’} and ‘std::tuple<const GURL&, const net::SiteForCookies&>’)
+
+There is no conversion from tuple to pair.
+
+Bug: 957519
+Change-Id: Idf29c7b21895ae28f45b35d6193ab4ac555945c8
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3211752
+Reviewed-by: Robbie McElrath <rmcelrath@chromium.org>
+Commit-Queue: José Dapena Paz <jdapena@igalia.com>
+Cr-Commit-Position: refs/heads/main@{#929597}
+---
+ services/network/restricted_cookie_manager.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/services/network/restricted_cookie_manager.cc b/services/network/restricted_cookie_manager.cc
+index 425426fd5a2b2..c8c10c65a6e8c 100644
+--- a/services/network/restricted_cookie_manager.cc
++++ b/services/network/restricted_cookie_manager.cc
+@@ -161,7 +161,7 @@ CookieAccesses* RestrictedCookieManager::GetCookieAccessesForURLAndSite(
+     const GURL& url,
+     const net::SiteForCookies& site_for_cookies) {
+   std::unique_ptr<CookieAccesses>& entry =
+-      recent_cookie_accesses_[std::tie(url, site_for_cookies)];
++      recent_cookie_accesses_[std::make_pair(url, site_for_cookies)];
+   if (!entry) {
+     entry = std::make_unique<CookieAccesses>();
+   }
+-- 
+2.31.1
+
diff --git a/chromium/chromium/chromium-gcc-11-r929634.patch b/chromium/chromium/chromium-gcc-11-r929634.patch
new file mode 100644
index 0000000..99aa1d5
--- /dev/null
+++ b/chromium/chromium/chromium-gcc-11-r929634.patch
@@ -0,0 +1,34 @@
+From c39c14e0e0c9fd21e8a3c180cd97590e4e76c608 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri, 8 Oct 2021 09:03:10 +0000
+Subject: [PATCH] IWYU: add vector for std::vector in CouponDB
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Bug: None
+Change-Id: Ibb2e2be27a6e74f305257365e28d77a71083ddfa
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3208412
+Reviewed-by: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
+Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
+Cr-Commit-Position: refs/heads/main@{#929634}
+---
+ chrome/browser/commerce/coupons/coupon_db.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/chrome/browser/commerce/coupons/coupon_db.h b/chrome/browser/commerce/coupons/coupon_db.h
+index f0758f43db12a..93e2dd3b5d84b 100644
+--- a/chrome/browser/commerce/coupons/coupon_db.h
++++ b/chrome/browser/commerce/coupons/coupon_db.h
+@@ -5,6 +5,8 @@
+ #ifndef CHROME_BROWSER_COMMERCE_COUPONS_COUPON_DB_H_
+ #define CHROME_BROWSER_COMMERCE_COUPONS_COUPON_DB_H_
+ 
++#include <vector>
++
+ #include "base/callback_helpers.h"
+ #include "base/memory/weak_ptr.h"
+ #include "url/gurl.h"
+-- 
+2.31.1
+
diff --git a/chromium/chromium/chromium-gcc-11-r930076.patch b/chromium/chromium/chromium-gcc-11-r930076.patch
new file mode 100644
index 0000000..0757adc
--- /dev/null
+++ b/chromium/chromium/chromium-gcc-11-r930076.patch
@@ -0,0 +1,30 @@
+From 26417403a23020d6b7a42174093bff86aeaf48cd Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Mon, 11 Oct 2021 09:14:06 +0000
+Subject: [PATCH] IWYU: add string.h for memcmp in ui::DrmRenderNodePathFinder
+
+Bug: None
+Change-Id: I9b97dfa1f14f8c7cf586d0de953eb93d6243beb4
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3212038
+Reviewed-by: Maksim Sisov <msisov@igalia.com>
+Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
+Cr-Commit-Position: refs/heads/main@{#930076}
+---
+ ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc b/ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc
+index 06776a7af702c..d5b7b71a5a0d1 100644
+--- a/ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc
++++ b/ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc
+@@ -5,6 +5,7 @@
+ #include "ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.h"
+ 
+ #include <fcntl.h>
++#include <string.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+-- 
+2.31.1
+
diff --git a/chromium/chromium/chromium-gcc-11-r930696.patch b/chromium/chromium/chromium-gcc-11-r930696.patch
new file mode 100644
index 0000000..9527bf3
--- /dev/null
+++ b/chromium/chromium/chromium-gcc-11-r930696.patch
@@ -0,0 +1,30 @@
+From 418597846f9a31e126c68ae4ef64e873e43c4569 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Tue, 12 Oct 2021 18:49:23 +0000
+Subject: [PATCH] IWYU: add memory for std::unique_ptr in base::CommandLine
+
+Bug: None
+Change-Id: I55328bdbbdcd82f09a852b400b93ec8027cbdb03
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3214337
+Commit-Queue: Lei Zhang <thestig@chromium.org>
+Reviewed-by: Lei Zhang <thestig@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#930696}
+---
+ base/command_line.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/base/command_line.h b/base/command_line.h
+index 706726a73eb1c..ad0281283a29b 100644
+--- a/base/command_line.h
++++ b/base/command_line.h
+@@ -19,6 +19,7 @@
+ #include <stddef.h>
+ #include <functional>
+ #include <map>
++#include <memory>
+ #include <string>
+ #include <vector>
+ 
+-- 
+2.31.1
+
diff --git a/chromium/chromium/chromium-jinja2-python-3.10-collections.patch b/chromium/chromium/chromium-jinja2-python-3.10-collections.patch
deleted file mode 100644
index 81ae7f6..0000000
--- a/chromium/chromium/chromium-jinja2-python-3.10-collections.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up chromium-92.0.4515.107/third_party/jinja2/tests.py.py3 chromium-92.0.4515.107/third_party/jinja2/tests.py
---- chromium-92.0.4515.107/third_party/jinja2/tests.py.py3	2021-07-28 15:53:45.670961029 -0400
-+++ chromium-92.0.4515.107/third_party/jinja2/tests.py	2021-07-28 15:55:56.637013096 -0400
-@@ -10,7 +10,12 @@
- """
- import operator
- import re
--from collections import Mapping
-+import sys
-+if sys.version_info[:2] >= (3, 8):  # pragma: no cover
-+    from collections.abc import Mapping
-+else:  # pragma: no cover
-+    from collections import Mapping
-+
- from jinja2.runtime import Undefined
- from jinja2._compat import text_type, string_types, integer_types
- import decimal
diff --git a/chromium/chromium/chromium-quiche-stddef.patch b/chromium/chromium/chromium-quiche-stddef.patch
deleted file mode 100644
index 2358c85..0000000
--- a/chromium/chromium/chromium-quiche-stddef.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From cde409004ec894d7651a73ba1986ad2efe3683b5 Mon Sep 17 00:00:00 2001
-From: dschinazi <dschinazi@google.com>
-Date: Mon, 20 Sep 2021 13:41:32 -0700
-Subject: [PATCH] Add missing include
-
-This change was proposed by Stephan Hartmann at <https://quiche-review.googlesource.com/c/quiche/+/10840>. I've confirmed that they've signed the CLA.
-
-PiperOrigin-RevId: 397831819
----
- http2/adapter/window_manager.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/http2/adapter/window_manager.h b/http2/adapter/window_manager.h
-index f15982d4..5a7701e9 100644
---- a/net/third_party/quiche/src/http2/adapter/window_manager.h
-+++ b/net/third_party/quiche/src/http2/adapter/window_manager.h
-@@ -1,6 +1,8 @@
- #ifndef QUICHE_HTTP2_ADAPTER_WINDOW_MANAGER_H_
- #define QUICHE_HTTP2_ADAPTER_WINDOW_MANAGER_H_
- 
-+#include <stddef.h>
-+
- #include <functional>
- 
- #include "common/platform/api/quiche_export.h"
--- 
-2.31.1
-
diff --git a/chromium/chromium/chromium-webrtc-template.patch b/chromium/chromium/chromium-webrtc-template.patch
deleted file mode 100644
index bb1ec4f..0000000
--- a/chromium/chromium/chromium-webrtc-template.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 3987e61086b277e26e999159cff1f4f188dfddbe Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Wed, 8 Sep 2021 13:57:14 +0000
-Subject: [PATCH] GCC: fix template specialization in webrtc::BitstreamReader
-
-GCC complains that explicit specialization in non-namespace scope
-is happening for webrtc::BitstreamReader::Read(). However,
-specializationvfor bool isn't used because std::is_unsigned<bool>::value
-returns true. Add std::is_same for bool check and enable second
-specialization only for bool types.
-
-Bug: chromium:819294
-Change-Id: I1873cd59e2737516bd4012fb952da65d6bf3172b
-Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/231561
-Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
-Reviewed-by: Harald Alvestrand <hta@webrtc.org>
-Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
-Cr-Commit-Position: refs/heads/main@{#35007}
----
- rtc_base/bitstream_reader.h | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/rtc_base/bitstream_reader.h b/rtc_base/bitstream_reader.h
-index 8c0f66fa91..51c7914bd7 100644
---- a/third_party/webrtc/rtc_base/bitstream_reader.h
-+++ b/third_party/webrtc/rtc_base/bitstream_reader.h
-@@ -61,14 +61,17 @@ class BitstreamReader {
-   // Reads unsigned integer of fixed width.
-   template <typename T,
-             typename std::enable_if<std::is_unsigned<T>::value &&
-+                                    !std::is_same<T, bool>::value &&
-                                     sizeof(T) <= 8>::type* = nullptr>
-   ABSL_MUST_USE_RESULT T Read() {
-     return rtc::dchecked_cast<T>(ReadBits(sizeof(T) * 8));
-   }
- 
-   // Reads single bit as boolean.
--  template <>
--  ABSL_MUST_USE_RESULT bool Read<bool>() {
-+  template <
-+      typename T,
-+      typename std::enable_if<std::is_same<T, bool>::value>::type* = nullptr>
-+  ABSL_MUST_USE_RESULT bool Read() {
-     return ReadBit() != 0;
-   }
- 
--- 
-2.31.1
-
diff --git a/chromium/chromium/chromium.spec b/chromium/chromium/chromium.spec
index 9ef0b9b..a770944 100644
--- a/chromium/chromium/chromium.spec
+++ b/chromium/chromium/chromium.spec
@@ -38,6 +38,15 @@
 # Enabled by default because Fedora Copr has enough memory
 %bcond_without symbol
 
+# Allow linking with ld.gold
+# Enabled by default because it is faster than ld.bfd
+# Disabled on Fedora 34 and older because it segfault too frequently
+%if 0%{?fedora} >= 35
+%bcond_without gold
+%else
+%bcond_with gold
+%endif
+
 # Allow compiling with clang
 # Disabled by default becaue gcc is the system compiler
 %bcond_with clang
@@ -47,7 +56,7 @@
 %bcond_with fedora_compilation_flags
 
 Name:       chromium
-Version:    95.0.4638.69
+Version:    96.0.4664.45
 Release:    100%{?dist}
 Summary:    A WebKit (Blink) powered web browser
 
@@ -99,16 +108,14 @@ Patch2:     chromium-gn-no-static-libstdc++.patch
 Patch10:    chromium-python3.patch
 
 # Pull patches from Fedora
-# https://src.fedoraproject.org/rpms/chromium/c/edc94b008fe5da8a
 # https://src.fedoraproject.org/rpms/chromium/c/c3fea076996d62bf
-Patch20:    chromium-jinja2-python-3.10-collections.patch
 Patch21:    chromium-breakpad-glibc-2.34-signal.patch
 
 # Pull upstream patches
-Patch30:    chromium-quiche-stddef.patch
-Patch31:    chromium-webrtc-template.patch
-Patch32:    chromium-gcc-11-r921717.patch
-Patch33:    chromium-gcc-11-r925776.patch
+Patch30:    chromium-gcc-11-r929597.patch
+Patch31:    chromium-gcc-11-r929634.patch
+Patch32:    chromium-gcc-11-r930076.patch
+Patch33:    chromium-gcc-11-r930696.patch
 
 # I don't have time to test whether it work on other architectures
 ExclusiveArch: x86_64
@@ -295,6 +302,7 @@ find -type f -exec \
     third_party/devtools-frontend/src/front_end/third_party/wasmparser \
     third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n \
     third_party/devtools-frontend/src/third_party \
+    third_party/distributed_point_functions \
     third_party/dom_distiller_js \
     third_party/eigen3 \
     third_party/emoji-segmenter \
@@ -433,7 +441,6 @@ find -type f -exec \
     third_party/tflite \
     third_party/tflite/src/third_party/eigen3 \
     third_party/tflite/src/third_party/fft2d \
-    third_party/tflite-support \
     third_party/tcmalloc \
     third_party/ruy \
     third_party/six \
@@ -534,7 +541,6 @@ gn_args=(
     is_component_build=false
     dcheck_always_on=false
     dcheck_is_configurable=false
-    use_gold=false
     use_sysroot=false
     use_custom_libcxx=false
     use_aura=true
@@ -577,6 +583,14 @@ gn_args=(
 )
 
 gn_args+=(
+%if %{with gold}
+    use_gold=true
+%else
+    use_gold=false
+%endif
+)
+
+gn_args+=(
 %if %{with clang}
     'clang_base_path="/usr"'
 %endif
@@ -723,7 +737,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
-* Fri Oct 29 2021 - Ting-Wei Lan <lantw44@gmail.com> - 95.0.4638.69-101
+* Wed Nov 17 2021 - Ting-Wei Lan <lantw44@gmail.com> - 96.0.4664.45-100
+- Update to 96.0.4664.45
+- Enable gold on Fedora 35 and later because it doesn't crash there
+
+* Fri Oct 29 2021 - Ting-Wei Lan <lantw44@gmail.com> - 95.0.4638.69-100
 - Update to 95.0.4638.69
 
 * Sun Oct 24 2021 - Ting-Wei Lan <lantw44@gmail.com> - 95.0.4638.54-101