python v3.11.2 (#624)

github-actions[bot] · web-flow · commit 3c52295866de · 2023-03-31T17:33:09.000Z
automerged PR by conda-forge/automerge-action
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "3.11.1" %}
+{% set version = "3.11.2" %}
 {% set dev = "" %}
 {% set dev_ = "" %}
 {% set ver2 = '.'.join(version.split('.')[0:2]) %}
@@ -46,7 +46,7 @@ source:
 {% else %}
   - url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz
     # md5 from: https://www.python.org/downloads/release/python-{{ ver3nd }}/
-    md5: 4efe92adf28875c77d3b9b2e8d3bc44a
+    md5: a957cffb58a89303b62124896881950b
 {% endif %}
     patches:
       - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
diff --git a/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch b/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
@@ -1,7 +1,7 @@
-From 7410c153983339ee3f6d410159e665aa9f23095b Mon Sep 17 00:00:00 2001
+From 2d4519f2e2aa9e9def4a37ca92fe317cc2a3d2cb Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Wed, 16 Aug 2017 11:53:55 +0100
-Subject: [PATCH 01/24] Win32: Change FD_SETSIZE from 512 to 2048
+Subject: [PATCH 01/25] Win32: Change FD_SETSIZE from 512 to 2048
 
 https://github.com/ContinuumIO/anaconda-issues/issues/1241
 ---
diff --git a/recipe/patches/0002-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch b/recipe/patches/0002-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch
@@ -1,7 +1,7 @@
-From a55a5df61ef1c947138b6b1533d298acde1379e5 Mon Sep 17 00:00:00 2001
+From acdaf595fb0e744a49fc69f9986d385a3b64f70b Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Wed, 16 Aug 2017 11:59:00 +0100
-Subject: [PATCH 02/24] Win32: distutils: Add support to cygwinccompiler for
+Subject: [PATCH 02/25] Win32: distutils: Add support to cygwinccompiler for
  VS>=2015
 
 Really this is for mingw-w64 though
diff --git a/recipe/patches/0003-bpo-45258-search-for-isysroot-in-addition-to-sysroot.patch b/recipe/patches/0003-bpo-45258-search-for-isysroot-in-addition-to-sysroot.patch
@@ -1,7 +1,7 @@
-From f5077412192981ccb8527ad35921f274f5666c67 Mon Sep 17 00:00:00 2001
+From c27448713e69e2ae75fc687e0b5acb0051416a05 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Tue, 21 Sep 2021 13:05:20 -0500
-Subject: [PATCH 03/24] bpo-45258: search for -isysroot in addition to
+Subject: [PATCH 03/25] bpo-45258: search for -isysroot in addition to
  --sysroot
 
 -isysroot is for macOS, while --sysroot is for gcc/linux
@@ -10,7 +10,7 @@ Subject: [PATCH 03/24] bpo-45258: search for -isysroot in addition to
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index 15d0d4576a..a15a7a46e0 100644
+index 4f122b62e0..87f76ad41b 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -166,7 +166,7 @@ def sysroot_paths(make_vars, subdirs):
diff --git a/recipe/patches/0004-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch b/recipe/patches/0004-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch
@@ -1,7 +1,7 @@
-From b99eb0ecf7beb3ccbeceaed4ac75ce74584f17be Mon Sep 17 00:00:00 2001
+From 9e321116c7fdfcd959fd54918610a7ae236a2728 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Thu, 5 Oct 2017 02:00:41 +0100
-Subject: [PATCH 04/24] runtime_library_dir_option: Use 1st word of CC as
+Subject: [PATCH 04/25] runtime_library_dir_option: Use 1st word of CC as
  compiler
 
 Previous, 'CC' got passed to os.path.basename, so any paths in it after
diff --git a/recipe/patches/0005-Win32-Do-not-download-externals.patch b/recipe/patches/0005-Win32-Do-not-download-externals.patch
@@ -1,7 +1,7 @@
-From af84a62e267b02dc48675fc4b88ba0a3a5dc3c73 Mon Sep 17 00:00:00 2001
+From 650da7b35876371b760416d78e132601f4c43401 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Thu, 7 Sep 2017 11:35:47 +0100
-Subject: [PATCH 05/24] Win32: Do not download externals
+Subject: [PATCH 05/25] Win32: Do not download externals
 
 ---
  PCbuild/build.bat | 2 +-
