bpo-32901: update macOS 10.9+ installer to Tcl/Tk 8.6.8
This commit is contained in:
parent
d7687eb4b6
commit
9189e95d9c
|
@ -225,9 +225,9 @@ def library_recipes():
|
||||||
if internalTk():
|
if internalTk():
|
||||||
result.extend([
|
result.extend([
|
||||||
dict(
|
dict(
|
||||||
name="Tcl 8.6.7",
|
name="Tcl 8.6.8",
|
||||||
url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tcl8.6.7-src.tar.gz",
|
url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tcl8.6.8-src.tar.gz",
|
||||||
checksum='5673aaf45b5de5d8dd80bb3daaeb8838',
|
checksum='81656d3367af032e0ae6157eff134f89',
|
||||||
buildDir="unix",
|
buildDir="unix",
|
||||||
configure_pre=[
|
configure_pre=[
|
||||||
'--enable-shared',
|
'--enable-shared',
|
||||||
|
@ -241,9 +241,12 @@ def library_recipes():
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
dict(
|
dict(
|
||||||
name="Tk 8.6.7",
|
name="Tk 8.6.8",
|
||||||
url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tk8.6.7-src.tar.gz",
|
url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tk8.6.8-src.tar.gz",
|
||||||
checksum='46ea9c0165c515d87393700f4891ab6f',
|
checksum='5e0faecba458ee1386078fb228d008ba',
|
||||||
|
patches=[
|
||||||
|
"tk868_on_10_8_10_9.patch",
|
||||||
|
],
|
||||||
buildDir="unix",
|
buildDir="unix",
|
||||||
configure_pre=[
|
configure_pre=[
|
||||||
'--enable-aqua',
|
'--enable-aqua',
|
||||||
|
|
|
@ -0,0 +1,18 @@
|
||||||
|
Fix build failure with +quartz variant on OS X 10.8 and 10.9.
|
||||||
|
Even though Gestalt was deprecated in OS X 10.8, it should work fine
|
||||||
|
through OS X 10.9, and its replacement NSOperatingSystemVersion was
|
||||||
|
not introduced until OS X 10.10.
|
||||||
|
|
||||||
|
Patch from MacPorts project and reported upstream:
|
||||||
|
https://trac.macports.org/ticket/55649
|
||||||
|
--- tk8.6.8/macosx/tkMacOSXXStubs.c.orig 2017-12-06 09:25:08.000000000 -0600
|
||||||
|
+++ tk8.6.8-patched/macosx/tkMacOSXXStubs.c 2018-01-06 19:34:17.000000000 -0600
|
||||||
|
@@ -175,7 +175,7 @@
|
||||||
|
{
|
||||||
|
int major, minor, patch;
|
||||||
|
|
||||||
|
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1080
|
||||||
|
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 101000
|
||||||
|
Gestalt(gestaltSystemVersionMajor, (SInt32*)&major);
|
||||||
|
Gestalt(gestaltSystemVersionMinor, (SInt32*)&minor);
|
||||||
|
Gestalt(gestaltSystemVersionBugFix, (SInt32*)&patch);
|
|
@ -0,0 +1 @@
|
||||||
|
Update macOS 10.9+ installer to Tcl/Tk 8.6.8.
|
Loading…
Reference in New Issue