port bug 1821963

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

@@ -0,0 +1,98 @@
+# HG changeset patch
+# User Bill Gianopoulos <wgianopoulos@gmail.com>
+# Date 1685133913 0
+Bug 9999999 - Port bug 1821963 to suite.
+Bug 1821963 - [CTW] Remove COM proxy infrastructure
+
+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
+@@ -148,20 +148,17 @@
+ #else
+ @BINPATH@/@DLL_PREFIX@qipcap@DLL_SUFFIX@
+ #endif
+ #endif
+ 
+ ; [Components]
+ #ifdef ACCESSIBILITY
+ #ifdef XP_WIN
+-@BINPATH@/Accessible.tlb
+-@BINPATH@/AccessibleHandler.dll
+ @BINPATH@/AccessibleMarshal.dll
+-@BINPATH@/IA2Marshal.dll
+ #endif
+ #endif
+ @RESPATH@/components/extensions.manifest
+ @RESPATH@/components/SuiteBrowser.manifest
+ @RESPATH@/components/SuiteComponents.manifest
+ @RESPATH@/components/SuiteFeeds.manifest
+ @RESPATH@/components/SuiteSidebar.manifest
+ ; JavaScript components
+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"
+ #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
+-
+-!if "@MOZ_UPDATE_CHANNEL@" == "default"
+-#ifdef DEBUG
+-!define AccessibleHandlerCLSID "{398FFD8D-5382-48F7-9E3B-19012762D39A}"
+-#else
+-!define AccessibleHandlerCLSID "{CE573FAF-7815-4FC2-A031-B092268ACE9E}"
+-#endif
+-!else if "@MOZ_UPDATE_CHANNEL@" == "nightly"
+-!define AccessibleHandlerCLSID "{4629216B-8753-41BF-9527-5BFF51401671}"
+-!else if "@MOZ_UPDATE_CHANNEL@" == "beta"
+-!define AccessibleHandlerCLSID "{21E9F98D-A6C9-4CB5-B288-AE2FD2A96C58}"
+-!else if "@MOZ_UPDATE_CHANNEL@" == "release"
+-!define AccessibleHandlerCLSID "{1BAA303D-B4B9-45E5-9CCB-E3FCA3E274B6}"
+-!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 "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
+     ${LogMsg} "** ERROR Registering: $INSTDIR\AccessibleMarshal.dll **"
+   ${Else}
+     ${LogUninstall} "DLLReg: \AccessibleMarshal.dll"
+     ${LogMsg} "Registered: $INSTDIR\AccessibleMarshal.dll"
+   ${EndIf}
+ 
+   ClearErrors
+ 
+-  ${RegisterDLL} "$INSTDIR\AccessibleHandler.dll"
+-  ${If} ${Errors}
+-    ${LogMsg} "** ERROR Registering: $INSTDIR\AccessibleHandler.dll **"
+-  ${Else}
+-    ${LogUninstall} "DLLReg: \AccessibleHandler.dll"
+-    ${LogMsg} "Registered: $INSTDIR\AccessibleHandler.dll"
+-  ${EndIf}
+-
+   ; Write extra files created by the application to the uninstall log so they
+   ; will be removed when the application is uninstalled. To remove an empty
+   ; directory write a bogus filename to the deepest directory and all empty
+   ; parent directories will be removed.
+   ${LogUninstall} "File: \components\compreg.dat"
+   ${LogUninstall} "File: \components\xpti.dat"
+   ${LogUninstall} "File: \active-update.xml"
+   ${LogUninstall} "File: \install.log"

comm-central/patches/series

@@ -1,3 +1,4 @@
+9999999-port1821963-suite-bustage.patch
 TOP-1642188-remove-nsDOMIEvent-cc.patch
 TOP-1611010-DOMEventListener-cc.patch
 TOP-1614671-port1456035-4-and-5-61a1-cc.patch