Rebase after pushes

comm-central/patches/9999999-port1702731-suite.patch

@@ -1,33 +0,0 @@
-# HG changeset patch
-# User Bill Gianopoulos <wgianopoulos@gmail.com>
-# Date 1640280539 0
-Bug 9999999 - port bug 1702731 to suite - bustage fix.
-
-diff --git a/suite/app/moz.build b/suite/app/moz.build
---- a/suite/app/moz.build
-+++ b/suite/app/moz.build
-@@ -29,16 +29,24 @@ if CONFIG["LIBFUZZER"]:
-         "/tools/fuzzing/libfuzzer",
-     ]
- 
- if CONFIG["CC_TYPE"] in ("msvc", "clang-cl"):
-     # Always enter a Windows program through wmain, whether or not we're
-     # a console application.
-     WIN32_EXE_LDFLAGS += ["-ENTRY:wmainCRTStartup"]
- 
-+if CONFIG["MOZ_SANDBOX"] and CONFIG["OS_ARCH"] == "Darwin":
-+    USE_LIBS += [
-+        "mozsandbox",
-+    ]
-+    OS_LIBS += [
-+        "-framework CoreFoundation",
-+    ]
-+
- if CONFIG["MOZ_SANDBOX"] and CONFIG["OS_ARCH"] == "WINNT":
-     # For sandbox includes and the include dependencies those have
-     LOCAL_INCLUDES += [
-         "/security/sandbox/chromium",
-         "/security/sandbox/chromium-shim",
-     ]
- 
-     OS_LIBS += [

comm-central/patches/9999999-port1747165-suite.patch

@@ -1,23 +0,0 @@
-# HG changeset patch
-# User Bill Gianopoulos <wgianopoulos@gmail.com>
-# Date 1640354871 0
-Bug 9999999 -Port bug 1747165 to suite.
-Bug 1747165 - Replace TK_FLAGS/TK_LIBS with MOZ_GTK3_FLAGS/MOZ_GTK3_LIBS.
-
-diff --git a/suite/components/shell/moz.build b/suite/components/shell/moz.build
---- a/suite/components/shell/moz.build
-+++ b/suite/components/shell/moz.build
-@@ -38,11 +38,12 @@ if SOURCES:
-     ]
- 
- EXTRA_JS_MODULES += [
-     "ShellService.jsm",
- ]
- 
- FINAL_LIBRARY = "suite"
- 
--CXXFLAGS += CONFIG["TK_CFLAGS"]
-+if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-+    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
- 
- JAR_MANIFESTS += ["jar.mn"]

comm-central/patches/9999999-port1747332-suite.patch

