Browse Source

Port bug 1903050

Bill Gianopoulos 4 months ago
parent
commit
4617661d6c

+ 40 - 0
comm-central/patches/9999999-port1903050-suite0bustage.patch

@@ -0,0 +1,40 @@
+# HG changeset patch
+# User Bill Gianopoulos <wgianopoulos@gmail.com>
+# Date 1718883682 0
+BUg 9999999- Port bug 1903050 to suite.
+Bug 1903050 - Move NSS_EXTRA_SYMBOLS_FILE from old-configure to moz.configure
+
+diff --git a/suite/confvars.sh b/suite/confvars.sh
+--- a/suite/confvars.sh
++++ b/suite/confvars.sh
+@@ -17,9 +17,8 @@ MOZ_UPDATER=1
+ # 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_PROFILE_MIGRATOR=1
+ 
+-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
+@@ -7,16 +7,17 @@
+ set_config("MOZ_SUITE", True)
+ set_define("MOZ_SUITE", True)
+ 
+ imply_option("MOZ_APP_BASENAME", "SeaMonkey")
+ imply_option("MOZ_APP_ID", "{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}")
+ imply_option("MOZ_APP_VENDOR", "Mozilla")
+ # Include the DevTools client, not just the server (which is the default)
+ imply_option("MOZ_DEVTOOLS", "all")
++imply_option("NSS_EXTRA_SYMBOLS_FILE", "../comm/mailnews/nss-extra.symbols")
+ 
+ imply_option('--enable-default-browser-agent', False)
+ 
+ @depends(target_is_windows, target_has_linux_kernel)
+ def bundled_fonts(is_windows, is_linux):
+     if is_windows or is_linux:
+         return True
+ 

+ 1 - 0
comm-central/patches/series

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