Revert "bpo-35402: Update macOS installer to use Tcl 8.6.9 / Tk 8.6.9… · python/cpython@c540c4e (original) (raw)

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

`

225

225

`if internalTk():

`

226

226

`result.extend([

`

227

227

`dict(

`

228

``

`-

name="Tcl 8.6.9",

`

229

``

`-

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

`

230

``

`-

checksum='aa0a121d95a0e7b73a036f26028538d4',

`

``

228

`+

name="Tcl 8.6.8",

`

``

229

`+

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

`

``

230

`+

checksum='81656d3367af032e0ae6157eff134f89',

`

231

231

`buildDir="unix",

`

232

232

`configure_pre=[

`

233

233

`'--enable-shared',

`

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

`

241

241

` },

`

242

242

` ),

`

243

243

`dict(

`

244

``

`-

name="Tk 8.6.9.1",

`

245

``

`-

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

`

246

``

`-

checksum='9efe3976468352dc894dae0c4e785a8e',

`

``

244

`+

name="Tk 8.6.8",

`

``

245

`+

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

`

``

246

`+

checksum='5e0faecba458ee1386078fb228d008ba',

`

``

247

`+

patches=[

`

``

248

`+

"tk868_on_10_8_10_9.patch",

`

``

249

`+

],

`

247

250

`buildDir="unix",

`

248

251

`configure_pre=[

`

249

252

`'--enable-aqua',

`

`@@ -705,7 +708,6 @@ def extractArchive(builddir, archiveName):

`

705

708

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

`

706

709

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

`

707

710

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

`

708

``

`-

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

`

709

711

` """

`

710

712

`curdir = os.getcwd()

`

711

713

`try:

`

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

`

715

717

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

`

716

718

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

`

717

719

`retval = retval[:-4]

`

718

``

`-

if retval == 'tk8.6.9.1':

`

719

``

`-

retval = 'tk8.6.9'

`

720

720

`if os.path.exists(retval):

`

721

721

`shutil.rmtree(retval)

`

722

722

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

`