From d2d7ef8ac1deaf2f681734b3b13f7a962ba7f78a Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Thu, 4 Nov 2021 16:39:07 +0000 Subject: [PATCH] bpo-43652: Actually update to Tcl/Tk 8.6.11 on Windows (GH-29397) --- .../next/Windows/2021-11-04-00-41-50.bpo-43652.RnqV7I.rst | 2 ++ PCbuild/get_externals.bat | 6 +++--- PCbuild/tcltk.props | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 Misc/NEWS.d/next/Windows/2021-11-04-00-41-50.bpo-43652.RnqV7I.rst diff --git a/Misc/NEWS.d/next/Windows/2021-11-04-00-41-50.bpo-43652.RnqV7I.rst b/Misc/NEWS.d/next/Windows/2021-11-04-00-41-50.bpo-43652.RnqV7I.rst new file mode 100644 index 00000000000000..7da8fc79a9dab1 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2021-11-04-00-41-50.bpo-43652.RnqV7I.rst @@ -0,0 +1,2 @@ +Update Tcl/Tk to 8.6.11, actually this time. The previous update incorrectly +included 8.6.10. diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index ea85d98e12bbd1..53bedf1cd92007 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-3.3.0 if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1l set libraries=%libraries% sqlite-3.35.5.0 -if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.11.0 -if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.11.0 +if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.11.1 +if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.11.1 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 @@ -78,7 +78,7 @@ echo.Fetching external binaries... set binaries= if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi-3.3.0 if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1l -if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.11.0 +if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.11.1 if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06 for %%b in (%binaries%) do ( diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props index 1101796bb3604a..228efb34d73999 100644 --- a/PCbuild/tcltk.props +++ b/PCbuild/tcltk.props @@ -5,7 +5,7 @@ 8 6 11 - 0 + 1 $(TclMajorVersion) $(TclMinorVersion) $(TclPatchLevel)