From c9e9100ff0d7e7da7e7fa35c032b3dc338013807 Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Thu, 1 Jul 2021 15:43:28 -0800 Subject: [PATCH] browser(firefox-beta): roll Firefox-beta to 90.0b13 (#7423) --- browser_patches/firefox-beta/BUILD_NUMBER | 4 ++-- browser_patches/firefox-beta/UPSTREAM_CONFIG.sh | 2 +- browser_patches/firefox-beta/patches/bootstrap.diff | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/browser_patches/firefox-beta/BUILD_NUMBER b/browser_patches/firefox-beta/BUILD_NUMBER index a9cec8b8c5..666d481ef7 100644 --- a/browser_patches/firefox-beta/BUILD_NUMBER +++ b/browser_patches/firefox-beta/BUILD_NUMBER @@ -1,2 +1,2 @@ -1267 -Changed: dgozman@gmail.com Tue Jun 30 16:15:40 PDT 2021 +1268 +Changed: lushnikov@chromium.org Thu 01 Jul 2021 03:59:44 AM PDT diff --git a/browser_patches/firefox-beta/UPSTREAM_CONFIG.sh b/browser_patches/firefox-beta/UPSTREAM_CONFIG.sh index 06b3f9f37b..e8ccc12b37 100644 --- a/browser_patches/firefox-beta/UPSTREAM_CONFIG.sh +++ b/browser_patches/firefox-beta/UPSTREAM_CONFIG.sh @@ -1,3 +1,3 @@ REMOTE_URL="https://github.com/mozilla/gecko-dev" BASE_BRANCH="beta" -BASE_REVISION="546eb283b0f4f85899513eaac0e60665ab9c653b" +BASE_REVISION="e55f3d9c1608709f5398e61288a99a09680f6808" diff --git a/browser_patches/firefox-beta/patches/bootstrap.diff b/browser_patches/firefox-beta/patches/bootstrap.diff index fb6202cd79..e4312735d8 100644 --- a/browser_patches/firefox-beta/patches/bootstrap.diff +++ b/browser_patches/firefox-beta/patches/bootstrap.diff @@ -92,7 +92,7 @@ index 6aebc7bde2cbb00ef2e127e417d92e5406c21259..dfbd67d4c8316c8f9d1019969a6f8433 DWORD creationFlags = CREATE_SUSPENDED | CREATE_UNICODE_ENVIRONMENT; diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn -index 1bdcf75ff59cf9966efc7213c9cc295e2f5ba16a..229d84f6a264ca7d9e19a1d10922161b4f7257bf 100644 +index 7f5d81bee397da8386fa2b460218fabe8c253248..d5a2a23337845d27fe0d3b6f4d80ad5ce7c64776 100644 --- a/browser/installer/allowed-dupes.mn +++ b/browser/installer/allowed-dupes.mn @@ -65,6 +65,12 @@ browser/defaults/settings/main/example.json