bpo-35402: Update macOS installer to use Tcl 8.6.9 / Tk 8.6.9.1 (GH-1… · python/cpython@aa58050 (original) (raw)

`@@ -223,9 +223,9 @@ def library_recipes():

`

223

223

`if internalTk():

`

224

224

`result.extend([

`

225

225

`dict(

`

226

``

`-

name="Tcl 8.6.8",

`

227

``

`-

url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tcl8.6.8-src.tar.gz",

`

228

``

`-

checksum='81656d3367af032e0ae6157eff134f89',

`

``

226

`+

name="Tcl 8.6.9",

`

``

227

`+

url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tcl8.6.9-src.tar.gz",

`

``

228

`+

checksum='aa0a121d95a0e7b73a036f26028538d4',

`

229

229

`buildDir="unix",

`

230

230

`configure_pre=[

`

231

231

`'--enable-shared',

`

`@@ -239,12 +239,9 @@ def library_recipes():

`

239

239

` },

`

240

240

` ),

`

241

241

`dict(

`

242

``

`-

name="Tk 8.6.8",

`

243

``

`-

url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tk8.6.8-src.tar.gz",

`

244

``

`-

checksum='5e0faecba458ee1386078fb228d008ba',

`

245

``

`-

patches=[

`

246

``

`-

"tk868_on_10_8_10_9.patch",

`

247

``

`-

],

`

``

242

`+

name="Tk 8.6.9.1",

`

``

243

`+

url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tk8.6.9.1-src.tar.gz",

`

``

244

`+

checksum='9efe3976468352dc894dae0c4e785a8e',

`

248

245

`buildDir="unix",

`

249

246

`configure_pre=[

`

250

247

`'--enable-aqua',

`

`@@ -706,6 +703,7 @@ def extractArchive(builddir, archiveName):

`

706

703

` work for current Tcl and Tk source releases where the basename of

`

707

704

` the archive ends with "-src" but the uncompressed directory does not.

`

708

705

` For now, just special case Tcl and Tk tar.gz downloads.

`

``

706

`+

Another special case: the tk8.6.9.1 tarball extracts to tk8.6.9.

`

709

707

` """

`

710

708

`curdir = os.getcwd()

`

711

709

`try:

`

`@@ -715,6 +713,8 @@ def extractArchive(builddir, archiveName):

`

715

713

`if ((retval.startswith('tcl') or retval.startswith('tk'))

`

716

714

`and retval.endswith('-src')):

`

717

715

`retval = retval[:-4]

`

``

716

`+

if retval == 'tk8.6.9.1':

`

``

717

`+

retval = 'tk8.6.9'

`

718

718

`if os.path.exists(retval):

`

719

719

`shutil.rmtree(retval)

`

720

720

`fp = os.popen("tar zxf %s 2>&1"%(shellQuote(archiveName),), 'r')

`