rebase patches

h-vetinari · h-vetinari · commit 630a828d4537 · 2024-06-08T11:25:48.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 656d027af328edb2cc196eec7e726fa62e2ce3f2 Mon Sep 17 00:00:00 2001
+From 4f915b76bf52d9a4a355e0047b0ac8d66a8ec336 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/22] 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 74d8297f1fb827e069ba795a00dd5cd40cd01a49 Mon Sep 17 00:00:00 2001
+From 89ac50838fc3c43b63342d7b9c434fe68e11d678 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/22] 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 6acef4cee4f5107be46225f159cf5a5238f2c6bd Mon Sep 17 00:00:00 2001
+From 1add97729db66a572b0ad8f26186071c6d1b19fd 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/22] Fix find_library so that it looks in sys.prefix/lib
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 842497c29a668817928af9ab966b2a63bfbcd294 Mon Sep 17 00:00:00 2001
+From 4c0b20c3cebfcb8eaa0406c7b626322d01087492 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/22] 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 4fd9f886ff5b07c0ff51a767b147f5154e685686 Mon Sep 17 00:00:00 2001
+From 91c6890e658e06e72213b8699e9c7e15ab42de55 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/22] Unvendor openssl
@@ -144,7 +144,7 @@ index 0da6f67495..17eee400eb 100644
    <Target Name="CleanAll">
      <Delete Files="$(TargetPath);$(BuildPath)$(tclDLLName)" />
 diff --git a/PCbuild/python.props b/PCbuild/python.props
-index d85fe4ab2a..cf0913f331 100644
+index d799948fa3..cf0913f331 100644
 --- a/PCbuild/python.props
 +++ b/PCbuild/python.props
 @@ -61,6 +61,7 @@
@@ -159,7 +159,7 @@ index d85fe4ab2a..cf0913f331 100644
    <Import Project="$(ExternalProps)" Condition="$(ExternalProps) != '' and Exists('$(ExternalProps)')" />
  
    <PropertyGroup>
--    <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.45.1.0\</sqlite3Dir>
+-    <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.45.3.0\</sqlite3Dir>
 -    <bz2Dir Condition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir>
 -    <lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.5\</lzmaDir>
 -    <libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.4\</libffiDir>
diff --git a/recipe/patches/0006-Unvendor-sqlite3.patch b/recipe/patches/0006-Unvendor-sqlite3.patch
@@ -1,4 +1,4 @@
-From 4437c580909034fa0e660b38cfca148bb0345f1d Mon Sep 17 00:00:00 2001
+From 0a0c280aec453af0a3904a696dfc71175e6dc246 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/22] Unvendor sqlite3
diff --git a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch
@@ -1,4 +1,4 @@
-From a588758d0e8935f6506e0fc9ce96ad016b918534 Mon Sep 17 00:00:00 2001
+From 46d9b400457bec18d25f3977758daa76d53acbf4 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/22] Add CondaEcosystemModifyDllSearchPath()
@@ -33,7 +33,7 @@ Co-authored-by: Isuru Fernando <isuruf@gmail.com>
  1 file changed, 96 insertions(+)
 
 diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
-index a0130fde15..e690dcf7df 100644
+index 2c36527a87..84cbae8248 100644
 --- a/Python/pylifecycle.c
 +++ b/Python/pylifecycle.c
 @@ -51,6 +51,10 @@
diff --git a/recipe/patches/0008-Doing-d1trimfile.patch b/recipe/patches/0008-Doing-d1trimfile.patch
@@ -1,4 +1,4 @@
-From 9f20e0ac40b761542197d65d4e188c474d42ea2b Mon Sep 17 00:00:00 2001
+From 679e1d26a2d1883952ef98d191cc08242adcab12 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/22] Doing d1trimfile
@@ -418,7 +418,7 @@ index 917d7ae50f..8c7e141eea 100644
      <ClCompile Include="..\Modules\_testbuffer.c" />
    </ItemGroup>
 diff --git a/PCbuild/_testcapi.vcxproj b/PCbuild/_testcapi.vcxproj
