From 3eb92f29ca9ce29b0cd1f84774a5ce7991e4bc48 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 24 Jun 2021 12:13:09 +0200
Subject: [PATCH] updates

---
 build.py                               | 51 +++++++++++++++++++-------
 patches/vpn-patch-91.0a1-nightly.patch | 18 +++++++++
 2 files changed, 56 insertions(+), 13 deletions(-)
 create mode 100644 patches/vpn-patch-91.0a1-nightly.patch

diff --git a/build.py b/build.py
index a4c704a..6f7be35 100755
--- a/build.py
+++ b/build.py
@@ -62,7 +62,7 @@ def exec(cmd):
 
 def patch(patchfile):
         cmd = "patch -p1 -i {}".format(patchfile)
-        print(cmd)
+        print("\n*** -> {}".format(cmd))
         if not options.no_execute:
                 retval = os.system(cmd)
                 if retval != 0:
@@ -210,26 +210,51 @@ def execute_lw_do_patches():
         enter_srcdir()
         # create the right mozconfig file..
         create_mozconfig(mozconfig_release)
+
         
         # copy branding files..
         exec("cp -vr ../common/source_files/* .")
         exec("cp -v ../files/configure.sh browser/branding/librewolf")
 
-        patches = [
-                "../common/patches/context-menu.patch",
-                "../common/patches/remove_addons.patch",
-                "../common/patches/megabar.patch",
-                "../common/patches/mozilla-vpn-ad.patch",
-                "../common/patches/allow_dark_preference_with_rfp.patch",
-                "../common/patches/about-dialog.patch",
+        
+        if options.src == 'release':
+                # production patches
+                patches = [
+                        "../common/patches/context-menu.patch",
+                        "../common/patches/remove_addons.patch",
+                        "../common/patches/megabar.patch",
+                        "../common/patches/mozilla-vpn-ad.patch",
+                        "../common/patches/allow_dark_preference_with_rfp.patch",
+                        "../common/patches/about-dialog.patch",
                 
-                # sed patches..
-                "../common/patches/sed-patches/allow-searchengines-non-esr.patch",
-                "../common/patches/sed-patches/disable-pocket.patch",
-                "../common/patches/sed-patches/remove-internal-plugin-certs.patch",
-                "../common/patches/sed-patches/stop-undesired-requests.patch",
+                        # sed patches..
+                        "../common/patches/sed-patches/allow-searchengines-non-esr.patch",
+                        "../common/patches/sed-patches/disable-pocket.patch",
+                        "../common/patches/sed-patches/remove-internal-plugin-certs.patch",
+                        "../common/patches/sed-patches/stop-undesired-requests.patch",
                 ]
                 
+        elif options.src == 'nightly':
+                # patches for future releases are caught with nightly
+                patches = [
+                        "../common/patches/context-menu.patch",
+                        "../common/patches/remove_addons.patch",
+                        "../common/patches/megabar.patch",
+                        #"../common/patches/mozilla-vpn-ad.patch",
+                        "../patches/vpn-patch-91.0a1-nightly.patch",
+                        "../common/patches/allow_dark_preference_with_rfp.patch",
+                        "../common/patches/about-dialog.patch",
+                
+                        # sed patches..
+                        "../common/patches/sed-patches/allow-searchengines-non-esr.patch",
+                        "../common/patches/sed-patches/disable-pocket.patch",
+                        "../common/patches/sed-patches/remove-internal-plugin-certs.patch",
+                        "../common/patches/sed-patches/stop-undesired-requests.patch",
+                ]
+
+
+
+                
         for p in patches:
             patch(p)
             
diff --git a/patches/vpn-patch-91.0a1-nightly.patch b/patches/vpn-patch-91.0a1-nightly.patch
new file mode 100644
index 0000000..2b6f557
--- /dev/null
+++ b/patches/vpn-patch-91.0a1-nightly.patch
@@ -0,0 +1,18 @@
+diff -r 536a892dd51f browser/components/privatebrowsing/content/aboutPrivateBrowsing.html
+--- a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html	Tue Jun 22 16:56:13 2021 +0000
++++ b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html	Wed Jun 23 07:09:38 2021 +0200
+@@ -58,6 +58,7 @@
+       </div>
+     </div>
+ 
++    <!--
+     <div class="promo">
+       <div class="promo-image-large">
+         <img src="" alt="" />
+@@ -73,5 +74,6 @@
+         </div>
+       </div>
+     </div>
++    -->
+   </body>
+ </html>