Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
9189e95d
Commit
9189e95d
authored
Feb 27, 2018
by
Ned Deily
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-32901: update macOS 10.9+ installer to Tcl/Tk 8.6.8
parent
d7687eb4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
6 deletions
+28
-6
Mac/BuildScript/build-installer.py
Mac/BuildScript/build-installer.py
+9
-6
Mac/BuildScript/tk868_on_10_8_10_9.patch
Mac/BuildScript/tk868_on_10_8_10_9.patch
+18
-0
Misc/NEWS.d/next/macOS/2018-02-27-17-33-15.bpo-32901.hQu0w3.rst
...EWS.d/next/macOS/2018-02-27-17-33-15.bpo-32901.hQu0w3.rst
+1
-0
No files found.
Mac/BuildScript/build-installer.py
View file @
9189e95d
...
...
@@ -225,9 +225,9 @@ def library_recipes():
if
internalTk
():
result
.
extend
([
dict
(
name
=
"Tcl 8.6.
7
"
,
url
=
"ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tcl8.6.
7
-src.tar.gz"
,
checksum
=
'
5673aaf45b5de5d8dd80bb3daaeb8838
'
,
name
=
"Tcl 8.6.
8
"
,
url
=
"ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tcl8.6.
8
-src.tar.gz"
,
checksum
=
'
81656d3367af032e0ae6157eff134f89
'
,
buildDir
=
"unix"
,
configure_pre
=
[
'--enable-shared'
,
...
...
@@ -241,9 +241,12 @@ def library_recipes():
},
),
dict
(
name
=
"Tk 8.6.7"
,
url
=
"ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tk8.6.7-src.tar.gz"
,
checksum
=
'46ea9c0165c515d87393700f4891ab6f'
,
name
=
"Tk 8.6.8"
,
url
=
"ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tk8.6.8-src.tar.gz"
,
checksum
=
'5e0faecba458ee1386078fb228d008ba'
,
patches
=
[
"tk868_on_10_8_10_9.patch"
,
],
buildDir
=
"unix"
,
configure_pre
=
[
'--enable-aqua'
,
...
...
Mac/BuildScript/tk868_on_10_8_10_9.patch
0 → 100644
View file @
9189e95d
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);
Misc/NEWS.d/next/macOS/2018-02-27-17-33-15.bpo-32901.hQu0w3.rst
0 → 100644
View file @
9189e95d
Update macOS 10.9+ installer to Tcl/Tk 8.6.8.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment