From e5e4444424a4e14bad05177363331c79b7cca683 Mon Sep 17 00:00:00 2001 From: szb512 <47613831+szb512@users.noreply.github.com> Date: Fri, 13 Mar 2020 18:29:48 -0400 Subject: [PATCH 1/4] Update Tcl/Tk (Check Issue 39107 on bugs.python.org) --- Mac/BuildScript/build-installer.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 0d69c04ba26b24..819d0977117290 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -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=[ @@ -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=[ From 2bc0553d3cbecb90cd879b441f5a2ca584706c96 Mon Sep 17 00:00:00 2001 From: szb512 <47613831+szb512@users.noreply.github.com> Date: Fri, 13 Mar 2020 20:12:08 -0400 Subject: [PATCH 2/4] Update and rename tk868_on_10_8_10_9.patch to tk8610_on_10_8_10_9.patch Prepare for Tk changes --- .../{tk868_on_10_8_10_9.patch => tk8610_on_10_8_10_9.patch} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename Mac/BuildScript/{tk868_on_10_8_10_9.patch => tk8610_on_10_8_10_9.patch} (79%) diff --git a/Mac/BuildScript/tk868_on_10_8_10_9.patch b/Mac/BuildScript/tk8610_on_10_8_10_9.patch similarity index 79% rename from Mac/BuildScript/tk868_on_10_8_10_9.patch rename to Mac/BuildScript/tk8610_on_10_8_10_9.patch index 8fe10604a68cb8..cfb604475b47b5 100644 --- a/Mac/BuildScript/tk868_on_10_8_10_9.patch +++ b/Mac/BuildScript/tk8610_on_10_8_10_9.patch @@ -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; From 8d3ded826fa8648f58baafd393048cd1011c8999 Mon Sep 17 00:00:00 2001 From: szb512 <47613831+szb512@users.noreply.github.com> Date: Thu, 19 Mar 2020 11:07:41 -0400 Subject: [PATCH 3/4] Update tcltk.props for windows More in issue 39107. --- PCbuild/tcltk.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props index 7fcd3e1c618c46..ac17b52bb717ee 100644 --- a/PCbuild/tcltk.props +++ b/PCbuild/tcltk.props @@ -4,7 +4,7 @@ 8 6 - 9 + 1 0 $(TclMajorVersion) $(TclMinorVersion) From 1db2b972ea9fdb1ef7c89ff8c2a4186d686808e9 Mon Sep 17 00:00:00 2001 From: szb512 <47613831+szb512@users.noreply.github.com> Date: Thu, 19 Mar 2020 11:13:02 -0400 Subject: [PATCH 4/4] Update for tcl-tk for windows --- PCbuild/get_externals.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index a079b752ce5592..ae769a17a68941 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -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