rebase patches

h-vetinari · h-vetinari · commit 6fe770e03974 · 2026-04-08T09:06:29.000+11:00
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,4 +1,4 @@
-From f08d8a962782a81d96f1b4eae2349e99761f625c Mon Sep 17 00:00:00 2001
+From bc87f7d41e5dbda75de04d93b6e60075f579d5f2 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/26] Win32: Change FD_SETSIZE from 512 to 2048
diff --git a/recipe/patches/0002-Win32-Do-not-download-externals.patch b/recipe/patches/0002-Win32-Do-not-download-externals.patch
@@ -1,4 +1,4 @@
-From 6c69b44235d9bc5728ec1861823fb93c42af01b6 Mon Sep 17 00:00:00 2001
+From ac7720a49412776a03313fecf281be7aa6d9d6d3 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/26] Win32: Do not download externals
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,4 +1,4 @@
-From f69fee4163758eee14ad4e73e1041bd838014297 Mon Sep 17 00:00:00 2001
+From f55dbad460ad50580aac291f5f68f77b4eb5e443 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/26] Fix find_library so that it looks in sys.prefix/lib
@@ -25,10 +25,10 @@ index 583c47daff3..ab9b01c87e2 100644
          yield os.path.join(executable_path, name[len('@executable_path/'):])
  
 diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
-index 378f12167c6..a0e4060721a 100644
+index 3b21658433b..2c900c1e2cf 100644
 --- a/Lib/ctypes/util.py
 +++ b/Lib/ctypes/util.py
-@@ -129,7 +129,8 @@ def dllist():
+@@ -135,7 +135,8 @@ def dllist():
  elif os.name == "posix" and sys.platform in {"darwin", "ios", "tvos", "watchos"}:
      from ctypes.macholib.dyld import dyld_find as _dyld_find
      def find_library(name):
@@ -38,7 +38,7 @@ index 378f12167c6..a0e4060721a 100644
                      '%s.dylib' % name,
                      '%s.framework/%s' % (name, name)]
          for name in possible:
-@@ -430,10 +431,30 @@ def _findLib_ld(name):
+@@ -436,10 +437,30 @@ def _findLib_ld(name):
                  pass  # result will be None
              return result
  
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,4 +1,4 @@
-From 3a1dffd72017c2d159df2c9ab17e9a94fd96919e Mon Sep 17 00:00:00 2001
+From 29f68dcae94d2ad54f7e36df12175fb2bd3ef467 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/26] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS
diff --git a/recipe/patches/0005-Unvendor-openssl.patch b/recipe/patches/0005-Unvendor-openssl.patch
@@ -1,4 +1,4 @@
-From 282408229840efda93052f9b6e86775a378a527b Mon Sep 17 00:00:00 2001
+From 17fc2b4af07c3e2732f8f9c62f34d0e1b57597bf 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/26] Unvendor openssl
@@ -90,7 +90,7 @@ index 7ca750dda8f..17eee400ebb 100644
    <Target Name="CleanAll">
      <Delete Files="$(TargetPath);$(BuildPath)$(tclDLLName)" />
 diff --git a/PCbuild/python.props b/PCbuild/python.props
-index cc157252655..253aa66f477 100644
+index da503ca0348..253aa66f477 100644
 --- a/PCbuild/python.props
 +++ b/PCbuild/python.props
 @@ -68,6 +68,7 @@
@@ -112,8 +112,8 @@ index cc157252655..253aa66f477 100644
 -    <libffiOutDir Condition="$(libffiOutDir) == ''">$(libffiDir)$(ArchName)\</libffiOutDir>
 -    <libffiIncludeDir Condition="$(libffiIncludeDir) == ''">$(libffiOutDir)include</libffiIncludeDir>
      <mpdecimalDir Condition="$(mpdecimalDir) == ''">$(ExternalsDir)\mpdecimal-4.0.0\</mpdecimalDir>
--    <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-3.0.18\</opensslDir>
--    <opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.0.18\$(ArchName)\</opensslOutDir>
+-    <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-3.0.19\</opensslDir>
+-    <opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.0.19\$(ArchName)\</opensslOutDir>
 -    <opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslOutDir)include</opensslIncludeDir>
      <nasmDir Condition="$(nasmDir) == ''">$(ExternalsDir)\nasm-2.11.06\</nasmDir>
 -    <zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.3.1\</zlibDir>
