From c349f9b91c06d70329bf4f8b7810457436194a56 Mon Sep 17 00:00:00 2001
From: Zanie Blue <contact@zanie.dev>
Date: Tue, 11 Feb 2025 16:49:35 -0600
Subject: [PATCH] Drop 8612 special case

---
 cpython-windows/build.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/cpython-windows/build.py b/cpython-windows/build.py
index 087f3fc9..394e6578 100644
--- a/cpython-windows/build.py
+++ b/cpython-windows/build.py
@@ -114,7 +114,7 @@
     "_lzma": ["xz"],
     "_sqlite3": ["sqlite"],
     "_ssl": ["openssl"],
-    "_tkinter": ["tcl-8612", "tk-8612", "tix"],
+    "_tkinter": ["tcl", "tk", "tix"],
     "_uuid": ["uuid"],
     "zlib": ["zlib"],
 }
@@ -362,7 +362,7 @@ def hack_props(
     if meets_python_minimum_version(python_version, "3.14"):
         tcltk_commit = DOWNLOADS["tk-windows-bin"]["git_commit"]
     else:
-        tcltk_commit = DOWNLOADS["tk-windows-bin-8612"]["git_commit"]
+        tcltk_commit = DOWNLOADS["tk-windows-bin"]["git_commit"]
 
     sqlite_path = td / ("sqlite-autoconf-%s" % sqlite_version)
     bzip2_path = td / ("bzip2-%s" % bzip2_version)
@@ -1138,10 +1138,6 @@ def find_additional_dependencies(project: pathlib.Path):
                 if name == "openssl":
                     name = openssl_entry
 
-                # On 3.14+, we use the latest tcl/tk version
-                if ext == "_tkinter" and python_majmin == "314":
-                    name = name.replace("-8612", "")
-
                 download_entry = DOWNLOADS[name]
 
                 # This will raise if no license metadata defined. This is
@@ -1230,7 +1226,7 @@ def build_cpython(
         )
     else:
         tk_bin_archive = download_entry(
-            "tk-windows-bin-8612", BUILD, local_name="tk-windows-bin.tar.gz"
+            "tk-windows-bin", BUILD, local_name="tk-windows-bin.tar.gz"
         )
 
     # CPython 3.13+ no longer uses a bundled `mpdecimal` version so we build it