port bug 1747332

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

@@ -0,0 +1,66 @@
+# 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/series

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