Merge branch 'master' into f31

This commit is contained in:
Tom Callaway 2020-03-11 09:30:13 -04:00
commit d4adf7181e
2 changed files with 6 additions and 13 deletions

View File

@ -158,7 +158,7 @@ Name: chromium%{chromium_channel}%{nsuffix}
%else
Name: chromium%{chromium_channel}
%endif
Version: %{majorversion}.0.3987.122
Version: %{majorversion}.0.3987.132
Release: 1%{?dist}
%if %{?freeworld}
%if %{?shared}
@ -224,11 +224,6 @@ Patch57: chromium-78-protobuf-export.patch
Patch59: chromium-77-clang.patch
# /../../ui/base/cursor/ozone/bitmap_cursor_factory_ozone.cc:53:15: error: 'find_if' is not a member of 'std'; did you mean 'find'?
Patch63: chromium-79.0.3945.56-fix-find_if.patch
# Work around situation with gcc10 where
# modifying a const object is not allowed in a constant expression
# except in a very specific case in c++17
# https://bugs.chromium.org/p/chromium/issues/detail?id=1045963
Patch64: chromium-79.0.3945.130-gcc10-use-c++17-to-work-around-ugly-angle-code.patch
# https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-80-gcc-incomplete-type.patch
Patch65: chromium-80-gcc-incomplete-type.patch
# https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-80-include.patch
@ -247,8 +242,6 @@ Patch71: chromium-80.0.3987.87-missing-string-header.patch
Patch72: chromium-80.0.3987.87-missing-cstdint-header.patch
# ../../third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h:34:3: error: 'size_t' does not name a type
Patch73: chromium-80.0.3987.106-missing-cstddef-header.patch
# Because of Patch64, we need to force std::as_const with c++17
Patch74: chromium-80.0.3987.87-fix-for-c++17.patch
# Missing <cstring> (thanks c++17)
Patch75: chromium-80.0.3987.106-missing-cstring-header.patch
@ -790,10 +783,6 @@ udev.
%patch57 -p1 -b .protobuf-export
%patch59 -p1 -b .clang-supports-location-builtins
%patch63 -p1 -b .fix-find_if
%if 0%{?fedora} >= 32
%patch64 -p1 -b .gcc10-angle
%patch74 -p1 -b .c17
%endif
%patch65 -p1 -b .gcc-incomplete-type
%patch66 -p1 -b .includefix
%patch67 -p1 -b .gcc-abstract
@ -1725,6 +1714,10 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
* Thu Feb 27 2020 Tom Callaway <spot@fedoraproject.org> - 80.0.3987.132-1
- update to 80.0.3987.132
- disable C++17 changes (this means f32+ will no longer build, but it segfaulted immediately)
* Thu Feb 27 2020 Tom Callaway <spot@fedoraproject.org> - 80.0.3987.122-1
- update to 80.0.3987.122

View File

@ -17,4 +17,4 @@ SHA512 (Tinos-Italic.ttf) = d4f4f096110ef98a781a2a0e0d319317e5f84e650fe6f4d4f6b0
SHA512 (Tinos-Regular.ttf) = 58085c5dac6d067d60ba2ab3220c4a0cc1efcf279cadfcfb8746a5e5fa1a6f6daa62750dc2051b3b2d8a51b4d2e9bb0f66594caf2253c0870ed9c7286fa45e8f
SHA512 (Ahem.ttf) = aeb64b10ab9c87860714cb60b4900254b13dc52c51319256a1a3722c882026ab7c616bf628fbc2fe14e38a6003f3a481af60b52a7ed62071d28ddaf428e4e3fd
SHA512 (node-v8.9.1-linux-x64.tar.gz) = a707fd4567041c56e7f9d415e505e3fa650627f31def7fefdd7ec50f9e7066bb33332b67f479e1159d85e1105a7e6d034aad7429f4f3d034c9161170d7e0b844
SHA512 (chromium-80.0.3987.122-clean.tar.xz) = 9de43bd70406a8b97ee5177f9983fea68403fa457d599843de423fe910e7f78f659e7e98a077be33f4fb8d288c61ecee28330eabb7cd560ac856bf9a24b58562
SHA512 (chromium-80.0.3987.132-clean.tar.xz) = a94a4501a9ef1a88d2855cd578d0e23e2c462c23b5942e31e5591985786a314d7841b64fac66d38c07df2b6c1c93a2d3b61f95eb9c4632e954dbe446e5a004d6