Merge pull request #841 from xhochy/3.15.0a3

xhochy · web-flow · commit c223c6e4f38b · 2025-12-18T06:34:05.000+01:00
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,5 +1,5 @@
 {% set version = "3.15.0" %}
-{% set dev = "a2" %}
+{% set dev = "a3" %}
 {% set dev_ = "" %}
 {% set ver2 = '.'.join(version.split('.')[0:2]) %}
 {% set ver2nd = ''.join(version.split('.')[0:2]) %}
@@ -46,7 +46,7 @@ package:
 source:
   - url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz
     # md5 from: https://www.python.org/downloads/release/python-{{ ver3nd }}{{ dev }}/
-    md5: 8a16a56591101a698e8d0779d41782f4
+    md5: d6ee7c74b9618520e88ec175f5539623
     patches:
       - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
       - patches/0002-Win32-Do-not-download-externals.patch
@@ -80,8 +80,6 @@ source:
 {% if freethreading == "yes" %}
       - patches/0026-Set-Py_GIL_DISABLED-in-windows-to-match-unix.patch
 {% endif %}
-      # https://github.com/python/cpython/pull/142039
-      - patches/0027-Expand-guard-for-types_world_is_stopped.patch
 
 build:
   number: {{ build_number }}
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 f0d0c464af24f7fbbc430abaa005eb298e18e5c8 Mon Sep 17 00:00:00 2001
+From 8c8d4d1ded1d513cffb4ae94e5bb7c8cef63ec1c 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/27] Win32: Change FD_SETSIZE from 512 to 2048
+Subject: [PATCH 01/26] Win32: Change FD_SETSIZE from 512 to 2048
 
 https://github.com/ContinuumIO/anaconda-issues/issues/1241
 ---
diff --git a/recipe/patches/0002-Win32-Do-not-download-externals.patch b/recipe/patches/0002-Win32-Do-not-download-externals.patch
@@ -1,17 +1,17 @@
-From 6a15ec3d4e45c28bff8510c81f571c6112b13497 Mon Sep 17 00:00:00 2001
+From 9f50db5dbb5a150b2c7799b16b6afacbb5339aa8 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 02/27] Win32: Do not download externals
+Subject: [PATCH 02/26] Win32: Do not download externals
 
 ---
  PCbuild/build.bat | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/PCbuild/build.bat b/PCbuild/build.bat
-index 60235704886..edb61912b74 100644
+index e4de9a80d76..22892c05dc7 100644
 --- a/PCbuild/build.bat
 +++ b/PCbuild/build.bat
-@@ -107,7 +107,7 @@ if "%~1"=="--no-ctypes" (set IncludeCTypes=false) & shift & goto CheckOpts
+@@ -109,7 +109,7 @@ if "%~1"=="--no-ctypes" (set IncludeCTypes=false) & shift & goto CheckOpts
  if "%~1"=="--no-ssl" (set IncludeSSL=false) & shift & goto CheckOpts
  if "%~1"=="--no-tkinter" (set IncludeTkinter=false) & shift & goto CheckOpts
  
diff --git a/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch b/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch
@@ -1,7 +1,7 @@
-From 299fc079ce68d641b415cb3d8843e029d7fc5b6c Mon Sep 17 00:00:00 2001
+From 7312b782873147be93df6dd501030d8c6fcff5f3 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 03/27] Fix find_library so that it looks in sys.prefix/lib
+Subject: [PATCH 03/26] Fix find_library so that it looks in sys.prefix/lib
  first
 
 ---
diff --git a/recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch b/recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch
@@ -1,7 +1,7 @@
-From 5bb72c8e81480293d90558a693e1be1550d512b6 Mon Sep 17 00:00:00 2001
+From d8e1bbacdc5456cf43d9dfc0c1231023d285afe9 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 04/27] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
+Subject: [PATCH 04/26] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
  is not 0
 
 Co-authored-by: Isuru Fernando<isuruf@gmail.com>
diff --git a/recipe/patches/0005-Unvendor-openssl.patch b/recipe/patches/0005-Unvendor-openssl.patch
@@ -1,7 +1,7 @@
-From 17fcde2d5bbbe8236afdd38526ad7b59a6868ab5 Mon Sep 17 00:00:00 2001
+From fe3fd0f75ef1e5fbac3aebe2ae615858850d4324 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 05/27] Unvendor openssl
+Subject: [PATCH 05/26] Unvendor openssl
 
 Co-authored-by: Isuru Fernando <isuruf@gmail.com>
 ---
