Update to 94.0.4606.81

1 year ago · db7a03bd93
6 changed files with 106 additions and 38 deletions
--- a/chromium-93.0.4577.63-clang-format.patch
+++ b/chromium-93.0.4577.63-clang-format.patch
@ -1,34 +1,37 @@
 diff -up chromium-93.0.4577.63/buildtools/linux64/clang-format.clang-format-py3 chromium-93.0.4577.63/buildtools/linux64/clang-format
 --- chromium-93.0.4577.63/buildtools/linux64/clang-format.clang-format-py3	2021-09-03 04:42:46.736294345 +0000
 +++ chromium-93.0.4577.63/buildtools/linux64/clang-format	2021-09-03 04:59:55.296512600 +0000
-@@ -10,9 +10,9 @@ import sys
- args = sys.argv[1:]
- inputfiles = [a for a in args if not a.startswith('-')]
- 
-contents = ''
-+contents = b''
- if '-' in args or not inputfiles:
+@@ -12,9 +12,9 @@ def main():
+  args = sys.argv[1:]
+  inputfiles = [a for a in args if not a.startswith('-')]
+
+- contents = ''
+ contents = b''
+  if '-' in args or not inputfiles:
 - contents = sys.stdin.read()
 + contents = sys.stdin.buffer.read()
- 
- # Tarball builds may or may not have depot_tools in $PATH. In the former case,
- # running 'clang-format' will call back into this script infinitely. Strip off
-@@ -34,14 +34,14 @@ try:
+
+  # Tarball builds may or may not have depot_tools in $PATH. In the former case,
+  # running 'clang-format' will call back into this script infinitely. Strip off
+@@ -37,17 +37,17 @@ def main():
 stdout, stderr = proc.communicate(input=contents)
 # Ignore if clang-format fails. Eg: it may be too old to support C++14.
 if proc.returncode == 0:
-  sys.stdout.write(stdout)
-  sys.stderr.write(stderr)
-+  sys.stdout.buffer.write(stdout)
-+  sys.stderr.buffer.write(stderr)
-  sys.exit(0)
- except OSError:
+- sys.stdout.write(stdout)
+- sys.stderr.write(stderr)
+ sys.stdout.buffer.write(stdout)
+ sys.stderr.buffer.write(stderr)
+ return 0
+  except OSError:
 # Ignore if clang-format is not installed.
 pass
- 
- # If any failure happens, continue with unformatted files.
-sys.stdout.write(contents)
-+sys.stdout.buffer.write(contents)
- for inputfile in inputfiles:
+
+  # If any failure happens, continue with unformatted files.
+- sys.stdout.write(contents)
+ sys.stdout.buffer.write(contents)
+  for inputfile in inputfiles:
 - sys.stdout.write(open(inputfile).read())
 + sys.stdout.buffer.write(open(inputfile).read())
