From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 23 Apr 2021 21:40:42 +0000 (-0400)
Subject: bop-43652: Update Tcl and Tk to 8.6.11 in Windows installer (GH-25170)
X-Git-Tag: v3.10.0b1~185
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6b59e662fa39a356d6eb03d349b140477857f4b1;p=thirdparty%2FPython%2Fcpython.git

bop-43652: Update Tcl and Tk to 8.6.11 in Windows installer (GH-25170)
---

diff --git a/Misc/NEWS.d/next/Windows/2021-04-03-18-54-31.bpo-43652.gNmfVN.rst b/Misc/NEWS.d/next/Windows/2021-04-03-18-54-31.bpo-43652.gNmfVN.rst
new file mode 100644
index 000000000000..0ef44e28a9a1
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2021-04-03-18-54-31.bpo-43652.gNmfVN.rst
@@ -0,0 +1 @@
+Update Tcl and Tk to 8.6.11 in Windows installer.
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index a8bb06f81998..d064a12a082a 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.1k
 set libraries=%libraries%                                       sqlite-3.34.0.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% 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% 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
 if NOT "%IncludeSSL%"=="false"     set binaries=%binaries% openssl-bin-1.1.1k-1
-if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.10.0
+if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.11.0
 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 fb61bee51472..1101796bb360 100644
--- a/PCbuild/tcltk.props
+++ b/PCbuild/tcltk.props
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <TclMajorVersion>8</TclMajorVersion>
     <TclMinorVersion>6</TclMinorVersion>
-    <TclPatchLevel>10</TclPatchLevel>
+    <TclPatchLevel>11</TclPatchLevel>
     <TclRevision>0</TclRevision>
     <TkMajorVersion>$(TclMajorVersion)</TkMajorVersion>
     <TkMinorVersion>$(TclMinorVersion)</TkMinorVersion>