diff --git a/recipe/patches/0006-Unvendor-sqlite3.patch b/recipe/patches/0006-Unvendor-sqlite3.patch
@@ -1,4 +1,4 @@
-From f4c9cf54276abcd8ac61f8a7c47253eda5f8746f Mon Sep 17 00:00:00 2001
+From f89df782ea930b7c8c8fa3a5cedf6984c68bbe26 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/26] Unvendor sqlite3
diff --git a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch
@@ -1,4 +1,4 @@
-From d2a622755b5640370ddbf758ffe364fbc1c5d476 Mon Sep 17 00:00:00 2001
+From 853657f2bd5774cf51d88c95cf9f7cd27ceea315 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/26] Add CondaEcosystemModifyDllSearchPath()
diff --git a/recipe/patches/0008-Doing-d1trimfile.patch b/recipe/patches/0008-Doing-d1trimfile.patch
@@ -1,4 +1,4 @@
-From b549b5d26e827079b0f11fffa2add7587c12a63b Mon Sep 17 00:00:00 2001
+From a638bbff1f76630d0b85554018670b6745b6a64e 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/26] Doing d1trimfile
diff --git a/recipe/patches/0009-cross-compile-darwin.patch b/recipe/patches/0009-cross-compile-darwin.patch
@@ -1,4 +1,4 @@
-From d0869e666f17978355eb8d5fc7e2fdc6319a2a96 Mon Sep 17 00:00:00 2001
+From 8b28429cdaf8b18f8a5f41b640c4c72c8e45897a 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/26] cross compile darwin
@@ -29,7 +29,7 @@ index b017b841311..f7821ae7f28 100644
      try:
          import plistlib
 diff --git a/configure b/configure
-index 645628fecf2..0d43c08ce03 100755
+index 8cfdda5a29b..be7e9c6713d 100755
 --- a/configure
 +++ b/configure
 @@ -4111,6 +4111,9 @@ then
@@ -53,7 +53,7 @@ index 645628fecf2..0d43c08ce03 100755
  		_host_ident=
  		;;
 diff --git a/configure.ac b/configure.ac
-index d81c76fc122..90366bb6257 100644
+index 1acb91fd27b..73fe005fa3d 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -324,6 +324,9 @@ then
diff --git a/recipe/patches/0010-Fix-TZPATH-on-windows.patch b/recipe/patches/0010-Fix-TZPATH-on-windows.patch
@@ -1,4 +1,4 @@
-From c4032e3b5fed532e99d33e6b4c44b34f5517749d Mon Sep 17 00:00:00 2001
+From f82fdb4890d33fa85807a8d9d8285df2c7580520 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/26] Fix TZPATH on windows
@@ -8,7 +8,7 @@ Subject: [PATCH 10/26] Fix TZPATH on windows
  1 file changed, 2 insertions(+)
 
 diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py
-index 2ecbff222fe..9a263dea8da 100644
+index faf8273bd0b..9e6d9257cf7 100644
 --- a/Lib/sysconfig/__init__.py
 +++ b/Lib/sysconfig/__init__.py
 @@ -175,6 +175,7 @@ def joinuser(*args):
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,4 +1,4 @@
-From 951db4322fd19139a4622b90d7dbffeb15362208 Mon Sep 17 00:00:00 2001
+From 4bedca8871c1bbe2f5a5a90db8559791f6e9247b 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/26] Make dyld search work with SYSTEM_VERSION_COMPAT=1
diff --git a/recipe/patches/0012-Unvendor-bzip2.patch b/recipe/patches/0012-Unvendor-bzip2.patch
@@ -1,4 +1,4 @@
-From 855f9e366d1d8ee00107a5d1ebf22da249e2dec5 Mon Sep 17 00:00:00 2001
+From a29058e2c62aea787df5ae1bc3e7e7c3d9f4e153 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/26] Unvendor bzip2
diff --git a/recipe/patches/0013-Unvendor-libffi.patch b/recipe/patches/0013-Unvendor-libffi.patch
@@ -1,4 +1,4 @@
-From 5b3fdc0eaf7915c3ea1072d38451b2be4e6d7fef Mon Sep 17 00:00:00 2001
+From 0d896e048d3b7994ebce253e3210fddc3a6a004b 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/26] Unvendor libffi
diff --git a/recipe/patches/0014-Unvendor-tcltk.patch b/recipe/patches/0014-Unvendor-tcltk.patch
@@ -1,4 +1,4 @@
-From 5dfbe7d99923687ee9a3c4e91490e051b6d96462 Mon Sep 17 00:00:00 2001
+From c5d8868e9c9862196d1f58eca51af9e6bf276a02 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/26] Unvendor tcltk
diff --git a/recipe/patches/0015-unvendor-xz.patch b/recipe/patches/0015-unvendor-xz.patch
@@ -1,4 +1,4 @@
-From 576269222bc04f75ff339dad05c7314cfa6d1f3a Mon Sep 17 00:00:00 2001
+From a6696e3a1910a1f70febf1dc65c7ae0ebb4e9da9 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/26] unvendor xz
diff --git a/recipe/patches/0016-unvendor-zlib.patch b/recipe/patches/0016-unvendor-zlib.patch
@@ -1,4 +1,4 @@
-From 3c453d205961e3ea6b7f76226f680f3247348ab0 Mon Sep 17 00:00:00 2001
+From 5a3effe6f9518217a3343ff7f7aa17ec4a950f24 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/26] unvendor zlib
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,4 +1,4 @@
-From e5418ff5c87e82a875616cac50f14e4b416c4010 Mon Sep 17 00:00:00 2001
+From b10930f94b1032084975cfe5e38c2678932e88de 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/26] Do not pass -g to GCC when not Py_DEBUG
@@ -10,7 +10,7 @@ This bloats our exe and our modules a lot.
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/configure b/configure
-index 0d43c08ce03..9071abda187 100755
+index be7e9c6713d..62acbe693c6 100755
 --- a/configure
 +++ b/configure
 @@ -5795,9 +5795,9 @@ if test $ac_test_CFLAGS; then
