port bug 1816266

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

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

comm-central/patches/series

@@ -9,3 +9,4 @@ 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