Browse Source

rebase after pushes

Frank-Rainer Grahl 4 months ago
parent
commit
fdef132126

+ 0 - 32
comm-central/patches/9999999-port1759175-suite-bustage.patch

@@ -1,32 +0,0 @@
-# HG changeset patch
-# User Bill Gianopoulos <wgianopoulos@gmail.com>
-# Date 1711096774 0
-Bug 9999999 - Port bug 1759175 to suite.
-Bug 1759175 pt9 - Remove old crash reporter localization
-
-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
-@@ -395,22 +395,17 @@ man/*
- 
- ; [Crash Reporter]
- ;
- #ifdef MOZ_CRASHREPORTER
- #ifdef XP_MACOSX
- @BINPATH@/crashreporter.app/
- #else
- @BINPATH@/crashreporter@BIN_SUFFIX@
--@RESPATH@/crashreporter.ini
--#ifdef XP_UNIX
--@RESPATH@/Throbber-small.gif
- #endif
--#endif
--@RESPATH@/crashreporter-override.ini
- #ifdef MOZ_CRASHREPORTER_INJECTOR
- @BINPATH@/breakpadinjector.dll
- #endif
- #endif
- 
- ; [ minidump-analyzer ]
- ;
- #ifdef MOZ_CRASHREPORTER

+ 0 - 26
comm-central/patches/9999999-port1823953-suite-bustage.patch

@@ -1,26 +0,0 @@
-# HG changeset patch
-# User Bill Gianopoulos <wgianopoulos@gmail.com>
-# Date 1707994863 0
-Bug 9999999 - Port bug 1823953: Use libvorbis though ffmpeg (packaging change).
-
-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
-@@ -121,16 +121,17 @@
- @RESPATH@/platform.ini
- #ifdef MOZ_UPDATER
- @RESPATH@/update-settings.ini
- #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@
- #endif
- #ifdef MOZ_GTK
- @BINPATH@/glxtest
- @BINPATH@/@DLL_PREFIX@mozgtk@DLL_SUFFIX@
- #ifdef MOZ_WAYLAND

+ 0 - 38
comm-central/patches/9999999-port1824260-suite-bustage.patch

@@ -1,38 +0,0 @@
-# HG changeset patch
-# User Bill Gianopoulos <wgianopoulos@gmail.com>
-# Date 1710319656 0
-Bug 9999999 - Port bug 1824260 to suite.
-Bug 1824260 - Migrate Thunderbird code from ChromeUtils.import to ES6 Modules
-
-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
-@@ -420,17 +420,16 @@ man/*
- ; [ Ping Sender ]
- ;
- @BINPATH@/pingsender@BIN_SUFFIX@
- 
- [mail]
- ; MailNews components
- 
- ; MailNews JS components
--@RESPATH@/components/msgMime.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
-@@ -500,10 +500,8 @@ man/*
- 
- [calendar]
- @RESPATH@/chrome/calendar@JAREXT@
- @RESPATH@/chrome/calendar.manifest
- 
- @RESPATH@/@PREF_DIR@/calendar.js
- 
- # Files added to components directory via `FINAL_TARGET_FILES.components`.
--@RESPATH@/components/calCachedCalendar.js
--@RESPATH@/components/calICSService-worker.js

+ 0 - 48
comm-central/patches/9999999-port1854868-suite-bustage.patch

@@ -1,48 +0,0 @@
-# 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

+ 0 - 122
comm-central/patches/9999999-port1873386-suite-bustage.patch

@@ -1,122 +0,0 @@
-# HG changeset patch
-# User Bill Gianopoulos <wgianopoulos@gmail.com>
-# Date 1712772626 0
-Bug 9999999 - Port bug 1873386 to suite.
-
-diff --git a/suite/components/sessionstore/nsISessionStore.idl b/suite/components/sessionstore/nsISessionStore.idl
---- a/suite/components/sessionstore/nsISessionStore.idl
-+++ b/suite/components/sessionstore/nsISessionStore.idl
-@@ -81,34 +81,37 @@ interface nsISessionStore : nsISupports
-   void setWindowState(in nsIDOMWindow aWindow, in AString aState, in boolean aOverwrite);
- 
-   /**
-    * @param aTab is the tabbrowser tab whose state is to be returned.
-    *
-    * @returns a JSON string representing the state of the tab
-    *         (note: doesn't contain cookies - if you need them, use getWindowState instead).
-    */
-+  [noscript]
-   AString getTabState(in nsINode aTab);
- 
-   /**
-    * @param aTab   is the tabbrowser tab whose state is to be set.
-    * @param aState is a JSON string representing a session state.
-    */
-+  [noscript]
-   void setTabState(in nsINode aTab, in AString aState);
- 
-   /**
-    * Duplicates a given tab as thoroughly as possible.
-    *
-    * @param aWindow  is the browser window into which the tab will be duplicated.
-    *                 Pass null if you want to create a new window.
-    * @param aTab     is the tabbrowser tab to duplicate (can be from a different window).
-    * @param aDelta   is the offset to the history entry that you want to load.
-    * @param aRelated is a flag to be passed to addTab().
-    * @returns a reference to the newly created tab, or null if opening a window.
-    */
-+  [noscript]
-   nsINode duplicateTab(in nsIDOMWindow aWindow, in nsINode aTab,
-                           [optional] in long aDelta,
-                           [optional] in boolean aRelated);
- 
-   /**
-    * Get the number of restore-able tabs for a browser window
-    */
-   unsigned long getClosedTabCount(in nsIDOMWindow aWindow);
-@@ -121,22 +124,24 @@ interface nsISessionStore : nsISupports
-    */
-   AString getClosedTabData(in nsIDOMWindow aWindow);
- 
-   /**
-    * @param aWindow is the browser window to reopen a closed tab in.
-    * @param aIndex  is the index of the tab to be restored (FIFO ordered).
-    * @returns a reference to the reopened tab.
-    */
-+  [noscript]
-   nsINode undoCloseTab(in nsIDOMWindow aWindow, in unsigned long aIndex);
- 
-   /**
-    * @param aWindow is the browser window associated with the closed tab.
-    * @param aIndex  is the index of the closed tab to be removed (FIFO ordered).
-    */
-+  [noscript]
-   nsINode forgetClosedTab(in nsIDOMWindow aWindow, in unsigned long aIndex);
- 
-   /**
-    * Get the number of restore-able windows
-    */
-   unsigned long getClosedWindowCount();
- 
-   /**
-@@ -153,16 +158,17 @@ interface nsISessionStore : nsISupports
-   nsIDOMWindow undoCloseWindow(in unsigned long aIndex);
- 
-   /**
-    * @param aIndex  is the index of the closed window to be removed (FIFO ordered).
-    *
-    * @throws NS_ERROR_INVALID_ARG
-    *   when aIndex does not map to a closed window
-    */
-+  [noscript]
-   nsINode forgetClosedWindow(in unsigned long aIndex);
- 
-   /**
-    * @param aWindow is the window to get the value for.
-    * @param aKey    is the value's name.
-    *
-    * @returns A string value or an empty string if none is set.
-    */
-@@ -182,29 +188,32 @@ interface nsISessionStore : nsISupports
-   void deleteWindowValue(in nsIDOMWindow aWindow, in AString aKey);
- 
-   /**
-    * @param aTab is the tabbrowser tab to get the value for.
-    * @param aKey is the value's name.
-    *
-    * @returns A string value or an empty string if none is set.
-    */
-+  [noscript]
-   AString getTabValue(in nsINode aTab, in AString aKey);
- 
-   /**
-    * @param aTab         is the tabbrowser tab to set the value for.
-    * @param aKey         is the value's name.
-    * @param aStringValue is the value itself (use toSource/eval before setting JS objects).
-    */
-+  [noscript]
-   void setTabValue(in nsINode aTab, in AString aKey, in AString aStringValue);
- 
-   /**
-    * @param aTab is the tabbrowser tab to get the value for.
-    * @param aKey is the value's name.
-    */
-+  [noscript]
-   void deleteTabValue(in nsINode aTab, in AString aKey);
- 
-   /**
-    * @param aName is the name of the attribute to save/restore for all tabbrowser tabs.
-    */
-   void persistTabAttribute(in AString aName);
- 
-   /**

+ 0 - 33
comm-central/patches/9999999-port1877852-suite-bustage.patch

@@ -1,33 +0,0 @@
-# HG changeset patch
-# User Bill Gianopoulos <wgianopoulos@gmail.com>
-# Date 1706784145 0
-Bug 9999999 - Port bug 1877852 to suite.
-Bug 1877852 - Stop shipping qipcap64.dll stub DLL.
-
-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
-@@ -135,23 +135,16 @@
- @BINPATH@/@DLL_PREFIX@mozgtk@DLL_SUFFIX@
- #ifdef MOZ_WAYLAND
- @BINPATH@/vaapitest
- @BINPATH@/@DLL_PREFIX@mozwayland@DLL_SUFFIX@
- #endif
- #endif
- @RESPATH@/license.txt
- @RESPATH@/blocklist.xml
--#ifdef XP_WIN
--#ifdef _AMD64_
--@BINPATH@/@DLL_PREFIX@qipcap64@DLL_SUFFIX@
--#else
--@BINPATH@/@DLL_PREFIX@qipcap@DLL_SUFFIX@
--#endif
--#endif
- 
- ; [Components]
- #ifdef ACCESSIBILITY
- #ifdef XP_WIN
- @BINPATH@/AccessibleMarshal.dll
- #endif
- #endif
- @RESPATH@/components/extensions.manifest

+ 2 - 1
comm-central/patches/9999999-suite-bustage.patch

@@ -1,6 +1,7 @@
 # HG changeset patch
 # HG changeset patch
 # User Bill Gianopoulos <wgianopoulos@gmail.com>
 # User Bill Gianopoulos <wgianopoulos@gmail.com>
 # Date 1716024044 0
 # Date 1716024044 0
+# Parent  3c3ba7ee7ca73d4cc580a155282f9dc735db1c8e
 Bug 9999999 - remove bad dependency on mail/extensions/openpgp in mailnewsr/base.
 Bug 9999999 - remove bad dependency on mail/extensions/openpgp in mailnewsr/base.
 
 
 diff --git a/mail/extensions/openpgp/moz.build b/mail/extensions/openpgp/moz.build
 diff --git a/mail/extensions/openpgp/moz.build b/mail/extensions/openpgp/moz.build
@@ -30,7 +31,7 @@ diff --git a/mail/extensions/openpgp/moz.build b/mail/extensions/openpgp/moz.bui
 diff --git a/mailnews/base/public/moz.build b/mailnews/base/public/moz.build
 diff --git a/mailnews/base/public/moz.build b/mailnews/base/public/moz.build
 --- a/mailnews/base/public/moz.build
 --- a/mailnews/base/public/moz.build
 +++ b/mailnews/base/public/moz.build
 +++ b/mailnews/base/public/moz.build
-@@ -39,16 +39,17 @@ XPIDL_SOURCES += [
+@@ -38,16 +38,17 @@ XPIDL_SOURCES += [
      "nsIMsgHdr.idl",
      "nsIMsgHdr.idl",
      "nsIMsgIdentity.idl",
      "nsIMsgIdentity.idl",
      "nsIMsgIncomingServer.idl",
      "nsIMsgIncomingServer.idl",

+ 7 - 7
comm-central/patches/TOP-1611647-2-fix-xul-references-suite.patch

@@ -3,7 +3,7 @@
 # Date 1697712739 14400
 # Date 1697712739 14400
 #      Thu Oct 19 06:52:19 2023 -0400
 #      Thu Oct 19 06:52:19 2023 -0400
 # Node ID aa370e119f11ae9c6df0dcd87822ab665f63193e
 # Node ID aa370e119f11ae9c6df0dcd87822ab665f63193e
-# Parent  36b7dc3096a19f1f8ed97d994943cd73ea739877
+# Parent  45168cc70907d2bdc98a39678c68c1213532af75
 Bug 1611647 - Port bug 1579952 - Fix references to xul files in suite.
 Bug 1611647 - Port bug 1579952 - Fix references to xul files in suite.
 
 
 diff --git a/suite/app/profile/suite-prefs.js b/suite/app/profile/suite-prefs.js
 diff --git a/suite/app/profile/suite-prefs.js b/suite/app/profile/suite-prefs.js
@@ -117,7 +117,7 @@ diff --git a/suite/base/content/nsContextMenu.js b/suite/base/content/nsContextM
  var {BrowserUtils} =
  var {BrowserUtils} =
    ChromeUtils.import("resource://gre/modules/BrowserUtils.jsm");
    ChromeUtils.import("resource://gre/modules/BrowserUtils.jsm");
  var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
  var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-@@ -1135,17 +1135,17 @@ nsContextMenu.prototype = {
+@@ -1136,17 +1136,17 @@ nsContextMenu.prototype = {
                   { referrerURI: doc.documentURIObject,
                   { referrerURI: doc.documentURIObject,
                     triggeringPrincipal: this.target.nodePrincipal,
                     triggeringPrincipal: this.target.nodePrincipal,
                   });
                   });
@@ -136,7 +136,7 @@ diff --git a/suite/base/content/nsContextMenu.js b/suite/base/content/nsContextM
    saveFrame: function() {
    saveFrame: function() {
      saveDocument(this.target.ownerDocument, true);
      saveDocument(this.target.ownerDocument, true);
    },
    },
-@@ -1362,17 +1362,17 @@ nsContextMenu.prototype = {
+@@ -1364,17 +1364,17 @@ nsContextMenu.prototype = {
      }
      }
      else
      else
        PlacesUIUtils.showItemProperties(itemId,
        PlacesUIUtils.showItemProperties(itemId,
@@ -328,7 +328,7 @@ diff --git a/suite/base/content/utilityOverlay.js b/suite/base/content/utilityOv
      }
      }
      else if (buttonID == "getMeOutOfHereButton") {
      else if (buttonID == "getMeOutOfHereButton") {
        // Redirect them to a known-functioning page, default start page
        // Redirect them to a known-functioning page, default start page
-@@ -1809,17 +1809,17 @@ function subscribeToFeedMiddleClick(href
+@@ -1813,17 +1813,17 @@ function subscribeToFeedMiddleClick(href
  }
  }
  
  
  function OpenSearchEngineManager() {
  function OpenSearchEngineManager() {
@@ -437,9 +437,9 @@ diff --git a/suite/base/content/viewZoomOverlay.js b/suite/base/content/viewZoom
 diff --git a/suite/base/jar.mn b/suite/base/jar.mn
 diff --git a/suite/base/jar.mn b/suite/base/jar.mn
 --- a/suite/base/jar.mn
 --- a/suite/base/jar.mn
 +++ b/suite/base/jar.mn
 +++ b/suite/base/jar.mn
-@@ -4,93 +4,93 @@
- # 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/.comm.jar:
+@@ -7,93 +7,93 @@
+ toolkit.jar:
+    content/global/aboutSeaMonkey.xhtml                              (content/aboutSeaMonkey.xhtml)
  
  
  comm.jar:
  comm.jar:
  % content communicator %content/communicator/ contentaccessible=yes
  % content communicator %content/communicator/ contentaccessible=yes

+ 2 - 2
comm-central/patches/WIP-1783623-port1524687-suite.patch

@@ -1,7 +1,7 @@
 # HG changeset patch
 # HG changeset patch
 # User Bill Gianopoulos <wgianopoulos@gmail.com>
 # User Bill Gianopoulos <wgianopoulos@gmail.com>
 # Date 1659988365 0
 # Date 1659988365 0
-# Parent  b714fbb93a5d1cf4c23a45deb42bd401615bce69
+# Parent  05d8f876218ab9bd2305a1e1f98a9b7734757a49
 Bug 1783623 - Convert suite binary components registration to components.conf.
 Bug 1783623 - Convert suite binary components registration to components.conf.
 Port Bug 1524687 Part 11  to suite.
 Port Bug 1524687 Part 11  to suite.
 
 
@@ -440,7 +440,7 @@ deleted file mode 100644
 diff --git a/suite/installer/package-manifest.in b/suite/installer/package-manifest.in
 diff --git a/suite/installer/package-manifest.in b/suite/installer/package-manifest.in
 --- a/suite/installer/package-manifest.in
 --- a/suite/installer/package-manifest.in
 +++ b/suite/installer/package-manifest.in
 +++ b/suite/installer/package-manifest.in
-@@ -160,17 +160,16 @@
+@@ -157,17 +157,16 @@
  @RESPATH@/components/SuiteFeeds.manifest
  @RESPATH@/components/SuiteFeeds.manifest
  @RESPATH@/components/SuiteSidebar.manifest
  @RESPATH@/components/SuiteSidebar.manifest
  ; JavaScript components
  ; JavaScript components

+ 0 - 6
comm-central/patches/series

@@ -1,10 +1,4 @@
-9999999-port1877852-suite-bustage.patch
-9999999-port1823953-suite-bustage.patch
 9999999-suite-bustage.patch
 9999999-suite-bustage.patch
-9999999-port1854868-suite-bustage.patch
-9999999-port1759175-suite-bustage.patch
-9999999-port1824260-suite-bustage.patch
-9999999-port1873386-suite-bustage.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