mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Revert "bpo-35402: Update macOS installer to use Tcl 8.6.9 / Tk 8.6.9.1 (GH-11101)" (GH-11332)

Browse source 
This reverts commit 7cf3d8e251.

Due to regressions found with using Tk 8.6.9.1, build the python.org macOS installers with Tcl/Tk 8.6.8 as used in previous releases.



https://bugs.python.org/issue35402
This commit is contained in:
Ned Deily 2018-12-27 16:13:30 -05:00 • committed by Miss Islington (bot)
parent 59c2aa25ff
commit a936639b22
3 changed files with 27 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Mac/BuildScript/build-installer.py
View file

@ -227,9 +227,9 @@ def library_recipes():
if internalTk():
result.extend([
dict(
name="Tcl 8.6.9",
url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tcl8.6.9-src.tar.gz",
checksum='aa0a121d95a0e7b73a036f26028538d4',
name="Tcl 8.6.8",
url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tcl8.6.8-src.tar.gz",
checksum='81656d3367af032e0ae6157eff134f89',
buildDir="unix",
configure_pre=[
'--enable-shared',
@ -243,9 +243,12 @@ def library_recipes():
},
),
dict(
name="Tk 8.6.9.1",
url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tk8.6.9.1-src.tar.gz",
checksum='9efe3976468352dc894dae0c4e785a8e',
name="Tk 8.6.8",
url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tk8.6.8-src.tar.gz",
checksum='5e0faecba458ee1386078fb228d008ba',
patches=[
"tk868_on_10_8_10_9.patch",
],
buildDir="unix",
configure_pre=[
'--enable-aqua',
@ -706,7 +709,6 @@ def extractArchive(builddir, archiveName):
work for current Tcl and Tk source releases where the basename of
the archive ends with "-src" but the uncompressed directory does not.
For now, just special case Tcl and Tk tar.gz downloads.
Another special case: the tk8.6.9.1 tarball extracts to tk8.6.9.
"""
curdir = os.getcwd()
try:
@ -716,8 +718,6 @@ def extractArchive(builddir, archiveName):
if ((retval.startswith('tcl') or retval.startswith('tk'))
and retval.endswith('-src')):
retval = retval[:-4]
if retval == 'tk8.6.9.1':
retval = 'tk8.6.9'
if os.path.exists(retval):
shutil.rmtree(retval)
fp = os.popen("tar zxf %s 2>&1"%(shellQuote(archiveName),), 'r')