traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-34370: Revert to using released Tk 8.6.8 with macOS installers 

For 3.7.1rc1 and 3.6.7rc1 we used a pre-release development
snapshot of Tk 8.6 to pick up some post-8.6.8 fixes for macOS.
But the snapshot introduced at least one regression (bpo-34927).
For rc2, revert to using the standard release 8.6.8 for now.
This reverts commit d9cfe5ed2c.
This commit is contained in:
Ned Deily 2018-10-12 22:30:30 -04:00
parent 5d8ef8bc3f
commit d8b6425e58
2 changed files with 24 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Mac/BuildScript/build-installer.py
View File

@ -242,16 +242,6 @@ def library_recipes():
"TCL_LIBRARY": shellQuote('/Library/Frameworks/Python.framework/Versions/%s/lib/tcl8.6'%(getVersion())),
},
),
])
# temporary workaround in 3.7.1 for addressing bpo-34370:
# use development snapshot of Tk 8.6 branch (post 8.6.8) to pick up
# potential fixes for various scrolling problems seen with 8.6.8.
# However, the snapshot fails to build on 10.6. For the moment,
# continue to build the 3.7.x 10.6 variant with the standard
# 8.6.6 branch.
if getDeptargetTuple() < (10, 9):
result.extend([
dict(
name="Tk 8.6.8",
url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tk8.6.8-src.tar.gz",
@ -274,30 +264,6 @@ def library_recipes():
},
),
])
else:
result.extend([
dict(
name="Tk 8.6.8+",
url="http://core.tcl.tk/tk/tarball/16fdad9d/tk-16fdad9d.tar.gz",
checksum='b8e0df69021924e8392f03d506252bdb',
patches=[
"tk868_on_10_8_10_9.patch",
],
buildDir="unix",
configure_pre=[
'--enable-aqua',
'--enable-shared',
'--enable-threads',
'--libdir=/Library/Frameworks/Python.framework/Versions/%s/lib'%(getVersion(),),
],
useLDFlags=False,
install='make TCL_LIBRARY=%(TCL_LIBRARY)s TK_LIBRARY=%(TK_LIBRARY)s && make install TCL_LIBRARY=%(TCL_LIBRARY)s TK_LIBRARY=%(TK_LIBRARY)s DESTDIR=%(DESTDIR)s'%{
"DESTDIR": shellQuote(os.path.join(WORKDIR, 'libraries')),
"TCL_LIBRARY": shellQuote('/Library/Frameworks/Python.framework/Versions/%s/lib/tcl8.6'%(getVersion())),
"TK_LIBRARY": shellQuote('/Library/Frameworks/Python.framework/Versions/%s/lib/tk8.6'%(getVersion())),
},
),
])
if PYTHON_3:
result.extend([

3
Misc/NEWS.d/next/macOS/2018-10-12-22-43-02.bpo-34370.kTJas4.rst Normal file
View File

@ -0,0 +1,3 @@
Revert to using the released Tk 8.6.8 with macOS installers instead of the
Tk 8.6.x development snapshot used with 3.7.1rc1 and 3.6.7rc1. The snapshot
introduced at least one significant regression (bpo-34927).