From 062a454cf3a13f04f303c5a1ac88c80f92e689d7 Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Mon, 19 Apr 2021 11:25:30 +0200
Subject: [PATCH] preliminary patch updates for 88.0

---
 megabar.patch       | 50 ++++++++++++++++++++++++---------------------
 remove_addons.patch | 15 +++++++++-----
 2 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/megabar.patch b/megabar.patch
index f12367c..cd8b0f0 100644
--- a/megabar.patch
+++ b/megabar.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm
-index b003b5f..e7a5332 100644
+index 73d15df..99cc41b 100644
 --- a/browser/components/urlbar/UrlbarInput.jsm
 +++ b/browser/components/urlbar/UrlbarInput.jsm
-@@ -1633,13 +1633,13 @@ class UrlbarInput {
+@@ -1692,13 +1692,13 @@ class UrlbarInput {
  
      // Enable the animation only after the first extend call to ensure it
      // doesn't run when opening a new window.
@@ -24,19 +24,19 @@ index b003b5f..e7a5332 100644
  
    endLayoutExtend() {
 diff --git a/browser/themes/shared/urlbar-searchbar.inc.css b/browser/themes/shared/urlbar-searchbar.inc.css
-index 9cc5b6f..97c2f19 100644
+index e9fde8b..6c4c444 100644
 --- a/browser/themes/shared/urlbar-searchbar.inc.css
 +++ b/browser/themes/shared/urlbar-searchbar.inc.css
-@@ -6,7 +6,7 @@
+@@ -5,7 +5,7 @@
+ %endif
  
- %define fieldBorderColor hsla(240,5%,5%,.25)
  %define fieldHoverBorderColor hsla(240,5%,5%,.35)
 -%define urlbarMarginInline 5px
 +%define urlbarMarginInline 0px
- %define urlbarSearchButtonWidth calc(16px + 2 * @identityBoxPaddingInline@)
+ %define urlbarSearchButtonWidth calc(16px + 2 * var(--urlbar-icon-padding))
  
  :root {
-@@ -197,13 +197,13 @@
+@@ -273,9 +273,9 @@
  }
  
  #urlbar[breakout][breakout-extend] {
@@ -48,14 +48,18 @@ index 9cc5b6f..97c2f19 100644
 +  width: 100%;
  }
  
+ @supports -moz-bool-pref("browser.proton.urlbar.enabled") {
+@@ -288,7 +288,7 @@
+ 
+ @supports not -moz-bool-pref("browser.proton.urlbar.enabled") {
  #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 {
-@@ -211,9 +211,9 @@
- }
+@@ -297,9 +297,9 @@
+ } /*** END !proton ***/
  
  #urlbar[breakout][breakout-extend] > #urlbar-input-container {
 -  height: calc(var(--urlbar-toolbar-height) + 2 * @urlbarBreakoutExtend@);
@@ -66,8 +70,8 @@ index 9cc5b6f..97c2f19 100644
 +  padding-inline: 0;
  }
  
- #urlbar.searchButton[breakout][breakout-extend] > #urlbar-input-container > #urlbar-search-button {
-@@ -231,7 +231,7 @@
+ @supports -moz-bool-pref("browser.proton.urlbar.enabled") {
+@@ -325,7 +325,7 @@
  }
  
  #urlbar[breakout][breakout-extend] > #urlbar-background {
@@ -77,38 +81,38 @@ index 9cc5b6f..97c2f19 100644
    animation-timing-function: var(--animation-easing-function);
  }
 diff --git a/browser/themes/shared/urlbarView.inc.css b/browser/themes/shared/urlbarView.inc.css
-index b648467..0a12ef0 100644
+index c6ce546..da00fac 100644
 --- a/browser/themes/shared/urlbarView.inc.css
 +++ b/browser/themes/shared/urlbarView.inc.css
-@@ -56,8 +56,8 @@
+@@ -74,8 +74,8 @@
    display: block;
    text-shadow: none;
    overflow: clip;
--  margin-inline: @urlbarViewMarginInline@;
--  width: calc(100% - 2 * @urlbarViewMarginInline@);
+-  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;
-@@ -90,7 +90,7 @@
- .urlbarView-row {
+ }
+@@ -115,7 +115,7 @@
+   flex-wrap: nowrap;
    fill: currentColor;
    fill-opacity: .6;
 -  padding-block: 3px;
 +  padding-block: 0;
  }
  
- .urlbarView-row-inner {
-@@ -207,6 +207,7 @@
+ :root[uidensity=compact] .urlbarView-row {
+@@ -280,6 +280,7 @@
    object-fit: contain;
    flex-shrink: 0;
    -moz-context-properties: fill, fill-opacity;
 +  margin-inline-start: 20px;
  }
  
- .urlbarView-row[type=tip] > .urlbarView-row-inner > .urlbarView-favicon {
-@@ -244,10 +245,10 @@
+ @supports not -moz-bool-pref("browser.proton.urlbar.enabled") {
+@@ -324,10 +325,10 @@
  
  .urlbarView-type-icon {
    position: absolute;
@@ -120,6 +124,6 @@ index b648467..0a12ef0 100644
 +  height: 16px;
 +  margin-bottom: 0;
 +  margin-inline-start: 0;
+   align-self: end;
    background-repeat: no-repeat;
    background-size: contain;
-   -moz-context-properties: fill, stroke;
diff --git a/remove_addons.patch b/remove_addons.patch
index 04fe18d..40fef37 100644
--- a/remove_addons.patch
+++ b/remove_addons.patch
@@ -1,13 +1,18 @@
 diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build
-index 0eb3c53..fb94b5c 100644
+index 269dcb2..ed7c31d 100644
 --- a/browser/extensions/moz.build
 +++ b/browser/extensions/moz.build
-@@ -4,4 +4,4 @@
- # License, v. 2.0. If a copy of the MPL was not distributed with this
+@@ -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"]
-+DIRS += ["formautofill", "screenshots"]
+ 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