[chromium-freeworld] Update to 79.0.3945.79

commit 7243aace2971539c112575c302a568a7d1991834 Author: Akarshan Biswas <akarshanbiswas(a)fedoraproject.org&gt; Date: Fri Dec 13 17:12:25 2019 +0530 Update to 79.0.3945.79 chromium-79.0.3945.56-glibc-clock-nanosleep.patch | 52 ++++++++++++++++++ chromium-freeworld.spec | 39 +++++++++----- chromium-system-icu.patch | 34 +++++++----- fix-spammy-unique-font-matching-log.patch | 13 +++++ icu65.patch | 64 +++++++++++++++++++++++ include-algorithm-to-use-std-lower_bound.patch | 49 +++++++++++++++++ launch_manager.h-uses-std-vector.patch | 36 +++++++++++++ sources | 2 +- widevine.patch | 33 +++++------- 9 files changed, 273 insertions(+), 49 deletions(-) --- diff --git a/chromium-79.0.3945.56-glibc-clock-nanosleep.patch b/chromium-79.0.3945.56-glibc-clock-nanosleep.patch new file mode 100644 index 0000000..71a5876 --- /dev/null +++ b/chromium-79.0.3945.56-glibc-clock-nanosleep.patch @@ -0,0 +1,52 @@ +diff -up chromium-79.0.3945.56/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.glibc-clock-nanosleep chromium-79.0.3945.56/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc +--- chromium-79.0.3945.56/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.glibc-clock-nanosleep 2019-12-03 11:36:08.592386976 -0500 ++++ chromium-79.0.3945.56/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc 2019-12-03 11:36:34.889947958 -0500 +@@ -148,7 +148,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de + return Allow(); + #endif + +- if (sysno == __NR_clock_gettime) { ++ if (sysno == __NR_clock_gettime || sysno == __NR_clock_nanosleep) { + return RestrictClockID(); + } + +diff -up chromium-79.0.3945.56/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h.glibc-clock-nanosleep chromium-79.0.3945.56/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h +--- chromium-79.0.3945.56/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h.glibc-clock-nanosleep 2019-12-03 11:36:56.808582039 -0500 ++++ chromium-79.0.3945.56/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h 2019-12-03 11:37:34.944945377 -0500 +@@ -86,12 +86,13 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr + // process). + SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictGetrusage(); + +-// Restrict |clk_id| for clock_getres(), clock_gettime() and clock_settime(). +-// We allow accessing only CLOCK_MONOTONIC, CLOCK_PROCESS_CPUTIME_ID, +-// CLOCK_REALTIME, and CLOCK_THREAD_CPUTIME_ID. In particular, this disallows +-// access to arbitrary per-{process,thread} CPU-time clock IDs (such as those +-// returned by {clock,pthread}_getcpuclockid), which can leak information +-// about the state of the host OS. ++// Restrict |clk_id| for clock_getres(), clock_gettime(), clock_settime(), and ++// clock_nanosleep(). We allow accessing only CLOCK_BOOTTIME, ++// CLOCK_MONOTONIC{,_RAW,_COARSE}, CLOCK_PROCESS_CPUTIME_ID, ++// CLOCK_REALTIME{,_COARSE}, and CLOCK_THREAD_CPUTIME_ID. In particular, on ++// non-Android platforms this disallows access to arbitrary per-{process,thread} ++// CPU-time clock IDs (such as those returned by {clock,pthread}_getcpuclockid), ++// which can leak information about the state of the host OS. + SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictClockID(); + + // Restrict the flags argument to getrandom() to allow only no flags, or +diff -up chromium-79.0.3945.56/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc.glibc-clock-nanosleep chromium-79.0.3945.56/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc +--- chromium-79.0.3945.56/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc.glibc-clock-nanosleep 2019-12-03 11:37:53.752639332 -0500 ++++ chromium-79.0.3945.56/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc 2019-12-03 11:38:32.802051407 -0500 +@@ -35,9 +35,10 @@ bool SyscallSets::IsAllowedGettime(int s + return true; + case __NR_adjtimex: // Privileged. + case __NR_clock_adjtime: // Privileged. +- case __NR_clock_getres: // Could be allowed. +- case __NR_clock_gettime: +- case __NR_clock_nanosleep: // Could be allowed. ++ case __NR_clock_getres: // Allowed only on Android with parameters ++ // filtered by RestrictClockID(). ++ case __NR_clock_gettime: // Parameters filtered by RestrictClockID(). ++ case __NR_clock_nanosleep: // Parameters filtered by RestrictClockID(). + case __NR_clock_settime: // Privileged. + #if defined(__i386__) || \ + (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec index ce83036..b07294e 100644 --- a/chromium-freeworld.spec +++ b/chromium-freeworld.spec @@ -40,12 +40,12 @@ # Allow testing whether icu can be unbundled # A patch fix building so enabled by default for Fedora 30 # Need icu version >= 64 -%bcond_with system_libicu -%if 0%{?fedora} >= 30 +%bcond_without system_libicu +%if 0%{?fedora} >= 31 # Allow testing whether libvpx can be unbundled %bcond_with system_libvpx # Allow testing whether ffmpeg can be unbundled -%bcond_with system_ffmpeg +%bcond_without system_ffmpeg #Allow minizip to be unbundled #mini-compat is going to be removed from fedora 30! %bcond_without system_minizip @@ -69,8 +69,8 @@ %global ozone 0 ##############################Package Definitions###################################### Name: chromium-freeworld -Version: 78.0.3904.108 -Release: 2%{?dist} +Version: 79.0.3945.79 +Release: 1%{?dist} Summary: Chromium-freeworld is an open-source web browser, powered by WebKit (Blink). It comes with all freeworld codecs and video acceleration enabled. License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2) URL: https://www.chromium.org/Home @@ -229,14 +229,15 @@ Patch65: chromium-73.0.3683.75-pipewire-cstring-fix.patch Patch68: Add-missing-header-to-fix-webrtc-build.patch Patch69: chromium-unbundle-zlib.patch Patch70: chromium-base-location.patch -# GCC patches -Patch73: chromium-gcc9-r688676.patch -Patch74: chromium-gcc9-r694853.patch -Patch75: chromium-gcc9-r696834.patch -Patch76: chromium-gcc9-r706467.patch -Patch77: chromium-v8-gcc9.patch -Patch78: chromium-gcc9-dns_util-ambiguous-ctor.patch -Patch79: add-missing-include-for-unique_ptr.patch +Patch71: fix-spammy-unique-font-matching-log.patch +# GCC +Patch72: include-algorithm-to-use-std-lower_bound.patch +Patch73: launch_manager.h-uses-std-vector.patch +# Fix: STolen from Fedora +Patch74: chromium-79.0.3945.56-glibc-clock-nanosleep.patch +# ICU ver. 65 support on Rawhide +Patch75: icu65.patch + %description %{name} is an open-source web browser, powered by WebKit (Blink) @@ -249,6 +250,11 @@ Patch79: add-missing-include-for-unique_ptr.patch %if !%{freeworld} %patch54 -p1 -R %endif +%if 0%{?fedora} <= 31 +# Only on Rawhide +%patch74 -p1 -R +%patch75 -p1 -R +%endif #Let's change the default shebang of python files. @@ -442,6 +448,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt third_party/swiftshader \ third_party/swiftshader/third_party/llvm-7.0 \ third_party/swiftshader/third_party/llvm-subzero \ + third_party/swiftshader/third_party/marl \ third_party/swiftshader/third_party/subzero \ third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1 \ third_party/tcmalloc \ @@ -605,6 +612,9 @@ gn_args=( # Optimizations gn_args+=( enable_vr=false +%if %{with system_libicu} + icu_use_data_file=false +%endif ) @@ -745,6 +755,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda %{chromiumdir}/swiftshader/libvk_swiftshader.so #########################################changelogs################################################# %changelog +* Fri Dec 13 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org&gt; - 79.0.3945.79-1 +- Update to 79.0.3945.79 + * Fri Dec 06 2019 Vasiliy Glazov <vascom2(a)gmail.com&gt; - 78.0.3904.108-2 - Disable fedora's build flags to reduce binary size diff --git a/chromium-system-icu.patch b/chromium-system-icu.patch index f00330b..1f848d7 100644 --- a/chromium-system-icu.patch +++ b/chromium-system-icu.patch @@ -1,14 +1,20 @@ -Index: chromium-76.0.3800.0/third_party/blink/renderer/platform/text/character_property_data.h -=================================================================== ---- chromium-76.0.3800.0.orig/third_party/blink/renderer/platform/text/character_property_data.h -+++ chromium-76.0.3800.0/third_party/blink/renderer/platform/text/character_property_data.h -@@ -258,7 +258,7 @@ static const UChar32 kIsHangulRanges[] = - 0xFFA0, 0xFFDC, - }; - --static const UChar32 kIsHangulArray[] = {}; -+static const UChar32 kIsHangulArray[] = {0xFFDC,}; - - // Freezed trie tree, see character_property_data_generator.cc. - extern const int32_t kSerializedCharacterDataSize; - +diff --git a/build/linux/unbundle/icu.gn b/build/linux/unbundle/icu.gn +index 4450e40..9ca36dd 100644 +--- a/build/linux/unbundle/icu.gn ++++ b/build/linux/unbundle/icu.gn +@@ -96,6 +96,7 @@ shim_headers("icui18n_shim") { + "unicode/fpositer.h", + "unicode/gender.h", + "unicode/gregocal.h", ++ "unicode/listformatter.h", + "unicode/measfmt.h", + "unicode/measunit.h", + "unicode/measure.h", +@@ -178,7 +179,6 @@ shim_headers("icuuc_shim") { + "unicode/icudataver.h", + "unicode/icuplug.h", + "unicode/idna.h", +- "unicode/listformatter.h", + "unicode/localpointer.h", + "unicode/locdspnm.h", + "unicode/locid.h", diff --git a/fix-spammy-unique-font-matching-log.patch b/fix-spammy-unique-font-matching-log.patch new file mode 100644 index 0000000..9321a98 --- /dev/null +++ b/fix-spammy-unique-font-matching-log.patch @@ -0,0 +1,13 @@ +diff --git a/content/child/child_process_sandbox_support_impl_linux.cc b/content/child/child_process_sandbox_support_impl_linux.cc +index 0a57543eb5..fe2ee491a2 100644 +--- a/content/child/child_process_sandbox_support_impl_linux.cc ++++ b/content/child/child_process_sandbox_support_impl_linux.cc +@@ -78,8 +78,6 @@ void WebSandboxSupportLinux::MatchFontByPostscriptNameOrFullFontName( + std::string family_name; + if (!font_loader_->MatchFontByPostscriptNameOrFullFontName(font_unique_name, + &font_identity)) { +- LOG(ERROR) << "FontService unique font name matching request did not " +- "receive a response."; + return; + } + diff --git a/icu65.patch b/icu65.patch new file mode 100644 index 0000000..811d562 --- /dev/null +++ b/icu65.patch @@ -0,0 +1,64 @@ +From 5679c3c191ed62b62d8db22f1657a296ee9bfe8e Mon Sep 17 00:00:00 2001 +From: Frank Tang <ftang(a)chromium.org&gt; +Date: Wed, 30 Oct 2019 22:49:47 +0000 +Subject: [PATCH] Update ICU to 65.1 from 64 and fix broken tests + +ICU 65-1 release note +http://site.icu-project.org/download/65 + +CLDR 36 release blog +http://blog.unicode.org/2019/10/unicode-cldr-version-36-languagelocale.html + +Most of the test expectation change is due to CLDR 36 update +of Grapheme Cluster for Indic languages +See the following for related changes in ICU 65.1 in this area: +https://unicode-org.atlassian.net/browse/CLDR-10994 +https://unicode-org.atlassian.net/browse/ICU-13637 +https://github.com/unicode-org/cldr/blob/master/common/properties/segments/readme.txt + +Bug: chromium:1014272, chromium:1017047 +Change-Id: I9fc6d4620bf2a4c189940d06d8c79893502db3dd +Cq-Include-Trybots: luci.chromium.try:linux_layout_tests_layout_ng_disabled +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1866059 +Reviewed-by: Jungshik Shin <jshin(a)chromium.org&gt; +Reviewed-by: Doug Turner <dougt(a)chromium.org&gt; +Reviewed-by: Michael Wasserman <msw(a)chromium.org&gt; +Reviewed-by: Kent Tamura <tkent(a)chromium.org&gt; +Reviewed-by: Trent Apted <tapted(a)chromium.org&gt; +Reviewed-by: Mason Freed <masonfreed(a)chromium.org&gt; +Commit-Queue: Frank Tang <ftang(a)chromium.org&gt; +Cr-Commit-Position: refs/heads/master@{#711027} +--- + third_party/blink/renderer/core/dom/document.cc | 2 +- + ui/gfx/render_text_harfbuzz.cc | 5 ++++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc +index 511aac29086..f188cf548a6 100644 +--- a/third_party/blink/renderer/core/dom/document.cc ++++ b/third_party/blink/renderer/core/dom/document.cc +@@ -6191,7 +6191,7 @@ static ParseQualifiedNameResult ParseQualifiedNameInternal( + + for (unsigned i = 0; i < length;) { + UChar32 c; +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (c == ':') { + if (saw_colon) + return ParseQualifiedNameResult(kQNMultipleColons); +diff --git a/ui/gfx/render_text_harfbuzz.cc b/ui/gfx/render_text_harfbuzz.cc +index 50e86af6b97..0339ff3ff8e 100644 +--- a/ui/gfx/render_text_harfbuzz.cc ++++ b/ui/gfx/render_text_harfbuzz.cc +@@ -971,7 +971,10 @@ RangeF TextRunHarfBuzz::GetGraphemeBounds(RenderTextHarfBuzz* render_text, + ++total; + } + } +- DCHECK_GT(total, 0); ++ // With ICU 65.1, DCHECK_GT() below fails. ++ // See https://crbug.com/1017047 for more details. ++ // ++ // DCHECK_GT(total, 0); + + // It's possible for |text_index| to point to a diacritical mark, at the end + // of |chars|. In this case all the grapheme boundaries come before it. Just diff --git a/include-algorithm-to-use-std-lower_bound.patch b/include-algorithm-to-use-std-lower_bound.patch new file mode 100644 index 0000000..dc37632 --- /dev/null +++ b/include-algorithm-to-use-std-lower_bound.patch @@ -0,0 +1,49 @@ +From f7c177d35242311ea7a2cf49a0980c61664f27ba Mon Sep 17 00:00:00 2001 +From: Jose Dapena Paz <jose.dapena(a)lge.com&gt; +Date: Fri, 25 Oct 2019 15:07:09 +0000 +Subject: [PATCH] IWYU: include algorithm to use std::lower_bound in + ui/gfx/font.cc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fix GCC build because of missing include: +../../ui/gfx/font.cc: In function ‘gfx::Font::Weight gfx::FontWeightFromInt(int)’: +../../ui/gfx/font.cc:114:8: error: no matching function for call to ‘lower_bound(const gfx::Font::Weight*, const gfx::Font::Weight*, int&, gfx::FontWeightFromInt(int)::<lambda(const gfx::Font::Weight&, const int&)>)’ + }); + ^ +In file included from /usr/include/c++/8/bits/char_traits.h:39, + from /usr/include/c++/8/string:40, + from ../../ui/gfx/font.h:8, + from ../../ui/gfx/font.cc:5: +/usr/include/c++/8/bits/stl_algobase.h:984:5: note: candidate: ‘template<class _ForwardIterator, class _Tp> _ForwardIterator std::lower_bound(_ForwardIterator, _ForwardIterator, const _Tp&)’ + lower_bound(_ForwardIterator __first, _ForwardIterator __last, + ^~~~~~~~~~~ +/usr/include/c++/8/bits/stl_algobase.h:984:5: note: template argument deduction/substitution failed: +../../ui/gfx/font.cc:114:8: note: candidate expects 3 arguments, 4 provided + }); + ^ + +Bug: 819294 +Change-Id: Ic59dcf3a06bdd54d1d426c08a61624873a0ff30c +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879909 +Commit-Queue: Alexei Svitkine <asvitkine(a)chromium.org&gt; +Reviewed-by: Alexei Svitkine <asvitkine(a)chromium.org&gt; +Cr-Commit-Position: refs/heads/master@{#709472} +--- + ui/gfx/font.cc | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/ui/gfx/font.cc b/ui/gfx/font.cc +index 21367fd7297..92b159e13d1 100644 +--- a/ui/gfx/font.cc ++++ b/ui/gfx/font.cc +@@ -4,6 +4,8 @@ + + #include "ui/gfx/font.h" + ++#include <algorithm> ++ + #include "base/strings/utf_string_conversions.h" + #include "build/build_config.h" + #include "ui/gfx/platform_font.h" diff --git a/launch_manager.h-uses-std-vector.patch b/launch_manager.h-uses-std-vector.patch new file mode 100644 index 0000000..72abe9b --- /dev/null +++ b/launch_manager.h-uses-std-vector.patch @@ -0,0 +1,36 @@ +From 97eb905ba262382bc3583078761c68f4452aea71 Mon Sep 17 00:00:00 2001 +From: Jose Dapena Paz <jose.dapena(a)lge.com&gt; +Date: Fri, 25 Oct 2019 09:27:53 +0000 +Subject: [PATCH] IWYU: launch_manager.h uses std::vector +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Add #include <vector> for using std::vector. This fixes GCC build. + +./../chrome/browser/apps/launch_service/launch_manager.h:46:15: error: ‘vector’ in namespace ‘std’ does not name a template type + static std::vector<base::FilePath> GetLaunchFilesFromCommandLine( + ^~~~~~ + +Bug: 819294 +Change-Id: I02ec3a2914a8fbe3aa0041017a0228f4b0ca1ec9 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879289 +Reviewed-by: Alexey Baskakov <loyso(a)chromium.org&gt; +Commit-Queue: José Dapena Paz <jose.dapena(a)lge.com&gt; +Cr-Commit-Position: refs/heads/master@{#709411} +--- + chrome/browser/apps/launch_service/launch_manager.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/chrome/browser/apps/launch_service/launch_manager.h b/chrome/browser/apps/launch_service/launch_manager.h +index 00aeb9d9c2a..76570ead0f9 100644 +--- a/chrome/browser/apps/launch_service/launch_manager.h ++++ b/chrome/browser/apps/launch_service/launch_manager.h +@@ -6,6 +6,7 @@ + #define CHROME_BROWSER_APPS_LAUNCH_SERVICE_LAUNCH_MANAGER_H_ + + #include <string> ++#include <vector> + + #include "base/macros.h" + diff --git a/sources b/sources index f768e2f..fa8bb3a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (chromium-78.0.3904.108.tar.xz) = 9801634358974dbe61484963599719b7c5571d32c70d7568287ab6b72054ed82afa146a0470c53129266a9fbc4a24dc50a43d552b8f1756776907c2760f15589 +SHA512 (chromium-79.0.3945.79.tar.xz) = 783473ea68f26656a86c6a9e726fcc6331d80860d6bb9e5ece6d71c120c3e80fc97ef867c720fe14121b3ba4599452bc40610e56900b2ffd813b9c4f415d644d diff --git a/widevine.patch b/widevine.patch index 3ecf0e7..32f0ae2 100644 --- a/widevine.patch +++ b/widevine.patch @@ -1,22 +1,13 @@ -diff -upr chromium-71.0.3578.80.orig/chrome/common/chrome_content_client.cc chromium-71.0.3578.80/chrome/common/chrome_content_client.cc ---- chromium-71.0.3578.80.orig/chrome/common/chrome_content_client.cc 2018-12-21 20:16:43.000000000 +0000 -+++ chromium-71.0.3578.80/chrome/common/chrome_content_client.cc 2018-12-21 21:34:28.658206942 +0000 -@@ -99,7 +99,7 @@ - // Registers Widevine CDM if Widevine is enabled, the Widevine CDM is - // bundled and not a component. When the Widevine CDM is a component, it is - // registered in widevine_cdm_component_installer.cc. --#if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) -+#if BUILDFLAG(ENABLE_WIDEVINE) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) - #define REGISTER_BUNDLED_WIDEVINE_CDM - #include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck - // TODO(crbug.com/663554): Needed for WIDEVINE_CDM_VERSION_STRING. Support -diff -upr chromium-71.0.3578.80.orig/third_party/widevine/cdm/widevine_cdm_version.h chromium-71.0.3578.80/third_party/widevine/cdm/widevine_cdm_version.h ---- chromium-71.0.3578.80.orig/third_party/widevine/cdm/widevine_cdm_version.h 2018-12-03 20:18:01.000000000 +0000 -+++ chromium-71.0.3578.80/third_party/widevine/cdm/widevine_cdm_version.h 2018-12-04 21:37:45.635374949 +0000 -@@ -12,4 +12,6 @@ - // - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available - // as a string, e.g., "1.0.123.456"). +diff --git a/third_party/widevine/cdm/BUILD.gn b/third_party/widevine/cdm/BUILD.gn +index ed0e2f5208b..5b431a030d5 100644 +--- a/third_party/widevine/cdm/BUILD.gn ++++ b/third_party/widevine/cdm/BUILD.gn +@@ -14,7 +14,7 @@ buildflag_header("buildflags") { -+#define WIDEVINE_CDM_VERSION_STRING "unknown" -+ - #endif // WIDEVINE_CDM_VERSION_H_ + flags = [ + "ENABLE_WIDEVINE=$enable_widevine", +- "BUNDLE_WIDEVINE_CDM=$bundle_widevine_cdm", ++ "BUNDLE_WIDEVINE_CDM=true", + "ENABLE_WIDEVINE_CDM_COMPONENT=$enable_widevine_cdm_component", + ] + }