From 456a600397ba3ef0a574ae975d4f1846ea9e247f Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 16 Sep 2021 07:04:42 +0200
Subject: [PATCH] changes to which patches get applied

---
 build.py | 26 ++++++++++++++++----------
 common   |  2 +-
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/build.py b/build.py
index 155e4a0..a161fd5 100755
--- a/build.py
+++ b/build.py
@@ -268,12 +268,15 @@ def execute_lw_do_patches():
         if options.src == 'release':
                 # production patches
                 patches = [
+                    "../common/patches/about-dialog.patch",
+                    "../common/patches/allow_dark_preference_with_rfp.patch",
+#                    "../common/patches/browser-confvars.patch",
                     "../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",
+                    "../common/patches/mozilla_dirs.patch",
+                    "../common/patches/remove_addons.patch",
+                    "../common/patches/search-config.patch",
                     
                     # sed patches..
                     "../common/patches/sed-patches/allow-searchengines-non-esr.patch",
@@ -285,18 +288,21 @@ def execute_lw_do_patches():
         elif options.src == 'nightly' or options.src == 'gecko-dev':
                 # patches for future releases are caught with nightly
                 patches = [
-                    "../common/patches/context-menu.patch",
-                    "../patches/remove_addons-91.0a1-nightly.patch",                        
-                    ##"../common/patches/megabar.patch",
-                    "../patches/vpn-patch-91.0a1-nightly.patch",
-                    "../common/patches/allow_dark_preference_with_rfp.patch",
                     "../common/patches/about-dialog.patch",
-                
+                    "../common/patches/allow_dark_preference_with_rfp.patch",
+#                    "../common/patches/browser-confvars.patch",
+                    "../common/patches/context-menu.patch",
+                    "../common/patches/megabar.patch",
+                    "../common/patches/mozilla-vpn-ad.patch",
+                    "../common/patches/mozilla_dirs.patch",
+                    "../common/patches/remove_addons.patch",
+                    "../common/patches/search-config.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",
+                    "../common/patches/sed-patches/stop-undesired-requests.patch",
                 ]
 
                 
diff --git a/common b/common
index 8403388..0ed8765 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 8403388baf642fd5cbb44a5698c84092210cb802
+Subproject commit 0ed87656757aa23b9475c354fe708a26bdecc6a8