From 78aecc53ff2f8f486ddc123cdc12f38cd41a3a15 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Fri, 4 Jun 2021 09:59:43 +0200
Subject: [PATCH] Added patches/release folder with patches needed for v89.0

---
 patches/release/context-menu2.patch  |  43 ++++++++
 patches/release/megabar3.patch       | 148 +++++++++++++++++++++++++++
 patches/release/mozilla-vpn-ad.patch |  17 +++
 patches/release/remove_addons.patch  |  74 ++++++++++++++
 4 files changed, 282 insertions(+)
 create mode 100644 patches/release/context-menu2.patch
 create mode 100644 patches/release/megabar3.patch
 create mode 100644 patches/release/mozilla-vpn-ad.patch
 create mode 100644 patches/release/remove_addons.patch

diff --git a/patches/release/context-menu2.patch b/patches/release/context-menu2.patch
new file mode 100644
index 0000000..5685f96
--- /dev/null
+++ b/patches/release/context-menu2.patch
@@ -0,0 +1,43 @@
+diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc
+--- a/browser/base/content/browser-context.inc
++++ b/browser/base/content/browser-context.inc
+@@ -102,19 +102,16 @@
+                 oncommand="gContextMenu.openLinkInPrivateWindow();"/>
+       <menuseparator id="context-sep-open"/>
+       <menuitem id="context-bookmarklink"
+                 data-l10n-id="main-context-menu-bookmark-link"
+                 oncommand="gContextMenu.bookmarkLink();"/>
+       <menuitem id="context-savelink"
+                 data-l10n-id="main-context-menu-save-link"
+                 oncommand="gContextMenu.saveLink();"/>
+-      <menuitem id="context-savelinktopocket"
+-                data-l10n-id="main-context-menu-save-link-to-pocket"
+-                oncommand= "Pocket.savePage(gContextMenu.browser, gContextMenu.linkURL);"/>
+       <menuitem id="context-copyemail"
+                 data-l10n-id="main-context-menu-copy-email"
+                 oncommand="gContextMenu.copyEmail();"/>
+       <menuitem id="context-copylink"
+                 data-l10n-id="main-context-menu-copy-link-simple"
+                 oncommand="gContextMenu.copyLink();"/>
+       <menu id="context-sendlinktodevice"
+             class="sync-ui-item"
+@@ -254,19 +251,16 @@
+ #ifdef XP_MACOSX
+       <menuitem id="context-bookmarkpage"
+                 data-l10n-id="main-context-menu-bookmark-add-mac"
+                 oncommand="gContextMenu.bookmarkThisPage();"/>
+ #endif
+       <menuitem id="context-savepage"
+                 data-l10n-id="main-context-menu-page-save"
+                 oncommand="gContextMenu.savePageAs();"/>
+-      <menuitem id="context-pocket"
+-                data-l10n-id="main-context-menu-save-to-pocket"
+-                oncommand="Pocket.savePage(gContextMenu.browser, gContextMenu.browser.currentURI.spec, gContextMenu.browser.contentTitle);"/>
+       <menu id="context-sendpagetodevice"
+             class="sync-ui-item"
+             data-l10n-id="main-context-menu-send-to-device"
+             hidden="true">
+         <menupopup id="context-sendpagetodevice-popup"
+                    onpopupshowing="(() => { gSync.populateSendTabToDevicesMenu(event.target, gBrowser.currentURI.spec, gBrowser.contentTitle); })()"/>
+       </menu>
+       <menu id="fill-login" hidden="true">
diff --git a/patches/release/megabar3.patch b/patches/release/megabar3.patch
new file mode 100644
index 0000000..d0687aa
--- /dev/null
+++ b/patches/release/megabar3.patch
@@ -0,0 +1,148 @@
+diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm
+index f076d5d7f2..92f0adf003 100644
+--- a/browser/components/urlbar/UrlbarInput.jsm
++++ b/browser/components/urlbar/UrlbarInput.jsm
+@@ -1704,13 +1704,13 @@ class UrlbarInput {
+ 
+     // Enable the animation only after the first extend call to ensure it
+     // doesn't run when opening a new window.
+-    if (!this.hasAttribute("breakout-extend-animate")) {
+-      this.window.promiseDocumentFlushed(() => {
+-        this.window.requestAnimationFrame(() => {
+-          this.setAttribute("breakout-extend-animate", "true");
+-        });
+-      });
+-    }
++//    if (!this.hasAttribute("breakout-extend-animate")) {
++//      this.window.promiseDocumentFlushed(() => {
++//        this.window.requestAnimationFrame(() => {
++//          this.setAttribute("breakout-extend-animate", "true");
++//        });
++//      });
++//    }
+   }
+ 
+   endLayoutExtend() {
+diff --git a/browser/themes/shared/urlbar-searchbar.inc.css b/browser/themes/shared/urlbar-searchbar.inc.css
+index 3abd701732..87713b9cbd 100644
+--- a/browser/themes/shared/urlbar-searchbar.inc.css
++++ b/browser/themes/shared/urlbar-searchbar.inc.css
+@@ -5,7 +5,7 @@
+ %endif
+ 
+ %define fieldHoverBorderColor hsla(240,5%,5%,.35)
+-%define urlbarMarginInline 5px
++%define urlbarMarginInline 0px
+ %define urlbarSearchButtonWidth calc(16px + 2 * var(--urlbar-icon-padding))
+ 
+ :root {
+@@ -273,40 +273,40 @@
+ }
+ 
+ #urlbar[breakout][breakout-extend] {
+-  top: -@urlbarBreakoutExtend@;
+-  left: calc(-@urlbarMarginInline@ - @urlbarBreakoutExtend@);
+-  width: calc(100% + 2 * @urlbarMarginInline@ + 2 * @urlbarBreakoutExtend@);
++  top: 0;
++  left: 0;
++  width: 100%;
+ }
+ 
+ @media (-moz-proton) {
+ #urlbar[breakout][breakout-extend] {
+   top: 0;
+-  left: -@urlbarMarginInline@;
+-  width: calc(100% + 2 * @urlbarMarginInline@);
++  left: 0;
++  width: 100%;
+ }
+ } /*** END proton ***/
+ 
+ @media not (-moz-proton) {
+ #urlbar[breakout][breakout-extend] > #urlbar-background {
+-  box-shadow: 0 3px 8px 0 rgba(0,0,0,.15)
++  box-shadow: 0 1px 4px rgba(0,0,0,.05);
+ }
+ 
+ #urlbar[breakout][breakout-extend][open] > #urlbar-background {
+-  box-shadow: 0 5px 18px rgba(0,0,0,.2);
++  box-shadow: 0 1px 4px rgba(0,0,0,.05);
+ }
+ } /*** END !proton ***/
+ 
+ #urlbar[breakout][breakout-extend] > #urlbar-input-container {
+-  height: calc(var(--urlbar-toolbar-height) + 2 * @urlbarBreakoutExtend@);
+-  padding-block: calc(@urlbarBreakoutExtend@ + (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2);
+-  padding-inline: calc(@urlbarMarginInline@ + @urlbarBreakoutExtend@);
++  height: var(--urlbar-toolbar-height);
++  padding-block: 0;
++  padding-inline: 0;
+ }
+ 
+ @media (-moz-proton) {
+ #urlbar[breakout][breakout-extend] > #urlbar-input-container {
+   height: var(--urlbar-toolbar-height);
+-  padding-block: calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2 + var(--urlbar-container-padding));
+-  padding-inline: calc(@urlbarMarginInline@ + var(--urlbar-container-padding));
++  padding-block: 0;
++  padding-inline: 0;
+ }
+ } /*** END proton ***/
+ 
+@@ -325,7 +325,7 @@
+ }
+ 
+ #urlbar[breakout][breakout-extend] > #urlbar-background {
+-  animation-name: urlbar-grow;
++  animation-name: none;
+   animation-duration: 0s;
+   animation-timing-function: var(--animation-easing-function);
+ }
+diff --git a/browser/themes/shared/urlbarView.inc.css b/browser/themes/shared/urlbarView.inc.css
+index e58531723e..dba8668168 100644
+--- a/browser/themes/shared/urlbarView.inc.css
++++ b/browser/themes/shared/urlbarView.inc.css
+@@ -86,16 +86,16 @@
+   display: block;
+   text-shadow: none;
+   overflow: clip;
+-  margin-inline: calc(5px + var(--urlbar-container-padding));
+-  width: calc(100% - 2 * (5px + var(--urlbar-container-padding)));
++  margin-inline: 0;
++  width: 100%
+   /* Match urlbar-background's border. */
+   border-inline: 1px solid transparent;
+ }
+ 
+ @media not (-moz-proton) {
+ .urlbarView {
+-  margin-inline: calc(4px + var(--identity-box-margin-inline));
+-  width: calc(100% - 2 * (4px + var(--identity-box-margin-inline)));
++  margin-inline: 0;
++  width: 100%;
+ }
+ /* If the view is open, offset the toolbar overlap so the view's top border
+    aligns with the toolbar. */
+@@ -298,6 +298,7 @@
+   object-fit: contain;
+   flex-shrink: 0;
+   -moz-context-properties: fill, fill-opacity;
++  margin-inline-start: 20px;
+ }
+ 
+ @media not (-moz-proton) {
+@@ -331,10 +332,10 @@
+ 
+ .urlbarView-type-icon {
+   position: absolute;
+-  width: 12px;
+-  height: 12px;
+-  margin-bottom: -4px;
+-  margin-inline-start: 8px;
++  width: 16px;
++  height: 16px;;
++  margin-bottom: 0;
++  margin-inline-start: 0;
+   align-self: end;
+   background-repeat: no-repeat;
+   background-size: contain;
diff --git a/patches/release/mozilla-vpn-ad.patch b/patches/release/mozilla-vpn-ad.patch
new file mode 100644
index 0000000..bc884f2
--- /dev/null
+++ b/patches/release/mozilla-vpn-ad.patch
@@ -0,0 +1,17 @@
+diff --git a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html
+--- a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html
++++ b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html
+@@ -54,13 +54,10 @@
+       <div class="info">
+         <h1 id="info-title" data-l10n-id="about-private-browsing-info-title"></h1>
+         <p id="info-body" data-l10n-id="about-private-browsing-info-description"></p>
+-        <a id="private-browsing-myths" data-l10n-id="about-private-browsing-info-myths"></a>
+       </div>
+     </div>
+ 
+     <div class="promo">
+-      <p id="private-browsing-vpn-text" class="vpn-promo" data-l10n-id="about-private-browsing-need-more-privacy"></p>
+-      <a id="private-browsing-vpn-link" class="vpn-promo" data-l10n-id="about-private-browsing-turn-on-vpn"></a>
+     </div>
+   </body>
+ </html>
diff --git a/patches/release/remove_addons.patch b/patches/release/remove_addons.patch
new file mode 100644
index 0000000..40fef37
--- /dev/null
+++ b/patches/release/remove_addons.patch
@@ -0,0 +1,74 @@
+diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build
+index 269dcb2..ed7c31d 100644
+--- a/browser/extensions/moz.build
++++ b/browser/extensions/moz.build
+@@ -5,10 +5,7 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+ DIRS += [
+-    "doh-rollout",
+     "formautofill",
+     "screenshots",
+-    "webcompat",
+-    "report-site-issue",
+     "pictureinpicture",
+ ]
+diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
+index 496379c..dd6f359 100644
+--- a/browser/locales/Makefile.in
++++ b/browser/locales/Makefile.in
+@@ -61,7 +61,6 @@ l10n-%:
+ ifneq (,$(wildcard ../extensions/formautofill/locales))
+ 	@$(MAKE) -C ../extensions/formautofill/locales AB_CD=$* XPI_NAME=locale-$*
+ endif
+-	@$(MAKE) -C ../extensions/report-site-issue/locales AB_CD=$* XPI_NAME=locale-$*
+ 	@$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
+ 	@$(MAKE) -C ../../devtools/startup/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
+ 	@$(MAKE) l10n AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
+@@ -82,7 +81,6 @@ endif
+ 	@$(MAKE) -C ../../devtools/startup/locales chrome AB_CD=$*
+ 	@$(MAKE) chrome AB_CD=$*
+ 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$*
+-	@$(MAKE) -C ../extensions/report-site-issue/locales chrome AB_CD=$*
+ 
+ package-win32-installer: $(SUBMAKEFILES)
+ 	$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen ZIP_IN='$(ZIP_OUT)' installer
+diff --git a/browser/locales/filter.py b/browser/locales/filter.py
+index bb2e992..7d7768e 100644
+--- a/browser/locales/filter.py
++++ b/browser/locales/filter.py
+@@ -20,7 +20,6 @@ def test(mod, path, entity=None):
+         "browser",
+         "browser/extensions/formautofill",
+         "browser/extensions/fxmonitor",
+-        "browser/extensions/report-site-issue",
+         "extensions/spellcheck",
+         "other-licenses/branding/firefox",
+         "browser/branding/official",
+diff --git a/browser/locales/l10n.ini b/browser/locales/l10n.ini
+index f4cb7ca..4efac13 100644
+--- a/browser/locales/l10n.ini
++++ b/browser/locales/l10n.ini
+@@ -14,7 +14,6 @@ dirs = browser
+      devtools/startup
+      browser/extensions/formautofill
+      browser/extensions/fxmonitor
+-     browser/extensions/report-site-issue
+ 
+ [includes]
+ # non-central apps might want to use %(topsrcdir)s here, or other vars
+diff --git a/browser/locales/l10n.toml b/browser/locales/l10n.toml
+index b9b18fe..af7c583 100644
+--- a/browser/locales/l10n.toml
++++ b/browser/locales/l10n.toml
+@@ -133,10 +133,6 @@ locales = [
+     reference = "browser/extensions/fxmonitor/locales/en-US/**"
+     l10n = "{l}browser/extensions/fxmonitor/**"
+ 
+-[[paths]]
+-    reference = "browser/extensions/report-site-issue/locales/en-US/**"
+-    l10n = "{l}browser/extensions/report-site-issue/**"
+-
+ [[paths]]
+     reference = "services/sync/locales/en-US/**"
+     l10n = "{l}services/sync/**"