diff --git a/recipe/patches/0006-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch b/recipe/patches/0006-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch
@@ -1,7 +1,7 @@
-From d8841e83026738e17ad0801b2bf458fa9cfe2117 Mon Sep 17 00:00:00 2001
+From 2325fcc6109a22975d582421c8cc2f2a77c4a193 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Tue, 5 Dec 2017 22:47:59 +0000
-Subject: [PATCH 06/24] Fix find_library so that it looks in sys.prefix/lib
+Subject: [PATCH 06/25] Fix find_library so that it looks in sys.prefix/lib
  first
 
 ---
diff --git a/recipe/patches/0007-bpo-22699-Allow-compiling-on-debian-ubuntu-with-a-di.patch b/recipe/patches/0007-bpo-22699-Allow-compiling-on-debian-ubuntu-with-a-di.patch
@@ -1,7 +1,7 @@
-From 8e25c153ba04342fb2d4a58c95ba0b3bf45f5514 Mon Sep 17 00:00:00 2001
+From 04bcc1556e446cf9ea9de03afd50e4bf47ba275b Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Thu, 16 Sep 2021 15:46:09 -0500
-Subject: [PATCH 07/24] bpo-22699: Allow compiling on debian/ubuntu with a
+Subject: [PATCH 07/25] bpo-22699: Allow compiling on debian/ubuntu with a
  different compiler
 
 This PR fixes one issue mentioned in the bpo
@@ -12,7 +12,7 @@ patch than given
  1 file changed, 22 insertions(+), 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index a15a7a46e0..25fc167722 100644
+index 87f76ad41b..95ee953e0e 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -687,9 +687,30 @@ def check_extension_import(self, ext):
diff --git a/recipe/patches/0008-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch b/recipe/patches/0008-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch
@@ -1,7 +1,7 @@
-From 63865ca253725962c588738c597843b5e3fe6040 Mon Sep 17 00:00:00 2001
+From 1620d788f86c2c010b720818357ba67917a867e3 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Sat, 27 Oct 2018 18:48:30 +0100
-Subject: [PATCH 08/24] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
+Subject: [PATCH 08/25] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
  is not 0
 
 Co-authored-by: Isuru Fernando<isuruf@gmail.com>
@@ -23,7 +23,7 @@ index ceacf36d89..a3d34da30a 100644
          !progname_to_dict(dict, "real_executable") ||
          !library_to_dict(dict, "library") ||
 diff --git a/Modules/getpath.py b/Modules/getpath.py
-index fc533a8f5f..d662dc1576 100644
+index 74f918cf28..0726b9932c 100644
 --- a/Modules/getpath.py
 +++ b/Modules/getpath.py
 @@ -51,6 +51,7 @@
@@ -34,7 +34,7 @@ index fc533a8f5f..d662dc1576 100644
  
  # ** Values calculated at runtime **
  # config            -- [in/out] dict of the PyConfig structure
-@@ -685,7 +686,7 @@ def search_up(prefix, *landmarks, test=isfile):
+@@ -673,7 +674,7 @@ def search_up(prefix, *landmarks, test=isfile):
      else:
          pythonpath.append(joinpath(prefix, ZIP_LANDMARK))
  
diff --git a/recipe/patches/0009-Unvendor-openssl.patch b/recipe/patches/0009-Unvendor-openssl.patch
@@ -1,7 +1,7 @@
-From 3bc5a526cca2674b04e88b077bd6bd4a42c78bab Mon Sep 17 00:00:00 2001
+From 48cc906aa668d9e022f05900e92fd9499dbb4781 Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Sat, 24 Nov 2018 20:38:02 -0600
-Subject: [PATCH 09/24] Unvendor openssl
+Subject: [PATCH 09/25] Unvendor openssl
 
 Co-authored-by: Isuru Fernando <isuruf@gmail.com>
 ---
@@ -146,17 +146,17 @@ index 0da6f67495..17eee400eb 100644
    <Target Name="CleanAll">
      <Delete Files="$(TargetPath);$(BuildPath)$(tclDLLName)" />
 diff --git a/PCbuild/python.props b/PCbuild/python.props
