From be7f24287922c5cfc2f7fef8bc6dd765fcee70f7 Mon Sep 17 00:00:00 2001 From: Eloston Date: Wed, 12 Sep 2018 06:50:19 +0000 Subject: [PATCH] Update to 69.0.3497.92 and version.ini to 69.0.3497.92-1 --- config_bundles/common/pruning.list | 1 + .../0001-fix-building-without-safebrowsing.patch | 4 ++-- patches/inox-patchset/chromium-vaapi-r18.patch | 2 +- patches/ungoogled-chromium/add-ipv6-probing-option.patch | 2 +- .../fix-building-without-one-click-signin.patch | 2 +- version.ini | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/config_bundles/common/pruning.list b/config_bundles/common/pruning.list index 37f8c571..f33a2b08 100644 --- a/config_bundles/common/pruning.list +++ b/config_bundles/common/pruning.list @@ -7075,6 +7075,7 @@ third_party/hunspell/fuzz/bdict_corpus/fda69541054125551c41ab3e591e0482405ca2dc third_party/icu/android/icudtl.dat third_party/icu/cast/icudtl.dat third_party/icu/common/icudtb.dat +third_party/icu/flutter/icudtl.dat third_party/icu/ios/icudtl.dat third_party/icu/source/data/curr/pool.res third_party/icu/source/data/in/coll/ucadata-implicithan.icu diff --git a/patches/inox-patchset/0001-fix-building-without-safebrowsing.patch b/patches/inox-patchset/0001-fix-building-without-safebrowsing.patch index 0b573531..8785e17d 100644 --- a/patches/inox-patchset/0001-fix-building-without-safebrowsing.patch +++ b/patches/inox-patchset/0001-fix-building-without-safebrowsing.patch @@ -803,7 +803,7 @@ "download/download_dir_util.cc", --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -2597,7 +2597,6 @@ split_static_library("ui") { +@@ -2599,7 +2599,6 @@ split_static_library("ui") { "cocoa/content_settings/cookie_tree_node.mm", "cocoa/content_settings/cookies_tree_controller_bridge.h", "cocoa/content_settings/cookies_tree_controller_bridge.mm", @@ -811,7 +811,7 @@ "cocoa/extensions/chooser_dialog_cocoa.h", "cocoa/extensions/chooser_dialog_cocoa.mm", "cocoa/extensions/chooser_dialog_cocoa_controller.h", -@@ -2901,7 +2900,6 @@ split_static_library("ui") { +@@ -2903,7 +2902,6 @@ split_static_library("ui") { "views/cookie_info_view.h", "views/device_chooser_content_view.cc", "views/device_chooser_content_view.h", diff --git a/patches/inox-patchset/chromium-vaapi-r18.patch b/patches/inox-patchset/chromium-vaapi-r18.patch index afe472a8..cb4357c4 100644 --- a/patches/inox-patchset/chromium-vaapi-r18.patch +++ b/patches/inox-patchset/chromium-vaapi-r18.patch @@ -422,7 +422,7 @@ Signed-off-by: Daniel Charles --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -1441,7 +1441,11 @@ media::GpuVideoAcceleratorFactories* Ren - kGpuStreamIdMedia, kGpuStreamPriorityMedia); + kGpuStreamPriorityMedia); const bool enable_video_accelerator = +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) diff --git a/patches/ungoogled-chromium/add-ipv6-probing-option.patch b/patches/ungoogled-chromium/add-ipv6-probing-option.patch index 7ffdcd69..8851f32e 100644 --- a/patches/ungoogled-chromium/add-ipv6-probing-option.patch +++ b/patches/ungoogled-chromium/add-ipv6-probing-option.patch @@ -23,7 +23,7 @@ // We use a separate histogram name for each platform to facilitate the // display of error codes by their symbolic name (since each platform has // different mappings). -@@ -2398,7 +2394,7 @@ bool HostResolverImpl::IsIPv6Reachable(c +@@ -2399,7 +2395,7 @@ bool HostResolverImpl::IsIPv6Reachable(c if ((tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() > kIPv6ProbePeriodMs) { last_ipv6_probe_result_ = diff --git a/patches/ungoogled-chromium/fix-building-without-one-click-signin.patch b/patches/ungoogled-chromium/fix-building-without-one-click-signin.patch index ec3a2f60..cb9e7e6f 100644 --- a/patches/ungoogled-chromium/fix-building-without-one-click-signin.patch +++ b/patches/ungoogled-chromium/fix-building-without-one-click-signin.patch @@ -47,7 +47,7 @@ "cocoa/page_info/page_info_bubble_controller.h", "cocoa/page_info/page_info_bubble_controller.mm", "cocoa/page_info/page_info_utils_cocoa.h", -@@ -3416,8 +3412,6 @@ split_static_library("ui") { +@@ -3418,8 +3414,6 @@ split_static_library("ui") { "views/policy/enterprise_startup_dialog_view.h", "views/profiles/forced_reauthentication_dialog_view.cc", "views/profiles/forced_reauthentication_dialog_view.h", diff --git a/version.ini b/version.ini index 71631024..501fe0bb 100644 --- a/version.ini +++ b/version.ini @@ -1,3 +1,3 @@ [version] -chromium_version = 69.0.3497.81 +chromium_version = 69.0.3497.92 release_revision = 1