From c8f1c9e3b1848835cb24e5ddb88c917a8befe47a Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Tue, 27 Sep 2022 23:00:12 +0300 Subject: [PATCH] upd: 105.0.5195.102 -> 106.0.5249.61 --- .abf.yml | 4 ++-- block-requests.patch | 20 ++++++++++---------- chromium-browser-stable.spec | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.abf.yml b/.abf.yml index e4a5871..669cd3f 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,6 +1,6 @@ sources: - chromium-105.0.5195.102.tar.xz: cae4eacf6ab37a0453c3e1f2021deb09855368a9 - chromium-gost-fccc49b952ad6c84709a4cbf82e9277f81dd41ae.tar.gz: 84a139b2c84295b3164f3acced8986f698351583 + chromium-106.0.5249.61.tar.xz: 7170bc9699451d8b8664fca9dae7bca5557fe21c + chromium-gost-2980e5bb5bec4bd52b615fc94a47ad2f29fcaae8.tar.gz: 68828d3dfd199535030c2f685a003b26e815b72b depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5 icons-2012.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3 msspi-0d09dc6de9df58041fc385ac49e5778323e547f4.tar.gz: 6bc512f9bffae44418d9482f3ad7395864a8dc24 diff --git a/block-requests.patch b/block-requests.patch index 13eb9d7..d3ec790 100644 --- a/block-requests.patch +++ b/block-requests.patch @@ -2,7 +2,7 @@ # chrome://discards/ attempts to use d3 to display the graph --- a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc +++ b/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc -@@ -286,6 +286,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad +@@ -287,6 +287,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad OneGoogleBarLoaderImpl::~OneGoogleBarLoaderImpl() = default; void OneGoogleBarLoaderImpl::Load(OneGoogleCallback callback) { @@ -12,14 +12,14 @@ // Note: If there is an ongoing request, abandon it. It's possible that --- a/chrome/browser/new_tab_page/promos/promo_service.cc +++ b/chrome/browser/new_tab_page/promos/promo_service.cc -@@ -138,6 +138,7 @@ PromoService::PromoService( +@@ -171,6 +171,7 @@ PromoService::PromoService( PromoService::~PromoService() = default; void PromoService::Refresh() { -+ return; - net::NetworkTrafficAnnotationTag traffic_annotation = - net::DefineNetworkTrafficAnnotation("promo_service", R"( - semantics { ++ if ((true)) return; + std::string command_id; + // Replace the promo URL with "command:" if such a command ID is set + // via the feature params. --- a/chrome/browser/resources/discards/graph_doc_template.html +++ b/chrome/browser/resources/discards/graph_doc_template.html @@ -78,10 +78,6 @@ URL. As result, this document needs to b @@ -35,7 +35,7 @@ --- a/chrome/browser/search/background/ntp_background_service.cc +++ b/chrome/browser/search/background/ntp_background_service.cc -@@ -83,6 +83,7 @@ void NtpBackgroundService::Shutdown() { +@@ -84,6 +84,7 @@ void NtpBackgroundService::Shutdown() { } void NtpBackgroundService::FetchCollectionInfo() { @@ -65,11 +65,11 @@ if (state_ == REQUESTING) { --- a/components/update_client/update_checker.cc +++ b/components/update_client/update_checker.cc -@@ -109,6 +109,7 @@ void UpdateCheckerImpl::CheckForUpdates( - const IdToComponentPtrMap& components, +@@ -98,6 +98,7 @@ void UpdateCheckerImpl::CheckForUpdates( + scoped_refptr context, const base::flat_map& additional_attributes, UpdateCheckCallback update_check_callback) { + return; DCHECK(thread_checker_.CalledOnValidThread()); - ids_checked_ = ids_checked; + update_check_callback_ = std::move(update_check_callback); diff --git a/chromium-browser-stable.spec b/chromium-browser-stable.spec index 07d1f7f..d19492f 100644 --- a/chromium-browser-stable.spec +++ b/chromium-browser-stable.spec @@ -50,7 +50,7 @@ # GOST patches and sources # Using commit hashes because upstream often puts tags long after making changes # (they wait for builds to finish to make a new "release" with binary packages) -%define chromium_gost_commit fccc49b952ad6c84709a4cbf82e9277f81dd41ae +%define chromium_gost_commit 2980e5bb5bec4bd52b615fc94a47ad2f29fcaae8 %define msspi_commit 0d09dc6de9df58041fc385ac49e5778323e547f4 %define _gostsourcedir %{_builddir}/chromium-gost @@ -80,7 +80,7 @@ Summary: A fast web browser based on the Blink engine Name: chromium-browser-stable -Version: 105.0.5195.102 +Version: 106.0.5249.61 Release: 1 License: BSD, LGPL Group: Networking/WWW