From 16888df7447154c7eb52ec0e67de463c91881623 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Mon, 14 Jun 2021 16:19:04 +0200
Subject: [PATCH] updates

---
 common     |  2 +-
 pybuild.py | 39 +++++++++++++++++++++++++--------------
 settings   |  2 +-
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/common b/common
index 92b53ba..100780c 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 92b53ba4f78e870c0404a51961e3eadffda8c258
+Subproject commit 100780c6ce47f5d0d60ba4da4f316dae2c161d1b
diff --git a/pybuild.py b/pybuild.py
index b59cf1d..0bd4c21 100644
--- a/pybuild.py
+++ b/pybuild.py
@@ -80,6 +80,9 @@ def execute_update_submodules():
         exec("git submodule foreach git merge origin master")
 
 def execute_git_init():
+        if options.src != 'release':
+            print("fatal error: git_init only works with the release source (--src release)")
+            sys.exit(1)
         enter_srcdir()
         exec("rm -rf .git")
         exec("git init")
@@ -210,21 +213,29 @@ def execute_lw_do_patches():
         exec("cp -vr ../common/source_files/* .")
         exec("cp -v ../files/configure.sh browser/branding/librewolf")
 
-        # patches..
-        patch("../common/patches/context-menu.patch")
-        patch("../common/patches/remove_addons.patch")
-        patch("../common/patches/megabar.patch")
-        patch("../common/patches/mozilla-vpn-ad.patch")
-
-        # sed patches..
-        patch("../common/patches/sed-patches/allow-searchengines-non-esr.patch")
-        patch("../common/patches/sed-patches/disable-pocket.patch")
-        patch("../common/patches/sed-patches/remove-internal-plugin-certs.patch")
-        patch("../common/patches/sed-patches/stop-undesired-requests.patch")
-
+        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",
+                ]
+                
+        for p in patches:
+            patch(p)
+            
         # local windows patches
-        patch("../patches/browser-confvars.patch") # not sure about this one yet!
-        patch("../patches/package-manifest.patch") # let ./mach package pick up our added files
+        for p in ["../patches/browser-confvars.patch", "../patches/package-manifest.patch"]:
+            patch(p)
+
+                
         leave_srcdir()
 
 
diff --git a/settings b/settings
index 0532d6c..3cb6059 160000
--- a/settings
+++ b/settings
@@ -1 +1 @@
-Subproject commit 0532d6cb861db42f3ccfbb3a90908e7cc9f31013
+Subproject commit 3cb605955b2598e111ff79b3c38eb726226f9cf9