Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade from Chromium 80.0.3987.78 to Chromium 80.0.3987.85 (1.3.x). #4498

Merged
merged 1 commit into from
Feb 5, 2020
Merged

Upgrade from Chromium 80.0.3987.78 to Chromium 80.0.3987.85 (1.3.x). #4498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions patches/chrome-VERSION.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-installer-mac-signing-signing.py.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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)

Expand Down