@@ -1,66 +0,0 @@
-# HG changeset patch
-# User Bill Gianopoulos <wgianopoulos@gmail.com>
-# Date 1640347051 0
-Bug 9999999 - Port bug 1747332 to suite.
-Bug 1747332 - s/check_build_environment/build_environment/.
-
-diff --git a/suite/moz.configure b/suite/moz.configure
---- a/suite/moz.configure
-+++ b/suite/moz.configure
-@@ -16,17 +16,17 @@ def bundled_fonts(is_windows, is_linux):
-     if is_windows or is_linux:
-         return True
- 
- 
- set_config("MOZ_BUNDLED_FONTS", bundled_fonts)
- add_old_configure_assignment("MOZ_BUNDLED_FONTS", bundled_fonts)
- 
- 
--@depends(check_build_environment, "--help")
-+@depends(build_environment, "--help")
- def comm_paths(build_env, _):
-     topsrcdir = build_env.topsrcdir
-     topobjdir = build_env.topobjdir
- 
-     moztopsrcdir = topsrcdir
-     commtopsrcdir = "%s/comm" % topsrcdir
-     mozreltopsrcdir = "."
-     commreltopsrcdir = "comm"
-@@ -50,17 +50,17 @@ def set_defconf(k, v):
- 
- set_defconf("moztopsrcdir", comm_paths.moztopsrcdir)
- set_defconf("commtopsrcdir", comm_paths.commtopsrcdir)
- set_defconf("mozreltopsrcdir", comm_paths.mozreltopsrcdir)
- set_defconf("commreltopsrcdir", comm_paths.commreltopsrcdir)
- set_defconf("commtopobjdir", comm_paths.commtopobjdir)
- 
- 
--@depends(check_build_environment, application)
-+@depends(build_environment, application)
- @imports(_from="os.path", _import="exists")
- @imports(_from="__builtin__", _import="open")
- def seamonkey_version(build_env, app_path):
-     version_file = os.path.join(
-         build_env.topsrcdir, app_path[0], "config", "version.txt"
-     )
-     version_file_display = os.path.join(
-         build_env.topsrcdir, app_path[0], "config", "version_display.txt"
-@@ -75,17 +75,17 @@ def seamonkey_version(build_env, app_pat
- 
-     return namespace(version=rv[0], version_display=rv[1])
- 
- 
- set_defconf("SEAMONKEY_VERSION", seamonkey_version.version)
- set_defconf("SEAMONKEY_VERSION_DISPLAY", seamonkey_version.version_display)
- 
- 
--@depends(check_build_environment)
-+@depends(build_environment)
- @imports(_from="os.path", _import="exists")
- @imports(_from="__builtin__", _import="open")
- def thunderbird_version(build_env):
-     version_file = os.path.join(
-         build_env.topsrcdir, "comm/mail", "config", "version.txt"
-     )
-     version_file_display = os.path.join(
-         build_env.topsrcdir, "comm/mail", "config", "version_display.txt"

comm-central/patches/9999999-port1747756-suite.patch

@@ -1,32 +0,0 @@
-# HG changeset patch
-# User Bill Gianopoulos <wgianopoulos@gmail.com>
-# Date 1640988702 0
-Bug 9999999 - Port bug 1749956 to suite.
-Bug 1747756 - Move Windows system libraries from LIBS to moz.build.
-
-diff --git a/suite/app/moz.build b/suite/app/moz.build
---- a/suite/app/moz.build
-+++ b/suite/app/moz.build
-@@ -52,16 +52,22 @@ if CONFIG["MOZ_SANDBOX"] and CONFIG["OS_
-     OS_LIBS += [
-         "version",
-     ]
- 
-     USE_LIBS += [
-         "sandbox_s",
-     ]
- 
-+    OS_LIBS += [
-+        "advapi32",
-+        "winmm",
-+        "user32",
-+    ]
-+
-     DELAYLOAD_DLLS += [
-         "winmm.dll",
-         "user32.dll",
-     ]
- 
- if CONFIG["OS_ARCH"] == "WINNT":
-     OS_LIBS += [
-         "ntdll",

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

@@ -3,7 +3,7 @@
 # Date 1641471337 18000
 #      Thu Jan 06 07:15:37 2022 -0500
 # Node ID b26cee1637d4d447b316f7466fd88cf523119dc4
-# Parent  722d19665cdc76194daf4974385a4b14ccada61b
+# Parent  5b32f73fa7543038023e3cca9e0f0ffe246553df
 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
@@ -4958,32 +4958,32 @@ diff --git a/suite/mailnews/content/ABSearchDialog.xhtml b/suite/mailnews/conten
 diff --git a/suite/mailnews/content/FilterListDialog.js b/suite/mailnews/content/FilterListDialog.js
 --- a/suite/mailnews/content/FilterListDialog.js
 +++ b/suite/mailnews/content/FilterListDialog.js
-@@ -366,17 +366,17 @@ function onEditFilter()
- {
-   if (gEditButton.disabled)
+@@ -300,17 +300,17 @@ function onEditFilter()
      return;
  
    var selectedFilter = currentFilter();
-   var curFilterList = currentFilterList();
-   var args = {filter: selectedFilter, filterList: curFilterList};
+   if (!selectedFilter)
+     return;
+ 
+   let args = {filter: selectedFilter, filterList: gCurrentFilterList};
  
 -  window.openDialog("chrome://messenger/content/FilterEditor.xul", "FilterEditor", "chrome,modal,titlebar,resizable,centerscreen", args);
 +  window.openDialog("chrome://messenger/content/FilterEditor.xhtml", "FilterEditor", "chrome,modal,titlebar,resizable,centerscreen", args);
  
-   // The focus change will cause a repaint of the row updating any name change
+   if ("refresh" in args && args.refresh) {
+     rebuildFilterList();
+   }
  }
  
  /**
   * Handler function for the 'New...' buttons.
-  * Opens the filter dialog for creating a new filter.
-  */
-@@ -409,17 +409,17 @@ function onCopyToNewFilter() {
-  *              and global filters list properties by this function.
-  */
- function calculatePositionAndShowCreateFilterDialog(args) {
-   var position = Math.max(gFilterTree.currentIndex, 0);
-   args.filterList = currentFilterList();
+@@ -358,17 +358,17 @@ function calculatePositionAndShowCreateF
+         break;
+       }
+     }
+   }
    args.filterPosition = position;
+   args.filterList = gCurrentFilterList;
    args.refresh = false;
  
 -  window.openDialog("chrome://messenger/content/FilterEditor.xul",
@@ -4993,17 +4993,17 @@ diff --git a/suite/mailnews/content/FilterListDialog.js b/suite/mailnews/content
  
    if (args.refresh)
    {
-     gFilterTreeView.tree.rowCountChanged(position, 1);
-     gFilterTree.view.selection.select(position);
-     gFilterTree.treeBoxObject.ensureRowIsVisible(position);
-@@ -533,17 +533,17 @@ function moveFilter(motion) {
+     rebuildFilterList();
+ 
+     // Select the new filter, it is at the position of previous selection.
+@@ -489,17 +489,17 @@ function moveFilter(motion) {
+ 
    moveCurrentFilter(moveFilterNative);
  }
  
  function viewLog()
  {
-   var filterList = currentFilterList();
-   var args = {filterList: filterList};
+   let args = {filterList: gCurrentFilterList};
  
 -  window.openDialog("chrome://messenger/content/viewLog.xul", "FilterLog", "chrome,modal,titlebar,resizable,centerscreen", args);
 +  window.openDialog("chrome://messenger/content/viewLog.xhtml", "FilterLog", "chrome,modal,titlebar,resizable,centerscreen", args);
@@ -5012,9 +5012,9 @@ diff --git a/suite/mailnews/content/FilterListDialog.js b/suite/mailnews/content
  function onFilterUnload()
  {
    // make sure to save the filter to disk
-   var filterList = currentFilterList();
-   if (filterList)
-     filterList.saveToDefaultFile();
+   if (gCurrentFilterList)
+     gCurrentFilterList.saveToDefaultFile();
+ 
 diff --git a/suite/mailnews/content/FilterListDialog.xhtml b/suite/mailnews/content/FilterListDialog.xhtml
 --- a/suite/mailnews/content/FilterListDialog.xhtml
 +++ b/suite/mailnews/content/FilterListDialog.xhtml

comm-central/patches/series

@@ -1,7 +1,3 @@
-9999999-port1702731-suite.patch
-9999999-port1747332-suite.patch
-9999999-port1747165-suite.patch
-9999999-port1747756-suite.patch
 TOP-1642188-remove-nsDOMIEvent-cc.patch
 TOP-1611010-DOMEventListener-cc.patch
 TOP-1614671-port1456035-4-and-5-61a1-cc.patch