pre push

comm-central/patches/1841165-1-cleaninstaller-1_1-25318.patch

@@ -0,0 +1,308 @@
+# HG changeset patch
+# User Frank-Rainer Grahl <frgrahl@gmx.net>
+# Date 1687039063 -7200
+# Parent  df334c4248616fffa14cbf55779e785e6a170efe
+Bug 1841165 - Clean up SeaMonkey Windows installer files. r=IanN
+
+diff --git a/suite/installer/windows/Makefile.in b/suite/installer/windows/Makefile.in
+--- a/suite/installer/windows/Makefile.in
++++ b/suite/installer/windows/Makefile.in
+@@ -9,17 +9,16 @@ SFX_MODULE = $(topsrcdir)/comm/other-lic
+ 
+ EXPAND_COMM_LOCALE_SRCDIR = $(if $(filter en-US,$(AB_CD)),$(topsrcdir)/comm/$(1)/en-US,$(or $(realpath $(L10NBASEDIR)),$(abspath $(L10NBASEDIR)))/$(AB_CD)/$(subst /locales,,$(1)))
+ 
+ INSTALLER_FILES = \
+ 	app.tag \
+ 	nsis/installer.nsi \
+ 	nsis/uninstaller.nsi \
+ 	nsis/shared.nsh \
+-	nsis/custom.nsi \
+ 	$(NULL)
+ 
+ BRANDING_FILES = \
+ 	branding.nsi \
+ 	wizHeader.bmp \
+ 	wizHeaderRTL.bmp \
+ 	wizWatermark.bmp \
+ 	$(NULL)
+diff --git a/suite/installer/windows/nsis/custom.nsi b/suite/installer/windows/nsis/custom.nsi
+deleted file mode 100644
+--- a/suite/installer/windows/nsis/custom.nsi
++++ /dev/null
+@@ -1,68 +0,0 @@
+-# 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/.
+-
+-!macro checkSuiteComponents
+-  ; If no extensions are available skip the components page
+-  ${Unless} ${FileExists} "$EXEDIR\optional\extensions\debugQA@mozilla.org.xpi"
+-  ${AndUnless} ${FileExists} "$EXEDIR\optional\extensions\{f13b157f-b174-47e7-a34d-4815ddfdfeb8}.xpi"
+-    Abort
+-  ${EndUnless}
+-!macroend
+-
+-!macro createSuiteComponentsIni
+-  WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Type   "label"
+-  WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Text   "$(OPTIONAL_COMPONENTS_LABEL)"
+-  WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Left   "0"
+-  WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Right  "-1"
+-  WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Top    "0"
+-  WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Bottom "15"
+-
+-  StrCpy $R1 2
+-  ; Top of checkbox
+-  StrCpy $R2 15
+-  ; Bottom of checkbox
+-  StrCpy $R3 25
+-  ; Seperation between titles/text
+-  StrCpy $R4 25
+-
+-  ${If} ${FileExists} "$EXEDIR\optional\extensions\debugQA@mozilla.org.xpi"
+-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Type   "checkbox"
+-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Text   "$(DEBUGQA_TITLE)"
+-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Left   "15"
+-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Right  "-1"
+-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Top    "$R2"
+-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Bottom "$R3"
+-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" State  "1"
+-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Flags  "GROUP"
+-    ${GetSize} "$EXEDIR\optional\extensions\debugQA@mozilla.org.xpi" "/S=0K" $0 $8 $9
+-    SectionSetSize ${DEBUG_IDX} $0
+-    IntOp $R1 $R1 + 1
+-    IntOp $R2 $R2 + $R4
+-    IntOp $R3 $R3 + $R4
+-  ${Else}
+-    ; Hide debugQA in the components page if it isn't available.
+-    SectionSetText ${DEBUG_IDX} ""
+-  ${EndIf}
+-
+-  ; Set new values for the top and bottom of labels
+-  ; Top of label box
+-  StrCpy $R2 27
+-  ; Bottom of label box
+-  StrCpy $R3 47
+-
+-  ${If} ${FileExists} "$EXEDIR\optional\extensions\debugQA@mozilla.org.xpi"
+-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Type   "label"
+-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Text   "$(DEBUGQA_TEXT)"
+-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Left   "30"
+-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Right  "-1"
+-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Top    "$R2"
+-    WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Bottom "$R3"
+-    IntOp $R1 $R1 + 1
+-    IntOp $R2 $R2 + $R4
+-    IntOp $R3 $R3 + $R4
+-  ${EndIf}
+-
+-  WriteINIStr "$PLUGINSDIR\components.ini" "Settings" NumFields "$R1"
+-
+-!macroend
+diff --git a/suite/installer/windows/nsis/installer.nsi b/suite/installer/windows/nsis/installer.nsi
+--- a/suite/installer/windows/nsis/installer.nsi
++++ b/suite/installer/windows/nsis/installer.nsi
+@@ -51,17 +51,16 @@ Var RegisterDefaultAgent
+ !insertmacro GetSize
+ !insertmacro WordFind
+ 
+ ; The following includes are custom.
+ !include branding.nsi
+ !include defines.nsi
+ !include common.nsh
+ !include locales.nsi
+-!include custom.nsi
+ 
+ VIAddVersionKey "FileDescription" "${BrandShortName} Installer"
+ VIAddVersionKey "OriginalFilename" "setup.exe"
+ 
+ ; Must be inserted before other macros that use logging
+ !insertmacro _LoggingCommon
+ 
+ ; Most commonly used macros for managing shortcuts
+@@ -137,19 +136,16 @@ ShowInstDetails nevershow
+ ; License Page
+ !define MUI_PAGE_CUSTOMFUNCTION_SHOW showLicense
+ !define MUI_LICENSEPAGE_CHECKBOX
+ !insertmacro MUI_PAGE_LICENSE license.txt
+ 
+ ; Custom Options Page
+ Page custom preOptions leaveOptions
+ 
+-; Custom Components Page
+-Page custom preComponents leaveComponents
+-
+ ; Select Install Directory Page
+ !define MUI_PAGE_CUSTOMFUNCTION_PRE preDirectory
+ !define MUI_PAGE_CUSTOMFUNCTION_LEAVE leaveDirectory
+ !define MUI_DIRECTORYPAGE_VERIFYONLEAVE
+ !insertmacro MUI_PAGE_DIRECTORY
+ 
+ ; Custom Shortcuts Page
+ Page custom preShortcuts leaveShortcuts
+@@ -195,30 +191,16 @@ Section "-InstallStartCleanup"
+     ; If the user closed the application it can take several seconds for it to
+     ; shut down completely. If the application is being used by another user we
+     ; can rename the file and then delete is when the system is restarted.
+     Sleep 5000
+     ${DeleteFile} "$INSTDIR\${FileMainEXE}"
+     ClearErrors
+   ${EndIf}
+ 
+-  ${If} $InstallType == ${INSTALLTYPE_CUSTOM}
+-    ; Custom installs.
+-    ; If DebugQA is installed and this install includes DebugQA remove it
+-    ; from the installation directory. This will remove it if the user
+-    ; deselected DebugQA on the components page.
+-    ${If} ${FileExists} "$EXEDIR\optional\extensions\debugQA@mozilla.org.xpi"
+-      ${DeleteFile} "$INSTDIR\extensions\debugQA@mozilla.org.xpi"
+-      ${If} ${FileExists} "$INSTDIR\extensions\debugQA@mozilla.org"
+-        RmDir /r "$INSTDIR\extensions\debugQA@mozilla.org"
+-      ${EndIf}
+-    ${EndIf}
+-
+-  ${EndIf}
+-
+   ; setup the application model id registration value
+   ${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
+ 
+   ; Remove the updates directory for Windows 7 and above
+   ${CleanUpdateDirectories} "Mozilla\SeaMonkey" "Mozilla\updates"
+ 
+   ${RemoveDeprecatedFiles}
+ 
+@@ -459,32 +441,16 @@ Section "-Application" APP_IDX
+       ApplicationID::Set "$DESKTOP\${BrandFullName}.lnk" "$AppUserModelID"
+     ${EndIf}
+     ${LogMsg} "Added Shortcut: $DESKTOP\${BrandFullName}.lnk"
+   ${EndIf}
+ 
+   !insertmacro MUI_STARTMENU_WRITE_END
+ SectionEnd
+ 
+-Section /o "Debug and QA Tools" DEBUG_IDX
+-  ${If} ${FileExists} "$EXEDIR\optional\extensions\debugQA@mozilla.org.xpi"
+-    SetDetailsPrint both
+-    DetailPrint $(STATUS_INSTALL_OPTIONAL)
+-    SetDetailsPrint none
+-
+-    ${RemoveDir} "$INSTDIR\extensions\debugQA@mozilla.org"
+-    ${DeleteFile} "$INSTDIR\extensions\debugQA@mozilla.org.xpi"
+-    ${DeleteFile} "$INSTDIR\distribution\extensions\debugQA@mozilla.org.xpi"
+-    ClearErrors
+-    ${LogHeader} "Installing Debug and QA Tools"
+-    CopyFiles /SILENT "$EXEDIR\optional\extensions\debugQA@mozilla.org.xpi" \
+-                      "$INSTDIR\extensions\"
+-  ${EndIf}
+-SectionEnd
+-
+ ; Cleanup operations to perform at the end of the installation.
+ Section "-InstallEndCleanup"
+   SetDetailsPrint both
+   DetailPrint "$(STATUS_CLEANUP)"
+   SetDetailsPrint none
+ 
+   ; Refresh desktop icons
+   System::Call "shell32::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)"
+@@ -626,39 +592,16 @@ Function leaveOptions
+ 
+   ${LeaveOptionsCommon}
+ 
+   ${If} $InstallType == ${INSTALLTYPE_BASIC}
+     Call CheckExistingInstall
+   ${EndIf}
+ FunctionEnd
+ 
+-Function preComponents
+-  ${CheckCustomCommon}
+-  !insertmacro checkSuiteComponents
+-  !insertmacro MUI_HEADER_TEXT "$(OPTIONAL_COMPONENTS_TITLE)" "$(OPTIONAL_COMPONENTS_SUBTITLE)"
+-  !insertmacro MUI_INSTALLOPTIONS_DISPLAY "components.ini"
+-FunctionEnd
+-
+-Function leaveComponents
+-  ; If debugQA exists then it will be Field 2.
+-  StrCpy $R1 2
+-
+-  ${If} ${FileExists} "$EXEDIR\optional\extensions\debugQA@mozilla.org.xpi"
+-    ${MUI_INSTALLOPTIONS_READ} $R0 "components.ini" "Field $R1" "State"
+-    ; State will be 1 for checked and 0 for unchecked so we can use that to set
+-    ; the section flags for installation.
+-    SectionSetFlags ${DEBUG_IDX} $R0
+-    IntOp $R1 $R1 + 1
+-  ${Else}
+-    SectionSetFlags ${DEBUG_IDX} 0 ; Disable install for debugQA
+-  ${EndIf}
+-
+-FunctionEnd
+-
+ Function preDirectory
+   ${PreDirectoryCommon}
+ FunctionEnd
+ 
+ Function leaveDirectory
+   ${If} $InstallType == ${INSTALLTYPE_BASIC}
+     Call CheckExistingInstall
+   ${EndIf}
+@@ -837,17 +780,16 @@ Function .onInit
+   ${EndUnless}
+   SetRegView 64
+ !endif
+ 
+   ${InstallOnInitCommon} "$(WARN_MIN_SUPPORTED_OSVER_CPU_MSG)"
+ 
+ 
+   !insertmacro InitInstallOptionsFile "options.ini"
+-  !insertmacro InitInstallOptionsFile "components.ini"
+   !insertmacro InitInstallOptionsFile "shortcuts.ini"
+   !insertmacro InitInstallOptionsFile "summary.ini"
+ 
+   ; Setup the options.ini file for the Custom Options Page
+   WriteINIStr "$PLUGINSDIR\options.ini" "Settings" NumFields "5"
+ 
+   WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Type   "label"
+   WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Text   "$(OPTIONS_SUMMARY)"
+@@ -882,19 +824,16 @@ Function .onInit
+ 
+   WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Type   "label"
+   WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Text   "$(OPTION_CUSTOM_DESC)"
+   WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Left   "30"
+   WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Right  "-1"
+   WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Top    "67"
+   WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Bottom "87"
+ 
+-  ; Setup the components.ini file for the Components page
+-  !insertmacro createSuiteComponentsINI
+-
+   ; Setup the shortcuts.ini file for the Custom Shortcuts Page
+   WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Settings" NumFields "4"
+ 
+   WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Type   "label"
+   WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Text   "$(CREATE_ICONS_DESC)"
+   WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Left   "0"
+   WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Right  "-1"
+   WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Top    "5"
+diff --git a/suite/locales/en-US/installer/windows/custom.properties b/suite/locales/en-US/installer/windows/custom.properties
+--- a/suite/locales/en-US/installer/windows/custom.properties
++++ b/suite/locales/en-US/installer/windows/custom.properties
+@@ -14,21 +14,16 @@
+ # $BrandFullNameDA allows the string to contain an ampersand (e.g. DA stands
+ # for double ampersand) and prevents the letter following the ampersand from
+ # being used as an accesskey.
+ 
+ # You can use \n to create a newline in the string but only when the string
+ # from en-US contains a \n.
+ 
+ REG_APP_DESC=$BrandShortName delivers safe, easy web browsing. A familiar user interface, enhanced security features including protection from online identity theft, and integrated search let you get the most out of the web.
+-OPTIONAL_COMPONENTS_TITLE=Choose Optional Components
+-OPTIONAL_COMPONENTS_SUBTITLE=Choose which features of $BrandFullNameDA you want to install.
+-OPTIONAL_COMPONENTS_LABEL=Optional Components:
+-DEBUGQA_TITLE=Debug and QA UI
+-DEBUGQA_TEXT=Provides additional debug and QA UI for $BrandShortName development.
+ CONTEXT_OPTIONS=$BrandShortName &Options
+ CONTEXT_SAFE_MODE=$BrandShortName &Safe Mode
+ SAFE_MODE=Safe Mode
+ # MAILNEWS_TEXT appears in Windows (All) Programs menu as "SeaMonkey $(MAILNEWS_TEXT)"
+ MAILNEWS_TEXT=Mail
+ PROFILE_TEXT=Profile Manager
+ OPTIONS_PAGE_TITLE=Setup Type
+ OPTIONS_PAGE_SUBTITLE=Choose setup options

comm-central/patches/1841165-2-nosurvey-1_1-25318.patch

@@ -0,0 +1,148 @@
+# HG changeset patch
+# User Frank-Rainer Grahl <frgrahl@gmx.net>
+# Date 1687124663 -7200
+# Parent  7f18b7ae6547015cceb5fdfe1c9b25c484fd2e5e
+Bug 1841165 - Remove unused survey code in installer. r=IanN
+
+diff --git a/suite/installer/windows/nsis/defines.nsi.in b/suite/installer/windows/nsis/defines.nsi.in
+--- a/suite/installer/windows/nsis/defines.nsi.in
++++ b/suite/installer/windows/nsis/defines.nsi.in
+@@ -1,14 +1,13 @@
+ #filter substitution
+ !define AppName               "SeaMonkey"
+ !define AppVersion            "@APP_VERSION@"
+ !define GREVersion            @MOZILLA_VERSION@
+ !define AB_CD                 "@AB_CD@"
+-!define NO_UNINSTALL_SURVEY
+ 
+ !define FileMainEXE           "@MOZ_APP_NAME@.exe"
+ !define WindowClass           "SeaMonkeyMessageWindow"
+ !define DDEApplication        "SeaMonkey"
+ 
+ !define AppRegName            "SeaMonkey"
+ !define AppRegNameMail        "SeaMonkey (Mail)"
+ !define AppRegNameNews        "SeaMonkey (News)"
+diff --git a/suite/installer/windows/nsis/uninstaller.nsi b/suite/installer/windows/nsis/uninstaller.nsi
+--- a/suite/installer/windows/nsis/uninstaller.nsi
++++ b/suite/installer/windows/nsis/uninstaller.nsi
+@@ -145,26 +145,16 @@ ShowUnInstDetails nevershow
+ !insertmacro MUI_UNPAGE_WELCOME
+ 
+ ; Uninstall Confirm Page
+ UninstPage custom un.preConfirm un.leaveConfirm
+ 
+ ; Remove Files Page
+ !insertmacro MUI_UNPAGE_INSTFILES
+ 
+-; Don't setup the survey controls, functions, etc. when the application has
+-; defined NO_UNINSTALL_SURVEY
+-!ifndef NO_UNINSTALL_SURVEY
+-!define MUI_PAGE_CUSTOMFUNCTION_PRE un.preFinish
+-!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
+-!define MUI_FINISHPAGE_SHOWREADME ""
+-!define MUI_FINISHPAGE_SHOWREADME_TEXT $(SURVEY_TEXT)
+-!define MUI_FINISHPAGE_SHOWREADME_FUNCTION un.Survey
+-!endif
+-
+ !insertmacro MUI_UNPAGE_FINISH
+ 
+ ; Use the default dialog for IDD_VERIFY for a simple Banner
+ ChangeUI IDD_VERIFY "${NSISDIR}\Contrib\UIs\default.exe"
+ 
+ ################################################################################
+ # Install Sections
+ ; Empty section required for the installer to compile as an uninstaller
+@@ -391,24 +381,16 @@ Section "Uninstall"
+   ; removed and other ugly things will happen like recreation of the app's
+   ; clients registry key by the OS under some conditions.
+   System::Call "shell32::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)"
+ SectionEnd
+ 
+ ################################################################################
+ # Helper Functions
+ 
+-; Don't setup the survey controls, functions, etc. when the application has
+-; defined NO_UNINSTALL_SURVEY
+-!ifndef NO_UNINSTALL_SURVEY
+-Function un.Survey
+-  Exec "$\"$TmpVal$\" $\"${SurveyURL}$\""
+-FunctionEnd
+-!endif
+-
+ ################################################################################
+ # Language
+ 
+ !insertmacro MOZ_MUI_LANGUAGE 'baseLocale'
+ !verbose push
+ !verbose 3
+ !include "overrideLocale.nsh"
+ !include "customLocale.nsh"
+@@ -515,47 +497,16 @@ Function un.leaveConfirm
+   ; then remove them on restart if they are in use.
+   ClearErrors
+   ${DeleteFile} "$INSTDIR\${FileMainEXE}"
+   ${If} ${Errors}
+     ${un.ManualCloseAppPrompt} "${WindowClass}" "$(WARN_MANUALLY_CLOSE_APP_UNINSTALL)"
+   ${EndIf}
+ FunctionEnd
+ 
+-!ifndef NO_UNINSTALL_SURVEY
+-Function un.preFinish
+-  ; Do not modify the finish page if there is a reboot pending
+-  ${Unless} ${RebootFlag}
+-    ; Setup the survey controls, functions, etc.
+-    StrCpy $TmpVal "SOFTWARE\Microsoft\IE Setup\Setup"
+-    ClearErrors
+-    ReadRegStr $0 HKLM $TmpVal "Path"
+-    ${If} ${Errors}
+-      !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "settings" "NumFields" "3"
+-    ${Else}
+-      ExpandEnvStrings $0 "$0" ; this value will usually contain %programfiles%
+-      ${If} $0 != "\"
+-        StrCpy $0 "$0\"
+-      ${EndIf}
+-      StrCpy $0 "$0\iexplore.exe"
+-      ClearErrors
+-      GetFullPathName $TmpVal $0
+-      ${If} ${Errors}
+-        !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "settings" "NumFields" "3"
+-      ${Else}
+-        ; When we add an optional action to the finish page the cancel button
+-        ; is enabled. This disables it and leaves the finish button as the
+-        ; only choice.
+-        !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "settings" "cancelenabled" "0"
+-      ${EndIf}
+-    ${EndIf}
+-  ${EndUnless}
+-FunctionEnd
+-!endif
+-
+ ################################################################################
+ # Initialization Functions
+ 
+ Function .onInit
+   ; We need this set up for most of the helper.exe operations.
+   !ifdef AppName
+   ${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
+   !endif
+diff --git a/suite/locales/en-US/installer/windows/custom.properties b/suite/locales/en-US/installer/windows/custom.properties
+--- a/suite/locales/en-US/installer/windows/custom.properties
++++ b/suite/locales/en-US/installer/windows/custom.properties
+@@ -30,17 +30,16 @@ OPTIONS_PAGE_SUBTITLE=Choose setup optio
+ SHORTCUTS_PAGE_TITLE=Set Up Shortcuts
+ SHORTCUTS_PAGE_SUBTITLE=Create Program Icons
+ SUMMARY_PAGE_TITLE=Summary
+ SUMMARY_PAGE_SUBTITLE=Ready to start installing $BrandShortName
+ SUMMARY_INSTALLED_TO=$BrandShortName will be installed to the following location:
+ SUMMARY_CLICK=Click Install to continue.
+ SUMMARY_REBOOT_REQUIRED_INSTALL=A restart of your computer may be required to complete the installation.
+ SUMMARY_REBOOT_REQUIRED_UNINSTALL=A restart of your computer may be required to complete the uninstall.
+-SURVEY_TEXT=&Tell us what you thought of $BrandShortName
+ LAUNCH_TEXT=&Launch $BrandFullNameDA now
+ CREATE_ICONS_DESC=Create icons for $BrandShortName:
+ ICONS_DESKTOP=On my &Desktop
+ ICONS_STARTMENU=In my &Start Menu Programs folder
+ ICONS_QUICKLAUNCH=In my &Quick Launch bar
+ WARN_WRITE_ACCESS=You don't have access to write to the installation directory.\n\nClick OK to select a different directory.
+ WARN_DISK_SPACE=You don't have sufficient disk space to install to this location.\n\nClick OK to select a different location.
+ WARN_MIN_SUPPORTED_CPU_MSG=Sorry, $BrandShortName can't be installed. This version of $BrandShortName requires a processor with ${MinSupportedCPU} support. Please click the OK button for additional information.

comm-central/patches/1841167-branding-1_1-25318.patch

@@ -0,0 +1,159 @@
+# HG changeset patch
+# User Frank-Rainer Grahl <frgrahl@gmx.net>
+# Date 1687557483 -7200
+# Parent  d8fa9e6befd840c3ab632f3fc96aed241359b5fe
+Bug 1841167 - Clean up branding files. r=IanN
+
+diff --git a/suite/app/module.ver b/suite/app/module.ver
+--- a/suite/app/module.ver
++++ b/suite/app/module.ver
+@@ -1,8 +1,8 @@
+-WIN32_MODULE_COMPANYNAME=mozilla.org
+-WIN32_MODULE_COPYRIGHT=©Mozilla Developers, according to the MPL 1.1/GPL 2.0/LGPL 2.1 licenses, as applicable.
++WIN32_MODULE_COMPANYNAME=SeaMonkey e.V.
++WIN32_MODULE_COPYRIGHT=©SeaMonkey Developers, according to the MPL 1.1/GPL 2.0/LGPL 2.1 licenses, as applicable.
+ WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@
+ WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@
+-WIN32_MODULE_TRADEMARKS=SeaMonkey and Mozilla are trademarks of The Mozilla Foundation.
++WIN32_MODULE_TRADEMARKS=SeaMonkey is a trademark of SeaMonkey e.V.
+ WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@
+ WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@
+ WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@
+diff --git a/suite/branding/seamonkey/icons/template/svg/README b/suite/branding/seamonkey/icons/template/svg/README
+--- a/suite/branding/seamonkey/icons/template/svg/README
++++ b/suite/branding/seamonkey/icons/template/svg/README
+@@ -7,9 +7,9 @@ that may be created in the future.
+ All image files in this directory and images derived from them are licensed
+ under the MPL 2 as follows:
+ 
+ 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/.
+ 
+ Note: The images may contain parts of the SeaMonkey logo, which by itself is a
+-registered trademark of the Mozilla Foundation.
++registered trademark of SeaMonkey e.V.
+diff --git a/suite/installer/windows/nsis/defines.nsi.in b/suite/installer/windows/nsis/defines.nsi.in
+--- a/suite/installer/windows/nsis/defines.nsi.in
++++ b/suite/installer/windows/nsis/defines.nsi.in
+@@ -49,15 +49,15 @@
+ !else
+ !define AccessibleHandlerCLSID "{4A195748-DCA2-45FB-9295-0A139E76A9E7}"
+ !endif
+ 
+ # File details shared by both the installer and uninstaller
+ VIProductVersion "1.0.0.0"
+ VIAddVersionKey "ProductName"     "${BrandShortName}"
+ VIAddVersionKey "CompanyName"     "${CompanyName}"
+-VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of The Mozilla Foundation."
++VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of SeaMonkey e.V."
+ VIAddVersionKey "LegalCopyright"  "${CompanyName}"
+ VIAddVersionKey "FileVersion"     "${AppVersion}"
+ VIAddVersionKey "ProductVersion"  "${AppVersion}"
+ # Comments is not used but left below commented out for future reference
+ # VIAddVersionKey "Comments"        "Comments"
+ 
+diff --git a/suite/locales/en-US/defines.inc b/suite/locales/en-US/defines.inc
+--- a/suite/locales/en-US/defines.inc
++++ b/suite/locales/en-US/defines.inc
+@@ -1,9 +1,9 @@
+ #filter emptyLines
+ 
+-#define MOZ_LANGPACK_CREATOR mozilla.org
++#define MOZ_LANGPACK_CREATOR SeaMonkey e.V.
+ 
+ # If non-English locales wish to credit multiple contributors, uncomment this
+ # variable definition and use the format specified.
+ # #define MOZ_LANGPACK_CONTRIBUTORS <em:contributor>Joe Solon</em:contributor> <em:contributor>Suzy Solon</em:contributor>
+ 
+ #unfilter emptyLines
+diff --git a/suite/locales/en-US/profile/bookmarks.inc b/suite/locales/en-US/profile/bookmarks.inc
+--- a/suite/locales/en-US/profile/bookmarks.inc
++++ b/suite/locales/en-US/profile/bookmarks.inc
+@@ -3,48 +3,40 @@
+ # LOCALIZATION NOTE: The 'en-US' strings in some URLs will be replaced with
+ # your locale code, and link to your translated pages as soon as they're live.
+ 
+ #define bookmarks_title Bookmarks
+ #define bookmarks_heading Bookmarks
+ 
+ #define personal_toolbarfolder Personal Toolbar Folder
+ 
+-#define seamonkey_and_mozilla SeaMonkey and Mozilla
++#define seamonkey_and_support SeaMonkey Resources
+ 
+ # LOCALIZATION NOTE (seamonkey):
+ # link title for https://www.seamonkey-project.org/ (in the personal toolbar)
+ #define seamonkey SeaMonkey
+ 
+ # LOCALIZATION NOTE (seamonkey_long):
+ # link title for https://www.seamonkey-project.org/ (in normal bookmarks)
+ #define seamonkey_long The SeaMonkey Project
+ 
+-# LOCALIZATION NOTE (mozilla_org_long):
+-# link title for https://www.mozilla.org/ (in normal bookmarks)
+-#define mozilla_org_long The Mozilla Organization
+-
+ #define extend_seamonkey Extending SeaMonkey
+ 
+ # LOCALIZATION NOTE (seamonkey_addons):
+ # link title for https://addons.thunderbird.net/en-US/seamonkey/
+ #define seamonkey_addons SeaMonkey Add-ons
+ 
+ # LOCALIZATION NOTE (seamonkey_themes):
+ # link title for https://addons.thunderbird.net/en-US/seamonkey/themes
+ #define seamonkey_themes SeaMonkey Themes
+ 
+ # LOCALIZATION NOTE (seamonkey_dictionaries):
+ # link title for https://addons.thunderbird.net/en-US/seamonkey/dictionaries
+ #define seamonkey_dictionaries Spell Checking Dictionaries
+ 
+-# LOCALIZATION NOTE (seamonkey_plugins):
+-# link title for https://addons.thunderbird.net/en-US/seamonkey/plugins
+-#define seamonkey_plugins Plugins for SeaMonkey
+-
+ #define community_support Community &amp; Support
+ 
+ # LOCALIZATION NOTE (seamonkey_community):
+ # link title for https://www.seamonkey-project.org/community
+ #define seamonkey_community SeaMonkey Community
+ 
+ # LOCALIZATION NOTE (mozillazine):
+ # link title for http://www.mozillazine.org/
+diff --git a/suite/locales/generic/profile/bookmarks.html.in b/suite/locales/generic/profile/bookmarks.html.in
+--- a/suite/locales/generic/profile/bookmarks.html.in
++++ b/suite/locales/generic/profile/bookmarks.html.in
+@@ -14,30 +14,28 @@ Do Not Edit! -->
+ 
+ <DL><p>
+     <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="NC:PersonalToolbarFolder">@personal_toolbarfolder@</H3>
+     <DL><p>
+         <DT><A HREF="https://www.seamonkey-project.org/">@seamonkey@</a>
+         @seamonkey_l10n@
+         <DT><A HREF="http://www.mozillazine.org/">@mozillazine@</A>
+     </DL><p>
+-    <DT><H3>@seamonkey_and_mozilla@</H3>
++    <DT><H3>@seamonkey_and_support@</H3>
+     <DL><p>
+         <DT><A HREF="https://www.seamonkey-project.org/">@seamonkey_long@</a>
+         @seamonkey_l10n_long@
+-        <DT><A HREF="https://www.mozilla.org/">@mozilla_org_long@</A>
+         <DT><H3>@extend_seamonkey@</H3>
+         <DL><p>
+             <DT><A HREF="https://addons.thunderbird.net/@AB_CD@/seamonkey/">@seamonkey_addons@</a>
+             <DT><A HREF="https://addons.thunderbird.net/@AB_CD@/seamonkey/themes">@seamonkey_themes@</a>
+             <DT><A HREF="https://addons.thunderbird.net/@AB_CD@/seamonkey/dictionaries">@seamonkey_dictionaries@</a>
+-            <DT><A HREF="https://addons.thunderbird.net/@AB_CD@/seamonkey/plugins">@seamonkey_plugins@</a>
+         </DL><p>
+         <DT><H3>@community_support@</H3>
+         <DL><p>
+             <DT><A HREF="https://www.seamonkey-project.org/community">@seamonkey_community@</a>
+-            <DT><A HREF="http://www.mozillazine.org/">@mozillazine@</A>
+-            <DT><A HREF="http://forums.mozillazine.org/viewforum.php?f=40">@seamonkey_support@</A>
++            <DT><A HREF="https://www.mozillazine.org/">@mozillazine@</A>
++            <DT><A HREF="https://forums.mozillazine.org/viewforum.php?f=40">@seamonkey_support@</A>
+         </DL><p>
+     </DL><p>
+ #include bookmarks.extra
+     <HR>
+ </DL><p>

comm-central/patches/9999999-port1079662-suite.patch → comm-central/patches/1841169-port1079662-suite-25318.patch

@@ -1,8 +1,10 @@
 # HG changeset patch
 # User Bill Gianopoulos <wgianopoulos@gmail.com>
 # Date 1687168509 0
-Bug - Port bug 1079662 to suite.
-Bug 1079662 - Always enable PIE.
+# Parent  3077b06c17bee039e5aa02c02f83c133f9371da7
+Bug 1841169 - Enable PIE in SeaMonkey. r=IanN
+
+Port Bug 1079662 "Always enable PIE.".
 
 diff --git a/suite/app/Makefile.in b/suite/app/Makefile.in
 --- a/suite/app/Makefile.in

comm-central/patches/9999999-port1821963-suite-bustage.patch

@@ -1,6 +1,7 @@
 # HG changeset patch
 # User Bill Gianopoulos <wgianopoulos@gmail.com>
 # Date 1685208346 0
+# Parent  9eb1dd8a9a10fc2706c35ce92d31c6c6a5480a88
 Bug 9999999 - Port bug 1821963 to suite.
 Bug 1821963 - [CTW] Remove COM proxy infrastructure
 
@@ -31,19 +32,15 @@ diff --git a/suite/installer/package-manifest.in b/suite/installer/package-manif
 diff --git a/suite/installer/windows/nsis/defines.nsi.in b/suite/installer/windows/nsis/defines.nsi.in
 --- a/suite/installer/windows/nsis/defines.nsi.in
 +++ b/suite/installer/windows/nsis/defines.nsi.in
-@@ -26,36 +26,16 @@
- !define MinSupportedVer "Microsoft Windows 7 x64"
- #else
- !define ARCH "x86"
- !define MinSupportedVer "Microsoft Windows 7"
+@@ -29,32 +29,16 @@
  #endif
  
  !define MinSupportedCPU "SSE2"
  
--# AccessibleHandler.dll uses a different CLSID depending on release channel.
--# These defines must match HANDLER_CLSID defined in
--# accessible/ipc/win/handler/HandlerData.idl
--
+ # AccessibleHandler.dll uses a different CLSID depending on release channel.
+ # These defines must match HANDLER_CLSID defined in
+ # accessible/ipc/win/handler/HandlerData.idl
+ 
 -!if "@MOZ_UPDATE_CHANNEL@" == "default"
 -#ifdef DEBUG
 -!define AccessibleHandlerCLSID "{398FFD8D-5382-48F7-9E3B-19012762D39A}"
@@ -64,14 +61,14 @@ diff --git a/suite/installer/windows/nsis/defines.nsi.in b/suite/installer/windo
  VIProductVersion "1.0.0.0"
  VIAddVersionKey "ProductName"     "${BrandShortName}"
  VIAddVersionKey "CompanyName"     "${CompanyName}"
- VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of The Mozilla Foundation."
+ VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of SeaMonkey e.V."
  VIAddVersionKey "LegalCopyright"  "${CompanyName}"
  VIAddVersionKey "FileVersion"     "${AppVersion}"
  VIAddVersionKey "ProductVersion"  "${AppVersion}"
 diff --git a/suite/installer/windows/nsis/installer.nsi b/suite/installer/windows/nsis/installer.nsi
 --- a/suite/installer/windows/nsis/installer.nsi
 +++ b/suite/installer/windows/nsis/installer.nsi
-@@ -275,24 +275,16 @@ Section "-Application" APP_IDX
+@@ -257,24 +257,16 @@ Section "-Application" APP_IDX
      ${LogMsg} "** ERROR Registering: $INSTDIR\AccessibleMarshal.dll **"
    ${Else}
      ${LogUninstall} "DLLReg: \AccessibleMarshal.dll"
@@ -185,7 +182,7 @@ diff --git a/suite/installer/windows/nsis/shared.nsh b/suite/installer/windows/n
 diff --git a/suite/installer/windows/nsis/uninstaller.nsi b/suite/installer/windows/nsis/uninstaller.nsi
 --- a/suite/installer/windows/nsis/uninstaller.nsi
 +++ b/suite/installer/windows/nsis/uninstaller.nsi
-@@ -352,19 +352,17 @@ Section "Uninstall"
+@@ -342,19 +342,17 @@ Section "Uninstall"
    ${un.CleanVirtualStore}
  
    ; Only unregister the dll if the registration points to this installation

comm-central/patches/9999999-port1824420-suite-bustage.patch

@@ -1,12 +1,13 @@
 # HG changeset patch
 # User Bill Gianopoulos <wgianopoulos@gmail.com>
 # Date 1688066916 0
+# Parent  31bacfa043fdb3e887a56fbe74c1dfaf00f7adba
 Bug 9999999 - Port bug 1824420 to suite.
 
 diff --git a/suite/installer/windows/nsis/installer.nsi b/suite/installer/windows/nsis/installer.nsi
 --- a/suite/installer/windows/nsis/installer.nsi
 +++ b/suite/installer/windows/nsis/installer.nsi
-@@ -67,17 +67,17 @@ VIAddVersionKey "OriginalFilename" "setu
+@@ -66,17 +66,17 @@ VIAddVersionKey "OriginalFilename" "setu
  ; Most commonly used macros for managing shortcuts
  !insertmacro _LoggingShortcutsCommon
  
@@ -25,9 +26,9 @@ diff --git a/suite/installer/windows/nsis/installer.nsi b/suite/installer/window
  !insertmacro InitHashAppModelId
  !insertmacro IsHandlerForInstallDir
  !insertmacro ManualCloseAppPrompt
-@@ -213,17 +213,17 @@ Section "-InstallStartCleanup"
-     ${EndIf}
- 
+@@ -195,17 +195,17 @@ Section "-InstallStartCleanup"
+     ${DeleteFile} "$INSTDIR\${FileMainEXE}"
+     ClearErrors
    ${EndIf}
  
    ; setup the application model id registration value
@@ -85,7 +86,7 @@ diff --git a/suite/installer/windows/nsis/uninstaller.nsi b/suite/installer/wind
  !insertmacro un.ManualCloseAppPrompt
  !insertmacro un.ParseUninstallLog
  !insertmacro un.RegCleanAppHandler
-@@ -200,17 +200,17 @@ Section "Uninstall"
+@@ -190,17 +190,17 @@ Section "Uninstall"
    ${un.InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
  
    ; Unregister resources associated with Win7 taskbar jump lists.

comm-central/patches/series

@@ -1,7 +1,10 @@
+1841165-1-cleaninstaller-1_1-25318.patch
+1841165-2-nosurvey-1_1-25318.patch
+1841169-port1079662-suite-25318.patch
+1841167-branding-1_1-25318.patch
 9999999-port1787182-suite-bustage.patch
 9999999-port1821963-suite-bustage.patch
 9999999-port1824420-suite-bustage.patch
-9999999-port1079662-suite.patch
 TOP-1642188-remove-nsDOMIEvent-cc.patch
 TOP-1611010-DOMEventListener-cc.patch
 TOP-1614671-port1456035-4-and-5-61a1-cc.patch