The package rpms/chromium.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=9776d9fcf...
https://src.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=1568f2550....
Change:
+%ifarch i686 aarch64
+%ifarch i686
Thanks.
Full change:
============
commit 9776d9fcfe4849ef19d21b659998f493468c1a72
Author: Tom spot Callaway <spot(a)fedoraproject.org>
Date: Tue Oct 12 10:42:58 2021 -0400
disable -g2 on aarch64 too because of space issues
diff --git a/chromium.spec b/chromium.spec
index e7a7e8d..a028ca9 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -1159,8 +1159,8 @@ CHROMIUM_CORE_GN_DEFINES+='
system_libdir="lib64"'
%if %{official_build}
CHROMIUM_CORE_GN_DEFINES+=' is_official_build=true use_thin_lto=false is_cfi=false
chrome_pgo_phase=0 use_debug_fission=true'
sed -i 's|OFFICIAL_BUILD|GOOGLE_CHROME_BUILD|g'
tools/generate_shim_headers/generate_shim_headers.py
-# Too much debuginfo for i686
-%ifarch i686
+# Too much debuginfo for i686 and aarch64
+%ifarch i686 aarch64
sed -i 's|-g2|-g0|g' build/config/compiler/BUILD.gn
%endif
%endif
commit fd994e0e99f8109e118f904992be11933b037c42
Author: Tom spot Callaway <spot(a)fedoraproject.org>
Date: Mon Oct 11 11:32:30 2021 -0400
turn off use_all_cpus to see if that fixes the aarch64 timeouts
diff --git a/chromium.spec b/chromium.spec
index 19ec6f9..e7a7e8d 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -6,8 +6,8 @@
%endif
# This flag is so I can build things very fast on a giant system.
-# Koji now likes this (as long as I don't build for every target at once).
-%global use_all_cpus 1
+# Enabling this in koji causes aarch64 builds to timeout indefinitely.
+%global use_all_cpus 0
%if %{use_all_cpus}
%global numjobs %{_smp_build_ncpus}
commit 1568f25500740341450b793ec8b8430614befb65
Author: Tom spot Callaway <spot(a)fedoraproject.org>
Date: Sat Oct 9 17:55:23 2021 -0400
turn off debug symbols for i686
diff --git a/chromium.spec b/chromium.spec
index 3339e19..19ec6f9 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -1159,6 +1159,10 @@ CHROMIUM_CORE_GN_DEFINES+='
system_libdir="lib64"'
%if %{official_build}
CHROMIUM_CORE_GN_DEFINES+=' is_official_build=true use_thin_lto=false is_cfi=false
chrome_pgo_phase=0 use_debug_fission=true'
sed -i 's|OFFICIAL_BUILD|GOOGLE_CHROME_BUILD|g'
tools/generate_shim_headers/generate_shim_headers.py
+# Too much debuginfo for i686
+%ifarch i686
+sed -i 's|-g2|-g0|g' build/config/compiler/BUILD.gn
+%endif
%endif
%if %{useapikey}
CHROMIUM_CORE_GN_DEFINES+=' google_api_key="%{api_key}"'
commit f0a2189889cfab93c70b3d7f778756b780172e74
Author: Tom spot Callaway <spot(a)fedoraproject.org>
Date: Fri Oct 8 11:51:53 2021 -0400
94.0.4606.81
diff --git a/chromium-94.0.4606.81-clang-format.patch
b/chromium-94.0.4606.81-clang-format.patch
new file mode 100644
index 0000000..960e7a4
--- /dev/null
+++ b/chromium-94.0.4606.81-clang-format.patch
@@ -0,0 +1,37 @@
+diff -up chromium-94.0.4606.81/buildtools/linux64/clang-format.clang-format-py3
chromium-94.0.4606.81/buildtools/linux64/clang-format
+--- chromium-94.0.4606.81/buildtools/linux64/clang-format.clang-format-py3 2021-10-08
11:26:16.411861005 -0400
++++ chromium-94.0.4606.81/buildtools/linux64/clang-format 2021-10-08 11:32:16.005895508
-0400
+@@ -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
+@@ -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)
+ 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:
+- sys.stdout.write(open(inputfile).read())
++ sys.stdout.buffer.write(open(inputfile).read())
+
+ return 0
+
diff --git a/chromium.spec b/chromium.spec
index 35f61e1..3339e19 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -225,8 +225,8 @@ Name: chromium%{chromium_channel}%{nsuffix}
%else
Name: chromium%{chromium_channel}
%endif
-Version: %{majorversion}.0.4606.71
-Release: 2%{?dist}
+Version: %{majorversion}.0.4606.81
+Release: 1%{?dist}
%if %{?freeworld}
%if %{?shared}
# chromium-libs-media-freeworld
@@ -324,7 +324,7 @@ 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
+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_;
@@ -2115,6 +2115,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r
chrome-remote-deskt
%changelog
+* Fri Oct 8 2021 Tom Callaway <spot(a)fedoraproject.org> - 94.0.4606.81-1
+- update to 94.0.4606.81
+
* Wed Oct 6 2021 Tom Callaway <spot(a)fedoraproject.org> - 94.0.4606.71-2
- add official_build flag
- apply upstream patch to handle nullptr correctly in PartitionGetSizeEstimate()
diff --git a/sources b/sources
new file mode 100644
index 0000000..152d62b
--- /dev/null
+++ b/sources
@@ -0,0 +1,24 @@
+SHA512 (gelasio.zip) =
0a22def3eca8848161ee72453dc5f97cc52ed09ffe21834152f2535d3a71f404cdf1f6e1809564bacb86aae75278cbcb96cae52b537d3ccdc299b60d6d0bc53e
+SHA512 (MuktiNarrow-0.94.tar.bz2) =
f7abd429e2591eaa047d1ac982d97fa67dc1480c42e55b2a97861abd90918704dce90b6bb27dec7b6d696f188017a74de54a7b7f45281f0515923b90300959d1
+SHA512 (NotoSansCJKjp-hinted.zip) =
e7bcbc53a10b8ec3679dcade5a8a94cea7e1f60875ab38f2193b4fa8e33968e1f0abc8184a3df1e5210f6f5c731f96c727c6aa8f519423a29707d2dee5ada193
+SHA512 (lohit-gurmukhi-ttf-2.91.2.tar.gz) =
714ed72d201e7f8956d24e9d9f1526207beb91a604e88c02a8b0d145f19d9bfe1408ca290d1665ebef462ab3854365dcd9850529803277738e2585addf3e280a
+SHA512 (Arimo-BoldItalic.ttf) =
cb1f411f2630f2754dfb0244b3c56fde43650d603512d47c143bc0f24028da4d7ca2b35a633226ef9c502b97c63cfbd5a6d696934b3e60b2a98ad879b113a4c4
+SHA512 (Arimo-Bold.ttf) =
2853e5f41e6899baf226db2578aba09f2f88085eaea02da024621492d21e1af8bdefdefd354ea23dc4d5de5cb0d554085040a0108820f213e86dd532986fdb41
+SHA512 (Arimo-Italic.ttf) =
56ef918e5811dcd375e6cd8d79dc69f4db75d544639c0f6ac3a0343b3b4ef94b7dee5a6066f1558d8747a32bbee074256be68b943ff31cfbd2f5f32acfa7c1c5
+SHA512 (Arimo-Regular.ttf) =
05e6aa6b785b0038a8e0e0a8a618a1b8e907a700be302148eaebc91cfac3c9e2d9acf90b9d077ff3b9ff54bd5f8a9c522a039cff6103cdeee54be29b6a0b355f
+SHA512 (Cousine-BoldItalic.ttf) =
2125aa9f5db4ae4a3725d308b6afbfbce5957f3c96a3c5fcba8ebf5cd167017d9c7023391e947ed68d12fa97e2cba3f156a3acca276d9f5ed50df7d78c07f918
+SHA512 (Cousine-Bold.ttf) =
1759fd23419ae0e1bfc9be92abb9cb0c74084ce85e7f53c055d86ec3d62da83169d0d67ed96fd4e496b28acf382933d63448459108b109d8202db7f18f05caab
+SHA512 (Cousine-Italic.ttf) =
ec3fc9d940b748dbbc64aa66184413a78ae2b085181eed563449df044b891e951e8feebd865be5be42f0cd001acf5bdce9084a006f9b5be32f096f7df0dc7700
+SHA512 (Cousine-Regular.ttf) =
a665a6a4a5583079eb87509e2da7d6bd06965e6a7655217302b088caef942ae9ad63e6cffda18d0001fc9ab2284836766843e46bfdacd188b54f39d7855f36a0
+SHA512 (Tinos-BoldItalic.ttf) =
2574de2add94ef976b731fac688951fab49574c9b0ccd259ba647ea3598ca026bcfb88e2ea3f19effb3af71fdc0eb5fa9973f0b6e996c22185c5f2aab5a23fdd
+SHA512 (Tinos-Bold.ttf) =
54aeca804c06a4d5c57ade596e73df91a6a1c4401c4aadba55d987b3fb73045d35f3df02678b59abb77c4914ec741755536c0adf808c931e4b77848c52c229c4
+SHA512 (Tinos-Italic.ttf) =
d4f4f096110ef98a781a2a0e0d319317e5f84e650fe6f4d4f6b0e22a16414278217f37497b904a18540273c0e2d79d4f1faabde3b0eb5446283b318c73bafb38
+SHA512 (Tinos-Regular.ttf) =
58085c5dac6d067d60ba2ab3220c4a0cc1efcf279cadfcfb8746a5e5fa1a6f6daa62750dc2051b3b2d8a51b4d2e9bb0f66594caf2253c0870ed9c7286fa45e8f
+SHA512 (Ahem.ttf) =
aeb64b10ab9c87860714cb60b4900254b13dc52c51319256a1a3722c882026ab7c616bf628fbc2fe14e38a6003f3a481af60b52a7ed62071d28ddaf428e4e3fd
+SHA512 (xcb-proto-1.14.tar.xz) =
de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690
+SHA512 (depot_tools.git-master.tar.gz) =
dc323888812b66cc92c53a24a8a58ccf9e2961be67aa21852bd091b8b49569071f06ae9104cb58950e6253ac3a29f0db0663e9f35ef2b1ea28696efb38b42708
+SHA512 (NotoSansSymbols2-Regular.ttf) =
2644b42c3fdccfe12395f9b61553aced169a0f1dc09f5a0fd7898e9d0a372ee4422b6b1cdab3c86ecc91db437e9ae8a951e64e85edc3ac9e9fca428852dbb2ad
+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-94.0.4606.81-clean.tar.xz) =
4cc14e91b244d59b30931e7ff90e6a031784d1da9f2e3e72172757d0a76305ccd265f5456779bfcb893482d70a5cc86b52a0d26e255331505d5c2acc036f87e9
commit 7ff4192252c3d72af0593210a619246db3355ccf
Author: Tom spot Callaway <spot(a)fedoraproject.org>
Date: Fri Oct 8 11:13:28 2021 -0400
use is_official_build=true
diff --git a/chromium-94.0.4606.71-PartitionFree-nullptr-fix.patch
b/chromium-94.0.4606.71-PartitionFree-nullptr-fix.patch
new file mode 100644
index 0000000..29777ef
--- /dev/null
+++ 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)) {
diff --git a/chromium-94.0.4606.71-remoting-missing-cmath-header.patch
b/chromium-94.0.4606.71-remoting-missing-cmath-header.patch
new file mode 100644
index 0000000..060c71b
--- /dev/null
+++ 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>
+
diff --git a/chromium.spec b/chromium.spec
index 149273e..35f61e1 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -6,13 +6,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 1
%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
@@ -223,7 +226,7 @@ Name: chromium%{chromium_channel}%{nsuffix}
Name: chromium%{chromium_channel}
%endif
Version: %{majorversion}.0.4606.71
-Release: 1%{?dist}
+Release: 2%{?dist}
%if %{?freeworld}
%if %{?shared}
# chromium-libs-media-freeworld
@@ -310,13 +313,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-Conver...
Patch81: chromium-94-ConversionStorageSql-lambda.patch
#
https://github.com/stha09/chromium-patches/blob/master/chromium-94-Custom...
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
@@ -336,6 +341,10 @@
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/+/403393b908cefaed09592a4f...
+Patch99: chromium-94.0.4606.71-PartitionFree-nullptr-fix.patch
+
# Use lstdc++ on EPEL7 only
@@ -1006,6 +1015,7 @@ udev.
%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
@@ -1013,6 +1023,7 @@ udev.
%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}
@@ -1145,6 +1156,10 @@ CHROMIUM_CORE_GN_DEFINES+=' is_debug=false'
%ifarch x86_64 aarch64
CHROMIUM_CORE_GN_DEFINES+=' system_libdir="lib64"'
%endif
+%if %{official_build}
+CHROMIUM_CORE_GN_DEFINES+=' is_official_build=true use_thin_lto=false is_cfi=false
chrome_pgo_phase=0 use_debug_fission=true'
+sed -i 's|OFFICIAL_BUILD|GOOGLE_CHROME_BUILD|g'
tools/generate_shim_headers/generate_shim_headers.py
+%endif
%if %{useapikey}
CHROMIUM_CORE_GN_DEFINES+=' google_api_key="%{api_key}"'
%endif
@@ -2039,9 +2054,11 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r
chrome-remote-deskt
%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
%if %{build_headless}
%files headless
@@ -2098,6 +2115,10 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r
chrome-remote-deskt
%changelog
+* Wed Oct 6 2021 Tom Callaway <spot(a)fedoraproject.org> - 94.0.4606.71-2
+- add official_build flag
+- apply upstream patch to handle nullptr correctly in PartitionGetSizeEstimate()
+
* Tue Oct 5 2021 Tom Callaway <spot(a)fedoraproject.org> - 94.0.4606.71-1
- update to 94.0.4606.71
diff --git a/sources b/sources
deleted file mode 100644
index b0e0c93..0000000
--- a/sources
+++ /dev/null
@@ -1,24 +0,0 @@
-SHA512 (gelasio.zip) =
0a22def3eca8848161ee72453dc5f97cc52ed09ffe21834152f2535d3a71f404cdf1f6e1809564bacb86aae75278cbcb96cae52b537d3ccdc299b60d6d0bc53e
-SHA512 (MuktiNarrow-0.94.tar.bz2) =
f7abd429e2591eaa047d1ac982d97fa67dc1480c42e55b2a97861abd90918704dce90b6bb27dec7b6d696f188017a74de54a7b7f45281f0515923b90300959d1
-SHA512 (NotoSansCJKjp-hinted.zip) =
e7bcbc53a10b8ec3679dcade5a8a94cea7e1f60875ab38f2193b4fa8e33968e1f0abc8184a3df1e5210f6f5c731f96c727c6aa8f519423a29707d2dee5ada193
-SHA512 (lohit-gurmukhi-ttf-2.91.2.tar.gz) =
714ed72d201e7f8956d24e9d9f1526207beb91a604e88c02a8b0d145f19d9bfe1408ca290d1665ebef462ab3854365dcd9850529803277738e2585addf3e280a
-SHA512 (Arimo-BoldItalic.ttf) =
cb1f411f2630f2754dfb0244b3c56fde43650d603512d47c143bc0f24028da4d7ca2b35a633226ef9c502b97c63cfbd5a6d696934b3e60b2a98ad879b113a4c4
-SHA512 (Arimo-Bold.ttf) =
2853e5f41e6899baf226db2578aba09f2f88085eaea02da024621492d21e1af8bdefdefd354ea23dc4d5de5cb0d554085040a0108820f213e86dd532986fdb41
-SHA512 (Arimo-Italic.ttf) =
56ef918e5811dcd375e6cd8d79dc69f4db75d544639c0f6ac3a0343b3b4ef94b7dee5a6066f1558d8747a32bbee074256be68b943ff31cfbd2f5f32acfa7c1c5
-SHA512 (Arimo-Regular.ttf) =
05e6aa6b785b0038a8e0e0a8a618a1b8e907a700be302148eaebc91cfac3c9e2d9acf90b9d077ff3b9ff54bd5f8a9c522a039cff6103cdeee54be29b6a0b355f
-SHA512 (Cousine-BoldItalic.ttf) =
2125aa9f5db4ae4a3725d308b6afbfbce5957f3c96a3c5fcba8ebf5cd167017d9c7023391e947ed68d12fa97e2cba3f156a3acca276d9f5ed50df7d78c07f918
-SHA512 (Cousine-Bold.ttf) =
1759fd23419ae0e1bfc9be92abb9cb0c74084ce85e7f53c055d86ec3d62da83169d0d67ed96fd4e496b28acf382933d63448459108b109d8202db7f18f05caab
-SHA512 (Cousine-Italic.ttf) =
ec3fc9d940b748dbbc64aa66184413a78ae2b085181eed563449df044b891e951e8feebd865be5be42f0cd001acf5bdce9084a006f9b5be32f096f7df0dc7700
-SHA512 (Cousine-Regular.ttf) =
a665a6a4a5583079eb87509e2da7d6bd06965e6a7655217302b088caef942ae9ad63e6cffda18d0001fc9ab2284836766843e46bfdacd188b54f39d7855f36a0
-SHA512 (Tinos-BoldItalic.ttf) =
2574de2add94ef976b731fac688951fab49574c9b0ccd259ba647ea3598ca026bcfb88e2ea3f19effb3af71fdc0eb5fa9973f0b6e996c22185c5f2aab5a23fdd
-SHA512 (Tinos-Bold.ttf) =
54aeca804c06a4d5c57ade596e73df91a6a1c4401c4aadba55d987b3fb73045d35f3df02678b59abb77c4914ec741755536c0adf808c931e4b77848c52c229c4
-SHA512 (Tinos-Italic.ttf) =
d4f4f096110ef98a781a2a0e0d319317e5f84e650fe6f4d4f6b0e22a16414278217f37497b904a18540273c0e2d79d4f1faabde3b0eb5446283b318c73bafb38
-SHA512 (Tinos-Regular.ttf) =
58085c5dac6d067d60ba2ab3220c4a0cc1efcf279cadfcfb8746a5e5fa1a6f6daa62750dc2051b3b2d8a51b4d2e9bb0f66594caf2253c0870ed9c7286fa45e8f
-SHA512 (Ahem.ttf) =
aeb64b10ab9c87860714cb60b4900254b13dc52c51319256a1a3722c882026ab7c616bf628fbc2fe14e38a6003f3a481af60b52a7ed62071d28ddaf428e4e3fd
-SHA512 (xcb-proto-1.14.tar.xz) =
de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690
-SHA512 (depot_tools.git-master.tar.gz) =
dc323888812b66cc92c53a24a8a58ccf9e2961be67aa21852bd091b8b49569071f06ae9104cb58950e6253ac3a29f0db0663e9f35ef2b1ea28696efb38b42708
-SHA512 (NotoSansSymbols2-Regular.ttf) =
2644b42c3fdccfe12395f9b61553aced169a0f1dc09f5a0fd7898e9d0a372ee4422b6b1cdab3c86ecc91db437e9ae8a951e64e85edc3ac9e9fca428852dbb2ad
-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-94.0.4606.71-clean.tar.xz) =
efed6617109901bee04145772e34260a9c45bc72cc4274cac32db1330f22f3867bc934edf75d2f144e43e52bce052d1f1e0300c046d6d7d823c2a0341a9c6469
commit 77abc3b15f87293a7f8217b4a93d87a14846575e
Author: Tom spot Callaway <spot(a)fedoraproject.org>
Date: Tue Oct 5 17:10:57 2021 -0400
update to 94.0.4606.71
diff --git a/chromium-94.0.4606.71-InkDropHost-crash.patch
b/chromium-94.0.4606.71-InkDropHost-crash.patch
new file mode 100644
index 0000000..b5e2794
--- /dev/null
+++ 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_;
diff --git a/chromium.spec b/chromium.spec
index 42404ca..149273e 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -222,7 +222,7 @@ Name: chromium%{chromium_channel}%{nsuffix}
%else
Name: chromium%{chromium_channel}
%endif
-Version: %{majorversion}.0.4606.61
+Version: %{majorversion}.0.4606.71
Release: 1%{?dist}
%if %{?freeworld}
%if %{?shared}
@@ -334,6 +334,8 @@ 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
# Use lstdc++ on EPEL7 only
@@ -1010,6 +1012,7 @@ udev.
%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
# Fedora branded user agent
%if 0%{?fedora}
@@ -2095,6 +2098,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r
chrome-remote-deskt
%changelog
+* Tue Oct 5 2021 Tom Callaway <spot(a)fedoraproject.org> - 94.0.4606.71-1
+- update to 94.0.4606.71
+
* Fri Sep 24 2021 Tom Callaway <spot(a)fedoraproject.org> - 94.0.4606.61-1
- update to 94.0.4606.61
diff --git a/sources b/sources
index e1d64f9..b0e0c93 100644
--- a/sources
+++ b/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-94.0.4606.61-clean.tar.xz) =
376d619e4bc4d5a5641aaf22d855889465c9b8990dcbc83517548edc9ada2e7087b66e839090c82cbbe2d46c2e98dc7f4b6461390a1f0d1d298cc698d1736b5e
+SHA512 (chromium-94.0.4606.71-clean.tar.xz) =
efed6617109901bee04145772e34260a9c45bc72cc4274cac32db1330f22f3867bc934edf75d2f144e43e52bce052d1f1e0300c046d6d7d823c2a0341a9c6469