Rebase after pushes

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

@@ -1,150 +0,0 @@
-# HG changeset patch
-# User Bill Gianopoulos <wgianopoulos@gmail.com>
-# Date 1676550639 0
-Bug 9999999 - Port bug 1816266 to suite.
-Bug 1816266 - comm/mail/moz.configure cleanup.
-
-diff --git a/suite/app.mozbuild b/suite/app.mozbuild
---- a/suite/app.mozbuild
-+++ b/suite/app.mozbuild
-@@ -1,14 +1,13 @@
- # vim: set filetype=python:
- # 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/.
- 
--include('/comm/mailnews/mailnews.mozbuild')
--
- include('/toolkit/toolkit.mozbuild')
- 
- DIRS += [
-+    '/comm/mailnews',
-     '/%s' % CONFIG['MOZ_BRANDING_DIRECTORY'],
-     '/comm/calendar',
-     '/comm/suite',
- ]
-diff --git a/suite/branding/seamonkey/locales/Makefile.in b/suite/branding/seamonkey/locales/Makefile.in
---- a/suite/branding/seamonkey/locales/Makefile.in
-+++ b/suite/branding/seamonkey/locales/Makefile.in
-@@ -1,8 +1,8 @@
- # 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/.
- 
- LOCALE_TOPDIR=$(commtopsrcdir)
- LOCALE_RELATIVEDIR=suite/branding/seamonkey/locales
- 
--include $(moztopsrcdir)/config/config.mk
-+include $(topsrcdir)/config/config.mk
-diff --git a/suite/mailnews/components/addrbook/moz.build b/suite/mailnews/components/addrbook/moz.build
---- a/suite/mailnews/components/addrbook/moz.build
-+++ b/suite/mailnews/components/addrbook/moz.build
-@@ -1,8 +1,8 @@
- # vim: set filetype=python:
- # 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/.
- 
- JAR_MANIFESTS += ["jar.mn"]
- 
--DEFINES["TOOLKIT_DIR"] = "%s/toolkit" % (CONFIG["moztopsrcdir"],)
-+DEFINES["TOOLKIT_DIR"] = "%s/toolkit" % (CONFIG["topsrcdir"],)
-diff --git a/suite/moz.configure b/suite/moz.configure
---- a/suite/moz.configure
-+++ b/suite/moz.configure
-@@ -17,47 +17,31 @@ def bundled_fonts(is_windows, is_linux):
-         return True
- 
- 
- set_config("MOZ_BUNDLED_FONTS", bundled_fonts)
- add_old_configure_assignment("MOZ_BUNDLED_FONTS", bundled_fonts)
- 
- 
- @depends(build_environment, "--help")
--def comm_paths(build_env, _):
-+@imports(_from="os.path", _import="join")
-+def commtopsrcdir(build_env, _):
-     topsrcdir = build_env.topsrcdir
--    topobjdir = build_env.topobjdir
--
--    moztopsrcdir = topsrcdir
--    commtopsrcdir = "%s/comm" % topsrcdir
--    mozreltopsrcdir = "."
--    commreltopsrcdir = "comm"
--    commtopobjdir = "%s/comm" % topobjdir
--
--    return namespace(
--        moztopsrcdir=moztopsrcdir,
--        commtopsrcdir=commtopsrcdir,
--        mozreltopsrcdir=mozreltopsrcdir,
--        commreltopsrcdir=commreltopsrcdir,
--        commtopobjdir=commtopobjdir,
--    )
-+    return join(topsrcdir, "comm")
- 
- 
- @template
- def set_defconf(k, v):
-     set_config(k, v)
-     set_define(k, v)
-     add_old_configure_assignment(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)
-+add_old_configure_assignment("commtopsrcdir", commtopsrcdir)
-+set_config("commtopsrcdir", commtopsrcdir)
- 
- 
- @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"
-@@ -82,42 +66,16 @@ def seamonkey_version(build_env, app_pat
- 
- 
- set_defconf("SEAMONKEY_VERSION", seamonkey_version.version)
- set_defconf("SEAMONKEY_VERSION_DISPLAY", seamonkey_version.version_display)
- # Currently not set in suite comm-central
- # set_defconf("MOZ_PKG_VERSION", seamonkey_version.version_package)
- 
- 
--@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"
--    )
--    rv = []
--    for f in [version_file, version_file_display]:
--        if exists(f):
--            f_value = open(f).read().strip()
--        else:
--            f_value = "unknown"
--        rv.append(f_value)
--
--    return namespace(version=rv[0], version_display=rv[1])
--
--
--set_defconf("THUNDERBIRD_VERSION", thunderbird_version.version)
--set_defconf("THUNDERBIRD_VERSION_DISPLAY", thunderbird_version.version_display)
--
--set_define("MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES", True)
--
- imply_option("MOZ_PLACES", True)
- imply_option("MOZ_SERVICES_SYNC", False)
- 
- # Building extensions is disabled by default.
- 
- # =========================================================
- # = ChatZilla extension
- # =========================================================

comm-central/patches/series

@@ -9,4 +9,3 @@ TOP-9999999-port1514936-suite-102a1.patch
 WIP-9999999-port1712633-suite-90a1.patch
 WIP-1650630-2-port-1603712-suite.patch
 WIP-1783623-port1524687-suite.patch
-9999999-port1816266-suite-bustage.patch