+
+ return 0
+
--- a/chromium-94.0.4606.71-InkDropHost-crash.patch
+++ b/chromium-94.0.4606.71-InkDropHost-crash.patch
@ -0,0 +1,24 @@
+diff -up chromium-94.0.4606.71/ui/views/animation/ink_drop_host_view.h.InkDropHost-crash chromium-94.0.4606.71/ui/views/animation/ink_drop_host_view.h
+--- chromium-94.0.4606.71/ui/views/animation/ink_drop_host_view.h.InkDropHost-crash	2021-10-05 16:04:46.313586509 -0400
+++ chromium-94.0.4606.71/ui/views/animation/ink_drop_host_view.h	2021-10-05 16:05:12.213732558 -0400
+@@ -228,6 +228,11 @@ class VIEWS_EXPORT InkDropHost {
+ // Used to observe View and inform the InkDrop of host-transform changes.
+ ViewLayerTransformObserver host_view_transform_observer_;
+ 
+ // Declared before |ink_drop_|, because InkDropImpl may call
+ // RemoveInkDropLayer on partly destructed InkDropHost. In
+ // that case |ink_drop_mask_| must be still valid.
+ std::unique_ptr<views::InkDropMask> ink_drop_mask_;
+
+ // Should not be accessed directly. Use GetInkDrop() instead.
+ std::unique_ptr<InkDrop> ink_drop_;
+ 
+@@ -249,8 +254,6 @@ class VIEWS_EXPORT InkDropHost {
+ int ink_drop_small_corner_radius_ = 2;
+ int ink_drop_large_corner_radius_ = 4;
+ 
+- std::unique_ptr<views::InkDropMask> ink_drop_mask_;
+-
+ base::RepeatingCallback<std::unique_ptr<InkDrop>()> create_ink_drop_callback_;
+ base::RepeatingCallback<std::unique_ptr<InkDropRipple>()>
+ create_ink_drop_ripple_callback_;
--- a/chromium-94.0.4606.71-PartitionFree-nullptr-fix.patch
+++ b/chromium-94.0.4606.71-PartitionFree-nullptr-fix.patch
@ -0,0 +1,15 @@
+diff -up chromium-94.0.4606.71/base/allocator/allocator_shim_default_dispatch_to_partition_alloc.cc.nullptr-fix chromium-94.0.4606.71/base/allocator/allocator_shim_default_dispatch_to_partition_alloc.cc
+--- chromium-94.0.4606.71/base/allocator/allocator_shim_default_dispatch_to_partition_alloc.cc.nullptr-fix	2021-10-06 15:23:11.590602162 -0400
+++ chromium-94.0.4606.71/base/allocator/allocator_shim_default_dispatch_to_partition_alloc.cc	2021-10-06 15:29:21.508762249 -0400
+@@ -380,7 +380,10 @@ void PartitionFree(const AllocatorDispat
+ size_t PartitionGetSizeEstimate(const AllocatorDispatch*,
+ void* address,
+ void* context) {
+- PA_DCHECK(address);
+ // This is used to implement malloc_usable_size(3). Per its man page, "if ptr
+ // is NULL, 0 is returned".
+ if (!address)
+ return 0;
+ 
+ #if defined(OS_APPLE)
+ if (!base::IsManagedByPartitionAlloc(address)) {
--- a/chromium-94.0.4606.71-remoting-missing-cmath-header.patch
+++ b/chromium-94.0.4606.71-remoting-missing-cmath-header.patch
@ -0,0 +1,11 @@
+diff -up chromium-94.0.4606.71/remoting/codec/codec_test.cc.missing-header chromium-94.0.4606.71/remoting/codec/codec_test.cc
+--- chromium-94.0.4606.71/remoting/codec/codec_test.cc.missing-header	2021-10-07 18:01:11.846157616 +0000
+++ chromium-94.0.4606.71/remoting/codec/codec_test.cc	2021-10-07 18:01:22.913662166 +0000
+@@ -8,6 +8,7 @@
+ #include <stdint.h>
+ #include <stdlib.h>
+ 
+#include <cmath>
+ #include <memory>
+ #include <utility>
+ 
--- a/2
+++ b/2
@ -20,5 +20,5 @@ SHA256 (NotoSansTibetan-Regular.ttf) = 5a45f430812ef981952553ef6dd6fa04c7849e978
 SHA256 (node-v12.22.6-linux-x64.tar.xz) = 80fc80cdb3d829ea4d752c2e52067a426f6c4fd629ecca5a858d268af8d5ec7e
 SHA256 (node-v12.22.6-linux-arm64.tar.xz) = 39b1ee686c78315c04593d2e216595d052ae3378d9e50a0a72d8f2dc95e69e58
 SHA256 (xcb-proto-1.14.tar.xz) = 186a3ceb26f9b4a015f5a44dcc814c93033a5fc39684f36f1ecc79834416a605
-SHA256 (chromium-94.0.4606.71.tar.xz) = cabbba2e608c5ec110850b14ee5fead2608c44447a52edb80e2ba8261be3dc5b
+SHA256 (chromium-94.0.4606.81.tar.xz) = 7071aa2b2caf48094c2ae816395948b4daec940606f4982ad5bbf68e5d2de598
 SHA256 (ungoogled-chromium-94.0.4606.71-1.tar.gz) = 04a73a707205ab6461213fbfd25ecade807e6b609b14aa632a1ec777e3903b4b
--- a/ungoogled-chromium.spec
+++ b/ungoogled-chromium.spec
@ -9,13 +9,16 @@
 %endif

 # This flag is so I can build things very fast on a giant system.
-# Do not enable in Koji builds.
+# Koji now likes this (as long as I don't build for every target at once).
 %global use_all_cpus 0

 %if %{use_all_cpus}
 %global numjobs %{_smp_build_ncpus}
 %endif

+# official builds have less debugging and go faster... but we have to shut some things off.
+%global official_build 1
+
 # Fancy build status, so we at least know, where we are..
 # %1 where
 # %2 what
@ -184,7 +187,7 @@ Name: ungoogled-chromium%{nsuffix}
 %else
 Name: ungoogled-chromium
 %endif
-Version:	%{majorversion}.0.4606.71
+Version:	%{majorversion}.0.4606.81
 Release:	1%{?dist}.%{revision}
 %if %{?freeworld}
 # chromium-freeworld
@ -264,13 +267,15 @@ 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
-
 # https://github.com/stha09/chromium-patches/blob/master/chromium-94-ConversionStorageSql-lambda.patch
 Patch81:	chromium-94-ConversionStorageSql-lambda.patch
 # https://github.com/stha09/chromium-patches/blob/master/chromium-94-CustomSpaces-include.patch
 Patch82:	chromium-94-CustomSpaces-include.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-93.0.4577.63-clang-format.patch
@ -288,6 +293,12 @@ Patch95:	chromium-93.0.4577.63-mojo-header-fix.patch
 Patch96:	chromium-94.0.4606.54-webrtc-BUILD.gn-fix-multiple-defines.patch
 # Fix extra qualification error
 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
+


 # Use lstdc++ on EPEL7 only
@ -335,10 +346,6 @@ Patch503: chromium-manpage.patch
 # RPM Fusion patches [free/chromium-browser-privacy]:
 Patch600: chromium-default-user-data-dir.patch

-# ungoogled-chromium platform patches
-Patch700: chromium-94.0.4606.61-ungoogled-pref-fix.patch
-Patch701: chromium-94.0.4606.61-ungoogled-safe-browsing-fix.patch
-
 # Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
 # http://build.chromium.org/buildbot/official/
 # For Chromium Fedora use chromium-latest.py --stable --ffmpegclean --ffmpegarm
@ -778,12 +785,15 @@ ln -s depot_tools-%{depot_tools_revision} ../depot_tools
 %patch81 -p1 -b .ConversionStorageSql-lambda-include
 %patch82 -p1 -b .CustomSpaces-include
 %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


 # EPEL specific patches
@ -821,10 +831,6 @@ ln -s depot_tools-%{depot_tools_revision} ../depot_tools
 # RPM Fusion patches [free/chromium-browser-privacy]:
 %patch600 -p1 -b .default-user-dir

-# ungoogled-chromium platform patches
-%patch700 -p1 -b .ungoogled-pref-fix
-%patch701 -p1 -b .ungoogled-safebrowsing-fix
-
 # Change shebang in all relevant files in this directory and all subdirectories
 # See `man find` for how the `-exec command {} +` syntax works
 %if 0%{?build_with_python3}
@ -912,10 +918,14 @@ popd

 # Core defines are flags that are true for both the browser and headless.
 UNGOOGLED_CHROMIUM_GN_DEFINES=""
-UNGOOGLED_CHROMIUM_GN_DEFINES+=' is_debug=false is_official_build=false is_unsafe_developer_build=false dcheck_always_on=false'
+UNGOOGLED_CHROMIUM_GN_DEFINES+=' is_debug=false is_unsafe_developer_build=false dcheck_always_on=false'
 %ifarch x86_64 aarch64
 UNGOOGLED_CHROMIUM_GN_DEFINES+=' system_libdir="lib64"'
 %endif
+%if %{official_build}
+CHROMIUM_CORE_GN_DEFINES+=' is_official_build=true'
+sed -i 's|OFFICIAL_BUILD|GOOGLE_CHROME_BUILD|g' tools/generate_shim_headers/generate_shim_headers.py
+%endif
 UNGOOGLED_CHROMIUM_GN_DEFINES+=' google_api_key="%{api_key}" google_default_client_id="%{default_client_id}" google_default_client_secret="%{default_client_secret}"'
 UNGOOGLED_CHROMIUM_GN_DEFINES+=' is_clang=false use_sysroot=false disable_fieldtrial_testing_config=true use_lld=false rtc_enable_symbol_export=true'
 UNGOOGLED_CHROMIUM_GN_DEFINES+=' use_gold=false'
@ -1613,9 +1623,11 @@ fi
 %lang(zh_CN) %{chromium_path}/locales/zh-CN.pak*
 %lang(zh_TW) %{chromium_path}/locales/zh-TW.pak*
 # These are psuedolocales, not real ones.
-# So we just include them always.
+# They only get generated when is_official_build=false
+%if ! %{official_build}
 %{chromium_path}/locales/ar-XB.pak*
 %{chromium_path}/locales/en-XA.pak*
+%endif

 %{_bindir}/chromedriver
 %{chromium_path}/chromedriver
@ -1623,16 +1635,19 @@ fi
 %endif

 %changelog
+* Fri Oct 8 2021 wchen342 <[email protected]> - 94.0.4606.81-1
+- update Chromium to 94.0.4606.81
+
 * Fri Oct 1 2021 wchen342 <[email protected]> - 94.0.4606.71-1
 - update Chromium to 94.0.4606.71

-* Wed Sep 28 2021 wchen342 <[email protected]> - 94.0.4606.61-1
+* Thu Sep 28 2021 wchen342 <[email protected]> - 94.0.4606.61-1
 - update Chromium to 94.0.4606.61

 * Wed Sep 22 2021 wchen342 <[email protected]> - 93.0.4577.82-1
 - update Chromium to 93.0.4577.82

-* Mon Sep 4 2021 wchen342 <[email protected]> - 93.0.4577.63-1
+* Sat Sep 4 2021 wchen342 <[email protected]> - 93.0.4577.63-1
 - update Chromium to 93.0.4577.63

 * Mon Aug 9 2021 wchen342 <[email protected]> - 92.0.4515.131-1