diff --git a/recipe/patches/0006-Unvendor-sqlite3.patch b/recipe/patches/0006-Unvendor-sqlite3.patch
@@ -1,7 +1,7 @@
-From 5d333d7c6aaa395b4bccee40fec534aa7c19d7f5 Mon Sep 17 00:00:00 2001
+From 89126b92c8ac764ce9e8034789bf74b4ecf003b5 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 06/27] Unvendor sqlite3
+Subject: [PATCH 06/26] Unvendor sqlite3
 
 ---
  PCbuild/_sqlite3.vcxproj | 11 +++++------
diff --git a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch
@@ -1,7 +1,7 @@
-From 83958047fd8a64f8c049735d5d8594bd5673a696 Mon Sep 17 00:00:00 2001
+From 0d5341782ce10d959a1914b99581aee95c4b4176 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 07/27] Add CondaEcosystemModifyDllSearchPath()
+Subject: [PATCH 07/26] Add CondaEcosystemModifyDllSearchPath()
 
   The python interpreter is modifed so that it works as if the python interpreter
   was called with the following conda directories.
@@ -33,7 +33,7 @@ Co-authored-by: Isuru Fernando <isuruf@gmail.com>
  1 file changed, 95 insertions(+)
 
 diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
-index 67368b5ce07..e08b2df1226 100644
+index 2527dca71d7..a2d28a9be46 100644
 --- a/Python/pylifecycle.c
 +++ b/Python/pylifecycle.c
 @@ -81,6 +81,10 @@
diff --git a/recipe/patches/0008-Doing-d1trimfile.patch b/recipe/patches/0008-Doing-d1trimfile.patch
@@ -1,7 +1,7 @@
-From 5c39a338040451810cc97adc1d0088e914cccd07 Mon Sep 17 00:00:00 2001
+From 2c64caf81d33ab9dea54bf06d183b877ddc32d47 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 08/27] Doing d1trimfile
+Subject: [PATCH 08/26] Doing d1trimfile
 
 ---
  PCbuild/_asyncio.vcxproj            | 20 ++++++++++++++++++++
@@ -720,7 +720,7 @@ index 3f8772d30b4..d80968e351a 100644
      <Link>
        <AdditionalDependencies>windowsapp.lib;%(AdditionalDependencies)</AdditionalDependencies>
 diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
-index 359a47fbfc4..ee07e5cffa2 100644
+index dcfb75ce162..5bf342227ad 100644
 --- a/PCbuild/pythoncore.vcxproj
 +++ b/PCbuild/pythoncore.vcxproj
 @@ -99,7 +99,7 @@
diff --git a/recipe/patches/0009-cross-compile-darwin.patch b/recipe/patches/0009-cross-compile-darwin.patch
@@ -1,7 +1,7 @@
-From 73649c07901551bcb28074e72c192e8338f2a794 Mon Sep 17 00:00:00 2001
+From 42d193573c79b9760d36d9150d8308f136e874e9 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 09/27] cross compile darwin
+Subject: [PATCH 09/26] cross compile darwin
 
 By Isuru Fernando.
 ---
@@ -11,10 +11,10 @@ By Isuru Fernando.
  3 files changed, 18 insertions(+), 1 deletion(-)
 
 diff --git a/Lib/platform.py b/Lib/platform.py
-index 4db93bea2a3..fce802b20a2 100644
+index 3a71b669985..b342ceec761 100644
 --- a/Lib/platform.py
 +++ b/Lib/platform.py
-@@ -475,7 +475,12 @@ def win32_ver(release='', version='', csd='', ptype=''):
+@@ -474,7 +474,12 @@ def win32_ver(release='', version='', csd='', ptype=''):
  def _mac_ver_xml():
      fn = '/System/Library/CoreServices/SystemVersion.plist'
      if not os.path.exists(fn):
@@ -29,10 +29,10 @@ index 4db93bea2a3..fce802b20a2 100644
      try:
          import plistlib
 diff --git a/configure b/configure
-index a4514f80c3a..3896a8a6fce 100755
+index a1bc7991aa8..f26e19a400a 100755
 --- a/configure
 +++ b/configure
