Port Bugs 1898060 and 1898177

comm-central/patches/9999999-port1898060-1898177-suite-bustage.patch

@@ -0,0 +1,64 @@
+# HG changeset patch
+# User Bill Gianopoulos <wgianopoulos@gmail.com>
+# Date 1718443645 0
+Bug 9999999 - Port bugs 1898060 and 1898177 to suite.
+Bug 1898060 - Move MOZ_APP_ID from old-configure to moz.configure.
+Bug 1898177 - Move MOZ_APP_VENDOR from confvars.sh to moz.configure.
+
+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_VENDOR=Mozilla
+ MOZ_APP_NAME=seamonkey
+ MOZ_APP_DISPLAYNAME=SeaMonkey
+ 
+ MOZ_APP_VERSION=$SEAMONKEY_VERSION
+ MOZ_APP_VERSION_DISPLAY=$SEAMONKEY_VERSION_DISPLAY
+ # MOZ_PKG_VERSION=$SEAMONKEY_VERSION_PACKAGE
+ 
+ MOZ_BRANDING_DIRECTORY=comm/suite/branding/seamonkey
+@@ -16,15 +15,14 @@ MOZ_OFFICIAL_BRANDING_DIRECTORY=comm/sui
+ 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
+ # of values.
+ ACCEPTED_MAR_CHANNEL_IDS=seamonkey-comm-central
+ # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
+ MAR_CHANNEL_ID=seamonkey-comm-central
+ 
+-MOZ_APP_ID={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+ MOZ_PROFILE_MIGRATOR=1
+ 
+ # Include the DevTools client, not just the server (which is the default)
+ MOZ_DEVTOOLS=all
+ 
+ NSS_EXTRA_SYMBOLS_FILE=../comm/mailnews/nss-extra.symbols
+diff --git a/suite/moz.configure b/suite/moz.configure
+--- a/suite/moz.configure
++++ b/suite/moz.configure
+@@ -6,16 +6,19 @@
+ 
+ set_config("MOZ_SUITE", True)
+ set_define("MOZ_SUITE", True)
+ 
+ imply_option("MOZ_APP_BASENAME", "SeaMonkey")
+ 
+ imply_option('--enable-default-browser-agent', False)
+ 
++imply_option("MOZ_APP_ID", "{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}")
++imply_option("MOZ_APP_VENDOR", "Mozilla")
++
+ @depends(target_is_windows, target_has_linux_kernel)
+ def bundled_fonts(is_windows, is_linux):
+     if is_windows or is_linux:
+         return True
+ 
+ 
+ set_config("MOZ_BUNDLED_FONTS", bundled_fonts)
+ add_old_configure_assignment("MOZ_BUNDLED_FONTS", bundled_fonts)

comm-central/patches/series

@@ -1,4 +1,5 @@
 9999999-suite-bustage.patch
+9999999-port1898060-1898177-suite-bustage.patch
 TOP-1642188-remove-nsDOMIEvent-cc.patch
 TOP-1614671-port1456035-4-and-5-61a1-cc.patch
 TOP-1611647-1-rename-xul-suite.patch