96

chromium-96-CommandLine-include.patch

@@ -0,0 +1,24 @@
+From 39e6e77798d86033e5eb1fb2a2caf20a5bca2262 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Sat, 9 Oct 2021 08:27:04 +0000
+Subject: [PATCH] IWYU: add memory for std::unique_ptr in base::CommandLine
+
+---
+ base/command_line.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/base/command_line.h b/base/command_line.h
+index 706726a..ad02812 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.32.0
+

chromium-96-CouponDB-include.patch

@@ -0,0 +1,25 @@
+From 3a7b8dd0fcceffcfd0ea7e3186d2850deed7a00b Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Wed, 6 Oct 2021 15:36:47 +0000
+Subject: [PATCH] IWYU: add vector for std::vector in CouponDB
+
+---
+ 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 f0758f4..93e2dd3 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.32.0
+

chromium-96-DrmRenderNodePathFinder-include.patch

@@ -0,0 +1,24 @@
+From 9e36b3c28935fb50d43ccef443be786a8e3f8a5f Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Sat, 9 Oct 2021 16:17:34 +0000
+Subject: [PATCH] IWYU: add string.h for memcmp in ui:: DrmRenderNodePathFinder
+
+---
+ 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 06776a7..d5b7b71 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.32.0
+

chromium-96-EnumTable-crash.patch

