From 2a838ee20cbe60fa688097ed5bc983d1c3724824 Mon Sep 17 00:00:00 2001 From: mkarolin <41635752+mkarolin@users.noreply.github.com> Date: Tue, 4 Feb 2020 14:31:43 -0500 Subject: [PATCH] Merge pull request #4483 from brave/80.0.3987.85 Upgrade from Chromium 80.0.3987.78 to Chromium 80.0.3987.85. --- patches/chrome-VERSION.patch | 4 ++-- ...er-notifications-notification_platform_bridge_mac.mm.patch | 2 +- patches/chrome-installer-mac-signing-signing.py.patch | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index bee499e2afe5..5bd90b61a5b7 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 360b384db23ff3e54f61378199dbb651b965e3f3..099900a727ce97e2c5a264c1059b1f7cb84376db 100644 +index 402042f3ee43b3fd3dea4699d09da3e2e7d507fe..628594414940a354e63bcb7e223aa3f3e5a8ea52 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=80 -MINOR=0 -BUILD=3987 --PATCH=78 +-PATCH=85 +MINOR=1 +BUILD=3 +PATCH=110 diff --git a/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch b/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch index d276594a7e78..951815aefc35 100644 --- a/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch +++ b/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/notifications/notification_platform_bridge_mac.mm b/chrome/browser/notifications/notification_platform_bridge_mac.mm -index d5e0d43599cacc822c1cd97c54c768f681bc7876..8a207252d8c435ad9246a7bde090fdba5075da98 100644 +index af5b5196170a8df89106ef8aa50ef133146c48f9..4733307aa497779bf049ceb0f8f01708ba983965 100644 --- a/chrome/browser/notifications/notification_platform_bridge_mac.mm +++ b/chrome/browser/notifications/notification_platform_bridge_mac.mm @@ -302,6 +302,7 @@ void NotificationPlatformBridgeMac::Display( diff --git a/patches/chrome-installer-mac-signing-signing.py.patch b/patches/chrome-installer-mac-signing-signing.py.patch index 872c2f05ea34..cc08a46f41fc 100644 --- a/patches/chrome-installer-mac-signing-signing.py.patch +++ b/patches/chrome-installer-mac-signing-signing.py.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/mac/signing/signing.py b/chrome/installer/mac/signing/signing.py -index cd93959385debe65d04c0a4664f638173da54b75..0324d4f534f4cec4a3b70c0577284151110d1b14 100644 +index 18a73509f528e67c29c7ef896eee338e0970b4fa..04c0bffc6eee08f758ed47fcbf201761556f2bec 100644 --- a/chrome/installer/mac/signing/signing.py +++ b/chrome/installer/mac/signing/signing.py @@ -11,6 +11,7 @@ import os.path @@ -27,7 +27,7 @@ index cd93959385debe65d04c0a4664f638173da54b75..0324d4f534f4cec4a3b70c0577284151 if config.notary_user: # Assume if the config has notary authentication information that the # products will be notarized, which requires a secure timestamp. -@@ -272,6 +274,7 @@ def sign_chrome(paths, config, sign_framework=False): +@@ -270,6 +272,7 @@ def sign_chrome(paths, config, sign_framework=False): continue sign_part(paths, config, part)