-index e032e67c25..288f68ee9d 100644
+index 257562c75d..41bd3cc56c 100644
 --- a/PCbuild/_testcapi.vcxproj
 +++ b/PCbuild/_testcapi.vcxproj
 @@ -92,6 +92,26 @@
diff --git a/recipe/patches/0009-cross-compile-darwin.patch b/recipe/patches/0009-cross-compile-darwin.patch
@@ -1,4 +1,4 @@
-From edb3ba3037493e6f18c6663577bbe2ed6828f8fa Mon Sep 17 00:00:00 2001
+From fae08eb999d62039e0dbbeb65761f0e4c507c471 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/22] cross compile darwin
@@ -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 7bb222088d..0b1cbc98e2 100755
+index c5b6048036..7470545466 100755
 --- a/Lib/platform.py
 +++ b/Lib/platform.py
-@@ -458,7 +458,12 @@ def win32_ver(release='', version='', csd='', ptype=''):
+@@ -459,7 +459,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,7 +29,7 @@ index 7bb222088d..0b1cbc98e2 100755
      try:
          import plistlib
 diff --git a/configure b/configure
-index be783faa24..4a3f0b6302 100755
+index 6dc8a66e48..552597c021 100755
 --- a/configure
 +++ b/configure
 @@ -4267,6 +4267,9 @@ then
@@ -53,7 +53,7 @@ index be783faa24..4a3f0b6302 100755
  		_host_cpu=
  		;;
 diff --git a/configure.ac b/configure.ac
-index 8be26cc0ab..058f1d1096 100644
+index 8a32cb58f4..36b565af1b 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -547,6 +547,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 021e22856ef3ef90a67b0d18d4678752a7ee0ad6 Mon Sep 17 00:00:00 2001
+From eaf0b19149ec28a231e0c73e36b2a6fdc29c250e 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/22] Fix TZPATH on windows
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 7ab332db570ac958bbd29d1fc509c56679a726c5 Mon Sep 17 00:00:00 2001
+From dfa56fb035e286513a96ab1ee60a438a61295aac 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/22] 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 08b3753e59a304836dc3c942f0f094da62792726 Mon Sep 17 00:00:00 2001
+From 4cfee77c16d2985f27f61ed831027f18ad51a641 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/22] Unvendor bzip2
diff --git a/recipe/patches/0013-Unvendor-libffi.patch b/recipe/patches/0013-Unvendor-libffi.patch
@@ -1,4 +1,4 @@
-From 65a0baff5337e62ec767c7325e1dff3d0befdc74 Mon Sep 17 00:00:00 2001
+From a346f51234b70e907c8bac4156e2f67f209ca380 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/22] Unvendor libffi
diff --git a/recipe/patches/0014-Unvendor-tcltk.patch b/recipe/patches/0014-Unvendor-tcltk.patch
@@ -1,4 +1,4 @@
-From 5c86ea7b1b6d1b8b80c8832d7419b34bbaf784dd Mon Sep 17 00:00:00 2001
+From dcb96fc3a6604875421ad94654bad12424db494c 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/22] Unvendor tcltk
diff --git a/recipe/patches/0015-unvendor-xz.patch b/recipe/patches/0015-unvendor-xz.patch
@@ -1,4 +1,4 @@
-From aac43cc3683c7e2883193c5c961ff663ca26b0d6 Mon Sep 17 00:00:00 2001
+From e2ef6df310bc7877332881ac140aab4d884a887e 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/22] unvendor xz
diff --git a/recipe/patches/0016-unvendor-zlib.patch b/recipe/patches/0016-unvendor-zlib.patch
@@ -1,4 +1,4 @@
-From 50d8263428889fb632fca91f23404af3ea153ab2 Mon Sep 17 00:00:00 2001
+From 91fcbab935cefba1855808e5b275d2b81b79d53a 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/22] 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 17ae3c508328f717f06f10a59ba4ce95326a45f8 Mon Sep 17 00:00:00 2001
+From 7c7ce51dae3af7b8325e1ccdf8bcd7225b2b5065 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/22] 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 4a3f0b6302..074830a032 100755
+index 552597c021..cff40b9959 100755
 --- a/configure
 +++ b/configure
 @@ -5465,9 +5465,9 @@ if test $ac_test_CFLAGS; then
