From 676bac3f6aeec82ca1cb7d951f3395de3ae4bc16 Mon Sep 17 00:00:00 2001 From: Ian Fitchet Date: Tue, 11 Aug 2026 15:17:48 +0100 Subject: [PATCH 1/2] first pass --- recipe/meta.yaml | 4 +- recipe/patches/0000-branding.patch | 7 +- ...2-Change-FD_SETSIZE-from-512-to-2048.patch | 9 +- ...0002-Win32-Do-not-download-externals.patch | 7 +- ...-so-that-it-looks-in-sys.prefix-lib-.patch | 11 +- ...-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch | 11 +- recipe/patches/0005-Unvendor-openssl.patch | 85 ++++++------ recipe/patches/0006-Unvendor-sqlite3.patch | 10 +- ...dd-CondaEcosystemModifyDllSearchPath.patch | 9 +- recipe/patches/0008-Doing-d1trimfile.patch | 129 ++---------------- ...009-Allow-cross-compiling-for-Darwin.patch | 11 +- .../patches/0010-Fix-TZPATH-on-windows.patch | 9 +- ...ch-work-with-SYSTEM_VERSION_COMPAT-1.patch | 11 +- recipe/patches/0012-Unvendor-bzip2.patch | 7 +- recipe/patches/0013-Unvendor-libffi.patch | 4 +- recipe/patches/0014-Unvendor-tcltk.patch | 7 +- recipe/patches/0015-unvendor-xz.patch | 33 +++-- recipe/patches/0016-unvendor-zlib.patch | 7 +- ...-not-pass-g-to-GCC-when-not-Py_DEBUG.patch | 15 +- recipe/patches/0018-Unvendor-expat.patch | 46 ++++--- .../patches/0019-Remove-unused-readelf.patch | 9 +- .../0021-Override-configure-LIBFFI.patch | 11 +- recipe/patches/0022-Unvendor-libmpdec.patch | 7 +- ...Win32-fallback-expat-HashSalt16Bytes.patch | 14 +- 24 files changed, 218 insertions(+), 255 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f144f8ee0..4c89a9900 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.13.14" %} +{% set version = "3.13.15" %} {% set dev = "" %} {% set dev_ = "" %} {% set ver2 = '.'.join(version.split('.')[0:2]) %} @@ -61,7 +61,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 }}/ - sha256: 639e43243c620a308f968213df9e00f2f8f62332f7adbaa7a7eeb9783057c690 + sha256: 1e66a7945a48390ee4c2a4268a0e4185884059a13c4aab6d148aa208deea4a76 {% endif %} patches: - patches/0000-branding.patch diff --git a/recipe/patches/0000-branding.patch b/recipe/patches/0000-branding.patch index dd50cbedc..175e14966 100644 --- a/recipe/patches/0000-branding.patch +++ b/recipe/patches/0000-branding.patch @@ -1,7 +1,7 @@ -From 3be7cda6e0b58051fcf761a694fd6065dc9d84a1 Mon Sep 17 00:00:00 2001 +From 7e2bf4f82f0b1301259acb23a9f467d42aab63de Mon Sep 17 00:00:00 2001 From: Charles Bousseau Date: Wed, 14 Jun 2023 22:52:16 -0400 -Subject: [PATCH 01/22] branding +Subject: [PATCH 00/22] branding --- Lib/platform.py | 2 +- @@ -46,3 +46,6 @@ index 226b2f999a6..0c7ff163257 100644 #endif PyOS_snprintf(version, sizeof(version), buildinfo_format, PY_VERSION, Py_GetBuildInfo(), Py_GetCompiler()); +-- +2.51.0 + 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 index e3dca4d18..eaa76b120 100644 --- 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 243e8bbee5535580bbd84dec07f7490ab1833a49 Mon Sep 17 00:00:00 2001 +From 4232d5634a4a27959efbc6af96ea36110b6469fc Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:53:55 +0100 -Subject: [PATCH 02/22] Win32: Change FD_SETSIZE from 512 to 2048 +Subject: [PATCH 01/22] Win32: Change FD_SETSIZE from 512 to 2048 https://github.com/ContinuumIO/anaconda-issues/issues/1241 --- @@ -9,7 +9,7 @@ https://github.com/ContinuumIO/anaconda-issues/issues/1241 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c -index 5bd9b7732a4..504f79e8998 100644 +index f69df694d44..1761960c928 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -45,7 +45,7 @@ @@ -21,3 +21,6 @@ index 5bd9b7732a4..504f79e8998 100644 #endif #if defined(HAVE_POLL_H) +-- +2.51.0 + diff --git a/recipe/patches/0002-Win32-Do-not-download-externals.patch b/recipe/patches/0002-Win32-Do-not-download-externals.patch index fe9a3b9e3..821254ace 100644 --- a/recipe/patches/0002-Win32-Do-not-download-externals.patch +++ b/recipe/patches/0002-Win32-Do-not-download-externals.patch @@ -1,7 +1,7 @@ -From b659c518f68ae106e1ac47cd2c0635359d393ec0 Mon Sep 17 00:00:00 2001 +From 3e51707f43e569918b3f5eac73e45813b25afb8c Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 7 Sep 2017 11:35:47 +0100 -Subject: [PATCH 03/22] Win32: Do not download externals +Subject: [PATCH 02/22] Win32: Do not download externals --- PCbuild/build.bat | 2 +- @@ -20,3 +20,6 @@ index 6c76f09a071..7c93d81b503 100644 if "%do_pgo%" EQU "true" if "%platf%" EQU "x64" ( if "%PROCESSOR_ARCHITEW6432%" NEQ "AMD64" if "%PROCESSOR_ARCHITECTURE%" NEQ "AMD64" ( +-- +2.51.0 + 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 index 33fd8b382..76947b2fd 100644 --- 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 4924a4432345994ee345573bd6b26f1c18106a0c Mon Sep 17 00:00:00 2001 +From bb7a3a91990e8b2badcd7e5b5b6f15374dd51961 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 5 Dec 2017 22:47:59 +0000 -Subject: [PATCH 04/22] Fix find_library so that it looks in sys.prefix/lib +Subject: [PATCH 03/22] Fix find_library so that it looks in sys.prefix/lib first --- @@ -25,7 +25,7 @@ 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 117bf06cb01..2e9fa474ace 100644 +index 43f10dedce8..33f914a0028 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py @@ -70,7 +70,8 @@ def find_library(name): @@ -38,7 +38,7 @@ index 117bf06cb01..2e9fa474ace 100644 '%s.dylib' % name, '%s.framework/%s' % (name, name)] for name in possible: -@@ -336,10 +337,30 @@ def _findLib_ld(name): +@@ -335,10 +336,30 @@ def _findLib_ld(name): pass # result will be None return result @@ -71,3 +71,6 @@ index 117bf06cb01..2e9fa474ace 100644 ################################################################ # test code +-- +2.51.0 + 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 index 7f342818c..71168b81d 100644 --- 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 27c50d3e1469817ec1cd8379118484f4689f427b Mon Sep 17 00:00:00 2001 +From 97b310738a30e0a821c9d43f4bf6bdfae914e5bb Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 27 Oct 2018 18:48:30 +0100 -Subject: [PATCH 05/22] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS +Subject: [PATCH 04/22] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS is not 0 Co-authored-by: Isuru Fernando @@ -25,7 +25,7 @@ index d0128b20fae..e7cfeba25ec 100644 !progname_to_dict(dict, "real_executable") || !library_to_dict(dict, "library") || diff --git a/Modules/getpath.py b/Modules/getpath.py -index 1f1bfcb4f64..344900c05e7 100644 +index 8a4bf6d735e..37cfee3d2e7 100644 --- a/Modules/getpath.py +++ b/Modules/getpath.py @@ -52,6 +52,7 @@ @@ -36,7 +36,7 @@ index 1f1bfcb4f64..344900c05e7 100644 # ** Values calculated at runtime ** # config -- [in/out] dict of the PyConfig structure -@@ -681,7 +682,7 @@ def search_up(prefix, *landmarks, test=isfile): +@@ -674,7 +675,7 @@ def search_up(prefix, *landmarks, test=isfile): else: pythonpath.append(joinpath(prefix, ZIP_LANDMARK)) @@ -1196,3 +1196,6 @@ index 00000000000..a73ea8a0e91 + } + return hPython3 != NULL; +} +-- +2.51.0 + diff --git a/recipe/patches/0005-Unvendor-openssl.patch b/recipe/patches/0005-Unvendor-openssl.patch index cd84348b8..bbdb03272 100644 --- a/recipe/patches/0005-Unvendor-openssl.patch +++ b/recipe/patches/0005-Unvendor-openssl.patch @@ -1,22 +1,22 @@ -From a5bc981e40a00c01ddd9c82015cc987358721c89 Mon Sep 17 00:00:00 2001 -From: Nehal J Wani -Date: Sat, 24 Nov 2018 20:38:02 -0600 -Subject: [PATCH 05/24] Unvendor openssl - -Co-authored-by: Isuru Fernando ---- - PCbuild/openssl.props | 14 ++------------ - PCbuild/openssl.vcxproj | 32 -------------------------------- - PCbuild/python.props | 11 +---------- - PCbuild/python.vcxproj | 3 +++ - PCbuild/pythonw.vcxproj | 3 +++ - 5 files changed, 9 insertions(+), 54 deletions(-) - -diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props -index 5fd708b211e..044cefd95ea 100644 ---- a/PCbuild/openssl.props -+++ b/PCbuild/openssl.props -@@ -2,10 +2,10 @@ +From 6f72185c07381690b0a69aa8c288d5c1dfc6497d Mon Sep 17 00:00:00 2001 +From: Nehal J Wani +Date: Sat, 24 Nov 2018 20:38:02 -0600 +Subject: [PATCH 05/22] Unvendor openssl + +Co-authored-by: Isuru Fernando +--- + PCbuild/openssl.props | 14 ++------------ + PCbuild/openssl.vcxproj | 32 -------------------------------- + PCbuild/python.props | 11 +---------- + PCbuild/python.vcxproj | 3 +++ + PCbuild/pythonw.vcxproj | 3 +++ + 5 files changed, 9 insertions(+), 54 deletions(-) + +diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props +index 5fd708b211e..044cefd95ea 100644 +--- a/PCbuild/openssl.props ++++ b/PCbuild/openssl.props +@@ -2,10 +2,10 @@ @@ -29,7 +29,7 @@ index 5fd708b211e..044cefd95ea 100644 ws2_32.lib;libcrypto.lib;libssl.lib;%(AdditionalDependencies) -@@ -21,14 +21,4 @@ +@@ -21,14 +21,4 @@ <_SSLDLL Include="$(opensslOutDir)\libssl$(_DLLSuffix).dll" /> <_SSLDLL Include="$(opensslOutDir)\libssl$(_DLLSuffix).pdb" /> @@ -44,11 +44,11 @@ index 5fd708b211e..044cefd95ea 100644 - - -diff --git a/PCbuild/openssl.vcxproj b/PCbuild/openssl.vcxproj -index 7ca750dda8f..17eee400ebb 100644 ---- a/PCbuild/openssl.vcxproj -+++ b/PCbuild/openssl.vcxproj -@@ -60,40 +60,8 @@ +diff --git a/PCbuild/openssl.vcxproj b/PCbuild/openssl.vcxproj +index 7ca750dda8f..17eee400ebb 100644 +--- a/PCbuild/openssl.vcxproj ++++ b/PCbuild/openssl.vcxproj +@@ -60,40 +60,8 @@ @@ -89,11 +89,11 @@ index 7ca750dda8f..17eee400ebb 100644 -diff --git a/PCbuild/python.props b/PCbuild/python.props -index 62f42d0ce9c..0ec0914facd 100644 ---- a/PCbuild/python.props -+++ b/PCbuild/python.props -@@ -61,6 +61,7 @@ +diff --git a/PCbuild/python.props b/PCbuild/python.props +index 64e4cd08db7..d0d58ce57e4 100644 +--- a/PCbuild/python.props ++++ b/PCbuild/python.props +@@ -62,6 +62,7 @@ $(EXTERNALS_DIR) @@ -101,7 +101,7 @@ index 62f42d0ce9c..0ec0914facd 100644 $([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`)) $(ExternalsDir)\ -@@ -68,18 +69,8 @@ +@@ -69,18 +70,8 @@ @@ -120,11 +120,11 @@ index 62f42d0ce9c..0ec0914facd 100644 -diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj -index 4a99ffc677c..b11fb617963 100644 ---- a/PCbuild/python.vcxproj -+++ b/PCbuild/python.vcxproj -@@ -110,6 +110,9 @@ +diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj +index 4a99ffc677c..b11fb617963 100644 +--- a/PCbuild/python.vcxproj ++++ b/PCbuild/python.vcxproj +@@ -110,6 +110,9 @@ @@ -134,11 +134,11 @@ index 4a99ffc677c..b11fb617963 100644 -diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj -index d08c210ef8a..87f71ca59d1 100644 ---- a/PCbuild/pythonw.vcxproj -+++ b/PCbuild/pythonw.vcxproj -@@ -102,6 +102,9 @@ +diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj +index d08c210ef8a..87f71ca59d1 100644 +--- a/PCbuild/pythonw.vcxproj ++++ b/PCbuild/pythonw.vcxproj +@@ -102,6 +102,9 @@ @@ -148,3 +148,6 @@ index d08c210ef8a..87f71ca59d1 100644 +-- +2.51.0 + diff --git a/recipe/patches/0006-Unvendor-sqlite3.patch b/recipe/patches/0006-Unvendor-sqlite3.patch index dd8ecc459..335e13379 100644 --- a/recipe/patches/0006-Unvendor-sqlite3.patch +++ b/recipe/patches/0006-Unvendor-sqlite3.patch @@ -1,7 +1,7 @@ -From d11ed988e3607d8ed0fe6579cb74a3801b426582 Mon Sep 17 00:00:00 2001 +From a26f438ac80a24cecd65099fa2e55cdeb76cabd4 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Tue, 5 Oct 2021 12:42:06 -0700 -Subject: [PATCH 07/22] Unvendor sqlite3 +Subject: [PATCH 06/22] Unvendor sqlite3 --- PCbuild/_sqlite3.vcxproj | 11 +++++------ @@ -27,7 +27,7 @@ index 9ae0a0fc3a0..f482734ba1d 100644 -@@ -127,12 +130,8 @@ +@@ -127,12 +130,7 @@ {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} false @@ -41,7 +41,6 @@ index 9ae0a0fc3a0..f482734ba1d 100644 - \ No newline at end of file -+ diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln index d10e1c46a91..22042bacd9f 100644 --- a/PCbuild/pcbuild.sln @@ -78,3 +77,6 @@ index 6bcc4e913c8..9fe4bb740ab 100644 +-- +2.51.0 + diff --git a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch index d23a835d1..7f68c0f0c 100644 --- a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch +++ b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch @@ -1,7 +1,7 @@ -From 56771c46459a48ea9ef30c4233b7e0aa1918335a Mon Sep 17 00:00:00 2001 +From d84960ff67f0fd088f73ef6b4e76beca899df447 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 24 Dec 2019 18:37:17 +0100 -Subject: [PATCH 08/22] Add CondaEcosystemModifyDllSearchPath() +Subject: [PATCH 07/22] 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 1 file changed, 96 insertions(+) diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c -index a8852a88f94..f1a919bad51 100644 +index fbbc38bc8e1..05e587d8ea5 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -74,6 +74,10 @@ @@ -153,3 +153,6 @@ index a8852a88f94..f1a919bad51 100644 return _PyRuntimeState_Init(&_PyRuntime); } +-- +2.51.0 + diff --git a/recipe/patches/0008-Doing-d1trimfile.patch b/recipe/patches/0008-Doing-d1trimfile.patch index 31d0c9321..aef757bc6 100644 --- a/recipe/patches/0008-Doing-d1trimfile.patch +++ b/recipe/patches/0008-Doing-d1trimfile.patch @@ -1,7 +1,7 @@ -From a66e3ee2cf3812fca68d1f68e90b2d5fee4989e9 Mon Sep 17 00:00:00 2001 +From 0494b7cc108babd53877738c80a8275fbcde099b Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 31 Dec 2019 21:47:47 +0100 -Subject: [PATCH 09/22] Doing d1trimfile +Subject: [PATCH 08/22] Doing d1trimfile --- PCbuild/_asyncio.vcxproj | 20 ++++++++++++++++++++ @@ -93,13 +93,6 @@ index e0dc6ec187a..30ad0dc4864 100644 -@@ -125,4 +129,4 @@ - - - -- -\ No newline at end of file -+ diff --git a/PCbuild/_ctypes.vcxproj b/PCbuild/_ctypes.vcxproj index 63d5fa49cd4..6329f3d960f 100644 --- a/PCbuild/_ctypes.vcxproj @@ -146,13 +139,6 @@ index 97354739c09..b200d592906 100644 -@@ -109,4 +129,4 @@ - - - -- -\ No newline at end of file -+ diff --git a/PCbuild/_decimal.vcxproj b/PCbuild/_decimal.vcxproj index ee7421484b5..e9d60b4db1a 100644 --- a/PCbuild/_decimal.vcxproj @@ -169,7 +155,7 @@ index ee7421484b5..e9d60b4db1a 100644 diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj -index 8c9c0e42f7f..94da21f6425 100644 +index 46e34a5ea82..fb1589557da 100644 --- a/PCbuild/_elementtree.vcxproj +++ b/PCbuild/_elementtree.vcxproj @@ -94,7 +94,11 @@ @@ -261,13 +247,6 @@ index a65397f532a..451ca375990 100644 -@@ -115,4 +127,4 @@ - - - -- -\ No newline at end of file -+ diff --git a/PCbuild/_overlapped.vcxproj b/PCbuild/_overlapped.vcxproj index 224bf05d530..f7efa63f562 100644 --- a/PCbuild/_overlapped.vcxproj @@ -291,13 +270,6 @@ index 224bf05d530..f7efa63f562 100644 -@@ -111,4 +123,4 @@ - - - -- -\ No newline at end of file -+ diff --git a/PCbuild/_queue.vcxproj b/PCbuild/_queue.vcxproj index 80a1c3c6a4a..8d4555299ae 100644 --- a/PCbuild/_queue.vcxproj @@ -352,13 +324,6 @@ index 41af0895921..45ecbcc4641 100644 -@@ -114,4 +126,4 @@ - - - -- -\ No newline at end of file -+ diff --git a/PCbuild/_sqlite3.vcxproj b/PCbuild/_sqlite3.vcxproj index f482734ba1d..70943daa021 100644 --- a/PCbuild/_sqlite3.vcxproj @@ -428,15 +393,8 @@ index 4e721e8ce09..3fec7516ed5 100644 -@@ -106,4 +126,4 @@ - - - -- -\ No newline at end of file -+ diff --git a/PCbuild/_testcapi.vcxproj b/PCbuild/_testcapi.vcxproj -index 44dbf234813..ec791cfe60c 100644 +index 02d755f8d5c..f28e1a4fc3b 100644 --- a/PCbuild/_testcapi.vcxproj +++ b/PCbuild/_testcapi.vcxproj @@ -92,6 +92,26 @@ @@ -481,13 +439,6 @@ index 69d312b17a5..bee3326ef8d 100644 Console -@@ -112,4 +116,4 @@ - - - -- -\ No newline at end of file -+ diff --git a/PCbuild/_testembed.vcxproj b/PCbuild/_testembed.vcxproj index a7ea8787e0c..e8edb3dd752 100644 --- a/PCbuild/_testembed.vcxproj @@ -503,13 +454,6 @@ index a7ea8787e0c..e8edb3dd752 100644 Console -@@ -109,4 +113,4 @@ - - - -- -\ No newline at end of file -+ diff --git a/PCbuild/_testimportmultiple.vcxproj b/PCbuild/_testimportmultiple.vcxproj index c35ac83c1c7..c9d7f5d22b7 100644 --- a/PCbuild/_testimportmultiple.vcxproj @@ -587,13 +531,6 @@ index e730fe308ab..a6f13ef31dc 100644 Console -@@ -112,4 +116,4 @@ - - - -- -\ No newline at end of file -+ diff --git a/PCbuild/_tkinter.vcxproj b/PCbuild/_tkinter.vcxproj index 117488a0162..5ca877b5f2e 100644 --- a/PCbuild/_tkinter.vcxproj @@ -609,13 +546,6 @@ index 117488a0162..5ca877b5f2e 100644 $(tcltkLib);%(AdditionalDependencies) -@@ -134,4 +138,4 @@ - - - -- -\ No newline at end of file -+ diff --git a/PCbuild/liblzma.vcxproj b/PCbuild/liblzma.vcxproj index 4dd42ab98a9..7c2dbc7e701 100644 --- a/PCbuild/liblzma.vcxproj @@ -632,7 +562,7 @@ index 4dd42ab98a9..7c2dbc7e701 100644 diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj -index dc9161a8b29..3bcef600a3e 100644 +index 8499402f0a9..833ab5e9f7e 100644 --- a/PCbuild/pyexpat.vcxproj +++ b/PCbuild/pyexpat.vcxproj @@ -92,6 +92,10 @@ @@ -676,15 +606,8 @@ index ea432d6bc9a..50397324a20 100644 version.lib;shlwapi.lib;%(AdditionalDependencies) -@@ -114,4 +118,4 @@ - - - -- -\ No newline at end of file -+ diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj -index 203c1712e87..a9db4b1175e 100644 +index b11fb617963..dacf01e264f 100644 --- a/PCbuild/python.vcxproj +++ b/PCbuild/python.vcxproj @@ -92,6 +92,10 @@ @@ -713,13 +636,6 @@ index 235ea1cf9d3..d861f6c6a43 100644 true -@@ -107,4 +111,4 @@ - - - -- -\ No newline at end of file -+ diff --git a/PCbuild/python_uwp.vcxproj b/PCbuild/python_uwp.vcxproj index fb27e9e7122..f8dc841ef1b 100644 --- a/PCbuild/python_uwp.vcxproj @@ -747,7 +663,7 @@ index 70212903c83..b85cca2cd51 100644 $(zlibDir);%(AdditionalIncludeDirectories) _USRDLL;Py_BUILD_CORE;Py_BUILD_CORE_BUILTIN;Py_ENABLE_SHARED;MS_DLL_ID="$(SysWinVer)";%(PreprocessorDefinitions) diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj -index 6023781339d..8e71612522b 100644 +index 87f71ca59d1..32873d3db15 100644 --- a/PCbuild/pythonw.vcxproj +++ b/PCbuild/pythonw.vcxproj @@ -96,6 +96,18 @@ @@ -797,13 +713,6 @@ index e50b69aefe2..d64a06b5e6e 100644 shell32.lib;pathcch.lib;%(AdditionalDependencies) -@@ -111,4 +115,4 @@ - - - -- -\ No newline at end of file -+ diff --git a/PCbuild/select.vcxproj b/PCbuild/select.vcxproj index d7448fd4d72..9fab5e8a638 100644 --- a/PCbuild/select.vcxproj @@ -827,13 +736,6 @@ index d7448fd4d72..9fab5e8a638 100644 -@@ -110,4 +122,4 @@ - - - -- -\ No newline at end of file -+ diff --git a/PCbuild/unicodedata.vcxproj b/PCbuild/unicodedata.vcxproj index 781f938e2ab..3870c85adf7 100644 --- a/PCbuild/unicodedata.vcxproj @@ -865,13 +767,6 @@ index 781f938e2ab..3870c85adf7 100644 -@@ -110,4 +130,4 @@ - - - -- -\ No newline at end of file -+ diff --git a/PCbuild/venvlauncher.vcxproj b/PCbuild/venvlauncher.vcxproj index 1193e032245..6855845d131 100644 --- a/PCbuild/venvlauncher.vcxproj @@ -925,13 +820,6 @@ index c26029b15a3..1e543b31c41 100644 -@@ -112,4 +124,4 @@ - - - -- -\ No newline at end of file -+ diff --git a/PCbuild/xxlimited.vcxproj b/PCbuild/xxlimited.vcxproj index 093e6920c0b..19dd43c19c2 100644 --- a/PCbuild/xxlimited.vcxproj @@ -966,3 +854,6 @@ index 3f4d4463f24..2572449ba0c 100644 wsock32.lib;%(AdditionalDependencies) +-- +2.51.0 + diff --git a/recipe/patches/0009-Allow-cross-compiling-for-Darwin.patch b/recipe/patches/0009-Allow-cross-compiling-for-Darwin.patch index f967d964d..3ab90f324 100644 --- a/recipe/patches/0009-Allow-cross-compiling-for-Darwin.patch +++ b/recipe/patches/0009-Allow-cross-compiling-for-Darwin.patch @@ -1,7 +1,7 @@ -From 408eaed5384c2bf5dddbacf76781993c8d77f324 Mon Sep 17 00:00:00 2001 +From 25ec62762c6d93d7ba8d529556d09e49df0b8905 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 26 Nov 2020 18:47:37 +0000 -Subject: [PATCH 10/22] Allow cross compiling for Darwin +Subject: [PATCH 09/22] Allow cross compiling for Darwin --- configure | 3 +++ @@ -9,7 +9,7 @@ Subject: [PATCH 10/22] Allow cross compiling for Darwin 2 files changed, 6 insertions(+) diff --git a/configure b/configure -index 1cd1f690f7b..f64218fc4ba 100755 +index 51e657ff0d6..c2f79686253 100755 --- a/configure +++ b/configure @@ -4052,6 +4052,9 @@ then @@ -23,7 +23,7 @@ index 1cd1f690f7b..f64218fc4ba 100755 ac_sys_system=Cygwin ;; diff --git a/configure.ac b/configure.ac -index 3fcb18922c5..848cc8b6ad4 100644 +index f93a9f29b39..1441b18f4e3 100644 --- a/configure.ac +++ b/configure.ac @@ -324,6 +324,9 @@ then @@ -36,3 +36,6 @@ index 3fcb18922c5..848cc8b6ad4 100644 *-*-cygwin*) ac_sys_system=Cygwin ;; +-- +2.51.0 + diff --git a/recipe/patches/0010-Fix-TZPATH-on-windows.patch b/recipe/patches/0010-Fix-TZPATH-on-windows.patch index c119ebff4..94d9d0411 100644 --- a/recipe/patches/0010-Fix-TZPATH-on-windows.patch +++ b/recipe/patches/0010-Fix-TZPATH-on-windows.patch @@ -1,14 +1,14 @@ -From 6135660bb977dbe7a89ccf5c975ac555338a9dbc Mon Sep 17 00:00:00 2001 +From 4642adfb51d2dc0e580ee0a2779fc9eab69046e5 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 7 Oct 2020 10:08:30 -0500 -Subject: [PATCH 11/22] Fix TZPATH on windows +Subject: [PATCH 10/22] Fix TZPATH on windows --- Lib/sysconfig/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py -index 510c7b9568a..c45f79fbc29 100644 +index 43edebce347..2df352ff415 100644 --- a/Lib/sysconfig/__init__.py +++ b/Lib/sysconfig/__init__.py @@ -499,6 +499,7 @@ def _init_config_vars(): @@ -19,3 +19,6 @@ index 510c7b9568a..c45f79fbc29 100644 if os.name == 'posix': _init_posix(_CONFIG_VARS) if _HAS_USER_BASE: +-- +2.51.0 + 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 index 4a79b87c0..f6d16c18c 100644 --- 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 20df89dab23139f045f741d658d8ed6320bfb7f2 Mon Sep 17 00:00:00 2001 +From 22c5018ecba6cdd2710882ffbb59158bf70d636b Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 25 Jan 2021 03:28:08 -0600 -Subject: [PATCH 12/22] Make dyld search work with SYSTEM_VERSION_COMPAT=1 +Subject: [PATCH 11/22] 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,10 +15,10 @@ 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 f9864ebb735..c413621f01b 100644 +index 066cbb99bdd..57eb2d94570 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c -@@ -1489,7 +1489,7 @@ copy_com_pointer(PyObject *self, PyObject *args) +@@ -1491,7 +1491,7 @@ copy_com_pointer(PyObject *self, PyObject *args) #ifdef HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH # ifdef HAVE_BUILTIN_AVAILABLE # define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME \ @@ -27,3 +27,6 @@ index f9864ebb735..c413621f01b 100644 # else # define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME \ (_dyld_shared_cache_contains_path != NULL) +-- +2.51.0 + diff --git a/recipe/patches/0012-Unvendor-bzip2.patch b/recipe/patches/0012-Unvendor-bzip2.patch index 579fcb832..c2bdfe285 100644 --- a/recipe/patches/0012-Unvendor-bzip2.patch +++ b/recipe/patches/0012-Unvendor-bzip2.patch @@ -1,7 +1,7 @@ -From 14478b1496481d6cb9acde6325a3a6f26f6fb180 Mon Sep 17 00:00:00 2001 +From 78b2f4b9ec0ba2473418f9a2f3abfaed3cbcb8bf Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 02:56:27 -0700 -Subject: [PATCH 13/22] Unvendor bzip2 +Subject: [PATCH 12/22] Unvendor bzip2 --- PCbuild/_bz2.vcxproj | 15 +++++---------- @@ -85,3 +85,6 @@ index 7c0b5162537..c1f960608c3 100644 Header Files\bzip2 +-- +2.51.0 + diff --git a/recipe/patches/0013-Unvendor-libffi.patch b/recipe/patches/0013-Unvendor-libffi.patch index 0352578b4..3d05cc78f 100644 --- a/recipe/patches/0013-Unvendor-libffi.patch +++ b/recipe/patches/0013-Unvendor-libffi.patch @@ -1,7 +1,7 @@ -From d9535423ad32a0dfb33f2f41d4013f196a7d8092 Mon Sep 17 00:00:00 2001 +From e486848bdc4b7790d4cb0a691505876b7fb871fc Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 03:07:40 -0700 -Subject: [PATCH 14/22] Unvendor libffi +Subject: [PATCH 13/22] Unvendor libffi --- PCbuild/libffi.props | 17 ++++------------- diff --git a/recipe/patches/0014-Unvendor-tcltk.patch b/recipe/patches/0014-Unvendor-tcltk.patch index e540d3d74..77fdb94d9 100644 --- a/recipe/patches/0014-Unvendor-tcltk.patch +++ b/recipe/patches/0014-Unvendor-tcltk.patch @@ -1,7 +1,7 @@ -From 8aab75b3f8fae98b3299c65bc0f0981357e393d9 Mon Sep 17 00:00:00 2001 +From 63f622a277d61dd0a70964bebfaa807eb52bff3d Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 20 Aug 2021 10:23:51 -0700 -Subject: [PATCH 15/22] Unvendor tcltk +Subject: [PATCH 14/22] Unvendor tcltk --- PCbuild/_tkinter.vcxproj | 6 ------ @@ -42,3 +42,6 @@ index 2aa3b7a1e42..8f951c9eecd 100644 $(tcltkDir)\bin\tclsh$(TclMajorVersion)$(TclMinorVersion)t.exe $(tcltkDir)\..\win32\bin\tclsh$(TclMajorVersion)$(TclMinorVersion)t.exe +-- +2.51.0 + diff --git a/recipe/patches/0015-unvendor-xz.patch b/recipe/patches/0015-unvendor-xz.patch index c515d8e5c..d0121e42c 100644 --- a/recipe/patches/0015-unvendor-xz.patch +++ b/recipe/patches/0015-unvendor-xz.patch @@ -1,17 +1,17 @@ -From a77e9e4513e9c2e85ea106cbde7d3b669f36e27d Mon Sep 17 00:00:00 2001 -From: Isuru Fernando -Date: Sat, 25 Sep 2021 10:07:05 -0700 -Subject: [PATCH 16/22] unvendor xz - ---- - PCbuild/_lzma.vcxproj | 10 +++------- - 1 file changed, 3 insertions(+), 7 deletions(-) - -diff --git a/PCbuild/_lzma.vcxproj b/PCbuild/_lzma.vcxproj -index 321f41d8d27..bd7d6c64b10 100644 ---- a/PCbuild/_lzma.vcxproj -+++ b/PCbuild/_lzma.vcxproj -@@ -93,15 +93,15 @@ +From 1ded3e22f51338e7cc72d1485b1909f34476d408 Mon Sep 17 00:00:00 2001 +From: Isuru Fernando +Date: Sat, 25 Sep 2021 10:07:05 -0700 +Subject: [PATCH 15/22] unvendor xz + +--- + PCbuild/_lzma.vcxproj | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +diff --git a/PCbuild/_lzma.vcxproj b/PCbuild/_lzma.vcxproj +index 321f41d8d27..6811fd1709e 100644 +--- a/PCbuild/_lzma.vcxproj ++++ b/PCbuild/_lzma.vcxproj +@@ -93,15 +93,15 @@ @@ -30,7 +30,7 @@ index 321f41d8d27..bd7d6c64b10 100644 -@@ -115,10 +115,6 @@ +@@ -115,10 +115,6 @@ {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} false @@ -41,3 +41,6 @@ index 321f41d8d27..bd7d6c64b10 100644 +-- +2.51.0 + diff --git a/recipe/patches/0016-unvendor-zlib.patch b/recipe/patches/0016-unvendor-zlib.patch index df14a37c2..feba2c667 100644 --- a/recipe/patches/0016-unvendor-zlib.patch +++ b/recipe/patches/0016-unvendor-zlib.patch @@ -1,7 +1,7 @@ -From 44c02cd037fbad6611aeeff9dc423469f779ea45 Mon Sep 17 00:00:00 2001 +From f4a1fddfbcdd4684cae1c2ad134b77d7aebbd8a8 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Sep 2021 15:21:55 -0700 -Subject: [PATCH 17/22] unvendor zlib +Subject: [PATCH 16/22] unvendor zlib --- PCbuild/pythoncore.vcxproj | 33 ++------------- @@ -163,3 +163,6 @@ index 3eed5a9465b..0892b669d6b 100644 Python +-- +2.51.0 + 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 index 87c7d4ed0..d73033bbf 100644 --- 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 0e595a174f9d6ca318d1314896fe57840f82708a Mon Sep 17 00:00:00 2001 +From f9ef759d7b3e02a947dfd6011ba4bc8a42a1a317 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:45:28 +0100 -Subject: [PATCH 18/22] Do not pass -g to GCC when not Py_DEBUG +Subject: [PATCH 17/22] Do not pass -g to GCC when not Py_DEBUG This bloats our exe and our modules a lot. --- @@ -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 f64218fc4ba..98219b342ab 100755 +index c2f79686253..a0d34059bf6 100755 --- a/configure +++ b/configure @@ -5668,9 +5668,9 @@ if test $ac_test_CFLAGS; then @@ -25,7 +25,7 @@ index f64218fc4ba..98219b342ab 100755 fi else if test "$GCC" = yes; then -@@ -9519,7 +9519,7 @@ then +@@ -9607,7 +9607,7 @@ then if test "$Py_DEBUG" = 'true' ; then OPT="-g $PYDEBUG_CFLAGS -Wall" else @@ -35,10 +35,10 @@ index f64218fc4ba..98219b342ab 100755 ;; *) diff --git a/configure.ac b/configure.ac -index 848cc8b6ad4..2d0794d696a 100644 +index 1441b18f4e3..7c24b3f90cd 100644 --- a/configure.ac +++ b/configure.ac -@@ -2386,7 +2386,7 @@ then +@@ -2411,7 +2411,7 @@ then if test "$Py_DEBUG" = 'true' ; then OPT="-g $PYDEBUG_CFLAGS -Wall" else @@ -47,3 +47,6 @@ index 848cc8b6ad4..2d0794d696a 100644 fi ;; *) +-- +2.51.0 + diff --git a/recipe/patches/0018-Unvendor-expat.patch b/recipe/patches/0018-Unvendor-expat.patch index 27a8343e3..5745d2a03 100644 --- a/recipe/patches/0018-Unvendor-expat.patch +++ b/recipe/patches/0018-Unvendor-expat.patch @@ -1,20 +1,20 @@ -From dab65766fabb2cb902d4d9f525f2cf61e76dd3dc Mon Sep 17 00:00:00 2001 +From 75803cc325238777a52d05eddddce26132a14a63 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Mar 2023 23:07:10 -0500 -Subject: [PATCH 19/22] Unvendor expat +Subject: [PATCH 18/22] Unvendor expat --- - PCbuild/_elementtree.vcxproj | 25 ++---------- - PCbuild/_elementtree.vcxproj.filters | 58 +--------------------------- - PCbuild/pyexpat.vcxproj | 12 ++---- - PCbuild/pyexpat.vcxproj.filters | 19 +-------- - 4 files changed, 10 insertions(+), 104 deletions(-) + PCbuild/_elementtree.vcxproj | 26 ++---------- + PCbuild/_elementtree.vcxproj.filters | 61 +--------------------------- + PCbuild/pyexpat.vcxproj | 14 ++----- + PCbuild/pyexpat.vcxproj.filters | 25 +----------- + 4 files changed, 10 insertions(+), 116 deletions(-) diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj -index 94da21f6425..f47bcd8e4e6 100644 +index fb1589557da..f47bcd8e4e6 100644 --- a/PCbuild/_elementtree.vcxproj +++ b/PCbuild/_elementtree.vcxproj -@@ -93,36 +93,19 @@ +@@ -93,37 +93,19 @@ @@ -36,10 +36,11 @@ index 94da21f6425..f47bcd8e4e6 100644 - - - +- - - - -- +- - - - @@ -56,10 +57,10 @@ index 94da21f6425..f47bcd8e4e6 100644 diff --git a/PCbuild/_elementtree.vcxproj.filters b/PCbuild/_elementtree.vcxproj.filters -index bc14e31f32b..7cc8e9a3b9b 100644 +index f6b55d8ff82..7cc8e9a3b9b 100644 --- a/PCbuild/_elementtree.vcxproj.filters +++ b/PCbuild/_elementtree.vcxproj.filters -@@ -17,70 +17,14 @@ +@@ -17,73 +17,14 @@ {f99990ba-cd06-40cc-8f28-d2d424ec13be} @@ -79,6 +80,9 @@ index bc14e31f32b..7cc8e9a3b9b 100644 - - Header Files\expat - +- +- Header Files\expat +- - - Header Files\expat - @@ -88,7 +92,7 @@ index bc14e31f32b..7cc8e9a3b9b 100644 - - Header Files\expat - -- +- - Header Files\expat - - @@ -133,10 +137,10 @@ index bc14e31f32b..7cc8e9a3b9b 100644 \ No newline at end of file + diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj -index 3bcef600a3e..ec5d4b64b3c 100644 +index 833ab5e9f7e..ec5d4b64b3c 100644 --- a/PCbuild/pyexpat.vcxproj +++ b/PCbuild/pyexpat.vcxproj -@@ -90,23 +90,19 @@ +@@ -90,25 +90,19 @@ @@ -153,6 +157,8 @@ index 3bcef600a3e..ec5d4b64b3c 100644 + - +- +- - - - @@ -165,14 +171,20 @@ index 3bcef600a3e..ec5d4b64b3c 100644 diff --git a/PCbuild/pyexpat.vcxproj.filters b/PCbuild/pyexpat.vcxproj.filters -index fd22fc8c477..41c73b434b9 100644 +index 230531033fc..41c73b434b9 100644 --- a/PCbuild/pyexpat.vcxproj.filters +++ b/PCbuild/pyexpat.vcxproj.filters -@@ -11,31 +11,14 @@ +@@ -11,37 +11,14 @@ {f1dbbdb5-41e5-4a88-bf8e-13da010c0ce4} - +- +- Header Files +- +- +- Header Files +- - - Header Files - diff --git a/recipe/patches/0019-Remove-unused-readelf.patch b/recipe/patches/0019-Remove-unused-readelf.patch index 691e4ff4f..6d770c8f7 100644 --- a/recipe/patches/0019-Remove-unused-readelf.patch +++ b/recipe/patches/0019-Remove-unused-readelf.patch @@ -1,7 +1,7 @@ -From 056cef59759a2566c7f83d2100f8eba3f15e28c2 Mon Sep 17 00:00:00 2001 +From 1f55fb8df6c2dfc6b856edf1209c4af6e17f1d83 Mon Sep 17 00:00:00 2001 From: Charles Bousseau Date: Thu, 25 May 2023 17:56:53 -0400 -Subject: [PATCH 20/22] Remove unused readelf +Subject: [PATCH 19/22] Remove unused readelf readelf has been dropped. .. date: 2022-11-02-10-56-40 @@ -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 3bd4495f95b..bb1935d39f1 100644 +index 2363b99a25c..a486ab9ead4 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -38,7 +38,6 @@ CC= @CC@ @@ -26,3 +26,6 @@ index 3bd4495f95b..bb1935d39f1 100644 SOABI= @SOABI@ ABIFLAGS= @ABIFLAGS@ ABI_THREAD= @ABI_THREAD@ +-- +2.51.0 + diff --git a/recipe/patches/0021-Override-configure-LIBFFI.patch b/recipe/patches/0021-Override-configure-LIBFFI.patch index 5befa51d2..d70e616dc 100644 --- a/recipe/patches/0021-Override-configure-LIBFFI.patch +++ b/recipe/patches/0021-Override-configure-LIBFFI.patch @@ -1,17 +1,17 @@ -From 8f9ec7e3faf49c70a1233ab78fc8c5b6bedcde15 Mon Sep 17 00:00:00 2001 +From 58a6eaf064e4ca47f060c99b1565129a938a7e24 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 5 Sep 2023 21:51:31 +0200 -Subject: [PATCH 21/22] Override configure LIBFFI +Subject: [PATCH 20/22] Override configure LIBFFI --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 98219b342ab..271dbcf3652 100755 +index a0d34059bf6..bbcc4695e68 100755 --- a/configure +++ b/configure -@@ -14293,7 +14293,7 @@ if test "x$ac_cv_lib_ffi_ffi_call" = xyes +@@ -14585,7 +14585,7 @@ if test "x$ac_cv_lib_ffi_ffi_call" = xyes then : have_libffi=yes @@ -20,3 +20,6 @@ index 98219b342ab..271dbcf3652 100755 LIBFFI_LIBS="-lffi" fi +-- +2.51.0 + diff --git a/recipe/patches/0022-Unvendor-libmpdec.patch b/recipe/patches/0022-Unvendor-libmpdec.patch index f5bde6ff1..42f19a1e9 100644 --- a/recipe/patches/0022-Unvendor-libmpdec.patch +++ b/recipe/patches/0022-Unvendor-libmpdec.patch @@ -1,7 +1,7 @@ -From 7a45c16b07d400d842c59d1b247a74983b981e24 Mon Sep 17 00:00:00 2001 +From 02a755f24366e2764f8f03794ddba6cd69f1668d Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 16 Aug 2024 21:34:43 -0500 -Subject: [PATCH 22/22] Unvendor libmpdec +Subject: [PATCH 21/22] Unvendor libmpdec --- PCbuild/_decimal.vcxproj | 50 +++++----------------------------------- @@ -83,3 +83,6 @@ index e9d60b4db1a..0f49d7923f5 100644 +-- +2.51.0 + diff --git a/recipe/patches/0023-Win32-fallback-expat-HashSalt16Bytes.patch b/recipe/patches/0023-Win32-fallback-expat-HashSalt16Bytes.patch index d17598c25..c7e969f4f 100644 --- a/recipe/patches/0023-Win32-fallback-expat-HashSalt16Bytes.patch +++ b/recipe/patches/0023-Win32-fallback-expat-HashSalt16Bytes.patch @@ -1,7 +1,7 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 3c361f8dad5758cd5137d2bacf342ac2bf267834 Mon Sep 17 00:00:00 2001 From: Anaconda Recipes -Date: Tue, 17 Jun 2026 12:00:00 +0000 -Subject: [PATCH 23/23] Win32 fallback expat HashSalt16Bytes +Date: Wed, 17 Jun 2026 12:00:00 +0000 +Subject: [PATCH 22/22] Win32 fallback expat HashSalt16Bytes pkgs/main libexpat 2.8.x on win-64 ships 2.8 headers but does not export XML_SetHashSalt16Bytes from expat.lib. Fall back to the 8-byte hash salt API @@ -11,9 +11,10 @@ until libexpat is rebuilt (gh-149018). 1 file changed, 11 insertions(+) diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c +index 9e5d84eb5e2..73fc763a8da 100644 --- a/Modules/pyexpat.c +++ b/Modules/pyexpat.c -@@ -1463,7 +1463,14 @@ +@@ -1464,7 +1464,14 @@ newxmlparseobject(pyexpat_state *state, const char *encoding, } #if XML_COMBINED_VERSION >= 20800 /* This feature was added upstream in libexpat 2.8.0. */ @@ -28,7 +29,7 @@ diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c #elif XML_COMBINED_VERSION >= 20100 /* This feature was added upstream in libexpat 2.1.0. */ XML_SetHashSalt(self->itself, -@@ -2327,7 +2334,11 @@ +@@ -2328,7 +2335,11 @@ pyexpat_exec(PyObject *mod) capi->SetHashSalt = NULL; #endif #if XML_COMBINED_VERSION >= 20800 @@ -40,3 +41,6 @@ diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c #else capi->SetHashSalt16Bytes = NULL; #endif +-- +2.51.0 + From 0dae96435e051b68a4e4dcfa6218755aab268d0d Mon Sep 17 00:00:00 2001 From: Ian Fitchet Date: Tue, 11 Aug 2026 16:26:00 +0100 Subject: [PATCH 2/2] broken patch --- recipe/patches/0006-Unvendor-sqlite3.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/patches/0006-Unvendor-sqlite3.patch b/recipe/patches/0006-Unvendor-sqlite3.patch index 335e13379..38cad2de8 100644 --- a/recipe/patches/0006-Unvendor-sqlite3.patch +++ b/recipe/patches/0006-Unvendor-sqlite3.patch @@ -27,7 +27,7 @@ index 9ae0a0fc3a0..f482734ba1d 100644 -@@ -127,12 +130,7 @@ +@@ -127,12 +130,8 @@ {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} false @@ -41,6 +41,7 @@ index 9ae0a0fc3a0..f482734ba1d 100644 - \ No newline at end of file ++ diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln index d10e1c46a91..22042bacd9f 100644 --- a/PCbuild/pcbuild.sln