@@ -0,0 +1,76 @@
+diff --git a/components/cast_channel/enum_table.h b/components/cast_channel/enum_table.h
+index aad9e08..2f3fcad 100644
+--- a/components/cast_channel/enum_table.h
++++ b/components/cast_channel/enum_table.h
+@@ -8,6 +8,7 @@
+ #include <cstdint>
+ #include <cstring>
+ #include <ostream>
++#include <vector>
+ 
+ #include "base/check_op.h"
+ #include "base/macros.h"
+@@ -188,7 +189,6 @@ class
+   inline constexpr GenericEnumTableEntry(int32_t value);
+   inline constexpr GenericEnumTableEntry(int32_t value, base::StringPiece str);
+ 
+-  GenericEnumTableEntry(const GenericEnumTableEntry&) = delete;
+   GenericEnumTableEntry& operator=(const GenericEnumTableEntry&) = delete;
+ 
+  private:
+@@ -254,7 +254,6 @@ class EnumTable {
+     constexpr Entry(E value, base::StringPiece str)
+         : GenericEnumTableEntry(static_cast<int32_t>(value), str) {}
+ 
+-    Entry(const Entry&) = delete;
+     Entry& operator=(const Entry&) = delete;
+   };
+ 
+@@ -313,15 +312,14 @@ class EnumTable {
+     if (is_sorted_) {
+       const std::size_t index = static_cast<std::size_t>(value);
+       if (ANALYZER_ASSUME_TRUE(index < data_.size())) {
+-        const auto& entry = data_.begin()[index];
++        const auto& entry = data_[index];
+         if (ANALYZER_ASSUME_TRUE(entry.has_str()))
+           return entry.str();
+       }
+       return absl::nullopt;
+     }
+     return GenericEnumTableEntry::FindByValue(
+-        reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()),
+-        data_.size(), static_cast<int32_t>(value));
++        &data_[0], data_.size(), static_cast<int32_t>(value));
+   }
+ 
+   // This overload of GetString is designed for cases where the argument is a
+@@ -349,8 +347,7 @@ class EnumTable {
+   // enum value directly.
+   absl::optional<E> GetEnum(base::StringPiece str) const {
+     auto* entry = GenericEnumTableEntry::FindByString(
+-        reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()),
+-        data_.size(), str);
++        &data_[0], data_.size(), str);
+     return entry ? static_cast<E>(entry->value) : absl::optional<E>();
+   }
+ 
+@@ -365,7 +362,7 @@ class EnumTable {
+   // Align the data on a cache line boundary.
+   alignas(64)
+ #endif
+-      std::initializer_list<Entry> data_;
++      const std::vector<Entry> data_;
+   bool is_sorted_;
+ 
+   constexpr EnumTable(std::initializer_list<Entry> data, bool is_sorted)
+@@ -377,8 +374,8 @@ class EnumTable {
+ 
+     for (std::size_t i = 0; i < data.size(); i++) {
+       for (std::size_t j = i + 1; j < data.size(); j++) {
+-        const Entry& ei = data.begin()[i];
+-        const Entry& ej = data.begin()[j];
++        const Entry& ei = data[i];
++        const Entry& ej = data[j];
+         DCHECK(ei.value != ej.value)
+             << "Found duplicate enum values at indices " << i << " and " << j;
+         DCHECK(!(ei.has_str() && ej.has_str() && ei.str() == ej.str()))

chromium-96-RestrictedCookieManager-tuple.patch

@@ -0,0 +1,31 @@
+From 86b1886673c3e75d3a7b8c802b3e9fa6ea945a1e Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jdapena@igalia.com>
+Date: Fri, 08 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.
+
+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}
+---
+
+diff --git a/services/network/restricted_cookie_manager.cc b/services/network/restricted_cookie_manager.cc
+index 425426f..c8c10c6 100644
+--- a/services/network/restricted_cookie_manager.cc
++++ b/services/network/restricted_cookie_manager.cc
+@@ -161,7 +161,7 @@
+     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>();
+   }

chromium-96-xfce-maximize.patch

@@ -0,0 +1,51 @@
+From 245e71ae8de3f4b5f3478739be819981bb12dfab Mon Sep 17 00:00:00 2001
+From: Alexander Dunaev <adunaev@igalia.com>
+Date: Sat, 13 Nov 2021 06:35:35 +0000
+Subject: [PATCH] [linux/xfce] Introduced a hack for Xfwm.
+
+This proposes an alternative to [1].  Either this patch or that one
+should be landed, but not both.  See the linked crbug for the details.
+
+Setting the frame extents via the _GTK_FRAME_EXTENTS property turned out
+to be problematic at Xfwm.  While the issue is agreed to be a bug in the
+window manager, for now we disable setting the frame extents on that WM.
+
+This patch introduces a logic that disables setting the window property
+on Xfwm.
+
+[1] https://chromium-review.googlesource.com/c/chromium/src/+/3275653
+
+Bug: 1260821
+Change-Id: I4b734ac0dc2b97d7ed6b1842564a33ec6e4b4035
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3275272
+Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
+Commit-Queue: Alexander Dunaev <adunaev@igalia.com>
+Cr-Commit-Position: refs/heads/main@{#941444}
+---
+
+diff --git a/ui/platform_window/x11/x11_window.cc b/ui/platform_window/x11/x11_window.cc
+index 2b20835..4fa2992 100644
+--- a/ui/platform_window/x11/x11_window.cc
++++ b/ui/platform_window/x11/x11_window.cc
+@@ -1016,6 +1016,21 @@
+ }
+ 
+ bool X11Window::CanSetDecorationInsets() const {
++  // Xfwm handles _GTK_FRAME_EXTENTS a bit unexpected way.  That is a known bug
++  // that will be eventually fixed, but for now we have to disable the function
++  // for Xfce.  The block below should be removed when Xfwm is updated with the
++  // fix and is known to work properly.
++  // See https://crbug.com/1260821.
++  {
++    static WindowManagerName wm_name = WM_OTHER;
++    static bool checked_for_wm = false;
++    if (!checked_for_wm) {
++      wm_name = GuessWindowManager();
++      checked_for_wm = true;
++    }
++    if (wm_name == WM_XFWM4)
++      return false;
++  }
+   return ui::WmSupportsHint(x11::GetAtom("_GTK_FRAME_EXTENTS"));
+ }
+ 

chromium-96.0.4664.45-gcc-remoting-constexpr.patch

@@ -0,0 +1,25 @@
+diff -up chromium-96.0.4664.45/remoting/signaling/message_tracker.cc.gcc-remoting-constexpr chromium-96.0.4664.45/remoting/signaling/message_tracker.cc
+--- chromium-96.0.4664.45/remoting/signaling/message_tracker.cc.gcc-remoting-constexpr	2021-11-19 16:53:23.197177348 -0500
++++ chromium-96.0.4664.45/remoting/signaling/message_tracker.cc	2021-11-19 17:03:16.354910826 -0500
+@@ -9,7 +9,7 @@
+ namespace remoting {
+ 
+ // static
+-const base::TimeDelta MessageTracker::kCleanupInterval = base::Minutes(2);
++constexpr base::TimeDelta MessageTracker::kCleanupInterval;
+ 
+ MessageTracker::MessageTracker() = default;
+ 
+diff -up chromium-96.0.4664.45/remoting/signaling/message_tracker.h.gcc-remoting-constexpr chromium-96.0.4664.45/remoting/signaling/message_tracker.h
+--- chromium-96.0.4664.45/remoting/signaling/message_tracker.h.gcc-remoting-constexpr	2021-11-12 05:24:33.000000000 -0500
++++ chromium-96.0.4664.45/remoting/signaling/message_tracker.h	2021-11-19 17:03:00.112809836 -0500
+@@ -40,7 +40,8 @@ class MessageTracker final {
+ 
+   // All IDs older than now - kCleanupInterval will be eventually removed, but
+   // they are not guaranteed to be immediately removed after the interval.
+-  static const base::TimeDelta kCleanupInterval;
++  static constexpr base::TimeDelta kCleanupInterval =
++      base::Minutes(2);
+ 
+   void RemoveExpiredIds();
+ 

chromium-96.0.4664.45-missing-cstdint-header.patch

@@ -0,0 +1,35 @@
+diff -up chromium-96.0.4664.45/third_party/webrtc/common_video/h264/pps_parser.h.missing-cstdint chromium-96.0.4664.45/third_party/webrtc/common_video/h264/pps_parser.h
+diff -up chromium-96.0.4664.45/third_party/webrtc/common_video/h264/sps_parser.h.missing-cstdint chromium-96.0.4664.45/third_party/webrtc/common_video/h264/sps_parser.h
+--- chromium-96.0.4664.45/third_party/webrtc/common_video/h264/sps_parser.h.missing-cstdint	2021-11-19 17:05:31.379750350 -0500
++++ chromium-96.0.4664.45/third_party/webrtc/common_video/h264/sps_parser.h	2021-11-19 17:07:35.191520127 -0500
+@@ -11,6 +11,7 @@
+ #ifndef COMMON_VIDEO_H264_SPS_PARSER_H_
+ #define COMMON_VIDEO_H264_SPS_PARSER_H_
+ 
++#include <cstdint>
+ #include "absl/types/optional.h"
+ #include "rtc_base/bitstream_reader.h"
+ 
+diff -up chromium-96.0.4664.45/third_party/webrtc/modules/include/module_common_types_public.h.missing-cstdint chromium-96.0.4664.45/third_party/webrtc/modules/include/module_common_types_public.h
+--- chromium-96.0.4664.45/third_party/webrtc/modules/include/module_common_types_public.h.missing-cstdint	2021-11-12 05:28:10.000000000 -0500
++++ chromium-96.0.4664.45/third_party/webrtc/modules/include/module_common_types_public.h	2021-11-19 17:05:31.379750350 -0500
+@@ -11,6 +11,7 @@
+ #ifndef MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_
+ #define MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_
+ 
++#include <cstdint>
+ #include <limits>
+ 
+ #include "absl/types/optional.h"
+diff -up chromium-96.0.4664.45/ui/gfx/linux/drm_util_linux.h.missing-cstdint chromium-96.0.4664.45/ui/gfx/linux/drm_util_linux.h
+--- chromium-96.0.4664.45/ui/gfx/linux/drm_util_linux.h.missing-cstdint	2021-11-12 05:25:24.000000000 -0500
++++ chromium-96.0.4664.45/ui/gfx/linux/drm_util_linux.h	2021-11-19 17:05:31.379750350 -0500
+@@ -9,6 +9,8 @@
+ 
+ #include "ui/gfx/buffer_types.h"
+ 
++#include <cstdint>
++
+ namespace ui {
+ 
+ int GetFourCCFormatFromBufferFormat(gfx::BufferFormat format);

chromium-96.0.4664.45-missing-cstring.patch

@@ -0,0 +1,47 @@
+diff -up chromium-96.0.4664.45/net/base/test_data_stream.cc.missing-cstring chromium-96.0.4664.45/net/base/test_data_stream.cc
+--- chromium-96.0.4664.45/net/base/test_data_stream.cc.missing-cstring	2021-11-12 05:24:31.000000000 -0500
++++ chromium-96.0.4664.45/net/base/test_data_stream.cc	2021-11-19 17:10:02.927438695 -0500
+@@ -5,6 +5,7 @@
+ #include "net/base/test_data_stream.h"
+ 
+ #include <algorithm>
++#include <cstring>
+ 
+ namespace net {
+ 
+diff -up chromium-96.0.4664.45/net/filter/filter_source_stream_test_util.cc.missing-cstring chromium-96.0.4664.45/net/filter/filter_source_stream_test_util.cc
+--- chromium-96.0.4664.45/net/filter/filter_source_stream_test_util.cc.missing-cstring	2021-11-12 05:24:32.000000000 -0500
++++ chromium-96.0.4664.45/net/filter/filter_source_stream_test_util.cc	2021-11-19 17:10:02.927438695 -0500
+@@ -4,6 +4,8 @@
+ 
+ #include "net/filter/filter_source_stream_test_util.h"
+ 
++#include <cstring>
++
+ #include "base/bit_cast.h"
+ #include "base/check_op.h"
+ #include "third_party/zlib/zlib.h"
+diff -up chromium-96.0.4664.45/third_party/webrtc/audio/utility/channel_mixer.cc.missing-cstring chromium-96.0.4664.45/third_party/webrtc/audio/utility/channel_mixer.cc
+--- chromium-96.0.4664.45/third_party/webrtc/audio/utility/channel_mixer.cc.missing-cstring	2021-11-12 05:28:09.000000000 -0500
++++ chromium-96.0.4664.45/third_party/webrtc/audio/utility/channel_mixer.cc	2021-11-19 17:10:02.927438695 -0500
+@@ -8,6 +8,8 @@
+  *  be found in the AUTHORS file in the root of the source tree.
+  */
+ 
++#include <cstring>
++
+ #include "audio/utility/channel_mixer.h"
+ 
+ #include "audio/utility/channel_mixing_matrix.h"
+diff -up chromium-96.0.4664.45/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc.missing-cstring chromium-96.0.4664.45/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
+diff -up chromium-96.0.4664.45/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc.missing-cstring chromium-96.0.4664.45/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc
+--- chromium-96.0.4664.45/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc.missing-cstring	2021-11-12 05:28:10.000000000 -0500
++++ chromium-96.0.4664.45/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc	2021-11-19 17:10:02.928438701 -0500
+@@ -10,6 +10,7 @@
+ 
+ #include "modules/video_coding/utility/ivf_file_reader.h"
+ 
++#include <cstring>
+ #include <string>
+ #include <vector>
+ 

chromium-96.0.4664.45-no-const-elements-in-std-vector.patch

@@ -0,0 +1,17 @@
+diff -up chromium-96.0.4664.45/net/test/embedded_test_server/http2_connection.cc.no-const chromium-96.0.4664.45/net/test/embedded_test_server/http2_connection.cc
+--- chromium-96.0.4664.45/net/test/embedded_test_server/http2_connection.cc.no-const	2021-11-23 18:56:57.700174009 +0000
++++ chromium-96.0.4664.45/net/test/embedded_test_server/http2_connection.cc	2021-11-23 18:57:39.405201162 +0000
+@@ -24,10 +24,9 @@ namespace net {
+ 
+ namespace {
+ 
+-std::vector<const http2::adapter::Header> GenerateHeaders(
+-    HttpStatusCode status,
+-    base::StringPairs headers) {
+-  std::vector<const http2::adapter::Header> response_vector;
++std::vector<http2::adapter::Header> GenerateHeaders(HttpStatusCode status,
++                                                    base::StringPairs headers) {
++  std::vector<http2::adapter::Header> response_vector;
+   response_vector.emplace_back(
+       http2::adapter::HeaderRep(std::string(":status")),
+       http2::adapter::HeaderRep(base::NumberToString(status)));

chromium.spec

@@ -213,14 +213,14 @@ BuildRequires:  libicu-devel >= 5.4
 %global chromoting_client_id %nil
 %endif
 
-%global majorversion 95
+%global majorversion 96
 
 %if %{freeworld}
 Name:		chromium%{chromium_channel}%{nsuffix}
 %else
 Name:		chromium%{chromium_channel}
 %endif
-Version:	%{majorversion}.0.4638.69
+Version:	%{majorversion}.0.4664.45
 Release:	1%{?dist}
 %if %{?freeworld}
 %if %{?shared}
@@ -253,8 +253,6 @@ Patch6:		chromium-95.0.4638.69-norar.patch
 # Use Gentoo's Widevine hack
 # https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-widevine-r3.patch
 Patch7:		chromium-71.0.3578.98-widevine-r3.patch
-# Disable fontconfig cache magic that breaks remoting
-Patch8:		chromium-91.0.4472.77-disable-fontconfig-cache-magic.patch
 # drop rsp clobber, which breaks gcc9 (thanks to Jeff Law)
 Patch9:		chromium-94.0.4606.54-gcc9-drop-rsp-clobber.patch
 # Try to load widevine from other places
@@ -268,52 +266,50 @@ Patch11:	chromium-92.0.4515.107-py2-bootstrap.patch
 # Add "Fedora" to the user agent string
 Patch12:	chromium-86.0.4240.75-fedora-user-agent.patch
 
-# https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-95-maldoca-zlib.patch
+# https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-96-xfce-maximize.patch
-Patch20:	chromium-95-maldoca-zlib.patch
+Patch24:	chromium-96-xfce-maximize.patch
-
-# https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-95-eigen-avx-1.patch
-# https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-95-eigen-avx-2.patch
-# https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-95-eigen-avx-3.patch
-Patch21:	chromium-95-eigen-avx-1.patch
-Patch22:	chromium-95-eigen-avx-2.patch
-Patch23:	chromium-95-eigen-avx-3.patch
-
-# https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-95-xfce-maximize.patch
-Patch24:	chromium-95-xfce-maximize.patch
 
 # Needs to be submitted..
-Patch51:	chromium-76.0.3809.100-gcc-remoting-constexpr.patch
+Patch51:	chromium-96.0.4664.45-gcc-remoting-constexpr.patch
 # https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-unbundle-zlib.patch
 Patch52:	chromium-81.0.4044.92-unbundle-zlib.patch
 # https://github.com/stha09/chromium-patches/blob/master/chromium-78-protobuf-RepeatedPtrField-export.patch
 Patch55:	chromium-78-protobuf-RepeatedPtrField-export.patch
 # ../../third_party/perfetto/include/perfetto/base/task_runner.h:48:55: error: 'uint32_t' has not been declared
-Patch56:	chromium-80.0.3987.87-missing-cstdint-header.patch
+Patch56:	chromium-96.0.4664.45-missing-cstdint-header.patch
 # Missing <cstring> (thanks c++17)
-Patch57:	chromium-95.0.4638.69-missing-cstring.patch
+Patch57:	chromium-96.0.4664.45-missing-cstring.patch
 # prepare for using system ffmpeg (clean)
 # http://svnweb.mageia.org/packages/cauldron/chromium-browser-stable/current/SOURCES/chromium-53-ffmpeg-no-deprecation-errors.patch?view=markup
 Patch58:	chromium-53-ffmpeg-no-deprecation-errors.patch
+# https://github.com/stha09/chromium-patches/blob/master/chromium-96-CouponDB-include.patch
+Patch59:	chromium-96-CouponDB-include.patch
 # https://github.com/stha09/chromium-patches/blob/master/chromium-95-libyuv-aarch64.patch
 Patch60:	chromium-95-libyuv-aarch64.patch
-# https://github.com/stha09/chromium-patches/blob/master/chromium-95-quiche-include.patch
+# https://github.com/stha09/chromium-patches/blob/master/chromium-96-CommandLine-include.patch
-Patch61:	chromium-95-quiche-include.patch
+Patch61:	chromium-96-CommandLine-include.patch
-# https://github.com/stha09/chromium-patches/blob/master/chromium-95-BitstreamReader-namespace.patch
+# https://github.com/stha09/chromium-patches/blob/master/chromium-96-RestrictedCookieManager-tuple.patch
-Patch62:	chromium-95-BitstreamReader-namespace.patch
+Patch62:	chromium-96-RestrictedCookieManager-tuple.patch
+# https://github.com/stha09/chromium-patches/blob/master/chromium-96-DrmRenderNodePathFinder-include.patch
+Patch63:	chromium-96-DrmRenderNodePathFinder-include.patch
 # Extra CXXFLAGS for aarch64
-Patch63:	chromium-91.0.4472.77-aarch64-cxxflags-addition.patch
+Patch64:	chromium-91.0.4472.77-aarch64-cxxflags-addition.patch
 # Fix issue where closure_compiler thinks java is only allowed in android builds
 # https://bugs.chromium.org/p/chromium/issues/detail?id=1192875
-Patch64:	chromium-91.0.4472.77-java-only-allowed-in-android-builds.patch
+Patch65:	chromium-91.0.4472.77-java-only-allowed-in-android-builds.patch
 
 # Silence GCC warnings during gn compile
-Patch65:	chromium-92.0.4515.107-gn-gcc-cleanup.patch
+Patch66:	chromium-92.0.4515.107-gn-gcc-cleanup.patch
 # Fix missing cstring in remoting code
-Patch66:	chromium-84.0.4147.125-remoting-cstring.patch
+Patch67:	chromium-84.0.4147.125-remoting-cstring.patch
 # Apply fix_textrels hack for i686 (even without lld)
-Patch67:	chromium-84.0.4147.125-i686-fix_textrels.patch
+Patch68:	chromium-84.0.4147.125-i686-fix_textrels.patch
 # Work around binutils bug in aarch64 (F33+)
-Patch68:	chromium-84.0.4147.125-aarch64-clearkeycdm-binutils-workaround.patch
+Patch69:	chromium-84.0.4147.125-aarch64-clearkeycdm-binutils-workaround.patch
+# No const elements in std::vector
+# https://github.com/chromium/chromium/commit/fd8ee2daf64a4348abca5dc9171523a1f9540c57#diff-45309c0989d0ee3ef14c373b6032b235c928574f72ac81e0b2ad8abf95c34547
+Patch70:	chromium-96.0.4664.45-no-const-elements-in-std-vector.patch
+
 # Rawhide (f35) glibc defines SIGSTKSZ as a long instead of a constant
 Patch76:	chromium-92.0.4515.107-rawhide-gcc-std-max-fix.patch
 # Do not download proprietary widevine module in the background (thanks Debian)
@@ -321,23 +317,13 @@ Patch79:	chromium-93.0.4577.63-widevine-no-download.patch
 
 # Fix crashes with components/cast_*
 # Thanks to Gentoo
-Patch80:	chromium-92.0.4515.107-EnumTable-crash.patch
+Patch80:	chromium-96-EnumTable-crash.patch
-# Fixes for python3
-Patch83:	chromium-92.0.4515.107-py3-fixes.patch
 # Add missing cmath header
 Patch84:	chromium-94.0.4606.71-remoting-missing-cmath-header.patch
 
 # Clean up clang-format for python3
 # thanks to Jon Nettleton
 Patch86:	chromium-94.0.4606.81-clang-format.patch
-# In file included from ../../components/cast_channel/enum_table.cc:5:
-# ../../components/cast_channel/enum_table.h:359:18: error: 'vector' in namespace 'std' does not name a template type
-#   359 |       const std::vector<Entry> data_;
-#       |                  ^~~~~~
-# ../../components/cast_channel/enum_table.h:18:1: note: 'std::vector' is defined in header '<vector>'; did you forget to '#include <vector>'?
-Patch93:	chromium-93.0.4577.63-vector-fix.patch
-# Fix NoDestructor issue with gcc
-Patch94:	chromium-94.0.4606.54-remoting-nodestructor-fix.patch
 # include full UrlResponseHead header
 Patch95:	chromium-93.0.4577.63-mojo-header-fix.patch
 # Fix multiple defines issue in webrtc/BUILD.gn
@@ -346,9 +332,6 @@ Patch96:	chromium-94.0.4606.54-webrtc-BUILD.gn-fix-multiple-defines.patch
 Patch97:	chromium-94.0.4606.61-remoting-extra-qualification.patch
 # From gentoo
 Patch98:	chromium-94.0.4606.71-InkDropHost-crash.patch
-# From upstream
-# https://chromium.googlesource.com/chromium/src/+/403393b908cefaed09592a4f25fe2cbd46317a68%5E%21/#F0
-Patch99:	chromium-94.0.4606.71-PartitionFree-nullptr-fix.patch
 
 
 
@@ -995,7 +978,6 @@ udev.
 %patch5 -p1 -b .nozlibmangle
 %patch6 -p1 -b .nounrar
 %patch7 -p1 -b .widevine-hack
-%patch8 -p1 -b .nofontconfigcache
 %patch9 -p1 -b .gcc9
 %patch10 -p1 -b .widevine-other-locations
 %if 0%{?build_with_python3}
@@ -1003,10 +985,6 @@ udev.
 %endif
 
 # Short term fixes (usually gcc and backports)
-%patch20 -p1 -b .maldoca-zlib
-%patch21 -p1 -b .eigen-avx-1
-%patch22 -p1 -b .eigen-avx-2
-%patch23 -p1 -b .eigen-avx-3
 %patch24 -p1 -b .xfce-maximize
 
 %patch51 -p1 -b .gcc-remoting-constexpr
@@ -1017,30 +995,29 @@ udev.
 %patch56 -p1 -b .missing-cstdint
 %patch57 -p1 -b .missing-cstring
 %patch58 -p1 -b .ffmpeg-deprecations
+%patch59 -p1 -b .CouponDB-include
 %patch60 -p1 -b .libyuv-aarch64
-%patch61 -p1 -b .quiche-include
+%patch61 -p1 -b .CommandLine-include
-%patch62 -p1 -b .BitstreamReader-namespace
+%patch62 -p1 -b .RestrictedCookieManager-tuple
-%patch63 -p1 -b .aarch64-cxxflags-addition
+%patch63 -p1 -b .DrmRenderNodePathFinder-include
-%patch64 -p1 -b .java-only-allowed
+%patch64 -p1 -b .aarch64-cxxflags-addition
-%patch65 -p1 -b .gn-gcc-cleanup
+%patch65 -p1 -b .java-only-allowed
-%patch66 -p1 -b .remoting-cstring
+%patch66 -p1 -b .gn-gcc-cleanup
-%patch67 -p1 -b .i686-textrels
+%patch67 -p1 -b .remoting-cstring
-%patch68 -p1 -b .aarch64-clearkeycdm-binutils-workaround
+%patch68 -p1 -b .i686-textrels
+%patch69 -p1 -b .aarch64-clearkeycdm-binutils-workaround
+%patch70 -p1 -b .no-const-elements-in-std-vector
 %if 0%{?fedora} >= 35
 %patch76 -p1 -b .sigstkszfix
 %endif
 %patch79 -p1 -b .widevine-no-download
 %patch80 -p1 -b .EnumTable-crash
-%patch83 -p1 -b .py3fixes
 %patch84 -p1 -b .remoting-missing-cmath-header
 %patch86 -p1 -b .clang-format-py3
-%patch93 -p1 -b .vector-fix
-%patch94 -p1 -b .remoting-nodestructor-fix
 %patch95 -p1 -b .mojo-header-fix
 %patch96 -p1 -b .webrtc-BUILD.gn-fix-multiple-defines
 %patch97 -p1 -b .remoting-extra-qualification
 %patch98 -p1 -b .InkDropHost-crash
-%patch99 -p1 -b .PartitionFree-nullptr-fix
 
 # Fedora branded user agent
 %if 0%{?fedora}
@@ -1349,6 +1326,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
 	'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' \
@@ -1494,7 +1472,6 @@ build/linux/unbundle/remove_bundled_libraries.py \
 	'third_party/tflite' \
 	'third_party/tflite/src/third_party/eigen3' \
 	'third_party/tflite/src/third_party/fft2d' \
-	'third_party/tflite-support' \
 	'third_party/ukey2' \
         'third_party/usb_ids' \
 	'third_party/usrsctp' \
@@ -2140,6 +2117,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
 
 
 %changelog
+* Fri Nov 19 2021 Tom Callaway <spot@fedoraproject.org> - 96.0.4664.45-1
+- update to 96.0.4664.45
+
 * Fri Nov 12 2021 Tom Callaway <spot@fedoraproject.org> - 95.0.4638.69-1
 - update to 95.0.4638.69
 

clean_ffmpeg.sh

@@ -238,6 +238,7 @@ manual_files="	libavcodec/aarch64/fft_neon.S \
 		libavcodec/mdct15.c \
 		libavcodec/mdct_template.c \
 		libavcodec/options.c \
+		libavcodec/pcm.c \
 		libavcodec/pel_template.c \
 		libavcodec/utils.c \
 		libavcodec/videodsp.c \

sources

@@ -21,4 +21,4 @@ SHA512 (NotoSansSymbols2-Regular.ttf) = 2644b42c3fdccfe12395f9b61553aced169a0f1d
 SHA512 (NotoSansTibetan-Regular.ttf) = fb5a48fcaea80eebe7d692f6fcf00d59d47658a358d0ec8e046fc559873f88bd595b2da474d2826abd9e9305f3741c69058d867b1e6048f37fe7d71b5d3af36a
 SHA512 (node-v12.22.6-linux-arm64.tar.xz) = 87ce5eb954deb1d0debe6fa02b28a3cc675e12fca1e51d44b123ab294aa39ce0c6b8ac9eae1e7a6e32673ea2c2d480651d9ba7eea73012f0529503eebe9eb34d
 SHA512 (node-v12.22.6-linux-x64.tar.xz) = e1b55c32343cb2ccc40d888c705414bebf9c46b02083d13731df79b1e79521b7277761f6bcca041e40e3a2e47c67bb8e7848aa2b919a9de5c2ebf62c4a9c7176
-SHA512 (chromium-95.0.4638.69-clean.tar.xz) = b4e7c917300ead59492b0817a3a73f74cebdb6daa62d90edf5f7df8a4de2cdeb100d45811611b5251bd50dab363ec54090fa39cfa97c7a194bdd6bca6c5e4072
+SHA512 (chromium-96.0.4664.45-clean.tar.xz) = b997cd95b5cf991e0352448c3ce635ada62fe49d3cc92d60f8dabf00cc6a202584f12b30e9a0d687163dee76892822b0d7d46a2d9737d0aa22d3992dfd31d706