From be1faabeef0821f188a28dd7cc6b744b89e85e94 Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Sun, 26 Nov 2017 11:55:46 -0600 Subject: bpo-30855: Bump Tcl/Tk to 8.5.19 on Windows (GH-4550) --- Misc/NEWS.d/next/Windows/2017-11-24-18-18-31.bpo-30855.Sowf7j.rst | 1 + PC/VS9.0/build.bat | 4 ++-- PCbuild/get_externals.bat | 4 ++-- PCbuild/readme.txt | 2 +- PCbuild/tcltk.props | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 Misc/NEWS.d/next/Windows/2017-11-24-18-18-31.bpo-30855.Sowf7j.rst 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 0000000..cc3ebef --- /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 fb10557..2c846a5 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 92fc944..a28648a 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 4e7d29e..2f10635 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 9660a9f..36cdef0 100644 --- a/PCbuild/tcltk.props +++ b/PCbuild/tcltk.props @@ -4,7 +4,7 @@ 8 5 - 15 + 19 0 $(TclMajorVersion) $(TclMinorVersion) -- cgit v0.12