Final setup for sea/comm which will be extrapolated elsewhere

sea/comm/CONTRIB-FIXED-chrome-icons-pkgmanifest.patch

@@ -0,0 +1,126 @@
+# HG changeset patch
+# Parent  e4a0fd06fd5d73af5a2b5fcaaee229e4fead149a
+Bug 9999999 - Wildcard package any chrome icons
+
+diff --git a/suite/installer/package-manifest.in b/suite/installer/package-manifest.in
+--- a/suite/installer/package-manifest.in
++++ b/suite/installer/package-manifest.in
+@@ -560,77 +560,20 @@
+ @RESPATH@/chrome/classic.manifest
+ @RESPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
+ 
+ ; modern theme
+ @RESPATH@/extensions/modern@themes.mozilla.org.xpi
+ 
+ ; shell icons
+ #ifdef MOZ_GTK
+-@RESPATH@/chrome/icons/default/bookmarkproperties.png
+-@RESPATH@/chrome/icons/default/bookmarkproperties16.png
+-@RESPATH@/chrome/icons/default/bookmarkproperties48.png
+-@RESPATH@/chrome/icons/default/chatzilla-window.png
+-@RESPATH@/chrome/icons/default/chatzilla-window16.png
+-@RESPATH@/chrome/icons/default/chatzilla-window48.png
+-@RESPATH@/chrome/icons/default/default16.png
+-@RESPATH@/chrome/icons/default/default22.png
+-@RESPATH@/chrome/icons/default/default24.png
+-@RESPATH@/chrome/icons/default/default32.png
+-@RESPATH@/chrome/icons/default/default48.png
+-@RESPATH@/chrome/icons/default/default64.png
+-@RESPATH@/chrome/icons/default/default128.png
+-@RESPATH@/chrome/icons/default/default256.png
+-@RESPATH@/chrome/icons/default/downloadManager.png
+-@RESPATH@/chrome/icons/default/downloadManager16.png
+-@RESPATH@/chrome/icons/default/downloadManager48.png
+-@RESPATH@/chrome/icons/default/editorWindow.png
+-@RESPATH@/chrome/icons/default/editorWindow16.png
+-@RESPATH@/chrome/icons/default/editorWindow48.png
+-@RESPATH@/chrome/icons/default/findBookmarkWindow.png
+-@RESPATH@/chrome/icons/default/findBookmarkWindow16.png
+-@RESPATH@/chrome/icons/default/findBookmarkWindow48.png
+-@RESPATH@/chrome/icons/default/findHistoryWindow.png
+-@RESPATH@/chrome/icons/default/findHistoryWindow16.png
+-@RESPATH@/chrome/icons/default/findHistoryWindow48.png
+-@RESPATH@/chrome/icons/default/history-window.png
+-@RESPATH@/chrome/icons/default/history-window16.png
+-@RESPATH@/chrome/icons/default/history-window48.png
+-@RESPATH@/chrome/icons/default/JSConsoleWindow.png
+-@RESPATH@/chrome/icons/default/JSConsoleWindow16.png
+-@RESPATH@/chrome/icons/default/JSConsoleWindow48.png
+-@RESPATH@/chrome/icons/default/places.png
+-@RESPATH@/chrome/icons/default/places16.png
+-@RESPATH@/chrome/icons/default/places48.png
+-@RESPATH@/chrome/icons/default/winInspectorMain.png
+-@RESPATH@/chrome/icons/default/winInspectorMain16.png
+-@RESPATH@/chrome/icons/default/winInspectorMain48.png
+ #ifdef MOZ_UPDATER
+ @RESPATH@/icons/updater.png
+ #endif
+-#elifdef XP_WIN
+-@RESPATH@/chrome/icons/default/bookmarkproperties.ico
+-@RESPATH@/chrome/icons/default/chatzilla-window.ico
+-@RESPATH@/chrome/icons/default/downloadManager.ico
+-@RESPATH@/chrome/icons/default/editorWindow.ico
+-@RESPATH@/chrome/icons/default/findBookmarkWindow.ico
+-@RESPATH@/chrome/icons/default/findHistoryWindow.ico
+-@RESPATH@/chrome/icons/default/gif-file.ico
+-@RESPATH@/chrome/icons/default/history-window.ico
+-@RESPATH@/chrome/icons/default/html-file.ico
+-@RESPATH@/chrome/icons/default/image-file.ico
+-@RESPATH@/chrome/icons/default/jpeg-file.ico
+-@RESPATH@/chrome/icons/default/JSConsoleWindow.ico
+-@RESPATH@/chrome/icons/default/main-window.ico
+-@RESPATH@/chrome/icons/default/places.ico
+-@RESPATH@/chrome/icons/default/script-file.ico
+-@RESPATH@/chrome/icons/default/winInspectorMain.ico
+-@RESPATH@/chrome/icons/default/xml-file.ico
+-@RESPATH@/chrome/icons/default/xul-file.ico
+-#endif
++@RESPATH@/chrome/icons/default/*
+ 
+ ; [Default Preferences]
+ ; All the browser/general pref files must be part of base to prevent migration bugs
+ @RESPATH@/@PREF_DIR@/suite-prefs.js
+ @RESPATH@/@PREF_DIR@/composer.js
+ @RESPATH@/greprefs.js
+ @RESPATH@/defaults/autoconfig/prefcalls.js
+ @RESPATH@/defaults/permissions
+@@ -827,39 +770,16 @@ bin/libfreebl_32int64_3.so
+ @RESPATH@/components/smime-service.js
+ @RESPATH@/components/smime-service.manifest
+ 
+ ; MailNews chrome
+ @RESPATH@/chrome/messenger@JAREXT@
+ @RESPATH@/chrome/messenger.manifest
+ @RESPATH@/chrome/newsblog@JAREXT@
+ @RESPATH@/chrome/newsblog.manifest
+-#ifdef MOZ_GTK
+-@RESPATH@/chrome/icons/default/abcardWindow.png
+-@RESPATH@/chrome/icons/default/abcardWindow16.png
+-@RESPATH@/chrome/icons/default/abcardWindow48.png
+-@RESPATH@/chrome/icons/default/ablistWindow.png
+-@RESPATH@/chrome/icons/default/ablistWindow16.png
+-@RESPATH@/chrome/icons/default/ablistWindow48.png
+-@RESPATH@/chrome/icons/default/addressbookWindow.png
+-@RESPATH@/chrome/icons/default/addressbookWindow16.png
+-@RESPATH@/chrome/icons/default/addressbookWindow48.png
+-@RESPATH@/chrome/icons/default/messengerWindow.png
+-@RESPATH@/chrome/icons/default/messengerWindow16.png
+-@RESPATH@/chrome/icons/default/messengerWindow48.png
+-@RESPATH@/chrome/icons/default/msgcomposeWindow.png
+-@RESPATH@/chrome/icons/default/msgcomposeWindow16.png
+-@RESPATH@/chrome/icons/default/msgcomposeWindow48.png
+-#elifdef XP_WIN
+-@RESPATH@/chrome/icons/default/abcardWindow.ico
+-@RESPATH@/chrome/icons/default/ablistWindow.ico
+-@RESPATH@/chrome/icons/default/addressbookWindow.ico
+-@RESPATH@/chrome/icons/default/messengerWindow.ico
+-@RESPATH@/chrome/icons/default/msgcomposeWindow.ico
+-#endif
+ 
+ ; [MailNews Default Preferences]
+ @RESPATH@/@PREF_DIR@/mailnews.js
+ @RESPATH@/@PREF_DIR@/mdn.js
+ @RESPATH@/@PREF_DIR@/smime.js
+ 
+ #ifdef MOZ_MAPI_SUPPORT
+ @BINPATH@/MapiProxy.dll

sea/comm/CONTRIB-FIXED-ifdefs-l10n-extensions-hack.patch

@@ -0,0 +1,21 @@
+# HG changeset patch
+# Parent  ff5f2d090a9f8e3cdce604d55fd70d9e9a2101d3
+Bug 999999 - Fix the hack in l10n jar manifest for the condition of
+no extensions l10n to slip in.
+
+diff --git a/suite/locales/jar.mn b/suite/locales/jar.mn
+--- a/suite/locales/jar.mn
++++ b/suite/locales/jar.mn
+@@ -390,10 +390,12 @@
+   locale/@AB_CD@/navigator/webDeveloper.dtd                                 (%chrome/browser/webDeveloper.dtd)
+   locale/@AB_CD@/navigator-region/region.properties                         (%chrome/browser/region.properties)
+   locale/@AB_CD@/pippki/pref-certs.dtd                                      (%chrome/common/pref/pref-certs.dtd)
+   locale/@AB_CD@/pippki/pref-masterpass.dtd                                 (%chrome/common/pref/pref-masterpass.dtd)
+   locale/@AB_CD@/pippki/pref-passwords.dtd                                  (%chrome/common/pref/pref-passwords.dtd)
+   locale/@AB_CD@/pippki/pref-ssl.dtd                                        (%chrome/common/pref/pref-ssl.dtd)
+ 
+ # This is hacky, but ensures the chrome.manifest chain is complete.
++#if defined(MOZ_CALENDAR) || defined(MOZ_IRC) || defined(MOZ_DEBUGQA)
+ [.] chrome.jar:
+ % manifest extensions/chrome.manifest
++#endif

sea/comm/CONTRIB-FIXED-locales-makefile-calendar-ifdef.patch

@@ -0,0 +1,27 @@
+# HG changeset patch
+# Parent  5dc54e8a8cf39e59f00d228d74e7a9f050d0f679
+Bug 9999999 - Add missing ifdef to locales makefile for MOZ_CALENDAR
+
+diff --git a/suite/locales/Makefile.in b/suite/locales/Makefile.in
+--- a/suite/locales/Makefile.in
++++ b/suite/locales/Makefile.in
+@@ -98,17 +98,19 @@ misc:: $(call MERGE_FILES,$(addprefix pr
+ l10n-%: AB_CD=$*
+ l10n-%:
+ # merge if we're not en-US. Conditional function because
+ # we need the current value of AB_CD.
+ 	$(if $(filter en-US,$(AB_CD)),, @$(MAKE) merge-$*)
+ 	$(NSINSTALL) -D $(DIST)/install
+ 	@$(MAKE) -C $(DEPTH)/toolkit/locales l10n-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
+ #	@$(MAKE) -C $(DEPTH)/services/sync/locales AB_CD=$* XPI_NAME=locale-$*
++ifdef MOZ_CALENDAR
+ 	@$(MAKE) -C ../../calendar/locales AB_CD=$* XPI_NAME=locale-$*
++endif
+ ifdef MOZ_IRC
+ 	@$(MAKE) -C ../extensions/irc/locales AB_CD=$* XPI_NAME=locale-$*
+ endif
+ ifdef MOZ_DEBUGQA
+ 	@$(MAKE) -C ../extensions/debugQA/locales AB_CD=$* XPI_NAME=locale-$*
+ endif
+ 	@$(MAKE) -C $(DEPTH)/extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
+ 	@$(MAKE) -C $(DEPTH)/devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'

sea/comm/binoc/borealis-confvars.patch

@@ -1,42 +0,0 @@
-# HG changeset patch
-# User Matt A. Tobin <email@mattatobin.com>
-# Date 1724100323 18000
-# Node ID 34d9b3fa1665eb29bb391d97f2219542afc45aaf
-# Parent  39ebd2dfbe6aaae94a845bca2d0e9d7409764466
-Issue 9999999 - Update confvars for BinOC branding
-
-diff --git a/suite/confvars.sh b/suite/confvars.sh
---- a/suite/confvars.sh
-+++ b/suite/confvars.sh
-@@ -1,26 +1,26 @@
- #! /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_APP_BASENAME=Borealis
-+MOZ_APP_VENDOR=BinOC
-+MOZ_APP_NAME=borealis
-+MOZ_APP_DISPLAYNAME=Borealis
- 
- MOZ_APP_VERSION=$SEAMONKEY_VERSION
- MOZ_APP_VERSION_DISPLAY=$SEAMONKEY_VERSION_DISPLAY
- MOZ_PKG_VERSION=$SEAMONKEY_VERSION_PACKAGE
- 
- BROWSER_CHROME_URL=chrome://navigator/content/navigator.xul
- 
- MOZ_BRANDING_DIRECTORY=comm/suite/branding/seamonkey
--MOZ_OFFICIAL_BRANDING_DIRECTORY=comm/suite/branding/seamonkey
-+MOZ_OFFICIAL_BRANDING_DIRECTORY=comm/suite/branding/borealis
- 
- 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

sea/comm/series

@@ -1,12 +1,14 @@
-TOP-BINOC-disable-mailnews.patch
-TOP-BINOC-domi-inspect-by-keycombo.patch
-TOP-BINOC-security-urlbar-status-styleux.patch
-TOP-BINOC-modern-original-personal-toolbar-home-icon.patch
+1912354-domi-inspect-by-keycombo.patch
 1913787-places-go-menu.patch
+CONTRIB-INCOMPLETE-disable-mailnews.patch
+CONTRIB-FIXED-locales-makefile-calendar-ifdef.patch
+CONTRIB-FIXED-chrome-icons-pkgmanifest.patch
+CONTRIB-FIXED-ifdefs-l10n-extensions-hack.patch
+CONTRIB-INCOMPLETE-security-style-update.patch
 XXXXXXX-MQSTOP-BINOC-UXSTYLE.patch
-./binoc/aviary-style-tabs.patch
-./binoc/kempelton-altnavi-icons.patch
 ./binoc/modern-skin-remove-navi-groove.patch
+./binoc/modern-skin-personal-toolbar-home-icon.patch
+./binoc/kempelton-altnavi-icons.patch
+./binoc/aviary-style-tabs.patch
 XXXXXXX-MQSTOP-BINOC-TRADEMARKED-BRANDING.patch
-./binoc/borealis-confvars.patch
-./binoc/borealis-branding.patch
+./binoc/branding.patch