Skip to content

Commit a936639

Browse files
ned-deilymiss-islington
authored andcommitted
Revert "bpo-35402: Update macOS installer to use Tcl 8.6.9 / Tk 8.6.9.1 (GH-11101)" (GH-11332)
This reverts commit 7cf3d8e. 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
1 parent 59c2aa2 commit a936639

File tree

3 files changed

+27
-10
lines changed

3 files changed

+27
-10
lines changed

Mac/BuildScript/build-installer.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,9 @@ def library_recipes():
227227
if internalTk():
228228
result.extend([
229229
dict(
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',
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',
233233
buildDir="unix",
234234
configure_pre=[
235235
'--enable-shared',
@@ -243,9 +243,12 @@ def library_recipes():
243243
},
244244
),
245245
dict(
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',
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+
],
249252
buildDir="unix",
250253
configure_pre=[
251254
'--enable-aqua',
@@ -706,7 +709,6 @@ def extractArchive(builddir, archiveName):
706709
work for current Tcl and Tk source releases where the basename of
707710
the archive ends with "-src" but the uncompressed directory does not.
708711
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.
710712
"""
711713
curdir = os.getcwd()
712714
try:
@@ -716,8 +718,6 @@ def extractArchive(builddir, archiveName):
716718
if ((retval.startswith('tcl') or retval.startswith('tk'))
717719
and retval.endswith('-src')):
718720
retval = retval[:-4]
719-
if retval == 'tk8.6.9.1':
720-
retval = 'tk8.6.9'
721721
if os.path.exists(retval):
722722
shutil.rmtree(retval)
723723
fp = os.popen("tar zxf %s 2>&1"%(shellQuote(archiveName),), 'r')
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
Fix build failure with +quartz variant on OS X 10.8 and 10.9.
2+
Even though Gestalt was deprecated in OS X 10.8, it should work fine
3+
through OS X 10.9, and its replacement NSOperatingSystemVersion was
4+
not introduced until OS X 10.10.
5+
6+
Patch from MacPorts project and reported upstream:
7+
https://trac.macports.org/ticket/55649
8+
--- tk8.6.8/macosx/tkMacOSXXStubs.c.orig 2017-12-06 09:25:08.000000000 -0600
9+
+++ tk8.6.8-patched/macosx/tkMacOSXXStubs.c 2018-01-06 19:34:17.000000000 -0600
10+
@@ -175,7 +175,7 @@
11+
{
12+
int major, minor, patch;
13+
14+
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1080
15+
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 101000
16+
Gestalt(gestaltSystemVersionMajor, (SInt32*)&major);
17+
Gestalt(gestaltSystemVersionMinor, (SInt32*)&minor);
18+
Gestalt(gestaltSystemVersionBugFix, (SInt32*)&patch);

Misc/NEWS.d/next/macOS/2018-12-10-02-44-48.bpo-35402.xzn8qJ.rst

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)