-index 320d41f4cc..512104969e 100644
+index 57360e57ba..f1ecc5bfcd 100644
 --- a/PCbuild/python.props
 +++ b/PCbuild/python.props
-@@ -59,6 +59,7 @@
- 
-     <!-- Directories of external projects. tcltk is handled in tcltk.props -->
-     <ExternalsDir>$(EXTERNALS_DIR)</ExternalsDir>
+@@ -61,6 +61,7 @@
+   <!-- Directories of external projects. tcltk is handled in tcltk.props -->
+   <PropertyGroup>
+     <ExternalsDir Condition="$(ExternalsDir) == ''">$(EXTERNALS_DIR)</ExternalsDir>
 +    <condaDir>$(LIBRARY_PREFIX)\</condaDir>
      <ExternalsDir Condition="$(ExternalsDir) == ''">$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`))</ExternalsDir>
      <ExternalsDir Condition="!HasTrailingSlash($(ExternalsDir))">$(ExternalsDir)\</ExternalsDir>
-     <sqlite3Dir>$(ExternalsDir)sqlite-3.39.4.0\</sqlite3Dir>
+   </PropertyGroup>
 diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj
 index d07db3a681..5f2356cb36 100644
 --- a/PCbuild/python.vcxproj
diff --git a/recipe/patches/0010-Unvendor-sqlite3.patch b/recipe/patches/0010-Unvendor-sqlite3.patch
@@ -1,7 +1,7 @@
-From db911efb5ebb8a0d410748aa4e89b2d080e5d1a6 Mon Sep 17 00:00:00 2001
+From 6ae7d9dfc7bdeb0eb90ceabc0dcd3b3ff54948d1 Mon Sep 17 00:00:00 2001
 From: Nehal J Wani <nehaljw.kkd1@gmail.com>
 Date: Tue, 5 Oct 2021 12:42:06 -0700
-Subject: [PATCH 10/24] Unvendor sqlite3
+Subject: [PATCH 10/25] Unvendor sqlite3
 
 ---
  PCbuild/_sqlite3.vcxproj | 11 +++++------
diff --git a/recipe/patches/0011-Use-ranlib-from-env-if-env-variable-is-set.patch b/recipe/patches/0011-Use-ranlib-from-env-if-env-variable-is-set.patch
@@ -1,7 +1,7 @@
-From 34c2bfc817cd34611b16af45e48fd2b94f95ccb0 Mon Sep 17 00:00:00 2001
+From 7ecb46f4e4974455cc6e06a8b61d6dc234b820a3 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Sun, 3 Nov 2019 15:09:45 -0600
-Subject: [PATCH 11/24] Use ranlib from env if env variable is set
+Subject: [PATCH 11/25] Use ranlib from env if env variable is set
 
 ---
  Lib/distutils/sysconfig.py | 3 +++
diff --git a/recipe/patches/0012-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0012-Add-CondaEcosystemModifyDllSearchPath.patch
@@ -1,7 +1,7 @@
-From 5ba27151bea43c756917868c336a42d36e73c3b6 Mon Sep 17 00:00:00 2001
+From 63157df417c2fd9bc42509788c06d0182b99edbe Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Tue, 24 Dec 2019 18:37:17 +0100
-Subject: [PATCH 12/24] Add CondaEcosystemModifyDllSearchPath()
+Subject: [PATCH 12/25] Add CondaEcosystemModifyDllSearchPath()
 
   The python interpreter is modifed so that it works as if the python interpreter
   was called with the following conda directories.
diff --git a/recipe/patches/0013-Add-d1trimfile-SRC_DIR-to-make-pdbs-more-relocatable.patch b/recipe/patches/0013-Add-d1trimfile-SRC_DIR-to-make-pdbs-more-relocatable.patch
@@ -1,7 +1,7 @@
-From bacab11e6038d76a26674fe132aa7881d1180208 Mon Sep 17 00:00:00 2001
+From 2b2d0872fd52ce344d0dd1b653d461c6daa66e78 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Tue, 31 Dec 2019 20:46:36 +0100
-Subject: [PATCH 13/24] Add /d1trimfile:%SRC_DIR% to make pdbs more relocatable
+Subject: [PATCH 13/25] Add /d1trimfile:%SRC_DIR% to make pdbs more relocatable
 
 ---
  Lib/distutils/_msvccompiler.py | 9 ++++++++-
diff --git a/recipe/patches/0014-Doing-d1trimfile.patch b/recipe/patches/0014-Doing-d1trimfile.patch
@@ -1,7 +1,7 @@
-From dbb6e8ecf76346337151028069b328a5d0d909d3 Mon Sep 17 00:00:00 2001
+From c31ae7d27dfb867f022dee5ba800e577ef3c906e Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Tue, 31 Dec 2019 21:47:47 +0100
-Subject: [PATCH 14/24] Doing d1trimfile
+Subject: [PATCH 14/25] Doing d1trimfile
 
 ---
  PCbuild/_asyncio.vcxproj            | 20 ++++++++++++++++++++
diff --git a/recipe/patches/0015-cross-compile-darwin.patch b/recipe/patches/0015-cross-compile-darwin.patch
@@ -1,7 +1,7 @@
-From 8054e8b69c76a9db3cd083b100d5a81f447431cc Mon Sep 17 00:00:00 2001
+From a4e1504dda93eeafc3932ff00bbb5d509ca92314 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Fri, 2 Oct 2020 00:03:12 +0200
-Subject: [PATCH 15/24] cross compile darwin
+Subject: [PATCH 15/25] cross compile darwin
 
 By Isuru Fernando.
 ---
@@ -12,10 +12,10 @@ By Isuru Fernando.
  4 files changed, 17 insertions(+), 6 deletions(-)
 
 diff --git a/Lib/platform.py b/Lib/platform.py
-index 9e9f3af3ce..e04cac72ad 100755
+index 9b9d88bf58..9b2807d61f 100755
 --- a/Lib/platform.py
 +++ b/Lib/platform.py
-@@ -413,7 +413,12 @@ def win32_ver(release='', version='', csd='', ptype=''):
+@@ -414,7 +414,12 @@ def win32_ver(release='', version='', csd='', ptype=''):
  def _mac_ver_xml():
      fn = '/System/Library/CoreServices/SystemVersion.plist'
      if not os.path.exists(fn):
@@ -30,10 +30,10 @@ index 9e9f3af3ce..e04cac72ad 100755
      try:
          import plistlib
 diff --git a/configure b/configure
-index 9567ac3a62..f1bfe4790b 100755
+index 9e76287725..57b2fad82d 100755
 --- a/configure
 +++ b/configure
-@@ -3874,6 +3874,9 @@ if test "$cross_compiling" = yes; then
+@@ -3876,6 +3876,9 @@ if test "$cross_compiling" = yes; then
  			_host_cpu=$host_cpu
  		esac
  		;;
@@ -43,7 +43,7 @@ index 9567ac3a62..f1bfe4790b 100755
  	*-*-cygwin*)
  		_host_cpu=
  		;;
-@@ -7207,7 +7210,7 @@ esac
+@@ -7209,7 +7212,7 @@ esac
    fi
  fi
  
@@ -53,7 +53,7 @@ index 9567ac3a62..f1bfe4790b 100755
  	readelf|:)
  	as_fn_error $? "readelf for the host is required for cross builds" "$LINENO" 5
 diff --git a/configure.ac b/configure.ac
-index 90008bcae1..24ed6fb365 100644
+index c62a565eb6..229d5593ea 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -597,6 +597,9 @@ if test "$cross_compiling" = yes; then
@@ -76,7 +76,7 @@ index 90008bcae1..24ed6fb365 100644
  	readelf|:)
  	AC_MSG_ERROR([readelf for the host is required for cross builds])
 diff --git a/setup.py b/setup.py
-index 25fc167722..1a354d5bd4 100644
+index 95ee953e0e..3288fea376 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -81,7 +81,7 @@ def get_platform():
@@ -88,7 +88,7 @@ index 25fc167722..1a354d5bd4 100644
  AIX = (HOST_PLATFORM.startswith('aix'))
  VXWORKS = ('vxworks' in HOST_PLATFORM)
  EMSCRIPTEN = HOST_PLATFORM == 'emscripten-wasm32'
-@@ -1067,11 +1067,11 @@ def detect_readline_curses(self):
+@@ -1070,11 +1070,11 @@ def detect_readline_curses(self):
                  readline_lib = 'readline'
              do_readline = self.compiler.find_library_file(self.lib_dirs,
                  readline_lib)
diff --git a/recipe/patches/0016-Fix-TZPATH-on-windows.patch b/recipe/patches/0016-Fix-TZPATH-on-windows.patch
@@ -1,7 +1,7 @@
-From b9ff5de5a34ab9c802a24f12c01fe01aa332b4a2 Mon Sep 17 00:00:00 2001
+From 768e5148f432931e9e7fd22c003e9f021e4675e4 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Wed, 7 Oct 2020 10:08:30 -0500
-Subject: [PATCH 16/24] Fix TZPATH on windows
+Subject: [PATCH 16/25] Fix TZPATH on windows
 
 ---
  Lib/sysconfig.py | 1 +
diff --git a/recipe/patches/0017-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch b/recipe/patches/0017-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch
@@ -1,7 +1,7 @@
-From b90601752071a69fed4434e7e7fd5b022a9b9061 Mon Sep 17 00:00:00 2001
+From 261c1b4ce5276a2acacd2d46fc7fcbd6780ae86f Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Mon, 25 Jan 2021 03:28:08 -0600
-Subject: [PATCH 17/24] Make dyld search work with SYSTEM_VERSION_COMPAT=1
+Subject: [PATCH 17/25] Make dyld search work with SYSTEM_VERSION_COMPAT=1
 
 In macOS Big Sur, if the executable was compiled with `MACOSX_DEPLOYMENT_TARGET=10.15`
 or below, then SYSTEM_VERSION_COMPAT=1 is the default which means that Big Sur
@@ -15,7 +15,7 @@ as that part is compiled with `MACOSX_DEPLOYMENT_TARGET=11.0`)
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
-index f42ff08f58..cb93b2cfce 100644
+index f42ff08f58..85edd81850 100644
 --- a/Modules/_ctypes/callproc.c
 +++ b/Modules/_ctypes/callproc.c
 @@ -1449,7 +1449,7 @@ copy_com_pointer(PyObject *self, PyObject *args)
diff --git a/recipe/patches/0018-Fix-LDSHARED-when-CC-is-overriden-on-Linux-too.patch b/recipe/patches/0018-Fix-LDSHARED-when-CC-is-overriden-on-Linux-too.patch
@@ -1,7 +1,7 @@
-From cd99533ef591c920c733122a115d0741b7d26a2a Mon Sep 17 00:00:00 2001
+From 547ee790161f1128a7069cc63cbfd000097a8c19 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Mon, 16 Aug 2021 02:18:50 -0700
-Subject: [PATCH 18/24] Fix LDSHARED when CC is overriden on Linux too
+Subject: [PATCH 18/25] Fix LDSHARED when CC is overriden on Linux too
 
 ---
  Lib/distutils/sysconfig.py | 5 ++---
diff --git a/recipe/patches/0019-Unvendor-bzip2.patch b/recipe/patches/0019-Unvendor-bzip2.patch
@@ -1,7 +1,7 @@
-From 02852a1f68784d6354e3234b9abcdc75d7150333 Mon Sep 17 00:00:00 2001
+From b449f39e3587a57a9fac942897396776653e9c23 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Mon, 16 Aug 2021 02:56:27 -0700
-Subject: [PATCH 19/24] Unvendor bzip2
+Subject: [PATCH 19/25] Unvendor bzip2
 
 ---
  PCbuild/_bz2.vcxproj         | 15 +++++----------
diff --git a/recipe/patches/0020-Unvendor-libffi.patch b/recipe/patches/0020-Unvendor-libffi.patch
@@ -1,7 +1,7 @@
-From b1260179d19d022c135e9195df284a9e9412877b Mon Sep 17 00:00:00 2001
+From 66cca1ce4e4616cb4d96cde25af4a03381bfb32f Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Mon, 16 Aug 2021 03:07:40 -0700
-Subject: [PATCH 20/24] Unvendor libffi
+Subject: [PATCH 20/25] Unvendor libffi
 
 ---
  PCbuild/libffi.props | 17 ++++-------------
diff --git a/recipe/patches/0021-Unvendor-tcltk.patch b/recipe/patches/0021-Unvendor-tcltk.patch
@@ -1,24 +1,24 @@
-From 3e0d466952034dcf1117ac304001d1bbba3ccebc Mon Sep 17 00:00:00 2001
+From 375daf999ad578f29a27c6a66a38d985bec1f848 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Fri, 20 Aug 2021 10:23:51 -0700
-Subject: [PATCH 21/24] Unvendor tcltk
+Subject: [PATCH 21/25] Unvendor tcltk
 
 ---
  PCbuild/tcltk.props | 12 +++++-------
  1 file changed, 5 insertions(+), 7 deletions(-)
 
 diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props
-index 7fd43e8279..5d7f07567d 100644
+index cd54b2567b..0507b044ee 100644
 --- a/PCbuild/tcltk.props
 +++ b/PCbuild/tcltk.props
-@@ -14,13 +14,11 @@
-     <TixMinorVersion>4</TixMinorVersion>
-     <TixPatchLevel>3</TixPatchLevel>
-     <TixRevision>6</TixRevision>
--    <tclDir>$(ExternalsDir)tcl-core-$(TclMajorVersion).$(TclMinorVersion).$(TclPatchLevel).$(TclRevision)\</tclDir>
--    <tkDir>$(ExternalsDir)tk-$(TkMajorVersion).$(TkMinorVersion).$(TkPatchLevel).$(TkRevision)\</tkDir>
--    <tixDir>$(ExternalsDir)tix-$(TixMajorVersion).$(TixMinorVersion).$(TixPatchLevel).$(TixRevision)\</tixDir>
--    <tcltkDir>$(ExternalsDir)tcltk-$(TclMajorVersion).$(TclMinorVersion).$(TclPatchLevel).$(TclRevision)\$(ArchName)\</tcltkDir>
+@@ -17,13 +17,11 @@
+     <TixMinorVersion>$([System.Version]::Parse($(TixVersion)).Minor)</TixMinorVersion>
+     <TixPatchLevel>$([System.Version]::Parse($(TixVersion)).Build)</TixPatchLevel>
+     <TixRevision>$([System.Version]::Parse($(TixVersion)).Revision)</TixRevision>
+-    <tclDir Condition="$(tclDir) == ''">$(ExternalsDir)tcl-core-$(TclVersion)\</tclDir>
+-    <tkDir Condition="$(tkDir) == ''">$(ExternalsDir)tk-$(TkVersion)\</tkDir>
+-    <tixDir Condition="$(tixDir) == ''">$(ExternalsDir)tix-$(TixVersion)\</tixDir>
+-    <tcltkDir Condition="$(tcltkDir) == ''">$(ExternalsDir)tcltk-$(TclVersion)\$(ArchName)\</tcltkDir>
 -    <tclWin32Exe Condition="$(Platform) == 'Win32'">$(tcltkDir)\bin\tclsh$(TclMajorVersion)$(TclMinorVersion)t.exe</tclWin32Exe>
 -    <tclWin32Exe Condition="$(Platform) != 'Win32'">$(tcltkDir)\..\win32\bin\tclsh$(TclMajorVersion)$(TclMinorVersion)t.exe</tclWin32Exe>
 -
diff --git a/recipe/patches/0022-unvendor-xz.patch b/recipe/patches/0022-unvendor-xz.patch
@@ -1,7 +1,7 @@
-From b3728c347e743274787178e9708621a2cfc89992 Mon Sep 17 00:00:00 2001
+From c248bff361cf2207fe232460238d80e40fd27e22 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Sat, 25 Sep 2021 10:07:05 -0700
-Subject: [PATCH 22/24] unvendor xz
+Subject: [PATCH 22/25] unvendor xz
 
 ---
  PCbuild/_lzma.vcxproj | 10 +++-------
diff --git a/recipe/patches/0023-unvendor-zlib.patch b/recipe/patches/0023-unvendor-zlib.patch
diff --git a/recipe/patches/0024-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch b/recipe/patches/0024-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch
diff --git a/recipe/patches/0025-Unvendor-expat.patch b/recipe/patches/0025-Unvendor-expat.patch
