Skip to content

bpo-39107: Update Tcl/Tk on macOS AND Windows #18982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
szb512 wants to merge 5 commits into from
Closed

bpo-39107: Update Tcl/Tk on macOS AND Windows #18982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e5e4444
Update Tcl/Tk (Check Issue 39107 on bugs.python.org)
szb512 Mar 13, 2020
2bc0553
Update and rename tk868_on_10_8_10_9.patch to tk8610_on_10_8_10_9.patch
szb512 Mar 14, 2020
8d3ded8
Update tcltk.props for windows
szb512 Mar 19, 2020
1db2b97
Update for tcl-tk for windows
szb512 Mar 19, 2020
0951923
Merge pull request #4 from szb512/tcltk-for-windows
szb512 Mar 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Mac/BuildScript/build-installer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,8 @@ def library_recipes():
if internalTk():
result.extend([
dict(
name="Tcl 8.6.8",
url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tcl8.6.8-src.tar.gz",
name="Tcl 8.6.10",
url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tcl8.6.10-src.tar.gz",
checksum='81656d3367af032e0ae6157eff134f89',
buildDir="unix",
configure_pre=[
Expand All @@ -243,11 +243,11 @@ def library_recipes():
},
),
dict(
name="Tk 8.6.8",
url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tk8.6.8-src.tar.gz",
name="Tk 8.6.10",
url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tk8.6.10-src.tar.gz",
checksum='5e0faecba458ee1386078fb228d008ba',
patches=[
"tk868_on_10_8_10_9.patch",
"tk8610_on_10_8_10_9.patch",
],
buildDir="unix",
configure_pre=[
Expand Down
4 changes: 2 additions & 2 deletions Mac/BuildScript/tk868_on_10_8_10_9.patch → Mac/BuildScript/tk8610_on_10_8_10_9.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ 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
--- tk8.6.10/macosx/tkMacOSXXStubs.c.orig 2017-12-06 09:25:08.000000000 -0600
+++ tk8.6.10-patched/macosx/tkMacOSXXStubs.c 2018-01-06 19:34:17.000000000 -0600
@@ -175,7 +175,7 @@
{
int major, minor, patch;
Expand Down
4 changes: 2 additions & 2 deletions PCbuild/get_externals.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ set libraries=%libraries% bzip2-1.0.6
if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1d
set libraries=%libraries% sqlite-3.31.1.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.9.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.9.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.10.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.10.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6
set libraries=%libraries% xz-5.2.2
set libraries=%libraries% zlib-1.2.11
Expand Down
2 changes: 1 addition & 1 deletion PCbuild/tcltk.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<PropertyGroup>
<TclMajorVersion>8</TclMajorVersion>
<TclMinorVersion>6</TclMinorVersion>
<TclPatchLevel>9</TclPatchLevel>
<TclPatchLevel>1</TclPatchLevel>
<TclRevision>0</TclRevision>
<TkMajorVersion>$(TclMajorVersion)</TkMajorVersion>
<TkMinorVersion>$(TclMinorVersion)</TkMinorVersion>
Expand Down