From fb2f446413b8d0ecb282f4aed50d4e30488e6698 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 3 Oct 2023 09:03:37 +0200 Subject: [PATCH] python: Update to 3.11.6 --- ...g-make-_sysconfigdata.py-relocatable.patch | 2 +- ...t-threads-and-make-it-default-on-min.patch | 2 +- ...S-and-others-when-compiling-with-MIN.patch | 4 +- ...re-add-MACHDEP-and-platform-on-MINGW.patch | 2 +- ...-Add-default-configuration-for-MINGW.patch | 2 +- ...-largefile-support-by-default-for-Mi.patch | 2 +- ...-to-CPPFLAGS-and-to-SRCDIRS-on-Mingw.patch | 2 +- ...fine-necessary-headers-for-compiling.patch | 4 +- ...-by-default-when-compiling-for-MINGW.patch | 2 +- .../0010-pyport.h-Add-support-for-MINGW.patch | 8 +- ...tions-so-that-shared-build-is-possib.patch | 2 +- ...dd-dynamic-loading-support-for-MINGW.patch | 6 +- ...-program-for-frozen-scripts-on-MINGW.patch | 4 +- ...g-library-for-multiprocessing-module.patch | 2 +- ...5-selectmodule-add-support-for-MINGW.patch | 4 +- ...raries-to-fix-compile-of-ctypes-on-M.patch | 2 +- ...k2-and-setup-_socket-module-on-MINGW.patch | 4 +- ...Enable-some-windows-specific-modules.patch | 2 +- ...nfig-MINGW-build-extensions-with-GCC.patch | 2 +- ...g-treat-MINGW-builds-as-POSIX-builds.patch | 2 +- ...pport-for-stdcall-without-underscore.patch | 2 +- ...ead-rename-to-avoid-failure-on-windo.patch | 2 +- .../0023-Customize-site-for-MINGW.patch | 2 +- .../0024-add-python-config-sh.patch | 2 +- ...ort_symbols-to-fix-compile-of-ctypes.patch | 2 +- ...x-sep-if-MSYSTEM-environment-variabl.patch | 14 +- ...s-cygwin-semi-native-build-sysconfig.patch | 4 +- ...sysconfig-mingw-sysconfig-like-posix.patch | 2 +- ...d-multiarch-paths-if-cross-compiling.patch | 2 +- ...ngw-use-backslashes-in-compileall-py.patch | 2 +- ...-msys-convert_path-fix-and-root-hack.patch | 8 +- .../0032-mingw-pdcurses_ISPAD.patch | 2 +- ...sys-monkeypatch-os-system-via-sh-exe.patch | 2 +- ...place-slashes-used-in-io-redirection.patch | 2 +- .../0035-remove_path_max.default.patch | 2 +- .../0036-dont-link-with-gettext.patch | 4 +- mingw-w64-python/0037-ctypes-python-dll.patch | 2 +- .../0038-gdbm-module-includes.patch | 2 +- .../0039-use-gnu_printf-in-format.patch | 6 +- ...w-fix-ssl-dont-use-enum_certificates.patch | 2 +- ...fix-using-dllhandle-and-winver-mingw.patch | 4 +- ...-config-so-msvccompiler-get_build_ve.patch | 2 +- ...3-MINGW-link-with-additional-library.patch | 2 +- mingw-w64-python/0044-install-msilib.patch | 6 +- .../0045-fix-signal-module-build.patch | 2 +- ...-build-winconsoleio-and-_testconsole.patch | 2 +- mingw-w64-python/0047-expose-sem_unlink.patch | 2 +- mingw-w64-python/0048-cygpty-isatty.patch | 16 +- .../0049-disable-broken-gdbm-module.patch | 2 +- ...win-resource-files-and-build-pythonw.patch | 12 +- mingw-w64-python/0051-disable-readline.patch | 2 +- mingw-w64-python/0052-fix-isselectable.patch | 2 +- .../0053-_xxsubinterpretersmodule.patch | 2 +- ...054-configure.ac-fix-inet_pton-check.patch | 2 +- .../0055-set-venv-activate-path-unix.patch | 2 +- .../0056-pass-gen-profile-ldflags.patch | 6 +- ...indows-must-link-ext-with-python-lib.patch | 2 +- .../0058-importlib-bootstrap-path-sep.patch | 2 +- mingw-w64-python/0059-pathlib-path-sep.patch | 2 +- mingw-w64-python/0060-warnings-fixes.patch | 10 +- .../0061-fix-build-testinternalcapi.patch | 2 +- .../0062-extend-MS_WINDOWS-flag.patch | 2 +- mingw-w64-python/0063-clang-arm64.patch | 2 +- ...configure.ac-set-MINGW-stack-reserve.patch | 2 +- ...065-Don-t-use-os.pathsep-to-find-EOF.patch | 2 +- ...ion-suffix-for-c-extensions-on-mingw.patch | 8 +- ...the-get_platform-method-in-sysconfig.patch | 2 +- ...ler-customize-mingw-cygwin-compilers.patch | 2 +- ...-distutils-compiler-enable-new-dtags.patch | 2 +- ...tils-MINGW-build-extensions-with-GCC.patch | 2 +- ...ngw32CCompiler-as-default-compiler-f.patch | 2 +- .../0072-distutils-find-import-library.patch | 2 +- ...circular-dependency-from-time-module.patch | 2 +- ...lization-of-posix-build-in-distutils.patch | 2 +- ...distutils-mingw-sysconfig-like-posix.patch | 2 +- .../0076-distutils-get_versions-fixes.patch | 2 +- ...77-distutils-install-layout-as-posix.patch | 2 +- ...-msys-convert_path-fix-and-root-hack.patch | 2 +- ...-distutils-mingw-build-optimized-ext.patch | 2 +- ...ccompiler-dont-strip-modules-if-pyde.patch | 2 +- ...istutils-get-compilers-from-env-vars.patch | 2 +- ...tutils-add-windmc-to-cygwinccompiler.patch | 2 +- .../0083-distutils-fix-msvc9-import.patch | 2 +- ...tils-mingw-add-LIBPL-to-library-dirs.patch | 2 +- ...-the-get_platform-method-in-distutil.patch | 2 +- ...86-build-Fix-ncursesw-include-lookup.patch | 4 +- .../0087-tests-fix-test_bytes.patch | 2 +- ...e-not-raising-for-invalid-year-value.patch | 2 +- ...brary-c-should-return-None-with-ucrt.patch | 2 +- ...uild-Disable-checks-for-dlopen-dlfcn.patch | 2 +- ...stall-location-of-the-import-library.patch | 6 +- ...NV_EXCL-for-the-shared-Python-module.patch | 6 +- ...venvlauncher-build-installation-into.patch | 12 +- ...onfigure.ac-set-_WIN32_WINNT-version.patch | 2 +- ....ac-don-t-check-for-clock_-functions.patch | 2 +- ...-normpath-paths-coming-from-env-vars.patch | 2 +- ...ld-and-add-some-mingw-specific-tests.patch | 2 +- .../0098-Prefer-sysconfig.python_build.patch | 2 +- ...0099-Define-PY3_DLLNAME-to-fix-build.patch | 2 +- ...move-checks-for-ancient-gcc-binutils.patch | 2 +- ...CC-env-var-before-passing-to-subproc.patch | 2 +- ...2-_testconsole.c-Fix-casing-path-sep.patch | 2 +- ...t-architecture-markers-for-python-on.patch | 2 +- .../0104-distutils-add-back-gcc_version.patch | 2 +- ...ix-mingw-cross-compiling-in-setup.py.patch | 2 +- ...sesw-pkg-config-when-cross-compiling.patch | 2 +- ...mingw_smoketests-fix-_UCRT-condition.patch | 2 +- ...-Modify-sys.winver-to-match-upstream.patch | 2 +- ...-packages-path-to-include-the-enviro.patch | 2 +- ...e-a-header-in-the-check-for-_beginth.patch | 2 +- ...ault-to-without-c-locale-coercion-on.patch | 2 +- mingw-w64-python/0112-Fix-failing-tests.patch | 2 +- ...ild-root-to-libdirs-when-building-un.patch | 2 +- ...sep-with-an-empty-MSYSTEM-env-var-no.patch | 2 +- ...TH-when-compiling-Python-sysmodule.c.patch | 6 +- .../0116-Make-_Py_CheckPython3-extern.patch | 2 +- mingw-w64-python/0117-link-with-bcrypt.patch | 2 +- .../0118-correctly-find-native-python.patch | 2 +- ...dd-extra-flags-for-_bootstrap_python.patch | 6 +- ...20-posixmodule-undefine-HAVE_OPENDIR.patch | 4 +- ...121-getpath.py-add-support-for-mingw.patch | 28 +- ...-t-build-_posixsubprocess-on-Windows.patch | 2 +- .../0123-_ssl-link-with-ws2_32.patch | 2 +- .../0124-Fix-building-_socket-module.patch | 2 +- ...125-Always-normalize-path-in-abspath.patch | 2 +- ...k.h-when-checking-for-netdb-function.patch | 2 +- ...multiprocessing-semaphore.c-on-win32.patch | 2 +- ...configure-build-mmap-module-on-win32.patch | 2 +- .../0129-venv-creation-fixes.patch | 2 +- ...n-function-where-winsock.h-is-includ.patch | 2 +- ...figure.ac-set-BUILDEXEEXT-and-EXEEXT.patch | 2 +- ...re.ac-fix-building-some-test-modules.patch | 2 +- ...sconfig.get_config_var-VPATH-to-an-a.patch | 4 +- ...o-before-passing-though-pathcch-func.patch | 8 +- ...-venvlauncher.exe-from-PC-launcher.c.patch | 10 +- .../0136-getpath.py-fix-dirname.patch | 4 +- ...use-normpath-on-all-generated-paths.patch} | 8 +- ...raw-f-string-in-test_httpservers.py-.patch | 28 -- ...0138-pathconfig-normpath-sys.path-0.patch} | 4 +- ...s-add-some-tests-for-sys-site-paths.patch} | 4 +- ...on-paths-added-using-add_dll_direct.patch} | 4 +- ...include-lib-dirs-from-CFLAGS-LDFLAG.patch} | 4 +- ...42-Build-and-install-libpython3.dll.patch} | 18 +- ...epend-the-system-library-directorie.patch} | 4 +- ... 0144-Port-GetPythonImport-to-mingw.patch} | 4 +- ...ke-sure-to-only-use-backslashes-for.patch} | 4 +- .../0145-tests-skip-a-broken-test.patch | 26 -- ... => 0146-Use-shared-instead-of-mdll.patch} | 4 +- mingw-w64-python/PKGBUILD | 344 +++++++++--------- 149 files changed, 418 insertions(+), 478 deletions(-) rename mingw-w64-python/{0138-getpath-use-normpath-on-all-generated-paths.patch => 0137-getpath-use-normpath-on-all-generated-paths.patch} (96%) delete mode 100644 mingw-w64-python/0137-gh-105821-Use-a-raw-f-string-in-test_httpservers.py-.patch rename mingw-w64-python/{0139-pathconfig-normpath-sys.path-0.patch => 0138-pathconfig-normpath-sys.path-0.patch} (86%) rename mingw-w64-python/{0140-smoketests-add-some-tests-for-sys-site-paths.patch => 0139-smoketests-add-some-tests-for-sys-site-paths.patch} (91%) rename mingw-w64-python/{0141-Search-DLLs-only-on-paths-added-using-add_dll_direct.patch => 0140-Search-DLLs-only-on-paths-added-using-add_dll_direct.patch} (97%) rename mingw-w64-python/{0142-Allow-picking-up-include-lib-dirs-from-CFLAGS-LDFLAG.patch => 0141-Allow-picking-up-include-lib-dirs-from-CFLAGS-LDFLAG.patch} (88%) rename mingw-w64-python/{0143-Build-and-install-libpython3.dll.patch => 0142-Build-and-install-libpython3.dll.patch} (89%) rename mingw-w64-python/{0144-setup.py-don-t-prepend-the-system-library-directorie.patch => 0143-setup.py-don-t-prepend-the-system-library-directorie.patch} (92%) rename mingw-w64-python/{0146-Port-GetPythonImport-to-mingw.patch => 0144-Port-GetPythonImport-to-mingw.patch} (95%) rename mingw-w64-python/{0147-LoadLibraryExW-make-sure-to-only-use-backslashes-for.patch => 0145-LoadLibraryExW-make-sure-to-only-use-backslashes-for.patch} (93%) delete mode 100644 mingw-w64-python/0145-tests-skip-a-broken-test.patch rename mingw-w64-python/{0148-Use-shared-instead-of-mdll.patch => 0146-Use-shared-instead-of-mdll.patch} (92%) diff --git a/mingw-w64-python/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch b/mingw-w64-python/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch index 8dc6507b53..8f2cf7ee34 100644 --- a/mingw-w64-python/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch +++ b/mingw-w64-python/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch @@ -1,4 +1,4 @@ -From 77fe2c5e83c9e36e285e7a429f0a52832f3794e2 Mon Sep 17 00:00:00 2001 +From 57af03ff5d68ee3db5ea37d3ec4e451fe5bf5246 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:51:10 +0530 Subject: [PATCH 001/N] sysconfig: make _sysconfigdata.py relocatable diff --git a/mingw-w64-python/0002-build-add-with-nt-threads-and-make-it-default-on-min.patch b/mingw-w64-python/0002-build-add-with-nt-threads-and-make-it-default-on-min.patch index 51ded912b7..c07f3df3ad 100644 --- a/mingw-w64-python/0002-build-add-with-nt-threads-and-make-it-default-on-min.patch +++ b/mingw-w64-python/0002-build-add-with-nt-threads-and-make-it-default-on-min.patch @@ -1,4 +1,4 @@ -From 755f5c3f05e3a8b0f42d5946f8011aa711267d9e Mon Sep 17 00:00:00 2001 +From 4bdf3815dae42a484cada9efa6312efb443aba1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:12 +0530 diff --git a/mingw-w64-python/0003-Define-MS_WINDOWS-and-others-when-compiling-with-MIN.patch b/mingw-w64-python/0003-Define-MS_WINDOWS-and-others-when-compiling-with-MIN.patch index fa72251223..ca9e5d91d3 100644 --- a/mingw-w64-python/0003-Define-MS_WINDOWS-and-others-when-compiling-with-MIN.patch +++ b/mingw-w64-python/0003-Define-MS_WINDOWS-and-others-when-compiling-with-MIN.patch @@ -1,4 +1,4 @@ -From e98ef82ef420a273e06f6cfcf6debd6cf1f3edc6 Mon Sep 17 00:00:00 2001 +From 206486d69c26b02ddebcc192adfc05c99387e2b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:13 +0530 @@ -18,7 +18,7 @@ Co-authored-by: Christoph Reiter 1 file changed, 15 insertions(+) diff --git a/Include/pyport.h b/Include/pyport.h -index 93250f4..f89e335 100644 +index b3b8b6f..b24c075 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -53,6 +53,21 @@ diff --git a/mingw-w64-python/0004-configure-add-MACHDEP-and-platform-on-MINGW.patch b/mingw-w64-python/0004-configure-add-MACHDEP-and-platform-on-MINGW.patch index 969bdec39a..4d167a377b 100644 --- a/mingw-w64-python/0004-configure-add-MACHDEP-and-platform-on-MINGW.patch +++ b/mingw-w64-python/0004-configure-add-MACHDEP-and-platform-on-MINGW.patch @@ -1,4 +1,4 @@ -From 12801eca369e8671315fa488f56590024fe02517 Mon Sep 17 00:00:00 2001 +From 35830376568329ecbf5dc787b1fc6999892f1661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:14 +0530 diff --git a/mingw-w64-python/0005-Add-default-configuration-for-MINGW.patch b/mingw-w64-python/0005-Add-default-configuration-for-MINGW.patch index f812ac3164..00facddce7 100644 --- a/mingw-w64-python/0005-Add-default-configuration-for-MINGW.patch +++ b/mingw-w64-python/0005-Add-default-configuration-for-MINGW.patch @@ -1,4 +1,4 @@ -From b88f3bb7d338ea915734407a7557593fa4688e49 Mon Sep 17 00:00:00 2001 +From 1ed6b291d95fde5ff7072d98d47fdbebd9bdffa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:15 +0530 diff --git a/mingw-w64-python/0006-configure-enable-largefile-support-by-default-for-Mi.patch b/mingw-w64-python/0006-configure-enable-largefile-support-by-default-for-Mi.patch index 6de102f970..a659a0303b 100644 --- a/mingw-w64-python/0006-configure-enable-largefile-support-by-default-for-Mi.patch +++ b/mingw-w64-python/0006-configure-enable-largefile-support-by-default-for-Mi.patch @@ -1,4 +1,4 @@ -From e0f6c63ec4541cf2bfcaed7268d39b9dc3a5a835 Mon Sep 17 00:00:00 2001 +From c0fbfdc45b039e2be91881ff9a39f2e12f5555cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:16 +0530 diff --git a/mingw-w64-python/0007-Add-PC-to-CPPFLAGS-and-to-SRCDIRS-on-Mingw.patch b/mingw-w64-python/0007-Add-PC-to-CPPFLAGS-and-to-SRCDIRS-on-Mingw.patch index 8d1d618eeb..6930688c46 100644 --- a/mingw-w64-python/0007-Add-PC-to-CPPFLAGS-and-to-SRCDIRS-on-Mingw.patch +++ b/mingw-w64-python/0007-Add-PC-to-CPPFLAGS-and-to-SRCDIRS-on-Mingw.patch @@ -1,4 +1,4 @@ -From 24c7c3bf102a127a812f76271c1b33143ac1854c Mon Sep 17 00:00:00 2001 +From 1cfddbd93746094175469bd5ed9a0b11311cc17e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:18 +0530 diff --git a/mingw-w64-python/0008-posixmodule.c-Define-necessary-headers-for-compiling.patch b/mingw-w64-python/0008-posixmodule.c-Define-necessary-headers-for-compiling.patch index d2ece6bafa..fbea8ea2b6 100644 --- a/mingw-w64-python/0008-posixmodule.c-Define-necessary-headers-for-compiling.patch +++ b/mingw-w64-python/0008-posixmodule.c-Define-necessary-headers-for-compiling.patch @@ -1,4 +1,4 @@ -From 13c317b52aa9e808a6b6a6b0ed94f6b7fbdc0970 Mon Sep 17 00:00:00 2001 +From 6dce6cdb9422eb5653e8c4ddeb6da02215ad4f06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:19 +0530 @@ -33,7 +33,7 @@ index e3e9b96..814acbc 100644 _tracemalloc _tracemalloc.c diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index cfadb6a..ce9155b 100644 +index 2e4a66a..419858d 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -350,6 +350,26 @@ corresponding Unix manual entries for more information on calls."); diff --git a/mingw-w64-python/0009-Build-winreg-by-default-when-compiling-for-MINGW.patch b/mingw-w64-python/0009-Build-winreg-by-default-when-compiling-for-MINGW.patch index a8fd9a3746..042eb71a16 100644 --- a/mingw-w64-python/0009-Build-winreg-by-default-when-compiling-for-MINGW.patch +++ b/mingw-w64-python/0009-Build-winreg-by-default-when-compiling-for-MINGW.patch @@ -1,4 +1,4 @@ -From f5aa9d232048fa781f148340593156184507bce6 Mon Sep 17 00:00:00 2001 +From 20760f53cd67ff80fe58b032bf21dcc26edbcb34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:20 +0530 diff --git a/mingw-w64-python/0010-pyport.h-Add-support-for-MINGW.patch b/mingw-w64-python/0010-pyport.h-Add-support-for-MINGW.patch index 77285a5ebb..1da83c0c74 100644 --- a/mingw-w64-python/0010-pyport.h-Add-support-for-MINGW.patch +++ b/mingw-w64-python/0010-pyport.h-Add-support-for-MINGW.patch @@ -1,4 +1,4 @@ -From a1023a23c1144ec360a67443715bac932cf4fef0 Mon Sep 17 00:00:00 2001 +From 480a08e08a0e255b63de9e5e261c387caabf2437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:23 +0530 @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Include/pyport.h b/Include/pyport.h -index f89e335..171872c 100644 +index b24c075..fbb0415 100644 --- a/Include/pyport.h +++ b/Include/pyport.h -@@ -524,12 +524,12 @@ extern char * _getpty(int *, int, mode_t, int); +@@ -519,12 +519,12 @@ extern char * _getpty(int *, int, mode_t, int); */ /* @@ -32,7 +32,7 @@ index f89e335..171872c 100644 # define HAVE_DECLSPEC_DLL #endif -@@ -542,21 +542,23 @@ extern char * _getpty(int *, int, mode_t, int); +@@ -537,21 +537,23 @@ extern char * _getpty(int *, int, mode_t, int); # define PyAPI_FUNC(RTYPE) Py_EXPORTED_SYMBOL RTYPE # define PyAPI_DATA(RTYPE) extern Py_EXPORTED_SYMBOL RTYPE /* module init functions inside the core need no external linkage */ diff --git a/mingw-w64-python/0011-configure-add-options-so-that-shared-build-is-possib.patch b/mingw-w64-python/0011-configure-add-options-so-that-shared-build-is-possib.patch index 695ce4495c..8e058187b1 100644 --- a/mingw-w64-python/0011-configure-add-options-so-that-shared-build-is-possib.patch +++ b/mingw-w64-python/0011-configure-add-options-so-that-shared-build-is-possib.patch @@ -1,4 +1,4 @@ -From 4b0b9b90c3643425478ffceddcdaff6c8ba0c167 Mon Sep 17 00:00:00 2001 +From 0f36d0e54ec627b531de674a96c2f97f5edd1425 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:24 +0530 diff --git a/mingw-w64-python/0012-Add-dynamic-loading-support-for-MINGW.patch b/mingw-w64-python/0012-Add-dynamic-loading-support-for-MINGW.patch index 27b7a99aab..e6db111442 100644 --- a/mingw-w64-python/0012-Add-dynamic-loading-support-for-MINGW.patch +++ b/mingw-w64-python/0012-Add-dynamic-loading-support-for-MINGW.patch @@ -1,4 +1,4 @@ -From ab85547bcbe3fa465872afd352f89bfc18508b19 Mon Sep 17 00:00:00 2001 +From 1565f21c259aa73b55457f6039a7ec7757d601c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:25 +0530 @@ -15,10 +15,10 @@ Co-authored-by: Алексей 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 884bea1..992f48f 100644 +index 0d0ac13..4cad68c 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1276,6 +1276,12 @@ Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile +@@ -1278,6 +1278,12 @@ Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile -DSHLIB_EXT='"$(EXT_SUFFIX)"' \ -o $@ $(srcdir)/Python/dynload_hpux.c diff --git a/mingw-w64-python/0013-Ignore-main-program-for-frozen-scripts-on-MINGW.patch b/mingw-w64-python/0013-Ignore-main-program-for-frozen-scripts-on-MINGW.patch index 3398351cad..47ce3b90bc 100644 --- a/mingw-w64-python/0013-Ignore-main-program-for-frozen-scripts-on-MINGW.patch +++ b/mingw-w64-python/0013-Ignore-main-program-for-frozen-scripts-on-MINGW.patch @@ -1,4 +1,4 @@ -From f3e9a09bf2ec981d509c35a6bb64188fa1ef88d8 Mon Sep 17 00:00:00 2001 +From 8245107f15bb4aafb27315e286dc1f5ed27aa576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:26 +0530 @@ -14,7 +14,7 @@ Co-authored-by: Алексей 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 992f48f..0653550 100644 +index 4cad68c..6a8affa 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -390,7 +390,7 @@ PYTHON_OBJS= \ diff --git a/mingw-w64-python/0014-Add-missing-library-for-multiprocessing-module.patch b/mingw-w64-python/0014-Add-missing-library-for-multiprocessing-module.patch index c3d94a823b..0defe72449 100644 --- a/mingw-w64-python/0014-Add-missing-library-for-multiprocessing-module.patch +++ b/mingw-w64-python/0014-Add-missing-library-for-multiprocessing-module.patch @@ -1,4 +1,4 @@ -From 26f1f5a1632563f575578dbfa9adb5fa48a6d155 Mon Sep 17 00:00:00 2001 +From f3cbfba3d2f227c0b3c190efbfebbaf65b8abc97 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Mon, 13 Feb 2023 18:24:30 +0530 Subject: [PATCH 014/N] Add missing library for multiprocessing module diff --git a/mingw-w64-python/0015-selectmodule-add-support-for-MINGW.patch b/mingw-w64-python/0015-selectmodule-add-support-for-MINGW.patch index f58bbf7189..dd9e239d38 100644 --- a/mingw-w64-python/0015-selectmodule-add-support-for-MINGW.patch +++ b/mingw-w64-python/0015-selectmodule-add-support-for-MINGW.patch @@ -1,4 +1,4 @@ -From 8ca34979153cafe5a0618d180ea24d22aef3ccc8 Mon Sep 17 00:00:00 2001 +From 9b3aea69401359ec3016a7aec19640e7d5858efb Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Mon, 13 Feb 2023 18:39:05 +0530 Subject: [PATCH 015/N] selectmodule: add support for MINGW @@ -9,7 +9,7 @@ Subject: [PATCH 015/N] selectmodule: add support for MINGW 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c -index 4eea928..6be3582 100644 +index 8210269..7e75533 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -146,9 +146,9 @@ seq2set(PyObject *seq, fd_set *set, pylist fd2obj[FD_SETSIZE + 1]) diff --git a/mingw-w64-python/0016-setup.py-add-libraries-to-fix-compile-of-ctypes-on-M.patch b/mingw-w64-python/0016-setup.py-add-libraries-to-fix-compile-of-ctypes-on-M.patch index 643a789cfd..f05d725727 100644 --- a/mingw-w64-python/0016-setup.py-add-libraries-to-fix-compile-of-ctypes-on-M.patch +++ b/mingw-w64-python/0016-setup.py-add-libraries-to-fix-compile-of-ctypes-on-M.patch @@ -1,4 +1,4 @@ -From 6336dfca428791dd7a8eefedecd013b239bbcbcc Mon Sep 17 00:00:00 2001 +From 14309af87ae1d74498e7601b282adefb05aab6ea Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Mon, 13 Feb 2023 19:05:43 +0530 Subject: [PATCH 016/N] setup.py: add libraries to fix compile of ctypes on diff --git a/mingw-w64-python/0017-Detect-winsock2-and-setup-_socket-module-on-MINGW.patch b/mingw-w64-python/0017-Detect-winsock2-and-setup-_socket-module-on-MINGW.patch index b1a6bd5e7a..b356474f13 100644 --- a/mingw-w64-python/0017-Detect-winsock2-and-setup-_socket-module-on-MINGW.patch +++ b/mingw-w64-python/0017-Detect-winsock2-and-setup-_socket-module-on-MINGW.patch @@ -1,4 +1,4 @@ -From f5c51dea4fe2296c3f5c4f1d919d675297c41fe8 Mon Sep 17 00:00:00 2001 +From 95648db223b664bbd97265a49c91ad478b7bce10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:30 +0530 @@ -28,7 +28,7 @@ index 513065d..9be43fd 100644 +# force detection of winsock2 functionality - require wxp or newer +ac_cv_func_getpeername=yes diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c -index e6d983a..399c1e7 100644 +index db3e051..8d7fbf9 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -274,7 +274,7 @@ shutdown(how) -- shut down traffic in one or both directions\n\ diff --git a/mingw-w64-python/0018-Enable-some-windows-specific-modules.patch b/mingw-w64-python/0018-Enable-some-windows-specific-modules.patch index c8fd86d368..fbbb8b49ee 100644 --- a/mingw-w64-python/0018-Enable-some-windows-specific-modules.patch +++ b/mingw-w64-python/0018-Enable-some-windows-specific-modules.patch @@ -1,4 +1,4 @@ -From a7d5196dc9d0062ef37fc22fd57b382fcd118978 Mon Sep 17 00:00:00 2001 +From e2c37845b9ea988a1ef7ac5a9d2e5226bd64d187 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Tue, 14 Feb 2023 20:40:42 +0530 Subject: [PATCH 018/N] Enable some windows specific modules diff --git a/mingw-w64-python/0019-sysconfig-MINGW-build-extensions-with-GCC.patch b/mingw-w64-python/0019-sysconfig-MINGW-build-extensions-with-GCC.patch index 5b62f20e23..d5a31b276c 100644 --- a/mingw-w64-python/0019-sysconfig-MINGW-build-extensions-with-GCC.patch +++ b/mingw-w64-python/0019-sysconfig-MINGW-build-extensions-with-GCC.patch @@ -1,4 +1,4 @@ -From 9ac31af8a4ac0fbf18f2df7c67909d3c6e46b070 Mon Sep 17 00:00:00 2001 +From 5b96139fcda60b4ff6d51fe77d23171bb5afe961 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 20:52:42 +0200 Subject: [PATCH 019/N] sysconfig: MINGW build extensions with GCC diff --git a/mingw-w64-python/0020-sysconfig-treat-MINGW-builds-as-POSIX-builds.patch b/mingw-w64-python/0020-sysconfig-treat-MINGW-builds-as-POSIX-builds.patch index 263b8331b3..264abd0043 100644 --- a/mingw-w64-python/0020-sysconfig-treat-MINGW-builds-as-POSIX-builds.patch +++ b/mingw-w64-python/0020-sysconfig-treat-MINGW-builds-as-POSIX-builds.patch @@ -1,4 +1,4 @@ -From d4d7bde7598b9fe241bece4c33a6c60c3a1daea6 Mon Sep 17 00:00:00 2001 +From adcf3336c44a78c6f5d3c315c98ea7b584b35849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:38 +0530 diff --git a/mingw-w64-python/0021-Add-support-for-stdcall-without-underscore.patch b/mingw-w64-python/0021-Add-support-for-stdcall-without-underscore.patch index d79290ae6d..556cec0d25 100644 --- a/mingw-w64-python/0021-Add-support-for-stdcall-without-underscore.patch +++ b/mingw-w64-python/0021-Add-support-for-stdcall-without-underscore.patch @@ -1,4 +1,4 @@ -From c8623992802849fbaf73aa10a17ac200905437d1 Mon Sep 17 00:00:00 2001 +From 14b0e83c3b90966d5353f54c58c5a624a74e56e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:39 +0530 diff --git a/mingw-w64-python/0022-Use-replace-instead-rename-to-avoid-failure-on-windo.patch b/mingw-w64-python/0022-Use-replace-instead-rename-to-avoid-failure-on-windo.patch index ed435af390..2cb39cdaca 100644 --- a/mingw-w64-python/0022-Use-replace-instead-rename-to-avoid-failure-on-windo.patch +++ b/mingw-w64-python/0022-Use-replace-instead-rename-to-avoid-failure-on-windo.patch @@ -1,4 +1,4 @@ -From 95601d70a05815b642cc71e1d4fe65c5e2136042 Mon Sep 17 00:00:00 2001 +From 735a2797b39c0ec47ae836456ce9e23c66e54eaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:40 +0530 diff --git a/mingw-w64-python/0023-Customize-site-for-MINGW.patch b/mingw-w64-python/0023-Customize-site-for-MINGW.patch index b697534a3e..90ccd21d0d 100644 --- a/mingw-w64-python/0023-Customize-site-for-MINGW.patch +++ b/mingw-w64-python/0023-Customize-site-for-MINGW.patch @@ -1,4 +1,4 @@ -From a416d20935e181671e2d17ae152a0df167556d8a Mon Sep 17 00:00:00 2001 +From c517ff5544413cc1b1043740facf23fbd71d1d02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:42 +0530 diff --git a/mingw-w64-python/0024-add-python-config-sh.patch b/mingw-w64-python/0024-add-python-config-sh.patch index 63e30d8524..b0d1052460 100644 --- a/mingw-w64-python/0024-add-python-config-sh.patch +++ b/mingw-w64-python/0024-add-python-config-sh.patch @@ -1,4 +1,4 @@ -From da1b79f217831e3a7dc5fbb9ecbecd2b507f24fe Mon Sep 17 00:00:00 2001 +From 03c321f3eff32508badd123edf204287e21ed210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:43 +0530 diff --git a/mingw-w64-python/0025-setup.py-add-export_symbols-to-fix-compile-of-ctypes.patch b/mingw-w64-python/0025-setup.py-add-export_symbols-to-fix-compile-of-ctypes.patch index 191625282d..870cc62c91 100644 --- a/mingw-w64-python/0025-setup.py-add-export_symbols-to-fix-compile-of-ctypes.patch +++ b/mingw-w64-python/0025-setup.py-add-export_symbols-to-fix-compile-of-ctypes.patch @@ -1,4 +1,4 @@ -From 0c09b3a36f41f7ae4223dd8570c4d91944ef61f2 Mon Sep 17 00:00:00 2001 +From c3b7707f884ddd838c39762266f969e1dd6c2b58 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 7 Apr 2023 19:13:42 +0530 Subject: [PATCH 025/N] setup.py: add export_symbols to fix compile of ctypes diff --git a/mingw-w64-python/0026-mingw-prefer-unix-sep-if-MSYSTEM-environment-variabl.patch b/mingw-w64-python/0026-mingw-prefer-unix-sep-if-MSYSTEM-environment-variabl.patch index 1f311fb605..f3878d738d 100644 --- a/mingw-w64-python/0026-mingw-prefer-unix-sep-if-MSYSTEM-environment-variabl.patch +++ b/mingw-w64-python/0026-mingw-prefer-unix-sep-if-MSYSTEM-environment-variabl.patch @@ -1,4 +1,4 @@ -From df273fa2a56e2e9de142bb7a78aafe866fdb7acb Mon Sep 17 00:00:00 2001 +From 5c6d9b01e93eec8092f9038941cc16b3fc66b951 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:51:46 +0530 Subject: [PATCH 026/N] mingw: prefer unix sep if MSYSTEM environment @@ -255,18 +255,18 @@ index 0246419..449add8 100644 try: diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index ce9155b..6b3d46a 100644 +index 419858d..ff30f47 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c -@@ -3835,6 +3835,7 @@ posix_getcwd(int use_bytes) - return PyErr_SetFromWindowsErr(0); +@@ -3857,6 +3857,7 @@ posix_getcwd(int use_bytes) + return NULL; } + Py_NormalizeSepsW(wbuf2); PyObject *resobj = PyUnicode_FromWideChar(wbuf2, len); if (wbuf2 != wbuf) { PyMem_RawFree(wbuf2); -@@ -4439,6 +4440,7 @@ os__getfinalpathname_impl(PyObject *module, path_t *path) +@@ -4461,6 +4462,7 @@ os__getfinalpathname_impl(PyObject *module, path_t *path) target_path = tmp; } @@ -441,10 +441,10 @@ index be0f97c..3d684d6 100644 diff --git a/Python/traceback.c b/Python/traceback.c -index 7f47349..23fda62 100644 +index c4f5ec8..ebc984c 100644 --- a/Python/traceback.c +++ b/Python/traceback.c -@@ -323,7 +323,7 @@ _Py_FindSourceFile(PyObject *filename, char* namebuf, size_t namelen, PyObject * +@@ -324,7 +324,7 @@ _Py_FindSourceFile(PyObject *filename, char* namebuf, size_t namelen, PyObject * filepath = PyBytes_AS_STRING(filebytes); /* Search tail of filename in sys.path before giving up */ diff --git a/mingw-w64-python/0027-msys-cygwin-semi-native-build-sysconfig.patch b/mingw-w64-python/0027-msys-cygwin-semi-native-build-sysconfig.patch index cbde8b699d..bc08c16b65 100644 --- a/mingw-w64-python/0027-msys-cygwin-semi-native-build-sysconfig.patch +++ b/mingw-w64-python/0027-msys-cygwin-semi-native-build-sysconfig.patch @@ -1,4 +1,4 @@ -From ca4e887c5d271a847b4d7447e87b5e3f954dacc6 Mon Sep 17 00:00:00 2001 +From 9041ebf29dc0395e7e8f42f21e19c806732698cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:50 +0530 @@ -34,7 +34,7 @@ index fa5e338..8be0645 100644 vars.update(done) return vars diff --git a/Makefile.pre.in b/Makefile.pre.in -index 0653550..48ac248 100644 +index 6a8affa..43a31ec 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -141,6 +141,13 @@ exec_prefix= @exec_prefix@ diff --git a/mingw-w64-python/0028-sysconfig-mingw-sysconfig-like-posix.patch b/mingw-w64-python/0028-sysconfig-mingw-sysconfig-like-posix.patch index 053e5119b3..aed876b9c4 100644 --- a/mingw-w64-python/0028-sysconfig-mingw-sysconfig-like-posix.patch +++ b/mingw-w64-python/0028-sysconfig-mingw-sysconfig-like-posix.patch @@ -1,4 +1,4 @@ -From 52376dd1c5de9f914cbe564c3c3c600e731e0a8a Mon Sep 17 00:00:00 2001 +From 730972fa7149985c28833e514894a4ad23f0409f Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 20:53:59 +0200 Subject: [PATCH 028/N] sysconfig: mingw sysconfig like posix diff --git a/mingw-w64-python/0029-cross-dont-add-multiarch-paths-if-cross-compiling.patch b/mingw-w64-python/0029-cross-dont-add-multiarch-paths-if-cross-compiling.patch index 84659c0623..dec504e784 100644 --- a/mingw-w64-python/0029-cross-dont-add-multiarch-paths-if-cross-compiling.patch +++ b/mingw-w64-python/0029-cross-dont-add-multiarch-paths-if-cross-compiling.patch @@ -1,4 +1,4 @@ -From 2859a5e11db8ac457ecde2bc7f969fb294936602 Mon Sep 17 00:00:00 2001 +From 98a5d73127e21206ac3bb772c82e1d79bd3d4fe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:52 +0530 diff --git a/mingw-w64-python/0030-mingw-use-backslashes-in-compileall-py.patch b/mingw-w64-python/0030-mingw-use-backslashes-in-compileall-py.patch index b0bddab3cc..18b3c78cd5 100644 --- a/mingw-w64-python/0030-mingw-use-backslashes-in-compileall-py.patch +++ b/mingw-w64-python/0030-mingw-use-backslashes-in-compileall-py.patch @@ -1,4 +1,4 @@ -From c23ea41ed680c5140d086847a8fd7f3b0cdd89c9 Mon Sep 17 00:00:00 2001 +From bc845aca5ee7781e2f9b290abd01967c136a759e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:53 +0530 diff --git a/mingw-w64-python/0031-msys-convert_path-fix-and-root-hack.patch b/mingw-w64-python/0031-msys-convert_path-fix-and-root-hack.patch index 22b211ce6e..57aef0cb76 100644 --- a/mingw-w64-python/0031-msys-convert_path-fix-and-root-hack.patch +++ b/mingw-w64-python/0031-msys-convert_path-fix-and-root-hack.patch @@ -1,4 +1,4 @@ -From 5996edc3df00f8d629938f382c1be646333877e6 Mon Sep 17 00:00:00 2001 +From 834619d08f67521237744123574d32c375d44b21 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:18:36 +0200 Subject: [PATCH 031/N] msys convert_path fix and root hack @@ -8,10 +8,10 @@ Subject: [PATCH 031/N] msys convert_path fix and root hack 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 48ac248..4db56dc 100644 +index 43a31ec..ef87de3 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2281,6 +2281,12 @@ libainstall: all python-config +@@ -2286,6 +2286,12 @@ libainstall: all python-config else true; \ fi @@ -24,7 +24,7 @@ index 48ac248..4db56dc 100644 # Install the dynamically loadable modules # This goes into $(exec_prefix) sharedinstall: all -@@ -2288,9 +2294,9 @@ sharedinstall: all +@@ -2293,9 +2299,9 @@ sharedinstall: all --prefix=$(prefix) \ --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ diff --git a/mingw-w64-python/0032-mingw-pdcurses_ISPAD.patch b/mingw-w64-python/0032-mingw-pdcurses_ISPAD.patch index 86a9fb5311..04eaf5fdb2 100644 --- a/mingw-w64-python/0032-mingw-pdcurses_ISPAD.patch +++ b/mingw-w64-python/0032-mingw-pdcurses_ISPAD.patch @@ -1,4 +1,4 @@ -From 22aa49d76ccf9113de545ff9f420391b95dcd8c3 Mon Sep 17 00:00:00 2001 +From 4624a3642dda794d47cfb1f468294af97dcc8452 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:55 +0530 diff --git a/mingw-w64-python/0033-msys-monkeypatch-os-system-via-sh-exe.patch b/mingw-w64-python/0033-msys-monkeypatch-os-system-via-sh-exe.patch index af23667040..2895cab133 100644 --- a/mingw-w64-python/0033-msys-monkeypatch-os-system-via-sh-exe.patch +++ b/mingw-w64-python/0033-msys-monkeypatch-os-system-via-sh-exe.patch @@ -1,4 +1,4 @@ -From 199be06c016345955331380b6a4d8562aa742fe7 Mon Sep 17 00:00:00 2001 +From 48afa1210333a96a32120db4eaca3e097b054c22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:57 +0530 diff --git a/mingw-w64-python/0034-msys-replace-slashes-used-in-io-redirection.patch b/mingw-w64-python/0034-msys-replace-slashes-used-in-io-redirection.patch index 7b23231d79..5b772294a9 100644 --- a/mingw-w64-python/0034-msys-replace-slashes-used-in-io-redirection.patch +++ b/mingw-w64-python/0034-msys-replace-slashes-used-in-io-redirection.patch @@ -1,4 +1,4 @@ -From 4c7d082bf00de4f7fce1d3a3b20065d1c1d738c6 Mon Sep 17 00:00:00 2001 +From 7942eb4081b4cc1778d9e9eb1485f14e3e9d7230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:58 +0530 diff --git a/mingw-w64-python/0035-remove_path_max.default.patch b/mingw-w64-python/0035-remove_path_max.default.patch index 05f8b1e00a..63b7de0cc5 100644 --- a/mingw-w64-python/0035-remove_path_max.default.patch +++ b/mingw-w64-python/0035-remove_path_max.default.patch @@ -1,4 +1,4 @@ -From 9bfcb56fcad56a4fc939008896f76424d4587634 Mon Sep 17 00:00:00 2001 +From e95cfaea196edf18aeb3ff5870943902a063a201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:59 +0530 diff --git a/mingw-w64-python/0036-dont-link-with-gettext.patch b/mingw-w64-python/0036-dont-link-with-gettext.patch index d2d222a07f..5151c43887 100644 --- a/mingw-w64-python/0036-dont-link-with-gettext.patch +++ b/mingw-w64-python/0036-dont-link-with-gettext.patch @@ -1,4 +1,4 @@ -From 3be7fcd9bf32f6a5d891d486c63a65ff1d384903 Mon Sep 17 00:00:00 2001 +From 57f536eac91a6a892425890a4c30034bdba0ab14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:00 +0530 @@ -14,7 +14,7 @@ Co-authored-by: Алексей 2 files changed, 16 insertions(+) diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c -index 23c38e1..dfb6c7e 100644 +index ac9709c..efbf4fb 100644 --- a/Modules/_localemodule.c +++ b/Modules/_localemodule.c @@ -12,6 +12,13 @@ This software comes with no warranty. Use at your own risk. diff --git a/mingw-w64-python/0037-ctypes-python-dll.patch b/mingw-w64-python/0037-ctypes-python-dll.patch index 3b77038c2e..3a67bf3483 100644 --- a/mingw-w64-python/0037-ctypes-python-dll.patch +++ b/mingw-w64-python/0037-ctypes-python-dll.patch @@ -1,4 +1,4 @@ -From 2477b883fd859370c9569546a69386ae33969f9f Mon Sep 17 00:00:00 2001 +From c901f5a6566e17268dd0154148514d6f7d82c4ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:01 +0530 diff --git a/mingw-w64-python/0038-gdbm-module-includes.patch b/mingw-w64-python/0038-gdbm-module-includes.patch index f6437f18e6..e783863abb 100644 --- a/mingw-w64-python/0038-gdbm-module-includes.patch +++ b/mingw-w64-python/0038-gdbm-module-includes.patch @@ -1,4 +1,4 @@ -From 1c3d21b5dc611193f75f946edb1059bb210b5db7 Mon Sep 17 00:00:00 2001 +From 72c2bd353f079b6245db55518a04088b7faf9e5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:02 +0530 diff --git a/mingw-w64-python/0039-use-gnu_printf-in-format.patch b/mingw-w64-python/0039-use-gnu_printf-in-format.patch index 72b8626ba3..694cb06b85 100644 --- a/mingw-w64-python/0039-use-gnu_printf-in-format.patch +++ b/mingw-w64-python/0039-use-gnu_printf-in-format.patch @@ -1,4 +1,4 @@ -From 0f8b325a0dcd737bcad1a1b64bb1c3aa9f91d43d Mon Sep 17 00:00:00 2001 +From 3e2b06e0595c2281d3b48a48aeb6056d3305646a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:03 +0530 @@ -48,10 +48,10 @@ index 34e3de3..fb71fde 100644 #ifndef Py_LIMITED_API # define Py_CPYTHON_ERRORS_H diff --git a/Include/pyport.h b/Include/pyport.h -index 171872c..b816c90 100644 +index fbb0415..9bbdbc9 100644 --- a/Include/pyport.h +++ b/Include/pyport.h -@@ -658,6 +658,12 @@ extern char * _getpty(int *, int, mode_t, int); +@@ -653,6 +653,12 @@ extern char * _getpty(int *, int, mode_t, int); #define Py_VA_COPY va_copy diff --git a/mingw-w64-python/0040-mingw-fix-ssl-dont-use-enum_certificates.patch b/mingw-w64-python/0040-mingw-fix-ssl-dont-use-enum_certificates.patch index 98f36cc83d..391239e3f9 100644 --- a/mingw-w64-python/0040-mingw-fix-ssl-dont-use-enum_certificates.patch +++ b/mingw-w64-python/0040-mingw-fix-ssl-dont-use-enum_certificates.patch @@ -1,4 +1,4 @@ -From e1272c61ea7b025463881b86a9c32e18c7df2610 Mon Sep 17 00:00:00 2001 +From 1cf98c4d4a83317fdde349af69a28722350fd28a Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:52:03 +0530 Subject: [PATCH 040/N] mingw fix ssl dont use enum_certificates diff --git a/mingw-w64-python/0041-fix-using-dllhandle-and-winver-mingw.patch b/mingw-w64-python/0041-fix-using-dllhandle-and-winver-mingw.patch index 149ea825e8..d8b32e36c1 100644 --- a/mingw-w64-python/0041-fix-using-dllhandle-and-winver-mingw.patch +++ b/mingw-w64-python/0041-fix-using-dllhandle-and-winver-mingw.patch @@ -1,4 +1,4 @@ -From 18927c3b4a98cebab02f988c60d159c04ccfe5bf Mon Sep 17 00:00:00 2001 +From 8320ed25acbe26021d6c2b41d88f3ed2ce792da7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:06 +0530 @@ -13,7 +13,7 @@ Co-authored-by: Алексей 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Python/sysmodule.c b/Python/sysmodule.c -index 6e9ec90..1b377ca 100644 +index d0941e8..29b6b9e 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -43,7 +43,7 @@ Data members: diff --git a/mingw-w64-python/0042-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch b/mingw-w64-python/0042-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch index 6f26fd2617..b93c99dda2 100644 --- a/mingw-w64-python/0042-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch +++ b/mingw-w64-python/0042-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch @@ -1,4 +1,4 @@ -From 9ec58bce1c2d94dcdcbedcb83a6f022f7b3e992e Mon Sep 17 00:00:00 2001 +From bcb58b2a917d11de0b02fb4be974fd00ed90425e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:07 +0530 diff --git a/mingw-w64-python/0043-MINGW-link-with-additional-library.patch b/mingw-w64-python/0043-MINGW-link-with-additional-library.patch index 19ef0f77fb..cf7d3eb640 100644 --- a/mingw-w64-python/0043-MINGW-link-with-additional-library.patch +++ b/mingw-w64-python/0043-MINGW-link-with-additional-library.patch @@ -1,4 +1,4 @@ -From b9c5425401b94bc4f862a8775d504473edd88226 Mon Sep 17 00:00:00 2001 +From 14db6a18d7c3f3312a5ee23cad36b399e335e1c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:08 +0530 diff --git a/mingw-w64-python/0044-install-msilib.patch b/mingw-w64-python/0044-install-msilib.patch index ef83bd5573..0cc530877c 100644 --- a/mingw-w64-python/0044-install-msilib.patch +++ b/mingw-w64-python/0044-install-msilib.patch @@ -1,4 +1,4 @@ -From 5042516f1dbda6830d0c8323ef8b773417c84e72 Mon Sep 17 00:00:00 2001 +From 94ee9b474c0aaa576b25a60a20ed7939bed4a0f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Thu, 17 Jun 2021 18:52:09 +0530 Subject: [PATCH 044/N] install msilib @@ -14,10 +14,10 @@ Co-authored-by: Ray Donnelly 1 file changed, 1 insertion(+) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 4db56dc..96e28ff 100644 +index ef87de3..99578a2 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1940,6 +1940,7 @@ LIBSUBDIRS= asyncio \ +@@ -1942,6 +1942,7 @@ LIBSUBDIRS= asyncio \ tkinter \ tomllib \ turtledemo \ diff --git a/mingw-w64-python/0045-fix-signal-module-build.patch b/mingw-w64-python/0045-fix-signal-module-build.patch index e251df584b..d53eb1debb 100644 --- a/mingw-w64-python/0045-fix-signal-module-build.patch +++ b/mingw-w64-python/0045-fix-signal-module-build.patch @@ -1,4 +1,4 @@ -From 59a94d6e41bd3899cb59412281d13678a380036e Mon Sep 17 00:00:00 2001 +From 38b0fea6ac2f398b183792d3f9cca8356b4c3df2 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:10 +0530 Subject: [PATCH 045/N] fix signal module build diff --git a/mingw-w64-python/0046-build-build-winconsoleio-and-_testconsole.patch b/mingw-w64-python/0046-build-build-winconsoleio-and-_testconsole.patch index 93fa03f815..6072987f50 100644 --- a/mingw-w64-python/0046-build-build-winconsoleio-and-_testconsole.patch +++ b/mingw-w64-python/0046-build-build-winconsoleio-and-_testconsole.patch @@ -1,4 +1,4 @@ -From ed25cf4fd88e89d6b371b76f82d397b988fdc514 Mon Sep 17 00:00:00 2001 +From 52304f63d5aa8647975435145c9dbd2404676e22 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:11 +0530 Subject: [PATCH 046/N] build: build winconsoleio and _testconsole diff --git a/mingw-w64-python/0047-expose-sem_unlink.patch b/mingw-w64-python/0047-expose-sem_unlink.patch index 48daf5e4d9..d71009da50 100644 --- a/mingw-w64-python/0047-expose-sem_unlink.patch +++ b/mingw-w64-python/0047-expose-sem_unlink.patch @@ -1,4 +1,4 @@ -From 4d0a165d5a2c8118b7782589418d82de92355668 Mon Sep 17 00:00:00 2001 +From aad7cb5dc312cd2163e8c865e38ce5a5c3cc828d Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:12 +0530 Subject: [PATCH 047/N] expose sem_unlink diff --git a/mingw-w64-python/0048-cygpty-isatty.patch b/mingw-w64-python/0048-cygpty-isatty.patch index 9d4514cec3..1b1f383ff3 100644 --- a/mingw-w64-python/0048-cygpty-isatty.patch +++ b/mingw-w64-python/0048-cygpty-isatty.patch @@ -1,4 +1,4 @@ -From c7812639e4c814071608203084268ba019f89b9e Mon Sep 17 00:00:00 2001 +From b783c7b290e1261c6cf6d2d059248ea5a5e45fae Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:14 +0530 Subject: [PATCH 048/N] cygpty isatty @@ -71,7 +71,7 @@ index 0000000..82fd0af + +#endif /* _ISCYGPTY_H */ diff --git a/Makefile.pre.in b/Makefile.pre.in -index 96e28ff..5db0b62 100644 +index 99578a2..f4decf2 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -409,6 +409,7 @@ PYTHON_OBJS= \ @@ -82,7 +82,7 @@ index 96e28ff..5db0b62 100644 Python/marshal.o \ Python/modsupport.o \ Python/mysnprintf.o \ -@@ -1509,6 +1510,7 @@ PYTHON_HEADERS= \ +@@ -1511,6 +1512,7 @@ PYTHON_HEADERS= \ $(srcdir)/Include/frameobject.h \ $(srcdir)/Include/import.h \ $(srcdir)/Include/intrcheck.h \ @@ -91,7 +91,7 @@ index 96e28ff..5db0b62 100644 $(srcdir)/Include/listobject.h \ $(srcdir)/Include/longobject.h \ diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c -index 4496609..80cc6f9 100644 +index fee97f2..d793eb1 100644 --- a/Modules/_io/fileio.c +++ b/Modules/_io/fileio.c @@ -20,6 +20,7 @@ @@ -133,7 +133,7 @@ index 6904e3f..5c8708e 100644 diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 6b3d46a..2618dee 100644 +index ff30f47..deb5304 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -50,6 +50,7 @@ @@ -144,7 +144,7 @@ index 6b3d46a..2618dee 100644 #include // ctermid() #include // system() -@@ -10227,7 +10228,7 @@ os_isatty_impl(PyObject *module, int fd) +@@ -10276,7 +10277,7 @@ os_isatty_impl(PyObject *module, int fd) int return_value; Py_BEGIN_ALLOW_THREADS _Py_BEGIN_SUPPRESS_IPH @@ -205,7 +205,7 @@ index f300405..090f598 100644 } diff --git a/Python/fileutils.c b/Python/fileutils.c -index b310a6c..137fde9 100644 +index 24341dd..0ac70aa 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c @@ -1,4 +1,5 @@ @@ -223,7 +223,7 @@ index b310a6c..137fde9 100644 _Py_END_SUPPRESS_IPH Py_END_ALLOW_THREADS if (!valid) -@@ -1809,12 +1810,12 @@ _Py_write_impl(int fd, const void *buf, size_t count, int gil_held) +@@ -1811,12 +1812,12 @@ _Py_write_impl(int fd, const void *buf, size_t count, int gil_held) depending on heap usage). */ if (gil_held) { Py_BEGIN_ALLOW_THREADS diff --git a/mingw-w64-python/0049-disable-broken-gdbm-module.patch b/mingw-w64-python/0049-disable-broken-gdbm-module.patch index 46289c40da..f00412cbb6 100644 --- a/mingw-w64-python/0049-disable-broken-gdbm-module.patch +++ b/mingw-w64-python/0049-disable-broken-gdbm-module.patch @@ -1,4 +1,4 @@ -From 6fe41544557264e45da69bbb81d5bd991668fbfa Mon Sep 17 00:00:00 2001 +From e0a413bc695fdb5f1d931fb315a88a9ec038b6f2 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:15 +0530 Subject: [PATCH 049/N] disable broken gdbm module diff --git a/mingw-w64-python/0050-build-link-win-resource-files-and-build-pythonw.patch b/mingw-w64-python/0050-build-link-win-resource-files-and-build-pythonw.patch index 8ba7f3804a..3a679d04f7 100644 --- a/mingw-w64-python/0050-build-link-win-resource-files-and-build-pythonw.patch +++ b/mingw-w64-python/0050-build-link-win-resource-files-and-build-pythonw.patch @@ -1,4 +1,4 @@ -From 88f2dfa642dd71d9cf17f5c12fe57b7f54e348f2 Mon Sep 17 00:00:00 2001 +From 5e4b0900637d18b74a98497db3ddf8c92cbebb28 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:16 +0530 Subject: [PATCH 050/N] build: link win resource files and build pythonw @@ -13,7 +13,7 @@ Co-authored-by: Алексей 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 5db0b62..ed6fbb4 100644 +index f4decf2..3f1bccb 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -39,6 +39,7 @@ CXX= @CXX@ @@ -40,7 +40,7 @@ index 5db0b62..ed6fbb4 100644 HOSTRUNNER= @HOSTRUNNER@ -@@ -592,7 +595,7 @@ LIBEXPAT_HEADERS= \ +@@ -593,7 +596,7 @@ LIBEXPAT_HEADERS= \ # Default target all: @DEF_MAKE_ALL_RULE@ @@ -49,7 +49,7 @@ index 5db0b62..ed6fbb4 100644 gdbhooks Programs/_testembed python-config build_wasm: check-clean-src $(BUILDPYTHON) platform oldsharedmods python-config -@@ -708,9 +711,21 @@ coverage-report: regen-token regen-frozen +@@ -709,9 +712,21 @@ coverage-report: regen-token regen-frozen clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c $(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py --make --srcdir $(srcdir) @@ -73,7 +73,7 @@ index 5db0b62..ed6fbb4 100644 platform: $(PYTHON_FOR_BUILD_DEPS) pybuilddir.txt $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print("%s-%d.%d" % (get_platform(), *sys.version_info[:2]))' >platform -@@ -814,10 +829,10 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \ +@@ -815,10 +830,10 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \ # This rule builds the Cygwin Python DLL and import library if configured # for a shared core library; otherwise, this rule is a noop. @@ -86,7 +86,7 @@ index 5db0b62..ed6fbb4 100644 else true; \ fi -@@ -1815,6 +1830,7 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@ +@@ -1817,6 +1832,7 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@ done if test "$(PYTHONFRAMEWORKDIR)" = "no-framework" ; then \ $(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \ diff --git a/mingw-w64-python/0051-disable-readline.patch b/mingw-w64-python/0051-disable-readline.patch index f298559791..9c721805f7 100644 --- a/mingw-w64-python/0051-disable-readline.patch +++ b/mingw-w64-python/0051-disable-readline.patch @@ -1,4 +1,4 @@ -From d1b1cc319f6070e8956e9d9e5957e60107eebb36 Mon Sep 17 00:00:00 2001 +From 1dc502b658669cd4d6a42834c4701be8082adeda Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:17 +0530 Subject: [PATCH 051/N] disable readline diff --git a/mingw-w64-python/0052-fix-isselectable.patch b/mingw-w64-python/0052-fix-isselectable.patch index 8e39d3301e..fae43abfac 100644 --- a/mingw-w64-python/0052-fix-isselectable.patch +++ b/mingw-w64-python/0052-fix-isselectable.patch @@ -1,4 +1,4 @@ -From 1fceb47977182eea53daae206b40c6d836a39411 Mon Sep 17 00:00:00 2001 +From da1a34e47a93f96b90dba2aeead9e92f13f3666c Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:18 +0530 Subject: [PATCH 052/N] fix isselectable diff --git a/mingw-w64-python/0053-_xxsubinterpretersmodule.patch b/mingw-w64-python/0053-_xxsubinterpretersmodule.patch index 868fdfae77..5300b6cd40 100644 --- a/mingw-w64-python/0053-_xxsubinterpretersmodule.patch +++ b/mingw-w64-python/0053-_xxsubinterpretersmodule.patch @@ -1,4 +1,4 @@ -From ec3e50cbfcebc0d83b311aaeaf5a4d11b07af917 Mon Sep 17 00:00:00 2001 +From 2fd868efd4a269c16833c44af9da9aeaeeb3aff7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:20 +0530 diff --git a/mingw-w64-python/0054-configure.ac-fix-inet_pton-check.patch b/mingw-w64-python/0054-configure.ac-fix-inet_pton-check.patch index 04ffe392d6..459682c175 100644 --- a/mingw-w64-python/0054-configure.ac-fix-inet_pton-check.patch +++ b/mingw-w64-python/0054-configure.ac-fix-inet_pton-check.patch @@ -1,4 +1,4 @@ -From 74758abca558d71540c6abcd1bc22cb4f17d25d0 Mon Sep 17 00:00:00 2001 +From 10a3bc0d0d35ee0ded3ba59716b72028f39e56fb Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:23 +0530 Subject: [PATCH 054/N] configure.ac: fix inet_pton check diff --git a/mingw-w64-python/0055-set-venv-activate-path-unix.patch b/mingw-w64-python/0055-set-venv-activate-path-unix.patch index d6ec59e5d0..1939fbba7e 100644 --- a/mingw-w64-python/0055-set-venv-activate-path-unix.patch +++ b/mingw-w64-python/0055-set-venv-activate-path-unix.patch @@ -1,4 +1,4 @@ -From 9e25e5d9cbeb6d9eda06c361e8a187a4015abff7 Mon Sep 17 00:00:00 2001 +From 54bcdb70d2dee6d82814aada6c8f43c26326431e Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Thu, 17 Jun 2021 18:52:25 +0530 Subject: [PATCH 055/N] set venv activate path unix diff --git a/mingw-w64-python/0056-pass-gen-profile-ldflags.patch b/mingw-w64-python/0056-pass-gen-profile-ldflags.patch index 57808add5f..4dcd0877e3 100644 --- a/mingw-w64-python/0056-pass-gen-profile-ldflags.patch +++ b/mingw-w64-python/0056-pass-gen-profile-ldflags.patch @@ -1,4 +1,4 @@ -From e07ef383d41ba44bf533ca6281cf3fc7f388c4a0 Mon Sep 17 00:00:00 2001 +From f5db58f1e2aba341999d6c153161c1f78ce0e7c2 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:27 +0530 Subject: [PATCH 056/N] pass gen profile ldflags @@ -12,10 +12,10 @@ Co-authored-by: Алексей 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index ed6fbb4..f3237b1 100644 +index 3f1bccb..3b3fe1e 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -832,7 +832,7 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \ +@@ -833,7 +833,7 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \ $(DLLLIBRARY) libpython$(LDVERSION).dll.a: $(LIBRARY_OBJS) python_nt.o if test -n "$(DLLLIBRARY)"; then \ $(LDSHARED) -Wl,--out-implib=$@ -o $(DLLLIBRARY) $^ \ diff --git a/mingw-w64-python/0057-pkg-config-windows-must-link-ext-with-python-lib.patch b/mingw-w64-python/0057-pkg-config-windows-must-link-ext-with-python-lib.patch index e98607f2b5..50ce3f0cbf 100644 --- a/mingw-w64-python/0057-pkg-config-windows-must-link-ext-with-python-lib.patch +++ b/mingw-w64-python/0057-pkg-config-windows-must-link-ext-with-python-lib.patch @@ -1,4 +1,4 @@ -From c4f285642609b2d62559c09a4832ac114ba67324 Mon Sep 17 00:00:00 2001 +From 489c1b233bf9f88557b9424db05365b0c65cd732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:29 +0530 diff --git a/mingw-w64-python/0058-importlib-bootstrap-path-sep.patch b/mingw-w64-python/0058-importlib-bootstrap-path-sep.patch index fe6a84264f..7377210dc5 100644 --- a/mingw-w64-python/0058-importlib-bootstrap-path-sep.patch +++ b/mingw-w64-python/0058-importlib-bootstrap-path-sep.patch @@ -1,4 +1,4 @@ -From 924af87475de89d77acc2dc1041e09b041dbf3a8 Mon Sep 17 00:00:00 2001 +From f473879b8afc4cedd8bbd16914b200a226c5c136 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:30 +0530 Subject: [PATCH 058/N] importlib bootstrap path sep diff --git a/mingw-w64-python/0059-pathlib-path-sep.patch b/mingw-w64-python/0059-pathlib-path-sep.patch index dbed12b219..1b956154c7 100644 --- a/mingw-w64-python/0059-pathlib-path-sep.patch +++ b/mingw-w64-python/0059-pathlib-path-sep.patch @@ -1,4 +1,4 @@ -From 8015015ff7c15323705ceae312705e58fea9aade Mon Sep 17 00:00:00 2001 +From 1120d25be2500e0d2eec285e8a8c2b0b23be4392 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:31 +0530 Subject: [PATCH 059/N] pathlib path sep diff --git a/mingw-w64-python/0060-warnings-fixes.patch b/mingw-w64-python/0060-warnings-fixes.patch index bcd10a0db6..b50001f67c 100644 --- a/mingw-w64-python/0060-warnings-fixes.patch +++ b/mingw-w64-python/0060-warnings-fixes.patch @@ -1,4 +1,4 @@ -From 2ec96fa601c56693dbc12077fb1fb8f2a3d5b9f0 Mon Sep 17 00:00:00 2001 +From 8770a821f8b280728a544a4d8c6468a063161f0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:33 +0530 @@ -28,10 +28,10 @@ index 9c4c1ff..fd262ae 100644 SIZE_T attribute_list_size = 0; diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 2618dee..88e61f7 100644 +index deb5304..ce44ab7 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c -@@ -5492,7 +5492,7 @@ os_utime_impl(PyObject *module, path_t *path, PyObject *times, PyObject *ns, +@@ -5514,7 +5514,7 @@ os_utime_impl(PyObject *module, path_t *path, PyObject *times, PyObject *ns, /*[clinic end generated code: output=cfcac69d027b82cf input=2fbd62a2f228f8f4]*/ { #ifdef MS_WINDOWS @@ -40,7 +40,7 @@ index 2618dee..88e61f7 100644 FILETIME atime, mtime; #else int result; -@@ -14716,7 +14716,7 @@ os__add_dll_directory_impl(PyObject *module, path_t *path) +@@ -14777,7 +14777,7 @@ os__add_dll_directory_impl(PyObject *module, path_t *path) loaded. */ Py_BEGIN_ALLOW_THREADS if (!(hKernel32 = GetModuleHandleW(L"kernel32")) || @@ -49,7 +49,7 @@ index 2618dee..88e61f7 100644 hKernel32, "AddDllDirectory")) || !(cookie = (*AddDllDirectory)(path->wide))) { err = GetLastError(); -@@ -14766,7 +14766,7 @@ os__remove_dll_directory_impl(PyObject *module, PyObject *cookie) +@@ -14827,7 +14827,7 @@ os__remove_dll_directory_impl(PyObject *module, PyObject *cookie) loaded. */ Py_BEGIN_ALLOW_THREADS if (!(hKernel32 = GetModuleHandleW(L"kernel32")) || diff --git a/mingw-w64-python/0061-fix-build-testinternalcapi.patch b/mingw-w64-python/0061-fix-build-testinternalcapi.patch index b3f1c1cb7e..7d212c6835 100644 --- a/mingw-w64-python/0061-fix-build-testinternalcapi.patch +++ b/mingw-w64-python/0061-fix-build-testinternalcapi.patch @@ -1,4 +1,4 @@ -From 54788a59bb0303a1c4abe69a565bbf6776ebabe9 Mon Sep 17 00:00:00 2001 +From fe123f76566ea9431347f9283bf427497251fb31 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Sat, 17 Jun 2023 00:21:25 +0530 Subject: [PATCH 061/N] fix build testinternalcapi diff --git a/mingw-w64-python/0062-extend-MS_WINDOWS-flag.patch b/mingw-w64-python/0062-extend-MS_WINDOWS-flag.patch index 33d85b8702..72b9c90d97 100644 --- a/mingw-w64-python/0062-extend-MS_WINDOWS-flag.patch +++ b/mingw-w64-python/0062-extend-MS_WINDOWS-flag.patch @@ -1,4 +1,4 @@ -From 02a108b43e2b971c3146b9850a84f4ce1fe78244 Mon Sep 17 00:00:00 2001 +From eb54869875125d84126927ccf10ca085f5a25668 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Thu, 17 Jun 2021 18:52:34 +0530 Subject: [PATCH 062/N] extend MS_WINDOWS flag diff --git a/mingw-w64-python/0063-clang-arm64.patch b/mingw-w64-python/0063-clang-arm64.patch index 9147fe82ef..22fc3ba56f 100644 --- a/mingw-w64-python/0063-clang-arm64.patch +++ b/mingw-w64-python/0063-clang-arm64.patch @@ -1,4 +1,4 @@ -From ba4ccb9497fedb0f4d439b24f964b86977eb7d95 Mon Sep 17 00:00:00 2001 +From ef7c21eddd08ddca68336f5081495c65fd4e7c23 Mon Sep 17 00:00:00 2001 From: jeremyd2019 <4524874+jeremyd2019@users.noreply.github.com> Date: Thu, 17 Jun 2021 18:52:36 +0530 Subject: [PATCH 063/N] clang arm64 diff --git a/mingw-w64-python/0064-configure.ac-set-MINGW-stack-reserve.patch b/mingw-w64-python/0064-configure.ac-set-MINGW-stack-reserve.patch index 5875d26772..c66b43c6c7 100644 --- a/mingw-w64-python/0064-configure.ac-set-MINGW-stack-reserve.patch +++ b/mingw-w64-python/0064-configure.ac-set-MINGW-stack-reserve.patch @@ -1,4 +1,4 @@ -From 435098659b6ca0a417108088091c2fac60aa50f7 Mon Sep 17 00:00:00 2001 +From d450ebbb846a50908300388680a1759d6b078f53 Mon Sep 17 00:00:00 2001 From: jeremyd2019 <4524874+jeremyd2019@users.noreply.github.com> Date: Thu, 17 Jun 2021 18:52:37 +0530 Subject: [PATCH 064/N] configure.ac: set MINGW stack reserve diff --git a/mingw-w64-python/0065-Don-t-use-os.pathsep-to-find-EOF.patch b/mingw-w64-python/0065-Don-t-use-os.pathsep-to-find-EOF.patch index e3c4b92812..5231c7fd80 100644 --- a/mingw-w64-python/0065-Don-t-use-os.pathsep-to-find-EOF.patch +++ b/mingw-w64-python/0065-Don-t-use-os.pathsep-to-find-EOF.patch @@ -1,4 +1,4 @@ -From 11c7cc454d6d825f1253c47ecd5307b4ea0712db Mon Sep 17 00:00:00 2001 +From 4d9879f55bb7fea58b0474a87b11572ebd63fac4 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 18 Jun 2021 12:38:11 +0530 Subject: [PATCH 065/N] Don't use os.pathsep to find EOF not all diff --git a/mingw-w64-python/0066-Fix-extension-suffix-for-c-extensions-on-mingw.patch b/mingw-w64-python/0066-Fix-extension-suffix-for-c-extensions-on-mingw.patch index ecabe8b075..bd2fa86bc3 100644 --- a/mingw-w64-python/0066-Fix-extension-suffix-for-c-extensions-on-mingw.patch +++ b/mingw-w64-python/0066-Fix-extension-suffix-for-c-extensions-on-mingw.patch @@ -1,4 +1,4 @@ -From ba7fe012422e9ef07c852a47eb5d28bd8ec69fae Mon Sep 17 00:00:00 2001 +From 559bcf45b85be8b6916e5f97ec1cf31ea4a22c11 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Wed, 23 Jun 2021 18:12:12 +0530 Subject: [PATCH 066/N] Fix extension suffix for c-extensions on mingw @@ -21,7 +21,7 @@ Signed-off-by: Naveen M K 3 files changed, 72 insertions(+), 17 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index f3237b1..72d7ee8 100644 +index 3b3fe1e..2acca5d 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -171,6 +171,7 @@ CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(LDVERSION) @@ -32,7 +32,7 @@ index f3237b1..72d7ee8 100644 LDSHARED= @LDSHARED@ $(PY_LDFLAGS) BLDSHARED= @BLDSHARED@ $(PY_CORE_LDFLAGS) LDCXXSHARED= @LDCXXSHARED@ -@@ -1301,8 +1302,7 @@ Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile +@@ -1303,8 +1304,7 @@ Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile Python/dynload_win.o: $(srcdir)/Python/dynload_win.c Makefile $(CC) -c $(PY_CORE_CFLAGS) \ @@ -42,7 +42,7 @@ index f3237b1..72d7ee8 100644 -o $@ $(srcdir)/Python/dynload_win.c Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile $(srcdir)/Include/pydtrace.h -@@ -2260,7 +2260,7 @@ libainstall: all python-config +@@ -2265,7 +2265,7 @@ libainstall: all python-config @if test "$(STATIC_LIBPYTHON)" = 1; then \ if test -d $(LIBRARY); then :; else \ if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \ diff --git a/mingw-w64-python/0067-Change-the-get_platform-method-in-sysconfig.patch b/mingw-w64-python/0067-Change-the-get_platform-method-in-sysconfig.patch index 0d383ea99b..a8cd5ca01f 100644 --- a/mingw-w64-python/0067-Change-the-get_platform-method-in-sysconfig.patch +++ b/mingw-w64-python/0067-Change-the-get_platform-method-in-sysconfig.patch @@ -1,4 +1,4 @@ -From 5c6f2ec6dbc37a89908400eece02dcae5634d6da Mon Sep 17 00:00:00 2001 +From ccad4aaddf95e040b9d0cbf64e512f8feaa896ec Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Tue, 21 Sep 2021 21:36:58 +0200 Subject: [PATCH 067/N] Change the `get_platform()` method in sysconfig diff --git a/mingw-w64-python/0068-distutils-compiler-customize-mingw-cygwin-compilers.patch b/mingw-w64-python/0068-distutils-compiler-customize-mingw-cygwin-compilers.patch index 11600d6b5a..00adcc14d5 100644 --- a/mingw-w64-python/0068-distutils-compiler-customize-mingw-cygwin-compilers.patch +++ b/mingw-w64-python/0068-distutils-compiler-customize-mingw-cygwin-compilers.patch @@ -1,4 +1,4 @@ -From 8309504e20df0d01bff69831ef2ee94ba25c6500 Mon Sep 17 00:00:00 2001 +From 1aaa5db95dd4c2f542d33a39438981c58a66907f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:21 +0530 diff --git a/mingw-w64-python/0069-distutils-compiler-enable-new-dtags.patch b/mingw-w64-python/0069-distutils-compiler-enable-new-dtags.patch index 879c0f8022..030b8b9f82 100644 --- a/mingw-w64-python/0069-distutils-compiler-enable-new-dtags.patch +++ b/mingw-w64-python/0069-distutils-compiler-enable-new-dtags.patch @@ -1,4 +1,4 @@ -From 2a1b63067cd1c14a32dab2138936d434570a2843 Mon Sep 17 00:00:00 2001 +From ce1d837dabc268a1dbfc68d0257ba3263b0bf81f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:22 +0530 diff --git a/mingw-w64-python/0070-distutils-MINGW-build-extensions-with-GCC.patch b/mingw-w64-python/0070-distutils-MINGW-build-extensions-with-GCC.patch index 28de494303..4de7128edf 100644 --- a/mingw-w64-python/0070-distutils-MINGW-build-extensions-with-GCC.patch +++ b/mingw-w64-python/0070-distutils-MINGW-build-extensions-with-GCC.patch @@ -1,4 +1,4 @@ -From e32f3fc468e223609b0ea2433baca10c8323fae2 Mon Sep 17 00:00:00 2001 +From fc151450deaf55f69d559e64b572446da8dcdbc8 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 20:52:22 +0200 Subject: [PATCH 070/N] distutils: MINGW build extensions with GCC diff --git a/mingw-w64-python/0071-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch b/mingw-w64-python/0071-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch index cd3199e0bc..6914f0edd1 100644 --- a/mingw-w64-python/0071-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch +++ b/mingw-w64-python/0071-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch @@ -1,4 +1,4 @@ -From 014fba25865b02630394a42eab51107d07b4f1b8 Mon Sep 17 00:00:00 2001 +From 27a514ddf24e98dfa1ab6b2f110fe4f4014ee173 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:35 +0530 diff --git a/mingw-w64-python/0072-distutils-find-import-library.patch b/mingw-w64-python/0072-distutils-find-import-library.patch index 42e0d8b5d0..0ba986c8fa 100644 --- a/mingw-w64-python/0072-distutils-find-import-library.patch +++ b/mingw-w64-python/0072-distutils-find-import-library.patch @@ -1,4 +1,4 @@ -From 9a8a6b228274aed7f29600abe231f619db3f1c2e Mon Sep 17 00:00:00 2001 +From 35121f998ac31266ab442ddd3b8e16ccda8c90ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:36 +0530 diff --git a/mingw-w64-python/0073-distutils-avoid-circular-dependency-from-time-module.patch b/mingw-w64-python/0073-distutils-avoid-circular-dependency-from-time-module.patch index 7ef96d6e06..44b12185d0 100644 --- a/mingw-w64-python/0073-distutils-avoid-circular-dependency-from-time-module.patch +++ b/mingw-w64-python/0073-distutils-avoid-circular-dependency-from-time-module.patch @@ -1,4 +1,4 @@ -From 5671662845760a1e5748b65048ead2cd37c8e247 Mon Sep 17 00:00:00 2001 +From e836e8fb6e880f96dc9af954b31e7258c9f95557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:41 +0530 diff --git a/mingw-w64-python/0074-distutils-generalization-of-posix-build-in-distutils.patch b/mingw-w64-python/0074-distutils-generalization-of-posix-build-in-distutils.patch index eb6d652c5d..6c2ceda047 100644 --- a/mingw-w64-python/0074-distutils-generalization-of-posix-build-in-distutils.patch +++ b/mingw-w64-python/0074-distutils-generalization-of-posix-build-in-distutils.patch @@ -1,4 +1,4 @@ -From c1e09a1afd8260b95940d7a215b839edd717b7b4 Mon Sep 17 00:00:00 2001 +From 638f2cee792d550e0b8c89f6f72368b57ed6505d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:41 +0530 diff --git a/mingw-w64-python/0075-distutils-mingw-sysconfig-like-posix.patch b/mingw-w64-python/0075-distutils-mingw-sysconfig-like-posix.patch index c63689aede..672b20b9eb 100644 --- a/mingw-w64-python/0075-distutils-mingw-sysconfig-like-posix.patch +++ b/mingw-w64-python/0075-distutils-mingw-sysconfig-like-posix.patch @@ -1,4 +1,4 @@ -From 7015d26722360b9ffd15fc5c96b78fdfa311e509 Mon Sep 17 00:00:00 2001 +From 53270b33066728d068d507ed87a332281bb056ae Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 20:53:29 +0200 Subject: [PATCH 075/N] distutils: mingw sysconfig like posix diff --git a/mingw-w64-python/0076-distutils-get_versions-fixes.patch b/mingw-w64-python/0076-distutils-get_versions-fixes.patch index ad9f7f20d4..9267c5c644 100644 --- a/mingw-w64-python/0076-distutils-get_versions-fixes.patch +++ b/mingw-w64-python/0076-distutils-get_versions-fixes.patch @@ -1,4 +1,4 @@ -From bd063465c2408d536e05c92fad7229b1e7dd6f09 Mon Sep 17 00:00:00 2001 +From 44c52dd6d7a742aeba7f0828b1dab04d0b1cbb69 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:14:31 +0200 Subject: [PATCH 076/N] distutils: get_versions() fixes diff --git a/mingw-w64-python/0077-distutils-install-layout-as-posix.patch b/mingw-w64-python/0077-distutils-install-layout-as-posix.patch index d7f93821f9..fdf257a871 100644 --- a/mingw-w64-python/0077-distutils-install-layout-as-posix.patch +++ b/mingw-w64-python/0077-distutils-install-layout-as-posix.patch @@ -1,4 +1,4 @@ -From e470e6d51f9428795dcf144a6996e1b979224578 Mon Sep 17 00:00:00 2001 +From eda46c40990f79b1b78f0c438d1f88e8fb9e5218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:59 +0530 diff --git a/mingw-w64-python/0078-distutils-msys-convert_path-fix-and-root-hack.patch b/mingw-w64-python/0078-distutils-msys-convert_path-fix-and-root-hack.patch index 0bafe86146..39a244a7a8 100644 --- a/mingw-w64-python/0078-distutils-msys-convert_path-fix-and-root-hack.patch +++ b/mingw-w64-python/0078-distutils-msys-convert_path-fix-and-root-hack.patch @@ -1,4 +1,4 @@ -From 014f81f383a6b8e09ef317d298a3d3c46418c76c Mon Sep 17 00:00:00 2001 +From 50bd66f726587188f19145d270818da235183667 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:18:50 +0200 Subject: [PATCH 078/N] distutils: msys convert_path fix and root hack diff --git a/mingw-w64-python/0079-distutils-mingw-build-optimized-ext.patch b/mingw-w64-python/0079-distutils-mingw-build-optimized-ext.patch index 00ebc8f45e..c7af6bd98b 100644 --- a/mingw-w64-python/0079-distutils-mingw-build-optimized-ext.patch +++ b/mingw-w64-python/0079-distutils-mingw-build-optimized-ext.patch @@ -1,4 +1,4 @@ -From 203ace1c5c0724e9eb4ca75e55e8e41893356d84 Mon Sep 17 00:00:00 2001 +From 4cc3a054e0be37f8c0041e606c4ce0d98d15349d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:04 +0530 diff --git a/mingw-w64-python/0080-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch b/mingw-w64-python/0080-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch index ab4d2ef4fc..397fa0a259 100644 --- a/mingw-w64-python/0080-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch +++ b/mingw-w64-python/0080-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch @@ -1,4 +1,4 @@ -From 5f1e359a1e9c4e0ccc91dcc4a73f0af52d3dc92d Mon Sep 17 00:00:00 2001 +From 0f6429db0f65168d4df72a35cd4533cb8aa073ab Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:52:05 +0530 Subject: [PATCH 080/N] distutils: cygwinccompiler dont strip modules if diff --git a/mingw-w64-python/0081-distutils-get-compilers-from-env-vars.patch b/mingw-w64-python/0081-distutils-get-compilers-from-env-vars.patch index 1f185a6034..4da1fdbb6f 100644 --- a/mingw-w64-python/0081-distutils-get-compilers-from-env-vars.patch +++ b/mingw-w64-python/0081-distutils-get-compilers-from-env-vars.patch @@ -1,4 +1,4 @@ -From c0b3148e911817f6ec6754be91612c285a8827e9 Mon Sep 17 00:00:00 2001 +From a464afa06aa3a6120a60aaa98d6203e90656cb06 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Tue, 17 Aug 2021 20:26:05 +0700 Subject: [PATCH 081/N] distutils: get compilers from env vars diff --git a/mingw-w64-python/0082-distutils-add-windmc-to-cygwinccompiler.patch b/mingw-w64-python/0082-distutils-add-windmc-to-cygwinccompiler.patch index 89470a9a0c..eeb894a46b 100644 --- a/mingw-w64-python/0082-distutils-add-windmc-to-cygwinccompiler.patch +++ b/mingw-w64-python/0082-distutils-add-windmc-to-cygwinccompiler.patch @@ -1,4 +1,4 @@ -From 036b97470d7b0fc3b7e4e25bac4538d13b3da91a Mon Sep 17 00:00:00 2001 +From 26fb4d2270cb652997740288c0a75d0ea3dd0b2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:28 +0530 diff --git a/mingw-w64-python/0083-distutils-fix-msvc9-import.patch b/mingw-w64-python/0083-distutils-fix-msvc9-import.patch index 4f22fca853..dbbc0d3eca 100644 --- a/mingw-w64-python/0083-distutils-fix-msvc9-import.patch +++ b/mingw-w64-python/0083-distutils-fix-msvc9-import.patch @@ -1,4 +1,4 @@ -From dffd2b766eb27aa03a0a1e23f6980ef2a851dbee Mon Sep 17 00:00:00 2001 +From f15aed51b6f901a292cffb948fe0cfca50471118 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:24 +0530 Subject: [PATCH 083/N] distutils: fix msvc9 import diff --git a/mingw-w64-python/0084-distutils-mingw-add-LIBPL-to-library-dirs.patch b/mingw-w64-python/0084-distutils-mingw-add-LIBPL-to-library-dirs.patch index 8fab29b4c4..5a3a18f085 100644 --- a/mingw-w64-python/0084-distutils-mingw-add-LIBPL-to-library-dirs.patch +++ b/mingw-w64-python/0084-distutils-mingw-add-LIBPL-to-library-dirs.patch @@ -1,4 +1,4 @@ -From 51a39787c7d329f4992a29313b7ebad87167d2d4 Mon Sep 17 00:00:00 2001 +From 85c7f93e601942563fae3964524eb4316772464d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:06 +0530 diff --git a/mingw-w64-python/0085-distutils-Change-the-get_platform-method-in-distutil.patch b/mingw-w64-python/0085-distutils-Change-the-get_platform-method-in-distutil.patch index a9209ce2b2..05d81896ca 100644 --- a/mingw-w64-python/0085-distutils-Change-the-get_platform-method-in-distutil.patch +++ b/mingw-w64-python/0085-distutils-Change-the-get_platform-method-in-distutil.patch @@ -1,4 +1,4 @@ -From b5c6c7a446235e5285899b18d472fda76509a7b4 Mon Sep 17 00:00:00 2001 +From 21fa75e9f0d6c5675315edaafb83a702b2c89da4 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Tue, 21 Sep 2021 21:37:23 +0200 Subject: [PATCH 085/N] distutils: Change the `get_platform()` method in diff --git a/mingw-w64-python/0086-build-Fix-ncursesw-include-lookup.patch b/mingw-w64-python/0086-build-Fix-ncursesw-include-lookup.patch index 6ec8473018..57d5d3607e 100644 --- a/mingw-w64-python/0086-build-Fix-ncursesw-include-lookup.patch +++ b/mingw-w64-python/0086-build-Fix-ncursesw-include-lookup.patch @@ -1,4 +1,4 @@ -From df4bd6db246b12f7382dbac292340838a5f643b7 Mon Sep 17 00:00:00 2001 +From 2894a762a591ed7df3efe7992e57a0fc639a7282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:09 +0530 @@ -13,7 +13,7 @@ pkg-config and use the exported path via sysconfig in setup.py 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 72d7ee8..7fdb2db 100644 +index 2acca5d..89eb642 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -355,6 +355,7 @@ IO_OBJS= \ diff --git a/mingw-w64-python/0087-tests-fix-test_bytes.patch b/mingw-w64-python/0087-tests-fix-test_bytes.patch index 8241887e51..eb5e475ab5 100644 --- a/mingw-w64-python/0087-tests-fix-test_bytes.patch +++ b/mingw-w64-python/0087-tests-fix-test_bytes.patch @@ -1,4 +1,4 @@ -From 704a940c76c6f49ce8da9e22fcb99cc2b03740e6 Mon Sep 17 00:00:00 2001 +From b6978a660120b36a5f0fed26b4f30eb47b75db9a Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 23 Jul 2021 08:51:32 +0200 Subject: [PATCH 087/N] tests: fix test_bytes diff --git a/mingw-w64-python/0088-time-fix-strftime-not-raising-for-invalid-year-value.patch b/mingw-w64-python/0088-time-fix-strftime-not-raising-for-invalid-year-value.patch index c83db18ca3..2c14c0ad5a 100644 --- a/mingw-w64-python/0088-time-fix-strftime-not-raising-for-invalid-year-value.patch +++ b/mingw-w64-python/0088-time-fix-strftime-not-raising-for-invalid-year-value.patch @@ -1,4 +1,4 @@ -From a462fb9cc6d5002eb88fb262975230c96aa2a89e Mon Sep 17 00:00:00 2001 +From 64fc537a5ec43a7086f52244e8648355d839b6ab Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 23 Jul 2021 08:52:50 +0200 Subject: [PATCH 088/N] time: fix strftime not raising for invalid year diff --git a/mingw-w64-python/0089-ctypes-find_library-c-should-return-None-with-ucrt.patch b/mingw-w64-python/0089-ctypes-find_library-c-should-return-None-with-ucrt.patch index 2718f898fb..94f4d8fc40 100644 --- a/mingw-w64-python/0089-ctypes-find_library-c-should-return-None-with-ucrt.patch +++ b/mingw-w64-python/0089-ctypes-find_library-c-should-return-None-with-ucrt.patch @@ -1,4 +1,4 @@ -From c7f518ece1a16ec02a63e009d29b3c9fd844820c Mon Sep 17 00:00:00 2001 +From 599a44886304a0954bdac46115ec5180624dce46 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 23 Jul 2021 18:23:58 +0200 Subject: [PATCH 089/N] ctypes: find_library('c') should return None with diff --git a/mingw-w64-python/0090-build-Disable-checks-for-dlopen-dlfcn.patch b/mingw-w64-python/0090-build-Disable-checks-for-dlopen-dlfcn.patch index 05e6c4acf2..36c446bd91 100644 --- a/mingw-w64-python/0090-build-Disable-checks-for-dlopen-dlfcn.patch +++ b/mingw-w64-python/0090-build-Disable-checks-for-dlopen-dlfcn.patch @@ -1,4 +1,4 @@ -From 6525565cf853903dd4d2453d9f5f90778dc43a10 Mon Sep 17 00:00:00 2001 +From 58ed4b5b336a75e3f64b1a09541f94f712f5db9f Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 13:54:12 +0200 Subject: [PATCH 090/N] build: Disable checks for dlopen/dlfcn diff --git a/mingw-w64-python/0091-Fix-install-location-of-the-import-library.patch b/mingw-w64-python/0091-Fix-install-location-of-the-import-library.patch index 33d9f8d265..30a0cf37b6 100644 --- a/mingw-w64-python/0091-Fix-install-location-of-the-import-library.patch +++ b/mingw-w64-python/0091-Fix-install-location-of-the-import-library.patch @@ -1,4 +1,4 @@ -From 3d5806555d024d8cae19a2fea398d9bd16ab7338 Mon Sep 17 00:00:00 2001 +From 67a7bdb6f1633719b6924d589e1a7e2ff3623f05 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 15:46:01 +0200 Subject: [PATCH 091/N] Fix install location of the import library @@ -8,10 +8,10 @@ Subject: [PATCH 091/N] Fix install location of the import library 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 7fdb2db..274b97d 100644 +index 89eb642..7de5aac 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2262,7 +2262,7 @@ libainstall: all python-config +@@ -2267,7 +2267,7 @@ libainstall: all python-config if test -d $(LIBRARY); then :; else \ if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \ if test "$(SHLIB_SUFFIX)" = .dll -o "$(SHLIB_SUFFIX)" = .pyd; then \ diff --git a/mingw-w64-python/0092-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch b/mingw-w64-python/0092-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch index 3f924ac4ac..f258ecc732 100644 --- a/mingw-w64-python/0092-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch +++ b/mingw-w64-python/0092-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch @@ -1,4 +1,4 @@ -From 15da7e0b8a5bcc903dfa647c168c10d82b7b4e25 Mon Sep 17 00:00:00 2001 +From f28b132c18e43568803a94a1b21faf9c33ed3464 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 15:46:54 +0200 Subject: [PATCH 092/N] Set MSYS2_ARG_CONV_EXCL for the shared Python module @@ -10,10 +10,10 @@ Otherwise one has to set it when calling "make install". 1 file changed, 1 insertion(+) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 274b97d..e1a31af 100644 +index 7de5aac..8267e1b 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2310,6 +2310,7 @@ endif +@@ -2315,6 +2315,7 @@ endif # Install the dynamically loadable modules # This goes into $(exec_prefix) sharedinstall: all diff --git a/mingw-w64-python/0093-build-Integrate-venvlauncher-build-installation-into.patch b/mingw-w64-python/0093-build-Integrate-venvlauncher-build-installation-into.patch index f11baff209..7f7b72c24f 100644 --- a/mingw-w64-python/0093-build-Integrate-venvlauncher-build-installation-into.patch +++ b/mingw-w64-python/0093-build-Integrate-venvlauncher-build-installation-into.patch @@ -1,4 +1,4 @@ -From 27b0e9bd3f956d96c3cb51dc27f66cd7a5e977bc Mon Sep 17 00:00:00 2001 +From 07ed8e13045b5be4ac6a36eabbaff7bef87c1494 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 16:53:35 +0200 Subject: [PATCH 093/N] build: Integrate venvlauncher build/installation into @@ -12,7 +12,7 @@ but a copy of main binary seems to work as well for now. 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index e1a31af..5bc39b7 100644 +index 8267e1b..879ff32 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -167,6 +167,7 @@ BINLIBDEST= @BINLIBDEST@ @@ -32,7 +32,7 @@ index e1a31af..5bc39b7 100644 HOSTRUNNER= @HOSTRUNNER@ -@@ -597,7 +600,7 @@ LIBEXPAT_HEADERS= \ +@@ -598,7 +601,7 @@ LIBEXPAT_HEADERS= \ # Default target all: @DEF_MAKE_ALL_RULE@ @@ -41,7 +41,7 @@ index e1a31af..5bc39b7 100644 gdbhooks Programs/_testembed python-config build_wasm: check-clean-src $(BUILDPYTHON) platform oldsharedmods python-config -@@ -729,6 +732,14 @@ $(BUILDPYTHONW): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) pythonw +@@ -730,6 +733,14 @@ $(BUILDPYTHONW): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) pythonw $(BUILDPYTHON): Programs/python.o $(LINK_PYTHON_DEPS) python_exe.o $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -municode -o $@ Programs/python.o $(LINK_PYTHON_OBJS) $(LIBS) $(MODLIBS) $(SYSLIBS) python_exe.o @@ -56,7 +56,7 @@ index e1a31af..5bc39b7 100644 platform: $(PYTHON_FOR_BUILD_DEPS) pybuilddir.txt $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print("%s-%d.%d" % (get_platform(), *sys.version_info[:2]))' >platform -@@ -1821,7 +1832,7 @@ $(DESTSHARED): +@@ -1823,7 +1834,7 @@ $(DESTSHARED): # Install the interpreter with $(VERSION) affixed # This goes into $(exec_prefix) altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@ @@ -65,7 +65,7 @@ index e1a31af..5bc39b7 100644 do \ if test ! -d $(DESTDIR)$$i; then \ echo "Creating directory $$i"; \ -@@ -1832,6 +1843,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@ +@@ -1834,6 +1845,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@ if test "$(PYTHONFRAMEWORKDIR)" = "no-framework" ; then \ $(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \ $(INSTALL_PROGRAM) $(BUILDPYTHONW) $(DESTDIR)$(BINDIR)/python3w$(EXE); \ diff --git a/mingw-w64-python/0094-configure.ac-set-_WIN32_WINNT-version.patch b/mingw-w64-python/0094-configure.ac-set-_WIN32_WINNT-version.patch index e332d47082..2d39077b22 100644 --- a/mingw-w64-python/0094-configure.ac-set-_WIN32_WINNT-version.patch +++ b/mingw-w64-python/0094-configure.ac-set-_WIN32_WINNT-version.patch @@ -1,4 +1,4 @@ -From ee9ff20827be57a6767d93d403c3932cf2060841 Mon Sep 17 00:00:00 2001 +From 6ad4d5eff9d817628109f08e7af416fd4987473c Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 1 Aug 2021 15:18:50 +0200 Subject: [PATCH 094/N] configure.ac: set _WIN32_WINNT version diff --git a/mingw-w64-python/0095-configure.ac-don-t-check-for-clock_-functions.patch b/mingw-w64-python/0095-configure.ac-don-t-check-for-clock_-functions.patch index b185bb41ad..bdfb2aa4ff 100644 --- a/mingw-w64-python/0095-configure.ac-don-t-check-for-clock_-functions.patch +++ b/mingw-w64-python/0095-configure.ac-don-t-check-for-clock_-functions.patch @@ -1,4 +1,4 @@ -From 5fef655d5b712600fe15241b49968952c3e5beb0 Mon Sep 17 00:00:00 2001 +From e20686564d682bde91c1ac4d49b6514bc6e55996 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 1 Aug 2021 18:35:17 +0200 Subject: [PATCH 095/N] configure.ac: don't check for clock_ functions diff --git a/mingw-w64-python/0096-expanduser-normpath-paths-coming-from-env-vars.patch b/mingw-w64-python/0096-expanduser-normpath-paths-coming-from-env-vars.patch index ba81eafa47..5547f2b573 100644 --- a/mingw-w64-python/0096-expanduser-normpath-paths-coming-from-env-vars.patch +++ b/mingw-w64-python/0096-expanduser-normpath-paths-coming-from-env-vars.patch @@ -1,4 +1,4 @@ -From 82d990c9ca6be73ee58e6b75aef1ae39c68b01c2 Mon Sep 17 00:00:00 2001 +From 5e0d69a1320c7498c4980d63fb71e0e48fb6e946 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 8 Aug 2021 10:17:35 +0200 Subject: [PATCH 096/N] expanduser: normpath paths coming from env vars diff --git a/mingw-w64-python/0097-CI-test-the-build-and-add-some-mingw-specific-tests.patch b/mingw-w64-python/0097-CI-test-the-build-and-add-some-mingw-specific-tests.patch index dc3fbfc34e..0af7509940 100644 --- a/mingw-w64-python/0097-CI-test-the-build-and-add-some-mingw-specific-tests.patch +++ b/mingw-w64-python/0097-CI-test-the-build-and-add-some-mingw-specific-tests.patch @@ -1,4 +1,4 @@ -From 5ec186f842676239ebea8deebc2032efb8ebc0d2 Mon Sep 17 00:00:00 2001 +From 7eb469be28b5242ffaffe02bf50c1dbaccbab0b8 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 18 Jun 2021 17:51:59 +0530 Subject: [PATCH 097/N] CI: test the build and add some mingw specific tests diff --git a/mingw-w64-python/0098-Prefer-sysconfig.python_build.patch b/mingw-w64-python/0098-Prefer-sysconfig.python_build.patch index 5dfccf18cd..361f1bc7bd 100644 --- a/mingw-w64-python/0098-Prefer-sysconfig.python_build.patch +++ b/mingw-w64-python/0098-Prefer-sysconfig.python_build.patch @@ -1,4 +1,4 @@ -From 24573a4fe910b9b270d2792c4c414ba07689afb2 Mon Sep 17 00:00:00 2001 +From ff681d81abae31425fa5e4850102976478149796 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Fri, 1 Oct 2021 07:28:36 +0700 Subject: [PATCH 098/N] Prefer sysconfig.python_build diff --git a/mingw-w64-python/0099-Define-PY3_DLLNAME-to-fix-build.patch b/mingw-w64-python/0099-Define-PY3_DLLNAME-to-fix-build.patch index 4bbcd795a2..cf03138a79 100644 --- a/mingw-w64-python/0099-Define-PY3_DLLNAME-to-fix-build.patch +++ b/mingw-w64-python/0099-Define-PY3_DLLNAME-to-fix-build.patch @@ -1,4 +1,4 @@ -From b1c65bf7ea0bb0ba012a8f31c8e51e4ecea829e3 Mon Sep 17 00:00:00 2001 +From 0d50181cd25d1189cfbe2b166f20577ae11875e7 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Tue, 12 Oct 2021 18:35:21 +0530 Subject: [PATCH 099/N] Define PY3_DLLNAME to fix build diff --git a/mingw-w64-python/0100-distutils-remove-checks-for-ancient-gcc-binutils.patch b/mingw-w64-python/0100-distutils-remove-checks-for-ancient-gcc-binutils.patch index 0d518d54ff..8dfa85235e 100644 --- a/mingw-w64-python/0100-distutils-remove-checks-for-ancient-gcc-binutils.patch +++ b/mingw-w64-python/0100-distutils-remove-checks-for-ancient-gcc-binutils.patch @@ -1,4 +1,4 @@ -From b77c8c933b3366f368822c8204aa3bebdb8be615 Mon Sep 17 00:00:00 2001 +From 864c055206885da76724c1f446f1700f3aa161a9 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 7 Nov 2021 23:06:13 +0100 Subject: [PATCH 100/N] distutils: remove checks for ancient gcc/binutils diff --git a/mingw-w64-python/0101-distutils-split-CC-env-var-before-passing-to-subproc.patch b/mingw-w64-python/0101-distutils-split-CC-env-var-before-passing-to-subproc.patch index c360b8d97a..bfae7b4281 100644 --- a/mingw-w64-python/0101-distutils-split-CC-env-var-before-passing-to-subproc.patch +++ b/mingw-w64-python/0101-distutils-split-CC-env-var-before-passing-to-subproc.patch @@ -1,4 +1,4 @@ -From 9c6aaae199468349373d4538814c35995502153c Mon Sep 17 00:00:00 2001 +From f741e96dcdc66d2faa8500ce1e51998a52c8659b Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 7 Nov 2021 23:12:10 +0100 Subject: [PATCH 101/N] distutils: split CC env var before passing to diff --git a/mingw-w64-python/0102-_testconsole.c-Fix-casing-path-sep.patch b/mingw-w64-python/0102-_testconsole.c-Fix-casing-path-sep.patch index b3a0e98328..61ae85e468 100644 --- a/mingw-w64-python/0102-_testconsole.c-Fix-casing-path-sep.patch +++ b/mingw-w64-python/0102-_testconsole.c-Fix-casing-path-sep.patch @@ -1,4 +1,4 @@ -From 58422cb1494140173ef0ab041fe580e3541a90cf Mon Sep 17 00:00:00 2001 +From 7ee750ee49940f59bd9feac70920f7cc2db0eae6 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Sun, 14 Nov 2021 14:55:35 +0700 Subject: [PATCH 102/N] _testconsole.c: Fix casing & path sep diff --git a/mingw-w64-python/0103-Return-consistent-architecture-markers-for-python-on.patch b/mingw-w64-python/0103-Return-consistent-architecture-markers-for-python-on.patch index f728686a46..6065b7b88f 100644 --- a/mingw-w64-python/0103-Return-consistent-architecture-markers-for-python-on.patch +++ b/mingw-w64-python/0103-Return-consistent-architecture-markers-for-python-on.patch @@ -1,4 +1,4 @@ -From d9188506752cc4a608a8cb16be7f66342e339cd2 Mon Sep 17 00:00:00 2001 +From 40ea48d34083be2bd31a7bf4b08361a671e94fc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Fri, 19 Nov 2021 12:18:06 +0200 Subject: [PATCH 103/N] Return consistent architecture markers for python on diff --git a/mingw-w64-python/0104-distutils-add-back-gcc_version.patch b/mingw-w64-python/0104-distutils-add-back-gcc_version.patch index 7576c41a1a..6762a3362d 100644 --- a/mingw-w64-python/0104-distutils-add-back-gcc_version.patch +++ b/mingw-w64-python/0104-distutils-add-back-gcc_version.patch @@ -1,4 +1,4 @@ -From eee1af683b694e23f693d19f65c5afebe6e636e3 Mon Sep 17 00:00:00 2001 +From ad3da2a6175fc1c368f13f9dfba824357c06ccb8 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 21 Nov 2021 14:00:06 +0100 Subject: [PATCH 104/N] distutils: add back gcc_version diff --git a/mingw-w64-python/0105-fix-mingw-cross-compiling-in-setup.py.patch b/mingw-w64-python/0105-fix-mingw-cross-compiling-in-setup.py.patch index 8f291a4d70..11d8af7293 100644 --- a/mingw-w64-python/0105-fix-mingw-cross-compiling-in-setup.py.patch +++ b/mingw-w64-python/0105-fix-mingw-cross-compiling-in-setup.py.patch @@ -1,4 +1,4 @@ -From b0c35a36cbe11a221b54b05ec86ee37a35fdee22 Mon Sep 17 00:00:00 2001 +From c733f7ec0c9a8cac515fc9f725efe38154a2ab54 Mon Sep 17 00:00:00 2001 From: jeremyd2019 Date: Mon, 22 Nov 2021 13:15:12 -0800 Subject: [PATCH 105/N] fix mingw cross compiling in setup.py diff --git a/mingw-w64-python/0106-handle-ncursesw-pkg-config-when-cross-compiling.patch b/mingw-w64-python/0106-handle-ncursesw-pkg-config-when-cross-compiling.patch index ca607d6913..3a9497a118 100644 --- a/mingw-w64-python/0106-handle-ncursesw-pkg-config-when-cross-compiling.patch +++ b/mingw-w64-python/0106-handle-ncursesw-pkg-config-when-cross-compiling.patch @@ -1,4 +1,4 @@ -From 0d51d4ac570993ceb4dde1481c44ce8b5d0bc8c4 Mon Sep 17 00:00:00 2001 +From c4ad00c801854c34d61a2e6d930926a73a097272 Mon Sep 17 00:00:00 2001 From: jeremyd2019 Date: Mon, 22 Nov 2021 16:04:41 -0800 Subject: [PATCH 106/N] handle ncursesw pkg-config when cross-compiling diff --git a/mingw-w64-python/0107-mingw_smoketests-fix-_UCRT-condition.patch b/mingw-w64-python/0107-mingw_smoketests-fix-_UCRT-condition.patch index 643d04ec14..807a788d32 100644 --- a/mingw-w64-python/0107-mingw_smoketests-fix-_UCRT-condition.patch +++ b/mingw-w64-python/0107-mingw_smoketests-fix-_UCRT-condition.patch @@ -1,4 +1,4 @@ -From 23a69a7e11ec0ad9e7a455beef732408b3f1d822 Mon Sep 17 00:00:00 2001 +From dd0482acee0c56ddb4ccba61f4d20adbe96ad387 Mon Sep 17 00:00:00 2001 From: jeremyd2019 Date: Sat, 22 Jan 2022 11:33:00 -0800 Subject: [PATCH 107/N] mingw_smoketests: fix _UCRT condition diff --git a/mingw-w64-python/0108-Modify-sys.winver-to-match-upstream.patch b/mingw-w64-python/0108-Modify-sys.winver-to-match-upstream.patch index 9a341a144d..6838f4f156 100644 --- a/mingw-w64-python/0108-Modify-sys.winver-to-match-upstream.patch +++ b/mingw-w64-python/0108-Modify-sys.winver-to-match-upstream.patch @@ -1,4 +1,4 @@ -From 2e45fd1d520abe959ffed8677dd68b854173b16a Mon Sep 17 00:00:00 2001 +From f617b6c5eca2f29e3ee0c2dbcb7e3ada38f92f87 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Wed, 19 Jan 2022 19:39:20 +0530 Subject: [PATCH 108/N] Modify `sys.winver` to match upstream diff --git a/mingw-w64-python/0109-Change-user-site-packages-path-to-include-the-enviro.patch b/mingw-w64-python/0109-Change-user-site-packages-path-to-include-the-enviro.patch index f5ebecd657..afbe380b13 100644 --- a/mingw-w64-python/0109-Change-user-site-packages-path-to-include-the-enviro.patch +++ b/mingw-w64-python/0109-Change-user-site-packages-path-to-include-the-enviro.patch @@ -1,4 +1,4 @@ -From 2d59c0495e04f1b790adab0538e84ac45a3dd0a8 Mon Sep 17 00:00:00 2001 +From 8d459a573fa13a239cc4826e39a82c00c5cf760f Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Wed, 19 Jan 2022 20:01:45 +0530 Subject: [PATCH 109/N] Change user site-packages path to include the diff --git a/mingw-w64-python/0110-configure-Include-a-header-in-the-check-for-_beginth.patch b/mingw-w64-python/0110-configure-Include-a-header-in-the-check-for-_beginth.patch index af48053aa6..aae572f37a 100644 --- a/mingw-w64-python/0110-configure-Include-a-header-in-the-check-for-_beginth.patch +++ b/mingw-w64-python/0110-configure-Include-a-header-in-the-check-for-_beginth.patch @@ -1,4 +1,4 @@ -From a0f77139dcb170158021ef38cf34cf750f80430d Mon Sep 17 00:00:00 2001 +From 2f5da81699c7193e25bf0acba9bac45b42de85f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Thu, 21 Apr 2022 14:25:51 +0300 Subject: [PATCH 110/N] configure: Include a header in the check for diff --git a/mingw-w64-python/0111-configure.ac-Default-to-without-c-locale-coercion-on.patch b/mingw-w64-python/0111-configure.ac-Default-to-without-c-locale-coercion-on.patch index 13d72235e3..c1ebf4c0a5 100644 --- a/mingw-w64-python/0111-configure.ac-Default-to-without-c-locale-coercion-on.patch +++ b/mingw-w64-python/0111-configure.ac-Default-to-without-c-locale-coercion-on.patch @@ -1,4 +1,4 @@ -From c93600fff7d274f0535f0ca848a85bd52a4741a6 Mon Sep 17 00:00:00 2001 +From db1aebbc4165e0c81eaae3c17ce202661b540eec Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 22 Apr 2022 17:31:19 +0200 Subject: [PATCH 111/N] configure.ac: Default to --without-c-locale-coercion diff --git a/mingw-w64-python/0112-Fix-failing-tests.patch b/mingw-w64-python/0112-Fix-failing-tests.patch index 2b0f3a7777..f00770fe6b 100644 --- a/mingw-w64-python/0112-Fix-failing-tests.patch +++ b/mingw-w64-python/0112-Fix-failing-tests.patch @@ -1,4 +1,4 @@ -From c9d2af7f74b3df2ed8a108fb81c795f4666184c9 Mon Sep 17 00:00:00 2001 +From effbd6e4fd96a0cac25bf534a12a7f59ccf00b68 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Sun, 5 Jun 2022 20:28:53 +0530 Subject: [PATCH 112/N] Fix failing tests diff --git a/mingw-w64-python/0113-distutils-add-build-root-to-libdirs-when-building-un.patch b/mingw-w64-python/0113-distutils-add-build-root-to-libdirs-when-building-un.patch index 0c67cd3302..193768f46a 100644 --- a/mingw-w64-python/0113-distutils-add-build-root-to-libdirs-when-building-un.patch +++ b/mingw-w64-python/0113-distutils-add-build-root-to-libdirs-when-building-un.patch @@ -1,4 +1,4 @@ -From 98d35b68c3de69e7be5e0c2ec3266a124df279c8 Mon Sep 17 00:00:00 2001 +From a5d148eeca27a55d76d2219f1ebf338815248c82 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Mon, 6 Jun 2022 16:24:55 +0200 Subject: [PATCH 113/N] distutils: add build root to libdirs when building diff --git a/mingw-w64-python/0114-Don-t-change-os.sep-with-an-empty-MSYSTEM-env-var-no.patch b/mingw-w64-python/0114-Don-t-change-os.sep-with-an-empty-MSYSTEM-env-var-no.patch index e4af3bafec..a3b916a553 100644 --- a/mingw-w64-python/0114-Don-t-change-os.sep-with-an-empty-MSYSTEM-env-var-no.patch +++ b/mingw-w64-python/0114-Don-t-change-os.sep-with-an-empty-MSYSTEM-env-var-no.patch @@ -1,4 +1,4 @@ -From 3b7e1140900b481e333734d5f03066ebf3842b3b Mon Sep 17 00:00:00 2001 +From 4a31b2a3b528b65b02818c5341aaade5061496e5 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 22 Sep 2022 17:51:33 +0200 Subject: [PATCH 114/N] Don't change os.sep with an empty MSYSTEM env var, diff --git a/mingw-w64-python/0115-def-VPATH-when-compiling-Python-sysmodule.c.patch b/mingw-w64-python/0115-def-VPATH-when-compiling-Python-sysmodule.c.patch index 19ab7608dd..6b029c0065 100644 --- a/mingw-w64-python/0115-def-VPATH-when-compiling-Python-sysmodule.c.patch +++ b/mingw-w64-python/0115-def-VPATH-when-compiling-Python-sysmodule.c.patch @@ -1,4 +1,4 @@ -From 3f80e0bf38177f0de97357f3fcebcdf82960ea2a Mon Sep 17 00:00:00 2001 +From 79ce4ba4ff8568004356b3239e9ae54779f6eb75 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Sun, 18 Jun 2023 13:12:56 +0530 Subject: [PATCH 115/N] def VPATH when compiling `Python/sysmodule.c` @@ -8,10 +8,10 @@ Subject: [PATCH 115/N] def VPATH when compiling `Python/sysmodule.c` 1 file changed, 1 insertion(+) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 5bc39b7..6057a5f 100644 +index 879ff32..b754c24 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1320,6 +1320,7 @@ Python/dynload_win.o: $(srcdir)/Python/dynload_win.c Makefile +@@ -1322,6 +1322,7 @@ Python/dynload_win.o: $(srcdir)/Python/dynload_win.c Makefile Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile $(srcdir)/Include/pydtrace.h $(CC) -c $(PY_CORE_CFLAGS) \ -DABIFLAGS='"$(ABIFLAGS)"' \ diff --git a/mingw-w64-python/0116-Make-_Py_CheckPython3-extern.patch b/mingw-w64-python/0116-Make-_Py_CheckPython3-extern.patch index c01d7f0d50..26003136f2 100644 --- a/mingw-w64-python/0116-Make-_Py_CheckPython3-extern.patch +++ b/mingw-w64-python/0116-Make-_Py_CheckPython3-extern.patch @@ -1,4 +1,4 @@ -From d2898338394f0e583e7e8d6d1ea3d482406dedc1 Mon Sep 17 00:00:00 2001 +From 5c263dc7f62e71b6ef3d7e4a9772a3a349d474e6 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Sun, 18 Jun 2023 13:17:48 +0530 Subject: [PATCH 116/N] Make `_Py_CheckPython3` extern diff --git a/mingw-w64-python/0117-link-with-bcrypt.patch b/mingw-w64-python/0117-link-with-bcrypt.patch index 8bba8c859b..f14481d55e 100644 --- a/mingw-w64-python/0117-link-with-bcrypt.patch +++ b/mingw-w64-python/0117-link-with-bcrypt.patch @@ -1,4 +1,4 @@ -From ebd9da6ab516e4b632885a1cbb3175216e5d3eb6 Mon Sep 17 00:00:00 2001 +From 12c8f4739c33c5328ee1844b7652318e18d0fca9 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Sun, 18 Jun 2023 14:20:44 +0530 Subject: [PATCH 117/N] link with bcrypt diff --git a/mingw-w64-python/0118-correctly-find-native-python.patch b/mingw-w64-python/0118-correctly-find-native-python.patch index 7bd2257e91..6929a72790 100644 --- a/mingw-w64-python/0118-correctly-find-native-python.patch +++ b/mingw-w64-python/0118-correctly-find-native-python.patch @@ -1,4 +1,4 @@ -From 48f75f22d0332041dd44aaa7b6b9cfc8e0e70f9d Mon Sep 17 00:00:00 2001 +From 5c5fac036e894275c65f85f68f68ea4361f592bc Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Sun, 18 Jun 2023 14:29:50 +0530 Subject: [PATCH 118/N] correctly find native python diff --git a/mingw-w64-python/0119-Add-extra-flags-for-_bootstrap_python.patch b/mingw-w64-python/0119-Add-extra-flags-for-_bootstrap_python.patch index fd0fa1fb30..60a6f09aca 100644 --- a/mingw-w64-python/0119-Add-extra-flags-for-_bootstrap_python.patch +++ b/mingw-w64-python/0119-Add-extra-flags-for-_bootstrap_python.patch @@ -1,4 +1,4 @@ -From 459ac2369bb6bb2733500fc798dee987326016aa Mon Sep 17 00:00:00 2001 +From 02574b88739fad64c6e4b5285c53ecaace1ac25d Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Sun, 18 Jun 2023 14:30:09 +0530 Subject: [PATCH 119/N] Add extra flags for `_bootstrap_python` @@ -8,10 +8,10 @@ Subject: [PATCH 119/N] Add extra flags for `_bootstrap_python` 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 6057a5f..0752bbe 100644 +index b754c24..ac621c4 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1010,7 +1010,7 @@ BOOTSTRAP_HEADERS = \ +@@ -1011,7 +1011,7 @@ BOOTSTRAP_HEADERS = \ Programs/_bootstrap_python.o: Programs/_bootstrap_python.c $(BOOTSTRAP_HEADERS) $(PYTHON_HEADERS) _bootstrap_python: $(LIBRARY_OBJS_OMIT_FROZEN) Programs/_bootstrap_python.o Modules/getpath.o Modules/Setup.local diff --git a/mingw-w64-python/0120-posixmodule-undefine-HAVE_OPENDIR.patch b/mingw-w64-python/0120-posixmodule-undefine-HAVE_OPENDIR.patch index 2eaef7c711..f35c7aded9 100644 --- a/mingw-w64-python/0120-posixmodule-undefine-HAVE_OPENDIR.patch +++ b/mingw-w64-python/0120-posixmodule-undefine-HAVE_OPENDIR.patch @@ -1,4 +1,4 @@ -From 66020f82088ef20e098b0fa85a65e155e743772c Mon Sep 17 00:00:00 2001 +From 9ce2b857d171728c68b0d193e6bdef47df2af958 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Tue, 20 Jun 2023 18:32:58 +0530 Subject: [PATCH 120/N] posixmodule: undefine `HAVE_OPENDIR` @@ -13,7 +13,7 @@ windows API. 1 file changed, 6 insertions(+) diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 88e61f7..71c53f9 100644 +index ce44ab7..863c2c9 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -354,6 +354,12 @@ corresponding Unix manual entries for more information on calls."); diff --git a/mingw-w64-python/0121-getpath.py-add-support-for-mingw.patch b/mingw-w64-python/0121-getpath.py-add-support-for-mingw.patch index 8cbddc025e..20734be2ee 100644 --- a/mingw-w64-python/0121-getpath.py-add-support-for-mingw.patch +++ b/mingw-w64-python/0121-getpath.py-add-support-for-mingw.patch @@ -1,4 +1,4 @@ -From ab165912002a5b02b89ae583e74ea470c3d10120 Mon Sep 17 00:00:00 2001 +From a19507cbed5a049594996c5863f9ebd282e90ff3 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Tue, 20 Jun 2023 18:43:59 +0530 Subject: [PATCH 121/N] getpath.py: add support for mingw @@ -26,7 +26,7 @@ index 50d8b76..5d29201 100644 PyAPI_FUNC(char) Py_GetSepA(const char *); diff --git a/Modules/getpath.c b/Modules/getpath.c -index bc730fc..d02fe05 100644 +index 2a14de0..a6db5dd 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -68,6 +68,7 @@ getpath_abspath(PyObject *Py_UNUSED(self), PyObject *args) @@ -37,7 +37,7 @@ index bc730fc..d02fe05 100644 r = PyUnicode_FromWideChar(abs, -1); PyMem_RawFree((void *)abs); } else { -@@ -884,6 +885,11 @@ _PyConfig_InitPathConfig(PyConfig *config, int compute_path_config) +@@ -885,6 +886,11 @@ _PyConfig_InitPathConfig(PyConfig *config, int compute_path_config) #else !decode_to_dict(dict, "os_name", "posix") || #endif @@ -49,7 +49,7 @@ index bc730fc..d02fe05 100644 #ifdef WITH_NEXT_FRAMEWORK !int_to_dict(dict, "WITH_NEXT_FRAMEWORK", 1) || #else -@@ -910,6 +916,9 @@ _PyConfig_InitPathConfig(PyConfig *config, int compute_path_config) +@@ -911,6 +917,9 @@ _PyConfig_InitPathConfig(PyConfig *config, int compute_path_config) !funcs_to_dict(dict, config->pathconfig_warnings) || #ifndef MS_WINDOWS PyDict_SetItemString(dict, "winreg", Py_None) < 0 || @@ -205,10 +205,10 @@ index 74f918c..83db516 100644 diff --git a/Python/fileutils.c b/Python/fileutils.c -index 137fde9..5bc6634 100644 +index 0ac70aa..22f4700 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c -@@ -2050,7 +2050,11 @@ _Py_abspath(const wchar_t *path, wchar_t **abspath_p) +@@ -2052,7 +2052,11 @@ _Py_abspath(const wchar_t *path, wchar_t **abspath_p) } #ifdef MS_WINDOWS @@ -221,7 +221,7 @@ index 137fde9..5bc6634 100644 #else wchar_t cwd[MAXPATHLEN + 1]; cwd[Py_ARRAY_LENGTH(cwd) - 1] = 0; -@@ -2196,11 +2200,16 @@ _Py_normpath_and_size(wchar_t *path, Py_ssize_t size, Py_ssize_t *normsize) +@@ -2198,11 +2202,16 @@ _Py_normpath_and_size(wchar_t *path, Py_ssize_t size, Py_ssize_t *normsize) wchar_t *minP2 = path; // the beginning of the destination range wchar_t lastC = L'\0'; // the last ljusted character, p2[-1] in most cases @@ -240,7 +240,7 @@ index 137fde9..5bc6634 100644 #endif #define SEP_OR_END(x) (IS_SEP(x) || IS_END(x)) -@@ -2211,7 +2220,7 @@ _Py_normpath_and_size(wchar_t *path, Py_ssize_t size, Py_ssize_t *normsize) +@@ -2213,7 +2222,7 @@ _Py_normpath_and_size(wchar_t *path, Py_ssize_t size, Py_ssize_t *normsize) path++; } p1 = p2 = minP2 = path; @@ -249,7 +249,7 @@ index 137fde9..5bc6634 100644 } #ifdef MS_WINDOWS // Skip past drive segment and update minP2 -@@ -2225,13 +2234,13 @@ _Py_normpath_and_size(wchar_t *path, Py_ssize_t size, Py_ssize_t *normsize) +@@ -2227,13 +2236,13 @@ _Py_normpath_and_size(wchar_t *path, Py_ssize_t size, Py_ssize_t *normsize) // and network paths, including the first segment. else if (IS_SEP(&p1[0]) && IS_SEP(&p1[1])) { int sepCount = 2; @@ -266,7 +266,7 @@ index 137fde9..5bc6634 100644 } else { *p2++ = lastC = *p1; } -@@ -2244,7 +2253,7 @@ _Py_normpath_and_size(wchar_t *path, Py_ssize_t size, Py_ssize_t *normsize) +@@ -2246,7 +2255,7 @@ _Py_normpath_and_size(wchar_t *path, Py_ssize_t size, Py_ssize_t *normsize) *p2++ = *p1++; *p2++ = *p1++; minP2 = p2 - 1; // Absolute path has SEP at minP2 @@ -275,7 +275,7 @@ index 137fde9..5bc6634 100644 } #endif /* MS_WINDOWS */ -@@ -2252,18 +2261,18 @@ _Py_normpath_and_size(wchar_t *path, Py_ssize_t size, Py_ssize_t *normsize) +@@ -2254,18 +2263,18 @@ _Py_normpath_and_size(wchar_t *path, Py_ssize_t size, Py_ssize_t *normsize) for (; !IS_END(p1); ++p1) { wchar_t c = *p1; #ifdef ALTSEP @@ -299,7 +299,7 @@ index 137fde9..5bc6634 100644 if (p2 == minP2 || (p3[0] == L'.' && p3[1] == L'.' && IS_SEP(&p3[2]))) { -@@ -2272,7 +2281,7 @@ _Py_normpath_and_size(wchar_t *path, Py_ssize_t size, Py_ssize_t *normsize) +@@ -2274,7 +2283,7 @@ _Py_normpath_and_size(wchar_t *path, Py_ssize_t size, Py_ssize_t *normsize) *p2++ = L'.'; *p2++ = L'.'; lastC = L'.'; @@ -308,7 +308,7 @@ index 137fde9..5bc6634 100644 // Absolute path, so absorb segment p2 = p3 + 1; } else { -@@ -2283,7 +2292,7 @@ _Py_normpath_and_size(wchar_t *path, Py_ssize_t size, Py_ssize_t *normsize) +@@ -2285,7 +2294,7 @@ _Py_normpath_and_size(wchar_t *path, Py_ssize_t size, Py_ssize_t *normsize) } else { *p2++ = lastC = c; } @@ -317,7 +317,7 @@ index 137fde9..5bc6634 100644 } else { *p2++ = lastC = c; } -@@ -2293,7 +2302,7 @@ _Py_normpath_and_size(wchar_t *path, Py_ssize_t size, Py_ssize_t *normsize) +@@ -2295,7 +2304,7 @@ _Py_normpath_and_size(wchar_t *path, Py_ssize_t size, Py_ssize_t *normsize) } *p2 = L'\0'; if (p2 != minP2) { diff --git a/mingw-w64-python/0122-Don-t-build-_posixsubprocess-on-Windows.patch b/mingw-w64-python/0122-Don-t-build-_posixsubprocess-on-Windows.patch index 1393d13c41..9aaed63476 100644 --- a/mingw-w64-python/0122-Don-t-build-_posixsubprocess-on-Windows.patch +++ b/mingw-w64-python/0122-Don-t-build-_posixsubprocess-on-Windows.patch @@ -1,4 +1,4 @@ -From 6f6c53c8db32376bdcb3b29b05f159a891275e9b Mon Sep 17 00:00:00 2001 +From 45a3d02cbc7af7472e5820adfdf460b95709270b Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Tue, 20 Jun 2023 20:17:23 +0530 Subject: [PATCH 122/N] Don't build _posixsubprocess on Windows. diff --git a/mingw-w64-python/0123-_ssl-link-with-ws2_32.patch b/mingw-w64-python/0123-_ssl-link-with-ws2_32.patch index 0a576c2be3..52d5ca6a47 100644 --- a/mingw-w64-python/0123-_ssl-link-with-ws2_32.patch +++ b/mingw-w64-python/0123-_ssl-link-with-ws2_32.patch @@ -1,4 +1,4 @@ -From d83af79e5ef55f2ae3f104eba8c820a3ff4191f3 Mon Sep 17 00:00:00 2001 +From b3feb8a896c6bd2f49b854f1e464bbbbb0c5c5a6 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Tue, 20 Jun 2023 20:35:27 +0530 Subject: [PATCH 123/N] `_ssl`: link with `ws2_32` diff --git a/mingw-w64-python/0124-Fix-building-_socket-module.patch b/mingw-w64-python/0124-Fix-building-_socket-module.patch index 1891154254..60ddd76742 100644 --- a/mingw-w64-python/0124-Fix-building-_socket-module.patch +++ b/mingw-w64-python/0124-Fix-building-_socket-module.patch @@ -1,4 +1,4 @@ -From 419ceedf28a45ed67c584dff7bd57f19542caaf6 Mon Sep 17 00:00:00 2001 +From 03955db0f0f1c3d1681284f58a4c18f6a1982e74 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Tue, 20 Jun 2023 22:08:12 +0530 Subject: [PATCH 124/N] Fix building `_socket` module diff --git a/mingw-w64-python/0125-Always-normalize-path-in-abspath.patch b/mingw-w64-python/0125-Always-normalize-path-in-abspath.patch index 8b2797d52f..7512745da1 100644 --- a/mingw-w64-python/0125-Always-normalize-path-in-abspath.patch +++ b/mingw-w64-python/0125-Always-normalize-path-in-abspath.patch @@ -1,4 +1,4 @@ -From 34902c26f696e749bdb607a9f2d8507afb209350 Mon Sep 17 00:00:00 2001 +From 41105965ff2b1f974e7d8e1e7ef1e1bcf7f150ae Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Tue, 20 Jun 2023 23:00:43 +0530 Subject: [PATCH 125/N] Always normalize path in abspath diff --git a/mingw-w64-python/0126-Include-winsock.h-when-checking-for-netdb-function.patch b/mingw-w64-python/0126-Include-winsock.h-when-checking-for-netdb-function.patch index 124c191d5d..52d9e0b8e3 100644 --- a/mingw-w64-python/0126-Include-winsock.h-when-checking-for-netdb-function.patch +++ b/mingw-w64-python/0126-Include-winsock.h-when-checking-for-netdb-function.patch @@ -1,4 +1,4 @@ -From 4bcfaee223627c4e4e0204392e3e93d8eba26acb Mon Sep 17 00:00:00 2001 +From 5f92e651d13b01e48cc5f5329e3acc9e3af8d245 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Wed, 21 Jun 2023 15:42:39 +0530 Subject: [PATCH 126/N] Include `winsock.h` when checking for netdb function diff --git a/mingw-w64-python/0127-include-_multiprocessing-semaphore.c-on-win32.patch b/mingw-w64-python/0127-include-_multiprocessing-semaphore.c-on-win32.patch index 2ed41920f6..6938549910 100644 --- a/mingw-w64-python/0127-include-_multiprocessing-semaphore.c-on-win32.patch +++ b/mingw-w64-python/0127-include-_multiprocessing-semaphore.c-on-win32.patch @@ -1,4 +1,4 @@ -From 13132e454b09c96be38ad218e40484051189c467 Mon Sep 17 00:00:00 2001 +From 1a06351298f4eae4384b967ead8d3747f690f38a Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 23 Jun 2023 20:13:23 +0530 Subject: [PATCH 127/N] include `_multiprocessing/semaphore.c` on win32 diff --git a/mingw-w64-python/0128-configure-build-mmap-module-on-win32.patch b/mingw-w64-python/0128-configure-build-mmap-module-on-win32.patch index 5266ea4b30..751f78df28 100644 --- a/mingw-w64-python/0128-configure-build-mmap-module-on-win32.patch +++ b/mingw-w64-python/0128-configure-build-mmap-module-on-win32.patch @@ -1,4 +1,4 @@ -From c61547e94028c413cb2c5d5481e218e8ac9285d6 Mon Sep 17 00:00:00 2001 +From d83f26aca38ec9a36578a161416a6a0738f7197c Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 23 Jun 2023 20:15:38 +0530 Subject: [PATCH 128/N] configure: build `mmap` module on win32 diff --git a/mingw-w64-python/0129-venv-creation-fixes.patch b/mingw-w64-python/0129-venv-creation-fixes.patch index d3e0d895b0..fef88f5f0f 100644 --- a/mingw-w64-python/0129-venv-creation-fixes.patch +++ b/mingw-w64-python/0129-venv-creation-fixes.patch @@ -1,4 +1,4 @@ -From 1c06dfc5583faab96a7630e96b00a1a34fe2d4e6 Mon Sep 17 00:00:00 2001 +From 05da864f5ae92e0960ad96cdc681466f11bddbe8 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 23 Jun 2023 20:49:15 +0530 Subject: [PATCH 129/N] venv creation fixes diff --git a/mingw-w64-python/0130-move-the-shutdown-function-where-winsock.h-is-includ.patch b/mingw-w64-python/0130-move-the-shutdown-function-where-winsock.h-is-includ.patch index fd035ef3c0..b2fc4f7b4d 100644 --- a/mingw-w64-python/0130-move-the-shutdown-function-where-winsock.h-is-includ.patch +++ b/mingw-w64-python/0130-move-the-shutdown-function-where-winsock.h-is-includ.patch @@ -1,4 +1,4 @@ -From 0e8f289ba69996a1e38c0738d1324872394fc5ec Mon Sep 17 00:00:00 2001 +From 5edca1b816ea63693a65615d933fd1813488f2a4 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 23 Jun 2023 23:34:01 +0530 Subject: [PATCH 130/N] move the `shutdown` function where `winsock.h` is diff --git a/mingw-w64-python/0131-configure.ac-set-BUILDEXEEXT-and-EXEEXT.patch b/mingw-w64-python/0131-configure.ac-set-BUILDEXEEXT-and-EXEEXT.patch index de2ab1de0b..7536ed6851 100644 --- a/mingw-w64-python/0131-configure.ac-set-BUILDEXEEXT-and-EXEEXT.patch +++ b/mingw-w64-python/0131-configure.ac-set-BUILDEXEEXT-and-EXEEXT.patch @@ -1,4 +1,4 @@ -From 97ab7442d666a33d129a369c41171d8ffbe7a83c Mon Sep 17 00:00:00 2001 +From 53274735291d444d22c973c3cba88343ba09a6eb Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 23 Jun 2023 21:47:32 +0200 Subject: [PATCH 131/N] configure.ac: set BUILDEXEEXT and EXEEXT diff --git a/mingw-w64-python/0132-configure.ac-fix-building-some-test-modules.patch b/mingw-w64-python/0132-configure.ac-fix-building-some-test-modules.patch index ebf66b25f0..80427ddc60 100644 --- a/mingw-w64-python/0132-configure.ac-fix-building-some-test-modules.patch +++ b/mingw-w64-python/0132-configure.ac-fix-building-some-test-modules.patch @@ -1,4 +1,4 @@ -From e74a1775f412a9044e95c73c21481aa40b1a6de9 Mon Sep 17 00:00:00 2001 +From b629ad68c32258dab28f94442cde22d52023be30 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 23 Jun 2023 23:42:39 +0200 Subject: [PATCH 132/N] configure.ac: fix building some test modules diff --git a/mingw-w64-python/0133-Don-t-convert-sysconfig.get_config_var-VPATH-to-an-a.patch b/mingw-w64-python/0133-Don-t-convert-sysconfig.get_config_var-VPATH-to-an-a.patch index 8927d7187e..9e1d849c13 100644 --- a/mingw-w64-python/0133-Don-t-convert-sysconfig.get_config_var-VPATH-to-an-a.patch +++ b/mingw-w64-python/0133-Don-t-convert-sysconfig.get_config_var-VPATH-to-an-a.patch @@ -1,4 +1,4 @@ -From 0acadfb919781fa46f45364ee49ecdb780267e11 Mon Sep 17 00:00:00 2001 +From f5afc02109936fcb7bb219890c8ff5b645b1ec1c Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Sun, 25 Jun 2023 17:20:52 +0530 Subject: [PATCH 133/N] Don't convert `sysconfig.get_config_var('VPATH')` to @@ -11,7 +11,7 @@ this is required for venv to work properly 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 0752bbe..22f0380 100644 +index ac621c4..5862493 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -145,7 +145,6 @@ datarootdir= @datarootdir@ diff --git a/mingw-w64-python/0134-Always-convert-to-before-passing-though-pathcch-func.patch b/mingw-w64-python/0134-Always-convert-to-before-passing-though-pathcch-func.patch index 1a3f6ec50d..b680137b43 100644 --- a/mingw-w64-python/0134-Always-convert-to-before-passing-though-pathcch-func.patch +++ b/mingw-w64-python/0134-Always-convert-to-before-passing-though-pathcch-func.patch @@ -1,4 +1,4 @@ -From 9c23e9d745c5c039a78a5a543b7f6a0320663449 Mon Sep 17 00:00:00 2001 +From c515711ef419c29ae0ddd39509c37784b467b20d Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Sun, 25 Jun 2023 17:24:11 +0530 Subject: [PATCH 134/N] Always convert `/` to `\\` before passing though @@ -25,10 +25,10 @@ index 5d29201..21346ba 100644 /* Py_PyAtExit is for the atexit module, Py_AtExit is for low-level * exit functions. diff --git a/Python/fileutils.c b/Python/fileutils.c -index 5bc6634..c575e5a 100644 +index 22f4700..0eeb957 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c -@@ -2005,19 +2005,31 @@ int +@@ -2007,19 +2007,31 @@ int _Py_isabs(const wchar_t *path) { #ifdef MS_WINDOWS @@ -64,7 +64,7 @@ index 5bc6634..c575e5a 100644 return 1; #else return (path[0] == SEP); -@@ -2098,6 +2110,8 @@ join_relfile(wchar_t *buffer, size_t bufsize, +@@ -2100,6 +2112,8 @@ join_relfile(wchar_t *buffer, size_t bufsize, const wchar_t *dirname, const wchar_t *relfile) { #ifdef MS_WINDOWS diff --git a/mingw-w64-python/0135-Build-venvlauncher.exe-from-PC-launcher.c.patch b/mingw-w64-python/0135-Build-venvlauncher.exe-from-PC-launcher.c.patch index 9a3f9a7a20..451dd253c4 100644 --- a/mingw-w64-python/0135-Build-venvlauncher.exe-from-PC-launcher.c.patch +++ b/mingw-w64-python/0135-Build-venvlauncher.exe-from-PC-launcher.c.patch @@ -1,4 +1,4 @@ -From 45a90fcf98b6def49ed97c334df244f938753846 Mon Sep 17 00:00:00 2001 +From 35da12992cf2378a034b1f137521331f3ad7634a Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Sun, 25 Jun 2023 17:26:55 +0530 Subject: [PATCH 135/N] Build venvlauncher.exe from PC/launcher.c @@ -15,10 +15,10 @@ Subject: [PATCH 135/N] Build venvlauncher.exe from PC/launcher.c 4 files changed, 53 insertions(+), 32 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 22f0380..fd87c65 100644 +index 5862493..19fc62f 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -724,6 +724,12 @@ pythonw_exe.o: $(srcdir)/PC/pythonw_exe.rc +@@ -725,6 +725,12 @@ pythonw_exe.o: $(srcdir)/PC/pythonw_exe.rc python_nt.o: $(srcdir)/PC/python_nt.rc $(WINDRES) $(RCFLAGS) -DORIGINAL_FILENAME=\\\"$(DLLLIBRARY)\\\" -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/python_nt.rc $@ @@ -31,7 +31,7 @@ index 22f0380..fd87c65 100644 $(BUILDPYTHONW): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) pythonw_exe.o $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -municode -mwindows -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) pythonw_exe.o -@@ -731,13 +737,11 @@ $(BUILDPYTHONW): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) pythonw +@@ -732,13 +738,11 @@ $(BUILDPYTHONW): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) pythonw $(BUILDPYTHON): Programs/python.o $(LINK_PYTHON_DEPS) python_exe.o $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -municode -o $@ Programs/python.o $(LINK_PYTHON_OBJS) $(LIBS) $(MODLIBS) $(SYSLIBS) python_exe.o @@ -49,7 +49,7 @@ index 22f0380..fd87c65 100644 platform: $(PYTHON_FOR_BUILD_DEPS) pybuilddir.txt $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print("%s-%d.%d" % (get_platform(), *sys.version_info[:2]))' >platform -@@ -1843,8 +1847,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@ +@@ -1845,8 +1849,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@ if test "$(PYTHONFRAMEWORKDIR)" = "no-framework" ; then \ $(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \ $(INSTALL_PROGRAM) $(BUILDPYTHONW) $(DESTDIR)$(BINDIR)/python3w$(EXE); \ diff --git a/mingw-w64-python/0136-getpath.py-fix-dirname.patch b/mingw-w64-python/0136-getpath.py-fix-dirname.patch index 46ff2c6b00..ac4f57e931 100644 --- a/mingw-w64-python/0136-getpath.py-fix-dirname.patch +++ b/mingw-w64-python/0136-getpath.py-fix-dirname.patch @@ -1,4 +1,4 @@ -From 41cf09bdc7f4237331fdc42edb456eef7ebcdddb Mon Sep 17 00:00:00 2001 +From 6fb900dd8d84f14f370ae32d033a9557fa9bcc4c Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Sun, 25 Jun 2023 19:39:30 +0530 Subject: [PATCH 136/N] getpath.py: fix `dirname` @@ -10,7 +10,7 @@ also, fix finding prefix when in a venv 2 files changed, 15 insertions(+) diff --git a/Modules/getpath.c b/Modules/getpath.c -index d02fe05..67e988a 100644 +index a6db5dd..88510a0 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -89,6 +89,12 @@ getpath_basename(PyObject *Py_UNUSED(self), PyObject *args) diff --git a/mingw-w64-python/0138-getpath-use-normpath-on-all-generated-paths.patch b/mingw-w64-python/0137-getpath-use-normpath-on-all-generated-paths.patch similarity index 96% rename from mingw-w64-python/0138-getpath-use-normpath-on-all-generated-paths.patch rename to mingw-w64-python/0137-getpath-use-normpath-on-all-generated-paths.patch index 9c34da6328..debee53ca1 100644 --- a/mingw-w64-python/0138-getpath-use-normpath-on-all-generated-paths.patch +++ b/mingw-w64-python/0137-getpath-use-normpath-on-all-generated-paths.patch @@ -1,7 +1,7 @@ -From 1db7292736e7373d4668afde9232b005d6062bde Mon Sep 17 00:00:00 2001 +From afab888cc898411cff0fda7e31a0bfbc7d50a316 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 28 Jul 2023 20:13:58 +0200 -Subject: [PATCH 138/N] getpath: use normpath on all generated paths +Subject: [PATCH 137/N] getpath: use normpath on all generated paths Instead of just calling normpath in abspath just call normpath on all the config results. This makes sure we don't change getpath.py @@ -40,7 +40,7 @@ index de489f3..82ad71d 100644 if self.isabs(path): return path diff --git a/Modules/getpath.c b/Modules/getpath.c -index 67e988a..0419c2a 100644 +index 88510a0..19ed64d 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -54,6 +54,25 @@ @@ -77,7 +77,7 @@ index 67e988a..0419c2a 100644 r = PyUnicode_FromWideChar(abs, -1); PyMem_RawFree((void *)abs); } else { -@@ -526,6 +544,7 @@ done: +@@ -527,6 +545,7 @@ done: static PyMethodDef getpath_methods[] = { diff --git a/mingw-w64-python/0137-gh-105821-Use-a-raw-f-string-in-test_httpservers.py-.patch b/mingw-w64-python/0137-gh-105821-Use-a-raw-f-string-in-test_httpservers.py-.patch deleted file mode 100644 index b989981729..0000000000 --- a/mingw-w64-python/0137-gh-105821-Use-a-raw-f-string-in-test_httpservers.py-.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0a6c9de7d32d1009051420a04b257587676317b7 Mon Sep 17 00:00:00 2001 -From: Pablo Galindo Salgado -Date: Thu, 15 Jun 2023 11:48:01 +0100 -Subject: [PATCH 137/N] gh-105821: Use a raw f-string in test_httpservers.py - (#105822) - -Use a raw f-string in test_httpservers.py ---- - Lib/test/test_httpservers.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py -index cdd1bea..cfd8a10 100644 ---- a/Lib/test/test_httpservers.py -+++ b/Lib/test/test_httpservers.py -@@ -442,10 +442,10 @@ class SimpleHTTPServerTestCase(BaseTestCase): - def test_undecodable_parameter(self): - # sanity check using a valid parameter - response = self.request(self.base_url + '/?x=123').read() -- self.assertRegex(response, f'listing for {self.base_url}/\?x=123'.encode('latin1')) -+ self.assertRegex(response, rf'listing for {self.base_url}/\?x=123'.encode('latin1')) - # now the bogus encoding - response = self.request(self.base_url + '/?x=%bb').read() -- self.assertRegex(response, f'listing for {self.base_url}/\?x=\xef\xbf\xbd'.encode('latin1')) -+ self.assertRegex(response, rf'listing for {self.base_url}/\?x=\xef\xbf\xbd'.encode('latin1')) - - def test_get_dir_redirect_location_domain_injection_bug(self): - """Ensure //evil.co/..%2f../../X does not put //evil.co/ in Location. diff --git a/mingw-w64-python/0139-pathconfig-normpath-sys.path-0.patch b/mingw-w64-python/0138-pathconfig-normpath-sys.path-0.patch similarity index 86% rename from mingw-w64-python/0139-pathconfig-normpath-sys.path-0.patch rename to mingw-w64-python/0138-pathconfig-normpath-sys.path-0.patch index 75f788bdc5..ea73c27d9c 100644 --- a/mingw-w64-python/0139-pathconfig-normpath-sys.path-0.patch +++ b/mingw-w64-python/0138-pathconfig-normpath-sys.path-0.patch @@ -1,7 +1,7 @@ -From b74bf81eae4ce628bff9e927bc1b3091b91578ce Mon Sep 17 00:00:00 2001 +From 89ab215f8f547e32d3fbb4e0e0e29429557dccd2 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 28 Jul 2023 20:14:38 +0200 -Subject: [PATCH 139/N] pathconfig: normpath sys.path[0] +Subject: [PATCH 138/N] pathconfig: normpath sys.path[0] this gets added as first element in sys.path. use normpath to make sure it uses the right path separator diff --git a/mingw-w64-python/0140-smoketests-add-some-tests-for-sys-site-paths.patch b/mingw-w64-python/0139-smoketests-add-some-tests-for-sys-site-paths.patch similarity index 91% rename from mingw-w64-python/0140-smoketests-add-some-tests-for-sys-site-paths.patch rename to mingw-w64-python/0139-smoketests-add-some-tests-for-sys-site-paths.patch index 2d24b9db30..54338ecff3 100644 --- a/mingw-w64-python/0140-smoketests-add-some-tests-for-sys-site-paths.patch +++ b/mingw-w64-python/0139-smoketests-add-some-tests-for-sys-site-paths.patch @@ -1,7 +1,7 @@ -From 438f4208965f63e234d0df3c0975abcbbcdf77b7 Mon Sep 17 00:00:00 2001 +From 0c040ba999e03b032376cf029d36742a372449d9 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 28 Jul 2023 20:15:01 +0200 -Subject: [PATCH 140/N] smoketests: add some tests for sys/site paths +Subject: [PATCH 139/N] smoketests: add some tests for sys/site paths --- mingw_smoketests.py | 23 +++++++++++++++++++++++ diff --git a/mingw-w64-python/0141-Search-DLLs-only-on-paths-added-using-add_dll_direct.patch b/mingw-w64-python/0140-Search-DLLs-only-on-paths-added-using-add_dll_direct.patch similarity index 97% rename from mingw-w64-python/0141-Search-DLLs-only-on-paths-added-using-add_dll_direct.patch rename to mingw-w64-python/0140-Search-DLLs-only-on-paths-added-using-add_dll_direct.patch index 9c47be2168..7930f6c1ac 100644 --- a/mingw-w64-python/0141-Search-DLLs-only-on-paths-added-using-add_dll_direct.patch +++ b/mingw-w64-python/0140-Search-DLLs-only-on-paths-added-using-add_dll_direct.patch @@ -1,7 +1,7 @@ -From 789fa5b6eb6c39e5256cdf3a41ec9d35bc36d3c4 Mon Sep 17 00:00:00 2001 +From db68febd8f9763bdc76fcaa265c079a9b76ebd89 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Sat, 5 Aug 2023 14:10:27 +0530 -Subject: [PATCH 141/N] Search DLLs only on paths added using +Subject: [PATCH 140/N] Search DLLs only on paths added using `add_dll_directory()`. This is the default behavior on upstream Python. We previously diff --git a/mingw-w64-python/0142-Allow-picking-up-include-lib-dirs-from-CFLAGS-LDFLAG.patch b/mingw-w64-python/0141-Allow-picking-up-include-lib-dirs-from-CFLAGS-LDFLAG.patch similarity index 88% rename from mingw-w64-python/0142-Allow-picking-up-include-lib-dirs-from-CFLAGS-LDFLAG.patch rename to mingw-w64-python/0141-Allow-picking-up-include-lib-dirs-from-CFLAGS-LDFLAG.patch index 4272e15f68..30219b66bc 100644 --- a/mingw-w64-python/0142-Allow-picking-up-include-lib-dirs-from-CFLAGS-LDFLAG.patch +++ b/mingw-w64-python/0141-Allow-picking-up-include-lib-dirs-from-CFLAGS-LDFLAG.patch @@ -1,7 +1,7 @@ -From 3de0045ef94be3c1d3b6b45dba28c21ad2f28981 Mon Sep 17 00:00:00 2001 +From bb3a61c575046e4e87e53f91bd77d7d2bc0756c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Wed, 16 Aug 2023 11:35:08 +0300 -Subject: [PATCH 142/N] Allow picking up include/lib dirs from CFLAGS/LDFLAGS +Subject: [PATCH 141/N] Allow picking up include/lib dirs from CFLAGS/LDFLAGS for Windows targets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/mingw-w64-python/0143-Build-and-install-libpython3.dll.patch b/mingw-w64-python/0142-Build-and-install-libpython3.dll.patch similarity index 89% rename from mingw-w64-python/0143-Build-and-install-libpython3.dll.patch rename to mingw-w64-python/0142-Build-and-install-libpython3.dll.patch index f33f457bec..8650784e06 100644 --- a/mingw-w64-python/0143-Build-and-install-libpython3.dll.patch +++ b/mingw-w64-python/0142-Build-and-install-libpython3.dll.patch @@ -1,7 +1,7 @@ -From 25d97190a4d2c0361335f475448c38af5cf5b901 Mon Sep 17 00:00:00 2001 +From 4dfc984bc521b902e0519c890f63877053f4257b Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Mon, 21 Aug 2023 08:19:28 +0200 -Subject: [PATCH 143/N] Build and install libpython3.dll +Subject: [PATCH 142/N] Build and install libpython3.dll This provides the limited ABI as a separate DLL, forwarding to the real one. This makes linking with "-lpython3" work. @@ -13,7 +13,7 @@ Fixes #147 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index fd87c65..a2ccbf1 100644 +index 19fc62f..93728d6 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -278,6 +278,8 @@ LIBRARY_DEPS= @LIBRARY_DEPS@ @@ -25,7 +25,7 @@ index fd87c65..a2ccbf1 100644 LIBS= @LIBS@ -@@ -600,7 +602,7 @@ LIBEXPAT_HEADERS= \ +@@ -601,7 +603,7 @@ LIBEXPAT_HEADERS= \ # Default target all: @DEF_MAKE_ALL_RULE@ build_all: check-clean-src $(BUILDPYTHON) $(BUILDPYTHONW) $(BUILDVENVLAUNCHER) $(BUILDVENVWLAUNCHER) platform oldsharedmods sharedmods \ @@ -34,7 +34,7 @@ index fd87c65..a2ccbf1 100644 build_wasm: check-clean-src $(BUILDPYTHON) platform oldsharedmods python-config # Check that the source is clean when building out of source. -@@ -724,6 +726,9 @@ pythonw_exe.o: $(srcdir)/PC/pythonw_exe.rc +@@ -725,6 +727,9 @@ pythonw_exe.o: $(srcdir)/PC/pythonw_exe.rc python_nt.o: $(srcdir)/PC/python_nt.rc $(WINDRES) $(RCFLAGS) -DORIGINAL_FILENAME=\\\"$(DLLLIBRARY)\\\" -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/python_nt.rc $@ @@ -44,7 +44,7 @@ index fd87c65..a2ccbf1 100644 venvlauncher.o: $(srcdir)/PC/pylauncher.rc $(WINDRES) $(RCFLAGS) -DPY_ICON -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/pylauncher.rc $@ -@@ -852,6 +857,10 @@ $(DLLLIBRARY) libpython$(LDVERSION).dll.a: $(LIBRARY_OBJS) python_nt.o +@@ -853,6 +858,10 @@ $(DLLLIBRARY) libpython$(LDVERSION).dll.a: $(LIBRARY_OBJS) python_nt.o else true; \ fi @@ -55,7 +55,7 @@ index fd87c65..a2ccbf1 100644 # wasm32-emscripten browser build # wasm assets directory is relative to current build dir, e.g. "./usr/local". # --preload-file turns a relative asset path into an absolute path. -@@ -1862,6 +1871,7 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@ +@@ -1864,6 +1873,7 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@ if test -f $(LDLIBRARY) && test "$(PYTHONFRAMEWORKDIR)" = "no-framework" ; then \ if test -n "$(DLLLIBRARY)" ; then \ $(INSTALL_SHARED) $(DLLLIBRARY) $(DESTDIR)$(BINDIR); \ @@ -63,7 +63,7 @@ index fd87c65..a2ccbf1 100644 else \ $(INSTALL_SHARED) $(LDLIBRARY) $(DESTDIR)$(LIBDIR)/$(INSTSONAME); \ if test $(LDLIBRARY) != $(INSTSONAME); then \ -@@ -2280,6 +2290,7 @@ libainstall: all python-config +@@ -2285,6 +2295,7 @@ libainstall: all python-config if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \ if test "$(SHLIB_SUFFIX)" = .dll -o "$(SHLIB_SUFFIX)" = .pyd; then \ $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBDIR) ; \ @@ -71,7 +71,7 @@ index fd87c65..a2ccbf1 100644 else \ $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ fi; \ -@@ -2526,7 +2537,7 @@ clean: clean-retain-profile +@@ -2532,7 +2543,7 @@ clean: clean-retain-profile fi clobber: clean diff --git a/mingw-w64-python/0144-setup.py-don-t-prepend-the-system-library-directorie.patch b/mingw-w64-python/0143-setup.py-don-t-prepend-the-system-library-directorie.patch similarity index 92% rename from mingw-w64-python/0144-setup.py-don-t-prepend-the-system-library-directorie.patch rename to mingw-w64-python/0143-setup.py-don-t-prepend-the-system-library-directorie.patch index a2ddfdd1e5..893624a5c6 100644 --- a/mingw-w64-python/0144-setup.py-don-t-prepend-the-system-library-directorie.patch +++ b/mingw-w64-python/0143-setup.py-don-t-prepend-the-system-library-directorie.patch @@ -1,7 +1,7 @@ -From d3c3408c198c294bbec0bcad17ecab6e0d13775d Mon Sep 17 00:00:00 2001 +From f098e75bc49e25fe3d6f5f99b1614074fafba3a5 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 25 Aug 2023 21:36:58 +0200 -Subject: [PATCH 144/N] setup.py: don't prepend the system library +Subject: [PATCH 143/N] setup.py: don't prepend the system library directories when building extensions For some reason the code assumes that relative paths are build paths prepends diff --git a/mingw-w64-python/0146-Port-GetPythonImport-to-mingw.patch b/mingw-w64-python/0144-Port-GetPythonImport-to-mingw.patch similarity index 95% rename from mingw-w64-python/0146-Port-GetPythonImport-to-mingw.patch rename to mingw-w64-python/0144-Port-GetPythonImport-to-mingw.patch index 5281b11326..8aff9b9199 100644 --- a/mingw-w64-python/0146-Port-GetPythonImport-to-mingw.patch +++ b/mingw-w64-python/0144-Port-GetPythonImport-to-mingw.patch @@ -1,7 +1,7 @@ -From a6cef77b4664e68982438130164b4cf120eca13f Mon Sep 17 00:00:00 2001 +From b6f0e86e690ffa95d1ce89231e406f2a9e22e1d4 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 27 Aug 2023 15:00:32 +0200 -Subject: [PATCH 146/N] Port GetPythonImport() to mingw +Subject: [PATCH 144/N] Port GetPythonImport() to mingw This looks for DLL names in the import table but while with MSVC the DLL is named python311.dll in our case it is named libpython3.11.dll. diff --git a/mingw-w64-python/0147-LoadLibraryExW-make-sure-to-only-use-backslashes-for.patch b/mingw-w64-python/0145-LoadLibraryExW-make-sure-to-only-use-backslashes-for.patch similarity index 93% rename from mingw-w64-python/0147-LoadLibraryExW-make-sure-to-only-use-backslashes-for.patch rename to mingw-w64-python/0145-LoadLibraryExW-make-sure-to-only-use-backslashes-for.patch index 37c2a82645..535cf888d4 100644 --- a/mingw-w64-python/0147-LoadLibraryExW-make-sure-to-only-use-backslashes-for.patch +++ b/mingw-w64-python/0145-LoadLibraryExW-make-sure-to-only-use-backslashes-for.patch @@ -1,7 +1,7 @@ -From 7a3aacf3cba0c35f8621a78fc2d239fe2c878c63 Mon Sep 17 00:00:00 2001 +From f156fa541c67cf7717e357f69acdf477f924fbbc Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 27 Aug 2023 16:04:50 +0200 -Subject: [PATCH 147/N] LoadLibraryExW: make sure to only use backslashes for +Subject: [PATCH 145/N] LoadLibraryExW: make sure to only use backslashes for paths It seems like in case the path passed to it is absolute, but contains diff --git a/mingw-w64-python/0145-tests-skip-a-broken-test.patch b/mingw-w64-python/0145-tests-skip-a-broken-test.patch deleted file mode 100644 index ddb2aaa2c0..0000000000 --- a/mingw-w64-python/0145-tests-skip-a-broken-test.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8e7cde8af909f191ba9433e6d2e931534b9ef673 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Sat, 26 Aug 2023 00:02:19 +0200 -Subject: [PATCH 145/N] tests: skip a broken test - -See https://github.com/python/cpython/issues/107219 -Once that is fixed this commit can be removed. -This is a commit and not just an addition to the skip list, since -we still run the skipped tests in CI and in this case everything would hang. ---- - Lib/test/test_concurrent_futures.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py -index 4558560..11d5001 100644 ---- a/Lib/test/test_concurrent_futures.py -+++ b/Lib/test/test_concurrent_futures.py -@@ -1372,6 +1372,8 @@ class ExecutorDeadlockTest: - executor_manager.join() - - def test_crash_big_data(self): -+ # https://github.com/python/cpython/issues/107219 -+ return - # Test that there is a clean exception instad of a deadlock when a - # child process crashes while some data is being written into the - # queue. diff --git a/mingw-w64-python/0148-Use-shared-instead-of-mdll.patch b/mingw-w64-python/0146-Use-shared-instead-of-mdll.patch similarity index 92% rename from mingw-w64-python/0148-Use-shared-instead-of-mdll.patch rename to mingw-w64-python/0146-Use-shared-instead-of-mdll.patch index ef4038d88f..179a5874e4 100644 --- a/mingw-w64-python/0148-Use-shared-instead-of-mdll.patch +++ b/mingw-w64-python/0146-Use-shared-instead-of-mdll.patch @@ -1,8 +1,8 @@ -From 3680d09207f1df34346552cd63c906210c15b943 Mon Sep 17 00:00:00 2001 +From f8ce319d46c25b8afe6083284315169d8f418880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Wed, 27 Sep 2023 21:45:13 +0100 -Subject: [PATCH 148/N] Use `-shared` instead of `-mdll` +Subject: [PATCH 146/N] Use `-shared` instead of `-mdll` --- Lib/distutils/cygwinccompiler.py | 4 ++-- diff --git a/mingw-w64-python/PKGBUILD b/mingw-w64-python/PKGBUILD index 86b217178a..beb39cdfec 100644 --- a/mingw-w64-python/PKGBUILD +++ b/mingw-w64-python/PKGBUILD @@ -21,8 +21,8 @@ else pkgbase="mingw-w64-${_realname}${_pybasever}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}${_pybasever}") fi -pkgver=${_pybasever}.5 -pkgrel=5 +pkgver=${_pybasever}.6 +pkgrel=1 pkgdesc="A high-level scripting language (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -184,18 +184,16 @@ source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz 0134-Always-convert-to-before-passing-though-pathcch-func.patch 0135-Build-venvlauncher.exe-from-PC-launcher.c.patch 0136-getpath.py-fix-dirname.patch - 0137-gh-105821-Use-a-raw-f-string-in-test_httpservers.py-.patch - 0138-getpath-use-normpath-on-all-generated-paths.patch - 0139-pathconfig-normpath-sys.path-0.patch - 0140-smoketests-add-some-tests-for-sys-site-paths.patch - 0141-Search-DLLs-only-on-paths-added-using-add_dll_direct.patch - 0142-Allow-picking-up-include-lib-dirs-from-CFLAGS-LDFLAG.patch - 0143-Build-and-install-libpython3.dll.patch - 0144-setup.py-don-t-prepend-the-system-library-directorie.patch - 0145-tests-skip-a-broken-test.patch - 0146-Port-GetPythonImport-to-mingw.patch - 0147-LoadLibraryExW-make-sure-to-only-use-backslashes-for.patch - 0148-Use-shared-instead-of-mdll.patch) + 0137-getpath-use-normpath-on-all-generated-paths.patch + 0138-pathconfig-normpath-sys.path-0.patch + 0139-smoketests-add-some-tests-for-sys-site-paths.patch + 0140-Search-DLLs-only-on-paths-added-using-add_dll_direct.patch + 0141-Allow-picking-up-include-lib-dirs-from-CFLAGS-LDFLAG.patch + 0142-Build-and-install-libpython3.dll.patch + 0143-setup.py-don-t-prepend-the-system-library-directorie.patch + 0144-Port-GetPythonImport-to-mingw.patch + 0145-LoadLibraryExW-make-sure-to-only-use-backslashes-for.patch + 0146-Use-shared-instead-of-mdll.patch) # Helper macros to help make tasks easier # apply_patch_with_msg() { @@ -345,18 +343,16 @@ prepare() { 0134-Always-convert-to-before-passing-though-pathcch-func.patch \ 0135-Build-venvlauncher.exe-from-PC-launcher.c.patch \ 0136-getpath.py-fix-dirname.patch \ - 0137-gh-105821-Use-a-raw-f-string-in-test_httpservers.py-.patch \ - 0138-getpath-use-normpath-on-all-generated-paths.patch \ - 0139-pathconfig-normpath-sys.path-0.patch \ - 0140-smoketests-add-some-tests-for-sys-site-paths.patch \ - 0141-Search-DLLs-only-on-paths-added-using-add_dll_direct.patch \ - 0142-Allow-picking-up-include-lib-dirs-from-CFLAGS-LDFLAG.patch \ - 0143-Build-and-install-libpython3.dll.patch \ - 0144-setup.py-don-t-prepend-the-system-library-directorie.patch \ - 0145-tests-skip-a-broken-test.patch \ - 0146-Port-GetPythonImport-to-mingw.patch \ - 0147-LoadLibraryExW-make-sure-to-only-use-backslashes-for.patch \ - 0148-Use-shared-instead-of-mdll.patch + 0137-getpath-use-normpath-on-all-generated-paths.patch \ + 0138-pathconfig-normpath-sys.path-0.patch \ + 0139-smoketests-add-some-tests-for-sys-site-paths.patch \ + 0140-Search-DLLs-only-on-paths-added-using-add_dll_direct.patch \ + 0141-Allow-picking-up-include-lib-dirs-from-CFLAGS-LDFLAG.patch \ + 0142-Build-and-install-libpython3.dll.patch \ + 0143-setup.py-don-t-prepend-the-system-library-directorie.patch \ + 0144-Port-GetPythonImport-to-mingw.patch \ + 0145-LoadLibraryExW-make-sure-to-only-use-backslashes-for.patch \ + 0146-Use-shared-instead-of-mdll.patch autoreconf -vfi } @@ -457,152 +453,150 @@ package() { fi } -sha256sums=('85cd12e9cf1d6d5a45f17f7afe1cebe7ee628d3282281c492e86adf636defa3f' - '4a40ee813a68cbc083b3d7ef2ae624ef6fc8ca145f6d3af13f3b1c5097351fb0' - 'd6e3d59b1a2495e072cbeb5a69154f5fa2d0a66f6eeb3732c984fed7de6c3b08' - '189abee18210b9d1ba70dd8e9b41ba59f2e4917bdc29f20ae5422ca704a9b44c' - '603a8797390ab6b4ba9d98d6b515540917a6f91cd7295fc72d641929ff1bdbf4' - '5c2e0b6b7ac0252b8032483f8018e60d5c6ed658ee8f69cd88916f640d148679' - 'ca7c6d8a031b2432e36e7c9ae2918d010dfdfccf25cd110a033ecccb153a955f' - '89feaf0e1b30140b7e5d33a76130b16f0360aef082d0099ce85186c0d2b67d8a' - 'b49e84722a97e562c8c2f8f21d1a0271b3ef69c045e20461aa1a6d6f29b2c502' - '15d3a38b4a68d863dcc737bd84efba8a9e3d28b3b9907204a34f10c811406975' - '86ee3ace5dc6745e9fc442befa12c01e43889994428d9b49057f358854211d3a' - '5650d6486aad145b900eff5d9dea27cf3e504e401fc5de886b289e3ab8aac26c' - '9868715ed72a2dcbaabd0134f0913457498441b534bb3345c548e851e779b988' - '7a1450ffb009761807628034920d5fd7018e14ba7d3a233ce604abee641e8cd1' - 'f28e35f4ab431a1c979d8c079df6e36592faa9d4549b7e0484a5b17eac88a394' - 'da963f32be94dc944e564bc9252d407757a94c5e423bfbd9d172f8a8dff4b69b' - '368e1a7a908b33a0fbde628fdd771521562603bbbc5d5f3e57fe560be08fe60a' - 'b029c2a55106000b0b172fcafaa570d8357efdbd917e094c636a566e5d97196f' - '2fb5469c90bd79c9e2f48782c54bee4010806d282185fe6f7fee092262ace673' - 'de033dc4a7754f4986bc67f898f4a925fbbc9f612a751cfaf285103210982ee8' - 'e5c41b05487be5cb88c09b80262fb381f9ea16d85129cfd71a590a25e704dc11' - '6c33b5943451122c73d629366e06c433ff4c2e4cdf10d20287c1db4494e97150' - '68fd29d3dd13df204504a697c65c9a81c8e3c36b4a5b956d422bde5e227f318a' - 'a967b1740ef0c4ccaa20ca6262c32d51902e0d100f55db069a0a5b39a9d17fb5' - 'db83b571d3d001309d4eb02866670109849dcd97d23d9c0b4aee3c312fd51ca9' - 'cf6c802c6155882d6edcaf343863addc91d949fcbeef1c005fd208261893ad36' - '88eceea271e0001e08340b5995dc5d51afb6efec93bdf6b5819ec518db9e88a5' - '28247e6afe28c170156c984d2439af1b3f5e72063a12b8132153806c7fb47100' - '21a96a04662684cdfab9804ad22064ae36b1f253e5241f74fd47e5d85d9cec85' - 'eabfe06001166205002019d2f5e83f025a4f2e12e49e1f2a9e879770364b9c0d' - '76ac0d7c5aca10075cc31a0c8f73f179278929b19a5efd4770b9f80b1923028a' - '68dd311a5ecb8b500448100239fb0e5dd6e76821654746da1093737544e4c726' - '7c75f0e7764292c718723e2307d2694545c9b373340e440adfd90083ea4b5d7f' - '49a8732840ee64b8f40cec26e0dd1e68834f66d937d85639f364e9a2f33d0335' - 'd5f7d9517a744985ea8ba3eae3b452562b3959858b5b8d0b928f3a7248c0846b' - 'c661968d33ba7be4d8ff5f427f3beb82d17fe34d7a7802b2bd1f75c99d89b2c8' - 'fc6f67d274cc025798d5754508b660d3af1dd1cf3af09fceb2f9efbca9f3e221' - 'ba0e10738f6e1f54b4e3f99732babb3925c7f319bc35f02ffb994df85823ea31' - 'aa073aed227b8e9fba185cca960a04718d3448e28c9a0faf09c7108d43b5be5a' - '550162769891fb49477206a0bc72c4dcf7d25b5b8fc36acdbbe967c74a0e00fa' - '39853b8c494ee9bede61ca2451c648fbf63992cf2540fd52a0ad707fb543a173' - 'cdde314bb0cd8dbef4b40b3a06ddce9ce89ed4c595bb692e36882c192d312dcc' - 'd01c26fbb4984cf1280b725375e7049d9d187c2db7df11b03354f653f4c4aa39' - '9ed2f75ad681a544fc80735cb6c0780fb1de523142c8bb108d667eaa8540601d' - '69f26e950c99456b0513d2780d03f6bbf7b91661e8499a8bdcb6aad978446471' - 'e064ef166a6a60bb40ccafc505062c2f88dc6b2308eb275f94cbf9e9e951b987' - '4685434738a67e4e1ea33766fa77ff49b2c50e6f9394c3f000c4d0777671866c' - '0dd14211734558980af978ada8c95de99c8c0d2ea04c0737f4b78d4943c3c01e' - '02bd01e5b0ce645e163f3301f1a2adbb37c0fd33be9820703a0934e6a5ba2118' - '49d35afeb89d3aa2dd1746f0f53e1018074a54f44dac28b8842b745b5ec42efe' - 'ba638f9d7578aa6078794c8cafb5fc612060df4ce9955ade8d574f721308a6ed' - 'f42b83ac99b01ff0d033f29be5616396a2269370d2d2020fd009ac8355aa51f7' - '84aabf117371e0774112d0c026fc414fcb7e69294802f90881e46866ebb1785c' - 'f4cf441878e1a477b353f54dc4bacfa14de4de1057abb6601243813ad0e49c1a' - '871bd009436eb0786dbf3017e540e59f12f1560076aac8248c30224b01938243' - '3efc10df4ef60dca9a8cc2d55f50d9b66abfa123fdbfa739accb527cb4ddf351' - '8ef25666be6cfd39cac861e14b62f702f8f5c5a0162ebf271cdb2718db0a3660' - 'e466fffcd146695236e23b506dce1bd0591db32d75b030a334304e6c29258006' - 'f4fc7dcf6cfd8fb33d919a28cf4034e5ada7b8ee3a6b228d7824ffef83451eb9' - 'b03937aaf49c773722ad9e9f038096c9d6460dee86aa53c9a8217d67d88034a0' - '208bb1fdc437904708ea070e332d0b24e62522454e2dac031c2783596951d8a2' - '698b0ecd96e0e385fa96c15a6306b5fe5e2b2c0f413f9c18061e045a17cf9ab4' - '7d26fe41c4e42cf923cf1065d2503ed2ba4b931ce1d50498477a80362ffc2d83' - '85eb804fefc3bfa24e019b80a2fd414b69dacdd275daa9d3c6d0654639f14604' - '47836511e94abdecfa471dc8d0af72537c3ced4dafae579c133387bc30e0cd0c' - 'fc05e6d57d5cac737176ca2a27886a76b2611ce97397ac43b5b4e2fe81ef22a3' - '178216f3251dde9da502992802ec82d597cd80cc2923fbdacc036fee95a15742' - '45f80bfcaab349d2220e0818fb6ea623270a823723b47e3994c2933c95145f62' - '2658af3e5df724613497832ac25ef29e41097ad98029c91468bfa0c3b4c39ce2' - '858941b799ba5b131271157ff0c2b2749d7a4df779515cffad1427c8dc036507' - 'af36bb2eec0aaebd7fc70fe107f68e84a0f9ee27c0057b6677b7922b193e1f23' - '82250b5d6589ebf8191f7455701101e93fe71acf6efd5b16be8058232806ff6a' - '098f707e28242a7864edf945a4782de2815de3392e1a0f9142f7dad78c769408' - 'dfbabca1ef4f5a85dce8c47adff05001920f6d4a6b3278a11c054b733e79b6bf' - '6c16857071899137365c97a6024a75a8026b0b7b106a3956184df0425e909eef' - '13b9bec4e6d5e7ddda6c836b90b1610954235d2e54cbf522f47dfb4ad6e47ac9' - 'fda0644a93a84e62ccfb7dcbaa27c41d0082f25ce73257608aff56c0d89d35a9' - 'd65ddc677e959aa3d4c055f5b414a8a0e327dcf349eebb7bc58f8f2e7b13b505' - 'f570cee22eb8425cc9a235d2bf9644d42bb4dd9dbbc98f085a07b3ee3dd6db23' - '6a5bd7efd952b4bc81ec54532f9718ba91647724d90c1edaa479f27af443dc98' - '4f803a2d1b54e20137c47c98452f560f1cd04b876148a8b3f6af25b29c25ad0c' - '73f22b079e557a3c31d16360a21ab4aa8905539a3f08547ea0fb4478eee7b60e' - 'd841eb9520a0b7ebacfb5373f9de11daa2c6733b6272824901ebc272ebea49f6' - 'bbc1313298a3f6a1d7b92abafd650f083b990b3125fe79286644e1d62206552e' - '9f666167a7f695a57b17c7baac884dbe5a497c126cdb08b2c6185e4734180daf' - '0407b9ba5275686b0b257f66049cd83b930d04a969b495c2f767a7582cde82ff' - 'fc8ddd4d6b695e755b3d0cd5f2dc2f552053ec5e7597235b8e16fb0af461eb4c' - 'ed2a2106cb56f6bc311b5b951aa84f9de84d777a5bda27cfc0621a43080b6678' - '67ec7e8f26313e292adafddc250155bfef3c443ab1adfd56e04b6ab4a46bcb87' - '64927764c276028abe53465523cbd5a42432a579988a40a22cb42d242e23eb3c' - 'f73c60babe3b4f1be38198d7a510369e772e9a4a6a01ddc814ea047be5ad32c5' - '69322fffcdd27d253537f34f2cbfcf04c9673c11f652332ac2c32a07c540fb7f' - 'b45aad644db1de0fb5234583a6ad16da2589b566804fc3a6296b878aa6e11ec7' - '54c0a68855730137660cd9076caa8afd1d2acba5a846d5e745201d5ccc35bf84' - '787e33290877c2373ae9e999c3ae8973e40d36877be316bbaec6a581920f56f8' - '4a8c52191fcd8f39e4e2f29ddad638d3980855a091ed2e379403a78e0e392933' - '4424a57742ebedbe83dc3937d53a90bbb6b5318c69068721a1837d5aa26ca889' - '368e3e8740bc58c037671e16deb4a1fc98d517d2745a2a3d2183b98a5153f7fe' - 'ff27d4efec23581efcb89c21b1f48ef51ae34c6dc49b41bd1144cdba7e44640f' - '02e11bfc6151dd42525e809c6ee4987a5286e37f258b4c5183193c21e9edd93c' - 'c6694eee6e9ff0c97c61f656a9a486faaa3a10504210d081c6e7782a8edb7697' - '67d34fb28f454ccd6781ca4903797490435736379f80560a171d425a9476b8eb' - '3d47a8b93c508b65988871daa82d1220ed14efed96de7f63cba20d14b87d7380' - '2d52bf5fea5fa7a17171c99a6acc626c23c548e57c5a5b98cbfef886c825eb2f' - 'e32d0ec699919d5656a43b8910e216617528515b3b308eab1b8155700f6d60fa' - 'dda17e7579a09192af21873099f71354d45268d8148321cd5ecd5aa99a382ab2' - '8d57e6aa948b9a3e2e5ae9465afa65a7adf9ae02973232befdc3d16225209288' - '713514562f236a92048084a2c2dcde780400b818eda1055a429376f8e98757d8' - 'de3fb092a3da6de2e279a829df9bdbd738a31eb7d75cc79c49f9fe0bdd81d28e' - '7dc348b75411d28f34b9c14ed5dbf32e5b74131c6fe0f01cae77c86644522e36' - '0e19f579a20dd234e1dc30485a7d4669836d1d1f069d13b8922189489c61cb27' - '416cd4104f9e3baa798a876a082a4c9d33d73d57cdbbeb200b0dfbda73f0323e' - '4dcadf30fcd42a13091c87fc5a5fbb524bab64210bfeb17147133b56f14f51be' - 'e09f7847210d44a8384e59ef7c975f36e1ca444800c6d4c3cd981b861076fb2b' - '64d1ff92a3ffd1bc7c70a66d5d99bbadedb2a076a0868802e2c4ed051234f774' - 'ba9f982462915964d2cd06bea3719efd3836587401f38b4264793e1d30ddab32' - 'e60648d47facb965e42c7746792378b1278b029fec2afeb222323282a57211ea' - 'ad7c6a67729fe885bb441f268f483bd7b9aceb1a8cd49284632473d959256a31' - 'ca69cc66e7452eaa2b46f888c02538dafaf6ab3ec143de5f3e56aafb4c627439' - '922faf6679d30c6fc3a123bb78ee6959ac1fa7acd07037710d5104982625a275' - '4d0103c4e704867e424639e338f3d938572d831b8b8b94bdb21e1ed75071e5ef' - '3b24f0b1f729f35d1f762eaa40f40ba985124350982d1ed1661be9a5fb5166e1' - '5721182ca05bfb82f0bdfd8470a76c3000b2783cae7c0de8c2cbe09d79284821' - 'b7cf1c0648716685ac3a38c0e15be4d1682c9ed39742098dcb529aff3bd3cb44' - 'b693ba21f1c30ae4fa94f1bc274984455f8e968b5b1ce813bc915e11e8c14a41' - '106243f6174941d8bf7250ae594d52aeefacd357599d923a7293bdc954cc1371' - '5bc983ff39a5062d381b08bcb8619798a71cb3afd221de0fe830726ddb3d0928' - '8e2ccd543862f7a2de0ed55ed7931502c738e8ca4c62a50b0d029f4ad04c6f48' - 'f8060a09ee3e17b6b25a382f1f709053d4531a4875bad859a3e90d83be066bbc' - '4db785442c6139721475affcbb49ca5fcd219103131392d38da9caa830d96a9c' - 'f19524c8026c736a1d159fcd14894b002a5ae1286eaae38801104df705de2582' - '39b9a61d5442d275e1f6c3fdf2ebffc82a6207302c54b8b67a4c3f339dbae45d' - 'c2949d1c24dd9df84f99eaf195e2f1b30921b2d89b1c7a18831d444916b8156c' - '5aae8b41a0e35960fe8c2a289347c56871e44e58e9e49858039c9c68578a1111' - '2b0b37d65dde2dcf79af101fa0e4b1e685b6c428c2f0bff5729edb9402bf3eb3' - '2945a9a65d84bc64cb93b51395e15b50dae9cc7d1332b17c31967997d56ecb5e' - 'a769b00821d82fd9fdff8d148db4129d010652fe9f58bfd0b906d7cb9f0c271d' - 'd7f7afbe5476348d286fbd4e2614f4bb8285282eab48ed9650936ca9d51cc6f2' - 'ce383107b26ddf5a94c688615032bbf9521422e71586c6c04c0c53fc66d30ce5' - '5d95995d79f4329b1a16e635bb9ff2a2a2c8cae636cc07369e3b7dd2bbbd9896' - '6c41a77a2399ca13ab512d7a62e43459807d9ba91627fad70eb3827823490581' - '71ea2425b9ba0b29a8ca7cc12a26787ce4775a3effaa49070da103892274cf5f' - '69cf576d5083088b1239b3bcbe30d18e6cb85e1dab8738f8b04007ef35fd40bd' - '8df3f5bee7856ee12ea705d6d31358f5ee5ff2c8eb99ab1aad9101afe92893b9' - '6e0d29ee44c5d5ab8605a980c7cee246acf5ccce638e6a7cee4c4e7a8ec865cd' - '3b6bf12600203d45ff9b0ecde0bb9959c4fde923c9609e4c1e18b6d7877e3f1b' - 'd9a54181024f0b538d8903bdf772a0dd754811aab339e6f553c47e1198ab04cc' - '71fd408d8bb8ca40584f287adea583032d1b7150f011abe2165c44d468428f0f' - 'bccfac6f05b4faa023bb41fd08f0979f77d5656dadfe90ef44418189f79e9f56') +sha256sums=('0fab78fa7f133f4f38210c6260d90d7c0d5c7198446419ce057ec7ac2e6f5f38' + 'e8bc6992aab35878f1b797527801516cf20fde18907ab5f0f6035e9e2d98aa56' + '7b2974bc0267869a74c9d90aa9b17d70053c50d7ada1ed74d88764773c49581b' + '3ec9d31277c4c106b59d8f7f4d7e31df7b88732f22aff4cc2db139ee3dbd1518' + '749e625b35d0fde9a2a57254ee4234d1e32429c58f98398318eb0ecb9bd4e27f' + 'a15912e751dd102ea7449a78d194886f55539f4556bb902221ae9e5fcd123200' + '7626edeadaf44f1af787cd5e476b0dcfcca0ef370c5590bc6798aaa46e5534b1' + '2f9739488e8421ad03c286a579339c7cc252902753c8fddef4894ffbd26d4e88' + '5a344d6af569ce480dcfd26e29a3abf731c8daa135fb6224aa8c1b556c2ca666' + '20e5079cc15042ceb675661bbaa88fa2af199ba3a8e6d806cb43d619729209a8' + 'e3d1e970c00e278fedc430e34452d35607a449a14cba6f5c507d14c2eb7e251c' + 'f7cf45c9aaea47843f52e9dea79570d7a401917d75ba0f6ed9b3bcbab670c19d' + '3f5fe5c86aafe08fbacba7820ab24657c3e399f272a3835fb4199ecceae40b33' + 'a8d2670e592b36456b74b414f5cd96e744108739f12bda315dedea947ecd686e' + '07fee799357bc17f91a977109bdf071077c8624d2c97a5378b664ef28d409925' + '0fc92b3415260e7975ce92fdfdca89af57fda5823dc7a3bc8082c4abf8dba23a' + '24e78dea4eaa0a10437ce0aa8b16f99eb9fced16c5402f2f1fac189898c571ae' + 'ff107971b80158cb48908a6f737f5847be402e7b8cf53768e7d117aa71fcca2e' + '1cbfa8c9e413b3190ec7f094dd3b95bbd9a8cddc9eb2a280d2a4b344e5c4448b' + '022901885c408fbe7c7ddc2449245134d9dd336dbfe1146e6bb51d5ccefcb894' + 'be715419a2e606dac6b09d5a268d10dc650ec8239373819d0884ced6f0ce731a' + '28b61b54de5bd733ba36f2080b348780d579c9f0ab194084d1fc8370f17bc49c' + '10b08f0ca3766aaabbfc2f41b3250ed31d8f06b8a6e477bab66efa2764b2a3cc' + '6a6a35c141610e90d3b19f37e9532ef438bf8e62a51d2bed51c08e65de140e19' + '90d4787e9e955377b4865dfcc32f743a95aabca5d1572091784c7a84286f9d58' + '71c198140ff229103181a9a55dc4ee7250235824d49d46647a572d2f9c7e10e5' + 'd37dc5516bf40c8fbba33a9732a260ceacfaa2fd7aa8734f8f1a1980e70c1917' + '656ecf804abc172bc95b9505a9842ba7d4188d83fcee909a910750a6ea70ad5f' + 'a83fc1669276b90b1f40673076a04fef1476d05d5b690bcc1d37c2ddc7bb0df8' + 'ed0cc5f3f20893b31ed5f3a584dbedad7625a4ee14d76398c165a7811eee82d8' + 'f54db4337e12d6034fa2901bcdd0a56ff8c2cc8ad16c91f3990fd5007c884be1' + '89321d7c5bb6f2dae174454f3ae547767887acb29c912fb6ec75bc7a5c1eb8f5' + 'ebc7f46403d5fbd809fadb00b0773dfa86b455040f6e942eb6c870b3c3542a54' + '5c6bd289c9b9b4696f5f4ec2d6f6f959a85c97ac909bb468afe85a3cb8af57b9' + '2d11a20e5484ec3f8704a3c3752d0389a46b655089263e6d1cbe5fa633d595f6' + '22d9247ad06941e9c29ba54e65dcf7c269d86e4b41d5366b133a696d99dd9d32' + '9ef4a44c8833ec4c227e2d5111983eafccdfb0ed4507e6f56d08fee0b2e3cf1b' + '82a4147a3b2bc533dcc21b4ea9d3cb663896dcc5b5621d1824a4880d53c0b822' + '43a2ae7ae7a6b3998c03426dcc29ea534669c5147e57e803be066aba2a6d92b4' + '9854816e49b41e0c002fd6e8b27245ed831bbdccf52483aace2686c305450deb' + '7d7c188465990df00fa46d5d6dc2571524537f17429374fa332ce73885a7a059' + 'c0594353fa71213ae8e1c08b0bdbb1c4c192ab9a9136af73fcef7df53012269d' + 'c5920b2e25216a94a0e5aed6852df27ef279fc57cb8731af860154c2e1d384f9' + '15744a4c4ebeb16e707630a88bac29cb18e73be026842ae9da6b110e06b75cdb' + '662c196bceb17ba43c7ee4dafd22550b68d15d9c6956fa86529220aa0ca9204b' + '6741f45eafb7ed312e7314c327962cdc9b473e9a21b9825d84eb2382220940fd' + '4b3d023f7385011eebb85f0ca10e151a8c1dcd0372e23e9768bc05c501f764b9' + '17f48b69aadc148ebe412453952ebc43eef4f21dfcbd634423efaa6d686edfc2' + 'd7b9a9897baedff1277d7abdf7b50982b98bf552d512372813f299a26e166c73' + '6f656ea592fbc2ef44202e1adec14b45d786bd9a9d75ad569f56e9c8598a6799' + 'f4b503d18f5d41f0f1e493f815cac35cb9ca3806ce850360486937a3b129300c' + '56c3f770b4d4970ae2bb26bf2a821b94114ea2a479cd450e233fc053588e2fcf' + '773690f96a029ccbfcdad83309aacb868cd4c1b05aa91020429b9e90a2fb1ec1' + 'e0243be5a7af2af69d76defe25373ed34ceb20890bcca0ac5e523103780a3202' + '533b299bc186a6b67f2010067c2c3ab1e9936514687e0f09e98407de94f491af' + 'da918b90878486e7532f18397224166a7472f17208af324eb5da1691e1d6fe80' + 'b6154b3d6dcf3d020c8d37041dd7f7b3d047998855b2f0bcd0a5efb896e5cf40' + '9ad8fb3141c09415b3b8a73959d3cf3217b38dbe3042cc0a88fbacad98fa4a21' + '7475984f438512ef343d030bd5596e0cbcd126f31732a33ee66151d2cfa5713a' + 'fca6186cdb75e7b2bd3147b48f4e98a4f2a3ff84afbeb027012bfbfba4bb75e5' + 'efe81b53c9e94ad85dba3f031057152f6b66eff225583721bb1eb08bf30dcb54' + '0f9f090c7eb6f52a038f66e46b7dd5714fc7bedd3a9a666cb31fa78f2529a3ec' + 'b3d066fed180d55b776977c017c602d13d38faa5eb0c23e278c14cd73f7275af' + '1aaab982b6c81663e2523abbbbecf74ed52d0251ad83ca51aeac367760726c04' + '5c3032b8cb8262e6c72fe9f0d4294b0d3c7cc9d831b995817f20e3bbba56faeb' + '2af41b02725996b85673b8b8d173bd210d901500743ca36a7a6249059c88bd9d' + 'd05965fd9f49b79d96662b720b0eb2674662d959702fe54fb15036996f5a120e' + '9dc3bd39d095b0fded17a3f6b1bb9c87848147602b8c825684332c8d9cc785d2' + '587ac14d5c20ad884ed6de2902a22e72d318a4a880893d3d24c2703e4d19b55a' + '64a337bda4069c4bd506b2977b84bfcf545e75fec9ba064046a3984d027b67fa' + 'f80ccc030df322768d3d02bac5a55c7527348b4d6f7f7e3ffe1f64cc9c151781' + 'd7f23966dda784b184ed6fe19697d4bcde3c38e5fa9ffd4131dcd6fd22cbde6b' + '93e3daea18b692f834f5a37153f2215fbbb10f424ae492f0ba716efa042fdbe5' + '6d76ca8563ff90b1a6e76eda5159da60030816d204be30964006e9fcadcff59d' + '70cd9adc0780d6f0b0d4dd36ebe5047a67ebaede0609febd6e893db3403b90cb' + '476ed4b9a2cb67aaa2b2f85151d9e4ff98051a61523039991d4241a9d941a6a0' + '6420101763602086b6705fef4984b02479a2be5b08124db895ca6ec649cceb54' + 'de39801e88923eeeec93c18d9b82859c0b17606b2f4a94bb5be08fad98e817ea' + '7867142eb067c54780eec234355b0468ee5ce09e97749165eaf362c27593ee29' + '535836211634fbce2d9386ed813dfcdb31807a264205049bbfb6d1669b012690' + '6271c5187661451ab4eb0af4b73f0f999c11dd11c444f3363ccf3327af671181' + '76cb0fd327806d2b8aaa28dd73e24948686ecf54f235eaae9829d6bf1582604f' + '21f050fa6330d58d5f8aa568f54fba73d3aa9caa5d1ea843b6de4d258078e2c2' + 'd6f60a4414a32b933adc47008030eed4dbb9e41192306da4f83c432e2ae23cab' + '222c8da2b83cabc3f5d43eaf33aefa7c61b8205b0876e3333de8b91e98aad4ad' + 'e612f66727c3fa9e13f02943b7ccde40544dc12c306e7884c0d46cc06885fdc3' + '2d3716225147264abb8b7d9a86605220b3155673d1214d3fc784086b738cb144' + 'ae0826b4830da952f21195eb2b71530451255a7f1f3f238cc3b9e00b428eb1f9' + 'f418af01bca5b99497a3dc64381356b7c80e82c14aa5d256f686a16296309dbe' + '2290e005afe36862a3d7f79978cf30dd544645389820d1a75874d31f349f6c12' + '08a93886e5862b91e37a1d0e45b68e6307e7618bd1f037da77c7e8f1b3caaf03' + 'c4c3abc2c318bf3bf7b241590841a5932fc3ec0bd7b05c3b65c81afa50d10097' + 'f2f9baecf73265948f9bd3d71fabfcd7c93fa1529eea7f743004ae97f6e8b4a1' + 'ad640f295a3304f1411d355dd05014b818c43f467e56f655fd28b806f4884d10' + '92bb17c6ba4e19feac8a57c08f84e051701b73822d9265edc26cef4c500b9a2c' + 'd4bc24e178468aa8bc8794137411d26a5f8a40ea4ca723c5910c4f950fd71863' + '5b3ab4782be568da71b712ac4c6d991598b944598ced5ca47c061ec88230b101' + '46b671aa8b4aedffd73bd228314b59dd087a5379569d133e414752556b3388c4' + 'b76941957a9c0ae88a0f8feda009df3f6a3427f1bcd22995f86a77553a71dd52' + 'e255e0aaaca0fcb24878457c428162169a3ffdb8508da0e4ccc673ce127121b4' + '37b1add60294a6bdc6f8f1f263d2a2d713c3ce40e2ad9259fe17c3316ff98e30' + '59cec64ae616d1ea9fae4cd9258b6c79eb04225ade49d69a18c3d3d9c6e7ac41' + '326f04df28bff61a8de72d7a4ebcf2b5d69d65be636675d42e99395a64647915' + '8bd736d1f0b0cc60878368e28017aeef5e5b6c2c264f757c8fbacd77ae904402' + '91fd356c161ae3503955b0ea0b0b700546c503b4c9eae72a1a50be125e19bfcc' + 'bcf0c5861ddb641effe97809a1ebcc0bc3b74f5d7112eb8cc9bfc700ff39141e' + '236a1d7a2ac00d98fdbdd09313d61866693c6ac6e5b6eff2c0548b6e635a8934' + '7e6fe2e58523420a69ab3a99d8da16b42fc714ed9c1afe0b4701fdd3c5b5f749' + 'b8b75c5e0fe51c70d98756d467ec4534244c3b2d453ba9fd974c4273c8a77244' + '06622b5485f68c7f9773d0bca17739d51a80df4d65769d349011e07d4a6c0d63' + 'be188de10f978c8b586af001462bfbac9ce7a17be27d8095d47d48821a92f90c' + '2508578c0da7cbd4fc2a703839f9641b4b81b6af187adb86d1581354d6a07102' + '991c1ee895e3b28f457af1013fdea8d7f23c9b2e5f3168d7e1bc4116b8372cd2' + '28a366f49fa7760fe1e6b3c967f18b2c6cfff82117fe66f36894c81d9ad10edb' + '591f40765b87f50d984332ea76d6165388ffb6a6f9cc3e750663efc996314e0f' + '55c907626983dce965470f8db075eaf3864ec488778085391aea92e25da55d1c' + '22853539fb102784227d7ffe6da78350f767c05c74d841749b9d75dd3c7878d2' + '8ab3e796b372b4c9468544e33de01bc1c07b5c90c6e3181b5782cfbc0663ad0b' + '64d11336f3c39a9d94595ee562feb8edbb9a5db7bc6a62e60c098b57c0a90da4' + 'c2748c494ccce93a93a2e11b1ddc66d5c380bcf790e4e3cb43f67a05189d2f5a' + '3ef569264112bb0421a22b0730eb38bcb1abcab92481efe2e3316601bcafe18b' + '74c6ee48d1a560eb0188a5ebf4e974a88b20c39d23063d2ffcdfc005c91be641' + '85077af45268749ed4c64b32246d4c4b5c16c14e3cb22bbf68fe58fabaa6cfcb' + '868742b69069b033681758deeb436bbb01d0785f3825db6dbb0d56e02d258837' + 'a5f79661a71bf1a51723b601f91d64c67826242b5ed27182714fbe6fe4990e0a' + '111540c4ee45ae33d62582ed17d8402a63f82ae5752ca6fb3210c2165b3def1c' + '19e62b89159153cb8e44d4a9cc68c02e2cd33adb6b9c8b8813ee525fc3bd895e' + '45bd5bf8fd53e3f7aef11ecb0601f651c1077862c1c452ad83bdb58a26ba3f86' + '4755bb696646b799969798b260b8a91d85dd8402aa0c2a0eb4529a5bc8afcf65' + '0f6beb0d308fed7ce428759e3046f794854c1f80a595578a1e9eab0b0ecd0fde' + '8e1e9946da23eb99cb72c927ff9b1fecae473a54848abcc20f9e3da5d8527e5e' + 'cd67e82fa30abb6848c0a58ad288ce7ef7a6381b52eaa1b58988ad2afa27ad34' + 'a71f9b7d01e9506931ff0b097471d9b4680c9c6fefccbab6360fc10dbcd097b5' + 'b9b110b0d5efc40c6aeb08f9ded20b994b3b57829871dab90dc08cdf0ac430c2' + 'dfe654d4f62e3447c0239baa6a385ae1b5695af158afa4e66c562232444122ca' + 'eaa5fab6a667b7b1e00186568b3125d4f1a74a4e3a9709b3930b0e1ac38ee499' + 'fa65c9acbc560cba03c42df5bc61640cd84a8a0afd24b4cd4007712725123868' + '6d66ec12f031b1adafb6ba7319093a1f439a6370feda902ccbf42b1eb3af66c4' + '8bf1adde50598e17928d9cce3aa45d5dec794171bb0eb704e9c2435a018bb94d' + '1b48b6f0a01e75956034401fcdab68a076753e69e92169ae9d77179470b97d29' + 'ae47357aabcfcd2aa810b8bd090576005a426f4903a84f485daa71c425b3c9d5' + '3aa781e6fa06d5c117220a3fa6a293ed1f943cfdf944f96d6ec934f8a3ed5c38' + '8cbb64fbaac528fc563a8d74109bc22668a9d10c349c8fecf0378dc3cdb51d2a' + 'c42adc1061b81f77f7a3dfabf455cc1894e82f6b65b35468621ba27d471ae21e' + '06704b6f161aa2607b1d3f7183fbc9f57e7b3f1b3a1ad97abcf7ef007c952029' + 'ab6d51169505a411c5a08d8f836b2bc96952f1bcc0ba72da121f1f174775138d' + '4ef06fe46863bf8d5b82ea936bb1819e80cc00b22fcd4bdc5e933071399c148c')