downloads: update tcl/tk to 8.6.12 / remove tix on macOS

As part of the upgrade, tix stopped compiling on macOS due to compiler
errors. What the root cause is I'm not sure. It is probably possible
to work around. However, as part of investigating this I noticed that
the official Python macOS pkg installers don't ship the tix tcl files.
And the `tkinter.tix` module has been deprecated since Python 3.6. So
I think it is acceptable to drop support for tix on macOS.

Author: indygreg

cpython-unix/Makefile

@@ -256,6 +256,8 @@ PYTHON_DEPENDS := \
     $(if $(NEED_PATCHELF),$(OUTDIR)/patchelf-$(PATCHELF_VERSION)-$(PACKAGE_SUFFIX).tar) \
     $(if $(NEED_READLINE),$(OUTDIR)/readline-$(READLINE_VERSION)-$(PACKAGE_SUFFIX).tar) \
     $(if $(NEED_SQLITE),$(OUTDIR)/sqlite-$(SQLITE_VERSION)-$(PACKAGE_SUFFIX).tar) \
+    $(if $(NEED_TCL),$(OUTDIR)/tcl-$(TCL_VERSION)-$(PACKAGE_SUFFIX).tar) \
+    $(if $(NEED_TK),$(OUTDIR)/tk-$(TK_VERSION)-$(PACKAGE_SUFFIX).tar) \
     $(if $(NEED_TIX),$(OUTDIR)/tix-$(TIX_VERSION)-$(PACKAGE_SUFFIX).tar) \
     $(if $(NEED_UUID),$(OUTDIR)/uuid-$(UUID_VERSION)-$(PACKAGE_SUFFIX).tar) \
     $(if $(NEED_XZ),$(OUTDIR)/xz-$(XZ_VERSION)-$(PACKAGE_SUFFIX).tar) \

cpython-unix/build-cpython.sh

@@ -1141,9 +1141,13 @@ 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/{tcl8,tcl8.6,thread2.8.5,Tix8.4.3,tk8.6}; do
+    for source in ${TOOLS_PATH}/deps/lib/{itcl4.2.2,tcl8,tcl8.6,thread2.8.7,tk8.6}; do
         cp -av $source ${ROOT}/out/python/install/lib/
     done
+
+    if [ "${PYBUILD_PLATFORM}" != "macos" ]; then
+        cp -av ${TOOLS_PATH}/deps/lib/Tix8.4.3 ${ROOT}/out/python/install/lib/
+    fi
 fi
 
 # config.c defines _PyImport_Inittab and extern references to modules, which

cpython-unix/build-tcl.sh

@@ -17,15 +17,15 @@ patch -p1 << 'EOF'
 diff --git a/unix/Makefile.in b/unix/Makefile.in
 --- a/unix/Makefile.in
 +++ b/unix/Makefile.in
-@@ -1724,7 +1724,7 @@ configure-packages:
- 		  $$i/configure --with-tcl=../.. \
- 		      --with-tclinclude=$(GENERIC_DIR) \
- 		      $(PKG_CFG_ARGS) --libdir=$(PACKAGE_DIR) \
--		      --enable-shared --enable-threads; ) || exit $$?; \
-+		      --enable-shared=no --enable-threads; ) || exit $$?; \
- 	      fi; \
+@@ -1813,7 +1813,7 @@ configure-packages:
+ 			  $$i/configure --with-tcl=../.. \
+ 			      --with-tclinclude=$(GENERIC_DIR) \
+ 			      $(PKG_CFG_ARGS) --libdir=$(PACKAGE_DIR) \
+-			      --enable-shared --enable-threads; ) || exit $$?; \
++			      --enable-shared=no --enable-threads; ) || exit $$?; \
+ 		    fi; \
+ 		fi; \
  	    fi; \
- 	  fi; \
 EOF
 
 # Remove packages we don't care about and can pull in unwanted symbols.
@@ -47,4 +47,4 @@ make -j ${NUM_CPUS} install DESTDIR=${ROOT}/out
 make -j ${NUM_CPUS} install-private-headers DESTDIR=${ROOT}/out
 
 # For some reason libtcl*.a have weird permissions. Fix that.
-chmod 644 ${ROOT}/out/tools/deps/lib/libtcl*.a
+chmod 644 ${ROOT}/out/tools/deps/lib/libtcl*.a

cpython-unix/build-tk.sh

@@ -12,7 +12,7 @@ export PKG_CONFIG_PATH=${TOOLS_PATH}/deps/share/pkgconfig:${TOOLS_PATH}/deps/lib
 
 tar -xf tk${TK_VERSION}-src.tar.gz
 
-pushd tk${TK_VERSION}/unix
+pushd tk*/unix
 
 CFLAGS="${EXTRA_TARGET_CFLAGS} -fPIC"
 LDFLAGS="${EXTRA_TARGET_LDFLAGS}"