-@@ -4113,6 +4113,9 @@ then
+@@ -4133,6 +4133,9 @@ then
  	*-*-linux*)
  		ac_sys_system=Linux
  		;;
@@ -42,7 +42,7 @@ index a4514f80c3a..3896a8a6fce 100755
  	*-*-cygwin*)
  		ac_sys_system=Cygwin
  		;;
-@@ -4592,6 +4595,9 @@ if test "$cross_compiling" = yes; then
+@@ -4612,6 +4615,9 @@ if test "$cross_compiling" = yes; then
  			_host_ident=$host_cpu
  		esac
  		;;
@@ -53,10 +53,10 @@ index a4514f80c3a..3896a8a6fce 100755
  		_host_ident=
  		;;
 diff --git a/configure.ac b/configure.ac
-index a059a07bec2..50381cf760e 100644
+index a284a118f02..b86228cea4f 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -324,6 +324,9 @@ then
+@@ -333,6 +333,9 @@ then
  	*-*-linux*)
  		ac_sys_system=Linux
  		;;
@@ -66,7 +66,7 @@ index a059a07bec2..50381cf760e 100644
  	*-*-cygwin*)
  		ac_sys_system=Cygwin
  		;;
-@@ -771,6 +774,9 @@ if test "$cross_compiling" = yes; then
+@@ -780,6 +783,9 @@ if test "$cross_compiling" = yes; then
  			_host_ident=$host_cpu
  		esac
  		;;
diff --git a/recipe/patches/0010-Fix-TZPATH-on-windows.patch b/recipe/patches/0010-Fix-TZPATH-on-windows.patch
@@ -1,7 +1,7 @@
-From b282fdadd59f2a8e90fc995ed76b95383eac6906 Mon Sep 17 00:00:00 2001
+From 630cb148ad55a8c366b0c4dd357faf0c99d3f133 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Wed, 7 Oct 2020 10:08:30 -0500
-Subject: [PATCH 10/27] Fix TZPATH on windows
+Subject: [PATCH 10/26] Fix TZPATH on windows
 
 ---
  Lib/sysconfig/__init__.py | 2 ++
diff --git a/recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch b/recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch
@@ -1,7 +1,7 @@
-From 6a25a0a62fd89072d2f902cd00fd19b8629f8571 Mon Sep 17 00:00:00 2001
+From 9f173aa92e5bb529fd60991c42abb178f16b1e9a Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Mon, 25 Jan 2021 03:28:08 -0600
-Subject: [PATCH 11/27] Make dyld search work with SYSTEM_VERSION_COMPAT=1
+Subject: [PATCH 11/26] 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
@@ -18,7 +18,7 @@ and this code using 10.16
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
-index a8c16547e4b..c8d1eb9dd7e 100644
+index 9a1c1ff8bb9..730e1fd1394 100644
 --- a/Modules/_ctypes/callproc.c
 +++ b/Modules/_ctypes/callproc.c
 @@ -1501,7 +1501,7 @@ copy_com_pointer(PyObject *self, PyObject *args)
diff --git a/recipe/patches/0012-Unvendor-bzip2.patch b/recipe/patches/0012-Unvendor-bzip2.patch
@@ -1,7 +1,7 @@
-From 9afee7464b67b708a18dcee213460f1df98bb404 Mon Sep 17 00:00:00 2001
+From b8da28d50e7830647b1069c3ee791914cf6eda1f Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Mon, 16 Aug 2021 02:56:27 -0700
-Subject: [PATCH 12/27] Unvendor bzip2
+Subject: [PATCH 12/26] Unvendor bzip2
 
 ---
  PCbuild/_bz2.vcxproj         | 15 +++++----------
diff --git a/recipe/patches/0013-Unvendor-libffi.patch b/recipe/patches/0013-Unvendor-libffi.patch
@@ -1,7 +1,7 @@
-From 64d9c760bb5a40d5a9f466087b668a8acb4071ce Mon Sep 17 00:00:00 2001
+From 8fe13b763103443ad71be1c8be14764b1afa0b00 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Mon, 16 Aug 2021 03:07:40 -0700
-Subject: [PATCH 13/27] Unvendor libffi
+Subject: [PATCH 13/26] Unvendor libffi
 
 ---
  PCbuild/libffi.props | 17 ++++-------------
