bpo-35402: Update macOS installer to use Tcl 8.6.9 / Tk 8.6.9.1 (GH-1… · python/cpython@3b9a018 (original) (raw)
`@@ -227,9 +227,9 @@ def library_recipes():
`
227
227
`if internalTk():
`
228
228
`result.extend([
`
229
229
`dict(
`
230
``
`-
name="Tcl 8.6.8",
`
231
``
`-
url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tcl8.6.8-src.tar.gz",
`
232
``
`-
checksum='81656d3367af032e0ae6157eff134f89',
`
``
230
`+
name="Tcl 8.6.9",
`
``
231
`+
url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tcl8.6.9-src.tar.gz",
`
``
232
`+
checksum='aa0a121d95a0e7b73a036f26028538d4',
`
233
233
`buildDir="unix",
`
234
234
`configure_pre=[
`
235
235
`'--enable-shared',
`
`@@ -243,12 +243,9 @@ def library_recipes():
`
243
243
` },
`
244
244
` ),
`
245
245
`dict(
`
246
``
`-
name="Tk 8.6.8",
`
247
``
`-
url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tk8.6.8-src.tar.gz",
`
248
``
`-
checksum='5e0faecba458ee1386078fb228d008ba',
`
249
``
`-
patches=[
`
250
``
`-
"tk868_on_10_8_10_9.patch",
`
251
``
`-
],
`
``
246
`+
name="Tk 8.6.9.1",
`
``
247
`+
url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tk8.6.9.1-src.tar.gz",
`
``
248
`+
checksum='9efe3976468352dc894dae0c4e785a8e',
`
252
249
`buildDir="unix",
`
253
250
`configure_pre=[
`
254
251
`'--enable-aqua',
`
`@@ -709,6 +706,7 @@ def extractArchive(builddir, archiveName):
`
709
706
` work for current Tcl and Tk source releases where the basename of
`
710
707
` the archive ends with "-src" but the uncompressed directory does not.
`
711
708
` For now, just special case Tcl and Tk tar.gz downloads.
`
``
709
`+
Another special case: the tk8.6.9.1 tarball extracts to tk8.6.9.
`
712
710
` """
`
713
711
`curdir = os.getcwd()
`
714
712
`try:
`
`@@ -718,6 +716,8 @@ def extractArchive(builddir, archiveName):
`
718
716
`if ((retval.startswith('tcl') or retval.startswith('tk'))
`
719
717
`and retval.endswith('-src')):
`
720
718
`retval = retval[:-4]
`
``
719
`+
if retval == 'tk8.6.9.1':
`
``
720
`+
retval = 'tk8.6.9'
`
721
721
`if os.path.exists(retval):
`
722
722
`shutil.rmtree(retval)
`
723
723
`fp = os.popen("tar zxf %s 2>&1"%(shellQuote(archiveName),), 'r')
`