Skip to content

Commit 9d8f2d8

Browse files
authored
gh-124448: Update Windows builds to use Tcl/Tk 8.6.15 (GH-124449)
1 parent 909c6f7 commit 9d8f2d8

6 files changed

+14
-14
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.

Misc/externals.spdx.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -112,42 +112,42 @@
112112
"checksums": [
113113
{
114114
"algorithm": "SHA256",
115-
"checksumValue": "ad7623a44e1b6e42df47ba8f16b2b0435ac605650b5054077c4355a30473074c"
115+
"checksumValue": "4c23f0dd3efcbe6f3a22c503a68d147617bb30c4f5290f1eb3eaacf0b460440b"
116116
}
117117
],
118-
"downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/tcl-core-8.6.14.0.tar.gz",
118+
"downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/tcl-core-8.6.15.0.tar.gz",
119119
"externalRefs": [
120120
{
121121
"referenceCategory": "SECURITY",
122-
"referenceLocator": "cpe:2.3:a:tcl_tk:tcl_tk:8.6.14.0:*:*:*:*:*:*:*",
122+
"referenceLocator": "cpe:2.3:a:tcl_tk:tcl_tk:8.6.15.0:*:*:*:*:*:*:*",
123123
"referenceType": "cpe23Type"
124124
}
125125
],
126126
"licenseConcluded": "NOASSERTION",
127127
"name": "tcl-core",
128128
"primaryPackagePurpose": "SOURCE",
129-
"versionInfo": "8.6.14.0"
129+
"versionInfo": "8.6.15.0"
130130
},
131131
{
132132
"SPDXID": "SPDXRef-PACKAGE-tk",
133133
"checksums": [
134134
{
135135
"algorithm": "SHA256",
136-
"checksumValue": "e8d5cbe97952037962518b69aba85e324d80aa189054c163ab0ee764a448e802"
136+
"checksumValue": "0ae56d39bca92865f338529557a1e56d110594184b6dc5a91339c5675751e264"
137137
}
138138
],
139-
"downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/tk-8.6.14.0.tar.gz",
139+
"downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/tk-8.6.15.0.tar.gz",
140140
"externalRefs": [
141141
{
142142
"referenceCategory": "SECURITY",
143-
"referenceLocator": "cpe:2.3:a:tcl_tk:tcl_tk:8.6.14.0:*:*:*:*:*:*:*",
143+
"referenceLocator": "cpe:2.3:a:tcl_tk:tcl_tk:8.6.15.0:*:*:*:*:*:*:*",
144144
"referenceType": "cpe23Type"
145145
}
146146
],
147147
"licenseConcluded": "NOASSERTION",
148148
"name": "tk",
149149
"primaryPackagePurpose": "SOURCE",
150-
"versionInfo": "8.6.14.0"
150+
"versionInfo": "8.6.15.0"
151151
},
152152
{
153153
"SPDXID": "SPDXRef-PACKAGE-xz",

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)