From 46905f8f8828db85a60557f9c9d2eb7ac12f6512 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 5 Aug 2026 17:51:56 +0000 Subject: [PATCH 1/2] updated v3.14.7 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 51a1afcb2..9f349afb9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,10 +1,10 @@ -{% set version = "3.14.6" %} +{% set version = "3.14.7" %} {% 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 = 2 %} +{% set build_number = 0 %} # this makes the linter happy {% set channel_targets = channel_targets or 'conda-forge main' %} @@ -46,7 +46,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: 143b1dddefaec3bd2e21e3b839b34a2b7fb9842272883c576420d605e9f30c63 + sha256: 3b48dac8fb59f62eaa67ac83c1eb12bda1b7a08406dd286e252c11a66be27f81 patches: - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch - patches/0002-Win32-Do-not-download-externals.patch From 903b9c7ced74d619ddf86379cf6d09b071fd4faa Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 6 Aug 2026 14:18:16 +1100 Subject: [PATCH 2/2] rebase patches --- ...2-Change-FD_SETSIZE-from-512-to-2048.patch | 2 +- ...0002-Win32-Do-not-download-externals.patch | 2 +- ...-so-that-it-looks-in-sys.prefix-lib-.patch | 8 +-- ...-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch | 6 +- recipe/patches/0005-Unvendor-openssl.patch | 2 +- recipe/patches/0006-Unvendor-sqlite3.patch | 2 +- ...dd-CondaEcosystemModifyDllSearchPath.patch | 4 +- recipe/patches/0008-Doing-d1trimfile.patch | 6 +- .../patches/0009-cross-compile-darwin.patch | 6 +- .../patches/0010-Fix-TZPATH-on-windows.patch | 2 +- ...ch-work-with-SYSTEM_VERSION_COMPAT-1.patch | 8 +-- recipe/patches/0012-Unvendor-bzip2.patch | 2 +- recipe/patches/0013-Unvendor-libffi.patch | 2 +- recipe/patches/0014-Unvendor-tcltk.patch | 14 +++-- recipe/patches/0015-unvendor-xz.patch | 2 +- recipe/patches/0016-unvendor-zlib.patch | 2 +- ...-not-pass-g-to-GCC-when-not-Py_DEBUG.patch | 6 +- recipe/patches/0018-Unvendor-expat.patch | 56 ++++++++++--------- .../patches/0019-Remove-unused-readelf.patch | 4 +- ...t-checksharedmods-if-cross-compiling.patch | 6 +- .../0021-Override-configure-LIBFFI.patch | 6 +- recipe/patches/0022-Unvendor-libmpdec.patch | 2 +- recipe/patches/0023-Brand-conda-forge.patch | 2 +- ...d_t-as-it-might-conflict-with-the-ac.patch | 18 +++--- recipe/patches/0025-Unvendor-zstd.patch | 2 +- ...IL_DISABLED-in-windows-to-match-unix.patch | 2 +- 26 files changed, 90 insertions(+), 84 deletions(-) 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 2c1825804..30e9f0d44 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 48fcc7c4d3d88ca7ffab052cfbee27512901d458 Mon Sep 17 00:00:00 2001 +From 204c40c00697419f29b214864bab80a8f01d804f 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 diff --git a/recipe/patches/0002-Win32-Do-not-download-externals.patch b/recipe/patches/0002-Win32-Do-not-download-externals.patch index ee286aac8..c740fddbc 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 d27b283f6f7b7372271cc862a0a0ae426815010e Mon Sep 17 00:00:00 2001 +From aaa85ea3a1edeb2e93ae12b60c7958084814df37 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 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 a4d86b2aa..48eb0e5f7 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 8eec70e4cde56e34cef8d23083a08b9b4833d20d Mon Sep 17 00:00:00 2001 +From 43ac24ca1c1083b50966846f07969a9c6454e22f 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 @@ -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 3b21658433b..2c900c1e2cf 100644 +index cd67fd87efc..9acb6e8c25f 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py @@ -135,7 +135,8 @@ def dllist(): @@ -38,7 +38,7 @@ index 3b21658433b..2c900c1e2cf 100644 '%s.dylib' % name, '%s.framework/%s' % (name, name)] for name in possible: -@@ -436,10 +437,30 @@ def _findLib_ld(name): +@@ -435,10 +436,30 @@ def _findLib_ld(name): pass # result will be None return result @@ -70,4 +70,4 @@ index 3b21658433b..2c900c1e2cf 100644 + _get_soname(_findLib_gcc(name)) or _get_soname(_findLib_ld(name)) - # Listing loaded libraries on other systems will try to use + # On platforms which provide dl_iterate_phdr(), dllist() is implemented 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 df164d2e6..e35b7a1d8 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 6ef047bc92544cc2bb50f89d6f1746397efb4b04 Mon Sep 17 00:00:00 2001 +From 21533f279cfe2060e7aa355b860547e7982b5c89 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 @@ -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 b89d7427e3f..21df0efac12 100644 +index 0e4f1e87e73..df5d89d857a 100644 --- a/Modules/getpath.py +++ b/Modules/getpath.py @@ -52,6 +52,7 @@ @@ -34,7 +34,7 @@ index b89d7427e3f..21df0efac12 100644 # ** Values calculated at runtime ** # config -- [in/out] dict of the PyConfig structure -@@ -704,7 +705,7 @@ def search_up(prefix, *landmarks, test=isfile): +@@ -697,7 +698,7 @@ def search_up(prefix, *landmarks, test=isfile): else: pythonpath.append(joinpath(base_prefix, ZIP_LANDMARK)) diff --git a/recipe/patches/0005-Unvendor-openssl.patch b/recipe/patches/0005-Unvendor-openssl.patch index 06ec56600..10332df80 100644 --- a/recipe/patches/0005-Unvendor-openssl.patch +++ b/recipe/patches/0005-Unvendor-openssl.patch @@ -1,4 +1,4 @@ -From aabd5c80763b1ce8c1220b9febccccc590ca7611 Mon Sep 17 00:00:00 2001 +From 91c3e5bdab6497eca2cfcb6838df9dc3d8317726 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 diff --git a/recipe/patches/0006-Unvendor-sqlite3.patch b/recipe/patches/0006-Unvendor-sqlite3.patch index 595aaf1b1..3b9954a43 100644 --- a/recipe/patches/0006-Unvendor-sqlite3.patch +++ b/recipe/patches/0006-Unvendor-sqlite3.patch @@ -1,4 +1,4 @@ -From ef9755d84ef3dfd8fdbe8e10363528da21afe502 Mon Sep 17 00:00:00 2001 +From 6fa5924da6eddfc530015bef11bc498913c630b1 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 diff --git a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch index f406f87b1..e6045d500 100644 --- a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch +++ b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch @@ -1,4 +1,4 @@ -From aeb6945890d75f21e022290f811bb0bd000e3369 Mon Sep 17 00:00:00 2001 +From e2a8b753a8c2420a2f0b793a40725264a116bbda 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 6241d6ddca1..fe2120940d2 100644 +index fe55ec7caff..cabd42067d7 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 ecf355e70..de0b80034 100644 --- a/recipe/patches/0008-Doing-d1trimfile.patch +++ b/recipe/patches/0008-Doing-d1trimfile.patch @@ -1,4 +1,4 @@ -From 942cda22db307772ca4254743eae0f7bcc328641 Mon Sep 17 00:00:00 2001 +From efdb6286b645c1c277f4c12f468a7bde97e876cc 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 @@ -162,7 +162,7 @@ index ee7421484b5..e9d60b4db1a 100644 diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj -index 3eb9c89bcb6..920656f2ee2 100644 +index 46e34a5ea82..fb1589557da 100644 --- a/PCbuild/_elementtree.vcxproj +++ b/PCbuild/_elementtree.vcxproj @@ -94,7 +94,11 @@ @@ -618,7 +618,7 @@ index 97938692328..212fb5e1ebc 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 @@ diff --git a/recipe/patches/0009-cross-compile-darwin.patch b/recipe/patches/0009-cross-compile-darwin.patch index 7bf70722f..d9a8b6999 100644 --- a/recipe/patches/0009-cross-compile-darwin.patch +++ b/recipe/patches/0009-cross-compile-darwin.patch @@ -1,4 +1,4 @@ -From 803aeaea8d4b1f6f62bf208a9c826664af1cc24c Mon Sep 17 00:00:00 2001 +From 91eb356ef711a6d9119a017f3572941e174360f9 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 @@ -29,7 +29,7 @@ index b017b841311..f7821ae7f28 100644 try: import plistlib diff --git a/configure b/configure -index 2088290f0ee..13fa7eb8101 100755 +index 2cb22a7806f..ad513bfe5fd 100755 --- a/configure +++ b/configure @@ -4112,6 +4112,9 @@ then @@ -53,7 +53,7 @@ index 2088290f0ee..13fa7eb8101 100755 _host_ident= ;; diff --git a/configure.ac b/configure.ac -index aed14946731..fcc0e58963e 100644 +index 967d34d47a3..68998aedfbc 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 1133ef811..9fdb8a327 100644 --- a/recipe/patches/0010-Fix-TZPATH-on-windows.patch +++ b/recipe/patches/0010-Fix-TZPATH-on-windows.patch @@ -1,4 +1,4 @@ -From 44df125643cd6cc308950430410ea157becfbb30 Mon Sep 17 00:00:00 2001 +From 57cb150a6af3b99bdde019fbece1f751e839d68b 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 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 0bd0357e4..bbb9e4b32 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 865dd0bfac76b1e793d0a8d70e736c3c79e3d5f6 Mon Sep 17 00:00:00 2001 +From b35fc75f5d8900881707f9aed502d11afda49193 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,10 +18,10 @@ 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 856b0376e5e..8d269ac5969 100644 +index 27b99211ce6..1c9a3a88da5 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c -@@ -1509,7 +1509,7 @@ copy_com_pointer(PyObject *self, PyObject *args) +@@ -1510,7 +1510,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 \ @@ -30,7 +30,7 @@ index 856b0376e5e..8d269ac5969 100644 # else # define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME \ (_dyld_shared_cache_contains_path != NULL) -@@ -1552,8 +1552,10 @@ static PyObject *py_dyld_shared_cache_contains_path(PyObject *self, PyObject *ar +@@ -1553,8 +1553,10 @@ static PyObject *py_dyld_shared_cache_contains_path(PyObject *self, PyObject *ar if (PyUnicode_FSConverter(name, &name2) == 0) return NULL; name_str = PyBytes_AS_STRING(name2); diff --git a/recipe/patches/0012-Unvendor-bzip2.patch b/recipe/patches/0012-Unvendor-bzip2.patch index 0c2061838..7e39069f9 100644 --- a/recipe/patches/0012-Unvendor-bzip2.patch +++ b/recipe/patches/0012-Unvendor-bzip2.patch @@ -1,4 +1,4 @@ -From 04122ddcb01d55991402257c11217b6b6cb4ff26 Mon Sep 17 00:00:00 2001 +From e0552ce78971ed4ad8f5e36bf4929812eb619f05 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 diff --git a/recipe/patches/0013-Unvendor-libffi.patch b/recipe/patches/0013-Unvendor-libffi.patch index 77ab1968e..d9a79fdc5 100644 --- a/recipe/patches/0013-Unvendor-libffi.patch +++ b/recipe/patches/0013-Unvendor-libffi.patch @@ -1,4 +1,4 @@ -From 0cf3e68100c1c4bb1bc4a1aee5e6d9b2682af821 Mon Sep 17 00:00:00 2001 +From b166bc9151cfa8743e9a54ebd29db8634096fc1c 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 diff --git a/recipe/patches/0014-Unvendor-tcltk.patch b/recipe/patches/0014-Unvendor-tcltk.patch index 0c0103677..530f8923b 100644 --- a/recipe/patches/0014-Unvendor-tcltk.patch +++ b/recipe/patches/0014-Unvendor-tcltk.patch @@ -1,12 +1,12 @@ -From 771b7e5d29f2dabe5c5af3544cd52d942969fc87 Mon Sep 17 00:00:00 2001 +From 7f7156f13b05bc456b470c4c174d52c7f3b52ceb Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 20 Aug 2021 10:23:51 -0700 Subject: [PATCH 14/26] Unvendor tcltk --- PCbuild/_tkinter.vcxproj | 6 ------ - PCbuild/tcltk.props | 11 +++++------ - 2 files changed, 5 insertions(+), 12 deletions(-) + PCbuild/tcltk.props | 13 +++++-------- + 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/PCbuild/_tkinter.vcxproj b/PCbuild/_tkinter.vcxproj index de9358312ac..3fe2c29c823 100644 @@ -26,14 +26,16 @@ index de9358312ac..3fe2c29c823 100644 diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props -index d26b36ba98e..40327f181d8 100644 +index 1ab8e96122a..f99f4e5d27e 100644 --- a/PCbuild/tcltk.props +++ b/PCbuild/tcltk.props -@@ -12,12 +12,11 @@ +@@ -12,14 +12,11 @@ $([System.Version]::Parse($(TkVersion)).Minor) $([System.Version]::Parse($(TkVersion)).Build) $([System.Version]::Parse($(TkVersion)).Revision) -- $(ExternalsDir)tcl-core-$(TclVersion)\ +- +- $(ExternalsDir)tcl-core-$(TclVersion)\ +- $(ExternalsDir)tcl-$(TclVersion)\ - $(ExternalsDir)tk-$(TkVersion)\ - $(ExternalsDir)tcltk-$(TclVersion)\$(ArchName)\ - $(tcltkDir)\bin\tclsh$(TclMajorVersion)$(TclMinorVersion)t.exe diff --git a/recipe/patches/0015-unvendor-xz.patch b/recipe/patches/0015-unvendor-xz.patch index 50f96bf5f..180722a2b 100644 --- a/recipe/patches/0015-unvendor-xz.patch +++ b/recipe/patches/0015-unvendor-xz.patch @@ -1,4 +1,4 @@ -From 3f4fd834df73f0d1329f4978eaca3115d6421cea Mon Sep 17 00:00:00 2001 +From 0ae25243be05283e8a83c99fa3a4f28a2e1cff46 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 diff --git a/recipe/patches/0016-unvendor-zlib.patch b/recipe/patches/0016-unvendor-zlib.patch index fbba5345e..2636253f9 100644 --- a/recipe/patches/0016-unvendor-zlib.patch +++ b/recipe/patches/0016-unvendor-zlib.patch @@ -1,4 +1,4 @@ -From ab500d12752b39f04c8aca04b6fe1249ae38ef51 Mon Sep 17 00:00:00 2001 +From e44bde2691911111f212ebe0ba71cfc0257e089c 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 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 64c6ba2f2..4ede08f67 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 719981a07f9546b08648c1e80d7d42224dd6ed9a Mon Sep 17 00:00:00 2001 +From 3ee4e754b55463e3c412e0bfeaeaa2894ca19aae 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,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 13fa7eb8101..c47039af150 100755 +index ad513bfe5fd..b8c58985cc1 100755 --- a/configure +++ b/configure @@ -5796,9 +5796,9 @@ if test $ac_test_CFLAGS; then @@ -35,7 +35,7 @@ index 13fa7eb8101..c47039af150 100755 ;; *) diff --git a/configure.ac b/configure.ac -index fcc0e58963e..3969e38be04 100644 +index 68998aedfbc..0318563343a 100644 --- a/configure.ac +++ b/configure.ac @@ -2339,7 +2339,7 @@ then diff --git a/recipe/patches/0018-Unvendor-expat.patch b/recipe/patches/0018-Unvendor-expat.patch index 46e7f22f9..0a12366c4 100644 --- a/recipe/patches/0018-Unvendor-expat.patch +++ b/recipe/patches/0018-Unvendor-expat.patch @@ -1,20 +1,20 @@ -From bac6bfc09cf09d73895fa839d0464a9f60b9320d Mon Sep 17 00:00:00 2001 +From a0cb53ca8dca0fca3b85d8b4ee5090a13ddd541b 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 --- - PCbuild/_elementtree.vcxproj | 24 ++---------- - PCbuild/_elementtree.vcxproj.filters | 55 +--------------------------- - PCbuild/pyexpat.vcxproj | 12 ++---- - PCbuild/pyexpat.vcxproj.filters | 19 +--------- - 4 files changed, 10 insertions(+), 100 deletions(-) + 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(-) diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj -index 920656f2ee2..f47bcd8e4e6 100644 +index fb1589557da..f47bcd8e4e6 100644 --- a/PCbuild/_elementtree.vcxproj +++ b/PCbuild/_elementtree.vcxproj -@@ -93,35 +93,19 @@ +@@ -93,37 +93,19 @@ @@ -36,9 +36,11 @@ index 920656f2ee2..f47bcd8e4e6 100644 - - - +- - - - +- - - - @@ -55,10 +57,10 @@ index 920656f2ee2..f47bcd8e4e6 100644 diff --git a/PCbuild/_elementtree.vcxproj.filters b/PCbuild/_elementtree.vcxproj.filters -index a5368024cce..7cc8e9a3b9b 100644 +index f6b55d8ff82..88a13faa683 100644 --- a/PCbuild/_elementtree.vcxproj.filters +++ b/PCbuild/_elementtree.vcxproj.filters -@@ -17,67 +17,14 @@ +@@ -17,69 +17,10 @@ {f99990ba-cd06-40cc-8f28-d2d424ec13be} @@ -78,6 +80,9 @@ index a5368024cce..7cc8e9a3b9b 100644 - - Header Files\expat - +- +- Header Files\expat +- - - Header Files\expat - @@ -87,6 +92,9 @@ index a5368024cce..7cc8e9a3b9b 100644 - - Header Files\expat - +- +- Header Files\expat +- - - Header Files\expat - @@ -122,17 +130,11 @@ index a5368024cce..7cc8e9a3b9b 100644 - Resource Files - - -- -\ 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 @@ @@ -149,6 +151,8 @@ index 3bcef600a3e..ec5d4b64b3c 100644 + - +- +- - - - @@ -161,14 +165,20 @@ index 3bcef600a3e..ec5d4b64b3c 100644 diff --git a/PCbuild/pyexpat.vcxproj.filters b/PCbuild/pyexpat.vcxproj.filters -index fd22fc8c477..41c73b434b9 100644 +index 230531033fc..b8280b4049c 100644 --- a/PCbuild/pyexpat.vcxproj.filters +++ b/PCbuild/pyexpat.vcxproj.filters -@@ -11,31 +11,14 @@ +@@ -11,33 +11,10 @@ {f1dbbdb5-41e5-4a88-bf8e-13da010c0ce4} - +- +- Header Files +- +- +- Header Files +- - - Header Files - @@ -192,9 +202,3 @@ index fd22fc8c477..41c73b434b9 100644 - Resource Files - - -- -\ No newline at end of file -+ diff --git a/recipe/patches/0019-Remove-unused-readelf.patch b/recipe/patches/0019-Remove-unused-readelf.patch index d68a608fa..949652595 100644 --- a/recipe/patches/0019-Remove-unused-readelf.patch +++ b/recipe/patches/0019-Remove-unused-readelf.patch @@ -1,4 +1,4 @@ -From 5f0b263a122f114cd65fec4310a3052e9151d512 Mon Sep 17 00:00:00 2001 +From 662e8ba8079271ccd3fb0177fd6bb5db895192e8 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 f86d7363e09..997fdedffa1 100644 +index 526d500fe08..91fcef7e427 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 c6f1063eb..558dab52d 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 73b753202af935b523b690a24a143d88b0ab5224 Mon Sep 17 00:00:00 2001 +From a738097607a2d95e2d31ce077d924146cf87a372 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 997fdedffa1..1ab701a52dd 100644 +index 91fcef7e427..8a80c51ac78 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1599,7 +1599,7 @@ sharedmods: $(SHAREDMODS) pybuilddir.txt +@@ -1603,7 +1603,7 @@ sharedmods: $(SHAREDMODS) pybuilddir.txt # dependency on BUILDPYTHON ensures that the target is run last .PHONY: checksharedmods checksharedmods: sharedmods $(PYTHON_FOR_BUILD_DEPS) $(BUILDPYTHON) diff --git a/recipe/patches/0021-Override-configure-LIBFFI.patch b/recipe/patches/0021-Override-configure-LIBFFI.patch index 531e3dd05..80ba75f7d 100644 --- a/recipe/patches/0021-Override-configure-LIBFFI.patch +++ b/recipe/patches/0021-Override-configure-LIBFFI.patch @@ -1,4 +1,4 @@ -From 15dd45a639190a9307dc229b37bbb1a7c651897a Mon Sep 17 00:00:00 2001 +From 8068e941c6afe8ca44773b277198d1bdb671851f 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 c47039af150..56788a4a9b9 100755 +index b8c58985cc1..2b0cc1e4358 100755 --- a/configure +++ b/configure -@@ -15358,7 +15358,7 @@ if test "x$ac_cv_lib_ffi_ffi_call" = xyes +@@ -15424,7 +15424,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 e28b2b2d4..0c30559ff 100644 --- a/recipe/patches/0022-Unvendor-libmpdec.patch +++ b/recipe/patches/0022-Unvendor-libmpdec.patch @@ -1,4 +1,4 @@ -From eb1432807cab49ff047fce3cde700f7488379dd6 Mon Sep 17 00:00:00 2001 +From 05b2d4adfea83d8057e016fceef693f7c4e99209 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 diff --git a/recipe/patches/0023-Brand-conda-forge.patch b/recipe/patches/0023-Brand-conda-forge.patch index 99eda784d..cb5b992de 100644 --- a/recipe/patches/0023-Brand-conda-forge.patch +++ b/recipe/patches/0023-Brand-conda-forge.patch @@ -1,4 +1,4 @@ -From 5076150e13869eef46ae60f3d1b242b417688461 Mon Sep 17 00:00:00 2001 +From 917c51dab6b2c7861edb8c3462963d9a6bd7c46d 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 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 bf081a10d..591fffc57 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 68b6f1e2b050062c5541c5064dc12f4c38b68124 Mon Sep 17 00:00:00 2001 +From 3170567ff2442f9460ae6da7f94883c9a7c5a445 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 @@ -30,20 +30,20 @@ index 6313abf5485..bc8169e2f68 100644 module _testcapi [clinic start generated code]*/ diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c -index b5aba8d64ac..5a419ea0f8d 100644 +index 5784482d389..6c1a2dfd399 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c -@@ -23,6 +23,10 @@ - # include // W_STOPCODE +@@ -30,6 +30,10 @@ + # include // sysctlbyname() #endif +#ifdef _MSC_VER +typedef int pid_t; +#endif + - #ifdef bool - # error "The public headers should not include , see gh-48924" - #endif + #include "_testcapi/util.h" + + diff --git a/Modules/_testlimitedcapi/long.c b/Modules/_testlimitedcapi/long.c index 99b9e96760d..932fef0497f 100644 --- a/Modules/_testlimitedcapi/long.c @@ -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 69e28a1ff95..ca4d58dfd63 100644 +index 7bf8bc9e5d9..f995fc804a0 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -219,6 +219,7 @@ @@ -100,7 +100,7 @@ index 710a737ebcc..92d327b1e35 100644 #if _MSC_VER >= 1200 /* This file only exists in VC 6.0 or higher */ diff --git a/Python/remote_debug.h b/Python/remote_debug.h -index 6a7706bb76e..efd3a4c4953 100644 +index ed0c4e2c85c..97f79087497 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 f3f0a4a47..28d4a622d 100644 --- a/recipe/patches/0025-Unvendor-zstd.patch +++ b/recipe/patches/0025-Unvendor-zstd.patch @@ -1,4 +1,4 @@ -From 70e96283f139a845467ecde9fe758dc84b1a252a Mon Sep 17 00:00:00 2001 +From e1a36beb37bcc740dd29bcd671550677ad9fc520 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 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 99e33ac3a..24457778a 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 1fa1e88b901278be305383651f07b1ac605e61af Mon Sep 17 00:00:00 2001 +From e43404b376775691f6b51e671f5ad53abf99c0d9 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