From ee46b22fe2b8e933de4f6ec19ee8a7e407821ca8 Mon Sep 17 00:00:00 2001 From: Max Karolinskiy Date: Wed, 27 Mar 2019 20:46:00 -0400 Subject: [PATCH 1/3] Revert "Merge pull request #3896 from brave/revert-c74" Reland C74 on master. This reverts commit 25a0ea784520b39f6c62034bbfcfb8e32bc5534c, reversing changes made to bd47a7fc87d1f7eb4db2025f8751bf7a7b3dc68d. --- lib/l10nUtil.js | 3 --- package.json | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/l10nUtil.js b/lib/l10nUtil.js index 730af21974d4..af6d33559dcf 100644 --- a/lib/l10nUtil.js +++ b/lib/l10nUtil.js @@ -46,8 +46,6 @@ const chromiumProfileSettingsPartPath = path.resolve(path.join(srcDir, 'chrome', const braveProfileSettingsPartPath = path.resolve(path.join(srcDir, 'brave', 'app', 'profiles_strings.grdp')) const chromiumFileManagerStringsPartPath = path.resolve(path.join(srcDir, 'chrome', 'app', 'file_manager_strings.grdp')) const braveFileManagerStringsPartPath = path.resolve(path.join(srcDir, 'brave', 'app', 'file_manager_strings.grdp')) -const chromiumNuxStringsPartPath = path.resolve(path.join(srcDir, 'chrome', 'app', 'nux_strings.grdp')) -const braveNuxStringsPartPath = path.resolve(path.join(srcDir, 'brave', 'app', 'nux_strings.grdp')) const chromiumVRStringsPartPath = path.resolve(path.join(srcDir, 'chrome', 'app', 'vr_strings.grdp')) const braveVRStringsPartPath = path.resolve(path.join(srcDir, 'brave', 'app', 'vr_strings.grdp')) const chromiumOnboardingWelcomeStringsPartPath = path.resolve(path.join(srcDir, 'chrome', 'app', 'onboarding_welcome_strings.grdp')) @@ -82,7 +80,6 @@ const chromiumToAutoGeneratedBraveMapping = { [chromiumPrintingStringsPartPath]: bravePrintingStringsPartPath, [chromiumProfileSettingsPartPath]: braveProfileSettingsPartPath, [chromiumFileManagerStringsPartPath]: braveFileManagerStringsPartPath, - [chromiumNuxStringsPartPath]: braveNuxStringsPartPath, [chromiumVRStringsPartPath]: braveVRStringsPartPath, [chromiumOnboardingWelcomeStringsPartPath]: braveOnboardingWelcomeStringsPartPath, [chromiumAppManagementStringsPartPath]: braveAppManagementStringsPartPath diff --git a/package.json b/package.json index ac05312e31b1..707db2f438ff 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "73.0.3683.75", + "tag": "74.0.3729.22", "repository": { "url": "https://chromium.googlesource.com/chromium/src.git" }, From 405eb4b537cc2f1e00cbb6d5d7070b85c66f5457 Mon Sep 17 00:00:00 2001 From: Anthony Tseng Date: Wed, 27 Mar 2019 16:46:25 -0700 Subject: [PATCH 2/3] Move apply_patches from hooks to sync.js --- scripts/sync.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/sync.js b/scripts/sync.js index 32ec533bbc1d..a2ce5767e436 100644 --- a/scripts/sync.js +++ b/scripts/sync.js @@ -50,5 +50,7 @@ if (updatedVersion || program.init || program.run_sync) { } if (updatedVersion || program.init || program.run_hooks) { + const core_dir = config.projects['brave-core'].dir + util.run('python', [path.join(core_dir, 'script', 'apply-patches.py')]) util.gclientRunhooks() } From 0e767830b7e308a117a98b4b8a185f2864f16a5a Mon Sep 17 00:00:00 2001 From: Max Karolinskiy Date: Thu, 28 Mar 2019 17:08:42 -0400 Subject: [PATCH 3/3] Upgrade from Chromium 74.0.3729.22 to Chromium 74.0.3729.40 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 707db2f438ff..4ce7ac77d77e 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "74.0.3729.22", + "tag": "74.0.3729.40", "repository": { "url": "https://chromium.googlesource.com/chromium/src.git" },