8000 [3.12] gh-124448: Update Windows builds to use Tcl/Tk 8.6.15 (GH-125796) · python/cpython@7a2bd3d · GitHub
[go: up one dir, main page]
Skip to content

Commit 7a2bd3d

Browse files
zwarezware
authored
[3.12] gh-124448: Update Windows builds to use Tcl/Tk 8.6.15 (GH-125796)
(cherry picked from commit 9d8f2d8)
1 parent e6746d9 commit 7a2bd3d

File tree

5 files changed

+14
-13
lines changed

5 files changed

+14
-13
lines changed

‎Misc/NEWS.d/next/Windows/2024-09-24-19-04-56.gh-issue-124448.srVT3d.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Updated bundled Tcl/Tk to 8.6.15.

‎Misc/externals.spdx.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,42 +90,42 @@
9090
"checksums": [
9191
{
9292
"algorithm": "SHA256",
93-
"checksumValue": "6e33a88f116822167734cd72b693b5d30ced130a3cae6dc2ff696042f993bb42"
93+
"checksumValue": "4c23f0dd3efcbe6f3a22c503a68d147617bb30c4f5290f1eb3eaacf0b460440b"
9494
}
9595
],
96-
"downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/tcl-core-8.6.13.0.tar.gz",
96+
"downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/tcl-core-8.6.15.0.tar.gz",
9797
"externalRefs": [
9898
{
9999
"referenceCategory": "SECURITY",
100-
"referenceLocator": "cpe:2.3:a:tcl_tk:tcl_tk:8.6.13.0:*:*:*:*:*:*:*",
100+
"referenceLocator": "cpe:2.3:a:tcl_tk:tcl_tk:8.6.15.0:*:*:*:*:*:*:*",
101101
"referenceType": "cpe23Type"
102102
}
103103
],
104104
"licenseConcluded": "NOASSERTION",
105105
"name": "tcl-core",
106106
"primaryPackagePurpose": "SOURCE",
107-
"versionInfo": "8.6.13.0"
107+
"versionInfo": "8.6.15.0"
108108
},
109109
{
110110
"SPDXID": "SPDXRef-PACKAGE-tk",
111111
"checksums": [
112112
{
113113
"algorithm": "SHA256",
114-
"checksumValue": "896c1f488bdd0159091bd5cce124b756dfdffa4a5350b7fd4d7d8e48421089a4"
114+
"checksumValue": "0ae56d39bca92865f338529557a1e56d110594184b6dc5a91339c5675751e264"
115115
}
116116
],
117-
"downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/tk-8.6.13.0.tar.gz",
117+
"downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/tk-8.6.15.0.tar.gz",
118118
"externalRefs": [
119119
{
120120
"referenceCategory": "SECURITY",
121-
"referenceLocator": "cpe:2.3:a:tcl_tk:tcl_tk:8.6.13.0:*:*:*:*:*:*:*",
121+
"referenceLocator": "cpe:2.3:a:tcl_tk:tcl_tk:8.6.15.0:*:*:*:*:*:*:*",
122122
"referenceType": "cpe23Type"
123123
}
124124
],
125125
"licenseConcluded": "NOASSERTION",
126126
"name": "tk",
127127
"primaryPackagePurpose": "SOURCE",
128-
"versionInfo": "8.6.13.0"
128+
"versionInfo": "8.6.15.0"
129129
},
130130
{
131131
"SPDXID": "SPDXRef-PACKAGE-tix",

‎PCbuild/get_externals.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ set libraries=%libraries% bzip2-1.0.8
5555
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% sqlite-3.45.3.0
58-
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.13.0
59-
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.13.0
58+
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.15.0
59+
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.15.0
6060
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6
6161
set libraries=%libraries% xz-5.2.5
6262
set libraries=%libraries% zlib-1.3.1
@@ -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.13.0
81+
if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.15.2
8282
if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06
8383

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

‎PCbuild/readme.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ _sqlite3
193193
Homepage:
194194
https://www.sqlite.org/
195195
_tkinter
196-
Wraps version 8.6.6 of the Tk windowing system, which is downloaded
196+
Wraps version 8.6.15 of the Tk windowing system, which is downloaded
197197
from our binaries repository at
198198
https://github.com/python/cpython-bin-deps.
199199

‎PCbuild/tcltk.props

Lines changed: 1 addition & 1 deletion
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.13.0</TclVersion>
5+
<TclVersion Condition="$(TclVersion) == ''">8.6.15.2</TclVersion>
66
<TkVersion Condition="$(TkVersion) == ''">$(TclVersion)</Tk 4781 Version>
77
<TixVersion Condition="$(TixVersion) == ''">8.4.3.6</TixVersion>
88
<TclMajorVersion>$([System.Version]::Parse($(TclVersion)).Major)</TclMajorVersion>

0 commit comments

Comments
 (0)
0