set/change various 'MOZ_APP_*' strings to Parabola (fixes #3196)

6 files changed, 53 insertions, 9 deletions

diff --git a/src/branding/configure.sh b/src/branding/configure.sh
index 9c95df6..2b6e246 100755
--- a/src/branding/configure.sh
+++ b/src/branding/configure.sh
@@ -1,4 +1,35 @@
-MOZ_APP_BASENAME="Iceweasel"
-MOZ_APP_DISPLAYNAME="Iceweasel"
-MOZ_APP_PROFILE=mozilla/firefox
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+# The following variables are available to branding and application
+# configuration ($BRANDING/configure.sh and $APPLICATION/confvars.sh):
+#
+# - MOZ_APP_VENDOR (mandatory): Used for application.ini's "Vendor" field,
+# which also impacts profile location and user-visible fields.
+#
+# - MOZ_APP_BASENAME (mandatory): Typically stays consistent for multiple
+# branded versions of a given application (e.g. Minefield and Firefox both
+# use "Firefox"), but may vary for full rebrandings (e.g. Iceweasel). Used
+# for application.ini's "Name" field, which controls profile location in
+# the absence of a "Profile" field (see below), and various system
+# integration hooks (Unix remoting, Windows MessageWindow name, etc.)
+#
+# - MOZ_APP_DISPLAYNAME (optional): Used in user-visible fields (DLL
+# properties, Mac Bundle name, Updater, Installer), it is typically used
+# for nightly builds (e.g. Minefield for Firefox). Defaults to
+# MOZ_APP_BASENAME if not set.
+#
+# - MOZ_APP_NAME (optional): Used for e.g. the binary program file name,
+# it is set, by default, to a lowercase form of MOZ_APP_BASENAME.
+#
+# - MOZ_APP_PROFILE (optional): When set, used for application.ini's
+# "Profile" field, which controls profile location.
+
+
+MOZ_APP_DISPLAYNAME=Iceweasel
 MOZ_APP_NAME=iceweasel
+MOZ_APP_BASENAME=Iceweasel
+MOZ_APP_PROFILE=mozilla/firefox
+
diff --git a/src/branding/locales/en-US/brand.dtd b/src/branding/locales/en-US/brand.dtd
index fc0c674..1f7b172 100644
--- a/src/branding/locales/en-US/brand.dtd
+++ b/src/branding/locales/en-US/brand.dtd
@@ -1,6 +1,6 @@
 <!ENTITY  brandShorterName      "Iceweasel">
 <!ENTITY  brandShortName        "Iceweasel">
-<!ENTITY  brandFullName         "Iceweasel">
+<!ENTITY  brandFullName         "Parabola Iceweasel">
 <!ENTITY  brandProductName      "Iceweasel">
-<!ENTITY  vendorShortName       "Mozilla">
+<!ENTITY  vendorShortName       "Parabola">
 <!ENTITY  trademarkInfo.part1   " ">
diff --git a/src/branding/locales/en-US/brand.ftl b/src/branding/locales/en-US/brand.ftl
index ec13ee3..a92dc0d 100644
--- a/src/branding/locales/en-US/brand.ftl
+++ b/src/branding/locales/en-US/brand.ftl
@@ -1,6 +1,6 @@
 -brand-shorter-name = Iceweasel
 -brand-short-name = Iceweasel
--brand-full-name = Iceweasel
+-brand-full-name = Parabola Iceweasel
 -brand-product-name = Iceweasel
--vendor-short-name = Mozilla
+-vendor-short-name = Parabola
 trademarkInfo = { " " }
diff --git a/src/branding/locales/en-US/brand.properties b/src/branding/locales/en-US/brand.properties
index 2276bc3..bf14269 100644
--- a/src/branding/locales/en-US/brand.properties
+++ b/src/branding/locales/en-US/brand.properties
@@ -1,7 +1,7 @@
 brandShorterName=Iceweasel
 brandShortName=Iceweasel
-brandFullName=Iceweasel
+brandFullName=Parabola_Iceweasel
 brandProductName=Iceweasel
-vendorShortName=Mozilla
+vendorShortName=Parabola
 
 syncBrandShortName=Sync
diff --git a/src/patches/iceweasel-branding/MOZ_APP_VENDOR.patch b/src/patches/iceweasel-branding/MOZ_APP_VENDOR.patch
new file mode 100644
index 0000000..85bf10b
--- /dev/null
+++ b/src/patches/iceweasel-branding/MOZ_APP_VENDOR.patch
@@ -0,0 +1,12 @@
+# this strng is user-facing (eg: `iceweasel --version`)
+--- a/browser/confvars.sh	2022-03-13 03:28:08.216443949 -0400
++++ b/browser/confvars.sh	2022-03-13 03:26:49.573111656 -0400
+@@ -3,7 +3,7 @@
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+-MOZ_APP_VENDOR=Mozilla
++MOZ_APP_VENDOR=Parabola
+ 
+ if test "$OS_ARCH" = "WINNT"; then
+   if ! test "$HAVE_64BIT_BUILD"; then
diff --git a/src/patches/series b/src/patches/series
index 49bf172..df44a3a 100644
--- a/src/patches/series
+++ b/src/patches/series
@@ -1,4 +1,5 @@
 iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.patch
+iceweasel-branding/MOZ_APP_VENDOR.patch
 iceweasel-branding/Determine-which-phishing-shavar-to-use.patch
 iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile.patch
 iceweasel-branding/Allowed-dupes_for_Iceweasel.patch