diff --git a/recipe/patches/0014-Unvendor-tcltk.patch b/recipe/patches/0014-Unvendor-tcltk.patch
@@ -1,7 +1,7 @@
-From aac5645d1d583be0604b130749cb61447e3c02c5 Mon Sep 17 00:00:00 2001
+From 1a6e9fc3846eee64ffa9477fd0ca120ee19eac11 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Fri, 20 Aug 2021 10:23:51 -0700
-Subject: [PATCH 14/27] Unvendor tcltk
+Subject: [PATCH 14/26] Unvendor tcltk
 
 ---
  PCbuild/_tkinter.vcxproj |  6 ------
diff --git a/recipe/patches/0015-unvendor-xz.patch b/recipe/patches/0015-unvendor-xz.patch
@@ -1,7 +1,7 @@
-From 2925d92d9d9f6b476800ea6832ef3bc6257fb230 Mon Sep 17 00:00:00 2001
+From fae25b8b8186b60128621097ebe4922c0c1d33ae Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Sat, 25 Sep 2021 10:07:05 -0700
-Subject: [PATCH 15/27] unvendor xz
+Subject: [PATCH 15/26] unvendor xz
 
 ---
  PCbuild/_lzma.vcxproj | 10 +++-------
diff --git a/recipe/patches/0016-unvendor-zlib.patch b/recipe/patches/0016-unvendor-zlib.patch
@@ -1,15 +1,15 @@
-From 59b4df04ee6775095f53787273d750aa23b96f9e Mon Sep 17 00:00:00 2001
+From cb1c4b7ebe9936da5001437bcdd54f3f496ebdcd Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Wed, 29 Sep 2021 15:21:55 -0700
-Subject: [PATCH 16/27] unvendor zlib
+Subject: [PATCH 16/26] unvendor zlib
 
 ---
  PCbuild/pythoncore.vcxproj         | 14 ++-----
  PCbuild/pythoncore.vcxproj.filters | 66 ------------------------------
  2 files changed, 4 insertions(+), 76 deletions(-)
 
 diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
-index ee07e5cffa2..0dfc40fab7f 100644
+index 5bf342227ad..f0e8fa6aaad 100644
 --- a/PCbuild/pythoncore.vcxproj
 +++ b/PCbuild/pythoncore.vcxproj
 @@ -82,7 +82,7 @@