@@ -35,10 +35,10 @@ index 4a3f0b6302..074830a032 100755
  	    ;;
  	*)
 diff --git a/configure.ac b/configure.ac
-index 058f1d1096..33dfd41aa9 100644
+index 36b565af1b..538122985c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2247,7 +2247,7 @@ then
+@@ -2255,7 +2255,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 c73635e11f1e462a1d65eb292403bf198fa59964 Mon Sep 17 00:00:00 2001
+From 578d46ad1930ab405cd908d8ec68368db36f0801 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/22] 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 cc5d7859a1961524c528a68983b461bdac7e9254 Mon Sep 17 00:00:00 2001
+From fd9f5630ec6e354261274f5cb79501024197f3a1 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/22] 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 27a26c2252..df08b7461a 100644
+index 4a957fb004..689ece9d24 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 c0c767d515e1cf5724a3d13804e41860d0ddc996 Mon Sep 17 00:00:00 2001
+From 46ed1d097913ea6752125324ecf254a51e4927b4 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/22] Don't checksharedmods if cross-compiling
@@ -10,10 +10,10 @@ Subject: [PATCH 20/22] Don't checksharedmods if cross-compiling
  create mode 100755 if_runnable.sh
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index df08b7461a..d3e0878335 100644
+index 689ece9d24..913cbd8e23 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -992,7 +992,7 @@ sharedmods: $(SHAREDMODS) pybuilddir.txt
+@@ -994,7 +994,7 @@ sharedmods: $(SHAREDMODS) pybuilddir.txt
  # dependency on BUILDPYTHON ensures that the target is run last
  .PHONY: checksharedmods
  checksharedmods: sharedmods $(PYTHON_FOR_BUILD_DEPS) $(BUILDPYTHON)
diff --git a/recipe/patches/0021-Override-configure-LIBFFI.patch b/recipe/patches/0021-Override-configure-LIBFFI.patch
@@ -1,4 +1,4 @@
-From 375e7bd98df476410a670b4168c2cd6b37caf31d Mon Sep 17 00:00:00 2001
+From 9278cac7fd97574e551bf989795d61381131ac97 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/22] Override configure LIBFFI
@@ -8,7 +8,7 @@ Subject: [PATCH 21/22] Override configure LIBFFI
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index 074830a032..09a90faf58 100755
+index cff40b9959..50cbcc1ac7 100755
 --- a/configure
 +++ b/configure
 @@ -14095,7 +14095,7 @@ if test "x$ac_cv_lib_ffi_ffi_call" = xyes
diff --git a/recipe/patches/0022-Allow-linking-ncursesw-panelw-on-macOS-if-available.patch b/recipe/patches/0022-Allow-linking-ncursesw-panelw-on-macOS-if-available.patch
@@ -1,4 +1,4 @@
-From 8d4663b64a97de15c6c252a51fa1047526e1b66d Mon Sep 17 00:00:00 2001
+From bbc64a8ca9d69dbfd220a3924a71f7ea12cd43da Mon Sep 17 00:00:00 2001
 From: Marcel Bargull <marcel.bargull@udo.edu>
 Date: Thu, 14 Dec 2023 22:16:33 +0100
 Subject: [PATCH 22/22] Allow linking ncursesw/panelw on macOS if available
@@ -10,7 +10,7 @@ Signed-off-by: Marcel Bargull <marcel.bargull@udo.edu>
  2 files changed, 10 deletions(-)
 
 diff --git a/configure b/configure
-index 09a90faf58..9950b03e50 100755
+index 50cbcc1ac7..0108f553bf 100755
 --- a/configure
 +++ b/configure
 @@ -25714,7 +25714,6 @@ fi
@@ -46,10 +46,10 @@ index 09a90faf58..9950b03e50 100755
    if test "x$have_curses" = xncurses
  then :
 diff --git a/configure.ac b/configure.ac
