From 2010c3a5c75ef1b087b5dfb0d6760131bea69fcb Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Mon, 31 Mar 2025 19:01:59 +0200
Subject: [PATCH] fix: update branding options in mozconfig and adjust JS
 preference handling

---
 configs/common/mozconfig                            |  1 -
 src/browser/branding/branding-common-mozbuild.patch | 13 +++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 src/browser/branding/branding-common-mozbuild.patch

diff --git a/configs/common/mozconfig b/configs/common/mozconfig
index 77878848e..7c8ed9076 100644
--- a/configs/common/mozconfig
+++ b/configs/common/mozconfig
@@ -1,7 +1,6 @@
 # Browser branding
 ac_add_options --with-app-name=${binName}
 ac_add_options --with-app-basename=Zen
-ac_add_options --enable-official-branding
 
 # Localization (Must be an absolute path)
 ac_add_options --with-l10n-base="${topsrcdir}/browser/locales"
diff --git a/src/browser/branding/branding-common-mozbuild.patch b/src/browser/branding/branding-common-mozbuild.patch
new file mode 100644
index 000000000..174ffe87e
--- /dev/null
+++ b/src/browser/branding/branding-common-mozbuild.patch
@@ -0,0 +1,13 @@
+diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild
+index a38663a3dc1ebe0c0817945efc2f72018bc1b3c7..8d9d314a718018ae074f1fb89d93dbfdcc51f36f 100644
+--- a/browser/branding/branding-common.mozbuild
++++ b/browser/branding/branding-common.mozbuild
+@@ -12,7 +12,7 @@ def FirefoxBranding():
+             "pref/firefox-branding.js",
+         ]
+     else:
+-        JS_PREFERENCE_FILES += [
++        JS_PREFERENCE_PP_FILES += [
+             "pref/firefox-branding.js",
+         ]
+