|
|
@@ -0,0 +1,49 @@
|
|
|
+# HG changeset patch
|
|
|
+# User Bill Gianopoulos <wgianopoulos@gmail.com>
|
|
|
+# Date 1597235901 14400
|
|
|
+# Wed Aug 12 08:38:21 2020 -0400
|
|
|
+# Node ID 2d00165146b6c6d8ba801e3434049045dc14ba01
|
|
|
+# Parent 3bbde9543946d547eacf5a3dc4f56e30f2cfc611
|
|
|
+Bug 1658682 - Port bug 1657954 - Move various branding options from `old-configure` - suite part.
|
|
|
+
|
|
|
+diff --git a/suite/config/mozconfigs/common b/suite/config/mozconfigs/common
|
|
|
+--- a/suite/config/mozconfigs/common
|
|
|
++++ b/suite/config/mozconfigs/common
|
|
|
+@@ -4,16 +4,19 @@
|
|
|
+
|
|
|
+ # This file is included by all suite mozconfigs
|
|
|
+
|
|
|
+ # Disable checking that add-ons are signed by the trusted root
|
|
|
+ MOZ_ADDON_SIGNING=0
|
|
|
+ # Disable enforcing that add-ons are signed by the trusted root
|
|
|
+ MOZ_REQUIRE_SIGNING=0
|
|
|
+
|
|
|
++# Define app basename for branding purposes.
|
|
|
++ac_add_options --with-app-basename=SeaMonkey
|
|
|
++
|
|
|
+ mk_add_options "export MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS}"
|
|
|
+ mk_add_options "export MOZ_SCM_LEVEL=3"
|
|
|
+ # Post bug 1422735, we now send symbols to Tecken.
|
|
|
+ # Post bug 1422735, we now send symbols to Tecken.
|
|
|
+ # See bug 1422737. Despite it saying SOCORRO, it's actually using
|
|
|
+ # the new Tecken symbol token.
|
|
|
+
|
|
|
+ case "$platform" in
|
|
|
+diff --git a/suite/confvars.sh b/suite/confvars.sh
|
|
|
+--- a/suite/confvars.sh
|
|
|
++++ b/suite/confvars.sh
|
|
|
+@@ -1,14 +1,13 @@
|
|
|
+ #! /bin/sh
|
|
|
+ # 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/.
|
|
|
+
|
|
|
+-MOZ_APP_BASENAME=SeaMonkey
|
|
|
+ MOZ_APP_VENDOR=Mozilla
|
|
|
+ MOZ_APP_NAME=seamonkey
|
|
|
+ MOZ_APP_DISPLAYNAME=SeaMonkey
|
|
|
+ MOZ_BRANDING_DIRECTORY=comm/suite/branding/seamonkey
|
|
|
+ MOZ_OFFICIAL_BRANDING_DIRECTORY=comm/suite/branding/seamonkey
|
|
|
+ MOZ_UPDATER=1
|
|
|
+ # This should usually be the same as the value MAR_CHANNEL_ID.
|
|
|
+ # If more than one ID is needed, then you should use a comma separated list
|
Bill Gianopoulos