@@ -25,7 +25,7 @@ index 0d43c08ce03..9071abda187 100755
    fi
  else
    if test "$GCC" = yes; then
-@@ -9585,7 +9585,7 @@ then
+@@ -9625,7 +9625,7 @@ then
  	    if test "$Py_DEBUG" = 'true' ; then
  		OPT="-g $PYDEBUG_CFLAGS -Wall"
  	    else
@@ -35,10 +35,10 @@ index 0d43c08ce03..9071abda187 100755
  	    ;;
  	*)
 diff --git a/configure.ac b/configure.ac
-index 90366bb6257..2c474ddebd4 100644
+index 73fe005fa3d..da7353cd686 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2314,7 +2314,7 @@ then
+@@ -2317,7 +2317,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,4 +1,4 @@
-From 75ac84943fc049794c11001bccd9ec271264df2f Mon Sep 17 00:00:00 2001
+From 71fa4441a757e1e9dad7ae3ffaeb252700a86106 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/26] Unvendor expat
diff --git a/recipe/patches/0019-Remove-unused-readelf.patch b/recipe/patches/0019-Remove-unused-readelf.patch
@@ -1,4 +1,4 @@
-From 20358512ac8c49345e48205db7ed3154fc3f73eb Mon Sep 17 00:00:00 2001
+From d22b97f0708600e81541f2b7b6a1167ee5036c00 Mon Sep 17 00:00:00 2001
 From: Charles Bousseau <cbousseau@anaconda.com>
 Date: Thu, 25 May 2023 17:56:53 -0400
 Subject: [PATCH 19/26] Remove unused readelf