cpython-unix/build.py

@@ -916,13 +916,16 @@ def build_cpython(
 
         python_info["tcl_library_path"] = "install/lib"
         python_info["tcl_library_paths"] = [
+            "itcl4.2.2",
             "tcl8",
             "tcl8.6",
-            "thread2.8.5",
-            "Tix8.4.3",
+            "thread2.8.7",
             "tk8.6",
         ]
 
+        if "-apple" not in target_triple:
+            python_info["tcl_library_paths"].append("Tix8.4.3")
+
         if "-apple" in target_triple:
             python_info["apple_sdk_platform"] = env["APPLE_SDK_PLATFORM"]
             python_info["apple_sdk_version"] = env["APPLE_SDK_VERSION"]

cpython-unix/targets.yml

@@ -88,7 +88,6 @@ aarch64-apple-darwin:
     - sqlite
     - tcl
     - tk
-    - tix
     - uuid
     - xz
     - zlib
@@ -489,7 +488,6 @@ x86_64-apple-darwin:
     - sqlite
     - tcl
     - tk
-    - tix
     - uuid
     - xz
     - zlib

docs/quirks.rst

@@ -143,6 +143,21 @@ run time, the ``TCL_LIBRARY`` environment variable is set from within
 the process before the Python interpreter is initialized. This ensures the
 ``.tcl`` files from the Python distribution are used.
 
+.. _quirk_macos_no_tix:
+
+No tix on macOS
+===============
+
+macOS distributions do not contain tix tcl support files. This means that
+``tkinter.tix`` module functionality will likely break at run-time. The
+module will import fine. But attempting to instantiate a ``tkinter.tix.Tk``
+instance or otherwise attempt to run tix tcl files will result in a run-time
+error.
+
+``tkinter.tix`` has been deprecated since Python 3.6 and the official Python
+macOS installers do not ship the tix support files. So this project behaves
+similarly to the official CPython distributions.
+
 .. _quirk_windows_no_pip:
 
 No ``pip.exe`` on Windows

pythonbuild/downloads.py

@@ -308,10 +308,10 @@
         "version": "5.28.1.1",
     },
     "tcl": {
-        "url": "https://prdownloads.sourceforge.net/tcl/tcl8.6.10-src.tar.gz",
-        "size": 10144235,
-        "sha256": "5196dbf6638e3df8d5c87b5815c8c2b758496eb6f0e41446596c9a4e638d87ed",
-        "version": "8.6.10",
+        "url": "https://prdownloads.sourceforge.net/tcl/tcl8.6.12-src.tar.gz",
+        "size": 10353486,
+        "sha256": "26c995dd0f167e48b11961d891ee555f680c175f7173ff8cb829f4ebcde4c1a6",
+        "version": "8.6.12",
         "library_names": ["tcl8.6"],
         "licenses": ["TCL"],
         "license_file": "LICENSE.tcl.txt",
@@ -325,20 +325,20 @@
         "license_file": "LICENSE.tix.txt",
     },
     "tk": {
-        "url": "https://prdownloads.sourceforge.net/tcl/tk8.6.10-src.tar.gz",
-        "size": 4444764,
-        "sha256": "63df418a859d0a463347f95ded5cd88a3dd3aaa1ceecaeee362194bc30f3e386",
-        "version": "8.6.10",
+        "url": "https://prdownloads.sourceforge.net/tcl/tk8.6.12-src.tar.gz",
+        "size": 4515393,
+        "sha256": "12395c1f3fcb6bed2938689f797ea3cdf41ed5cb6c4766eec8ac949560310630",
+        "version": "8.6.12",
         "library_names": ["tk8.6"],
         "licenses": ["TCL"],
         "license_file": "LICENSE.tcl.txt",
     },
     "tk-windows-bin": {
-        "url": "https://github.com/python/cpython-bin-deps/archive/86027ce3edda1284ae4bf6c2c580288366af4052.tar.gz",
-        "size": 7162470,
-        "sha256": "34400f7b76a13389a475fc1a4d6e33d5ca21dda6f6ff11b04759865814bdf3d2",
-        "version": "6.6.9",
-        "git_commit": "86027ce3edda1284ae4bf6c2c580288366af4052",
+        "url": "https://github.com/python/cpython-bin-deps/archive/e3c3e9a2856124aa32b608632a52742d479eb7a9.tar.gz",
+        "size": 6787654,
+        "sha256": "01ad9c663659224e075d487cbc33ea2fed7a225593965b79bed92ca7f79b676f",
+        "version": "8.6.12",
+        "git_commit": "e3c3e9a2856124aa32b608632a52742d479eb7a9",
     },
     "uuid": {
         "url": "https://sourceforge.net/projects/libuuid/files/libuuid-1.0.3.tar.gz",