[3.15] gh-124111: Update Windows builds to Tcl/Tk 9.0.4 (GH-153990)

(cherry picked from commit 46e950fc0df8ad300497d612c4c9de3e5a1e87f3)

Co-authored-by: Zachary Ware <zach@python.org>

diff --git a/Misc/NEWS.d/next/Windows/2026-07-18-11-56-53.gh-issue-124111.m4OBX8.rst b/Misc/NEWS.d/next/Windows/2026-07-18-11-56-53.gh-issue-124111.m4OBX8.rst
new file mode 100644 (file)
index 0000000..802afc6
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2026-07-18-11-56-53.gh-issue-124111.m4OBX8.rst
@@ -0,0 +1 @@
+Updated Windows builds to use Tcl/Tk 9.0.4.

diff --git a/Misc/externals.spdx.json b/Misc/externals.spdx.json
index 523d20259adaaa9df0cd576c01d0ec03f47b5195..cdacaf6f58695310095cce98531535572e0ce0e5 100644 (file)
--- a/Misc/externals.spdx.json
+++ b/Misc/externals.spdx.json
@@ -112,42 +112,42 @@
       "checksums": [
         {
           "algorithm": "SHA256",
-          "checksumValue": "7a1d1f3a2b8f4484a9c2a027a157963c18f85a81785e85fcb5d1e3df6b6a4fd4"
+          "checksumValue": "3ac2acd65ddaaac0b2b8df321b558419d21da20bf67ab39149b8248c85f0d214"
         }
       ],
-      "downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/tcl-9.0.3.0.tar.gz",
+      "downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/tcl-9.0.4.0.tar.gz",
       "externalRefs": [
         {
           "referenceCategory": "SECURITY",
-          "referenceLocator": "cpe:2.3:a:tcl_tk:tcl_tk:9.0.3.0:*:*:*:*:*:*:*",
+          "referenceLocator": "cpe:2.3:a:tcl_tk:tcl_tk:9.0.4.0:*:*:*:*:*:*:*",
           "referenceType": "cpe23Type"
         }
       ],
       "licenseConcluded": "NOASSERTION",
       "name": "tcl",
       "primaryPackagePurpose": "SOURCE",
-      "versionInfo": "9.0.3.0"
+      "versionInfo": "9.0.4.0"
     },
     {
       "SPDXID": "SPDXRef-PACKAGE-tk",
       "checksums": [
         {
           "algorithm": "SHA256",
-          "checksumValue": "54fb59df12c489c6264f5b7d3d7444b150d1e3d6561fd59cdb11483440cec000"
+          "checksumValue": "66048966cfa88989333ff1632f454e10e9248516bb45efda7b4d2ae5a61642cb"
         }
       ],
-      "downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/tk-9.0.3.1.tar.gz",
+      "downloadLocation": "https://github.com/python/cpython-source-deps/archive/refs/tags/tk-9.0.4.1.tar.gz",
       "externalRefs": [
         {
           "referenceCategory": "SECURITY",
-          "referenceLocator": "cpe:2.3:a:tcl_tk:tcl_tk:9.0.3.1:*:*:*:*:*:*:*",
+          "referenceLocator": "cpe:2.3:a:tcl_tk:tcl_tk:9.0.4.1:*:*:*:*:*:*:*",
           "referenceType": "cpe23Type"
         }
       ],
       "licenseConcluded": "NOASSERTION",
       "name": "tk",
       "primaryPackagePurpose": "SOURCE",
-      "versionInfo": "9.0.3.1"
+      "versionInfo": "9.0.4.1"
     },
     {
       "SPDXID": "SPDXRef-PACKAGE-xz",

diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 47399fe65d1e542dcb3f0aeb09ad96d64b273366..6bedd21299a73e9c01136f3d2d1efc44b5d13117 100644 (file)
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -57,8 +57,8 @@ if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries%  libffi-3.4.4
 if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries%     openssl-3.5.7
 set libraries=%libraries%                                       mpdecimal-4.0.0
 set libraries=%libraries%                                       sqlite-3.53.2.0
-if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-9.0.3.0
-if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-9.0.3.1
+if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-9.0.4.0
+if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-9.0.4.1
 set libraries=%libraries%                                       xz-5.8.1.1
 set libraries=%libraries%                                       zlib-ng-2.2.4
 set libraries=%libraries%                                       zstd-1.5.7
@@ -80,7 +80,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.5.7
-if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-9.0.3.0
+if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-9.0.4.0
 if NOT "%IncludeSSLSrc%"=="false"  set binaries=%binaries% nasm-2.11.06
 if NOT "%IncludeLLVM%"=="false"    set binaries=%binaries% llvm-21.1.4.0
 

diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 7c5eab2eb75a1def70c1724fa87a189aeea0e2fc..7739264f56ccc2759e5bd21a604d38bcd02009e2 100644 (file)
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -247,7 +247,7 @@ _sqlite3
         https://www.sqlite.org/
 
 _tkinter
-    Wraps version 9.0.3 of the Tk windowing system, which is downloaded
+    Wraps version 9.0.4 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 28e8c0db4d1eafd0122ef212aab3cfa2610bc6da..1d6b4f57f09f747bf6f12ccbe9e5346992af24b5 100644 (file)
--- 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) == ''">9.0.3.0</TclVersion>
+    <TclVersion Condition="$(TclVersion) == ''">9.0.4.0</TclVersion>
     <TkVersion Condition="$(TkVersion) == ''">$(TclVersion)</TkVersion>
     <TclMajorVersion>$([System.Version]::Parse($(TclVersion)).Major)</TclMajorVersion>
     <TclMinorVersion>$([System.Version]::Parse($(TclVersion)).Minor)</TclMinorVersion>