From 0ba021e50247d0c5b338cc7fff157ed7900b142b Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Wed, 2 Jun 2021 04:49:59 +0200
Subject: [PATCH] v89.0

---
 build.sh                            | 22 ++++++++++++++++++----
 patches/mozilla-vpn-ad-proton.patch | 17 +++++++++++++++++
 settings                            |  2 +-
 version.sh                          |  2 +-
 4 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 patches/mozilla-vpn-ad-proton.patch

diff --git a/build.sh b/build.sh
index 5e38d14..067bc53 100755
--- a/build.sh
+++ b/build.sh
@@ -82,24 +82,38 @@ do_patches() {
     cp -v ../files/configure.sh browser/branding/librewolf
 
     echo 'Applying patches...'
+
     
-    patch -p1 -i ../common/patches/mozilla-vpn-ad.patch
     
     if [ "$srcdir" == "mozilla-unified" ]; then
 	patch -p1 -i ../common/patches/nightly/context-menu2.patch
 	patch -p1 -i ../common/patches/nightly/report-site-issue.patch
 	patch -p1 -i ../common/patches/nightly/megabar3.patch
     else
-	patch -p1 -i ../common/patches/context-menu.patch
+	echo "patch -p1 -i ../common/patches/nightly/context-menu2.patch"
+	patch -p1 -i ../common/patches/nightly/context-menu2.patch
+	#	patch -p1 -i ../common/patches/context-menu.patch
+	
+	echo "patch -p1 -i ../common/patches/remove_addons.patch"
 	patch -p1 -i ../common/patches/remove_addons.patch
-	patch -p1 -i ../common/patches/megabar.patch
+#	echo "patch -p1 -i ../common/patches/megabar.patch"
+#	patch -p1 -i ../common/patches/megabar.patch
+	echo 'patch -p1 -i ../common/patches/nightly/megabar3.patch'
+	patch -p1 -i ../common/patches/nightly/megabar3.patch
+	
+	echo "patch -p1 -i ../patches/mozilla-vpn-ad-proton.patch"
+	patch -p1 -i ../patches/mozilla-vpn-ad-proton.patch
     fi
 
     echo 'GNU sed patches...'
     
-    patch -p1 -i ../common/patches/sed-patches/allow-searchengines-non-esr.patch
+    echo 'patch -p1 -i ../common/patches/sed-patches/allow-searchengines-non-esr.patch'
+    patch -p1 -i ../common/patches/sed-patches/allow-searchengines-non-esr.patch    
+    echo 'patch -p1 -i ../common/patches/sed-patches/disable-pocket.patch'
     patch -p1 -i ../common/patches/sed-patches/disable-pocket.patch
+    echo 'patch -p1 -i ../common/patches/sed-patches/remove-internal-plugin-certs.patch'
     patch -p1 -i ../common/patches/sed-patches/remove-internal-plugin-certs.patch
+    echo 'patch -p1 -i ../common/patches/sed-patches/stop-undesired-requests.patch'
     patch -p1 -i ../common/patches/sed-patches/stop-undesired-requests.patch
     
     echo 'Local patches...'
diff --git a/patches/mozilla-vpn-ad-proton.patch b/patches/mozilla-vpn-ad-proton.patch
new file mode 100644
index 0000000..bc884f2
--- /dev/null
+++ b/patches/mozilla-vpn-ad-proton.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/settings b/settings
index 3d69f24..5cbb8b8 160000
--- a/settings
+++ b/settings
@@ -1 +1 @@
-Subproject commit 3d69f247d403f3b317c8f348b0d040392d8f704b
+Subproject commit 5cbb8b8b5401188f6e92f7880d33963ee0dcd8ca
diff --git a/version.sh b/version.sh
index 91ffa4f..b0ab9da 100644
--- a/version.sh
+++ b/version.sh
@@ -1 +1 @@
-pkgver=88.0.1
+pkgver=89.0