Skip to content
/ cpython Public
forked from python/cpython

Commit e4d68af

Browse files
committed
pythongh-124448: Update Windows builds to use Tcl/Tk 8.6.15
1 parent 20ccda0 commit e4d68af

5 files changed

+6
-6
lines changed

Misc/NEWS.d/next/Windows/2024-03-19-19-04-56.gh-issue-116145.srVT3d.rst

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Updated bundled Tcl/Tk to 8.6.15.

PCbuild/get_externals.bat

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.4.4
5656
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-3.0.15
5757
set libraries=%libraries% mpdecimal-4.0.0
5858
set libraries=%libraries% sqlite-3.45.3.0
59-
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.14.0
60-
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.14.0
59+
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.15.0
60+
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.15.0
6161
set libraries=%libraries% xz-5.2.5
6262
set libraries=%libraries% zlib-1.3.1
6363

@@ -78,7 +78,7 @@ echo.Fetching external binaries...
7878
set binaries=
7979
if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi-3.4.4
8080
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-3.0.15
81-
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.14.0
81+
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.15.0
8282
if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06
8383

8484
for %%b in (%binaries%) do (

PCbuild/readme.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ _sqlite3
195195
Homepage:
196196
https://www.sqlite.org/
197197
_tkinter
198-
Wraps version 8.6.14 of the Tk windowing system, which is downloaded
198+
Wraps version 8.6.15 of the Tk windowing system, which is downloaded
199199
from our binaries repository at
200200
https://github.com/python/cpython-bin-deps.
201201

PCbuild/tcltk.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="pyproject.props" Condition="$(__PyProject_Props_Imported) != 'true'" />
44
<PropertyGroup>
5-
<TclVersion Condition="$(TclVersion) == ''">8.6.14.0</TclVersion>
5+
<TclVersion Condition="$(TclVersion) == ''">8.6.15.0</TclVersion>
66
<TkVersion Condition="$(TkVersion) == ''">$(TclVersion)</TkVersion>
77
<TclMajorVersion>$([System.Version]::Parse($(TclVersion)).Major)</TclMajorVersion>
88
<TclMinorVersion>$([System.Version]::Parse($(TclVersion)).Minor)</TclMinorVersion>

0 commit comments

Comments
 (0)