From: Zachary Ware <zachary.ware@gmail.com>
Date: Sun, 26 Nov 2017 17:55:46 +0000 (-0600)
Subject: bpo-30855: Bump Tcl/Tk to 8.5.19 on Windows (GH-4550)
X-Git-Tag: v2.7.15rc1~112
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=be1faabeef0821f188a28dd7cc6b744b89e85e94;p=python

bpo-30855: Bump Tcl/Tk to 8.5.19 on Windows (GH-4550)
---

diff --git a/Misc/NEWS.d/next/Windows/2017-11-24-18-18-31.bpo-30855.Sowf7j.rst b/Misc/NEWS.d/next/Windows/2017-11-24-18-18-31.bpo-30855.Sowf7j.rst
new file mode 100644
index 0000000000..cc3ebef29a
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2017-11-24-18-18-31.bpo-30855.Sowf7j.rst
@@ -0,0 +1 @@
+Bump Tcl/Tk to 8.5.19.
diff --git a/PC/VS9.0/build.bat b/PC/VS9.0/build.bat
index fb10557859..2c846a54fe 100644
--- a/PC/VS9.0/build.bat
+++ b/PC/VS9.0/build.bat
@@ -70,8 +70,8 @@ if '%build_tkinter%'=='true' (
         set tcl_dbg_ext=
         set debug_flag=0
     )
-    set tcldir=%externals_dir%\tcl-8.5.15.0
-    set tkdir=%externals_dir%\tk-8.5.15.0
+    set tcldir=%externals_dir%\tcl-8.5.19.0
+    set tkdir=%externals_dir%\tk-8.5.19.0
     set tixdir=%externals_dir%\tix-8.4.3.5
 )
 if '%build_tkinter%'=='true' (
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 92fc944172..a28648a1c4 100644
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -49,8 +49,8 @@ set libraries=%libraries%                                    bzip2-1.0.6
 if NOT "%IncludeBsddb%"=="false" set libraries=%libraries%   bsddb-4.7.25.0
 if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2k
 set libraries=%libraries%                                    sqlite-3.14.2.0
-if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.15.0
-if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.15.0
+if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.19.0
+if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.19.0
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tix-8.4.3.5
 
 for %%e in (%libraries%) do (
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 4e7d29ee6e..2f10635e26 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -231,7 +231,7 @@ _sqlite3
     Homepage:
         http://www.sqlite.org/
 _tkinter
-    Wraps version 8.5.15 of the Tk windowing system.
+    Wraps version 8.5.19 of the Tk windowing system.
     Homepage:
         http://www.tcl.tk/
 
diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props
index 9660a9fc25..36cdef0ae4 100644
--- a/PCbuild/tcltk.props
+++ b/PCbuild/tcltk.props
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <TclMajorVersion>8</TclMajorVersion>
     <TclMinorVersion>5</TclMinorVersion>
-    <TclPatchLevel>15</TclPatchLevel>
+    <TclPatchLevel>19</TclPatchLevel>
     <TclRevision>0</TclRevision>
     <TkMajorVersion>$(TclMajorVersion)</TkMajorVersion>
     <TkMinorVersion>$(TclMinorVersion)</TkMinorVersion>