diff options
| author | Ned Deily <nad@python.org> | 2021-11-01 11:53:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-01 11:53:05 -0400 |
| commit | e2063d6a1ebc3568e90a14ed163fa291b5977ae8 (patch) | |
| tree | 08cc90a460ac8a948f86014b47b2cb145f53c672 /Mac/BuildScript/build-installer.py | |
| parent | 401d25e92f62a9ef320a97542b3e63cb8c34e7e9 (diff) | |
| download | cpython-git-e2063d6a1ebc3568e90a14ed163fa291b5977ae8.tar.gz | |
Update macOS installer to use Tk 8.6.12rc1 pre-release. (GH-29354)
Diffstat (limited to 'Mac/BuildScript/build-installer.py')
| -rwxr-xr-x | Mac/BuildScript/build-installer.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index f366968a71..9db2616bc7 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -265,11 +265,11 @@ def library_recipes(): tk_patches = ['tk868_on_10_8_10_9.patch'] else: - tcl_tk_ver='8.6.11' - tcl_checksum='8a4c004f48984a03a7747e9ba06e4da4' + tcl_tk_ver='8.6.12rc1' + tcl_checksum='82fd1637c0f7d4b76cb909f8abc373ec' - tk_checksum='c7ee71a2d05bba78dfffd76528dc17c6' - tk_patches = ['bpo-44828-filedialog-crash-monterey.patch'] + tk_checksum='d63c3b91b86cd8b6fa54e83ef2c5153e' + tk_patches = [ ] result.extend([ @@ -729,6 +729,10 @@ def extractArchive(builddir, archiveName): if ((retval.startswith('tcl') or retval.startswith('tk')) and retval.endswith('-src')): retval = retval[:-4] + # Strip rcxx suffix from Tcl/Tk release candidates + retval_rc = retval.find('rc') + if retval_rc > 0: + retval = retval[:retval_rc] if os.path.exists(retval): shutil.rmtree(retval) fp = os.popen("tar zxf %s 2>&1"%(shellQuote(archiveName),), 'r') |