@@ -15,7 +15,7 @@ Drop unused build dependency on ``readelf``.
  1 file changed, 1 deletion(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 38a355a23f2..b7157b1eb21 100644
+index 80a1b590c2f..0b3e988571d 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -38,7 +38,6 @@ CC=		@CC@
diff --git a/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch b/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch
@@ -1,4 +1,4 @@
-From e6f058d7968b8e14c78357b4b6fee271109f12a7 Mon Sep 17 00:00:00 2001
+From 3feeb1c1d8a5f839f917784a163b74392722cebe Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Fri, 1 Sep 2023 23:32:14 +0200
 Subject: [PATCH 20/26] Don't checksharedmods if cross-compiling
@@ -10,7 +10,7 @@ Subject: [PATCH 20/26] Don't checksharedmods if cross-compiling
  create mode 100755 if_runnable.sh
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index b7157b1eb21..a16b15bc3ef 100644
+index 0b3e988571d..20f6c243f4c 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -1597,7 +1597,7 @@ sharedmods: $(SHAREDMODS) pybuilddir.txt
diff --git a/recipe/patches/0021-Override-configure-LIBFFI.patch b/recipe/patches/0021-Override-configure-LIBFFI.patch
@@ -1,4 +1,4 @@
-From 2d0c899745990b743c1818249f0c6f469670c341 Mon Sep 17 00:00:00 2001
+From fe59652c1d2b368168c8b0b2d99239b634774661 Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Tue, 5 Sep 2023 21:51:31 +0200
 Subject: [PATCH 21/26] Override configure LIBFFI
@@ -8,10 +8,10 @@ Subject: [PATCH 21/26] Override configure LIBFFI
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index 9071abda187..66405ea0aca 100755
+index 62acbe693c6..966aaf6a29d 100755
 --- a/configure
 +++ b/configure
-@@ -15264,7 +15264,7 @@ if test "x$ac_cv_lib_ffi_ffi_call" = xyes
+@@ -15304,7 +15304,7 @@ if test "x$ac_cv_lib_ffi_ffi_call" = xyes
  then :
  
                  have_libffi=yes
diff --git a/recipe/patches/0022-Unvendor-libmpdec.patch b/recipe/patches/0022-Unvendor-libmpdec.patch
@@ -1,4 +1,4 @@
-From 6bc36d5fbb42300b8c0276fca832d0883d34bc38 Mon Sep 17 00:00:00 2001
+From 65928acddcde36a49500e3d002e69d2ee8f77c1a Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Fri, 16 Aug 2024 21:34:43 -0500
 Subject: [PATCH 22/26] Unvendor libmpdec
diff --git a/recipe/patches/0023-Brand-conda-forge.patch b/recipe/patches/0023-Brand-conda-forge.patch
@@ -1,4 +1,4 @@
-From c5f04b22e082434d903f6a5632d08b623e7e3dc9 Mon Sep 17 00:00:00 2001
+From 42032895b96cd9ec5cba9e81544dd2684cf11f7c Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Wed, 28 Aug 2024 11:12:22 -0500
 Subject: [PATCH 23/26] Brand conda-forge
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
@@ -1,4 +1,4 @@
-From 5cfc14457be90d160d31b2b7b67f04b944f843c5 Mon Sep 17 00:00:00 2001
+From 8b136967da9cfa41060e54e64ad4ee0ebe9a048e Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Sun, 12 Jan 2025 10:37:29 +0530
 Subject: [PATCH 24/26] Do not define pid_t as it might conflict with the
@@ -30,7 +30,7 @@ index 6313abf5485..bc8169e2f68 100644
  module _testcapi
  [clinic start generated code]*/
 diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
-index 228fe4eff58..1db7b51160e 100644
+index 53f630832f8..8cc5b40a8d0 100644
 --- a/Modules/_testcapimodule.c
 +++ b/Modules/_testcapimodule.c
 @@ -23,6 +23,10 @@
@@ -60,7 +60,7 @@ index 34bc7331da9..abae4b19bf0 100644
  module _testlimitedcapi
  [clinic start generated code]*/
 diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h
-index 87a17935507..a88a9151cb6 100644
+index 1c7a860e1ec..64bdbdf23db 100644
 --- a/Modules/clinic/posixmodule.c.h
 +++ b/Modules/clinic/posixmodule.c.h
 @@ -10,6 +10,10 @@ preserve
@@ -75,7 +75,7 @@ index 87a17935507..a88a9151cb6 100644
  "stat($module, /, path, *, dir_fd=None, follow_symlinks=True)\n"
  "--\n"
 diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
-index cb3a62d211a..428ef667745 100644
+index 31b2d28200c..cc7e40c0283 100644
 --- a/Modules/posixmodule.c
 +++ b/Modules/posixmodule.c
 @@ -219,6 +219,7 @@
@@ -100,7 +100,7 @@ index 710a737ebcc..92d327b1e35 100644
  #if _MSC_VER >= 1200
  /* This file only exists in VC 6.0 or higher */
 diff --git a/Python/remote_debug.h b/Python/remote_debug.h
-index ed213859a8a..bd66dded8cd 100644
+index df1225f2eda..93b11c59309 100644
 --- a/Python/remote_debug.h
 +++ b/Python/remote_debug.h
 @@ -28,6 +28,9 @@ extern "C" {
diff --git a/recipe/patches/0025-Unvendor-zstd.patch b/recipe/patches/0025-Unvendor-zstd.patch
@@ -1,4 +1,4 @@
-From 75773c30d72ec021f2b0250d90cf7e36524d4880 Mon Sep 17 00:00:00 2001
+From 9fbb5ed9fcf079c56d8cb68c82bff97d7ca47735 Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwelk@xhochy.com>
 Date: Tue, 22 Jul 2025 18:07:54 +0200
 Subject: [PATCH 25/26] Unvendor zstd
@@ -195,8 +195,9 @@ index eec666e5eaf..5028bb5592d 100644
        <Filter>Header Files</Filter>
      </ClInclude>
 -    <ClInclude Include="$(zstdDir)lib\zstd.h">
--      <Filter>Header Files\zstd</Filter>
--    </ClInclude>
++    <ClInclude Include="$(condaDir)\include\zstd.h">
+       <Filter>Header Files\zstd</Filter>
+     </ClInclude>
 -    <ClInclude Include="$(zstdDir)lib\zstd_errors.h">
 -      <Filter>Header Files\zstd</Filter>
 -    </ClInclude>
@@ -258,9 +259,8 @@ index eec666e5eaf..5028bb5592d 100644
 -      <Filter>Header Files\zstd</Filter>
 -    </ClInclude>
 -    <ClInclude Include="$(zstdDir)lib\compress\zstdmt_compress.h">
-+    <ClInclude Include="$(condaDir)\include\zstd.h">
-       <Filter>Header Files\zstd</Filter>
-     </ClInclude>
+-      <Filter>Header Files\zstd</Filter>
+-    </ClInclude>
 -    <ClInclude Include="$(zstdDir)lib\decompress\zstd_ddict.h">
 +    <ClInclude Include="$(condaDir)\include\zstd_errors.h">
        <Filter>Header Files\zstd</Filter>
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
@@ -1,4 +1,4 @@
-From 69850a4863945e98a7ed61c8adde6692dc2c0424 Mon Sep 17 00:00:00 2001
+From 9fc166d6187fd4dc1be91b3e42b84840acf05bfc Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Tue, 2 Dec 2025 09:46:56 -0800
 Subject: [PATCH 26/26] Set Py_GIL_DISABLED in windows to match unix

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From f08d8a962782a81d96f1b4eae2349e99761f625c Mon Sep 17 00:00:00 2001`
	`1`	`+From bc87f7d41e5dbda75de04d93b6e60075f579d5f2 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Ray Donnelly <mingw.android@gmail.com>`
`3`	`3`	`Date: Wed, 16 Aug 2017 11:53:55 +0100`
`4`	`4`	`Subject: [PATCH 01/26] Win32: Change FD_SETSIZE from 512 to 2048`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 6c69b44235d9bc5728ec1861823fb93c42af01b6 Mon Sep 17 00:00:00 2001`
	`1`	`+From ac7720a49412776a03313fecf281be7aa6d9d6d3 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Ray Donnelly <mingw.android@gmail.com>`
`3`	`3`	`Date: Thu, 7 Sep 2017 11:35:47 +0100`
`4`	`4`	`Subject: [PATCH 02/26] Win32: Do not download externals`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 3a1dffd72017c2d159df2c9ab17e9a94fd96919e Mon Sep 17 00:00:00 2001`
	`1`	`+From 29f68dcae94d2ad54f7e36df12175fb2bd3ef467 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Ray Donnelly <mingw.android@gmail.com>`
`3`	`3`	`Date: Sat, 27 Oct 2018 18:48:30 +0100`
`4`	`4`	`Subject: [PATCH 04/26] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From f4c9cf54276abcd8ac61f8a7c47253eda5f8746f Mon Sep 17 00:00:00 2001`
	`1`	`+From f89df782ea930b7c8c8fa3a5cedf6984c68bbe26 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Nehal J Wani <nehaljw.kkd1@gmail.com>`
`3`	`3`	`Date: Tue, 5 Oct 2021 12:42:06 -0700`
`4`	`4`	`Subject: [PATCH 06/26] Unvendor sqlite3`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From d2a622755b5640370ddbf758ffe364fbc1c5d476 Mon Sep 17 00:00:00 2001`
	`1`	`+From 853657f2bd5774cf51d88c95cf9f7cd27ceea315 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Ray Donnelly <mingw.android@gmail.com>`
`3`	`3`	`Date: Tue, 24 Dec 2019 18:37:17 +0100`
`4`	`4`	`Subject: [PATCH 07/26] Add CondaEcosystemModifyDllSearchPath()`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From b549b5d26e827079b0f11fffa2add7587c12a63b Mon Sep 17 00:00:00 2001`
	`1`	`+From a638bbff1f76630d0b85554018670b6745b6a64e Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Ray Donnelly <mingw.android@gmail.com>`
`3`	`3`	`Date: Tue, 31 Dec 2019 21:47:47 +0100`
`4`	`4`	`Subject: [PATCH 08/26] Doing d1trimfile`