-index 33dfd41aa9..8b87deac81 100644
+index 538122985c..284c0daddd 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -6424,8 +6424,6 @@ AH_TEMPLATE([HAVE_NCURSESW], [Define to 1 if you have the `ncursesw' library.])
+@@ -6432,8 +6432,6 @@ AH_TEMPLATE([HAVE_NCURSESW], [Define to 1 if you have the `ncursesw' library.])
  AC_CHECK_HEADERS([curses.h ncurses.h])
  
  AS_VAR_IF([ac_cv_header_ncurses_h], [yes], [
@@ -58,15 +58,15 @@ index 33dfd41aa9..8b87deac81 100644
      PKG_CHECK_MODULES([CURSES], [ncursesw], [
        AC_DEFINE([HAVE_NCURSESW], [1])
        have_curses=ncursesw
-@@ -6439,7 +6437,6 @@ AS_VAR_IF([ac_cv_header_ncurses_h], [yes], [
+@@ -6447,7 +6445,6 @@ AS_VAR_IF([ac_cv_header_ncurses_h], [yes], [
          ])
        ])
      ])
 -  fi
  
    AS_VAR_IF([have_curses], [no], [
      PKG_CHECK_MODULES([CURSES], [ncurses], [
-@@ -6488,8 +6485,6 @@ AC_CHECK_HEADERS([panel.h])
+@@ -6496,8 +6493,6 @@ AC_CHECK_HEADERS([panel.h])
  
  AS_VAR_IF([ac_cv_header_panel_h], [yes], [
  
@@ -75,7 +75,7 @@ index 33dfd41aa9..8b87deac81 100644
      AS_VAR_IF([have_curses], [ncursesw], [
        PKG_CHECK_MODULES([PANEL], [panelw], [
          have_panel=panelw
-@@ -6503,7 +6498,6 @@ AS_VAR_IF([ac_cv_header_panel_h], [yes], [
+@@ -6511,7 +6506,6 @@ AS_VAR_IF([ac_cv_header_panel_h], [yes], [
          ])
        ])
      ])

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 656d027af328edb2cc196eec7e726fa62e2ce3f2 Mon Sep 17 00:00:00 2001`
	`1`	`+From 4f915b76bf52d9a4a355e0047b0ac8d66a8ec336 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/22] Win32: Change FD_SETSIZE from 512 to 2048`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 74d8297f1fb827e069ba795a00dd5cd40cd01a49 Mon Sep 17 00:00:00 2001`
	`1`	`+From 89ac50838fc3c43b63342d7b9c434fe68e11d678 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/22] Win32: Do not download externals`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 6acef4cee4f5107be46225f159cf5a5238f2c6bd Mon Sep 17 00:00:00 2001`
	`1`	`+From 1add97729db66a572b0ad8f26186071c6d1b19fd Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Ray Donnelly <mingw.android@gmail.com>`
`3`	`3`	`Date: Tue, 5 Dec 2017 22:47:59 +0000`
`4`	`4`	`Subject: [PATCH 03/22] Fix find_library so that it looks in sys.prefix/lib`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 842497c29a668817928af9ab966b2a63bfbcd294 Mon Sep 17 00:00:00 2001`
	`1`	`+From 4c0b20c3cebfcb8eaa0406c7b626322d01087492 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/22] 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 4437c580909034fa0e660b38cfca148bb0345f1d Mon Sep 17 00:00:00 2001`
	`1`	`+From 0a0c280aec453af0a3904a696dfc71175e6dc246 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/22] Unvendor sqlite3`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 021e22856ef3ef90a67b0d18d4678752a7ee0ad6 Mon Sep 17 00:00:00 2001`
	`1`	`+From eaf0b19149ec28a231e0c73e36b2a6fdc29c250e Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Isuru Fernando <isuruf@gmail.com>`
`3`	`3`	`Date: Wed, 7 Oct 2020 10:08:30 -0500`
`4`	`4`	`Subject: [PATCH 10/22] Fix TZPATH on windows`