diff options
| author | Christoph Moench-Tegeder <cmt@FreeBSD.org> | 2022-09-11 15:12:49 +0200 |
|---|---|---|
| committer | Christoph Moench-Tegeder <cmt@FreeBSD.org> | 2022-09-11 15:12:49 +0200 |
| commit | 4185660c39ad992441cae35833fc69c1295a4bf8 (patch) | |
| tree | b2a0934b7a84570ad59fc13caa5c882bdfd11741 /mail/thunderbird/files/patch-bug1288587 | |
| parent | www/firefox-esr: update to 102.2.0 (diff) | |
mail/thunderbird: update to 102.2.2
Release Notes:
https://www.thunderbird.net/en-US/thunderbird/102.2.2/releasenotes/
Diffstat (limited to 'mail/thunderbird/files/patch-bug1288587')
| -rw-r--r-- | mail/thunderbird/files/patch-bug1288587 | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/mail/thunderbird/files/patch-bug1288587 b/mail/thunderbird/files/patch-bug1288587 deleted file mode 100644 index 0925ac98733c..000000000000 --- a/mail/thunderbird/files/patch-bug1288587 +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure -index 855214a..1e91d51 100644 ---- build/moz.configure/init.configure -+++ build/moz.configure/init.configure -@@ -238,6 +238,7 @@ option( - @imports(_from="mozbuild.pythonutil", _import="find_python3_executable") - @imports(_from="mozbuild.pythonutil", _import="python_executable_version") - @imports(_from="six", _import="ensure_text") -+@imports(_from="__builtin__", _import="KeyError") - def virtualenv_python3(env_python, build_env, mozconfig, help): - # Avoid re-executing python when running configure --help. - if help: -@@ -271,6 +272,12 @@ def virtualenv_python3(env_python, virtualenv_name, bu - python = mozconfig["vars"]["added"]["PYTHON3"] - elif "PYTHON3" in mozconfig["vars"]["modified"]: - python = mozconfig["vars"]["modified"]["PYTHON3"][1] -+ for i in ("env", "vars"): -+ for j in ("added", "modified"): -+ try: -+ del mozconfig[i][j]["PYTHON3"] -+ except KeyError: -+ pass - - log.debug("python3: executable from configuration: %r" % python) - -@@ -364,7 +371,10 @@ def virtualenv_python3(env_python, virtualenv_name, bu - ) - log.info("Re-executing in the virtualenv") - if env_python: -- del os.environ["PYTHON3"] -+ try: -+ del os.environ["PYTHON3"] -+ except KeyError: -+ pass - # Another quirk on macOS, with the system python, the virtualenv is - # not fully operational (missing entries in sys.path) if - # __PYVENV_LAUNCHER__ is set. |