chromium: Chromium 94.0.4606.81 -> 95.0.4638.54

6 files changed, 124 insertions, 58 deletions

diff --git a/chromium/chromium/chromium-gcc-11-r911787.patch b/chromium/chromium/chromium-gcc-11-r911787.patch
deleted file mode 100644
index a051d1e..0000000
--- a/chromium/chromium/chromium-gcc-11-r911787.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1d1ec5b48c4e55c273d801aa82d57e9b1e24f239 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Fri, 13 Aug 2021 16:57:20 +0000
-Subject: [PATCH] IWYU: add memory for std::unique_ptr in blink::CustomSpaces
-
-Bug: None
-Change-Id: I415e68638d230d201f6cf72b109ad39da917a53b
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3094266
-Reviewed-by: Anton Bikineev <bikineev@chromium.org>
-Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
-Cr-Commit-Position: refs/heads/master@{#911787}
----
- .../blink/renderer/platform/heap/v8_wrapper/custom_spaces.h      | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h b/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h
-index df0465a6a5658..640cb332c35e1 100644
---- a/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h
-+++ b/third_party/blink/renderer/platform/heap/v8_wrapper/custom_spaces.h
-@@ -5,6 +5,7 @@
- #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_V8_WRAPPER_CUSTOM_SPACES_H_
- #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_HEAP_V8_WRAPPER_CUSTOM_SPACES_H_
- 
-+#include <memory>
- #include <vector>
- 
- #include "third_party/blink/renderer/platform/platform_export.h"
--- 
-2.31.1
-
diff --git a/chromium/chromium/chromium-gcc-11-r921717.patch b/chromium/chromium/chromium-gcc-11-r921717.patch
new file mode 100644
index 0000000..75bae80
--- /dev/null
+++ b/chromium/chromium/chromium-gcc-11-r921717.patch
@@ -0,0 +1,34 @@
+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-quiche-stddef.patch b/chromium/chromium/chromium-quiche-stddef.patch
new file mode 100644
index 0000000..2358c85
--- /dev/null
+++ b/chromium/chromium/chromium-quiche-stddef.patch
@@ -0,0 +1,28 @@
+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-ruy-limits.patch b/chromium/chromium/chromium-ruy-limits.patch
deleted file mode 100644
index 1d1fab3..0000000
--- a/chromium/chromium/chromium-ruy-limits.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 3c93cda8211efa01128d48950f0d6ee5233c5b9b Mon Sep 17 00:00:00 2001
-From: stha09 <51720730+stha09@users.noreply.github.com>
-Date: Thu, 6 May 2021 18:31:30 +0200
-Subject: [PATCH] IWYU: include limits for std::numeric_limits (#253)
-
----
- ruy/block_map.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/ruy/block_map.cc b/ruy/block_map.cc
-index 6c01e52..e04e7af 100644
---- a/third_party/ruy/src/ruy/block_map.cc
-+++ b/third_party/ruy/src/ruy/block_map.cc
-@@ -17,6 +17,7 @@ limitations under the License.
- 
- #include <algorithm>
- #include <cstdint>
-+#include <limits>
- 
- #ifdef RUY_MAKEBLOCKMAP_DEBUG
- #include <cstdio>
--- 
-2.31.1
-
diff --git a/chromium/chromium/chromium-webrtc-template.patch b/chromium/chromium/chromium-webrtc-template.patch
new file mode 100644
index 0000000..bb1ec4f
--- /dev/null
+++ b/chromium/chromium/chromium-webrtc-template.patch
@@ -0,0 +1,49 @@
+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 4ffd048..0c2dd31 100644
--- a/chromium/chromium/chromium.spec
+++ b/chromium/chromium/chromium.spec
@@ -47,7 +47,7 @@
 %bcond_with fedora_compilation_flags
 
 Name:       chromium
-Version:    94.0.4606.81
+Version:    95.0.4638.54
 Release:    100%{?dist}
 Summary:    A WebKit (Blink) powered web browser
 
@@ -105,8 +105,9 @@ Patch20:    chromium-jinja2-python-3.10-collections.patch
 Patch21:    chromium-breakpad-glibc-2.34-signal.patch
 
 # Pull upstream patches
-Patch30:    chromium-ruy-limits.patch
-Patch31:    chromium-gcc-11-r911787.patch
+Patch30:    chromium-quiche-stddef.patch
+Patch31:    chromium-webrtc-template.patch
+Patch32:    chromium-gcc-11-r921717.patch
 
 # I don't have time to test whether it work on other architectures
 ExclusiveArch: x86_64
@@ -362,6 +363,9 @@ find -type f -exec \
     third_party/lss \
     third_party/lzma_sdk \
     third_party/mako \
+    third_party/maldoca \
+    third_party/maldoca/src/third_party/tensorflow_protos \
+    third_party/maldoca/src/third_party/zlibwrapper \
     third_party/markupsafe \
     third_party/mesa \
     third_party/metrics_proto \
@@ -552,12 +556,12 @@ gn_args=(
     use_system_minigbm=true
     use_xkbcommon=true
     ozone_auto_platforms=false
+    'ozone_platform="x11"'
     ozone_platform_headless=true
     ozone_platform_wayland=true
     ozone_platform_x11=true
     rtc_use_pipewire=true
     rtc_link_pipewire=true
-    'rtc_pipewire_version="0.3"'
     enable_hangout_services_extension=false
     enable_nacl=false
     fatal_linker_warnings=false
@@ -718,6 +722,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sat Oct 23 2021 - Ting-Wei Lan <lantw44@gmail.com> - 95.0.4638.54-100
+- Update to 95.0.4638.54
+- Set the default ozone platform to X11 because it cannot automatically choose
+  the appropriate platform at runtime
+
 * Fri Oct 08 2021 - Ting-Wei Lan <lantw44@gmail.com> - 94.0.4606.81-100
 - Update to 94.0.4606.81