From 099d72a89493bcbf1b7809dd35395712c0bab9bc Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gregory.szorc@gmail.com>
Date: Sat, 24 Aug 2024 14:08:16 -0700
Subject: [PATCH] tcl/tk: upgrade from 8.6.12 -> 8.6.14

Let's stay modern.

Should address #296.
---
 cpython-unix/build-cpython.sh |  2 +-
 cpython-unix/build.py         |  4 ++--
 pythonbuild/downloads.py      | 24 ++++++++++++------------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/cpython-unix/build-cpython.sh b/cpython-unix/build-cpython.sh
index 87225429..a4e0f371 100755
--- a/cpython-unix/build-cpython.sh
+++ b/cpython-unix/build-cpython.sh
@@ -869,7 +869,7 @@ if [ -d "${TOOLS_PATH}/deps/lib/tcl8" ]; then
     # Copy tcl/tk/tix resources needed by tkinter.
     mkdir ${ROOT}/out/python/install/lib/tcl
     # Keep this list in sync with tcl_library_paths.
-    for source in ${TOOLS_PATH}/deps/lib/{itcl4.2.2,tcl8,tcl8.6,thread2.8.7,tk8.6}; do
+    for source in ${TOOLS_PATH}/deps/lib/{itcl4.2.4,tcl8,tcl8.6,thread2.8.9,tk8.6}; do
         cp -av $source ${ROOT}/out/python/install/lib/
     done
 
diff --git a/cpython-unix/build.py b/cpython-unix/build.py
index ccea702c..c396a5e9 100755
--- a/cpython-unix/build.py
+++ b/cpython-unix/build.py
@@ -859,10 +859,10 @@ def build_cpython(
 
         python_info["tcl_library_path"] = "install/lib"
         python_info["tcl_library_paths"] = [
-            "itcl4.2.2",
+            "itcl4.2.4",
             "tcl8",
             "tcl8.6",
-            "thread2.8.7",
+            "thread2.8.79",
             "tk8.6",
         ]
 
diff --git a/pythonbuild/downloads.py b/pythonbuild/downloads.py
index ae46a85d..ceb369c5 100644
--- a/pythonbuild/downloads.py
+++ b/pythonbuild/downloads.py
@@ -298,10 +298,10 @@
         "version": "5.28.1.1",
     },
     "tcl": {
-        "url": "https://prdownloads.sourceforge.net/tcl/tcl8.6.12-src.tar.gz",
-        "size": 10353486,
-        "sha256": "26c995dd0f167e48b11961d891ee555f680c175f7173ff8cb829f4ebcde4c1a6",
-        "version": "8.6.12",
+        "url": "https://prdownloads.sourceforge.net/tcl/tcl8.6.14-src.tar.gz",
+        "size": 11627322,
+        "sha256": "5880225babf7954c58d4fb0f5cf6279104ce1cd6aa9b71e9a6322540e1c4de66",
+        "version": "8.6.14",
         "library_names": ["tcl8.6"],
         "licenses": ["TCL"],
         "license_file": "LICENSE.tcl.txt",
@@ -315,19 +315,19 @@
         "license_file": "LICENSE.tix.txt",
     },
     "tk": {
-        "url": "https://prdownloads.sourceforge.net/tcl/tk8.6.12-src.tar.gz",
-        "size": 4515393,
-        "sha256": "12395c1f3fcb6bed2938689f797ea3cdf41ed5cb6c4766eec8ac949560310630",
-        "version": "8.6.12",
+        "url": "https://prdownloads.sourceforge.net/tcl/tk8.6.14-src.tar.gz",
+        "size": 4510695,
+        "sha256": "8ffdb720f47a6ca6107eac2dd877e30b0ef7fac14f3a84ebbd0b3612cee41a94",
+        "version": "8.6.14",
         "library_names": ["tk8.6"],
         "licenses": ["TCL"],
         "license_file": "LICENSE.tcl.txt",
     },
     "tk-windows-bin": {
-        "url": "https://github.com/python/cpython-bin-deps/archive/e3c3e9a2856124aa32b608632a52742d479eb7a9.tar.gz",
-        "size": 6787654,
-        "sha256": "01ad9c663659224e075d487cbc33ea2fed7a225593965b79bed92ca7f79b676f",
-        "version": "8.6.12",
+        "url": "https://github.com/python/cpython-bin-deps/archive/c624cc881bd0e5071dec9de4b120cbe9985d8c14.tar.gz",
+        "size": 9497943,
+        "sha256": "9b8e77d55f40ceaedd140ccca0daa804f0d43346d5abfcead9b547b5590f82f8",
+        "version": "8.6.14",
         "git_commit": "e3c3e9a2856124aa32b608632a52742d479eb7a9",
     },
     "uuid": {