]> granicus.if.org Git - python/commitdiff
bpo-30855: Bump Tcl/Tk to 8.5.19 on Windows (GH-4550)
authorZachary Ware <zachary.ware@gmail.com>
Sun, 26 Nov 2017 17:55:46 +0000 (11:55 -0600)
committerGitHub <noreply@github.com>
Sun, 26 Nov 2017 17:55:46 +0000 (11:55 -0600)
Misc/NEWS.d/next/Windows/2017-11-24-18-18-31.bpo-30855.Sowf7j.rst [new file with mode: 0644]
PC/VS9.0/build.bat
PCbuild/get_externals.bat
PCbuild/readme.txt
PCbuild/tcltk.props

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 (file)
index 0000000..cc3ebef
--- /dev/null
@@ -0,0 +1 @@
+Bump Tcl/Tk to 8.5.19.
index fb10557859305b2210392df032cfef7cdb0162da..2c846a54fed150e8d854596e49e27f529b3d919e 100644 (file)
@@ -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' (
index 92fc9441727f80b9fa9d5a89a46e4c5702782674..a28648a1c4a4bfa0236fc8104fc82d2bcc9e1cba 100644 (file)
@@ -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 (
index 4e7d29ee6e2738bbe85fa332c155ae4d7ca33e45..2f10635e26073e44616ac9c58d48dc54ef5220da 100644 (file)
@@ -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/
 
index 9660a9fc257132ad42da62705dc7937d0c54d492..36cdef0ae46487401fe3aaeacd7eab11f0f1a326 100644 (file)
@@ -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>