From 76afd3a799b31a993aef780085be7f51aa58491b Mon Sep 17 00:00:00 2001
From: Jonathan Helmus <jjhelmus@gmail.com>
Date: Wed, 14 Jan 2026 16:11:51 -0600
Subject: [PATCH] Fix int types in _tkinter for Python 3.10

The Split, SplitObj and _tkinter_tkapp_split function require the use of
Tcl_Size for the size of argument lists. Adjust the patch to account for
this.

closes #948
---
 cpython-unix/build-cpython.sh                 |  1 +
 .../patch-tkinter-backport-tcl-9-310.patch    | 38 ++++++++++++++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/cpython-unix/build-cpython.sh b/cpython-unix/build-cpython.sh
index c590e2fd..03ccf624 100755
--- a/cpython-unix/build-cpython.sh
+++ b/cpython-unix/build-cpython.sh
@@ -292,6 +292,7 @@ fi
 if [ "${PYTHON_MAJMIN_VERSION}" = "3.10" ]; then
     # git checkout v3.10.19
     # git cherry-pick 625887e6 27cbeb08 d4680b9e ec139c8f
+    # manually change int argc/objc -> Tcl_Size argc/objc in file
     # git diff v3.10.19 Modules/_tkinter.c > patch-tkinter-backport-tcl-9-310.patch
     patch -p1 -i ${ROOT}/patch-tkinter-backport-tcl-9-310.patch
 fi
diff --git a/cpython-unix/patch-tkinter-backport-tcl-9-310.patch b/cpython-unix/patch-tkinter-backport-tcl-9-310.patch
index 85e22687..fc9c5e31 100644
--- a/cpython-unix/patch-tkinter-backport-tcl-9-310.patch
+++ b/cpython-unix/patch-tkinter-backport-tcl-9-310.patch
@@ -1,5 +1,5 @@
 diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
-index 2a3e65b6c97..8bed45f933d 100644
+index 2a3e65b6c97..d601a2b7c2a 100644
 --- a/Modules/_tkinter.c
 +++ b/Modules/_tkinter.c
 @@ -55,9 +55,24 @@ Copyright (C) 1994 Steen Lumholt.
@@ -44,6 +44,33 @@ index 2a3e65b6c97..8bed45f933d 100644
  #if USE_TCL_UNICODE
      int byteorder = NATIVE_BYTEORDER;
      const Tcl_UniChar *u = Tcl_GetUnicodeFromObj(value, &len);
+@@ -510,7 +526,7 @@ unicodeFromTclObj(Tcl_Obj *value)
+ static PyObject *
+ Split(const char *list)
+ {
+-    int argc;
++    Tcl_Size argc;
+     const char **argv;
+     PyObject *v;
+ 
+@@ -612,7 +628,7 @@ SplitObj(PyObject *arg)
+         return result;
+     }
+     else if (PyUnicode_Check(arg)) {
+-        int argc;
++        Tcl_Size argc;
+         const char **argv;
+         const char *list = PyUnicode_AsUTF8(arg);
+ 
+@@ -627,7 +643,7 @@ SplitObj(PyObject *arg)
+         /* Fall through, returning arg. */
+     }
+     else if (PyBytes_Check(arg)) {
+-        int argc;
++        Tcl_Size argc;
+         const char **argv;
+         const char *list = PyBytes_AS_STRING(arg);
+ 
 @@ -655,6 +671,10 @@ class _tkinter.tktimertoken "TkttObject *" "&Tktt_Type_spec"
  
  /**** Tkapp Object ****/
@@ -275,3 +302,12 @@ index 2a3e65b6c97..8bed45f933d 100644
          Tcl_Obj **objv;
          if (Tcl_ListObjGetElements(Tkapp_Interp(self),
                                     ((PyTclObject*)arg)->value,
+@@ -2365,7 +2405,7 @@ _tkinter_tkapp_split(TkappObject *self, PyObject *arg)
+ 
+     if (PyTclObject_Check(arg)) {
+         Tcl_Obj *value = ((PyTclObject*)arg)->value;
+-        int objc;
++        Tcl_Size objc;
+         Tcl_Obj **objv;
+         int i;
+         if (Tcl_ListObjGetElements(Tkapp_Interp(self), value,