port bug 1854868

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

@@ -0,0 +1,48 @@
+# HG changeset patch
+# User Bill Gianopoulos <wgianopoulos@gmail.com>
+# Date 1708599766 0
+Bug 9999999 - Port bug 1854868 to suite to fix bustage.
+Bug 1854868 - Replace update-settings.ini with a macOS Framework.
+
+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
+@@ -115,18 +115,21 @@
+ @BINPATH@/@MOZ_APP_NAME@.exe
+ #else
+ @BINPATH@/@MOZ_APP_NAME@-bin
+ @BINPATH@/@MOZ_APP_NAME@
+ #endif
+ @RESPATH@/application.ini
+ @RESPATH@/platform.ini
+ #ifdef MOZ_UPDATER
++# update-settings.ini has been removed on macOS.
++#ifndef XP_MACOSX
+ @RESPATH@/update-settings.ini
+ #endif
++#endif
+ #ifndef MOZ_FOLD_LIBS
+ @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
+ #endif
+ @BINPATH@/@DLL_PREFIX@lgpllibs@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@gkcodecs@DLL_SUFFIX@
+ #ifdef MOZ_FFVPX
+ @BINPATH@/@DLL_PREFIX@mozavutil@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@mozavcodec@DLL_SUFFIX@
+diff --git a/suite/installer/removed-files.in b/suite/installer/removed-files.in
+--- a/suite/installer/removed-files.in
++++ b/suite/installer/removed-files.in
+@@ -283,8 +283,13 @@
+ @DIR_MACOS@extensions/langpack-sk@chatzilla.mozilla.org/chrome.manifest
+ @DIR_MACOS@extensions/langpack-sk@chatzilla.mozilla.org/install.js
+ @DIR_MACOS@extensions/langpack-sk@chatzilla.mozilla.org/install.rdf
+ @DIR_MACOS@extensions/langpack-sv-SE@chatzilla.mozilla.org/chrome/chatzilla.jar
+ @DIR_MACOS@extensions/langpack-sv-SE@chatzilla.mozilla.org/chrome/chatzilla.manifest
+ @DIR_MACOS@extensions/langpack-sv-SE@chatzilla.mozilla.org/chrome.manifest
+ @DIR_MACOS@extensions/langpack-sv-SE@chatzilla.mozilla.org/install.js
+ @DIR_MACOS@extensions/langpack-sv-SE@chatzilla.mozilla.org/install.rdf
++
++# update-settings.ini has been removed on macOS.
++#ifdef XP_MACOSX
++@DIR_RESOURCES@update-settings.ini
++#endif

comm-central/patches/series

@@ -1,6 +1,7 @@
 9999999-port1877852-suite-bustage.patch
 9999999-port1823953-suite-bustage.patch
 9999999-suite-bustage.patch
+9999999-port1854868-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