bpo-32901: Update Tcl and Tk versions to 8.6.8 (GH-5823)

(cherry picked from commit efa6c762268d68985f3012234f62ea9e5ced8b7c)

Co-authored-by: Steve Dower <steve.dower@microsoft.com>

diff --git a/Misc/NEWS.d/next/Windows/2018-02-23-00-47-13.bpo-32901.mGKz5_.rst b/Misc/NEWS.d/next/Windows/2018-02-23-00-47-13.bpo-32901.mGKz5_.rst
new file mode 100644 (file)
index 0000000..af0ca65
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2018-02-23-00-47-13.bpo-32901.mGKz5_.rst
@@ -0,0 +1 @@
+Update Tcl and Tk versions to 8.6.8

diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index d2af042d4aaebd1d9e395ff88385a23a5d5ca1f4..6d307517188913e3714cab6f000fe212983fd5c9 100644 (file)
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -51,8 +51,8 @@ set libraries=
 set libraries=%libraries%                                       bzip2-1.0.6
 if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries%     openssl-1.1.0f
 set libraries=%libraries%                                       sqlite-3.21.0.0
-if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.6.0
-if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.6.0
+if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.8.0
+if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.8.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
@@ -73,7 +73,7 @@ echo.Fetching external binaries...
 
 set binaries=
 if NOT "%IncludeSSL%"=="false"     set binaries=%binaries% openssl-bin-1.1.0f
-if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.6.0
+if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.8.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 cad52b8f0220ef4e6ad76a9b4c3ad048cf4ebca0..0a59c0894d7443dfbf63e23cdafd819697bfbfec 100644 (file)
--- a/PCbuild/tcltk.props
+++ b/PCbuild/tcltk.props
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <TclMajorVersion>8</TclMajorVersion>
     <TclMinorVersion>6</TclMinorVersion>
-    <TclPatchLevel>6</TclPatchLevel>
+    <TclPatchLevel>8</TclPatchLevel>
     <TclRevision>0</TclRevision>
     <TkMajorVersion>$(TclMajorVersion)</TkMajorVersion>
     <TkMinorVersion>$(TclMinorVersion)</TkMinorVersion>