https://github.com/python/cpython/commit/7a2bd3d2adba2c95f316243dc477910e63f4e6ae
commit: 7a2bd3d2adba2c95f316243dc477910e63f4e6ae
branch: 3.12
author: Zachary Ware <[email protected]>
committer: zware <[email protected]>
date: 2024-10-21T21:44:56-05:00
summary:
[3.12] gh-124448: Update Windows builds to use Tcl/Tk 8.6.15 (GH-125796)
(cherry picked from commit 9d8f2d8e08336695fdade5846da4bbcc3eb5f152)
files:
A Misc/NEWS.d/next/Windows/2024-09-24-19-04-56.gh-issue-124448.srVT3d.rst
M Misc/externals.spdx.json
M PCbuild/get_externals.bat
M PCbuild/readme.txt
M PCbuild/tcltk.props
diff --git
a/Misc/NEWS.d/next/Windows/2024-09-24-19-04-56.gh-issue-124448.srVT3d.rst
b/Misc/NEWS.d/next/Windows/2024-09-24-19-04-56.gh-issue-124448.srVT3d.rst
new file mode 100644
index 00000000000000..ca9845a8daea9d
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2024-09-24-19-04-56.gh-issue-124448.srVT3d.rst
@@ -0,0 +1 @@
+Updated bundled Tcl/Tk to 8.6.15.
diff --git a/Misc/externals.spdx.json b/Misc/externals.spdx.json
index 6c711e74f94c79..4219cd4fe4c953 100644
--- a/Misc/externals.spdx.json
+++ b/Misc/externals.spdx.json
@@ -90,42 +90,42 @@
"checksums": [
{
"algorithm": "SHA256",
- "checksumValue":
"6e33a88f116822167734cd72b693b5d30ced130a3cae6dc2ff696042f993bb42"
+ "checksumValue":
"4c23f0dd3efcbe6f3a22c503a68d147617bb30c4f5290f1eb3eaacf0b460440b"
}
],
- "downloadLocation":
"https://github.com/python/cpython-source-deps/archive/refs/tags/tcl-core-8.6.13.0.tar.gz";,
+ "downloadLocation":
"https://github.com/python/cpython-source-deps/archive/refs/tags/tcl-core-8.6.15.0.tar.gz";,
"externalRefs": [
{
"referenceCategory": "SECURITY",
- "referenceLocator": "cpe:2.3:a:tcl_tk:tcl_tk:8.6.13.0:*:*:*:*:*:*:*",
+ "referenceLocator": "cpe:2.3:a:tcl_tk:tcl_tk:8.6.15.0:*:*:*:*:*:*:*",
"referenceType": "cpe23Type"
}
],
"licenseConcluded": "NOASSERTION",
"name": "tcl-core",
"primaryPackagePurpose": "SOURCE",
- "versionInfo": "8.6.13.0"
+ "versionInfo": "8.6.15.0"
},
{
"SPDXID": "SPDXRef-PACKAGE-tk",
"checksums": [
{
"algorithm": "SHA256",
- "checksumValue":
"896c1f488bdd0159091bd5cce124b756dfdffa4a5350b7fd4d7d8e48421089a4"
+ "checksumValue":
"0ae56d39bca92865f338529557a1e56d110594184b6dc5a91339c5675751e264"
}
],
- "downloadLocation":
"https://github.com/python/cpython-source-deps/archive/refs/tags/tk-8.6.13.0.tar.gz";,
+ "downloadLocation":
"https://github.com/python/cpython-source-deps/archive/refs/tags/tk-8.6.15.0.tar.gz";,
"externalRefs": [
{
"referenceCategory": "SECURITY",
- "referenceLocator": "cpe:2.3:a:tcl_tk:tcl_tk:8.6.13.0:*:*:*:*:*:*:*",
+ "referenceLocator": "cpe:2.3:a:tcl_tk:tcl_tk:8.6.15.0:*:*:*:*:*:*:*",
"referenceType": "cpe23Type"
}
],
"licenseConcluded": "NOASSERTION",
"name": "tk",
"primaryPackagePurpose": "SOURCE",
- "versionInfo": "8.6.13.0"
+ "versionInfo": "8.6.15.0"
},
{
"SPDXID": "SPDXRef-PACKAGE-tix",
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index e0144bcdf18c10..fa99d03e51ffe6 100644
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -55,8 +55,8 @@ set libraries=%libraries%
bzip2-1.0.8
if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.4.4
if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-3.0.15
set libraries=%libraries% sqlite-3.45.3.0
-if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries%
tcl-core-8.6.13.0
-if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.13.0
+if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries%
tcl-core-8.6.15.0
+if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.15.0
if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6
set libraries=%libraries% xz-5.2.5
set libraries=%libraries% zlib-1.3.1
@@ -78,7 +78,7 @@ echo.Fetching external binaries...
set binaries=
if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi-3.4.4
if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-3.0.15
-if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.13.0
+if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.15.2
if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06
for %%b in (%binaries%) do (
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 29edf9bf260ab1..e054a94cf578bf 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -193,7 +193,7 @@ _sqlite3
Homepage:
https://www.sqlite.org/
_tkinter
- Wraps version 8.6.6 of the Tk windowing system, which is downloaded
+ Wraps version 8.6.15 of the Tk windowing system, which is downloaded
from our binaries repository at
https://github.com/python/cpython-bin-deps.
diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props
index 9d5189b3b8e93d..6b01d5b78eb199 100644
--- a/PCbuild/tcltk.props
+++ b/PCbuild/tcltk.props
@@ -2,7 +2,7 @@
<Project ToolsVersion="15.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<Import Project="pyproject.props" Condition="$(__PyProject_Props_Imported)
!= 'true'" />
<PropertyGroup>
- <TclVersion Condition="$(TclVersion) == ''">8.6.13.0</TclVersion>
+ <TclVersion Condition="$(TclVersion) == ''">8.6.15.2</TclVersion>
<TkVersion Condition="$(TkVersion) == ''">$(TclVersion)</TkVersion>
<TixVersion Condition="$(TixVersion) == ''">8.4.3.6</TixVersion>
<TclMajorVersion>$([System.Version]::Parse($(TclVersion)).Major)</TclMajorVersion>
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