@@ -30,8 +30,8 @@ index ee07e5cffa2..0dfc40fab7f 100644
        <AdditionalIncludeDirectories Condition="'$(UseJIT)' == 'true'">$(GeneratedJitStencilsDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_USRDLL;Py_BUILD_CORE;Py_BUILD_CORE_BUILTIN;Py_ENABLE_SHARED;MS_DLL_ID="$(SysWinVer)";ZLIB_COMPAT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <PreprocessorDefinitions Condition="$(IncludeExternals)">_Py_HAVE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-@@ -112,8 +112,8 @@
-       <PreprocessorDefinitions Condition="'$(DisableRemoteDebug)' != 'true'">Py_REMOTE_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+@@ -113,8 +113,8 @@
+       <PreprocessorDefinitions Condition="'$(StackRefDebug)' == 'true'">Py_STACKREF_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      </ClCompile>
      <Link>
 -      <AdditionalDependencies>version.lib;ws2_32.lib;pathcch.lib;bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -41,7 +41,7 @@ index ee07e5cffa2..0dfc40fab7f 100644
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
-@@ -689,12 +689,6 @@
+@@ -691,12 +691,6 @@
    <ItemGroup>
      <ResourceCompile Include="..\PC\python_nt.rc" />
    </ItemGroup>
@@ -55,10 +55,10 @@ index ee07e5cffa2..0dfc40fab7f 100644
    <ImportGroup Label="ExtensionTargets">
      <Import Project="regen.targets" />
 diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters
-index 17999690990..7376f1130b5 100644
+index 247f4b5a784..00c8bd6e551 100644
 --- a/PCbuild/pythoncore.vcxproj.filters
 +++ b/PCbuild/pythoncore.vcxproj.filters
-@@ -915,39 +915,6 @@
+@@ -918,39 +918,6 @@
      <ClInclude Include="..\Include\internal\mimalloc\mimalloc\types.h">
        <Filter>Include\internal\mimalloc</Filter>
      </ClInclude>
@@ -98,7 +98,7 @@ index 17999690990..7376f1130b5 100644
      <ClInclude Include="..\Include\internal\pycore_structseq.h">
        <Filter>Include\internal</Filter>
      </ClInclude>
-@@ -1604,39 +1571,6 @@
+@@ -1607,39 +1574,6 @@
      <ClCompile Include="..\Objects\odictobject.c">
        <Filter>Objects</Filter>
      </ClCompile>
diff --git a/recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch b/recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch
@@ -1,7 +1,7 @@
-From 675879079500bd180419d8fff0d0310da3dc2097 Mon Sep 17 00:00:00 2001
+From f8510f4e1d2f6adbe4d7ac28f039febf6ed7d144 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Wed, 16 Aug 2017 11:45:28 +0100
-Subject: [PATCH 17/27] Do not pass -g to GCC when not Py_DEBUG
+Subject: [PATCH 17/26] Do not pass -g to GCC when not Py_DEBUG
 
 This bloats our exe and our modules a lot.
 ---
@@ -10,10 +10,10 @@ This bloats our exe and our modules a lot.
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/configure b/configure
-index 3896a8a6fce..1f1a310988a 100755
+index f26e19a400a..24b4a5290e6 100755
 --- a/configure
 +++ b/configure
-@@ -5797,9 +5797,9 @@ if test $ac_test_CFLAGS; then
+@@ -5817,9 +5817,9 @@ if test $ac_test_CFLAGS; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
    if test "$GCC" = yes; then
@@ -25,7 +25,7 @@ index 3896a8a6fce..1f1a310988a 100755
    fi
  else
    if test "$GCC" = yes; then
-@@ -9596,7 +9596,7 @@ then
+@@ -9612,7 +9612,7 @@ then
  	    if test "$Py_DEBUG" = 'true' ; then
  		OPT="-g $PYDEBUG_CFLAGS -Wall"
  	    else
@@ -35,10 +35,10 @@ index 3896a8a6fce..1f1a310988a 100755
  	    ;;
  	*)
 diff --git a/configure.ac b/configure.ac
-index 50381cf760e..bbd47d7f4df 100644
+index b86228cea4f..095fd5fd9ea 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2322,7 +2322,7 @@ then
+@@ -2327,7 +2327,7 @@ then
  	    if test "$Py_DEBUG" = 'true' ; then
  		OPT="-g $PYDEBUG_CFLAGS -Wall"
  	    else
diff --git a/recipe/patches/0018-Unvendor-expat.patch b/recipe/patches/0018-Unvendor-expat.patch
@@ -1,7 +1,7 @@
-From c161a3b3435c3f6ce56c3ff2836913349c74cd2e Mon Sep 17 00:00:00 2001
+From b795ea2453a53052d407c26c9f145731fed44580 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Wed, 29 Mar 2023 23:07:10 -0500
-Subject: [PATCH 18/27] Unvendor expat
+Subject: [PATCH 18/26] Unvendor expat
 
 ---
  PCbuild/_elementtree.vcxproj         | 24 ++----------
diff --git a/recipe/patches/0019-Remove-unused-readelf.patch b/recipe/patches/0019-Remove-unused-readelf.patch
diff --git a/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch b/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch
diff --git a/recipe/patches/0021-Override-configure-LIBFFI.patch b/recipe/patches/0021-Override-configure-LIBFFI.patch
diff --git a/recipe/patches/0022-Unvendor-libmpdec.patch b/recipe/patches/0022-Unvendor-libmpdec.patch
diff --git a/recipe/patches/0023-Brand-conda-forge.patch b/recipe/patches/0023-Brand-conda-forge.patch
diff --git a/recipe/patches/0024-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch b/recipe/patches/0024-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch
diff --git a/recipe/patches/0025-Unvendor-zstd.patch b/recipe/patches/0025-Unvendor-zstd.patch
diff --git a/recipe/patches/0026-Set-Py_GIL_DISABLED-in-windows-to-match-unix.patch b/recipe/patches/0026-Set-Py_GIL_DISABLED-in-windows-to-match-unix.patch
diff --git a/recipe/patches/0027-Expand-guard-for-types_world_is_stopped.patch b/recipe/patches/0027-Expand-guard-for-types_world_is_stopped.patch
