From f960482279ecff8b45f649882be6449c208e3a35 Mon Sep 17 00:00:00 2001 From: Michael Sarahan Date: Sat, 3 Oct 2026 16:58:23 -0500 Subject: [PATCH 1/4] [3.14] Update Python to 3.14.8 Bring the upstream security release into the matching conda-forge series. Verify the source checksum, reset the base build number, and refresh Windows dependency patches so they apply to the updated source. --- recipe/meta.yaml | 6 ++--- recipe/patches/0005-Unvendor-openssl.patch | 4 ++-- recipe/patches/0018-Unvendor-expat.patch | 26 ++++++++++++++-------- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 04fa0972b..db8c430f0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,10 +1,10 @@ -{% set version = "3.14.7" %} +{% set version = "3.14.8" %} {% set dev = "" %} {% set dev_ = "" %} {% set ver2 = '.'.join(version.split('.')[0:2]) %} {% set ver2nd = ''.join(version.split('.')[0:2]) %} {% set ver3nd = ''.join(version.split('.')[0:3]) %} -{% set build_number = 6 %} +{% set build_number = 0 %} # this makes the linter happy {% set channel_targets = channel_targets or 'conda-forge main' %} @@ -64,7 +64,7 @@ package: source: - url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz # sha256 from: https://www.python.org/downloads/release/python-{{ ver3nd }}{{ dev }}/ - sha256: 3b48dac8fb59f62eaa67ac83c1eb12bda1b7a08406dd286e252c11a66be27f81 + sha256: c2215904f02b175596dc49351585104f4bc20341e1c47378b26a2c274360ce73 patches: - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch - patches/0002-Win32-Do-not-download-externals.patch diff --git a/recipe/patches/0005-Unvendor-openssl.patch b/recipe/patches/0005-Unvendor-openssl.patch index 10332df80..216678f7d 100644 --- a/recipe/patches/0005-Unvendor-openssl.patch +++ b/recipe/patches/0005-Unvendor-openssl.patch @@ -112,8 +112,8 @@ index ce4a7781fbd..253aa66f477 100644 - $(libffiDir)$(ArchName)\ - $(libffiOutDir)include $(ExternalsDir)\mpdecimal-4.0.0\ -- $(ExternalsDir)openssl-3.5.7\ -- $(ExternalsDir)openssl-bin-3.5.7\$(ArchName)\ +- $(ExternalsDir)openssl-3.5.9\ +- $(ExternalsDir)openssl-bin-3.5.9\$(ArchName)\ - $(opensslOutDir)include $(ExternalsDir)\nasm-2.11.06\ - $(ExternalsDir)\zlib-1.3.1\ diff --git a/recipe/patches/0018-Unvendor-expat.patch b/recipe/patches/0018-Unvendor-expat.patch index 0a12366c4..ed4c9dcd9 100644 --- a/recipe/patches/0018-Unvendor-expat.patch +++ b/recipe/patches/0018-Unvendor-expat.patch @@ -4,17 +4,17 @@ Date: Wed, 29 Mar 2023 23:07:10 -0500 Subject: [PATCH 18/26] Unvendor expat --- - PCbuild/_elementtree.vcxproj | 26 ++---------- - PCbuild/_elementtree.vcxproj.filters | 59 ---------------------------- - PCbuild/pyexpat.vcxproj | 14 ++----- - PCbuild/pyexpat.vcxproj.filters | 23 ----------- - 4 files changed, 8 insertions(+), 114 deletions(-) + PCbuild/_elementtree.vcxproj | 27 ++---------- + PCbuild/_elementtree.vcxproj.filters | 62 ---------------------------- + PCbuild/pyexpat.vcxproj | 15 ++----- + PCbuild/pyexpat.vcxproj.filters | 26 ----------- + 4 files changed, 8 insertions(+), 122 deletions(-) diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj index fb1589557da..f47bcd8e4e6 100644 --- a/PCbuild/_elementtree.vcxproj +++ b/PCbuild/_elementtree.vcxproj -@@ -93,37 +93,19 @@ +@@ -93,38 +93,19 @@ @@ -37,6 +37,7 @@ index fb1589557da..f47bcd8e4e6 100644 - - - +- - - - @@ -60,7 +61,7 @@ diff --git a/PCbuild/_elementtree.vcxproj.filters b/PCbuild/_elementtree.vcxproj index f6b55d8ff82..88a13faa683 100644 --- a/PCbuild/_elementtree.vcxproj.filters +++ b/PCbuild/_elementtree.vcxproj.filters -@@ -17,69 +17,10 @@ +@@ -17,72 +17,10 @@ {f99990ba-cd06-40cc-8f28-d2d424ec13be} @@ -83,6 +84,9 @@ index f6b55d8ff82..88a13faa683 100644 - - Header Files\expat - +- +- Header Files\expat +- - - Header Files\expat - @@ -134,7 +138,7 @@ diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj index 833ab5e9f7e..ec5d4b64b3c 100644 --- a/PCbuild/pyexpat.vcxproj +++ b/PCbuild/pyexpat.vcxproj -@@ -90,25 +90,19 @@ +@@ -90,26 +90,19 @@ @@ -152,6 +156,7 @@ index 833ab5e9f7e..ec5d4b64b3c 100644 - - +- - - - @@ -168,7 +173,7 @@ diff --git a/PCbuild/pyexpat.vcxproj.filters b/PCbuild/pyexpat.vcxproj.filters index 230531033fc..b8280b4049c 100644 --- a/PCbuild/pyexpat.vcxproj.filters +++ b/PCbuild/pyexpat.vcxproj.filters -@@ -11,33 +11,10 @@ +@@ -11,36 +11,10 @@ {f1dbbdb5-41e5-4a88-bf8e-13da010c0ce4} @@ -176,6 +181,9 @@ index 230531033fc..b8280b4049c 100644 - - Header Files - +- +- Header Files +- - - Header Files - From 29134447968261521a07ec5518369ad38f75b0fb Mon Sep 17 00:00:00 2001 From: Michael Sarahan Date: Mon, 5 Oct 2026 13:10:39 -0500 Subject: [PATCH 2/4] Regenerate patches and document the reviewed refresh workflow --- AGENTS.md | 16 ++++ ...2-Change-FD_SETSIZE-from-512-to-2048.patch | 4 +- ...0002-Win32-Do-not-download-externals.patch | 4 +- ...-so-that-it-looks-in-sys.prefix-lib-.patch | 6 +- ...-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch | 6 +- recipe/patches/0005-Unvendor-openssl.patch | 12 +-- recipe/patches/0006-Unvendor-sqlite3.patch | 8 +- ...dd-CondaEcosystemModifyDllSearchPath.patch | 4 +- recipe/patches/0008-Doing-d1trimfile.patch | 84 +++++++++---------- .../patches/0009-cross-compile-darwin.patch | 8 +- .../patches/0010-Fix-TZPATH-on-windows.patch | 4 +- ...ch-work-with-SYSTEM_VERSION_COMPAT-1.patch | 4 +- recipe/patches/0012-Unvendor-bzip2.patch | 6 +- recipe/patches/0013-Unvendor-libffi.patch | 4 +- recipe/patches/0014-Unvendor-tcltk.patch | 10 +-- recipe/patches/0015-unvendor-xz.patch | 4 +- recipe/patches/0016-unvendor-zlib.patch | 8 +- ...-not-pass-g-to-GCC-when-not-Py_DEBUG.patch | 12 +-- recipe/patches/0018-Unvendor-expat.patch | 12 +-- .../patches/0019-Remove-unused-readelf.patch | 4 +- ...t-checksharedmods-if-cross-compiling.patch | 8 +- .../0021-Override-configure-LIBFFI.patch | 6 +- recipe/patches/0022-Unvendor-libmpdec.patch | 4 +- recipe/patches/0023-Brand-conda-forge.patch | 6 +- ...d_t-as-it-might-conflict-with-the-ac.patch | 18 ++-- recipe/patches/0025-Unvendor-zstd.patch | 16 ++-- ...IL_DISABLED-in-windows-to-match-unix.patch | 4 +- recipe/patches/README.md | 64 ++++++++++---- 28 files changed, 196 insertions(+), 150 deletions(-) create mode 100644 AGENTS.md diff --git a/AGENTS.md b/AGENTS.md new file mode 100644 index 000000000..01329dd98 --- /dev/null +++ b/AGENTS.md @@ -0,0 +1,16 @@ +# Agent guidance + +## Updating Python and its patches + +Before preparing a Python version bump or editing `recipe/patches/*.patch`, read +[the patch regeneration instructions](recipe/patches/README.md) and +[`make-mixed-crlf-patch.py`](recipe/patches/make-mixed-crlf-patch.py) on the target +version branch. If either is absent, consult the corresponding file on upstream +`main`. The repository's patch instructions are authoritative. + +Follow the README's complete regeneration and validation workflow before +committing or publishing patch changes. Keep that workflow in the README rather +than duplicating it here. + +Run the applicable recipe and pre-commit checks, and report any checks that could +not be completed. 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 30e9f0d44..d189e1b88 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,4 +1,4 @@ -From 204c40c00697419f29b214864bab80a8f01d804f Mon Sep 17 00:00:00 2001 +From 275618e5cdec09c87dd24c8d06ac56ffda45ea7c Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:53:55 +0100 Subject: [PATCH 01/26] Win32: Change FD_SETSIZE from 512 to 2048 @@ -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 42bf1157ccc..fb3c27a9ac5 100644 +index 42bf1157cc..fb3c27a9ac 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -44,7 +44,7 @@ diff --git a/recipe/patches/0002-Win32-Do-not-download-externals.patch b/recipe/patches/0002-Win32-Do-not-download-externals.patch index c740fddbc..be9b2ec24 100644 --- 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 aaa85ea3a1edeb2e93ae12b60c7958084814df37 Mon Sep 17 00:00:00 2001 +From ee840291f4b658ab5614eef4960fb9cad036774a Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 7 Sep 2017 11:35:47 +0100 Subject: [PATCH 02/26] Win32: Do not download externals @@ -8,7 +8,7 @@ Subject: [PATCH 02/26] Win32: Do not download externals 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PCbuild/build.bat b/PCbuild/build.bat -index 60235704886..717a35c9d7e 100644 +index 6023570488..717a35c9d7 100644 --- a/PCbuild/build.bat +++ b/PCbuild/build.bat @@ -113,7 +113,7 @@ if "%IncludeSSL%"=="" set IncludeSSL=true 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 48eb0e5f7..a9e60fc47 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,4 +1,4 @@ -From 43ac24ca1c1083b50966846f07969a9c6454e22f Mon Sep 17 00:00:00 2001 +From 83f7bc0623f8d26b4de528532d00856d5ce45efb Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 5 Dec 2017 22:47:59 +0000 Subject: [PATCH 03/26] Fix find_library so that it looks in sys.prefix/lib @@ -10,7 +10,7 @@ Subject: [PATCH 03/26] Fix find_library so that it looks in sys.prefix/lib 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/Lib/ctypes/macholib/dyld.py b/Lib/ctypes/macholib/dyld.py -index 583c47daff3..ab9b01c87e2 100644 +index 583c47daff..ab9b01c87e 100644 --- a/Lib/ctypes/macholib/dyld.py +++ b/Lib/ctypes/macholib/dyld.py @@ -93,6 +93,10 @@ def dyld_executable_path_search(name, executable_path=None): @@ -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 cd67fd87efc..9acb6e8c25f 100644 +index cd67fd87ef..9acb6e8c25 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py @@ -135,7 +135,8 @@ def dllist(): 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 e35b7a1d8..6ddb8a13e 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,4 +1,4 @@ -From 21533f279cfe2060e7aa355b860547e7982b5c89 Mon Sep 17 00:00:00 2001 +From 6001f676b1297438ed8bcd346ee83511f06ffef5 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 27 Oct 2018 18:48:30 +0100 Subject: [PATCH 04/26] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS @@ -11,7 +11,7 @@ Co-authored-by: Isuru Fernando 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Modules/getpath.c b/Modules/getpath.c -index 1e75993480a..ff96c8e1990 100644 +index 1e75993480..ff96c8e199 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -937,6 +937,7 @@ _PyConfig_InitPathConfig(PyConfig *config, int compute_path_config) @@ -23,7 +23,7 @@ index 1e75993480a..ff96c8e1990 100644 !progname_to_dict(dict, "real_executable") || !library_to_dict(dict, "library") || diff --git a/Modules/getpath.py b/Modules/getpath.py -index 0e4f1e87e73..df5d89d857a 100644 +index 0e4f1e87e7..df5d89d857 100644 --- a/Modules/getpath.py +++ b/Modules/getpath.py @@ -52,6 +52,7 @@ diff --git a/recipe/patches/0005-Unvendor-openssl.patch b/recipe/patches/0005-Unvendor-openssl.patch index 216678f7d..5fbe9b9ad 100644 --- a/recipe/patches/0005-Unvendor-openssl.patch +++ b/recipe/patches/0005-Unvendor-openssl.patch @@ -1,4 +1,4 @@ -From 91c3e5bdab6497eca2cfcb6838df9dc3d8317726 Mon Sep 17 00:00:00 2001 +From aacc0fc576a7c68a1a5141ae2d5eb132ba9edf4e Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sat, 24 Nov 2018 20:38:02 -0600 Subject: [PATCH 05/26] Unvendor openssl @@ -13,7 +13,7 @@ Co-authored-by: Isuru Fernando 5 files changed, 9 insertions(+), 56 deletions(-) diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props -index 5fd708b211e..044cefd95ea 100644 +index 5fd708b211..044cefd95e 100644 --- a/PCbuild/openssl.props +++ b/PCbuild/openssl.props @@ -2,10 +2,10 @@ @@ -45,7 +45,7 @@ index 5fd708b211e..044cefd95ea 100644 - diff --git a/PCbuild/openssl.vcxproj b/PCbuild/openssl.vcxproj -index 7ca750dda8f..17eee400ebb 100644 +index 7ca750dda8..17eee400eb 100644 --- a/PCbuild/openssl.vcxproj +++ b/PCbuild/openssl.vcxproj @@ -60,40 +60,8 @@ @@ -90,7 +90,7 @@ index 7ca750dda8f..17eee400ebb 100644 diff --git a/PCbuild/python.props b/PCbuild/python.props -index ce4a7781fbd..253aa66f477 100644 +index e255ac58c9..05c8c7cd83 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -68,6 +68,7 @@ @@ -123,7 +123,7 @@ index ce4a7781fbd..253aa66f477 100644 diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj -index 70dabaa3c8b..ac5f96ebafc 100644 +index 70dabaa3c8..ac5f96ebaf 100644 --- a/PCbuild/python.vcxproj +++ b/PCbuild/python.vcxproj @@ -110,6 +110,9 @@ @@ -137,7 +137,7 @@ index 70dabaa3c8b..ac5f96ebafc 100644 diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj -index c6a5b8ce90a..74bd19144f9 100644 +index c6a5b8ce90..74bd19144f 100644 --- a/PCbuild/pythonw.vcxproj +++ b/PCbuild/pythonw.vcxproj @@ -105,6 +105,9 @@ diff --git a/recipe/patches/0006-Unvendor-sqlite3.patch b/recipe/patches/0006-Unvendor-sqlite3.patch index 3b9954a43..e5daff4e6 100644 --- a/recipe/patches/0006-Unvendor-sqlite3.patch +++ b/recipe/patches/0006-Unvendor-sqlite3.patch @@ -1,4 +1,4 @@ -From 6fa5924da6eddfc530015bef11bc498913c630b1 Mon Sep 17 00:00:00 2001 +From 8f0a9f199ee952017e0a7dd58c35288cb17a745f Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Tue, 5 Oct 2021 12:42:06 -0700 Subject: [PATCH 06/26] Unvendor sqlite3 @@ -10,7 +10,7 @@ Subject: [PATCH 06/26] Unvendor sqlite3 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/PCbuild/_sqlite3.vcxproj b/PCbuild/_sqlite3.vcxproj -index 9ae0a0fc3a0..f482734ba1d 100644 +index 9ae0a0fc3a..f482734ba1 100644 --- a/PCbuild/_sqlite3.vcxproj +++ b/PCbuild/_sqlite3.vcxproj @@ -93,9 +93,12 @@ @@ -43,7 +43,7 @@ index 9ae0a0fc3a0..f482734ba1d 100644 \ No newline at end of file + diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln -index 7296ea75301..9dd5e07ad8a 100644 +index 7296ea7530..9dd5e07ad8 100644 --- a/PCbuild/pcbuild.sln +++ b/PCbuild/pcbuild.sln @@ -72,8 +72,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_elementtree", "_elementtre @@ -56,7 +56,7 @@ index 7296ea75301..9dd5e07ad8a 100644 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcxproj", "{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}" diff --git a/PCbuild/sqlite3.vcxproj b/PCbuild/sqlite3.vcxproj -index f12ec348b37..f9e5e449a49 100644 +index f12ec348b3..f9e5e449a4 100644 --- a/PCbuild/sqlite3.vcxproj +++ b/PCbuild/sqlite3.vcxproj @@ -88,12 +88,12 @@ diff --git a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch index e6045d500..d8e628422 100644 --- a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch +++ b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch @@ -1,4 +1,4 @@ -From e2a8b753a8c2420a2f0b793a40725264a116bbda Mon Sep 17 00:00:00 2001 +From 8bd6853dd8154238dafcfd095ed2a5fb09b3fa24 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 24 Dec 2019 18:37:17 +0100 Subject: [PATCH 07/26] Add CondaEcosystemModifyDllSearchPath() @@ -33,7 +33,7 @@ Co-authored-by: Isuru Fernando 1 file changed, 95 insertions(+) diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c -index fe55ec7caff..cabd42067d7 100644 +index fe55ec7caf..cabd42067d 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -80,6 +80,10 @@ diff --git a/recipe/patches/0008-Doing-d1trimfile.patch b/recipe/patches/0008-Doing-d1trimfile.patch index de0b80034..156fd01cf 100644 --- a/recipe/patches/0008-Doing-d1trimfile.patch +++ b/recipe/patches/0008-Doing-d1trimfile.patch @@ -1,4 +1,4 @@ -From efdb6286b645c1c277f4c12f468a7bde97e876cc Mon Sep 17 00:00:00 2001 +From b8e7996b66c272dc094913645041a8f24146be5e Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 31 Dec 2019 21:47:47 +0100 Subject: [PATCH 08/26] Doing d1trimfile @@ -48,7 +48,7 @@ Subject: [PATCH 08/26] Doing d1trimfile 41 files changed, 367 insertions(+), 19 deletions(-) diff --git a/PCbuild/_asyncio.vcxproj b/PCbuild/_asyncio.vcxproj -index 76b0ffd660d..1402860e19b 100644 +index 76b0ffd660..1402860e19 100644 --- a/PCbuild/_asyncio.vcxproj +++ b/PCbuild/_asyncio.vcxproj @@ -91,6 +91,26 @@ @@ -79,7 +79,7 @@ index 76b0ffd660d..1402860e19b 100644 diff --git a/PCbuild/_bz2.vcxproj b/PCbuild/_bz2.vcxproj -index e0dc6ec187a..30ad0dc4864 100644 +index e0dc6ec187..30ad0dc486 100644 --- a/PCbuild/_bz2.vcxproj +++ b/PCbuild/_bz2.vcxproj @@ -97,6 +97,10 @@ @@ -101,7 +101,7 @@ index e0dc6ec187a..30ad0dc4864 100644 \ No newline at end of file + diff --git a/PCbuild/_ctypes.vcxproj b/PCbuild/_ctypes.vcxproj -index 63d5fa49cd4..6329f3d960f 100644 +index 63d5fa49cd..6329f3d960 100644 --- a/PCbuild/_ctypes.vcxproj +++ b/PCbuild/_ctypes.vcxproj @@ -95,6 +95,10 @@ @@ -116,7 +116,7 @@ index 63d5fa49cd4..6329f3d960f 100644 /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions) diff --git a/PCbuild/_ctypes_test.vcxproj b/PCbuild/_ctypes_test.vcxproj -index f15b80852e3..e565441ca4c 100644 +index f15b80852e..e565441ca4 100644 --- a/PCbuild/_ctypes_test.vcxproj +++ b/PCbuild/_ctypes_test.vcxproj @@ -93,6 +93,26 @@ @@ -147,7 +147,7 @@ index f15b80852e3..e565441ca4c 100644 diff --git a/PCbuild/_decimal.vcxproj b/PCbuild/_decimal.vcxproj -index ee7421484b5..e9d60b4db1a 100644 +index ee7421484b..e9d60b4db1 100644 --- a/PCbuild/_decimal.vcxproj +++ b/PCbuild/_decimal.vcxproj @@ -99,6 +99,10 @@ @@ -162,7 +162,7 @@ index ee7421484b5..e9d60b4db1a 100644 diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj -index 46e34a5ea82..fb1589557da 100644 +index c102da85e9..8d5117e804 100644 --- a/PCbuild/_elementtree.vcxproj +++ b/PCbuild/_elementtree.vcxproj @@ -94,7 +94,11 @@ @@ -179,7 +179,7 @@ index 46e34a5ea82..fb1589557da 100644 diff --git a/PCbuild/_freeze_module.vcxproj b/PCbuild/_freeze_module.vcxproj -index 5ceddf759b8..6b113ad8c2e 100644 +index 5ceddf759b..6b113ad8c2 100644 --- a/PCbuild/_freeze_module.vcxproj +++ b/PCbuild/_freeze_module.vcxproj @@ -93,6 +93,10 @@ @@ -194,7 +194,7 @@ index 5ceddf759b8..6b113ad8c2e 100644 Console diff --git a/PCbuild/_hashlib.vcxproj b/PCbuild/_hashlib.vcxproj -index 2cd205224bc..1ff3a9cdeca 100644 +index 2cd205224b..1ff3a9cdec 100644 --- a/PCbuild/_hashlib.vcxproj +++ b/PCbuild/_hashlib.vcxproj @@ -96,6 +96,18 @@ @@ -217,7 +217,7 @@ index 2cd205224bc..1ff3a9cdeca 100644 diff --git a/PCbuild/_lzma.vcxproj b/PCbuild/_lzma.vcxproj -index 40107d4b76c..321f41d8d27 100644 +index 40107d4b76..321f41d8d2 100644 --- a/PCbuild/_lzma.vcxproj +++ b/PCbuild/_lzma.vcxproj @@ -95,6 +95,10 @@ @@ -232,7 +232,7 @@ index 40107d4b76c..321f41d8d27 100644 $(OutDir)liblzma$(PyDebugExt).lib;%(AdditionalDependencies) diff --git a/PCbuild/_multiprocessing.vcxproj b/PCbuild/_multiprocessing.vcxproj -index a65397f532a..451ca375990 100644 +index a65397f532..451ca37599 100644 --- a/PCbuild/_multiprocessing.vcxproj +++ b/PCbuild/_multiprocessing.vcxproj @@ -95,6 +95,18 @@ @@ -262,7 +262,7 @@ index a65397f532a..451ca375990 100644 \ No newline at end of file + diff --git a/PCbuild/_overlapped.vcxproj b/PCbuild/_overlapped.vcxproj -index 224bf05d530..f7efa63f562 100644 +index 224bf05d53..f7efa63f56 100644 --- a/PCbuild/_overlapped.vcxproj +++ b/PCbuild/_overlapped.vcxproj @@ -95,6 +95,18 @@ @@ -292,7 +292,7 @@ index 224bf05d530..f7efa63f562 100644 \ No newline at end of file + diff --git a/PCbuild/_queue.vcxproj b/PCbuild/_queue.vcxproj -index 80a1c3c6a4a..8d4555299ae 100644 +index 80a1c3c6a4..8d4555299a 100644 --- a/PCbuild/_queue.vcxproj +++ b/PCbuild/_queue.vcxproj @@ -91,6 +91,26 @@ @@ -323,7 +323,7 @@ index 80a1c3c6a4a..8d4555299ae 100644 diff --git a/PCbuild/_socket.vcxproj b/PCbuild/_socket.vcxproj -index 41af0895921..45ecbcc4641 100644 +index 41af089592..45ecbcc464 100644 --- a/PCbuild/_socket.vcxproj +++ b/PCbuild/_socket.vcxproj @@ -95,6 +95,18 @@ @@ -353,7 +353,7 @@ index 41af0895921..45ecbcc4641 100644 \ No newline at end of file + diff --git a/PCbuild/_sqlite3.vcxproj b/PCbuild/_sqlite3.vcxproj -index f482734ba1d..70943daa021 100644 +index f482734ba1..70943daa02 100644 --- a/PCbuild/_sqlite3.vcxproj +++ b/PCbuild/_sqlite3.vcxproj @@ -95,6 +95,10 @@ @@ -368,7 +368,7 @@ index f482734ba1d..70943daa021 100644 $(condaDir)\lib\sqlite3.lib;%(AdditionalDependencies) diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj -index ce21f992ff8..34561515c12 100644 +index ce21f992ff..34561515c1 100644 --- a/PCbuild/_ssl.vcxproj +++ b/PCbuild/_ssl.vcxproj @@ -96,6 +96,18 @@ @@ -391,7 +391,7 @@ index ce21f992ff8..34561515c12 100644 diff --git a/PCbuild/_testbuffer.vcxproj b/PCbuild/_testbuffer.vcxproj -index 4e721e8ce09..3fec7516ed5 100644 +index 4e721e8ce0..3fec7516ed 100644 --- a/PCbuild/_testbuffer.vcxproj +++ b/PCbuild/_testbuffer.vcxproj @@ -92,6 +92,26 @@ @@ -429,7 +429,7 @@ index 4e721e8ce09..3fec7516ed5 100644 \ No newline at end of file + diff --git a/PCbuild/_testcapi.vcxproj b/PCbuild/_testcapi.vcxproj -index 51c4bcc6b47..ccc81a417fa 100644 +index 51c4bcc6b4..ccc81a417f 100644 --- a/PCbuild/_testcapi.vcxproj +++ b/PCbuild/_testcapi.vcxproj @@ -92,6 +92,26 @@ @@ -460,7 +460,7 @@ index 51c4bcc6b47..ccc81a417fa 100644 diff --git a/PCbuild/_testconsole.vcxproj b/PCbuild/_testconsole.vcxproj -index 69d312b17a5..bee3326ef8d 100644 +index 69d312b17a..bee3326ef8 100644 --- a/PCbuild/_testconsole.vcxproj +++ b/PCbuild/_testconsole.vcxproj @@ -92,6 +92,10 @@ @@ -482,7 +482,7 @@ index 69d312b17a5..bee3326ef8d 100644 \ No newline at end of file + diff --git a/PCbuild/_testembed.vcxproj b/PCbuild/_testembed.vcxproj -index a7ea8787e0c..e8edb3dd752 100644 +index a7ea8787e0..e8edb3dd75 100644 --- a/PCbuild/_testembed.vcxproj +++ b/PCbuild/_testembed.vcxproj @@ -89,6 +89,10 @@ @@ -504,7 +504,7 @@ index a7ea8787e0c..e8edb3dd752 100644 \ No newline at end of file + diff --git a/PCbuild/_testimportmultiple.vcxproj b/PCbuild/_testimportmultiple.vcxproj -index c35ac83c1c7..c9d7f5d22b7 100644 +index c35ac83c1c..c9d7f5d22b 100644 --- a/PCbuild/_testimportmultiple.vcxproj +++ b/PCbuild/_testimportmultiple.vcxproj @@ -92,6 +92,26 @@ @@ -535,7 +535,7 @@ index c35ac83c1c7..c9d7f5d22b7 100644 diff --git a/PCbuild/_testinternalcapi.vcxproj b/PCbuild/_testinternalcapi.vcxproj -index f7e050b7c74..58c3e10c0f0 100644 +index f7e050b7c7..58c3e10c0f 100644 --- a/PCbuild/_testinternalcapi.vcxproj +++ b/PCbuild/_testinternalcapi.vcxproj @@ -92,6 +92,26 @@ @@ -566,7 +566,7 @@ index f7e050b7c74..58c3e10c0f0 100644 diff --git a/PCbuild/_testmultiphase.vcxproj b/PCbuild/_testmultiphase.vcxproj -index e730fe308ab..a6f13ef31dc 100644 +index e730fe308a..a6f13ef31d 100644 --- a/PCbuild/_testmultiphase.vcxproj +++ b/PCbuild/_testmultiphase.vcxproj @@ -92,6 +92,10 @@ @@ -588,7 +588,7 @@ index e730fe308ab..a6f13ef31dc 100644 \ No newline at end of file + diff --git a/PCbuild/_tkinter.vcxproj b/PCbuild/_tkinter.vcxproj -index 87f6005fffc..de9358312ac 100644 +index 87f6005fff..de9358312a 100644 --- a/PCbuild/_tkinter.vcxproj +++ b/PCbuild/_tkinter.vcxproj @@ -97,6 +97,10 @@ @@ -603,7 +603,7 @@ index 87f6005fffc..de9358312ac 100644 $(tcltkLib);%(AdditionalDependencies) diff --git a/PCbuild/liblzma.vcxproj b/PCbuild/liblzma.vcxproj -index 97938692328..212fb5e1ebc 100644 +index 9793869232..212fb5e1eb 100644 --- a/PCbuild/liblzma.vcxproj +++ b/PCbuild/liblzma.vcxproj @@ -95,6 +95,10 @@ @@ -618,7 +618,7 @@ index 97938692328..212fb5e1ebc 100644 diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj -index 8499402f0a9..833ab5e9f7e 100644 +index 92ecac2f7a..d517f9392b 100644 --- a/PCbuild/pyexpat.vcxproj +++ b/PCbuild/pyexpat.vcxproj @@ -92,6 +92,10 @@ @@ -633,7 +633,7 @@ index 8499402f0a9..833ab5e9f7e 100644 diff --git a/PCbuild/pylauncher.vcxproj b/PCbuild/pylauncher.vcxproj -index ca422ef4d02..0c692649ed6 100644 +index ca422ef4d0..0c692649ed 100644 --- a/PCbuild/pylauncher.vcxproj +++ b/PCbuild/pylauncher.vcxproj @@ -93,6 +93,10 @@ @@ -648,7 +648,7 @@ index ca422ef4d02..0c692649ed6 100644 shell32.lib;pathcch.lib;%(AdditionalDependencies) diff --git a/PCbuild/pyshellext.vcxproj b/PCbuild/pyshellext.vcxproj -index ea432d6bc9a..50397324a20 100644 +index ea432d6bc9..50397324a2 100644 --- a/PCbuild/pyshellext.vcxproj +++ b/PCbuild/pyshellext.vcxproj @@ -92,6 +92,10 @@ @@ -670,7 +670,7 @@ index ea432d6bc9a..50397324a20 100644 \ No newline at end of file + diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj -index ac5f96ebafc..3d0caa906cf 100644 +index ac5f96ebaf..3d0caa906c 100644 --- a/PCbuild/python.vcxproj +++ b/PCbuild/python.vcxproj @@ -92,6 +92,10 @@ @@ -685,7 +685,7 @@ index ac5f96ebafc..3d0caa906cf 100644 Console diff --git a/PCbuild/python3dll.vcxproj b/PCbuild/python3dll.vcxproj -index 235ea1cf9d3..d861f6c6a43 100644 +index 235ea1cf9d..d861f6c6a4 100644 --- a/PCbuild/python3dll.vcxproj +++ b/PCbuild/python3dll.vcxproj @@ -93,6 +93,10 @@ @@ -707,7 +707,7 @@ index 235ea1cf9d3..d861f6c6a43 100644 \ No newline at end of file + diff --git a/PCbuild/python_uwp.vcxproj b/PCbuild/python_uwp.vcxproj -index 3f8772d30b4..d80968e351a 100644 +index 3f8772d30b..d80968e351 100644 --- a/PCbuild/python_uwp.vcxproj +++ b/PCbuild/python_uwp.vcxproj @@ -90,7 +90,7 @@ @@ -720,7 +720,7 @@ index 3f8772d30b4..d80968e351a 100644 windowsapp.lib;%(AdditionalDependencies) diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj -index b911c938563..8e45967a83c 100644 +index 5099e44020..b724db69bd 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -99,7 +99,7 @@ @@ -733,7 +733,7 @@ index b911c938563..8e45967a83c 100644 $(zlibNgDir);$(GeneratedZlibNgDir);%(AdditionalIncludeDirectories) $(GeneratedJitStencilsDir);%(AdditionalIncludeDirectories) diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj -index 74bd19144f9..6fea2e1f70c 100644 +index 74bd19144f..6fea2e1f70 100644 --- a/PCbuild/pythonw.vcxproj +++ b/PCbuild/pythonw.vcxproj @@ -96,6 +96,18 @@ @@ -763,7 +763,7 @@ index 74bd19144f9..6fea2e1f70c 100644 \ No newline at end of file + diff --git a/PCbuild/pythonw_uwp.vcxproj b/PCbuild/pythonw_uwp.vcxproj -index f548d022642..fa4e75f9712 100644 +index f548d02264..fa4e75f971 100644 --- a/PCbuild/pythonw_uwp.vcxproj +++ b/PCbuild/pythonw_uwp.vcxproj @@ -90,7 +90,7 @@ @@ -776,7 +776,7 @@ index f548d022642..fa4e75f9712 100644 windowsapp.lib;%(AdditionalDependencies) diff --git a/PCbuild/pywlauncher.vcxproj b/PCbuild/pywlauncher.vcxproj -index 1694548935a..9be580e2663 100644 +index 1694548935..9be580e266 100644 --- a/PCbuild/pywlauncher.vcxproj +++ b/PCbuild/pywlauncher.vcxproj @@ -93,6 +93,10 @@ @@ -798,7 +798,7 @@ index 1694548935a..9be580e2663 100644 \ No newline at end of file + diff --git a/PCbuild/select.vcxproj b/PCbuild/select.vcxproj -index d7448fd4d72..9fab5e8a638 100644 +index d7448fd4d7..9fab5e8a63 100644 --- a/PCbuild/select.vcxproj +++ b/PCbuild/select.vcxproj @@ -94,6 +94,18 @@ @@ -828,7 +828,7 @@ index d7448fd4d72..9fab5e8a638 100644 \ No newline at end of file + diff --git a/PCbuild/unicodedata.vcxproj b/PCbuild/unicodedata.vcxproj -index 781f938e2ab..3870c85adf7 100644 +index 781f938e2a..3870c85adf 100644 --- a/PCbuild/unicodedata.vcxproj +++ b/PCbuild/unicodedata.vcxproj @@ -91,6 +91,26 @@ @@ -866,7 +866,7 @@ index 781f938e2ab..3870c85adf7 100644 \ No newline at end of file + diff --git a/PCbuild/venvlauncher.vcxproj b/PCbuild/venvlauncher.vcxproj -index abaf3a979af..324aadcd782 100644 +index abaf3a979a..324aadcd78 100644 --- a/PCbuild/venvlauncher.vcxproj +++ b/PCbuild/venvlauncher.vcxproj @@ -94,6 +94,10 @@ @@ -881,7 +881,7 @@ index abaf3a979af..324aadcd782 100644 PY_ICON;%(PreprocessorDefinitions) diff --git a/PCbuild/venvwlauncher.vcxproj b/PCbuild/venvwlauncher.vcxproj -index c58280deb8a..4dacf7f2724 100644 +index c58280deb8..4dacf7f272 100644 --- a/PCbuild/venvwlauncher.vcxproj +++ b/PCbuild/venvwlauncher.vcxproj @@ -94,6 +94,10 @@ @@ -896,7 +896,7 @@ index c58280deb8a..4dacf7f2724 100644 PYW_ICON;%(PreprocessorDefinitions) diff --git a/PCbuild/winsound.vcxproj b/PCbuild/winsound.vcxproj -index c26029b15a3..1e543b31c41 100644 +index c26029b15a..1e543b31c4 100644 --- a/PCbuild/winsound.vcxproj +++ b/PCbuild/winsound.vcxproj @@ -96,6 +96,18 @@ @@ -926,7 +926,7 @@ index c26029b15a3..1e543b31c41 100644 \ No newline at end of file + diff --git a/PCbuild/xxlimited.vcxproj b/PCbuild/xxlimited.vcxproj -index 093e6920c0b..19dd43c19c2 100644 +index 093e6920c0..19dd43c19c 100644 --- a/PCbuild/xxlimited.vcxproj +++ b/PCbuild/xxlimited.vcxproj @@ -93,6 +93,12 @@ @@ -943,7 +943,7 @@ index 093e6920c0b..19dd43c19c2 100644 wsock32.lib;%(AdditionalDependencies) diff --git a/PCbuild/xxlimited_35.vcxproj b/PCbuild/xxlimited_35.vcxproj -index 3f4d4463f24..2572449ba0c 100644 +index 3f4d4463f2..2572449ba0 100644 --- a/PCbuild/xxlimited_35.vcxproj +++ b/PCbuild/xxlimited_35.vcxproj @@ -93,6 +93,12 @@ diff --git a/recipe/patches/0009-cross-compile-darwin.patch b/recipe/patches/0009-cross-compile-darwin.patch index d9a8b6999..5b6cccc78 100644 --- a/recipe/patches/0009-cross-compile-darwin.patch +++ b/recipe/patches/0009-cross-compile-darwin.patch @@ -1,4 +1,4 @@ -From 91eb356ef711a6d9119a017f3572941e174360f9 Mon Sep 17 00:00:00 2001 +From 666b13da654892e802ea1fe8087928a988a7b418 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Fri, 2 Oct 2020 00:03:12 +0200 Subject: [PATCH 09/26] cross compile darwin @@ -11,7 +11,7 @@ By Isuru Fernando. 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Lib/platform.py b/Lib/platform.py -index b017b841311..f7821ae7f28 100644 +index b017b84131..f7821ae7f2 100644 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -477,7 +477,12 @@ def win32_ver(release='', version='', csd='', ptype=''): @@ -29,7 +29,7 @@ index b017b841311..f7821ae7f28 100644 try: import plistlib diff --git a/configure b/configure -index 2cb22a7806f..ad513bfe5fd 100755 +index 88f235951b..00b320f6ad 100755 --- a/configure +++ b/configure @@ -4112,6 +4112,9 @@ then @@ -53,7 +53,7 @@ index 2cb22a7806f..ad513bfe5fd 100755 _host_ident= ;; diff --git a/configure.ac b/configure.ac -index 967d34d47a3..68998aedfbc 100644 +index a082848c50..21ccf04a55 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 index 9fdb8a327..90d4aac8f 100644 --- a/recipe/patches/0010-Fix-TZPATH-on-windows.patch +++ b/recipe/patches/0010-Fix-TZPATH-on-windows.patch @@ -1,4 +1,4 @@ -From 57cb150a6af3b99bdde019fbece1f751e839d68b Mon Sep 17 00:00:00 2001 +From 917d6573ec342716d3a73c431ef7f3330d0c8048 Mon Sep 17 00:00:00 2001 From: Isuru Fernando 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 faf8273bd0b..9e6d9257cf7 100644 +index faf8273bd0..9e6d9257cf 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 index bbb9e4b32..21c6f6e8a 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,4 +1,4 @@ -From b35fc75f5d8900881707f9aed502d11afda49193 Mon Sep 17 00:00:00 2001 +From 2b4b2eb01bb1dc545274401bb22fc1c81e432f55 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 25 Jan 2021 03:28:08 -0600 Subject: [PATCH 11/26] Make dyld search work with SYSTEM_VERSION_COMPAT=1 @@ -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 27b99211ce6..1c9a3a88da5 100644 +index 27b99211ce..1c9a3a88da 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c @@ -1510,7 +1510,7 @@ copy_com_pointer(PyObject *self, PyObject *args) diff --git a/recipe/patches/0012-Unvendor-bzip2.patch b/recipe/patches/0012-Unvendor-bzip2.patch index 7e39069f9..f62e65e94 100644 --- a/recipe/patches/0012-Unvendor-bzip2.patch +++ b/recipe/patches/0012-Unvendor-bzip2.patch @@ -1,4 +1,4 @@ -From e0552ce78971ed4ad8f5e36bf4929812eb619f05 Mon Sep 17 00:00:00 2001 +From e0d4400eac295e5f44dfcfacfc91b3c68b5d3f78 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 02:56:27 -0700 Subject: [PATCH 12/26] Unvendor bzip2 @@ -9,7 +9,7 @@ Subject: [PATCH 12/26] Unvendor bzip2 2 files changed, 7 insertions(+), 36 deletions(-) diff --git a/PCbuild/_bz2.vcxproj b/PCbuild/_bz2.vcxproj -index 30ad0dc4864..1d46cc8198f 100644 +index 30ad0dc486..1d46cc8198 100644 --- a/PCbuild/_bz2.vcxproj +++ b/PCbuild/_bz2.vcxproj @@ -94,7 +94,7 @@ @@ -47,7 +47,7 @@ index 30ad0dc4864..1d46cc8198f 100644 diff --git a/PCbuild/_bz2.vcxproj.filters b/PCbuild/_bz2.vcxproj.filters -index 7c0b5162537..ed9510978f1 100644 +index 7c0b516253..ed9510978f 100644 --- a/PCbuild/_bz2.vcxproj.filters +++ b/PCbuild/_bz2.vcxproj.filters @@ -21,33 +21,9 @@ diff --git a/recipe/patches/0013-Unvendor-libffi.patch b/recipe/patches/0013-Unvendor-libffi.patch index d9a79fdc5..96fed65f4 100644 --- a/recipe/patches/0013-Unvendor-libffi.patch +++ b/recipe/patches/0013-Unvendor-libffi.patch @@ -1,4 +1,4 @@ -From b166bc9151cfa8743e9a54ebd29db8634096fc1c Mon Sep 17 00:00:00 2001 +From d301d8c737745f3e1cde720e832980f7553e79f9 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 16 Aug 2021 03:07:40 -0700 Subject: [PATCH 13/26] Unvendor libffi @@ -8,7 +8,7 @@ Subject: [PATCH 13/26] Unvendor libffi 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/PCbuild/libffi.props b/PCbuild/libffi.props -index 22c9550e2c0..40ddb08d2b0 100644 +index 22c9550e2c..40ddb08d2b 100644 --- a/PCbuild/libffi.props +++ b/PCbuild/libffi.props @@ -2,20 +2,11 @@ diff --git a/recipe/patches/0014-Unvendor-tcltk.patch b/recipe/patches/0014-Unvendor-tcltk.patch index 1b9554834..0a5d80a20 100644 --- a/recipe/patches/0014-Unvendor-tcltk.patch +++ b/recipe/patches/0014-Unvendor-tcltk.patch @@ -1,7 +1,7 @@ -From 54643d97b98b2ef7e58a79ecc96eab2c678d6770 Mon Sep 17 00:00:00 2001 +From 6b78e159af2ab087854cb2c46acf7c9f282df918 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 20 Aug 2021 10:23:51 -0700 -Subject: [PATCH] Unvendor tcltk +Subject: [PATCH 14/26] Unvendor tcltk --- PCbuild/_tkinter.vcxproj | 6 ------ @@ -9,10 +9,10 @@ Subject: [PATCH] Unvendor tcltk 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/PCbuild/_tkinter.vcxproj b/PCbuild/_tkinter.vcxproj -index 87f6005fffc..60a21115c55 100644 +index de9358312a..3fe2c29c82 100644 --- a/PCbuild/_tkinter.vcxproj +++ b/PCbuild/_tkinter.vcxproj -@@ -124,12 +124,6 @@ +@@ -128,12 +128,6 @@ @@ -26,7 +26,7 @@ index 87f6005fffc..60a21115c55 100644 diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props -index 1ab8e96122a..8fbdfbb9a6b 100644 +index 1ab8e96122..8fbdfbb9a6 100644 --- a/PCbuild/tcltk.props +++ b/PCbuild/tcltk.props @@ -12,14 +12,13 @@ diff --git a/recipe/patches/0015-unvendor-xz.patch b/recipe/patches/0015-unvendor-xz.patch index 180722a2b..6b78a9ed9 100644 --- a/recipe/patches/0015-unvendor-xz.patch +++ b/recipe/patches/0015-unvendor-xz.patch @@ -1,4 +1,4 @@ -From 0ae25243be05283e8a83c99fa3a4f28a2e1cff46 Mon Sep 17 00:00:00 2001 +From 81467fa24b34dbfcf904bb3e012360a48c3c751b Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 25 Sep 2021 10:07:05 -0700 Subject: [PATCH 15/26] unvendor xz @@ -8,7 +8,7 @@ Subject: [PATCH 15/26] unvendor xz 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/PCbuild/_lzma.vcxproj b/PCbuild/_lzma.vcxproj -index 321f41d8d27..6811fd1709e 100644 +index 321f41d8d2..6811fd1709 100644 --- a/PCbuild/_lzma.vcxproj +++ b/PCbuild/_lzma.vcxproj @@ -93,15 +93,15 @@ diff --git a/recipe/patches/0016-unvendor-zlib.patch b/recipe/patches/0016-unvendor-zlib.patch index 2636253f9..3cf37ff4d 100644 --- a/recipe/patches/0016-unvendor-zlib.patch +++ b/recipe/patches/0016-unvendor-zlib.patch @@ -1,4 +1,4 @@ -From e44bde2691911111f212ebe0ba71cfc0257e089c Mon Sep 17 00:00:00 2001 +From e7e8bf8385e414075ad1f315c96563e685c2b850 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Sep 2021 15:21:55 -0700 Subject: [PATCH 16/26] unvendor zlib @@ -9,7 +9,7 @@ Subject: [PATCH 16/26] unvendor zlib 2 files changed, 4 insertions(+), 76 deletions(-) diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj -index 8e45967a83c..3674ca1b267 100644 +index b724db69bd..9472fda6e2 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -82,7 +82,7 @@ @@ -41,7 +41,7 @@ index 8e45967a83c..3674ca1b267 100644 -@@ -681,12 +681,6 @@ +@@ -684,12 +684,6 @@ @@ -55,7 +55,7 @@ index 8e45967a83c..3674ca1b267 100644 diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters -index 0e6d42cc959..144a0e3425a 100644 +index 0e6d42cc95..144a0e3425 100644 --- a/PCbuild/pythoncore.vcxproj.filters +++ b/PCbuild/pythoncore.vcxproj.filters @@ -900,39 +900,6 @@ 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 4ede08f67..529e09239 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,4 +1,4 @@ -From 3ee4e754b55463e3c412e0bfeaeaa2894ca19aae Mon Sep 17 00:00:00 2001 +From 6bf0b432cd124513ae7d33d9c3a4e202d75badc6 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:45:28 +0100 Subject: [PATCH 17/26] Do not pass -g to GCC when not Py_DEBUG @@ -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 ad513bfe5fd..b8c58985cc1 100755 +index 00b320f6ad..e86d08ee0c 100755 --- a/configure +++ b/configure -@@ -5796,9 +5796,9 @@ if test $ac_test_CFLAGS; then +@@ -5801,9 +5801,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 ad513bfe5fd..b8c58985cc1 100755 fi else if test "$GCC" = yes; then -@@ -9679,7 +9679,7 @@ then +@@ -9684,7 +9684,7 @@ then if test "$Py_DEBUG" = 'true' ; then OPT="-g $PYDEBUG_CFLAGS -Wall" else @@ -35,10 +35,10 @@ index ad513bfe5fd..b8c58985cc1 100755 ;; *) diff --git a/configure.ac b/configure.ac -index 68998aedfbc..0318563343a 100644 +index 21ccf04a55..18d09118f4 100644 --- a/configure.ac +++ b/configure.ac -@@ -2339,7 +2339,7 @@ then +@@ -2343,7 +2343,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 index ed4c9dcd9..cdb9f1822 100644 --- a/recipe/patches/0018-Unvendor-expat.patch +++ b/recipe/patches/0018-Unvendor-expat.patch @@ -1,4 +1,4 @@ -From a0cb53ca8dca0fca3b85d8b4ee5090a13ddd541b Mon Sep 17 00:00:00 2001 +From 1e80d082065a262148e9a9168d3e78ca01395904 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 29 Mar 2023 23:07:10 -0500 Subject: [PATCH 18/26] Unvendor expat @@ -7,11 +7,11 @@ Subject: [PATCH 18/26] Unvendor expat PCbuild/_elementtree.vcxproj | 27 ++---------- PCbuild/_elementtree.vcxproj.filters | 62 ---------------------------- PCbuild/pyexpat.vcxproj | 15 ++----- - PCbuild/pyexpat.vcxproj.filters | 26 ----------- + PCbuild/pyexpat.vcxproj.filters | 26 ------------ 4 files changed, 8 insertions(+), 122 deletions(-) diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj -index fb1589557da..f47bcd8e4e6 100644 +index 8d5117e804..f47bcd8e4e 100644 --- a/PCbuild/_elementtree.vcxproj +++ b/PCbuild/_elementtree.vcxproj @@ -93,38 +93,19 @@ @@ -58,7 +58,7 @@ index fb1589557da..f47bcd8e4e6 100644 diff --git a/PCbuild/_elementtree.vcxproj.filters b/PCbuild/_elementtree.vcxproj.filters -index f6b55d8ff82..88a13faa683 100644 +index 9e2e062af3..88a13faa68 100644 --- a/PCbuild/_elementtree.vcxproj.filters +++ b/PCbuild/_elementtree.vcxproj.filters @@ -17,72 +17,10 @@ @@ -135,7 +135,7 @@ index f6b55d8ff82..88a13faa683 100644 diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj -index 833ab5e9f7e..ec5d4b64b3c 100644 +index d517f9392b..ec5d4b64b3 100644 --- a/PCbuild/pyexpat.vcxproj +++ b/PCbuild/pyexpat.vcxproj @@ -90,26 +90,19 @@ @@ -170,7 +170,7 @@ index 833ab5e9f7e..ec5d4b64b3c 100644 diff --git a/PCbuild/pyexpat.vcxproj.filters b/PCbuild/pyexpat.vcxproj.filters -index 230531033fc..b8280b4049c 100644 +index e63cb9c630..b8280b4049 100644 --- a/PCbuild/pyexpat.vcxproj.filters +++ b/PCbuild/pyexpat.vcxproj.filters @@ -11,36 +11,10 @@ diff --git a/recipe/patches/0019-Remove-unused-readelf.patch b/recipe/patches/0019-Remove-unused-readelf.patch index 949652595..62bdeb935 100644 --- a/recipe/patches/0019-Remove-unused-readelf.patch +++ b/recipe/patches/0019-Remove-unused-readelf.patch @@ -1,4 +1,4 @@ -From 662e8ba8079271ccd3fb0177fd6bb5db895192e8 Mon Sep 17 00:00:00 2001 +From 8f936c483623a1b74acc7c6df4f6273b0aaf1b86 Mon Sep 17 00:00:00 2001 From: Charles Bousseau 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 526d500fe08..91fcef7e427 100644 +index 7ca65dddb9..8f50263ea6 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 index 558dab52d..02c082864 100644 --- 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 a738097607a2d95e2d31ce077d924146cf87a372 Mon Sep 17 00:00:00 2001 +From 8a2809306267aa386946ed07686d35f4bb561527 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 1 Sep 2023 23:32:14 +0200 Subject: [PATCH 20/26] Don't checksharedmods if cross-compiling @@ -10,10 +10,10 @@ 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 91fcef7e427..8a80c51ac78 100644 +index 8f50263ea6..f8c66b26ea 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1603,7 +1603,7 @@ sharedmods: $(SHAREDMODS) pybuilddir.txt +@@ -1604,7 +1604,7 @@ sharedmods: $(SHAREDMODS) pybuilddir.txt # dependency on BUILDPYTHON ensures that the target is run last .PHONY: checksharedmods checksharedmods: sharedmods $(PYTHON_FOR_BUILD_DEPS) $(BUILDPYTHON) @@ -24,7 +24,7 @@ index 91fcef7e427..8a80c51ac78 100644 rundsymutil: sharedmods $(PYTHON_FOR_BUILD_DEPS) $(BUILDPYTHON) diff --git a/if_runnable.sh b/if_runnable.sh new file mode 100755 -index 00000000000..dcfde5b751e +index 0000000000..dcfde5b751 --- /dev/null +++ b/if_runnable.sh @@ -0,0 +1,10 @@ diff --git a/recipe/patches/0021-Override-configure-LIBFFI.patch b/recipe/patches/0021-Override-configure-LIBFFI.patch index 80ba75f7d..6b79266a5 100644 --- a/recipe/patches/0021-Override-configure-LIBFFI.patch +++ b/recipe/patches/0021-Override-configure-LIBFFI.patch @@ -1,4 +1,4 @@ -From 8068e941c6afe8ca44773b277198d1bdb671851f Mon Sep 17 00:00:00 2001 +From bbacd02c49bf153f17a14353413781a6c8cfa9b8 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" 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 b8c58985cc1..2b0cc1e4358 100755 +index e86d08ee0c..672aa1fe6f 100755 --- a/configure +++ b/configure -@@ -15424,7 +15424,7 @@ if test "x$ac_cv_lib_ffi_ffi_call" = xyes +@@ -15429,7 +15429,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 index 0c30559ff..7385c5a51 100644 --- a/recipe/patches/0022-Unvendor-libmpdec.patch +++ b/recipe/patches/0022-Unvendor-libmpdec.patch @@ -1,4 +1,4 @@ -From 05b2d4adfea83d8057e016fceef693f7c4e99209 Mon Sep 17 00:00:00 2001 +From 7b6ea9231eae0a6628fc8c1084916dfbd69259d9 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 16 Aug 2024 21:34:43 -0500 Subject: [PATCH 22/26] Unvendor libmpdec @@ -8,7 +8,7 @@ Subject: [PATCH 22/26] Unvendor libmpdec 1 file changed, 6 insertions(+), 44 deletions(-) diff --git a/PCbuild/_decimal.vcxproj b/PCbuild/_decimal.vcxproj -index e9d60b4db1a..0f49d7923f5 100644 +index e9d60b4db1..0f49d7923f 100644 --- a/PCbuild/_decimal.vcxproj +++ b/PCbuild/_decimal.vcxproj @@ -93,65 +93,27 @@ diff --git a/recipe/patches/0023-Brand-conda-forge.patch b/recipe/patches/0023-Brand-conda-forge.patch index cb5b992de..30d981417 100644 --- a/recipe/patches/0023-Brand-conda-forge.patch +++ b/recipe/patches/0023-Brand-conda-forge.patch @@ -1,4 +1,4 @@ -From 917c51dab6b2c7861edb8c3462963d9a6bd7c46d Mon Sep 17 00:00:00 2001 +From 862fdb9fbf23131e39f7851782221ff791139a01 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 28 Aug 2024 11:12:22 -0500 Subject: [PATCH 23/26] Brand conda-forge @@ -9,7 +9,7 @@ Subject: [PATCH 23/26] Brand conda-forge 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Lib/platform.py b/Lib/platform.py -index f7821ae7f28..628af468297 100644 +index f7821ae7f2..628af46829 100644 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -1215,6 +1215,7 @@ def _sys_version(sys_version=None): @@ -21,7 +21,7 @@ index f7821ae7f28..628af468297 100644 r'(?:,\s*([\w ]*)' # ", builddate" r'(?:,\s*([\w :]*))?)?\)\s*' # ", buildtime)" diff --git a/Python/getversion.c b/Python/getversion.c -index 8d8bc6ea700..2fc5c13dbfb 100644 +index 8d8bc6ea70..2fc5c13dbf 100644 --- a/Python/getversion.c +++ b/Python/getversion.c @@ -15,9 +15,9 @@ void _Py_InitVersion(void) 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 index 591fffc57..b28064182 100644 --- 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 3170567ff2442f9460ae6da7f94883c9a7c5a445 Mon Sep 17 00:00:00 2001 +From fb67cd8211b67bad6360b97cbdc62e158d01d126 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sun, 12 Jan 2025 10:37:29 +0530 Subject: [PATCH 24/26] Do not define pid_t as it might conflict with the @@ -15,7 +15,7 @@ Subject: [PATCH 24/26] Do not define pid_t as it might conflict with the 7 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Modules/_testcapi/long.c b/Modules/_testcapi/long.c -index 6313abf5485..bc8169e2f68 100644 +index 6313abf548..bc8169e2f6 100644 --- a/Modules/_testcapi/long.c +++ b/Modules/_testcapi/long.c @@ -6,6 +6,10 @@ @@ -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 5784482d389..6c1a2dfd399 100644 +index ee6ab7ab2c..37e1799f65 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -30,6 +30,10 @@ @@ -45,7 +45,7 @@ index 5784482d389..6c1a2dfd399 100644 diff --git a/Modules/_testlimitedcapi/long.c b/Modules/_testlimitedcapi/long.c -index 99b9e96760d..932fef0497f 100644 +index 01d7621658..bb5cc1d3ab 100644 --- a/Modules/_testlimitedcapi/long.c +++ b/Modules/_testlimitedcapi/long.c @@ -8,6 +8,10 @@ @@ -60,7 +60,7 @@ index 99b9e96760d..932fef0497f 100644 module _testlimitedcapi [clinic start generated code]*/ diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h -index 094580e7c23..02d74ec937d 100644 +index 15d1650d00..3591760d33 100644 --- a/Modules/clinic/posixmodule.c.h +++ b/Modules/clinic/posixmodule.c.h @@ -10,6 +10,10 @@ preserve @@ -75,7 +75,7 @@ index 094580e7c23..02d74ec937d 100644 "stat($module, /, path, *, dir_fd=None, follow_symlinks=True)\n" "--\n" diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 7bf8bc9e5d9..f995fc804a0 100644 +index 916c65721e..dd458638af 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -219,6 +219,7 @@ @@ -87,10 +87,10 @@ index 7bf8bc9e5d9..f995fc804a0 100644 diff --git a/PC/pyconfig.h b/PC/pyconfig.h -index 710a737ebcc..92d327b1e35 100644 +index bb0c89651a..a78e1a021c 100644 --- a/PC/pyconfig.h +++ b/PC/pyconfig.h -@@ -235,8 +235,6 @@ typedef _W64 int Py_ssize_t; +@@ -247,8 +247,6 @@ typedef _W64 int Py_ssize_t; #endif #endif /* MS_WIN32 && !MS_WIN64 */ @@ -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 ed0c4e2c85c..97f79087497 100644 +index 6a1020ff89..1e4279d7d8 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 index 28d4a622d..862b85cf9 100644 --- a/recipe/patches/0025-Unvendor-zstd.patch +++ b/recipe/patches/0025-Unvendor-zstd.patch @@ -1,4 +1,4 @@ -From e1a36beb37bcc740dd29bcd671550677ad9fc520 Mon Sep 17 00:00:00 2001 +From 0298b1366e431876af761aabcf677092f919e2a4 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 22 Jul 2025 18:07:54 +0200 Subject: [PATCH 25/26] Unvendor zstd @@ -9,7 +9,7 @@ Subject: [PATCH 25/26] Unvendor zstd 2 files changed, 6 insertions(+), 209 deletions(-) diff --git a/PCbuild/_zstd.vcxproj b/PCbuild/_zstd.vcxproj -index 6f91b8d05cc..cc6f99cb002 100644 +index 6f91b8d05c..cc6f99cb00 100644 --- a/PCbuild/_zstd.vcxproj +++ b/PCbuild/_zstd.vcxproj @@ -95,72 +95,22 @@ @@ -90,7 +90,7 @@ index 6f91b8d05cc..cc6f99cb002 100644 diff --git a/PCbuild/_zstd.vcxproj.filters b/PCbuild/_zstd.vcxproj.filters -index eec666e5eaf..5028bb5592d 100644 +index eec666e5ea..5028bb5592 100644 --- a/PCbuild/_zstd.vcxproj.filters +++ b/PCbuild/_zstd.vcxproj.filters @@ -30,96 +30,6 @@ @@ -195,9 +195,8 @@ index eec666e5eaf..5028bb5592d 100644 Header Files - -+ - Header Files\zstd - +- Header Files\zstd +- - - Header Files\zstd - @@ -259,8 +258,9 @@ index eec666e5eaf..5028bb5592d 100644 - Header Files\zstd - - -- Header Files\zstd -- ++ + Header Files\zstd + - + Header Files\zstd 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 index 24457778a..bb47977f7 100644 --- 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 e43404b376775691f6b51e671f5ad53abf99c0d9 Mon Sep 17 00:00:00 2001 +From 89994b9192761722059ea410f81f7bea20288ba2 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 2 Dec 2025 09:46:56 -0800 Subject: [PATCH 26/26] Set Py_GIL_DISABLED in windows to match unix @@ -11,7 +11,7 @@ luxury of not having to do that. 1 file changed, 2 insertions(+) diff --git a/PC/pyconfig.h b/PC/pyconfig.h -index 92d327b1e35..ed0d9c0592b 100644 +index a78e1a021c..44d5b5fc6d 100644 --- a/PC/pyconfig.h +++ b/PC/pyconfig.h @@ -105,6 +105,8 @@ WIN32 is still required for the locale module. diff --git a/recipe/patches/README.md b/recipe/patches/README.md index 24254607d..a238c8548 100644 --- a/recipe/patches/README.md +++ b/recipe/patches/README.md @@ -1,24 +1,54 @@ ### How to re-generate patches + +Use the existing series from the target feedstock branch and the CPython tags +for its old and new releases. The example below assumes sibling `cpython` and +`python-feedstock` checkouts; adjust the paths and tags as needed. + ```bash -old=v3.9.6 -new=v3.10.0 -git clone git@github.com:python/cpython && cd cpython -git reset --hard $old -for f in ../recipe/patches/*.patch; do - git am $f; -done -head=$(git rev-parse HEAD) -git reset --hard $new -git cherry-pick $old...$head # fix conflicts and make sure the editor doesn't add end of file line ending -git format-patch --no-signature $new -for f in *.patch; do - python ../recipe/patches/make-mixed-crlf-patch.py $f; +old=v3.14.7 +new=v3.14.8 +git clone https://github.com/python/cpython.git +cd cpython +git switch -c feedstock-patches "$old" +git am -3 ../python-feedstock/recipe/patches/*.patch +git rebase --onto "$new" "$old" +``` + +The glob selects only patch files in numbered order. Apply all patches, including +those selected only on other platforms in the recipe. `git am -3` can fall back +to a three-way merge when the required Git blobs are available. + +Resolve any rebase conflicts, preserving the intended patch changes and file +line endings. Do not let an editor add a final newline to a file that lacks one. +Stage each resolution and run `git rebase --continue`. + +Export to a separate directory so generated patches are not mixed with the old +series, then restore the mixed line endings required by Windows patches: + +```bash +mkdir ../refreshed-patches +git format-patch --no-signature -o ../refreshed-patches "$new" +for f in ../refreshed-patches/*.patch; do + python ../python-feedstock/recipe/patches/make-mixed-crlf-patch.py "$f" done -cp 00*.patch ../recipe/patches/ ``` -On windows, the last loop can be done as follows (once the patches -have been copied; executed within the `recipe/patch` folder): +For Windows Command Prompt, the application step has this equivalent (use `%%f` +instead of `%f` in a batch file): + +```bat +for /f "delims=" %f in ('dir /b /s /on ..\python-feedstock\recipe\patches\*.patch') do git am -3 "%f" +``` + +Before replacing the feedstock's patches, verify the exported series with +`git am` on a clean checkout of the new tag: + ```bash -for /f %f in ('dir /b /S .') do python make-mixed-crlf-patch.py %f +git worktree add --detach ../cpython-patch-check "$new" +git -C ../cpython-patch-check am ../refreshed-patches/*.patch +git diff HEAD "$(git -C ../cpython-patch-check rev-parse HEAD)" --exit-code ``` + +The final check confirms that applying the exported patches reproduces the +rebased source tree. Preserve patch authorship, metadata, ordering, and recipe +references when copying the regenerated series back to the feedstock. From e0d4780af4f5f4bff9e5c8230701d62d07444ffd Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Mon, 5 Oct 2026 10:17:07 -0400 Subject: [PATCH 3/4] Add alternate location for cli-64.exe for conda-build 26.9+ (cherry picked from commit e073344f3301d2248ab2de5c7758514d72dab4e3) --- recipe/fix_staged_scripts.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/recipe/fix_staged_scripts.py b/recipe/fix_staged_scripts.py index 63343fb43..4bfea1003 100644 --- a/recipe/fix_staged_scripts.py +++ b/recipe/fix_staged_scripts.py @@ -31,7 +31,16 @@ def fix_staged_scripts(scripts_dir): # now create the .exe file # This is hardcoded that conda and conda-build are in the same environment base_env = dirname(dirname(os.environ['CONDA_EXE'])) - exe = join(base_env, 'lib', 'site-packages', 'conda_build', 'cli-64.exe') + # conda-build >= 26.9 sources launchers from conda-launchers + candidates = [ + join(base_env, 'share', 'conda-launchers', 'cli-64.exe'), + join(base_env, 'lib', 'site-packages', 'conda_build', 'cli-64.exe'), + ] + exe = next((path for path in candidates if isfile(path)), None) + if exe is None: + raise FileNotFoundError( + 'cli-64.exe launcher not found in any of: %s' % ', '.join(candidates) + ) shutil.copyfile(exe, join(scripts_dir, fn + '.exe')) # remove the original script From 46618b89aa6e1cb2e1246fc34163f0c9c901b9ae Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 5 Oct 2026 08:11:47 -0700 Subject: [PATCH 4/4] Add target architecture detection for script fixes (cherry picked from commit 6e713eb1421e8bc77e1b4a2986ebc63ab486a8ec) --- recipe/fix_staged_scripts.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipe/fix_staged_scripts.py b/recipe/fix_staged_scripts.py index 4bfea1003..050ce856f 100644 --- a/recipe/fix_staged_scripts.py +++ b/recipe/fix_staged_scripts.py @@ -10,6 +10,7 @@ def fix_staged_scripts(scripts_dir): Fixes scripts which have been installed unix-style to have a .bat helper """ + target_arch = os.environ["target_platform"].split("-")[-1] if not isdir(scripts_dir): return for fn in os.listdir(scripts_dir): @@ -33,8 +34,8 @@ def fix_staged_scripts(scripts_dir): base_env = dirname(dirname(os.environ['CONDA_EXE'])) # conda-build >= 26.9 sources launchers from conda-launchers candidates = [ - join(base_env, 'share', 'conda-launchers', 'cli-64.exe'), - join(base_env, 'lib', 'site-packages', 'conda_build', 'cli-64.exe'), + join(base_env, 'share', 'conda-launchers', f'cli-{target_arch}.exe'), + join(base_env, 'lib', 'site-packages', 'conda_build', f'cli-{target_arch}.exe'), ] exe = next((path for path in candidates if isfile(path)), None) if exe is None: