From 0ee92e24868ea1394da0afb241a088d3121df0e7 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Mon, 9 Sep 2024 21:36:32 +0530 Subject: [PATCH] python3.12: update to 3.12.5 --- ...g-make-_sysconfigdata.py-relocatable.patch | 2 +- ...t-threads-and-make-it-default-on-min.patch | 28 +- ...S-and-others-when-compiling-with-MIN.patch | 4 +- ...re-add-MACHDEP-and-platform-on-MINGW.patch | 4 +- ...-Add-default-configuration-for-MINGW.patch | 4 +- ...-largefile-support-by-default-for-Mi.patch | 6 +- ...-to-CPPFLAGS-and-to-SRCDIRS-on-Mingw.patch | 8 +- ...fine-necessary-headers-for-compiling.patch | 14 +- ...-by-default-when-compiling-for-MINGW.patch | 6 +- .../0010-pyport.h-Add-support-for-MINGW.patch | 4 +- ...tions-so-that-shared-build-is-possib.patch | 8 +- ...dd-dynamic-loading-support-for-MINGW.patch | 14 +- ...-program-for-frozen-scripts-on-MINGW.patch | 8 +- ...k2-and-setup-_socket-module-on-MINGW.patch | 14 +- ...Enable-some-windows-specific-modules.patch | 10 +- ...nfig-MINGW-build-extensions-with-GCC.patch | 2 +- ...g-treat-MINGW-builds-as-POSIX-builds.patch | 4 +- ...pport-for-stdcall-without-underscore.patch | 4 +- .../0019-Customize-site-for-MINGW.patch | 12 +- .../0020-add-python-config-sh.patch | 2 +- ...x-sep-if-MSYSTEM-environment-variabl.patch | 40 +-- ...s-cygwin-semi-native-build-sysconfig.patch | 6 +- ...sysconfig-mingw-sysconfig-like-posix.patch | 6 +- ...ngw-use-backslashes-in-compileall-py.patch | 2 +- .../0025-mingw-pdcurses_ISPAD.patch | 2 +- .../0026-remove_path_max.default.patch | 2 +- .../0027-dont-link-with-gettext.patch | 8 +- .../0028-ctypes-python-dll.patch | 6 +- .../0029-gdbm-module-includes.patch | 2 +- .../0030-use-gnu_printf-in-format.patch | 4 +- ...w-fix-ssl-dont-use-enum_certificates.patch | 6 +- ...fix-using-dllhandle-and-winver-mingw.patch | 6 +- ...-config-so-msvccompiler-get_build_ve.patch | 2 +- ...4-MINGW-link-with-additional-library.patch | 6 +- .../0035-install-msilib.patch | 6 +- .../0036-fix-signal-module-build.patch | 2 +- ...-build-winconsoleio-and-_testconsole.patch | 8 +- .../0038-expose-sem_unlink.patch | 2 +- .../0039-Use-cygpty-while-using-isatty.patch | 24 +- ...win-resource-files-and-build-pythonw.patch | 16 +- .../0041-fix-isselectable.patch | 2 +- ...042-configure.ac-fix-inet_pton-check.patch | 6 +- .../0043-pass-gen-profile-ldflags.patch | 6 +- ...indows-must-link-ext-with-python-lib.patch | 6 +- .../0045-importlib-bootstrap-path-sep.patch | 6 +- .../0046-warnings-fixes.patch | 10 +- .../0047-fix-build-testinternalcapi.patch | 6 +- mingw-w64-python3.12/0048-clang-arm64.patch | 2 +- ...configure.ac-set-MINGW-stack-reserve.patch | 8 +- ...050-Don-t-use-os.pathsep-to-find-EOF.patch | 6 +- ...ion-suffix-for-c-extensions-on-mingw.patch | 18 +- ...the-get_platform-method-in-sysconfig.patch | 2 +- ...53-build-Fix-ncursesw-include-lookup.patch | 8 +- .../0054-tests-fix-test_bytes.patch | 4 +- ...e-not-raising-for-invalid-year-value.patch | 6 +- ...brary-c-should-return-None-with-ucrt.patch | 8 +- ...uild-Disable-checks-for-dlopen-dlfcn.patch | 12 +- ...stall-location-of-the-import-library.patch | 6 +- ...venvlauncher-build-installation-into.patch | 12 +- ...onfigure.ac-set-_WIN32_WINNT-version.patch | 6 +- ....ac-don-t-check-for-clock_-functions.patch | 8 +- ...-normpath-paths-coming-from-env-vars.patch | 4 +- ...ld-and-add-some-mingw-specific-tests.patch | 2 +- ...0064-Define-PY3_DLLNAME-to-fix-build.patch | 6 +- ...5-_testconsole.c-Fix-casing-path-sep.patch | 2 +- ...t-architecture-markers-for-python-on.patch | 6 +- ...sesw-pkg-config-when-cross-compiling.patch | 8 +- ...mingw_smoketests-fix-_UCRT-condition.patch | 4 +- ...-Modify-sys.winver-to-match-upstream.patch | 8 +- ...-packages-path-to-include-the-enviro.patch | 8 +- ...e-a-header-in-the-check-for-_beginth.patch | 6 +- ...ault-to-without-c-locale-coercion-on.patch | 6 +- .../0073-Fix-failing-tests.patch | 18 +- ...sep-with-an-empty-MSYSTEM-env-var-no.patch | 12 +- ...TH-when-compiling-Python-sysmodule.c.patch | 6 +- .../0076-Make-_Py_CheckPython3-extern.patch | 2 +- .../0077-link-with-bcrypt.patch | 6 +- .../0078-correctly-find-native-python.patch | 4 +- ...dd-extra-flags-for-_bootstrap_python.patch | 6 +- ...80-posixmodule-undefine-HAVE_OPENDIR.patch | 6 +- ...081-getpath.py-add-support-for-mingw.patch | 28 +- ...-t-build-_posixsubprocess-on-Windows.patch | 8 +- .../0083-_ssl-link-with-ws2_32.patch | 6 +- ...084-Always-normalize-path-in-abspath.patch | 6 +- ...k.h-when-checking-for-netdb-function.patch | 10 +- ...multiprocessing-semaphore.c-on-win32.patch | 6 +- ...configure-build-mmap-module-on-win32.patch | 6 +- .../0088-venv-creation-fixes.patch | 12 +- ...n-function-where-winsock.h-is-includ.patch | 8 +- ...figure.ac-set-BUILDEXEEXT-and-EXEEXT.patch | 4 +- ...re.ac-fix-building-some-test-modules.patch | 8 +- ...sconfig.get_config_var-VPATH-to-an-a.patch | 6 +- ...o-before-passing-though-pathcch-func.patch | 2 +- ...-venvlauncher.exe-from-PC-launcher.c.patch | 12 +- .../0095-getpath.py-fix-dirname.patch | 6 +- ...-use-normpath-on-all-generated-paths.patch | 16 +- .../0097-pathconfig-normpath-sys.path-0.patch | 2 +- ...ts-add-some-tests-for-sys-site-paths.patch | 4 +- ...-on-paths-added-using-add_dll_direct.patch | 6 +- ...100-Build-and-install-libpython3.dll.patch | 16 +- .../0101-Port-GetPythonImport-to-mingw.patch | 2 +- ...ake-sure-to-only-use-backslashes-for.patch | 2 +- ...-add-a-test-to-check-if-sysconfig-re.patch | 6 +- ...g-library-for-multiprocessing-module.patch | 8 +- ...5-selectmodule-add-support-for-MINGW.patch | 10 +- .../0106-readline-disable-on-MINGW.patch | 6 +- ...es-to-fix-compile-of-ctypes-on-MINGW.patch | 10 +- ...lpython-version-while-linking-stdlib.patch | 2 +- .../0109-Enable-_uuid-on-MINGW.patch | 8 +- .../0110-Enable-curses-library-on-MINGW.patch | 6 +- ...ests-disable-distutils-related-tests.patch | 4 +- ...-skip-test_c_ext_build-for-in-tree-b.patch | 4 +- .../0113-configure.ac-use-autoconf-2.69.patch | 4 +- ...lose-writer-pipe-in-multiprocessing..patch | 67 ----- .../0114-CI-clean-up-ignored-tests.patch | 119 ++++++++ ...ix-tests-for-XMLPullParser-with-Expa.patch | 109 -------- ...compatible-pointer-types-as-warning.patch} | 12 +- .../0116-CI-clean-up-ignored-tests.patch | 258 ------------------ ...6-CI-normalize-path-in-test_makefile.patch | 27 ++ mingw-w64-python3.12/PKGBUILD | 253 +++++++++-------- 120 files changed, 690 insertions(+), 981 deletions(-) delete mode 100644 mingw-w64-python3.12/0114-3.12-gh-114440-Close-writer-pipe-in-multiprocessing..patch create mode 100644 mingw-w64-python3.12/0114-CI-clean-up-ignored-tests.patch delete mode 100644 mingw-w64-python3.12/0115-3.12-gh-115133-Fix-tests-for-XMLPullParser-with-Expa.patch rename mingw-w64-python3.12/{0117-gcc-make-incompatible-pointer-types-as-warning.patch => 0115-gcc-make-incompatible-pointer-types-as-warning.patch} (89%) delete mode 100644 mingw-w64-python3.12/0116-CI-clean-up-ignored-tests.patch create mode 100644 mingw-w64-python3.12/0116-CI-normalize-path-in-test_makefile.patch diff --git a/mingw-w64-python3.12/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch b/mingw-w64-python3.12/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch index c77bcc5efc521..31474f095bef5 100644 --- a/mingw-w64-python3.12/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch +++ b/mingw-w64-python3.12/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch @@ -1,4 +1,4 @@ -From b9c69bf57cd419396c4bf6c566c556303421ada4 Mon Sep 17 00:00:00 2001 +From c0a4ccb7cd65cbff40fed50d612304fd82743a71 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-python3.12/0002-build-add-with-nt-threads-and-make-it-default-on-min.patch b/mingw-w64-python3.12/0002-build-add-with-nt-threads-and-make-it-default-on-min.patch index c2b9899264153..01a7428111ae9 100644 --- a/mingw-w64-python3.12/0002-build-add-with-nt-threads-and-make-it-default-on-min.patch +++ b/mingw-w64-python3.12/0002-build-add-with-nt-threads-and-make-it-default-on-min.patch @@ -1,4 +1,4 @@ -From c349719ad44b2b32e41822cf758b67a4b98765be Mon Sep 17 00:00:00 2001 +From cba5764ad34dd241b05e7b207c8f4d93f6a9ef37 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 @@ -81,10 +81,10 @@ index dfc2a8e..dc92a23 100644 # include /* O_CREAT and O_EXCL */ # if defined(HAVE_SEM_OPEN) && !defined(POSIX_SEMAPHORES_NOT_ENABLED) diff --git a/configure.ac b/configure.ac -index bd2be94..2979f2a 100644 +index 0d6df8e..93a2045 100644 --- a/configure.ac +++ b/configure.ac -@@ -2689,6 +2689,53 @@ then +@@ -2697,6 +2697,53 @@ then BASECFLAGS="$BASECFLAGS $ac_arch_flags" fi @@ -138,7 +138,7 @@ index bd2be94..2979f2a 100644 # On some compilers, pthreads are available without further options # (e.g. MacOS X). On some of these systems, the compiler will not # complain if unaccepted options are passed (e.g. gcc on Mac OS X). -@@ -2800,6 +2847,8 @@ int main(void){ +@@ -2808,6 +2855,8 @@ int main(void){ CC="$ac_save_cc"]) fi @@ -147,7 +147,7 @@ index bd2be94..2979f2a 100644 # If we have set a CC compiler flag for thread support then # check if it works for CXX, too. if test ! -z "$CXX" -@@ -2819,6 +2868,10 @@ elif test "$ac_cv_pthread" = "yes" +@@ -2827,6 +2876,10 @@ elif test "$ac_cv_pthread" = "yes" then CXX="$CXX -pthread" ac_cv_cxx_thread=yes @@ -158,7 +158,7 @@ index bd2be94..2979f2a 100644 else ac_cv_cxx_thread=no fi -@@ -2860,8 +2913,8 @@ AC_CHECK_HEADERS([ \ +@@ -2868,8 +2921,8 @@ AC_CHECK_HEADERS([ \ alloca.h asm/types.h bluetooth.h conio.h crypt.h direct.h dlfcn.h endian.h errno.h fcntl.h grp.h \ ieeefp.h io.h langinfo.h libintl.h libutil.h linux/auxvec.h sys/auxv.h linux/fs.h linux/limits.h linux/memfd.h \ linux/random.h linux/soundcard.h \ @@ -169,7 +169,7 @@ index bd2be94..2979f2a 100644 sys/endian.h sys/epoll.h sys/event.h sys/eventfd.h sys/file.h sys/ioctl.h sys/kern_control.h \ sys/loadavg.h sys/lock.h sys/memfd.h sys/mkdev.h sys/mman.h sys/modem.h sys/param.h sys/poll.h \ sys/random.h sys/resource.h sys/select.h sys/sendfile.h sys/socket.h sys/soundcard.h sys/stat.h \ -@@ -2872,6 +2925,14 @@ AC_CHECK_HEADERS([ \ +@@ -2880,6 +2933,14 @@ AC_CHECK_HEADERS([ \ AC_HEADER_DIRENT AC_HEADER_MAJOR @@ -184,7 +184,7 @@ index bd2be94..2979f2a 100644 # bluetooth/bluetooth.h has been known to not compile with -std=c99. # http://permalink.gmane.org/gmane.linux.bluez.kernel/22294 SAVE_CFLAGS=$CFLAGS -@@ -3084,6 +3145,10 @@ elif test "$ac_cv_pthread" = "yes" +@@ -3092,6 +3153,10 @@ elif test "$ac_cv_pthread" = "yes" then CC="$CC -pthread" fi @@ -195,7 +195,7 @@ index bd2be94..2979f2a 100644 AC_CACHE_CHECK([for pthread_t], [ac_cv_have_pthread_t], [ AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[@%:@include ]], [[pthread_t x; x = *(pthread_t*)0;]]) -@@ -3115,7 +3180,7 @@ AS_VAR_IF([ac_cv_pthread_key_t_is_arithmetic_type], [yes], [ +@@ -3123,7 +3188,7 @@ AS_VAR_IF([ac_cv_pthread_key_t_is_arithmetic_type], [yes], [ AC_DEFINE([PTHREAD_KEY_T_IS_COMPATIBLE_WITH_INT], [1], [Define if pthread_key_t is compatible with int.]) ]) @@ -204,7 +204,7 @@ index bd2be94..2979f2a 100644 CC="$ac_save_cc" AC_MSG_CHECKING([for --enable-framework]) -@@ -3629,10 +3694,15 @@ AS_VAR_IF([have_uuid], [missing], [ +@@ -3655,10 +3720,15 @@ AS_VAR_IF([have_uuid], [missing], [ AS_VAR_IF([have_uuid], [missing], [have_uuid=no]) @@ -220,7 +220,7 @@ index bd2be94..2979f2a 100644 # check if we need libintl for locale functions AC_CHECK_LIB([intl], [textdomain], -@@ -4352,6 +4422,11 @@ then +@@ -4378,6 +4448,11 @@ then CXX="$CXX -pthread" fi posix_threads=yes @@ -232,7 +232,7 @@ index bd2be94..2979f2a 100644 else if test ! -z "$withval" -a -d "$withval" then LDFLAGS="$LDFLAGS -L$withval" -@@ -4868,6 +4943,15 @@ else +@@ -4894,6 +4969,15 @@ else fi # checks for library functions @@ -248,7 +248,7 @@ index bd2be94..2979f2a 100644 AC_CHECK_FUNCS([ \ accept4 alarm bind_textdomain_codeset chmod chown clock close_range confstr \ copy_file_range ctermid dup dup3 execv explicit_bzero explicit_memset \ -@@ -5763,6 +5847,10 @@ dnl actually works. For FreeBSD versions <= 7.2, +@@ -5790,6 +5874,10 @@ dnl actually works. For FreeBSD versions <= 7.2, dnl the kernel module that provides POSIX semaphores dnl isn't loaded by default, so an attempt to call dnl sem_open results in a 'Signal 12' error. @@ -259,7 +259,7 @@ index bd2be94..2979f2a 100644 AC_CACHE_CHECK([whether POSIX semaphores are enabled], [ac_cv_posix_semaphores_enabled], AC_RUN_IFELSE([ AC_LANG_SOURCE([ -@@ -5796,6 +5884,14 @@ AS_VAR_IF([ac_cv_posix_semaphores_enabled], [no], [ +@@ -5823,6 +5911,14 @@ AS_VAR_IF([ac_cv_posix_semaphores_enabled], [no], [ ]) dnl Multiprocessing check for broken sem_getvalue diff --git a/mingw-w64-python3.12/0003-Define-MS_WINDOWS-and-others-when-compiling-with-MIN.patch b/mingw-w64-python3.12/0003-Define-MS_WINDOWS-and-others-when-compiling-with-MIN.patch index e2e53c42082d7..c634c82e5a0f2 100644 --- a/mingw-w64-python3.12/0003-Define-MS_WINDOWS-and-others-when-compiling-with-MIN.patch +++ b/mingw-w64-python3.12/0003-Define-MS_WINDOWS-and-others-when-compiling-with-MIN.patch @@ -1,4 +1,4 @@ -From 54c49640c27b4f838fe30aee43041a3be79ecd5c Mon Sep 17 00:00:00 2001 +From ba3cbfb963919d94414d9570c9515cea535ab57f 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 @@ -22,7 +22,7 @@ Co-authored-by: Naveen M K 1 file changed, 38 insertions(+) diff --git a/Include/pyport.h b/Include/pyport.h -index 35eca72..82e848e 100644 +index e2bac3b..3d70b8e 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -53,6 +53,44 @@ diff --git a/mingw-w64-python3.12/0004-configure-add-MACHDEP-and-platform-on-MINGW.patch b/mingw-w64-python3.12/0004-configure-add-MACHDEP-and-platform-on-MINGW.patch index f1137038fa9da..a1e7a5dc9e713 100644 --- a/mingw-w64-python3.12/0004-configure-add-MACHDEP-and-platform-on-MINGW.patch +++ b/mingw-w64-python3.12/0004-configure-add-MACHDEP-and-platform-on-MINGW.patch @@ -1,4 +1,4 @@ -From 4f7786cbf80ab351640db780bca57829dbc00419 Mon Sep 17 00:00:00 2001 +From 52e1ab063f3b759704694a3470fbbe285954c5f6 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 @@ -13,7 +13,7 @@ Co-authored-by: Алексей 1 file changed, 15 insertions(+) diff --git a/configure.ac b/configure.ac -index 2979f2a..aa28593 100644 +index 93a2045..32e74a0 100644 --- a/configure.ac +++ b/configure.ac @@ -550,6 +550,9 @@ then diff --git a/mingw-w64-python3.12/0005-Add-default-configuration-for-MINGW.patch b/mingw-w64-python3.12/0005-Add-default-configuration-for-MINGW.patch index 82dbf953338f8..3e6cf5a0b471c 100644 --- a/mingw-w64-python3.12/0005-Add-default-configuration-for-MINGW.patch +++ b/mingw-w64-python3.12/0005-Add-default-configuration-for-MINGW.patch @@ -1,4 +1,4 @@ -From 0c2a00c27aa730a861db559b8d4271ff03993c4b Mon Sep 17 00:00:00 2001 +From 5c2e0d853cd89ee8d6b8bd243da803446e38bbb5 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 @@ -53,7 +53,7 @@ index 0000000..03fde9e + +ac_cv_have_size_t_format=no diff --git a/configure.ac b/configure.ac -index aa28593..e214b00 100644 +index 32e74a0..cf872b8 100644 --- a/configure.ac +++ b/configure.ac @@ -1205,6 +1205,28 @@ AC_CACHE_CHECK([for -Wl,--no-as-needed], [ac_cv_wl_no_as_needed], [ diff --git a/mingw-w64-python3.12/0006-configure-enable-largefile-support-by-default-for-Mi.patch b/mingw-w64-python3.12/0006-configure-enable-largefile-support-by-default-for-Mi.patch index 324692b42c6f6..22a5965c6fe15 100644 --- a/mingw-w64-python3.12/0006-configure-enable-largefile-support-by-default-for-Mi.patch +++ b/mingw-w64-python3.12/0006-configure-enable-largefile-support-by-default-for-Mi.patch @@ -1,4 +1,4 @@ -From cdbf83278a1e6e00c8d3bfbd10a40c25d5fa5db4 Mon Sep 17 00:00:00 2001 +From e5a3b41af3432435b0d0457f7e11d527660dde1a 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 @@ -18,10 +18,10 @@ Co-authored-by: Christoph Reiter 1 file changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac -index e214b00..16c7164 100644 +index cf872b8..7dbe095 100644 --- a/configure.ac +++ b/configure.ac -@@ -3152,6 +3152,10 @@ dnl LFS does not work with Emscripten 3.1 +@@ -3160,6 +3160,10 @@ dnl LFS does not work with Emscripten 3.1 AS_CASE([$ac_sys_system], [Emscripten], [have_largefile_support="no"] ) diff --git a/mingw-w64-python3.12/0007-Add-PC-to-CPPFLAGS-and-to-SRCDIRS-on-Mingw.patch b/mingw-w64-python3.12/0007-Add-PC-to-CPPFLAGS-and-to-SRCDIRS-on-Mingw.patch index 38fbc1d698ca5..aaa61b3c8a239 100644 --- a/mingw-w64-python3.12/0007-Add-PC-to-CPPFLAGS-and-to-SRCDIRS-on-Mingw.patch +++ b/mingw-w64-python3.12/0007-Add-PC-to-CPPFLAGS-and-to-SRCDIRS-on-Mingw.patch @@ -1,4 +1,4 @@ -From 37424ab3b952ded46011f744b709ce44a281fa5d Mon Sep 17 00:00:00 2001 +From cf489827528c1d3d3554828172f2e13a509d94be 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 @@ -10,10 +10,10 @@ Co-authored-by: Naveen M K 1 file changed, 15 insertions(+) diff --git a/configure.ac b/configure.ac -index 16c7164..a3904b3 100644 +index 7dbe095..b810f57 100644 --- a/configure.ac +++ b/configure.ac -@@ -6862,6 +6862,16 @@ do +@@ -6889,6 +6889,16 @@ do THREADHEADERS="$THREADHEADERS \$(srcdir)/$h" done @@ -30,7 +30,7 @@ index 16c7164..a3904b3 100644 AC_SUBST([SRCDIRS]) SRCDIRS="\ Modules \ -@@ -6884,6 +6894,11 @@ SRCDIRS="\ +@@ -6911,6 +6921,11 @@ SRCDIRS="\ Python \ Python/frozen_modules \ Python/deepfreeze" diff --git a/mingw-w64-python3.12/0008-posixmodule.c-Define-necessary-headers-for-compiling.patch b/mingw-w64-python3.12/0008-posixmodule.c-Define-necessary-headers-for-compiling.patch index 0abaef6d606c0..6db2753d758d7 100644 --- a/mingw-w64-python3.12/0008-posixmodule.c-Define-necessary-headers-for-compiling.patch +++ b/mingw-w64-python3.12/0008-posixmodule.c-Define-necessary-headers-for-compiling.patch @@ -1,4 +1,4 @@ -From 63c64473df6079c92cf5548a0560303db0f2f22c Mon Sep 17 00:00:00 2001 +From 758204f7c604444e319a6065f4e6a389441e1692 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,10 +33,10 @@ index 8ef0f20..1f21d35 100644 _tracemalloc _tracemalloc.c diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 0ac5a8d..0d6bb01 100644 +index 2277cae..0bc4d83 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c -@@ -361,6 +361,26 @@ corresponding Unix manual entries for more information on calls."); +@@ -365,6 +365,26 @@ corresponding Unix manual entries for more information on calls."); # define HAVE_PIPE 1 # define HAVE_FSYNC 1 # define fsync _commit @@ -63,7 +63,7 @@ index 0ac5a8d..0d6bb01 100644 #endif /* ! __WATCOMC__ || __QNX__ */ /*[clinic input] -@@ -438,7 +458,7 @@ extern char *ctermid_r(char *); +@@ -442,7 +462,7 @@ extern char *ctermid_r(char *); # endif #endif @@ -72,7 +72,7 @@ index 0ac5a8d..0d6bb01 100644 # ifdef HAVE_DIRECT_H # include # endif -@@ -449,7 +469,7 @@ extern char *ctermid_r(char *); +@@ -453,7 +473,7 @@ extern char *ctermid_r(char *); # include # endif # include @@ -81,7 +81,7 @@ index 0ac5a8d..0d6bb01 100644 #ifndef MAXPATHLEN # if defined(PATH_MAX) && PATH_MAX > 1024 -@@ -1536,9 +1556,9 @@ _Py_Sigset_Converter(PyObject *obj, void *addr) +@@ -1590,9 +1610,9 @@ error: ** man environ(7). */ #include @@ -94,7 +94,7 @@ index 0ac5a8d..0d6bb01 100644 static PyObject * convertenviron(void) diff --git a/configure.ac b/configure.ac -index a3904b3..9372127 100644 +index b810f57..12d6336 100644 --- a/configure.ac +++ b/configure.ac @@ -755,6 +755,14 @@ then diff --git a/mingw-w64-python3.12/0009-Build-winreg-by-default-when-compiling-for-MINGW.patch b/mingw-w64-python3.12/0009-Build-winreg-by-default-when-compiling-for-MINGW.patch index 38029d7987db1..8a5ea0d9f62eb 100644 --- a/mingw-w64-python3.12/0009-Build-winreg-by-default-when-compiling-for-MINGW.patch +++ b/mingw-w64-python3.12/0009-Build-winreg-by-default-when-compiling-for-MINGW.patch @@ -1,4 +1,4 @@ -From 6ae67a8b1f0df130fc9e29db25e7c5ec2b30eaac Mon Sep 17 00:00:00 2001 +From 7f35cbb5de2c3e3046dbcbb8c66cd0edb5e69830 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 @@ -58,10 +58,10 @@ index e2d5322..368291d 100644 typedef struct { diff --git a/configure.ac b/configure.ac -index 9372127..5a936ea 100644 +index 12d6336..fa06926 100644 --- a/configure.ac +++ b/configure.ac -@@ -4437,6 +4437,13 @@ done +@@ -4463,6 +4463,13 @@ done IFS=$as_save_IFS AC_MSG_RESULT([$DBM_CFLAGS $DBM_LIBS]) diff --git a/mingw-w64-python3.12/0010-pyport.h-Add-support-for-MINGW.patch b/mingw-w64-python3.12/0010-pyport.h-Add-support-for-MINGW.patch index 0620272da3cf4..c372e9962ff9c 100644 --- a/mingw-w64-python3.12/0010-pyport.h-Add-support-for-MINGW.patch +++ b/mingw-w64-python3.12/0010-pyport.h-Add-support-for-MINGW.patch @@ -1,4 +1,4 @@ -From e64166a220e620d1f8f96ea674ed2e2961cc8fa9 Mon Sep 17 00:00:00 2001 +From cea500dc8f5099e6e04d44dfee4cd32fb5eed7db 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,7 +13,7 @@ Co-authored-by: Алексей 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Include/pyport.h b/Include/pyport.h -index 82e848e..b7f3e66 100644 +index 3d70b8e..ddff496 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -532,12 +532,12 @@ extern char * _getpty(int *, int, mode_t, int); diff --git a/mingw-w64-python3.12/0011-configure-add-options-so-that-shared-build-is-possib.patch b/mingw-w64-python3.12/0011-configure-add-options-so-that-shared-build-is-possib.patch index 0c6e1233d3f01..e6b6e9b3027a5 100644 --- a/mingw-w64-python3.12/0011-configure-add-options-so-that-shared-build-is-possib.patch +++ b/mingw-w64-python3.12/0011-configure-add-options-so-that-shared-build-is-possib.patch @@ -1,4 +1,4 @@ -From 175caef177d1d8c2a86160fbb8c51b8158d7bf1b Mon Sep 17 00:00:00 2001 +From 6d1cb39365429f1bf5ed04f22fd6eb993b4e05e3 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 @@ -11,7 +11,7 @@ Co-authored-by: Naveen M K 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 5a936ea..1eb61be 100644 +index fa06926..64e5340 100644 --- a/configure.ac +++ b/configure.ac @@ -1549,6 +1549,11 @@ if test $enable_shared = "yes"; then @@ -36,7 +36,7 @@ index 5a936ea..1eb61be 100644 esac fi -@@ -3495,6 +3503,10 @@ then +@@ -3521,6 +3529,10 @@ then CYGWIN*) LDSHARED="gcc -shared -Wl,--enable-auto-image-base" LDCXXSHARED="g++ -shared -Wl,--enable-auto-image-base";; @@ -47,7 +47,7 @@ index 5a936ea..1eb61be 100644 *) LDSHARED="ld";; esac fi -@@ -6883,7 +6895,8 @@ case $host in +@@ -6910,7 +6922,8 @@ case $host in dnl "errmap.h" from $srcdir/PC. dnl Note we cannot use BASECPPFLAGS as autogenerated pyconfig.h dnl has to be before customized located in ../PC. diff --git a/mingw-w64-python3.12/0012-Add-dynamic-loading-support-for-MINGW.patch b/mingw-w64-python3.12/0012-Add-dynamic-loading-support-for-MINGW.patch index ce6dd111e004d..4c5077be23e3e 100644 --- a/mingw-w64-python3.12/0012-Add-dynamic-loading-support-for-MINGW.patch +++ b/mingw-w64-python3.12/0012-Add-dynamic-loading-support-for-MINGW.patch @@ -1,4 +1,4 @@ -From 7d2d590da71ea6ef2be339ef5b43238859bc5bcf Mon Sep 17 00:00:00 2001 +From 8aef384e2fcbc87bd0ef94cbbc657f18379eb619 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 7af1845..664e270 100644 +index c027eaa..392f75f 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1374,6 +1374,12 @@ Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile +@@ -1378,6 +1378,12 @@ Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile -DSHLIB_EXT='"$(EXT_SUFFIX)"' \ -o $@ $(srcdir)/Python/dynload_hpux.c @@ -59,10 +59,10 @@ index acab05e..4bb90ba 100644 PyMem_Free(wpathname); diff --git a/configure.ac b/configure.ac -index 1eb61be..c5446af 100644 +index 64e5340..1a262eb 100644 --- a/configure.ac +++ b/configure.ac -@@ -3374,6 +3374,9 @@ if test -z "$SHLIB_SUFFIX"; then +@@ -3400,6 +3400,9 @@ if test -z "$SHLIB_SUFFIX"; then CYGWIN*) SHLIB_SUFFIX=.dll;; *) SHLIB_SUFFIX=.so;; esac @@ -72,7 +72,7 @@ index 1eb61be..c5446af 100644 fi AC_MSG_RESULT([$SHLIB_SUFFIX]) -@@ -4986,6 +4989,13 @@ then +@@ -5012,6 +5015,13 @@ then fi ;; esac @@ -86,7 +86,7 @@ index 1eb61be..c5446af 100644 fi AC_MSG_RESULT([$DYNLOADFILE]) if test "$DYNLOADFILE" != "dynload_stub.o" -@@ -6874,6 +6884,12 @@ case "$ac_cv_computed_gotos" in yes*) +@@ -6901,6 +6911,12 @@ case "$ac_cv_computed_gotos" in yes*) AC_DEFINE([HAVE_COMPUTED_GOTOS], [1], [Define if the C compiler supports computed gotos.]) esac diff --git a/mingw-w64-python3.12/0013-Ignore-main-program-for-frozen-scripts-on-MINGW.patch b/mingw-w64-python3.12/0013-Ignore-main-program-for-frozen-scripts-on-MINGW.patch index dede25718f4d4..4eaea5e685fba 100644 --- a/mingw-w64-python3.12/0013-Ignore-main-program-for-frozen-scripts-on-MINGW.patch +++ b/mingw-w64-python3.12/0013-Ignore-main-program-for-frozen-scripts-on-MINGW.patch @@ -1,4 +1,4 @@ -From 2cef9a90220147f25ba63e97482d258f61cda395 Mon Sep 17 00:00:00 2001 +From 52ce4e2537a6fd8269c82ce6d1fafb6b60346bf1 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 664e270..d16afef 100644 +index 392f75f..e0be7d2 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -383,7 +383,7 @@ PYTHON_OBJS= \ @@ -27,10 +27,10 @@ index 664e270..d16afef 100644 Python/getargs.o \ Python/getcompiler.o \ diff --git a/configure.ac b/configure.ac -index c5446af..fe251c4 100644 +index 1a262eb..ede25fb 100644 --- a/configure.ac +++ b/configure.ac -@@ -6916,6 +6916,16 @@ case $host in +@@ -6943,6 +6943,16 @@ case $host in ;; esac diff --git a/mingw-w64-python3.12/0014-Detect-winsock2-and-setup-_socket-module-on-MINGW.patch b/mingw-w64-python3.12/0014-Detect-winsock2-and-setup-_socket-module-on-MINGW.patch index 781f1af0a86d1..36105c9f69a6b 100644 --- a/mingw-w64-python3.12/0014-Detect-winsock2-and-setup-_socket-module-on-MINGW.patch +++ b/mingw-w64-python3.12/0014-Detect-winsock2-and-setup-_socket-module-on-MINGW.patch @@ -1,4 +1,4 @@ -From 1da317ac6e345b84c424d2d4aa3c049d4fad5f6d Mon Sep 17 00:00:00 2001 +From 725cca02509e9041bd154e2a139afc00f02e065a 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 de7229d..4b521ca 100644 +index 9724879..1f7f297 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -282,6 +282,7 @@ shutdown(how) -- shut down traffic in one or both directions\n\ @@ -59,10 +59,10 @@ index de7229d..4b521ca 100644 # include "addrinfo.h" #endif diff --git a/configure.ac b/configure.ac -index fe251c4..e193452 100644 +index ede25fb..e926532 100644 --- a/configure.ac +++ b/configure.ac -@@ -4138,6 +4138,12 @@ AS_CASE([$ac_sys_system], +@@ -4164,6 +4164,12 @@ AS_CASE([$ac_sys_system], [OSSAUDIODEV_LIBS=""] ) @@ -75,7 +75,7 @@ index fe251c4..e193452 100644 dnl detect sqlite3 from Emscripten emport PY_CHECK_EMSCRIPTEN_PORT([LIBSQLITE3], [-sUSE_SQLITE3]) -@@ -5598,18 +5604,33 @@ if test $ac_cv_header_time_altzone = yes; then +@@ -5625,18 +5631,33 @@ if test $ac_cv_header_time_altzone = yes; then [Define this if your time.h defines altzone.]) fi @@ -113,7 +113,7 @@ index fe251c4..e193452 100644 [ac_cv_struct_sockaddr_storage=yes], [ac_cv_struct_sockaddr_storage=no])) if test $ac_cv_struct_sockaddr_storage = yes; then -@@ -6804,8 +6825,11 @@ AC_CHECK_TYPE( +@@ -6831,8 +6852,11 @@ AC_CHECK_TYPE( [socklen_t], [], [AC_DEFINE( [socklen_t], [int], @@ -126,7 +126,7 @@ index fe251c4..e193452 100644 #ifdef HAVE_SYS_TYPES_H #include #endif -@@ -7601,7 +7625,9 @@ PY_STDLIB_MOD([mmap], +@@ -7641,7 +7665,9 @@ PY_STDLIB_MOD([mmap], PY_STDLIB_MOD([_socket], [], m4_flatten([test "$ac_cv_header_sys_socket_h" = "yes" -a "$ac_cv_header_sys_types_h" = "yes" diff --git a/mingw-w64-python3.12/0015-Enable-some-windows-specific-modules.patch b/mingw-w64-python3.12/0015-Enable-some-windows-specific-modules.patch index 71d7dbd11c2dd..c75f2fe43bd23 100644 --- a/mingw-w64-python3.12/0015-Enable-some-windows-specific-modules.patch +++ b/mingw-w64-python3.12/0015-Enable-some-windows-specific-modules.patch @@ -1,4 +1,4 @@ -From d53eb47f222dfe154720f67e4560c6b756c69cb7 Mon Sep 17 00:00:00 2001 +From 28e1af00861552311daf5d8b31ad13fe28405637 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Tue, 14 Feb 2023 20:40:42 +0530 Subject: [PATCH 015/N] Enable some windows specific modules @@ -23,7 +23,7 @@ index 3def7e8..d8b41ee 100644 +@MODULE_MSVCRT_TRUE@msvcrt -DPy_BUILD_CORE ../PC/msvcrtmodule.c +@MODULE__WINAPI_TRUE@_winapi _winapi.c diff --git a/Modules/Setup.stdlib.in b/Modules/Setup.stdlib.in -index 3360805..202a55e 100644 +index b68b8e4..296db8e 100644 --- a/Modules/Setup.stdlib.in +++ b/Modules/Setup.stdlib.in @@ -160,6 +160,13 @@ @@ -41,7 +41,7 @@ index 3360805..202a55e 100644 ############################################################################ # Test modules diff --git a/Modules/_winapi.c b/Modules/_winapi.c -index 7727540..fda1171 100644 +index edb1181..dd4fe8b 100644 --- a/Modules/_winapi.c +++ b/Modules/_winapi.c @@ -44,7 +44,9 @@ @@ -82,10 +82,10 @@ index 7febaa0..70d5b3d 100644 #endif diff --git a/configure.ac b/configure.ac -index e193452..f1bcf82 100644 +index e926532..b083ac8 100644 --- a/configure.ac +++ b/configure.ac -@@ -7727,6 +7727,16 @@ PY_STDLIB_MOD([_ssl], [], [test "$ac_cv_working_openssl_ssl" = yes], +@@ -7767,6 +7767,16 @@ PY_STDLIB_MOD([_ssl], [], [test "$ac_cv_working_openssl_ssl" = yes], PY_STDLIB_MOD([_hashlib], [], [test "$ac_cv_working_openssl_hashlib" = yes], [$OPENSSL_INCLUDES], [$OPENSSL_LDFLAGS $OPENSSL_LDFLAGS_RPATH $LIBCRYPTO_LIBS]) diff --git a/mingw-w64-python3.12/0016-sysconfig-MINGW-build-extensions-with-GCC.patch b/mingw-w64-python3.12/0016-sysconfig-MINGW-build-extensions-with-GCC.patch index 1c1d6679688df..b7bc449855875 100644 --- a/mingw-w64-python3.12/0016-sysconfig-MINGW-build-extensions-with-GCC.patch +++ b/mingw-w64-python3.12/0016-sysconfig-MINGW-build-extensions-with-GCC.patch @@ -1,4 +1,4 @@ -From 10149a78b035a7d41391aed4d8f4ddf46e592b85 Mon Sep 17 00:00:00 2001 +From 46c000c4f87f06fe9c67292a2c673afeed48a1b4 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 20:52:42 +0200 Subject: [PATCH 016/N] sysconfig: MINGW build extensions with GCC diff --git a/mingw-w64-python3.12/0017-sysconfig-treat-MINGW-builds-as-POSIX-builds.patch b/mingw-w64-python3.12/0017-sysconfig-treat-MINGW-builds-as-POSIX-builds.patch index bb8bfc2150f4e..cab0b508c20b1 100644 --- a/mingw-w64-python3.12/0017-sysconfig-treat-MINGW-builds-as-POSIX-builds.patch +++ b/mingw-w64-python3.12/0017-sysconfig-treat-MINGW-builds-as-POSIX-builds.patch @@ -1,4 +1,4 @@ -From 77e7dad5d1dca5e397855159593fbe4e99fccbbb Mon Sep 17 00:00:00 2001 +From 94dd7ca741ab3554d96f2ff0f33c2c4c46259b5a 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 @@ -17,7 +17,7 @@ diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py index 3710a83..ce900b3 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py -@@ -99,13 +99,18 @@ +@@ -99,13 +99,18 @@ _INSTALL_SCHEMES = { }, } diff --git a/mingw-w64-python3.12/0018-Add-support-for-stdcall-without-underscore.patch b/mingw-w64-python3.12/0018-Add-support-for-stdcall-without-underscore.patch index 3f865770271dd..ea5b608e427ef 100644 --- a/mingw-w64-python3.12/0018-Add-support-for-stdcall-without-underscore.patch +++ b/mingw-w64-python3.12/0018-Add-support-for-stdcall-without-underscore.patch @@ -1,4 +1,4 @@ -From c7c28e844ca553ab0724e344440fb90b7e851b90 Mon Sep 17 00:00:00 2001 +From a50bcff1946ea73608342a8fd845c9335d35583d 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 @@ -15,7 +15,7 @@ Co-authored-by: Алексей 1 file changed, 19 insertions(+) diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c -index 534ef8c..28f921c 100644 +index c515756..a5745cc 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -3378,6 +3378,18 @@ static PPROC FindAddress(void *handle, const char *name, PyObject *type) diff --git a/mingw-w64-python3.12/0019-Customize-site-for-MINGW.patch b/mingw-w64-python3.12/0019-Customize-site-for-MINGW.patch index 4139cc96567ff..3a781034fa670 100644 --- a/mingw-w64-python3.12/0019-Customize-site-for-MINGW.patch +++ b/mingw-w64-python3.12/0019-Customize-site-for-MINGW.patch @@ -1,4 +1,4 @@ -From 206bdd2be7d602d9651aeaddefb523ad6c59e1cf Mon Sep 17 00:00:00 2001 +From 0a5d63dc324294f06683646b8422ee1f17b16732 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 @@ -14,10 +14,10 @@ Co-authored-by: Christoph Reiter 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Lib/site.py b/Lib/site.py -index 672fa7b..4cbb55c 100644 +index 924cfbe..4df0357 100644 --- a/Lib/site.py +++ b/Lib/site.py -@@ -88,6 +88,12 @@ +@@ -89,6 +89,12 @@ USER_SITE = None USER_BASE = None @@ -30,7 +30,7 @@ index 672fa7b..4cbb55c 100644 def _trace(message): if sys.flags.verbose: print(message, file=sys.stderr) -@@ -273,7 +279,7 @@ def _getuserbase(): +@@ -294,7 +300,7 @@ def _getuserbase(): def joinuser(*args): return os.path.expanduser(os.path.join(*args)) @@ -39,7 +39,7 @@ index 672fa7b..4cbb55c 100644 base = os.environ.get("APPDATA") or "~" return joinuser(base, "Python") -@@ -288,7 +294,7 @@ def joinuser(*args): +@@ -309,7 +315,7 @@ def _getuserbase(): def _get_path(userbase): version = sys.version_info @@ -48,7 +48,7 @@ index 672fa7b..4cbb55c 100644 ver_nodot = sys.winver.replace('.', '') return f'{userbase}\\Python{ver_nodot}\\site-packages' -@@ -361,7 +367,7 @@ def getsitepackages(prefixes=None): +@@ -382,7 +388,7 @@ def getsitepackages(prefixes=None): continue seen.add(prefix) diff --git a/mingw-w64-python3.12/0020-add-python-config-sh.patch b/mingw-w64-python3.12/0020-add-python-config-sh.patch index 108b83a1c207a..0a5d942054efe 100644 --- a/mingw-w64-python3.12/0020-add-python-config-sh.patch +++ b/mingw-w64-python3.12/0020-add-python-config-sh.patch @@ -1,4 +1,4 @@ -From be03be6923079d83a11c2c2580c3d3ec4295cb88 Mon Sep 17 00:00:00 2001 +From 26696a62a14b43b0eb70bf6b7aef39e4f394c26c 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-python3.12/0021-mingw-prefer-unix-sep-if-MSYSTEM-environment-variabl.patch b/mingw-w64-python3.12/0021-mingw-prefer-unix-sep-if-MSYSTEM-environment-variabl.patch index 77e28a2612dec..4a83ec1d9c05d 100644 --- a/mingw-w64-python3.12/0021-mingw-prefer-unix-sep-if-MSYSTEM-environment-variabl.patch +++ b/mingw-w64-python3.12/0021-mingw-prefer-unix-sep-if-MSYSTEM-environment-variabl.patch @@ -1,4 +1,4 @@ -From 216a7fef504bb563903b7426977e519d9dc63c22 Mon Sep 17 00:00:00 2001 +From 1609aab34f0c7446739fb2cef139cab2cd31db7d Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:51:46 +0530 Subject: [PATCH 021/N] mingw: prefer unix sep if MSYSTEM environment @@ -38,10 +38,10 @@ index e4c3b09..50d8b76 100644 /* Py_PyAtExit is for the atexit module, Py_AtExit is for low-level * exit functions. diff --git a/Lib/ntpath.py b/Lib/ntpath.py -index df3402d..ce683b1 100644 +index 2e290dc..108ffce 100644 --- a/Lib/ntpath.py +++ b/Lib/ntpath.py -@@ -11,9 +11,7 @@ +@@ -11,9 +11,7 @@ module as os.path. curdir = '.' pardir = '..' extsep = '.' @@ -51,7 +51,7 @@ index df3402d..ce683b1 100644 defpath = '.;C:\\bin' devnull = 'nul' -@@ -23,6 +21,14 @@ +@@ -23,6 +21,14 @@ import stat import genericpath from genericpath import * @@ -66,7 +66,7 @@ index df3402d..ce683b1 100644 __all__ = ["normcase","isabs","join","splitdrive","splitroot","split","splitext", "basename","dirname","commonprefix","getsize","getmtime", -@@ -34,9 +40,33 @@ +@@ -34,9 +40,33 @@ __all__ = ["normcase","isabs","join","splitdrive","splitroot","split","splitext" def _get_bothseps(path): if isinstance(path, bytes): @@ -102,7 +102,7 @@ index df3402d..ce683b1 100644 # Normalize the case of a pathname and map slashes to backslashes. # Other normalizations (such as optimizing '../' away) are not done -@@ -58,14 +88,14 @@ def normcase(s): +@@ -58,14 +88,14 @@ try: return s if isinstance(s, bytes): encoding = sys.getfilesystemencoding() @@ -119,7 +119,7 @@ index df3402d..ce683b1 100644 except ImportError: def normcase(s): """Normalize case of pathname. -@@ -74,8 +104,8 @@ def normcase(s): +@@ -74,8 +104,8 @@ except ImportError: """ s = os.fspath(s) if isinstance(s, bytes): @@ -130,7 +130,7 @@ index df3402d..ce683b1 100644 # Return whether a path is absolute. -@@ -87,14 +117,9 @@ def normcase(s): +@@ -87,14 +117,9 @@ except ImportError: def isabs(s): """Test whether a path is absolute""" s = os.fspath(s) @@ -203,7 +203,7 @@ index df3402d..ce683b1 100644 splitext.__doc__ = genericpath._splitext.__doc__ -@@ -527,14 +541,12 @@ def expandvars(path): +@@ -527,14 +541,12 @@ except ImportError: def normpath(path): """Normalize path, eliminating double slashes, etc.""" path = os.fspath(path) @@ -220,7 +220,7 @@ index df3402d..ce683b1 100644 curdir = '.' pardir = '..' path = path.replace(altsep, sep) -@@ -757,6 +769,7 @@ def realpath(path, *, strict=False): +@@ -749,6 +761,7 @@ else: # strip the prefix anyway. if ex.winerror == initial_winerror: path = spath @@ -228,7 +228,7 @@ index df3402d..ce683b1 100644 return path -@@ -766,12 +779,11 @@ def realpath(path, *, strict=False): +@@ -758,12 +771,11 @@ supports_unicode_filenames = True def relpath(path, start=None): """Return a relative version of a path""" path = os.fspath(path) @@ -242,7 +242,7 @@ index df3402d..ce683b1 100644 curdir = '.' pardir = '..' -@@ -826,13 +838,11 @@ def commonpath(paths): +@@ -818,13 +830,11 @@ def commonpath(paths): raise ValueError('commonpath() arg is an empty sequence') paths = tuple(map(os.fspath, paths)) @@ -259,10 +259,10 @@ index df3402d..ce683b1 100644 try: diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 0d6bb01..6cde737 100644 +index 0bc4d83..751628f 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c -@@ -3926,6 +3926,7 @@ posix_getcwd(int use_bytes) +@@ -4002,6 +4002,7 @@ posix_getcwd(int use_bytes) return NULL; } @@ -270,21 +270,21 @@ index 0d6bb01..6cde737 100644 PyObject *resobj = PyUnicode_FromWideChar(wbuf2, len); if (wbuf2 != wbuf) { PyMem_RawFree(wbuf2); -@@ -4810,6 +4811,7 @@ os__getfinalpathname_impl(PyObject *module, path_t *path) +@@ -4888,6 +4889,7 @@ os__getfinalpathname_impl(PyObject *module, path_t *path) target_path = tmp; } + Py_NormalizeSepsW(target_path); result = PyUnicode_FromWideChar(target_path, result_length); - if (result && path->narrow) { + if (result && PyBytes_Check(path->object)) { Py_SETREF(result, PyUnicode_EncodeFSDefault(result)); diff --git a/Python/initconfig.c b/Python/initconfig.c -index 4e5d4bb..a52d11e 100644 +index 192089b..0519a7e 100644 --- a/Python/initconfig.c +++ b/Python/initconfig.c -@@ -188,7 +188,7 @@ static const char usage_envvars[] = - "PYTHONVERBOSE : trace import statements (-v)\n" - "PYTHONWARNINGS=arg : warning control (-W arg)\n"; +@@ -163,7 +163,7 @@ static const char usage_envvars[] = + "PYTHONWARNINGS : warning control (-W)\n" + ; -#if defined(MS_WINDOWS) +#if defined(_MSC_VER) diff --git a/mingw-w64-python3.12/0022-msys-cygwin-semi-native-build-sysconfig.patch b/mingw-w64-python3.12/0022-msys-cygwin-semi-native-build-sysconfig.patch index 6a5ccbf92148e..1f6d853807a96 100644 --- a/mingw-w64-python3.12/0022-msys-cygwin-semi-native-build-sysconfig.patch +++ b/mingw-w64-python3.12/0022-msys-cygwin-semi-native-build-sysconfig.patch @@ -1,4 +1,4 @@ -From 894a6d30cbddb7de34b72d6427269ec01280a688 Mon Sep 17 00:00:00 2001 +From f87b7e1d1f2ce73b137b1b7dfbaeeb7aa847ea8c 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 ce900b3..19fa25a 100644 vars.update(done) return vars diff --git a/Makefile.pre.in b/Makefile.pre.in -index d16afef..b5c0c41 100644 +index e0be7d2..a9e79dd 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -142,6 +142,13 @@ exec_prefix= @exec_prefix@ @@ -52,7 +52,7 @@ index d16afef..b5c0c41 100644 BINDIR= @bindir@ LIBDIR= @libdir@ diff --git a/configure.ac b/configure.ac -index f1bcf82..ceab383 100644 +index b083ac8..39bbc05 100644 --- a/configure.ac +++ b/configure.ac @@ -755,6 +755,65 @@ then diff --git a/mingw-w64-python3.12/0023-sysconfig-mingw-sysconfig-like-posix.patch b/mingw-w64-python3.12/0023-sysconfig-mingw-sysconfig-like-posix.patch index 01e63bce11fd2..ec62d39cc7f73 100644 --- a/mingw-w64-python3.12/0023-sysconfig-mingw-sysconfig-like-posix.patch +++ b/mingw-w64-python3.12/0023-sysconfig-mingw-sysconfig-like-posix.patch @@ -1,4 +1,4 @@ -From f932c3d21ae13bd00139d0579eed9149e2fdf763 Mon Sep 17 00:00:00 2001 +From a7b5ff9e752e9d1c190893ea46a9f71887e5a317 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 20:53:59 +0200 Subject: [PATCH 023/N] sysconfig: mingw sysconfig like posix @@ -11,7 +11,7 @@ diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py index 19fa25a..08efb9b 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py -@@ -49,13 +49,13 @@ +@@ -49,13 +49,13 @@ _INSTALL_SCHEMES = { 'data': '{base}', }, 'nt': { @@ -32,7 +32,7 @@ index 19fa25a..08efb9b 100644 'data': '{base}', }, # Downstream distributors can overwrite the default install scheme. -@@ -141,12 +141,12 @@ def joinuser(*args): +@@ -141,12 +141,12 @@ if _HAS_USER_BASE: _INSTALL_SCHEMES |= { # NOTE: When modifying "purelib" scheme, update site._get_path() too. 'nt_user': { diff --git a/mingw-w64-python3.12/0024-mingw-use-backslashes-in-compileall-py.patch b/mingw-w64-python3.12/0024-mingw-use-backslashes-in-compileall-py.patch index 77534510b0ca7..867032aaa57a1 100644 --- a/mingw-w64-python3.12/0024-mingw-use-backslashes-in-compileall-py.patch +++ b/mingw-w64-python3.12/0024-mingw-use-backslashes-in-compileall-py.patch @@ -1,4 +1,4 @@ -From f6b5ccaebb9a7008218165db5f2b8e05f97ed432 Mon Sep 17 00:00:00 2001 +From ca791303c7d20f8f8864c9393547878218546cba 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-python3.12/0025-mingw-pdcurses_ISPAD.patch b/mingw-w64-python3.12/0025-mingw-pdcurses_ISPAD.patch index 55c809358cbf8..081e4b1eba7bb 100644 --- a/mingw-w64-python3.12/0025-mingw-pdcurses_ISPAD.patch +++ b/mingw-w64-python3.12/0025-mingw-pdcurses_ISPAD.patch @@ -1,4 +1,4 @@ -From 39dc626fa370443de87a52a4f4c20c07688be64b Mon Sep 17 00:00:00 2001 +From 7833d58666a62e56363dc30c2745472746d638a7 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-python3.12/0026-remove_path_max.default.patch b/mingw-w64-python3.12/0026-remove_path_max.default.patch index 71026eb289f52..8c1fac58d8acd 100644 --- a/mingw-w64-python3.12/0026-remove_path_max.default.patch +++ b/mingw-w64-python3.12/0026-remove_path_max.default.patch @@ -1,4 +1,4 @@ -From b6618fd164ce8bfc3e93ead5d8f2cbdb7db1ac9b Mon Sep 17 00:00:00 2001 +From 146660c615550cce16d9cbd0891279873b345855 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-python3.12/0027-dont-link-with-gettext.patch b/mingw-w64-python3.12/0027-dont-link-with-gettext.patch index 5d19659dfbda4..16a59270ccfe8 100644 --- a/mingw-w64-python3.12/0027-dont-link-with-gettext.patch +++ b/mingw-w64-python3.12/0027-dont-link-with-gettext.patch @@ -1,4 +1,4 @@ -From 4a9078f3f394c66eb4c224c1e67ed0fc5756c526 Mon Sep 17 00:00:00 2001 +From 42bc1b5a9c0bfd3df5d104e1b0ed4c9b779e01f0 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 cbd036f..9d71bb3 100644 +index f080b97..aaf6a61 100644 --- a/Modules/_localemodule.c +++ b/Modules/_localemodule.c @@ -12,6 +12,13 @@ This software comes with no warranty. Use at your own risk. @@ -32,10 +32,10 @@ index cbd036f..9d71bb3 100644 #include #include diff --git a/configure.ac b/configure.ac -index ceab383..7a34f86 100644 +index 39bbc05..a622a88 100644 --- a/configure.ac +++ b/configure.ac -@@ -3828,10 +3828,19 @@ AC_SEARCH_LIBS([sem_init], [pthread rt posix4]) +@@ -3854,10 +3854,19 @@ AC_SEARCH_LIBS([sem_init], [pthread rt posix4]) fi # check if we need libintl for locale functions diff --git a/mingw-w64-python3.12/0028-ctypes-python-dll.patch b/mingw-w64-python3.12/0028-ctypes-python-dll.patch index a6098caf73368..2f26b107ae9c8 100644 --- a/mingw-w64-python3.12/0028-ctypes-python-dll.patch +++ b/mingw-w64-python3.12/0028-ctypes-python-dll.patch @@ -1,4 +1,4 @@ -From 774710a21540f1aeccee20cd320f3c818e7ebb26 Mon Sep 17 00:00:00 2001 +From ea649239935368c4ba41af5efb0791c32fb3f34d 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 @@ -14,10 +14,10 @@ Co-authored-by: Christoph Reiter 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py -index 95353ba..2b06fba 100644 +index 6cedee7..7fceeb8 100644 --- a/Lib/ctypes/__init__.py +++ b/Lib/ctypes/__init__.py -@@ -464,7 +464,9 @@ def LoadLibrary(self, name): +@@ -464,7 +464,9 @@ class LibraryLoader(object): cdll = LibraryLoader(CDLL) pydll = LibraryLoader(PyDLL) diff --git a/mingw-w64-python3.12/0029-gdbm-module-includes.patch b/mingw-w64-python3.12/0029-gdbm-module-includes.patch index a42c8be7e9d7d..09164027b92a9 100644 --- a/mingw-w64-python3.12/0029-gdbm-module-includes.patch +++ b/mingw-w64-python3.12/0029-gdbm-module-includes.patch @@ -1,4 +1,4 @@ -From 8e4d2ab38090e420066be303c315387106edd8b0 Mon Sep 17 00:00:00 2001 +From 6a05ec3dd13cf5c1c78d4a4d79960105492cb57b 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-python3.12/0030-use-gnu_printf-in-format.patch b/mingw-w64-python3.12/0030-use-gnu_printf-in-format.patch index 2ce7a1830acb9..8eb5a8cdd8e4d 100644 --- a/mingw-w64-python3.12/0030-use-gnu_printf-in-format.patch +++ b/mingw-w64-python3.12/0030-use-gnu_printf-in-format.patch @@ -1,4 +1,4 @@ -From 6499cbfbfa97c2db6bd483a3033b0c57b1a85825 Mon Sep 17 00:00:00 2001 +From 5058627e43a87fd8f7b5fca2f0ef5b8fb346d4db 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,7 +48,7 @@ index d089fa7..f8e604e 100644 #ifndef Py_LIMITED_API # define Py_CPYTHON_ERRORS_H diff --git a/Include/pyport.h b/Include/pyport.h -index b7f3e66..b8810c1 100644 +index ddff496..df363d0 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -666,6 +666,12 @@ extern char * _getpty(int *, int, mode_t, int); diff --git a/mingw-w64-python3.12/0031-mingw-fix-ssl-dont-use-enum_certificates.patch b/mingw-w64-python3.12/0031-mingw-fix-ssl-dont-use-enum_certificates.patch index 8aa8c2357dad2..5117313803cc4 100644 --- a/mingw-w64-python3.12/0031-mingw-fix-ssl-dont-use-enum_certificates.patch +++ b/mingw-w64-python3.12/0031-mingw-fix-ssl-dont-use-enum_certificates.patch @@ -1,4 +1,4 @@ -From 81bfbaabab3a2847a9cf434e60bab959c9923db1 Mon Sep 17 00:00:00 2001 +From be6ded6b02d3485f37cddb1169ce786eed20e5ab Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:52:03 +0530 Subject: [PATCH 031/N] mingw fix ssl dont use enum_certificates @@ -13,7 +13,7 @@ Co-authored-by: Christoph Reiter 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/ssl.py b/Lib/ssl.py -index 3586d3a..58a92dc 100644 +index 983c2db..eec2122 100644 --- a/Lib/ssl.py +++ b/Lib/ssl.py @@ -254,7 +254,7 @@ class _TLSMessageType: @@ -25,7 +25,7 @@ index 3586d3a..58a92dc 100644 from _ssl import enum_certificates, enum_crls from socket import socket, SOCK_STREAM, create_connection -@@ -529,7 +529,7 @@ def _load_windows_store_certs(self, storename, purpose): +@@ -529,7 +529,7 @@ class SSLContext(_SSLContext): def load_default_certs(self, purpose=Purpose.SERVER_AUTH): if not isinstance(purpose, _ASN1Object): raise TypeError(purpose) diff --git a/mingw-w64-python3.12/0032-fix-using-dllhandle-and-winver-mingw.patch b/mingw-w64-python3.12/0032-fix-using-dllhandle-and-winver-mingw.patch index 86d54cf60ddbd..d641296caa05f 100644 --- a/mingw-w64-python3.12/0032-fix-using-dllhandle-and-winver-mingw.patch +++ b/mingw-w64-python3.12/0032-fix-using-dllhandle-and-winver-mingw.patch @@ -1,4 +1,4 @@ -From 46c5de660b742c85dc5d941dbe9d063e920a3686 Mon Sep 17 00:00:00 2001 +From 15a2ea5320417f45a8bf95324c33310d8e63e968 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 14f4447..6c2405c 100644 +index a99a97f..abb2880 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -42,7 +42,7 @@ Data members: @@ -25,7 +25,7 @@ index 14f4447..6c2405c 100644 extern void *PyWin_DLLhModule; /* A string loaded from the DLL at startup: */ extern const char *PyWin_DLLVersionString; -@@ -3291,7 +3291,7 @@ _PySys_InitCore(PyThreadState *tstate, PyObject *sysdict) +@@ -3307,7 +3307,7 @@ _PySys_InitCore(PyThreadState *tstate, PyObject *sysdict) SET_SYS_FROM_STRING("byteorder", "little"); #endif diff --git a/mingw-w64-python3.12/0033-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch b/mingw-w64-python3.12/0033-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch index 520bfc5e293b4..85ae20f5392d8 100644 --- a/mingw-w64-python3.12/0033-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch +++ b/mingw-w64-python3.12/0033-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch @@ -1,4 +1,4 @@ -From 5e0a48384fb296afed84d2ab346c0d5120b8489e Mon Sep 17 00:00:00 2001 +From 93b4bbd6258690238e1a294a8157c00710cf12dd 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-python3.12/0034-MINGW-link-with-additional-library.patch b/mingw-w64-python3.12/0034-MINGW-link-with-additional-library.patch index 813f2bd16e993..5e6104deb3ed1 100644 --- a/mingw-w64-python3.12/0034-MINGW-link-with-additional-library.patch +++ b/mingw-w64-python3.12/0034-MINGW-link-with-additional-library.patch @@ -1,4 +1,4 @@ -From ec57238583ffa0470c12bc5bc27536f514e5a855 Mon Sep 17 00:00:00 2001 +From 138a4c6a446ac959d135113acb5cfbb4fedca2fc 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 @@ -9,10 +9,10 @@ Subject: [PATCH 034/N] MINGW link with additional library 1 file changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac -index 7a34f86..dde8937 100644 +index a622a88..ecbb935 100644 --- a/configure.ac +++ b/configure.ac -@@ -7053,6 +7053,15 @@ for dir in $SRCDIRS; do +@@ -7080,6 +7080,15 @@ for dir in $SRCDIRS; do done AC_MSG_RESULT([done]) diff --git a/mingw-w64-python3.12/0035-install-msilib.patch b/mingw-w64-python3.12/0035-install-msilib.patch index 6032401102041..d0406e16521f2 100644 --- a/mingw-w64-python3.12/0035-install-msilib.patch +++ b/mingw-w64-python3.12/0035-install-msilib.patch @@ -1,4 +1,4 @@ -From 32cf53fc0ff98c55ebe0871f4716e58878cda0fe Mon Sep 17 00:00:00 2001 +From 161f3b644cedf669d14b21f298e5654d16db7867 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 035/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 b5c0c41..e400d56 100644 +index a9e79dd..ed8a86b 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2118,6 +2118,7 @@ LIBSUBDIRS= asyncio \ +@@ -2122,6 +2122,7 @@ LIBSUBDIRS= asyncio \ tkinter \ tomllib \ turtledemo \ diff --git a/mingw-w64-python3.12/0036-fix-signal-module-build.patch b/mingw-w64-python3.12/0036-fix-signal-module-build.patch index 2646aaf0cbadd..14ffb63560f29 100644 --- a/mingw-w64-python3.12/0036-fix-signal-module-build.patch +++ b/mingw-w64-python3.12/0036-fix-signal-module-build.patch @@ -1,4 +1,4 @@ -From 87bc3aedc10cb8c01c76f7a105aeb044f0cf93a1 Mon Sep 17 00:00:00 2001 +From 9cc9d3d0c3ca867e2f766e590ac0f859e519b3bd Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:10 +0530 Subject: [PATCH 036/N] fix signal module build diff --git a/mingw-w64-python3.12/0037-build-build-winconsoleio-and-_testconsole.patch b/mingw-w64-python3.12/0037-build-build-winconsoleio-and-_testconsole.patch index c48e1ab7cc729..905f0b5b85c5e 100644 --- a/mingw-w64-python3.12/0037-build-build-winconsoleio-and-_testconsole.patch +++ b/mingw-w64-python3.12/0037-build-build-winconsoleio-and-_testconsole.patch @@ -1,4 +1,4 @@ -From 631c774c6b1483c0524769d15b45b0ab21a53769 Mon Sep 17 00:00:00 2001 +From 474a18d07ad2502363452e86a13859def67c8a59 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:11 +0530 Subject: [PATCH 037/N] build: build winconsoleio and _testconsole @@ -28,7 +28,7 @@ index ec0f81e..cec80f5 100644 _sre _sre/sre.c _thread _threadmodule.c diff --git a/Modules/Setup.stdlib.in b/Modules/Setup.stdlib.in -index 202a55e..3f4d7f6 100644 +index 296db8e..945edff 100644 --- a/Modules/Setup.stdlib.in +++ b/Modules/Setup.stdlib.in @@ -184,6 +184,7 @@ @@ -40,10 +40,10 @@ index 202a55e..3f4d7f6 100644 # Limited API template modules; must be built as shared modules. @MODULE_XXLIMITED_TRUE@xxlimited xxlimited.c diff --git a/configure.ac b/configure.ac -index dde8937..3b4745f 100644 +index ecbb935..70927d5 100644 --- a/configure.ac +++ b/configure.ac -@@ -7823,6 +7823,7 @@ PY_STDLIB_MOD([_testimportmultiple], [test "$TEST_MODULES" = yes], [test "$ac_cv +@@ -7863,6 +7863,7 @@ PY_STDLIB_MOD([_testimportmultiple], [test "$TEST_MODULES" = yes], [test "$ac_cv PY_STDLIB_MOD([_testmultiphase], [test "$TEST_MODULES" = yes], [test "$ac_cv_func_dlopen" = yes]) PY_STDLIB_MOD([xxsubtype], [test "$TEST_MODULES" = yes]) PY_STDLIB_MOD([_xxtestfuzz], [test "$TEST_MODULES" = yes]) diff --git a/mingw-w64-python3.12/0038-expose-sem_unlink.patch b/mingw-w64-python3.12/0038-expose-sem_unlink.patch index 736621700a61a..cc12cb9ab7be9 100644 --- a/mingw-w64-python3.12/0038-expose-sem_unlink.patch +++ b/mingw-w64-python3.12/0038-expose-sem_unlink.patch @@ -1,4 +1,4 @@ -From d3687f2585f3233cdeea3ffc53683d6ea4f655ca Mon Sep 17 00:00:00 2001 +From d05be5c118de834cc8b3bb954469a1fa4b614676 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:12 +0530 Subject: [PATCH 038/N] expose sem_unlink diff --git a/mingw-w64-python3.12/0039-Use-cygpty-while-using-isatty.patch b/mingw-w64-python3.12/0039-Use-cygpty-while-using-isatty.patch index 581a8ff0e4953..0e8300b75ac4a 100644 --- a/mingw-w64-python3.12/0039-Use-cygpty-while-using-isatty.patch +++ b/mingw-w64-python3.12/0039-Use-cygpty-while-using-isatty.patch @@ -1,4 +1,4 @@ -From 542a2d46be156bfcfc555eeb3704455027529c72 Mon Sep 17 00:00:00 2001 +From debddaf4b4a57351fe3237bffed9a0758eed9003 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:14 +0530 Subject: [PATCH 039/N] Use cygpty while using isatty @@ -74,7 +74,7 @@ index 0000000..82fd0af + +#endif /* _ISCYGPTY_H */ diff --git a/Makefile.pre.in b/Makefile.pre.in -index e400d56..93e23f0 100644 +index ed8a86b..a1288aa 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -406,6 +406,7 @@ PYTHON_OBJS= \ @@ -85,7 +85,7 @@ index e400d56..93e23f0 100644 Python/marshal.o \ Python/modsupport.o \ Python/mysnprintf.o \ -@@ -1632,6 +1633,7 @@ PYTHON_HEADERS= \ +@@ -1636,6 +1637,7 @@ PYTHON_HEADERS= \ $(srcdir)/Include/import.h \ $(srcdir)/Include/interpreteridobject.h \ $(srcdir)/Include/intrcheck.h \ @@ -94,7 +94,7 @@ index e400d56..93e23f0 100644 $(srcdir)/Include/listobject.h \ $(srcdir)/Include/longobject.h \ diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c -index c8be998..c09410a 100644 +index bab6807..919b8b0 100644 --- a/Modules/_io/fileio.c +++ b/Modules/_io/fileio.c @@ -20,6 +20,7 @@ @@ -115,7 +115,7 @@ index c8be998..c09410a 100644 Py_END_ALLOW_THREADS return PyBool_FromLong(res); diff --git a/Modules/main.c b/Modules/main.c -index 1b189b4..674b737 100644 +index b602272..4d7f4b6 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -7,6 +7,7 @@ @@ -136,10 +136,10 @@ index 1b189b4..674b737 100644 diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 6cde737..38687e0 100644 +index 751628f..a41a23b 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c -@@ -54,6 +54,7 @@ +@@ -57,6 +57,7 @@ #ifdef __ANDROID__ # undef HAVE_FACCESSAT #endif @@ -147,7 +147,7 @@ index 6cde737..38687e0 100644 #include // ctermid() #include // system() -@@ -11180,7 +11181,7 @@ os_isatty_impl(PyObject *module, int fd) +@@ -11231,7 +11232,7 @@ os_isatty_impl(PyObject *module, int fd) int return_value; Py_BEGIN_ALLOW_THREADS _Py_BEGIN_SUPPRESS_IPH @@ -178,7 +178,7 @@ index e99e155..c74d2af 100644 return PyBool_FromLong(res); diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c -index 84fbc33..ac9166c 100644 +index 1a65ddd..264017d 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -1,6 +1,7 @@ @@ -454,7 +454,7 @@ index 0000000..722f88f + +/* vim: set ts=4 sw=4: */ diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c -index a0130fd..5ad77d6 100644 +index 2c36527..99d3a53 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -30,6 +30,7 @@ @@ -465,7 +465,7 @@ index a0130fd..5ad77d6 100644 #include // setlocale() #include // getenv() -@@ -3070,7 +3071,7 @@ Py_Exit(int sts) +@@ -3072,7 +3073,7 @@ Py_Exit(int sts) int Py_FdIsInteractive(FILE *fp, const char *filename) { @@ -474,7 +474,7 @@ index a0130fd..5ad77d6 100644 return 1; } if (!_Py_GetConfig()->interactive) { -@@ -3085,7 +3086,7 @@ Py_FdIsInteractive(FILE *fp, const char *filename) +@@ -3087,7 +3088,7 @@ Py_FdIsInteractive(FILE *fp, const char *filename) int _Py_FdIsInteractive(FILE *fp, PyObject *filename) { diff --git a/mingw-w64-python3.12/0040-build-link-win-resource-files-and-build-pythonw.patch b/mingw-w64-python3.12/0040-build-link-win-resource-files-and-build-pythonw.patch index 2ab0af4af4b1f..e471b3fd96e4f 100644 --- a/mingw-w64-python3.12/0040-build-link-win-resource-files-and-build-pythonw.patch +++ b/mingw-w64-python3.12/0040-build-link-win-resource-files-and-build-pythonw.patch @@ -1,4 +1,4 @@ -From 52cab5ad7ba709042b0d25d8e30aa96b72b27dd6 Mon Sep 17 00:00:00 2001 +From 8a3fd6109d88e78e32414b5cfaeb9952b45b0385 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:16 +0530 Subject: [PATCH 040/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 93e23f0..4064977 100644 +index a1288aa..cba776e 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -38,6 +38,7 @@ CC= @CC@ @@ -40,7 +40,7 @@ index 93e23f0..4064977 100644 HOSTRUNNER= @HOSTRUNNER@ -@@ -620,7 +623,7 @@ all: @DEF_MAKE_ALL_RULE@ +@@ -622,7 +625,7 @@ all: @DEF_MAKE_ALL_RULE@ .PHONY: all .PHONY: build_all @@ -49,7 +49,7 @@ index 93e23f0..4064977 100644 gdbhooks Programs/_testembed scripts checksharedmods rundsymutil .PHONY: build_wasm -@@ -785,9 +788,21 @@ coverage-report: regen-token regen-frozen +@@ -789,9 +792,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 93e23f0..4064977 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 -@@ -876,10 +891,10 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \ +@@ -880,10 +895,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 93e23f0..4064977 100644 else true; \ fi -@@ -1975,6 +1990,7 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@ +@@ -1979,6 +1994,7 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@ done if test "$(PYTHONFRAMEWORKDIR)" = "no-framework" ; then \ $(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \ @@ -95,7 +95,7 @@ index 93e23f0..4064977 100644 $(INSTALL_PROGRAM) $(STRIPFLAG) Mac/pythonw $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \ fi diff --git a/configure.ac b/configure.ac -index 3b4745f..d690f92 100644 +index 70927d5..973848f 100644 --- a/configure.ac +++ b/configure.ac @@ -1759,6 +1759,10 @@ AC_SUBST([LINK_PYTHON_OBJS]) @@ -109,7 +109,7 @@ index 3b4745f..d690f92 100644 # tweak ARFLAGS only if the user didn't set it on the command line AC_SUBST([ARFLAGS]) if test -z "$ARFLAGS" -@@ -7057,10 +7061,33 @@ AC_MSG_RESULT([done]) +@@ -7084,10 +7088,33 @@ AC_MSG_RESULT([done]) case $host in *-*-mingw*) LIBS="$LIBS -lversion -lshlwapi -lpathcch" diff --git a/mingw-w64-python3.12/0041-fix-isselectable.patch b/mingw-w64-python3.12/0041-fix-isselectable.patch index 3e97eb9a1558c..1cde505012207 100644 --- a/mingw-w64-python3.12/0041-fix-isselectable.patch +++ b/mingw-w64-python3.12/0041-fix-isselectable.patch @@ -1,4 +1,4 @@ -From 2ce010ce13a1b5cff820c53de40cfd25e15f5183 Mon Sep 17 00:00:00 2001 +From 29cc76e8473e9f021faa7ed77c96bbb15f6114f2 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:18 +0530 Subject: [PATCH 041/N] fix isselectable diff --git a/mingw-w64-python3.12/0042-configure.ac-fix-inet_pton-check.patch b/mingw-w64-python3.12/0042-configure.ac-fix-inet_pton-check.patch index b3edb32defa2a..f67b106e79005 100644 --- a/mingw-w64-python3.12/0042-configure.ac-fix-inet_pton-check.patch +++ b/mingw-w64-python3.12/0042-configure.ac-fix-inet_pton-check.patch @@ -1,4 +1,4 @@ -From 2b67fbdb9fdd6588ff43a9738d199eec52e16f5f Mon Sep 17 00:00:00 2001 +From ecacc24bff66230efac7a8b864b82fb608a45630 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:23 +0530 Subject: [PATCH 042/N] configure.ac: fix inet_pton check @@ -12,10 +12,10 @@ Co-authored-by: Алексей 1 file changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac -index d690f92..0fd77b9 100644 +index 973848f..38b2a1a 100644 --- a/configure.ac +++ b/configure.ac -@@ -5353,10 +5353,14 @@ PY_CHECK_NETDB_FUNC([getprotobyname]) +@@ -5379,10 +5379,14 @@ PY_CHECK_NETDB_FUNC([getprotobyname]) dnl PY_CHECK_SOCKET_FUNC(FUNCTION) AC_DEFUN([PY_CHECK_SOCKET_FUNC], [PY_CHECK_FUNC([$1], [ diff --git a/mingw-w64-python3.12/0043-pass-gen-profile-ldflags.patch b/mingw-w64-python3.12/0043-pass-gen-profile-ldflags.patch index 368cacb340af6..db385edb51f6b 100644 --- a/mingw-w64-python3.12/0043-pass-gen-profile-ldflags.patch +++ b/mingw-w64-python3.12/0043-pass-gen-profile-ldflags.patch @@ -1,4 +1,4 @@ -From 942ce0ac16624b91e753ab21eae6d75f343be536 Mon Sep 17 00:00:00 2001 +From 3fa8828664f58df2aa348b30f97d0a53f38b58a4 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:27 +0530 Subject: [PATCH 043/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 4064977..03fa15e 100644 +index cba776e..c430bc5 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -894,7 +894,7 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \ +@@ -898,7 +898,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-python3.12/0044-pkg-config-windows-must-link-ext-with-python-lib.patch b/mingw-w64-python3.12/0044-pkg-config-windows-must-link-ext-with-python-lib.patch index 7cb567adaa9cf..aece6e2eb9ed7 100644 --- a/mingw-w64-python3.12/0044-pkg-config-windows-must-link-ext-with-python-lib.patch +++ b/mingw-w64-python3.12/0044-pkg-config-windows-must-link-ext-with-python-lib.patch @@ -1,4 +1,4 @@ -From 4f5ce776066be9e6c3ef959dfd204c1ce6cc2b10 Mon Sep 17 00:00:00 2001 +From 8920050edd896819c84d607dbc56ee9fa8b51ee7 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 @@ -9,10 +9,10 @@ Subject: [PATCH 044/N] pkg config windows must link ext with python lib 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 0fd77b9..0e15ece 100644 +index 38b2a1a..10e4a8a 100644 --- a/configure.ac +++ b/configure.ac -@@ -6233,7 +6233,7 @@ AC_MSG_RESULT([$LDVERSION]) +@@ -6260,7 +6260,7 @@ AC_MSG_RESULT([$LDVERSION]) # On Android and Cygwin the shared libraries must be linked with libpython. AC_SUBST([LIBPYTHON]) diff --git a/mingw-w64-python3.12/0045-importlib-bootstrap-path-sep.patch b/mingw-w64-python3.12/0045-importlib-bootstrap-path-sep.patch index 0ec82dc6be63a..7bc9e32952c5c 100644 --- a/mingw-w64-python3.12/0045-importlib-bootstrap-path-sep.patch +++ b/mingw-w64-python3.12/0045-importlib-bootstrap-path-sep.patch @@ -1,4 +1,4 @@ -From 2209bcf1e009fc08bf11a8cfc18274c875bf7d11 Mon Sep 17 00:00:00 2001 +From 8a01da234af8e4f2e27973eefe8de5c4f113c680 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:30 +0530 Subject: [PATCH 045/N] importlib bootstrap path sep @@ -13,10 +13,10 @@ Co-authored-by: Naveen M K 1 file changed, 4 insertions(+) diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py -index 73ac440..42d987d 100644 +index 61dafc0..dc2d02b 100644 --- a/Lib/importlib/_bootstrap_external.py +++ b/Lib/importlib/_bootstrap_external.py -@@ -42,6 +42,10 @@ +@@ -42,6 +42,10 @@ if _MS_WINDOWS: path_separators = ['\\', '/'] else: path_separators = ['/'] diff --git a/mingw-w64-python3.12/0046-warnings-fixes.patch b/mingw-w64-python3.12/0046-warnings-fixes.patch index ebe13e0deb369..21ae20ea894f5 100644 --- a/mingw-w64-python3.12/0046-warnings-fixes.patch +++ b/mingw-w64-python3.12/0046-warnings-fixes.patch @@ -1,4 +1,4 @@ -From a236eba8384c4f6bc6681520c4d829686eadcd8e Mon Sep 17 00:00:00 2001 +From 9a372d04def89d34f65ae228ebfed147ba36227f 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 @@ -14,10 +14,10 @@ Subject: [PATCH 046/N] warnings fixes 6 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Modules/_winapi.c b/Modules/_winapi.c -index fda1171..d25f244 100644 +index dd4fe8b..87a8f47 100644 --- a/Modules/_winapi.c +++ b/Modules/_winapi.c -@@ -962,7 +962,7 @@ getattributelist(PyObject *obj, const char *name, AttributeList *attribute_list) +@@ -1127,7 +1127,7 @@ getattributelist(PyObject *obj, const char *name, AttributeList *attribute_list) DWORD err; BOOL result; PyObject *value; @@ -27,10 +27,10 @@ index fda1171..d25f244 100644 SIZE_T attribute_list_size = 0; diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 38687e0..0cff7d6 100644 +index a41a23b..a78c135 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c -@@ -6241,7 +6241,7 @@ os_utime_impl(PyObject *module, path_t *path, PyObject *times, PyObject *ns, +@@ -6277,7 +6277,7 @@ os_utime_impl(PyObject *module, path_t *path, PyObject *times, PyObject *ns, /*[clinic end generated code: output=cfcac69d027b82cf input=2fbd62a2f228f8f4]*/ { #ifdef MS_WINDOWS diff --git a/mingw-w64-python3.12/0047-fix-build-testinternalcapi.patch b/mingw-w64-python3.12/0047-fix-build-testinternalcapi.patch index 7384af8f950eb..436d3d47aa930 100644 --- a/mingw-w64-python3.12/0047-fix-build-testinternalcapi.patch +++ b/mingw-w64-python3.12/0047-fix-build-testinternalcapi.patch @@ -1,4 +1,4 @@ -From 6d9f3fe8ccd271283b7f42beb6f77047cc5892f0 Mon Sep 17 00:00:00 2001 +From 7cfcf8aba718273f6e8633be26cddbc2e6027b35 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Sat, 17 Jun 2023 00:21:25 +0530 Subject: [PATCH 047/N] fix build testinternalcapi @@ -8,10 +8,10 @@ Subject: [PATCH 047/N] fix build testinternalcapi 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 0e15ece..9fec1f9 100644 +index 10e4a8a..4126c37 100644 --- a/configure.ac +++ b/configure.ac -@@ -7848,7 +7848,7 @@ PY_STDLIB_MOD([_overlapped], [test "$MACHDEP" = "win32"], [], [], +@@ -7888,7 +7888,7 @@ PY_STDLIB_MOD([_overlapped], [test "$MACHDEP" = "win32"], [], [], dnl test modules PY_STDLIB_MOD([_testcapi], [test "$TEST_MODULES" = yes]) PY_STDLIB_MOD([_testclinic], [test "$TEST_MODULES" = yes]) diff --git a/mingw-w64-python3.12/0048-clang-arm64.patch b/mingw-w64-python3.12/0048-clang-arm64.patch index a2a7e23d8d825..5f45972641685 100644 --- a/mingw-w64-python3.12/0048-clang-arm64.patch +++ b/mingw-w64-python3.12/0048-clang-arm64.patch @@ -1,4 +1,4 @@ -From da616a0b3495114d4eadf7f05f0ef9fa3afce904 Mon Sep 17 00:00:00 2001 +From df36a51a5ac2f352125a8831ef91ca4ebf84508f 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 048/N] clang arm64 diff --git a/mingw-w64-python3.12/0049-configure.ac-set-MINGW-stack-reserve.patch b/mingw-w64-python3.12/0049-configure.ac-set-MINGW-stack-reserve.patch index c07915853db31..1155a90c2c706 100644 --- a/mingw-w64-python3.12/0049-configure.ac-set-MINGW-stack-reserve.patch +++ b/mingw-w64-python3.12/0049-configure.ac-set-MINGW-stack-reserve.patch @@ -1,4 +1,4 @@ -From 43f2ea75ddebca53bd0959da3bd3e3356004f304 Mon Sep 17 00:00:00 2001 +From 9e43b2b81cccce43f32a4289e6a5c55cc60c34f2 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 049/N] configure.ac: set MINGW stack reserve @@ -8,17 +8,17 @@ Subject: [PATCH 049/N] configure.ac: set MINGW stack reserve 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac -index 9fec1f9..4851088 100644 +index 4126c37..71540b5 100644 --- a/configure.ac +++ b/configure.ac -@@ -3696,6 +3696,11 @@ then +@@ -3722,6 +3722,11 @@ then VxWorks*) LINKFORSHARED='-Wl,-export-dynamic';; esac + case $host in + *-*-mingw*) + # for https://bugs.python.org/issue40458 on MINGW -+ LINKFORSHARED="-Wl,--stack,2000000";; ++ LINKFORSHARED="-Wl,--stack,4194304";; + esac fi AC_MSG_RESULT([$LINKFORSHARED]) diff --git a/mingw-w64-python3.12/0050-Don-t-use-os.pathsep-to-find-EOF.patch b/mingw-w64-python3.12/0050-Don-t-use-os.pathsep-to-find-EOF.patch index d02f99b1ea5d2..4a03a07e1a645 100644 --- a/mingw-w64-python3.12/0050-Don-t-use-os.pathsep-to-find-EOF.patch +++ b/mingw-w64-python3.12/0050-Don-t-use-os.pathsep-to-find-EOF.patch @@ -1,4 +1,4 @@ -From 1860e5a5ee72f8ca60e5e5c549e8d1964bf1cfb2 Mon Sep 17 00:00:00 2001 +From c80ff73cde38f612e9cf6a5068c525a23ca88761 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 18 Jun 2021 12:38:11 +0530 Subject: [PATCH 050/N] Don't use os.pathsep to find EOF not all @@ -10,10 +10,10 @@ Signed-off-by: Naveen M K 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/site.py b/Lib/site.py -index 4cbb55c..7c89370 100644 +index 4df0357..febf254 100644 --- a/Lib/site.py +++ b/Lib/site.py -@@ -398,7 +398,7 @@ def setquit(): +@@ -419,7 +419,7 @@ def setquit(): The repr of each object contains a hint at how it works. """ diff --git a/mingw-w64-python3.12/0051-Fix-extension-suffix-for-c-extensions-on-mingw.patch b/mingw-w64-python3.12/0051-Fix-extension-suffix-for-c-extensions-on-mingw.patch index 02d1f57e2242b..4733862128c21 100644 --- a/mingw-w64-python3.12/0051-Fix-extension-suffix-for-c-extensions-on-mingw.patch +++ b/mingw-w64-python3.12/0051-Fix-extension-suffix-for-c-extensions-on-mingw.patch @@ -1,4 +1,4 @@ -From efa19dfbf3d56c42a0a33aa77a2eec9466f4f434 Mon Sep 17 00:00:00 2001 +From 25c454ecefa7137a47c45bdf429d416cbd9d8044 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Wed, 23 Jun 2021 18:12:12 +0530 Subject: [PATCH 051/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 03fa15e..7ca010b 100644 +index c430bc5..743caff 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -174,6 +174,7 @@ CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(LDVERSION) @@ -32,7 +32,7 @@ index 03fa15e..7ca010b 100644 LDSHARED= @LDSHARED@ $(PY_LDFLAGS) BLDSHARED= @BLDSHARED@ $(PY_CORE_LDFLAGS) LDCXXSHARED= @LDCXXSHARED@ -@@ -1399,8 +1400,7 @@ Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile +@@ -1403,8 +1404,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 03fa15e..7ca010b 100644 -o $@ $(srcdir)/Python/dynload_win.c Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile $(srcdir)/Include/pydtrace.h -@@ -2462,7 +2462,7 @@ libainstall: all scripts +@@ -2476,7 +2476,7 @@ libainstall: all scripts @if test "$(STATIC_LIBPYTHON)" = 1; then \ if test -d $(LIBRARY); then :; else \ if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \ @@ -69,10 +69,10 @@ index 4bb90ba..26d6036 100644 PYD_UNTAGGED_SUFFIX, NULL diff --git a/configure.ac b/configure.ac -index 4851088..6700d52 100644 +index 71540b5..c50907c 100644 --- a/configure.ac +++ b/configure.ac -@@ -3438,7 +3438,7 @@ if test -z "$SHLIB_SUFFIX"; then +@@ -3464,7 +3464,7 @@ if test -z "$SHLIB_SUFFIX"; then *) SHLIB_SUFFIX=.so;; esac case $host_os in @@ -81,7 +81,7 @@ index 4851088..6700d52 100644 esac fi AC_MSG_RESULT([$SHLIB_SUFFIX]) -@@ -6198,6 +6198,68 @@ esac +@@ -6225,6 +6225,68 @@ esac # check for endianness AC_C_BIGENDIAN @@ -150,7 +150,7 @@ index 4851088..6700d52 100644 # ABI version string for Python extension modules. This appears between the # periods in shared library file names, e.g. foo..so. It is calculated # from the following attributes which affect the ABI of this Python build (in -@@ -6230,7 +6292,12 @@ if test "$Py_DEBUG" = 'true' -a "$with_trace_refs" != "yes"; then +@@ -6257,7 +6319,12 @@ if test "$Py_DEBUG" = 'true' -a "$with_trace_refs" != "yes"; then fi AC_SUBST([EXT_SUFFIX]) @@ -164,7 +164,7 @@ index 4851088..6700d52 100644 AC_MSG_CHECKING([LDVERSION]) LDVERSION='$(VERSION)$(ABIFLAGS)' -@@ -6989,12 +7056,6 @@ case "$ac_cv_computed_gotos" in yes*) +@@ -7016,12 +7083,6 @@ case "$ac_cv_computed_gotos" in yes*) AC_DEFINE([HAVE_COMPUTED_GOTOS], [1], [Define if the C compiler supports computed gotos.]) esac diff --git a/mingw-w64-python3.12/0052-Change-the-get_platform-method-in-sysconfig.patch b/mingw-w64-python3.12/0052-Change-the-get_platform-method-in-sysconfig.patch index 6fcf88d460b4d..7a3769d69c3bd 100644 --- a/mingw-w64-python3.12/0052-Change-the-get_platform-method-in-sysconfig.patch +++ b/mingw-w64-python3.12/0052-Change-the-get_platform-method-in-sysconfig.patch @@ -1,4 +1,4 @@ -From 3a72056f0b45a37febb548801e9d45c55cc06889 Mon Sep 17 00:00:00 2001 +From c29d51b354d8a455494b400dbdfb1db8a149bb66 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Tue, 21 Sep 2021 21:36:58 +0200 Subject: [PATCH 052/N] Change the `get_platform()` method in sysconfig diff --git a/mingw-w64-python3.12/0053-build-Fix-ncursesw-include-lookup.patch b/mingw-w64-python3.12/0053-build-Fix-ncursesw-include-lookup.patch index e5a7f5a28c7df..bcb9db527ff85 100644 --- a/mingw-w64-python3.12/0053-build-Fix-ncursesw-include-lookup.patch +++ b/mingw-w64-python3.12/0053-build-Fix-ncursesw-include-lookup.patch @@ -1,4 +1,4 @@ -From 441d13f416a1b0b4e68fef763a2d798408f40259 Mon Sep 17 00:00:00 2001 +From 9ea12576fd0ea9a288611a057bf66f01cc2d755f 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 @@ -12,7 +12,7 @@ pkg-config and use the exported path via sysconfig in setup.py 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 7ca010b..769fabc 100644 +index 743caff..d1388ab 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -347,6 +347,10 @@ IO_OBJS= \ @@ -27,10 +27,10 @@ index 7ca010b..769fabc 100644 # Parser diff --git a/configure.ac b/configure.ac -index 6700d52..4f71199 100644 +index c50907c..6f8bc1e 100644 --- a/configure.ac +++ b/configure.ac -@@ -6849,10 +6849,17 @@ AS_VAR_IF([have_panel], [no], [ +@@ -6876,10 +6876,17 @@ AS_VAR_IF([have_panel], [no], [ AC_MSG_RESULT([$have_panel (CFLAGS: $PANEL_CFLAGS, LIBS: $PANEL_LIBS)]) ]) diff --git a/mingw-w64-python3.12/0054-tests-fix-test_bytes.patch b/mingw-w64-python3.12/0054-tests-fix-test_bytes.patch index 26f589dcbd49d..6aa74680408c4 100644 --- a/mingw-w64-python3.12/0054-tests-fix-test_bytes.patch +++ b/mingw-w64-python3.12/0054-tests-fix-test_bytes.patch @@ -1,4 +1,4 @@ -From 2a749b397722a1a87534eb64f000d19f4f993956 Mon Sep 17 00:00:00 2001 +From 507ec6825475dccf846d40de1cccab8d53549805 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 23 Jul 2021 08:51:32 +0200 Subject: [PATCH 054/N] tests: fix test_bytes @@ -13,7 +13,7 @@ diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py index a3804a9..4997534 100644 --- a/Lib/test/test_bytes.py +++ b/Lib/test/test_bytes.py -@@ -1136,7 +1136,7 @@ def test_from_format(self): +@@ -1136,7 +1136,7 @@ class BytesTest(BaseBytesTest, unittest.TestCase): if os.name == 'nt': # Windows (MSCRT) diff --git a/mingw-w64-python3.12/0055-time-fix-strftime-not-raising-for-invalid-year-value.patch b/mingw-w64-python3.12/0055-time-fix-strftime-not-raising-for-invalid-year-value.patch index 80139312ad96a..465850315b8f9 100644 --- a/mingw-w64-python3.12/0055-time-fix-strftime-not-raising-for-invalid-year-value.patch +++ b/mingw-w64-python3.12/0055-time-fix-strftime-not-raising-for-invalid-year-value.patch @@ -1,4 +1,4 @@ -From 490320311882e23c1afc259695f788f74e310945 Mon Sep 17 00:00:00 2001 +From d28b9d97b11fbe343787b79d1cf562505497d919 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 23 Jul 2021 08:52:50 +0200 Subject: [PATCH 055/N] time: fix strftime not raising for invalid year @@ -11,10 +11,10 @@ This fixes a test case in test_time 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/timemodule.c b/Modules/timemodule.c -index 3b46dea..aea6097 100644 +index 8613fcc..f04d236 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c -@@ -825,7 +825,7 @@ time_strftime(PyObject *module, PyObject *args) +@@ -832,7 +832,7 @@ time_strftime(PyObject *module, PyObject *args) return NULL; } diff --git a/mingw-w64-python3.12/0056-ctypes-find_library-c-should-return-None-with-ucrt.patch b/mingw-w64-python3.12/0056-ctypes-find_library-c-should-return-None-with-ucrt.patch index a7fa56b1b590a..bac8d17631c10 100644 --- a/mingw-w64-python3.12/0056-ctypes-find_library-c-should-return-None-with-ucrt.patch +++ b/mingw-w64-python3.12/0056-ctypes-find_library-c-should-return-None-with-ucrt.patch @@ -1,4 +1,4 @@ -From 4e38eab6ba68953f78ca95f6e133f2de1cac6db3 Mon Sep 17 00:00:00 2001 +From 3a658507823f206d1fdcc83c693d230f1743e6c7 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 23 Jul 2021 18:23:58 +0200 Subject: [PATCH 056/N] ctypes: find_library('c') should return None with @@ -10,10 +10,10 @@ Just like with MSVC. This fixes a test in test_ctypes. 1 file changed, 9 insertions(+) diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py -index 0c2510e..48ddb3b 100644 +index c550883..a5a2a3f 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py -@@ -31,6 +31,12 @@ def _get_build_version(): +@@ -31,6 +31,12 @@ if os.name == "nt": # else we don't know what version of the compiler this is return None @@ -26,7 +26,7 @@ index 0c2510e..48ddb3b 100644 def find_msvcrt(): """Return the name of the VC runtime dll""" version = _get_build_version() -@@ -54,6 +60,9 @@ def find_msvcrt(): +@@ -54,6 +60,9 @@ if os.name == "nt": def find_library(name): if name in ('c', 'm'): diff --git a/mingw-w64-python3.12/0057-build-Disable-checks-for-dlopen-dlfcn.patch b/mingw-w64-python3.12/0057-build-Disable-checks-for-dlopen-dlfcn.patch index 7a958ad177059..05bfb2846eff5 100644 --- a/mingw-w64-python3.12/0057-build-Disable-checks-for-dlopen-dlfcn.patch +++ b/mingw-w64-python3.12/0057-build-Disable-checks-for-dlopen-dlfcn.patch @@ -1,4 +1,4 @@ -From cd274c6a6ba955931e0d794c2037470e0918bd24 Mon Sep 17 00:00:00 2001 +From af9d6179fa1b646e2e6b1c983a4319ce8d5c1999 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 13:54:12 +0200 Subject: [PATCH 057/N] build: Disable checks for dlopen/dlfcn @@ -10,10 +10,10 @@ checks for it. 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 4f71199..4b0cd79 100644 +index 6f8bc1e..794204a 100644 --- a/configure.ac +++ b/configure.ac -@@ -3026,7 +3026,7 @@ AC_DEFINE([STDC_HEADERS], [1], +@@ -3034,7 +3034,7 @@ AC_DEFINE([STDC_HEADERS], [1], # checks for header files AC_CHECK_HEADERS([ \ @@ -22,7 +22,7 @@ index 4f71199..4b0cd79 100644 ieeefp.h io.h langinfo.h libintl.h libutil.h linux/auxvec.h sys/auxv.h linux/fs.h linux/limits.h linux/memfd.h \ linux/random.h linux/soundcard.h \ linux/tipc.h linux/wait.h netdb.h net/ethernet.h netinet/in.h netpacket/packet.h poll.h process.h pty.h \ -@@ -3038,6 +3038,13 @@ AC_CHECK_HEADERS([ \ +@@ -3046,6 +3046,13 @@ AC_CHECK_HEADERS([ \ sys/types.h sys/uio.h sys/un.h sys/utsname.h sys/wait.h sys/xattr.h sysexits.h syslog.h \ termios.h util.h utime.h utmp.h \ ]) @@ -36,7 +36,7 @@ index 4f71199..4b0cd79 100644 AC_HEADER_DIRENT AC_HEADER_MAJOR -@@ -3765,7 +3772,12 @@ AC_SUBST([PERF_TRAMPOLINE_OBJ]) +@@ -3791,7 +3798,12 @@ AC_SUBST([PERF_TRAMPOLINE_OBJ]) # checks for libraries AC_CHECK_LIB([sendfile], [sendfile]) @@ -50,7 +50,7 @@ index 4f71199..4b0cd79 100644 AC_CHECK_LIB([dld], [shl_load]) # Dynamic linking for HP-UX -@@ -6108,7 +6120,10 @@ AS_VAR_IF([ac_cv_broken_sem_getvalue], [yes], [ +@@ -6135,7 +6147,10 @@ AS_VAR_IF([ac_cv_broken_sem_getvalue], [yes], [ ) ]) diff --git a/mingw-w64-python3.12/0058-Fix-install-location-of-the-import-library.patch b/mingw-w64-python3.12/0058-Fix-install-location-of-the-import-library.patch index 89f363b6a66f0..9629c42b7163d 100644 --- a/mingw-w64-python3.12/0058-Fix-install-location-of-the-import-library.patch +++ b/mingw-w64-python3.12/0058-Fix-install-location-of-the-import-library.patch @@ -1,4 +1,4 @@ -From 3002b516f9a4a13744b94f51259b6db15576def7 Mon Sep 17 00:00:00 2001 +From 3a43ce5faf7e71e00e899c124f0429348c18fe51 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 15:46:01 +0200 Subject: [PATCH 058/N] Fix install location of the import library @@ -8,10 +8,10 @@ Subject: [PATCH 058/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 769fabc..84fc56c 100644 +index d1388ab..65bc0a5 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2467,7 +2467,7 @@ libainstall: all scripts +@@ -2481,7 +2481,7 @@ libainstall: all scripts 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-python3.12/0059-build-Integrate-venvlauncher-build-installation-into.patch b/mingw-w64-python3.12/0059-build-Integrate-venvlauncher-build-installation-into.patch index 93d95adb75f22..94c4523e76440 100644 --- a/mingw-w64-python3.12/0059-build-Integrate-venvlauncher-build-installation-into.patch +++ b/mingw-w64-python3.12/0059-build-Integrate-venvlauncher-build-installation-into.patch @@ -1,4 +1,4 @@ -From 6d8ce76ab34dd2571362037b4eaf0088b1c58641 Mon Sep 17 00:00:00 2001 +From b0e5bce43256bf7da1b9262ba89f0bd27c9d6d42 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 16:53:35 +0200 Subject: [PATCH 059/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 84fc56c..4a6e692 100644 +index 65bc0a5..c371209 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -170,6 +170,7 @@ BINLIBDEST= @BINLIBDEST@ @@ -32,7 +32,7 @@ index 84fc56c..4a6e692 100644 HOSTRUNNER= @HOSTRUNNER@ -@@ -628,7 +631,7 @@ all: @DEF_MAKE_ALL_RULE@ +@@ -630,7 +633,7 @@ all: @DEF_MAKE_ALL_RULE@ .PHONY: all .PHONY: build_all @@ -41,7 +41,7 @@ index 84fc56c..4a6e692 100644 gdbhooks Programs/_testembed scripts checksharedmods rundsymutil .PHONY: build_wasm -@@ -809,6 +812,14 @@ $(BUILDPYTHONW): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) pythonw +@@ -813,6 +816,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 84fc56c..4a6e692 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 -@@ -1984,7 +1995,7 @@ sharedinstall: all +@@ -1988,7 +1999,7 @@ sharedinstall: all # This goes into $(exec_prefix) .PHONY: altbininstall altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@ @@ -65,7 +65,7 @@ index 84fc56c..4a6e692 100644 do \ if test ! -d $(DESTDIR)$$i; then \ echo "Creating directory $$i"; \ -@@ -1995,6 +2006,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@ +@@ -1999,6 +2010,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-python3.12/0060-configure.ac-set-_WIN32_WINNT-version.patch b/mingw-w64-python3.12/0060-configure.ac-set-_WIN32_WINNT-version.patch index 89f35a9bb4fbe..44c7a7685c6d3 100644 --- a/mingw-w64-python3.12/0060-configure.ac-set-_WIN32_WINNT-version.patch +++ b/mingw-w64-python3.12/0060-configure.ac-set-_WIN32_WINNT-version.patch @@ -1,4 +1,4 @@ -From cdf16e5cb3f6b36a4406b41bd7339986ae2fc4e9 Mon Sep 17 00:00:00 2001 +From 0ef0faaf641fa0098f03526c222e14cda279dfd6 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 1 Aug 2021 15:18:50 +0200 Subject: [PATCH 060/N] configure.ac: set _WIN32_WINNT version @@ -8,10 +8,10 @@ Subject: [PATCH 060/N] configure.ac: set _WIN32_WINNT version 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac -index 4b0cd79..f14e51a 100644 +index 794204a..523567a 100644 --- a/configure.ac +++ b/configure.ac -@@ -4547,6 +4547,11 @@ done +@@ -4573,6 +4573,11 @@ done IFS=$as_save_IFS AC_MSG_RESULT([$DBM_CFLAGS $DBM_LIBS]) diff --git a/mingw-w64-python3.12/0061-configure.ac-don-t-check-for-clock_-functions.patch b/mingw-w64-python3.12/0061-configure.ac-don-t-check-for-clock_-functions.patch index ac612f7bbb5e4..957f271301dca 100644 --- a/mingw-w64-python3.12/0061-configure.ac-don-t-check-for-clock_-functions.patch +++ b/mingw-w64-python3.12/0061-configure.ac-don-t-check-for-clock_-functions.patch @@ -1,4 +1,4 @@ -From aa626c00d72c0dd5a258f39673bf54bbe8b56fd2 Mon Sep 17 00:00:00 2001 +From 11883cf272a2d7a37f25a508ecdb22e80d4a6801 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 1 Aug 2021 18:35:17 +0200 Subject: [PATCH 061/N] configure.ac: don't check for clock_ functions @@ -9,10 +9,10 @@ They shouldn't be exposed on Windows and lead to winpthread being linked in 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac -index f14e51a..fc1f083 100644 +index 523567a..3b0501c 100644 --- a/configure.ac +++ b/configure.ac -@@ -5488,6 +5488,9 @@ WITH_SAVE_ENV([ +@@ -5514,6 +5514,9 @@ WITH_SAVE_ENV([ ]) ]) @@ -22,7 +22,7 @@ index f14e51a..fc1f083 100644 AC_CHECK_FUNCS([clock_gettime], [], [ AC_CHECK_LIB([rt], [clock_gettime], [ LIBS="$LIBS -lrt" -@@ -5508,6 +5511,8 @@ AC_CHECK_FUNCS([clock_settime], [], [ +@@ -5534,6 +5537,8 @@ AC_CHECK_FUNCS([clock_settime], [], [ AC_DEFINE([HAVE_CLOCK_SETTIME], [1]) ]) ]) diff --git a/mingw-w64-python3.12/0062-expanduser-normpath-paths-coming-from-env-vars.patch b/mingw-w64-python3.12/0062-expanduser-normpath-paths-coming-from-env-vars.patch index 3707937d7ac34..02f72d5a6accc 100644 --- a/mingw-w64-python3.12/0062-expanduser-normpath-paths-coming-from-env-vars.patch +++ b/mingw-w64-python3.12/0062-expanduser-normpath-paths-coming-from-env-vars.patch @@ -1,4 +1,4 @@ -From bc61e3a11754715d70914052e159ee0e6f0046bc Mon Sep 17 00:00:00 2001 +From 44d8cdddaa23f2ffb0313c2ab2658e575f2be7ea Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 8 Aug 2021 10:17:35 +0200 Subject: [PATCH 062/N] expanduser: normpath paths coming from env vars @@ -9,7 +9,7 @@ This makes sure we get the same paths as with related functions in pathlib. 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/ntpath.py b/Lib/ntpath.py -index ce683b1..309235b 100644 +index 108ffce..fca193b 100644 --- a/Lib/ntpath.py +++ b/Lib/ntpath.py @@ -379,7 +379,7 @@ def expanduser(path): diff --git a/mingw-w64-python3.12/0063-CI-test-the-build-and-add-some-mingw-specific-tests.patch b/mingw-w64-python3.12/0063-CI-test-the-build-and-add-some-mingw-specific-tests.patch index 82ba6cf330b67..a4cbfcf5e42b4 100644 --- a/mingw-w64-python3.12/0063-CI-test-the-build-and-add-some-mingw-specific-tests.patch +++ b/mingw-w64-python3.12/0063-CI-test-the-build-and-add-some-mingw-specific-tests.patch @@ -1,4 +1,4 @@ -From 4c1a33f26848d4e2a3107d910101edebf558a905 Mon Sep 17 00:00:00 2001 +From 6ff102ff6817dbd5b6f134dabf6aac4e01434ac0 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 18 Jun 2021 17:51:59 +0530 Subject: [PATCH 063/N] CI: test the build and add some mingw specific tests diff --git a/mingw-w64-python3.12/0064-Define-PY3_DLLNAME-to-fix-build.patch b/mingw-w64-python3.12/0064-Define-PY3_DLLNAME-to-fix-build.patch index f836e2b937d0e..18b4916870010 100644 --- a/mingw-w64-python3.12/0064-Define-PY3_DLLNAME-to-fix-build.patch +++ b/mingw-w64-python3.12/0064-Define-PY3_DLLNAME-to-fix-build.patch @@ -1,4 +1,4 @@ -From 731fa5ca973d4ceca4f8679e17a176051314bb2c Mon Sep 17 00:00:00 2001 +From 67680b59f59b8bb1dd454f836609263c209f1dc0 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Tue, 12 Oct 2021 18:35:21 +0530 Subject: [PATCH 064/N] Define PY3_DLLNAME to fix build @@ -12,10 +12,10 @@ Co-authored-by: jeremyd2019 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index fc1f083..2d3c574 100644 +index 3b0501c..2ebe8e4 100644 --- a/configure.ac +++ b/configure.ac -@@ -5093,7 +5093,7 @@ then +@@ -5119,7 +5119,7 @@ then *-*-mingw*) DYNLOADFILE="dynload_win.o" extra_machdep_objs="$extra_machdep_objs PC/dl_nt.o" diff --git a/mingw-w64-python3.12/0065-_testconsole.c-Fix-casing-path-sep.patch b/mingw-w64-python3.12/0065-_testconsole.c-Fix-casing-path-sep.patch index c8ace8582a188..6cfbdb0437ab9 100644 --- a/mingw-w64-python3.12/0065-_testconsole.c-Fix-casing-path-sep.patch +++ b/mingw-w64-python3.12/0065-_testconsole.c-Fix-casing-path-sep.patch @@ -1,4 +1,4 @@ -From 453ebc55f3cc7a69f946f6ba43c89afe455cd052 Mon Sep 17 00:00:00 2001 +From 9277ca4f9061ca8f72b1363fff3f4113a803cd4d Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Sun, 14 Nov 2021 14:55:35 +0700 Subject: [PATCH 065/N] _testconsole.c: Fix casing & path sep diff --git a/mingw-w64-python3.12/0066-Return-consistent-architecture-markers-for-python-on.patch b/mingw-w64-python3.12/0066-Return-consistent-architecture-markers-for-python-on.patch index ee4791d423065..9f254c7a54e39 100644 --- a/mingw-w64-python3.12/0066-Return-consistent-architecture-markers-for-python-on.patch +++ b/mingw-w64-python3.12/0066-Return-consistent-architecture-markers-for-python-on.patch @@ -1,4 +1,4 @@ -From 52eb9560ea54ecf155b91c01fa1c305367f0c19d Mon Sep 17 00:00:00 2001 +From 04211609bedaf3d1cf4ab0059c8a4448e0607313 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 066/N] Return consistent architecture markers for python on @@ -37,10 +37,10 @@ index 275f799..4b0b9b3 100644 #define ARCH_SUFFIX " 32 bit" #endif diff --git a/configure.ac b/configure.ac -index 2d3c574..ecab56d 100644 +index 2ebe8e4..55feaf0 100644 --- a/configure.ac +++ b/configure.ac -@@ -6281,6 +6281,9 @@ case $host_os in +@@ -6308,6 +6308,9 @@ case $host_os in aarch64-*-mingw*) PYD_PLATFORM_TAG+="mingw_aarch64" ;; diff --git a/mingw-w64-python3.12/0067-handle-ncursesw-pkg-config-when-cross-compiling.patch b/mingw-w64-python3.12/0067-handle-ncursesw-pkg-config-when-cross-compiling.patch index 8935f84990b63..d0275d5e8aeac 100644 --- a/mingw-w64-python3.12/0067-handle-ncursesw-pkg-config-when-cross-compiling.patch +++ b/mingw-w64-python3.12/0067-handle-ncursesw-pkg-config-when-cross-compiling.patch @@ -1,4 +1,4 @@ -From 0ade53e4e7d444daa47672893ce07167cec84162 Mon Sep 17 00:00:00 2001 +From 38336800b0a0b12a3cd541a85e4019b953f2d3a8 Mon Sep 17 00:00:00 2001 From: jeremyd2019 Date: Mon, 22 Nov 2021 16:04:41 -0800 Subject: [PATCH 067/N] handle ncursesw pkg-config when cross-compiling @@ -11,10 +11,10 @@ Use pkg-config ncursesw include dir even if cross-compiling (PKG_CONFIG_PATH sho 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index ecab56d..f07fce5 100644 +index 55feaf0..988744b 100644 --- a/configure.ac +++ b/configure.ac -@@ -6878,7 +6878,7 @@ AS_VAR_IF([have_panel], [no], [ +@@ -6905,7 +6905,7 @@ AS_VAR_IF([have_panel], [no], [ ]) if test -n "$PKG_CONFIG"; then @@ -23,7 +23,7 @@ index ecab56d..f07fce5 100644 else NCURSESW_INCLUDEDIR="" fi -@@ -6886,9 +6886,7 @@ AC_SUBST(NCURSESW_INCLUDEDIR) +@@ -6913,9 +6913,7 @@ AC_SUBST(NCURSESW_INCLUDEDIR) # first curses header check ac_save_cppflags="$CPPFLAGS" diff --git a/mingw-w64-python3.12/0068-mingw_smoketests-fix-_UCRT-condition.patch b/mingw-w64-python3.12/0068-mingw_smoketests-fix-_UCRT-condition.patch index 52f46cbbc6d46..1e9adde6c9b25 100644 --- a/mingw-w64-python3.12/0068-mingw_smoketests-fix-_UCRT-condition.patch +++ b/mingw-w64-python3.12/0068-mingw_smoketests-fix-_UCRT-condition.patch @@ -1,4 +1,4 @@ -From 29d1642bfc256e8fc7cedfdf48604975cf99b6f7 Mon Sep 17 00:00:00 2001 +From dffc0d2ab82f2d182dbc8a0ff70fd31d9d8db845 Mon Sep 17 00:00:00 2001 From: jeremyd2019 Date: Sat, 22 Jan 2022 11:33:00 -0800 Subject: [PATCH 068/N] mingw_smoketests: fix _UCRT condition @@ -12,7 +12,7 @@ diff --git a/mingw_smoketests.py b/mingw_smoketests.py index d92c74a..ce95846 100644 --- a/mingw_smoketests.py +++ b/mingw_smoketests.py -@@ -34,7 +34,7 @@ +@@ -34,7 +34,7 @@ if "MSYSTEM" in os.environ: else: SEP = "\\" diff --git a/mingw-w64-python3.12/0069-Modify-sys.winver-to-match-upstream.patch b/mingw-w64-python3.12/0069-Modify-sys.winver-to-match-upstream.patch index 84915b2455c53..0f67defc07796 100644 --- a/mingw-w64-python3.12/0069-Modify-sys.winver-to-match-upstream.patch +++ b/mingw-w64-python3.12/0069-Modify-sys.winver-to-match-upstream.patch @@ -1,4 +1,4 @@ -From 66065e2d38e9b1c23e23f1ebf22b29c7fb37f926 Mon Sep 17 00:00:00 2001 +From 672bbf2b622d14d4fae15c1257d5e958c2c98874 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Wed, 19 Jan 2022 19:39:20 +0530 Subject: [PATCH 069/N] Modify `sys.winver` to match upstream @@ -15,10 +15,10 @@ See https://github.com/msys2-contrib/cpython-mingw/issues/40 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac -index f07fce5..3d8a63c 100644 +index 988744b..d42ca30 100644 --- a/configure.ac +++ b/configure.ac -@@ -5091,10 +5091,24 @@ then +@@ -5117,10 +5117,24 @@ then esac case $host in *-*-mingw*) @@ -51,7 +51,7 @@ diff --git a/mingw_smoketests.py b/mingw_smoketests.py index ce95846..aa76659 100644 --- a/mingw_smoketests.py +++ b/mingw_smoketests.py -@@ -214,7 +214,14 @@ def test_platform_things(self): +@@ -214,7 +214,14 @@ class Tests(unittest.TestCase): ext_suffixes = importlib.machinery.EXTENSION_SUFFIXES self.assertTrue(ext_suffix in ext_suffixes) self.assertTrue(".pyd" in ext_suffixes) diff --git a/mingw-w64-python3.12/0070-Change-user-site-packages-path-to-include-the-enviro.patch b/mingw-w64-python3.12/0070-Change-user-site-packages-path-to-include-the-enviro.patch index 6eac1e9291808..c337ae13ba425 100644 --- a/mingw-w64-python3.12/0070-Change-user-site-packages-path-to-include-the-enviro.patch +++ b/mingw-w64-python3.12/0070-Change-user-site-packages-path-to-include-the-enviro.patch @@ -1,4 +1,4 @@ -From 83258d903c0b8f3614feadbf78fb813d02d116a9 Mon Sep 17 00:00:00 2001 +From d6fae2190dbd0b6d5ef33e5e52522ab45eab920a Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Wed, 19 Jan 2022 20:01:45 +0530 Subject: [PATCH 070/N] Change user site-packages path to include the @@ -19,10 +19,10 @@ Fixes https://github.com/msys2-contrib/cpython-mingw/issues/40 2 files changed, 40 insertions(+), 14 deletions(-) diff --git a/Lib/site.py b/Lib/site.py -index 7c89370..0cca82f 100644 +index febf254..a7a5a22 100644 --- a/Lib/site.py +++ b/Lib/site.py -@@ -289,14 +289,36 @@ def joinuser(*args): +@@ -310,14 +310,36 @@ def _getuserbase(): return joinuser("~", ".local") @@ -66,7 +66,7 @@ diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py index 33f8cd8..cbe060f 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py -@@ -141,20 +141,20 @@ def joinuser(*args): +@@ -141,20 +141,20 @@ if _HAS_USER_BASE: _INSTALL_SCHEMES |= { # NOTE: When modifying "purelib" scheme, update site._get_path() too. 'nt_user': { diff --git a/mingw-w64-python3.12/0071-configure-Include-a-header-in-the-check-for-_beginth.patch b/mingw-w64-python3.12/0071-configure-Include-a-header-in-the-check-for-_beginth.patch index 7ac6a4b33ecba..6faaf6bac0b5d 100644 --- a/mingw-w64-python3.12/0071-configure-Include-a-header-in-the-check-for-_beginth.patch +++ b/mingw-w64-python3.12/0071-configure-Include-a-header-in-the-check-for-_beginth.patch @@ -1,4 +1,4 @@ -From fd99658f3ebe275329b506b9f4f4f0d2418a190d Mon Sep 17 00:00:00 2001 +From d8ccb0fad0704b26d1523861bfb4326309e89591 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 071/N] configure: Include a header in the check for @@ -19,10 +19,10 @@ in C99 mode (or newer). 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 3d8a63c..1bca34c 100644 +index d42ca30..aa18037 100644 --- a/configure.ac +++ b/configure.ac -@@ -2838,7 +2838,7 @@ AC_MSG_RESULT([$with_nt_threads]) +@@ -2846,7 +2846,7 @@ AC_MSG_RESULT([$with_nt_threads]) if test $with_nt_threads = yes ; then AC_MSG_CHECKING([whether linking with nt-threads work]) AC_LINK_IFELSE([ diff --git a/mingw-w64-python3.12/0072-configure.ac-Default-to-without-c-locale-coercion-on.patch b/mingw-w64-python3.12/0072-configure.ac-Default-to-without-c-locale-coercion-on.patch index 7c1db652df3ea..fb25e2ed22875 100644 --- a/mingw-w64-python3.12/0072-configure.ac-Default-to-without-c-locale-coercion-on.patch +++ b/mingw-w64-python3.12/0072-configure.ac-Default-to-without-c-locale-coercion-on.patch @@ -1,4 +1,4 @@ -From a98d668d5be7b5e17d1c5e5f0a0af53c1b405282 Mon Sep 17 00:00:00 2001 +From 285cf3ea318e36f45e40f7a2a6a470e18acec2ec Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 22 Apr 2022 17:31:19 +0200 Subject: [PATCH 072/N] configure.ac: Default to --without-c-locale-coercion @@ -15,10 +15,10 @@ Fixes #36 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index 1bca34c..a0b2aba 100644 +index aa18037..67a1966 100644 --- a/configure.ac +++ b/configure.ac -@@ -4980,11 +4980,14 @@ AC_MSG_RESULT([$with_freelists]) +@@ -5006,11 +5006,14 @@ AC_MSG_RESULT([$with_freelists]) AC_MSG_CHECKING([for --with-c-locale-coercion]) AC_ARG_WITH( [c-locale-coercion], diff --git a/mingw-w64-python3.12/0073-Fix-failing-tests.patch b/mingw-w64-python3.12/0073-Fix-failing-tests.patch index 6564d66e2dff8..1804733dd7cb0 100644 --- a/mingw-w64-python3.12/0073-Fix-failing-tests.patch +++ b/mingw-w64-python3.12/0073-Fix-failing-tests.patch @@ -1,4 +1,4 @@ -From 3a8acec4421fb0f4c4fcdbe7e5f420d6201e0e97 Mon Sep 17 00:00:00 2001 +From 0b86018d8776c25e04a8ee357f8fa7cd26a70957 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Sun, 5 Jun 2022 20:28:53 +0530 Subject: [PATCH 073/N] Fix failing tests @@ -21,7 +21,7 @@ diff --git a/Lib/test/test_getpath.py b/Lib/test/test_getpath.py index b9cbe1d..ee4ab99 100644 --- a/Lib/test/test_getpath.py +++ b/Lib/test/test_getpath.py -@@ -837,6 +837,7 @@ def test_symlink_buildpath_macos(self): +@@ -837,6 +837,7 @@ DEFAULT_NAMESPACE = dict( ENV_PYTHONHOME="", ENV_PYTHONEXECUTABLE="", ENV___PYVENV_LAUNCHER__="", @@ -29,7 +29,7 @@ index b9cbe1d..ee4ab99 100644 argv0="", py_setpath="", real_executable="", -@@ -876,6 +877,7 @@ def __init__(self, *a, argv0=None, config=None, **kw): +@@ -876,6 +877,7 @@ class MockNTNamespace(dict): self.update(DEFAULT_NAMESPACE) self["config"] = DEFAULT_CONFIG.copy() self["os_name"] = "nt" @@ -37,7 +37,7 @@ index b9cbe1d..ee4ab99 100644 self["PLATLIBDIR"] = "DLLs" self["PYWINVER"] = "9.8-XY" self["VPATH"] = r"..\.." -@@ -1052,6 +1054,7 @@ def __init__(self, *a, argv0=None, config=None, **kw): +@@ -1052,6 +1054,7 @@ class MockPosixNamespace(dict): self.update(DEFAULT_NAMESPACE) self["config"] = DEFAULT_CONFIG.copy() self["os_name"] = "posix" @@ -74,10 +74,10 @@ index 40b8aa1..03b5a98 100644 os.environ['VSCMD_ARG_TGT_ARCH'] in TARGET_TO_PLAT): return TARGET_TO_PLAT[os.environ['VSCMD_ARG_TGT_ARCH']] diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py -index b6dbf3d..42a81c4 100644 +index 1137c20..f0f97dc 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py -@@ -16,7 +16,7 @@ +@@ -16,7 +16,7 @@ import sysconfig from sysconfig import (get_paths, get_platform, get_config_vars, get_path, get_path_names, _INSTALL_SCHEMES, get_default_scheme, get_scheme_names, get_config_var, @@ -86,8 +86,8 @@ index b6dbf3d..42a81c4 100644 import _osx_support -@@ -179,7 +179,7 @@ def test_nt_venv_scheme(self): - self.assertEqual(libpath, sysconfig.get_path('purelib', scheme='nt_venv')) +@@ -188,7 +188,7 @@ class TestSysConfig(unittest.TestCase): + self.assertEqual(libpath, sysconfig.get_path('purelib', scheme='nt_venv', vars=vars)) def test_venv_scheme(self): - if sys.platform == 'win32': @@ -95,7 +95,7 @@ index b6dbf3d..42a81c4 100644 self.assertEqual( sysconfig.get_path('scripts', scheme='venv'), sysconfig.get_path('scripts', scheme='nt_venv') -@@ -370,6 +370,10 @@ def test_user_similar(self): +@@ -379,6 +379,10 @@ class TestSysConfig(unittest.TestCase): if HAS_USER_BASE: user_path = get_path(name, 'posix_user') expected = os.path.normpath(global_path.replace(base, user, 1)) diff --git a/mingw-w64-python3.12/0074-Don-t-change-os.sep-with-an-empty-MSYSTEM-env-var-no.patch b/mingw-w64-python3.12/0074-Don-t-change-os.sep-with-an-empty-MSYSTEM-env-var-no.patch index eec57f16de859..9510bcc1988a7 100644 --- a/mingw-w64-python3.12/0074-Don-t-change-os.sep-with-an-empty-MSYSTEM-env-var-no.patch +++ b/mingw-w64-python3.12/0074-Don-t-change-os.sep-with-an-empty-MSYSTEM-env-var-no.patch @@ -1,4 +1,4 @@ -From 078fffbb89900c5ab1df3c4a9848515a1732ebce Mon Sep 17 00:00:00 2001 +From 840f2a52c12172aab9e321d20f5e74341a22c411 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 22 Sep 2022 17:51:33 +0200 Subject: [PATCH 074/N] Don't change os.sep with an empty MSYSTEM env var, @@ -27,10 +27,10 @@ Co-authored-by: Naveen M K 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py -index 42d987d..92ba611 100644 +index dc2d02b..5a02df0 100644 --- a/Lib/importlib/_bootstrap_external.py +++ b/Lib/importlib/_bootstrap_external.py -@@ -43,7 +43,7 @@ +@@ -43,7 +43,7 @@ if _MS_WINDOWS: else: path_separators = ['/'] @@ -40,10 +40,10 @@ index 42d987d..92ba611 100644 # Assumption made in _path_join() diff --git a/Lib/ntpath.py b/Lib/ntpath.py -index 309235b..0eb4aa0 100644 +index fca193b..10ac3c1 100644 --- a/Lib/ntpath.py +++ b/Lib/ntpath.py -@@ -21,7 +21,7 @@ +@@ -21,7 +21,7 @@ import stat import genericpath from genericpath import * @@ -121,7 +121,7 @@ diff --git a/mingw_smoketests.py b/mingw_smoketests.py index aa76659..2a8bd16 100644 --- a/mingw_smoketests.py +++ b/mingw_smoketests.py -@@ -29,7 +29,7 @@ +@@ -29,7 +29,7 @@ import os import unittest import sysconfig diff --git a/mingw-w64-python3.12/0075-def-VPATH-when-compiling-Python-sysmodule.c.patch b/mingw-w64-python3.12/0075-def-VPATH-when-compiling-Python-sysmodule.c.patch index e6d4e936ca169..c3e39d2bcad94 100644 --- a/mingw-w64-python3.12/0075-def-VPATH-when-compiling-Python-sysmodule.c.patch +++ b/mingw-w64-python3.12/0075-def-VPATH-when-compiling-Python-sysmodule.c.patch @@ -1,4 +1,4 @@ -From 87662963e70b97cba57a7ccee9a633de2657805c Mon Sep 17 00:00:00 2001 +From 1d988b67d45dc9f835a29735d12a4a12a8bf107c Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Sun, 18 Jun 2023 13:12:56 +0530 Subject: [PATCH 075/N] def VPATH when compiling `Python/sysmodule.c` @@ -8,10 +8,10 @@ Subject: [PATCH 075/N] def VPATH when compiling `Python/sysmodule.c` 1 file changed, 1 insertion(+) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 4a6e692..7037c3d 100644 +index c371209..dd63a80 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1421,6 +1421,7 @@ Python/dynload_win.o: $(srcdir)/Python/dynload_win.c Makefile +@@ -1425,6 +1425,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-python3.12/0076-Make-_Py_CheckPython3-extern.patch b/mingw-w64-python3.12/0076-Make-_Py_CheckPython3-extern.patch index e83b08708a1bd..b1fd01c84be91 100644 --- a/mingw-w64-python3.12/0076-Make-_Py_CheckPython3-extern.patch +++ b/mingw-w64-python3.12/0076-Make-_Py_CheckPython3-extern.patch @@ -1,4 +1,4 @@ -From d556fd3784168da06aab0bd310c10a10e971cd2b Mon Sep 17 00:00:00 2001 +From 80014a3bf3a7f0c878c7db328d3e211d98a306d8 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Sun, 18 Jun 2023 13:17:48 +0530 Subject: [PATCH 076/N] Make `_Py_CheckPython3` extern diff --git a/mingw-w64-python3.12/0077-link-with-bcrypt.patch b/mingw-w64-python3.12/0077-link-with-bcrypt.patch index 05dfca7c708cf..2ead39cc60fa2 100644 --- a/mingw-w64-python3.12/0077-link-with-bcrypt.patch +++ b/mingw-w64-python3.12/0077-link-with-bcrypt.patch @@ -1,4 +1,4 @@ -From 59989dddda6f207a2689564a63f5b16d3c6dcef5 Mon Sep 17 00:00:00 2001 +From 64771d101377e48551294962ca8a354d5f668511 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Sun, 18 Jun 2023 14:20:44 +0530 Subject: [PATCH 077/N] link with bcrypt @@ -8,10 +8,10 @@ Subject: [PATCH 077/N] link with bcrypt 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index a0b2aba..84192b9 100644 +index 67a1966..3655ba6 100644 --- a/configure.ac +++ b/configure.ac -@@ -7180,7 +7180,7 @@ AC_MSG_RESULT([done]) +@@ -7207,7 +7207,7 @@ AC_MSG_RESULT([done]) # For mingw build need additional library for linking case $host in *-*-mingw*) diff --git a/mingw-w64-python3.12/0078-correctly-find-native-python.patch b/mingw-w64-python3.12/0078-correctly-find-native-python.patch index 8ca27a0efc6c8..348ed080fd759 100644 --- a/mingw-w64-python3.12/0078-correctly-find-native-python.patch +++ b/mingw-w64-python3.12/0078-correctly-find-native-python.patch @@ -1,4 +1,4 @@ -From 742c6c9041d42767b8ec30e3d76af29f1c76ff8d Mon Sep 17 00:00:00 2001 +From 14393dc6a7b53ec654c3bc8df9b1910094233ec9 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Sun, 18 Jun 2023 14:29:50 +0530 Subject: [PATCH 078/N] correctly find native python @@ -9,7 +9,7 @@ it's required for regen-modules 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 84192b9..05c4dd5 100644 +index 3655ba6..6a717c0 100644 --- a/configure.ac +++ b/configure.ac @@ -204,9 +204,11 @@ AC_SUBST([FREEZE_MODULE]) diff --git a/mingw-w64-python3.12/0079-Add-extra-flags-for-_bootstrap_python.patch b/mingw-w64-python3.12/0079-Add-extra-flags-for-_bootstrap_python.patch index 16e3d953ee9a1..8bfc4e488285c 100644 --- a/mingw-w64-python3.12/0079-Add-extra-flags-for-_bootstrap_python.patch +++ b/mingw-w64-python3.12/0079-Add-extra-flags-for-_bootstrap_python.patch @@ -1,4 +1,4 @@ -From d161651cab4115d627094dd1bed1b58841f75af4 Mon Sep 17 00:00:00 2001 +From d24aa611f6447f108737ac10f80f2e7a8092dfd1 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Sun, 18 Jun 2023 14:30:09 +0530 Subject: [PATCH 079/N] Add extra flags for `_bootstrap_python` @@ -8,10 +8,10 @@ Subject: [PATCH 079/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 7037c3d..486076d 100644 +index dd63a80..cfaa0e3 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1107,7 +1107,7 @@ BOOTSTRAP_HEADERS = \ +@@ -1111,7 +1111,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-python3.12/0080-posixmodule-undefine-HAVE_OPENDIR.patch b/mingw-w64-python3.12/0080-posixmodule-undefine-HAVE_OPENDIR.patch index 4c28b7551dd15..c1c016fd36fa8 100644 --- a/mingw-w64-python3.12/0080-posixmodule-undefine-HAVE_OPENDIR.patch +++ b/mingw-w64-python3.12/0080-posixmodule-undefine-HAVE_OPENDIR.patch @@ -1,4 +1,4 @@ -From 955c80002f562265983ad6011b8afc4c582a9826 Mon Sep 17 00:00:00 2001 +From b27d90674f182d7f194e53310b82c0673ab8dc62 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Tue, 20 Jun 2023 18:32:58 +0530 Subject: [PATCH 080/N] posixmodule: undefine `HAVE_OPENDIR` @@ -13,10 +13,10 @@ windows API. 1 file changed, 6 insertions(+) diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 0cff7d6..53ee3b7 100644 +index a78c135..261a79a 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c -@@ -365,6 +365,12 @@ corresponding Unix manual entries for more information on calls."); +@@ -369,6 +369,12 @@ corresponding Unix manual entries for more information on calls."); #elif defined(__MINGW32__) /* GCC for windows hosts */ /* getlogin is detected by configure on mingw-w64 */ # undef HAVE_GETLOGIN diff --git a/mingw-w64-python3.12/0081-getpath.py-add-support-for-mingw.patch b/mingw-w64-python3.12/0081-getpath.py-add-support-for-mingw.patch index 34daff559b2e8..b770cee25a320 100644 --- a/mingw-w64-python3.12/0081-getpath.py-add-support-for-mingw.patch +++ b/mingw-w64-python3.12/0081-getpath.py-add-support-for-mingw.patch @@ -1,4 +1,4 @@ -From 4b36c1161c374dbc3081b13b0ddaa5bb8490c48d Mon Sep 17 00:00:00 2001 +From eaec91d4821eb1748fa038222c39fb075d600f65 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Tue, 20 Jun 2023 18:43:59 +0530 Subject: [PATCH 081/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 b9914a0..bd80221 100644 +index 0a31000..de7efb6 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 b9914a0..bd80221 100644 r = PyUnicode_FromWideChar(abs, -1); PyMem_RawFree((void *)abs); } else { -@@ -877,6 +878,11 @@ _PyConfig_InitPathConfig(PyConfig *config, int compute_path_config) +@@ -881,6 +882,11 @@ _PyConfig_InitPathConfig(PyConfig *config, int compute_path_config) #else !decode_to_dict(dict, "os_name", "posix") || #endif @@ -49,7 +49,7 @@ index b9914a0..bd80221 100644 #ifdef WITH_NEXT_FRAMEWORK !int_to_dict(dict, "WITH_NEXT_FRAMEWORK", 1) || #else -@@ -903,6 +909,9 @@ _PyConfig_InitPathConfig(PyConfig *config, int compute_path_config) +@@ -907,6 +913,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 || @@ -79,7 +79,7 @@ index 9913fcb..6867e98 100644 # ** Values calculated at runtime ** # config -- [in/out] dict of the PyConfig structure -@@ -185,8 +187,27 @@ +@@ -185,8 +187,27 @@ if os_name == 'posix' or os_name == 'darwin': ZIP_LANDMARK = f'{platlibdir}/python{VERSION_MAJOR}{VERSION_MINOR}.zip' DELIM = ':' SEP = '/' @@ -108,7 +108,7 @@ index 9913fcb..6867e98 100644 BUILDDIR_TXT = 'pybuilddir.txt' BUILD_LANDMARK = f'{VPATH}\\Modules\\Setup.local' DEFAULT_PROGRAM_NAME = f'python' -@@ -199,6 +220,7 @@ +@@ -199,6 +220,7 @@ elif os_name == 'nt': WINREG_KEY = f'SOFTWARE\\Python\\PythonCore\\{PYWINVER}\\PythonPath' DELIM = ';' SEP = '\\' @@ -116,7 +116,7 @@ index 9913fcb..6867e98 100644 # ****************************************************************************** -@@ -263,10 +285,10 @@ def search_up(prefix, *landmarks, test=isfile): +@@ -263,10 +285,10 @@ if py_setpath: if not executable: executable = real_executable @@ -129,7 +129,7 @@ index 9913fcb..6867e98 100644 if not executable: # All platforms default to real_executable if known at this # stage. POSIX does not set this value. -@@ -497,15 +519,15 @@ def search_up(prefix, *landmarks, test=isfile): +@@ -497,15 +519,15 @@ if ((not home_was_set and real_executable_dir and not py_setpath) except (FileNotFoundError, PermissionError): if isfile(joinpath(real_executable_dir, BUILD_LANDMARK)): build_prefix = joinpath(real_executable_dir, VPATH) @@ -148,7 +148,7 @@ index 9913fcb..6867e98 100644 build_stdlib_prefix = build_prefix else: build_stdlib_prefix = search_up(build_prefix, *BUILDSTDLIB_LANDMARKS) -@@ -597,7 +619,7 @@ def search_up(prefix, *landmarks, test=isfile): +@@ -597,7 +619,7 @@ else: # Detect exec_prefix by searching from executable for the platstdlib_dir if PLATSTDLIB_LANDMARK and not exec_prefix: @@ -157,7 +157,7 @@ index 9913fcb..6867e98 100644 # QUIRK: Windows always assumed these were the same # gh-100320: Our PYDs are assumed to be relative to the Lib directory # (that is, prefix) rather than the executable (that is, executable_dir) -@@ -607,7 +629,7 @@ def search_up(prefix, *landmarks, test=isfile): +@@ -607,7 +629,7 @@ else: if not exec_prefix and EXEC_PREFIX: exec_prefix = EXEC_PREFIX if not exec_prefix or not isdir(joinpath(exec_prefix, PLATSTDLIB_LANDMARK)): @@ -166,7 +166,7 @@ index 9913fcb..6867e98 100644 # QUIRK: If DLLs is missing on Windows, don't warn, just assume # that they're in exec_prefix if not platstdlib_dir: -@@ -660,7 +682,7 @@ def search_up(prefix, *landmarks, test=isfile): +@@ -660,7 +682,7 @@ elif not pythonpath_was_set: pythonpath.append(abspath(p)) # Then add the default zip file @@ -175,7 +175,7 @@ index 9913fcb..6867e98 100644 # QUIRK: Windows uses the library directory rather than the prefix if library: library_dir = dirname(library) -@@ -673,7 +695,7 @@ def search_up(prefix, *landmarks, test=isfile): +@@ -673,7 +695,7 @@ elif not pythonpath_was_set: else: pythonpath.append(joinpath(prefix, ZIP_LANDMARK)) @@ -184,7 +184,7 @@ index 9913fcb..6867e98 100644 # QUIRK: Windows also lists paths in the registry. Paths are stored # as the default value of each subkey of # {HKCU,HKLM}\Software\Python\PythonCore\{winver}\PythonPath -@@ -714,7 +736,7 @@ def search_up(prefix, *landmarks, test=isfile): +@@ -714,7 +736,7 @@ elif not pythonpath_was_set: if not platstdlib_dir and exec_prefix: platstdlib_dir = joinpath(exec_prefix, PLATSTDLIB_LANDMARK) @@ -193,7 +193,7 @@ index 9913fcb..6867e98 100644 # QUIRK: Windows generates paths differently if platstdlib_dir: pythonpath.append(platstdlib_dir) -@@ -742,8 +764,8 @@ def search_up(prefix, *landmarks, test=isfile): +@@ -742,8 +764,8 @@ elif not pythonpath_was_set: # QUIRK: Non-Windows replaces prefix/exec_prefix with defaults when running # in build directory. This happens after pythonpath calculation. diff --git a/mingw-w64-python3.12/0082-Don-t-build-_posixsubprocess-on-Windows.patch b/mingw-w64-python3.12/0082-Don-t-build-_posixsubprocess-on-Windows.patch index 00bae0495eeac..619468bfafb8e 100644 --- a/mingw-w64-python3.12/0082-Don-t-build-_posixsubprocess-on-Windows.patch +++ b/mingw-w64-python3.12/0082-Don-t-build-_posixsubprocess-on-Windows.patch @@ -1,4 +1,4 @@ -From cbaff611ec2c073f6f963aad3f7862f0158b1037 Mon Sep 17 00:00:00 2001 +From 4e6989b780cfbfcd8b44bff344ac7dbbdb11ea98 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Tue, 20 Jun 2023 20:17:23 +0530 Subject: [PATCH 082/N] Don't build _posixsubprocess on Windows. @@ -8,10 +8,10 @@ Subject: [PATCH 082/N] Don't build _posixsubprocess on Windows. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 05c4dd5..f8043cd 100644 +index 6a717c0..ca8d914 100644 --- a/configure.ac +++ b/configure.ac -@@ -7815,7 +7815,6 @@ PY_STDLIB_MOD_SIMPLE([_json]) +@@ -7855,7 +7855,6 @@ PY_STDLIB_MOD_SIMPLE([_json]) PY_STDLIB_MOD_SIMPLE([_lsprof]) PY_STDLIB_MOD_SIMPLE([_opcode]) PY_STDLIB_MOD_SIMPLE([_pickle]) @@ -19,7 +19,7 @@ index 05c4dd5..f8043cd 100644 PY_STDLIB_MOD_SIMPLE([_queue]) PY_STDLIB_MOD_SIMPLE([_random]) PY_STDLIB_MOD_SIMPLE([select]) -@@ -7868,6 +7867,7 @@ PY_STDLIB_MOD([_scproxy], +@@ -7908,6 +7907,7 @@ PY_STDLIB_MOD([_scproxy], PY_STDLIB_MOD([spwd], [], [test "$ac_cv_func_getspent" = yes -o "$ac_cv_func_getspnam" = yes]) PY_STDLIB_MOD([syslog], [], [test "$ac_cv_header_syslog_h" = yes]) PY_STDLIB_MOD([termios], [], [test "$ac_cv_header_termios_h" = yes]) diff --git a/mingw-w64-python3.12/0083-_ssl-link-with-ws2_32.patch b/mingw-w64-python3.12/0083-_ssl-link-with-ws2_32.patch index 4011574cdd1d4..256cd18ab397c 100644 --- a/mingw-w64-python3.12/0083-_ssl-link-with-ws2_32.patch +++ b/mingw-w64-python3.12/0083-_ssl-link-with-ws2_32.patch @@ -1,4 +1,4 @@ -From 62d0b819f5cf6a12c325cf56ef61617cfbf2719c Mon Sep 17 00:00:00 2001 +From 5bab8fce8b041c0ca289b4ac232d7d0d7d72a431 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Tue, 20 Jun 2023 20:35:27 +0530 Subject: [PATCH 083/N] `_ssl`: link with `ws2_32` @@ -8,10 +8,10 @@ Subject: [PATCH 083/N] `_ssl`: link with `ws2_32` 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index f8043cd..e76c845 100644 +index ca8d914..b9ff25c 100644 --- a/configure.ac +++ b/configure.ac -@@ -7949,7 +7949,7 @@ PY_STDLIB_MOD([_lzma], [], [test "$have_liblzma" = yes], +@@ -7989,7 +7989,7 @@ PY_STDLIB_MOD([_lzma], [], [test "$have_liblzma" = yes], dnl OpenSSL bindings PY_STDLIB_MOD([_ssl], [], [test "$ac_cv_working_openssl_ssl" = yes], diff --git a/mingw-w64-python3.12/0084-Always-normalize-path-in-abspath.patch b/mingw-w64-python3.12/0084-Always-normalize-path-in-abspath.patch index 3434a9f7076bd..8572dc1c3bf86 100644 --- a/mingw-w64-python3.12/0084-Always-normalize-path-in-abspath.patch +++ b/mingw-w64-python3.12/0084-Always-normalize-path-in-abspath.patch @@ -1,4 +1,4 @@ -From 062c8ba1084f97d249a68ce602c25d16b8a94dac Mon Sep 17 00:00:00 2001 +From 74332f47b9931f1341a4c1083249e8c2f695892a Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Tue, 20 Jun 2023 23:00:43 +0530 Subject: [PATCH 084/N] Always normalize path in abspath @@ -8,10 +8,10 @@ Subject: [PATCH 084/N] Always normalize path in abspath 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/ntpath.py b/Lib/ntpath.py -index 0eb4aa0..6b9074f 100644 +index 10ac3c1..018ff1c 100644 --- a/Lib/ntpath.py +++ b/Lib/ntpath.py -@@ -608,7 +608,7 @@ def _abspath_fallback(path): +@@ -600,7 +600,7 @@ else: # use native Windows method on Windows def abspath(path): """Return the absolute version of a path.""" try: diff --git a/mingw-w64-python3.12/0085-Include-winsock.h-when-checking-for-netdb-function.patch b/mingw-w64-python3.12/0085-Include-winsock.h-when-checking-for-netdb-function.patch index 48a8c07e013b4..52d54631fc057 100644 --- a/mingw-w64-python3.12/0085-Include-winsock.h-when-checking-for-netdb-function.patch +++ b/mingw-w64-python3.12/0085-Include-winsock.h-when-checking-for-netdb-function.patch @@ -1,4 +1,4 @@ -From 4be4188154fe4f9f7ee01111efb4b7208d5ff4fb Mon Sep 17 00:00:00 2001 +From c93499dc035d60d61d1d7cf57fcb61d31f143325 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Wed, 21 Jun 2023 15:42:39 +0530 Subject: [PATCH 085/N] Include `winsock.h` when checking for netdb function @@ -9,10 +9,10 @@ also move `gethostname` to that check 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index e76c845..34e58fa 100644 +index b9ff25c..30e6488 100644 --- a/configure.ac +++ b/configure.ac -@@ -5155,7 +5155,7 @@ AC_CHECK_FUNCS([ \ +@@ -5181,7 +5181,7 @@ AC_CHECK_FUNCS([ \ faccessat fchmod fchmodat fchown fchownat fdopendir fdwalk fexecve \ fork fork1 fpathconf fstatat ftime ftruncate futimens futimes futimesat \ gai_strerror getegid getentropy geteuid getgid getgrgid getgrgid_r \ @@ -21,7 +21,7 @@ index e76c845..34e58fa 100644 getpeername getpgid getpid getppid getpriority _getpty \ getpwent getpwnam_r getpwuid getpwuid_r getresgid getresuid getrusage getsid getspent \ getspnam getuid getwd if_nameindex initgroups kill killpg lchown linkat \ -@@ -5382,7 +5382,13 @@ PKG_CHECK_MODULES([LIBLZMA], [liblzma], [have_liblzma=yes], [ +@@ -5408,7 +5408,13 @@ PKG_CHECK_MODULES([LIBLZMA], [liblzma], [have_liblzma=yes], [ ]) dnl PY_CHECK_NETDB_FUNC(FUNCTION) @@ -36,7 +36,7 @@ index e76c845..34e58fa 100644 PY_CHECK_NETDB_FUNC([hstrerror]) dnl not available in WASI yet -@@ -5391,6 +5397,7 @@ PY_CHECK_NETDB_FUNC([getservbyport]) +@@ -5417,6 +5423,7 @@ PY_CHECK_NETDB_FUNC([getservbyport]) PY_CHECK_NETDB_FUNC([gethostbyname]) PY_CHECK_NETDB_FUNC([gethostbyaddr]) PY_CHECK_NETDB_FUNC([getprotobyname]) diff --git a/mingw-w64-python3.12/0086-include-_multiprocessing-semaphore.c-on-win32.patch b/mingw-w64-python3.12/0086-include-_multiprocessing-semaphore.c-on-win32.patch index c509a3c3a52d9..7ede4f3ba8a57 100644 --- a/mingw-w64-python3.12/0086-include-_multiprocessing-semaphore.c-on-win32.patch +++ b/mingw-w64-python3.12/0086-include-_multiprocessing-semaphore.c-on-win32.patch @@ -1,4 +1,4 @@ -From 31037b3ba9a98e9ed450bd181ad304d1f870c6a2 Mon Sep 17 00:00:00 2001 +From 7df8eb5f8a9a49ed8677d07ef7944da680e2d700 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 23 Jun 2023 20:13:23 +0530 Subject: [PATCH 086/N] include `_multiprocessing/semaphore.c` on win32 @@ -10,10 +10,10 @@ also, always build that module on win32 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 34e58fa..1e4fc2c 100644 +index 30e6488..a4afcba 100644 --- a/configure.ac +++ b/configure.ac -@@ -7833,7 +7833,7 @@ PY_STDLIB_MOD_SIMPLE([_zoneinfo]) +@@ -7873,7 +7873,7 @@ PY_STDLIB_MOD_SIMPLE([_zoneinfo]) dnl multiprocessing modules PY_STDLIB_MOD([_multiprocessing], diff --git a/mingw-w64-python3.12/0087-configure-build-mmap-module-on-win32.patch b/mingw-w64-python3.12/0087-configure-build-mmap-module-on-win32.patch index 8a23e99ac19df..ceb5d7390931b 100644 --- a/mingw-w64-python3.12/0087-configure-build-mmap-module-on-win32.patch +++ b/mingw-w64-python3.12/0087-configure-build-mmap-module-on-win32.patch @@ -1,4 +1,4 @@ -From 8b688d3c23389f7f86097f8a0222ae0a13d17ded Mon Sep 17 00:00:00 2001 +From e279f8f0bd82b5d0c72437bf5c9e003d4507b95a Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 23 Jun 2023 20:15:38 +0530 Subject: [PATCH 087/N] configure: build `mmap` module on win32 @@ -8,10 +8,10 @@ Subject: [PATCH 087/N] configure: build `mmap` module on win32 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 1e4fc2c..cba1434 100644 +index a4afcba..720120c 100644 --- a/configure.ac +++ b/configure.ac -@@ -7853,7 +7853,9 @@ PY_STDLIB_MOD([fcntl], +@@ -7893,7 +7893,9 @@ PY_STDLIB_MOD([fcntl], [], [test "$ac_cv_header_sys_ioctl_h" = "yes" -a "$ac_cv_header_fcntl_h" = "yes"], [], [$FCNTL_LIBS]) PY_STDLIB_MOD([mmap], diff --git a/mingw-w64-python3.12/0088-venv-creation-fixes.patch b/mingw-w64-python3.12/0088-venv-creation-fixes.patch index 5490b53579f3a..9c27b6eddefdd 100644 --- a/mingw-w64-python3.12/0088-venv-creation-fixes.patch +++ b/mingw-w64-python3.12/0088-venv-creation-fixes.patch @@ -1,4 +1,4 @@ -From 29cd24b1d69cbc5ef8047ff92cbafb7bde0c9352 Mon Sep 17 00:00:00 2001 +From 4140a8c8aaaee597e273612673652a266fcdda3c Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 23 Jun 2023 20:49:15 +0530 Subject: [PATCH 088/N] venv creation fixes @@ -8,10 +8,10 @@ Subject: [PATCH 088/N] venv creation fixes 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py -index 2173c9b..22e8adf 100644 +index d5dec4a..db2f161 100644 --- a/Lib/venv/__init__.py +++ b/Lib/venv/__init__.py -@@ -11,7 +11,7 @@ +@@ -11,7 +11,7 @@ import subprocess import sys import sysconfig import types @@ -20,7 +20,7 @@ index 2173c9b..22e8adf 100644 CORE_VENV_DEPS = ('pip',) logger = logging.getLogger(__name__) -@@ -302,7 +302,7 @@ def setup_python(self, context): +@@ -329,7 +329,7 @@ class EnvBuilder: if not os.path.islink(path): os.chmod(path, 0o755) else: @@ -29,7 +29,7 @@ index 2173c9b..22e8adf 100644 # For symlinking, we need a complete copy of the root directory # If symlinks fail, you'll get unnecessary copies of files, but # we assume that if you've opted into symlinks on Windows then -@@ -326,6 +326,12 @@ def setup_python(self, context): +@@ -353,6 +353,12 @@ class EnvBuilder: if os.path.lexists(src): copier(src, os.path.join(binpath, suffix)) @@ -42,7 +42,7 @@ index 2173c9b..22e8adf 100644 if sysconfig.is_python_build(): # copy init.tcl for root, dirs, files in os.walk(context.python_dir): -@@ -350,6 +356,7 @@ def _call_new_python(self, context, *py_args, **kwargs): +@@ -377,6 +383,7 @@ class EnvBuilder: env['VIRTUAL_ENV'] = context.env_dir env.pop('PYTHONHOME', None) env.pop('PYTHONPATH', None) diff --git a/mingw-w64-python3.12/0089-move-the-shutdown-function-where-winsock.h-is-includ.patch b/mingw-w64-python3.12/0089-move-the-shutdown-function-where-winsock.h-is-includ.patch index 6169f67ceb080..7bb96e5c61d6e 100644 --- a/mingw-w64-python3.12/0089-move-the-shutdown-function-where-winsock.h-is-includ.patch +++ b/mingw-w64-python3.12/0089-move-the-shutdown-function-where-winsock.h-is-includ.patch @@ -1,4 +1,4 @@ -From 4b83207f4c821f1da5ec939edf4e28bb8c609774 Mon Sep 17 00:00:00 2001 +From 4e70d6b5af61e33034fa72d99940fbeb832d675e Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 23 Jun 2023 23:34:01 +0530 Subject: [PATCH 089/N] move the `shutdown` function where `winsock.h` is @@ -9,10 +9,10 @@ Subject: [PATCH 089/N] move the `shutdown` function where `winsock.h` is 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index cba1434..e407e1d 100644 +index 720120c..480e932 100644 --- a/configure.ac +++ b/configure.ac -@@ -5168,7 +5168,7 @@ AC_CHECK_FUNCS([ \ +@@ -5194,7 +5194,7 @@ AC_CHECK_FUNCS([ \ sched_setparam sched_setscheduler sem_clockwait sem_getvalue sem_open \ sem_timedwait sem_unlink sendfile setegid seteuid setgid sethostname \ setitimer setlocale setpgid setpgrp setpriority setregid setresgid \ @@ -21,7 +21,7 @@ index cba1434..e407e1d 100644 sigfillset siginterrupt sigpending sigrelse sigtimedwait sigwait \ sigwaitinfo snprintf splice strftime strlcpy strsignal symlinkat sync \ sysconf system tcgetpgrp tcsetpgrp tempnam timegm times tmpfile \ -@@ -5398,6 +5398,7 @@ PY_CHECK_NETDB_FUNC([gethostbyname]) +@@ -5424,6 +5424,7 @@ PY_CHECK_NETDB_FUNC([gethostbyname]) PY_CHECK_NETDB_FUNC([gethostbyaddr]) PY_CHECK_NETDB_FUNC([getprotobyname]) PY_CHECK_NETDB_FUNC([gethostname]) diff --git a/mingw-w64-python3.12/0090-configure.ac-set-BUILDEXEEXT-and-EXEEXT.patch b/mingw-w64-python3.12/0090-configure.ac-set-BUILDEXEEXT-and-EXEEXT.patch index 1bda3d01b6747..6092b7095d182 100644 --- a/mingw-w64-python3.12/0090-configure.ac-set-BUILDEXEEXT-and-EXEEXT.patch +++ b/mingw-w64-python3.12/0090-configure.ac-set-BUILDEXEEXT-and-EXEEXT.patch @@ -1,4 +1,4 @@ -From 7e1ed60a3558f74c3d27e1fb65214bf74803456d Mon Sep 17 00:00:00 2001 +From a4b7fa1c44778eed7514cca1f8b4a2458258c4cd Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 23 Jun 2023 21:47:32 +0200 Subject: [PATCH 090/N] configure.ac: set BUILDEXEEXT and EXEEXT @@ -8,7 +8,7 @@ Subject: [PATCH 090/N] configure.ac: set BUILDEXEEXT and EXEEXT 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac -index e407e1d..3337b12 100644 +index 480e932..0274f3c 100644 --- a/configure.ac +++ b/configure.ac @@ -1409,6 +1409,7 @@ AC_ARG_WITH([suffix], diff --git a/mingw-w64-python3.12/0091-configure.ac-fix-building-some-test-modules.patch b/mingw-w64-python3.12/0091-configure.ac-fix-building-some-test-modules.patch index 0ae4d719782cf..09639686a21c3 100644 --- a/mingw-w64-python3.12/0091-configure.ac-fix-building-some-test-modules.patch +++ b/mingw-w64-python3.12/0091-configure.ac-fix-building-some-test-modules.patch @@ -1,4 +1,4 @@ -From 7219ae643fe9e2bd67667c45201baeb1fee88af5 Mon Sep 17 00:00:00 2001 +From 9463917a83eb7b16c9cea63305d5280e8f0796e8 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 23 Jun 2023 23:42:39 +0200 Subject: [PATCH 091/N] configure.ac: fix building some test modules @@ -10,10 +10,10 @@ is more correct. 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac -index 3337b12..c1875f8 100644 +index 0274f3c..13ba8e8 100644 --- a/configure.ac +++ b/configure.ac -@@ -5124,8 +5124,11 @@ fi +@@ -5150,8 +5150,11 @@ fi AC_MSG_RESULT([$DYNLOADFILE]) if test "$DYNLOADFILE" != "dynload_stub.o" then @@ -25,7 +25,7 @@ index 3337b12..c1875f8 100644 fi # MACHDEP_OBJS can be set to platform-specific object files needed by Python -@@ -7983,20 +7986,20 @@ PY_STDLIB_MOD([_testcapi], [test "$TEST_MODULES" = yes]) +@@ -8023,20 +8026,20 @@ PY_STDLIB_MOD([_testcapi], [test "$TEST_MODULES" = yes]) PY_STDLIB_MOD([_testclinic], [test "$TEST_MODULES" = yes]) PY_STDLIB_MOD([_testinternalcapi], [test "$TEST_MODULES" = yes], [], [-DPY3_DLLNAME="\"$DLLLIBRARY\""], []) PY_STDLIB_MOD([_testbuffer], [test "$TEST_MODULES" = yes]) diff --git a/mingw-w64-python3.12/0092-Don-t-convert-sysconfig.get_config_var-VPATH-to-an-a.patch b/mingw-w64-python3.12/0092-Don-t-convert-sysconfig.get_config_var-VPATH-to-an-a.patch index abd1d21d99d04..022a12f8c726f 100644 --- a/mingw-w64-python3.12/0092-Don-t-convert-sysconfig.get_config_var-VPATH-to-an-a.patch +++ b/mingw-w64-python3.12/0092-Don-t-convert-sysconfig.get_config_var-VPATH-to-an-a.patch @@ -1,4 +1,4 @@ -From 4492bf83d5e82dc5983fa379badbe60e5de9fd1f Mon Sep 17 00:00:00 2001 +From ba16e2554e5d02de10f1b22ece7c200ba5899557 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Sun, 25 Jun 2023 17:20:52 +0530 Subject: [PATCH 092/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 486076d..03c6087 100644 +index cfaa0e3..98fc780 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -146,7 +146,6 @@ datarootdir= @datarootdir@ @@ -23,7 +23,7 @@ index 486076d..03c6087 100644 abs_builddir_b2h= @abs_builddir_b2h@ prefix_b2h= @prefix_b2h@ diff --git a/configure.ac b/configure.ac -index c1875f8..5eff281 100644 +index 13ba8e8..b91b48f 100644 --- a/configure.ac +++ b/configure.ac @@ -763,12 +763,8 @@ fi diff --git a/mingw-w64-python3.12/0093-Always-convert-to-before-passing-though-pathcch-func.patch b/mingw-w64-python3.12/0093-Always-convert-to-before-passing-though-pathcch-func.patch index 2ba81a3be3f09..e7f6b8a03223a 100644 --- a/mingw-w64-python3.12/0093-Always-convert-to-before-passing-though-pathcch-func.patch +++ b/mingw-w64-python3.12/0093-Always-convert-to-before-passing-though-pathcch-func.patch @@ -1,4 +1,4 @@ -From ab3ef7381c0eb8518d0a6ea63cf675b3f6cf8204 Mon Sep 17 00:00:00 2001 +From 1948d4ca165bb42614d824a637907f818e0e014a Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Sun, 25 Jun 2023 17:24:11 +0530 Subject: [PATCH 093/N] Always convert `/` to `\\` before passing though diff --git a/mingw-w64-python3.12/0094-Build-venvlauncher.exe-from-PC-launcher.c.patch b/mingw-w64-python3.12/0094-Build-venvlauncher.exe-from-PC-launcher.c.patch index 7e7a52ad22e32..a71f1c1e38445 100644 --- a/mingw-w64-python3.12/0094-Build-venvlauncher.exe-from-PC-launcher.c.patch +++ b/mingw-w64-python3.12/0094-Build-venvlauncher.exe-from-PC-launcher.c.patch @@ -1,4 +1,4 @@ -From 4a4b65385946815cd4c843c151c9b3052bafd957 Mon Sep 17 00:00:00 2001 +From da9de5a047120ecb5aa53cdd132acc3117ca2965 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Sun, 25 Jun 2023 17:26:55 +0530 Subject: [PATCH 094/N] Build venvlauncher.exe from PC/launcher.c @@ -15,10 +15,10 @@ Subject: [PATCH 094/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 03c6087..4b8f513 100644 +index 98fc780..369540e 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -804,6 +804,12 @@ pythonw_exe.o: $(srcdir)/PC/pythonw_exe.rc +@@ -808,6 +808,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 03c6087..4b8f513 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 -@@ -811,13 +817,11 @@ $(BUILDPYTHONW): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) pythonw +@@ -815,13 +821,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 03c6087..4b8f513 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 -@@ -2006,8 +2010,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@ +@@ -2010,8 +2014,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); \ @@ -173,7 +173,7 @@ diff --git a/mingw_smoketests.py b/mingw_smoketests.py index 2a8bd16..00601f9 100644 --- a/mingw_smoketests.py +++ b/mingw_smoketests.py -@@ -194,6 +194,18 @@ def test_venv_creation(self): +@@ -194,6 +194,18 @@ class Tests(unittest.TestCase): assert os.path.exists(os.path.join(tmp, "bin", "python3.exe")) subprocess.check_call([shutil.which("bash.exe"), os.path.join(tmp, "bin", "activate")]) diff --git a/mingw-w64-python3.12/0095-getpath.py-fix-dirname.patch b/mingw-w64-python3.12/0095-getpath.py-fix-dirname.patch index adb88b9de33fd..fdee94e128fe7 100644 --- a/mingw-w64-python3.12/0095-getpath.py-fix-dirname.patch +++ b/mingw-w64-python3.12/0095-getpath.py-fix-dirname.patch @@ -1,4 +1,4 @@ -From c4d0bdb74deb03161bbb583bf3bf356fffee2eb6 Mon Sep 17 00:00:00 2001 +From cac4689f803543d9a5448415b7808fef7203899d Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Sun, 25 Jun 2023 19:39:30 +0530 Subject: [PATCH 095/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 bd80221..16d18b3 100644 +index de7efb6..099cffc 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -89,6 +89,12 @@ getpath_basename(PyObject *Py_UNUSED(self), PyObject *args) @@ -43,7 +43,7 @@ diff --git a/Modules/getpath.py b/Modules/getpath.py index 6867e98..5687e4f 100644 --- a/Modules/getpath.py +++ b/Modules/getpath.py -@@ -574,6 +574,9 @@ def search_up(prefix, *landmarks, test=isfile): +@@ -574,6 +574,9 @@ else: # First try to detect prefix by looking alongside our runtime library, if known if library and not prefix: library_dir = dirname(library) diff --git a/mingw-w64-python3.12/0096-getpath-use-normpath-on-all-generated-paths.patch b/mingw-w64-python3.12/0096-getpath-use-normpath-on-all-generated-paths.patch index 911654dccc0e3..bb5ae8d021c35 100644 --- a/mingw-w64-python3.12/0096-getpath-use-normpath-on-all-generated-paths.patch +++ b/mingw-w64-python3.12/0096-getpath-use-normpath-on-all-generated-paths.patch @@ -1,4 +1,4 @@ -From 51fa807b6357e1f2ed85018233f44d117e71f017 Mon Sep 17 00:00:00 2001 +From 0f82cd178b958d617271889e71b4d8f7f27e4639 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 28 Jul 2023 20:13:58 +0200 Subject: [PATCH 096/N] getpath: use normpath on all generated paths @@ -19,7 +19,7 @@ diff --git a/Lib/test/test_getpath.py b/Lib/test/test_getpath.py index ee4ab99..47ca302 100644 --- a/Lib/test/test_getpath.py +++ b/Lib/test/test_getpath.py -@@ -913,6 +913,9 @@ def __missing__(self, key): +@@ -913,6 +913,9 @@ class MockNTNamespace(dict): except AttributeError: raise KeyError(key) from None @@ -29,7 +29,7 @@ index ee4ab99..47ca302 100644 def abspath(self, path): if self.isabs(path): return path -@@ -1091,6 +1094,9 @@ def __missing__(self, key): +@@ -1091,6 +1094,9 @@ class MockPosixNamespace(dict): except AttributeError: raise KeyError(key) from None @@ -40,7 +40,7 @@ index ee4ab99..47ca302 100644 if self.isabs(path): return path diff --git a/Modules/getpath.c b/Modules/getpath.c -index 16d18b3..4753022 100644 +index 099cffc..47b89eb 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -54,6 +54,25 @@ @@ -77,7 +77,7 @@ index 16d18b3..4753022 100644 r = PyUnicode_FromWideChar(abs, -1); PyMem_RawFree((void *)abs); } else { -@@ -519,6 +537,7 @@ getpath_realpath(PyObject *Py_UNUSED(self) , PyObject *args) +@@ -523,6 +541,7 @@ done: static PyMethodDef getpath_methods[] = { @@ -98,7 +98,7 @@ index 5687e4f..d143f97 100644 # ****************************************************************************** # READ VARIABLES FROM config -@@ -670,7 +672,7 @@ def search_up(prefix, *landmarks, test=isfile): +@@ -670,7 +672,7 @@ else: if py_setpath: # If Py_SetPath was called then it overrides any existing search path @@ -107,7 +107,7 @@ index 5687e4f..d143f97 100644 config['module_search_paths_set'] = 1 elif not pythonpath_was_set: -@@ -757,7 +759,7 @@ def search_up(prefix, *landmarks, test=isfile): +@@ -757,7 +759,7 @@ elif not pythonpath_was_set: if platstdlib_dir: pythonpath.append(platstdlib_dir) @@ -116,7 +116,7 @@ index 5687e4f..d143f97 100644 config['module_search_paths_set'] = 1 -@@ -792,23 +794,23 @@ def search_up(prefix, *landmarks, test=isfile): +@@ -792,23 +794,23 @@ if pth: warn("unsupported 'import' line in ._pth file") else: pythonpath.append(joinpath(pth_dir, line)) diff --git a/mingw-w64-python3.12/0097-pathconfig-normpath-sys.path-0.patch b/mingw-w64-python3.12/0097-pathconfig-normpath-sys.path-0.patch index 05b9bd40b8c15..fb6311a4014b1 100644 --- a/mingw-w64-python3.12/0097-pathconfig-normpath-sys.path-0.patch +++ b/mingw-w64-python3.12/0097-pathconfig-normpath-sys.path-0.patch @@ -1,4 +1,4 @@ -From e23c9747e36b67afeb8e7d4fbb7ebbe5ed1d4990 Mon Sep 17 00:00:00 2001 +From 189df6a793e125427a10ab7a7051a60d19ef1a84 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 28 Jul 2023 20:14:38 +0200 Subject: [PATCH 097/N] pathconfig: normpath sys.path[0] diff --git a/mingw-w64-python3.12/0098-smoketests-add-some-tests-for-sys-site-paths.patch b/mingw-w64-python3.12/0098-smoketests-add-some-tests-for-sys-site-paths.patch index 453f4e1e1f3b5..48ea794ccc85c 100644 --- a/mingw-w64-python3.12/0098-smoketests-add-some-tests-for-sys-site-paths.patch +++ b/mingw-w64-python3.12/0098-smoketests-add-some-tests-for-sys-site-paths.patch @@ -1,4 +1,4 @@ -From f2d1898d485f41180c6d99474f6fd48ff2509a48 Mon Sep 17 00:00:00 2001 +From 2e3a8f2eca212920864d2cf3b859bb65cbd0395a Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 28 Jul 2023 20:15:01 +0200 Subject: [PATCH 098/N] smoketests: add some tests for sys/site paths @@ -11,7 +11,7 @@ diff --git a/mingw_smoketests.py b/mingw_smoketests.py index 00601f9..516005c 100644 --- a/mingw_smoketests.py +++ b/mingw_smoketests.py -@@ -238,6 +238,29 @@ def test_platform_things(self): +@@ -238,6 +238,29 @@ class Tests(unittest.TestCase): self.assertEqual(platform.system(), "Windows") self.assertTrue(isinstance(sys.api_version, int) and sys.api_version > 0) diff --git a/mingw-w64-python3.12/0099-Search-DLLs-only-on-paths-added-using-add_dll_direct.patch b/mingw-w64-python3.12/0099-Search-DLLs-only-on-paths-added-using-add_dll_direct.patch index 30fcbe863fdee..da4d4622d2972 100644 --- a/mingw-w64-python3.12/0099-Search-DLLs-only-on-paths-added-using-add_dll_direct.patch +++ b/mingw-w64-python3.12/0099-Search-DLLs-only-on-paths-added-using-add_dll_direct.patch @@ -1,4 +1,4 @@ -From cd2927084b47627236aad65067d72d8596e2c74d Mon Sep 17 00:00:00 2001 +From c932248adbf4450cc8f73dbe2883062e34dad42d Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Sat, 5 Aug 2023 14:10:27 +0530 Subject: [PATCH 099/N] Search DLLs only on paths added using @@ -107,7 +107,7 @@ diff --git a/Tools/build/check_extension_modules.py b/Tools/build/check_extensio index 59239c6..6810b3b 100644 --- a/Tools/build/check_extension_modules.py +++ b/Tools/build/check_extension_modules.py -@@ -60,6 +60,10 @@ +@@ -60,6 +60,10 @@ WINDOWS_MODULES = { "winsound", } @@ -122,7 +122,7 @@ diff --git a/mingw_smoketests.py b/mingw_smoketests.py index 516005c..ca1f652 100644 --- a/mingw_smoketests.py +++ b/mingw_smoketests.py -@@ -34,6 +34,9 @@ +@@ -34,6 +34,9 @@ if os.environ.get("MSYSTEM", ""): else: SEP = "\\" diff --git a/mingw-w64-python3.12/0100-Build-and-install-libpython3.dll.patch b/mingw-w64-python3.12/0100-Build-and-install-libpython3.dll.patch index c03548082a5c6..26771b1efb301 100644 --- a/mingw-w64-python3.12/0100-Build-and-install-libpython3.dll.patch +++ b/mingw-w64-python3.12/0100-Build-and-install-libpython3.dll.patch @@ -1,4 +1,4 @@ -From 4c28b3108f89f35bb093873843777eb10d8d6d7f Mon Sep 17 00:00:00 2001 +From 7c15ee5a84158b2608e382e9e377805558b0599d Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Mon, 21 Aug 2023 08:19:28 +0200 Subject: [PATCH 100/N] Build and install libpython3.dll @@ -13,7 +13,7 @@ Fixes #147 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 4b8f513..9717caf 100644 +index 369540e..a13dc45 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -273,6 +273,8 @@ LIBRARY_DEPS= @LIBRARY_DEPS@ @@ -25,7 +25,7 @@ index 4b8f513..9717caf 100644 LIBS= @LIBS@ -@@ -631,7 +633,7 @@ all: @DEF_MAKE_ALL_RULE@ +@@ -633,7 +635,7 @@ all: @DEF_MAKE_ALL_RULE@ .PHONY: build_all build_all: check-clean-src $(BUILDPYTHON) $(BUILDPYTHONW) $(BUILDVENVLAUNCHER) $(BUILDVENVWLAUNCHER) platform sharedmods \ @@ -34,7 +34,7 @@ index 4b8f513..9717caf 100644 .PHONY: build_wasm build_wasm: check-clean-src $(BUILDPYTHON) platform sharedmods \ -@@ -804,6 +806,9 @@ pythonw_exe.o: $(srcdir)/PC/pythonw_exe.rc +@@ -808,6 +810,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 4b8f513..9717caf 100644 venvlauncher.o: $(srcdir)/PC/pylauncher.rc $(WINDRES) $(RCFLAGS) -DPY_ICON -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/pylauncher.rc $@ -@@ -917,6 +922,10 @@ $(DLLLIBRARY) libpython$(LDVERSION).dll.a: $(LIBRARY_OBJS) python_nt.o +@@ -921,6 +926,10 @@ $(DLLLIBRARY) libpython$(LDVERSION).dll.a: $(LIBRARY_OBJS) python_nt.o else true; \ fi @@ -55,7 +55,7 @@ index 4b8f513..9717caf 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. -@@ -2025,6 +2034,7 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@ +@@ -2029,6 +2038,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 4b8f513..9717caf 100644 else \ $(INSTALL_SHARED) $(LDLIBRARY) $(DESTDIR)$(LIBDIR)/$(INSTSONAME); \ if test $(LDLIBRARY) != $(INSTSONAME); then \ -@@ -2485,6 +2495,7 @@ libainstall: all scripts +@@ -2499,6 +2509,7 @@ libainstall: all scripts 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 4b8f513..9717caf 100644 else \ $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ fi; \ -@@ -2734,7 +2745,7 @@ clean: clean-retain-profile clean-bolt +@@ -2752,7 +2763,7 @@ clean: clean-retain-profile clean-bolt .PHONY: clobber clobber: clean diff --git a/mingw-w64-python3.12/0101-Port-GetPythonImport-to-mingw.patch b/mingw-w64-python3.12/0101-Port-GetPythonImport-to-mingw.patch index aa989308f7d1c..16a129b74f210 100644 --- a/mingw-w64-python3.12/0101-Port-GetPythonImport-to-mingw.patch +++ b/mingw-w64-python3.12/0101-Port-GetPythonImport-to-mingw.patch @@ -1,4 +1,4 @@ -From a6e3077cf648f9085d1d00903b68a3870be291c2 Mon Sep 17 00:00:00 2001 +From b3aa1ac9595f752f7f97ff6b6ce7a521706982c2 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 27 Aug 2023 15:00:32 +0200 Subject: [PATCH 101/N] Port GetPythonImport() to mingw diff --git a/mingw-w64-python3.12/0102-LoadLibraryExW-make-sure-to-only-use-backslashes-for.patch b/mingw-w64-python3.12/0102-LoadLibraryExW-make-sure-to-only-use-backslashes-for.patch index 43eab176eb19c..5fd9d0695951c 100644 --- a/mingw-w64-python3.12/0102-LoadLibraryExW-make-sure-to-only-use-backslashes-for.patch +++ b/mingw-w64-python3.12/0102-LoadLibraryExW-make-sure-to-only-use-backslashes-for.patch @@ -1,4 +1,4 @@ -From 788013a59ef6ddfdcbef1d97917aa224281a0d98 Mon Sep 17 00:00:00 2001 +From 3b97429a0d477effd24ac1cae76a3a3890e60f89 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 27 Aug 2023 16:04:50 +0200 Subject: [PATCH 102/N] LoadLibraryExW: make sure to only use backslashes for diff --git a/mingw-w64-python3.12/0103-mingw_smoketests-add-a-test-to-check-if-sysconfig-re.patch b/mingw-w64-python3.12/0103-mingw_smoketests-add-a-test-to-check-if-sysconfig-re.patch index 1b8b44ae80907..a3a7f42b4462d 100644 --- a/mingw-w64-python3.12/0103-mingw_smoketests-add-a-test-to-check-if-sysconfig-re.patch +++ b/mingw-w64-python3.12/0103-mingw_smoketests-add-a-test-to-check-if-sysconfig-re.patch @@ -1,4 +1,4 @@ -From 6a326b63d5894e4cb1bd0ac71bc4b83ffc1b04e3 Mon Sep 17 00:00:00 2001 +From 83ae58bc1791449094dc754560be1b8ca25cbbab Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Wed, 8 Nov 2023 19:44:22 +0530 Subject: [PATCH 103/N] mingw_smoketests: add a test to check if sysconfig @@ -12,7 +12,7 @@ diff --git a/mingw_smoketests.py b/mingw_smoketests.py index ca1f652..4f81c68 100644 --- a/mingw_smoketests.py +++ b/mingw_smoketests.py -@@ -218,6 +218,9 @@ def test_platform_things(self): +@@ -218,6 +218,9 @@ class Tests(unittest.TestCase): import sysconfig import platform import importlib.machinery @@ -22,7 +22,7 @@ index ca1f652..4f81c68 100644 self.assertEqual(sys.implementation.name, "cpython") self.assertEqual(sys.platform, "win32") self.assertTrue(sysconfig.get_platform().startswith("mingw")) -@@ -241,6 +244,21 @@ def test_platform_things(self): +@@ -241,6 +244,21 @@ class Tests(unittest.TestCase): self.assertEqual(platform.system(), "Windows") self.assertTrue(isinstance(sys.api_version, int) and sys.api_version > 0) diff --git a/mingw-w64-python3.12/0104-Add-missing-library-for-multiprocessing-module.patch b/mingw-w64-python3.12/0104-Add-missing-library-for-multiprocessing-module.patch index 175aec6d0a834..cf51de7761c39 100644 --- a/mingw-w64-python3.12/0104-Add-missing-library-for-multiprocessing-module.patch +++ b/mingw-w64-python3.12/0104-Add-missing-library-for-multiprocessing-module.patch @@ -1,4 +1,4 @@ -From bd51677657509f4a418b69e063486559290af8b5 Mon Sep 17 00:00:00 2001 +From 07c0461838044aa08230bbee9ba07120e63b0f6e Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Mon, 1 Jan 2024 13:42:01 +0530 Subject: [PATCH 104/N] Add missing library for multiprocessing module @@ -9,10 +9,10 @@ Subject: [PATCH 104/N] Add missing library for multiprocessing module 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 5eff281..4a7b66c 100644 +index b91b48f..72c6b0b 100644 --- a/configure.ac +++ b/configure.ac -@@ -4232,6 +4232,13 @@ AS_CASE([$MACHDEP], +@@ -4258,6 +4258,13 @@ AS_CASE([$MACHDEP], [SOCKET_LIBS=""] ) @@ -26,7 +26,7 @@ index 5eff281..4a7b66c 100644 dnl detect sqlite3 from Emscripten emport PY_CHECK_EMSCRIPTEN_PORT([LIBSQLITE3], [-sUSE_SQLITE3]) -@@ -7835,7 +7842,7 @@ PY_STDLIB_MOD_SIMPLE([_zoneinfo]) +@@ -7875,7 +7882,7 @@ PY_STDLIB_MOD_SIMPLE([_zoneinfo]) dnl multiprocessing modules PY_STDLIB_MOD([_multiprocessing], [], [test "$ac_cv_func_sem_unlink" = "yes" -o "$MACHDEP" = "win32"], diff --git a/mingw-w64-python3.12/0105-selectmodule-add-support-for-MINGW.patch b/mingw-w64-python3.12/0105-selectmodule-add-support-for-MINGW.patch index 442a7d3b362e8..f0eeb3c919b34 100644 --- a/mingw-w64-python3.12/0105-selectmodule-add-support-for-MINGW.patch +++ b/mingw-w64-python3.12/0105-selectmodule-add-support-for-MINGW.patch @@ -1,4 +1,4 @@ -From 561fc7c0f4e80bfdca3badec47ff254cedb6f2be Mon Sep 17 00:00:00 2001 +From 4de6986b458a4c11b18378c663e2bf794b3690f1 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Mon, 1 Jan 2024 14:14:45 +0530 Subject: [PATCH 105/N] selectmodule: add support for MINGW @@ -9,7 +9,7 @@ Subject: [PATCH 105/N] selectmodule: add support for MINGW 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c -index b7c6b1b..de47121 100644 +index 50788e5..89396f3 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -169,9 +169,9 @@ seq2set(PyObject *seq, fd_set *set, pylist fd2obj[FD_SETSIZE + 1]) @@ -34,10 +34,10 @@ index b7c6b1b..de47121 100644 /* add object and its file descriptor to the list */ diff --git a/configure.ac b/configure.ac -index 4a7b66c..57b2df1 100644 +index 72c6b0b..6fcbfe0 100644 --- a/configure.ac +++ b/configure.ac -@@ -4238,6 +4238,11 @@ AS_CASE([$MACHDEP], +@@ -4264,6 +4264,11 @@ AS_CASE([$MACHDEP], [MULTIPROCESSING_LIBS=""] ) @@ -49,7 +49,7 @@ index 4a7b66c..57b2df1 100644 dnl detect sqlite3 from Emscripten emport PY_CHECK_EMSCRIPTEN_PORT([LIBSQLITE3], [-sUSE_SQLITE3]) -@@ -7832,7 +7837,7 @@ PY_STDLIB_MOD_SIMPLE([_opcode]) +@@ -7872,7 +7877,7 @@ PY_STDLIB_MOD_SIMPLE([_opcode]) PY_STDLIB_MOD_SIMPLE([_pickle]) PY_STDLIB_MOD_SIMPLE([_queue]) PY_STDLIB_MOD_SIMPLE([_random]) diff --git a/mingw-w64-python3.12/0106-readline-disable-on-MINGW.patch b/mingw-w64-python3.12/0106-readline-disable-on-MINGW.patch index 9e2cec702031d..bdf88c8499e5e 100644 --- a/mingw-w64-python3.12/0106-readline-disable-on-MINGW.patch +++ b/mingw-w64-python3.12/0106-readline-disable-on-MINGW.patch @@ -1,4 +1,4 @@ -From cc5ceaf8377bb0588a2f09029c147d25b9a3c43f Mon Sep 17 00:00:00 2001 +From 06fec657bc172393d324ce2682da5e3238b7b345 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Mon, 1 Jan 2024 14:19:41 +0530 Subject: [PATCH 106/N] readline: disable on MINGW @@ -8,10 +8,10 @@ Subject: [PATCH 106/N] readline: disable on MINGW 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac -index 57b2df1..aa52c11 100644 +index 6fcbfe0..bfa74cd 100644 --- a/configure.ac +++ b/configure.ac -@@ -7704,6 +7704,7 @@ AS_CASE([$ac_sys_system], +@@ -7736,6 +7736,7 @@ AS_CASE([$ac_sys_system], [VxWorks*], [PY_STDLIB_MOD_SET_NA([_scproxy], [_crypt], [termios], [grp])], [Darwin], [PY_STDLIB_MOD_SET_NA([ossaudiodev], [spwd])], [CYGWIN*], [PY_STDLIB_MOD_SET_NA([_scproxy], [nis])], diff --git a/mingw-w64-python3.12/0107-Add-libraries-to-fix-compile-of-ctypes-on-MINGW.patch b/mingw-w64-python3.12/0107-Add-libraries-to-fix-compile-of-ctypes-on-MINGW.patch index ec93df08f0d18..d85a433bc0ca2 100644 --- a/mingw-w64-python3.12/0107-Add-libraries-to-fix-compile-of-ctypes-on-MINGW.patch +++ b/mingw-w64-python3.12/0107-Add-libraries-to-fix-compile-of-ctypes-on-MINGW.patch @@ -1,4 +1,4 @@ -From 3bb9185ebf5df474783e376c820b59cef15b4a23 Mon Sep 17 00:00:00 2001 +From 0f8827aabb169bd80004e65841466b7c1fdf9fe6 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Mon, 1 Jan 2024 14:25:11 +0530 Subject: [PATCH 107/N] Add libraries to fix compile of ctypes on MINGW @@ -8,10 +8,10 @@ Subject: [PATCH 107/N] Add libraries to fix compile of ctypes on MINGW 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index aa52c11..894a543 100644 +index bfa74cd..5e98122 100644 --- a/configure.ac +++ b/configure.ac -@@ -4244,6 +4244,12 @@ AS_CASE([$MACHDEP], +@@ -4270,6 +4270,12 @@ AS_CASE([$MACHDEP], [SELECTMODULE_LIBS=""] ) @@ -24,7 +24,7 @@ index aa52c11..894a543 100644 dnl detect sqlite3 from Emscripten emport PY_CHECK_EMSCRIPTEN_PORT([LIBSQLITE3], [-sUSE_SQLITE3]) -@@ -7927,7 +7933,7 @@ PY_STDLIB_MOD([_crypt], +@@ -7967,7 +7973,7 @@ PY_STDLIB_MOD([_crypt], [$LIBCRYPT_CFLAGS], [$LIBCRYPT_LIBS]) PY_STDLIB_MOD([_ctypes], [], [test "$have_libffi" = yes], @@ -33,7 +33,7 @@ index aa52c11..894a543 100644 PY_STDLIB_MOD([_curses], [], [test "$have_curses" != "no"], [$CURSES_CFLAGS], [$CURSES_LIBS] -@@ -7998,7 +8004,7 @@ PY_STDLIB_MOD([_xxtestfuzz], [test "$TEST_MODULES" = yes]) +@@ -8038,7 +8044,7 @@ PY_STDLIB_MOD([_xxtestfuzz], [test "$TEST_MODULES" = yes]) PY_STDLIB_MOD([_testconsole], [test "$TEST_MODULES" = yes -a "$MACHDEP" = "win32"]) PY_STDLIB_MOD([_ctypes_test], [test "$TEST_MODULES" = yes], [test "$have_libffi" = yes -a "$have_dynamic_loading" = yes], diff --git a/mingw-w64-python3.12/0108-Add-lpython-version-while-linking-stdlib.patch b/mingw-w64-python3.12/0108-Add-lpython-version-while-linking-stdlib.patch index fbf15c55c1ada..9a08a52ce1d09 100644 --- a/mingw-w64-python3.12/0108-Add-lpython-version-while-linking-stdlib.patch +++ b/mingw-w64-python3.12/0108-Add-lpython-version-while-linking-stdlib.patch @@ -1,4 +1,4 @@ -From 9448873e84b2b24bf5e1b3ebe8266fcceb4d0177 Mon Sep 17 00:00:00 2001 +From 27e0ab2d7d95e6ac95dcbc5a526534e8335d8205 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Mon, 1 Jan 2024 14:48:28 +0530 Subject: [PATCH 108/N] Add `-lpython` while linking stdlib diff --git a/mingw-w64-python3.12/0109-Enable-_uuid-on-MINGW.patch b/mingw-w64-python3.12/0109-Enable-_uuid-on-MINGW.patch index 718e51949dc4f..6c2e03eb52fac 100644 --- a/mingw-w64-python3.12/0109-Enable-_uuid-on-MINGW.patch +++ b/mingw-w64-python3.12/0109-Enable-_uuid-on-MINGW.patch @@ -1,4 +1,4 @@ -From 7df6f8165a141f4e87e4639e318b6b5563ce3c32 Mon Sep 17 00:00:00 2001 +From cc5349878a8e38f5dff5e1bc101d785d7a8927bb Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Mon, 1 Jan 2024 15:04:43 +0530 Subject: [PATCH 109/N] Enable `_uuid` on MINGW @@ -8,10 +8,10 @@ Subject: [PATCH 109/N] Enable `_uuid` on MINGW 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index 894a543..d840b0a 100644 +index 5e98122..7d9dd18 100644 --- a/configure.ac +++ b/configure.ac -@@ -4250,6 +4250,12 @@ AS_CASE([$MACHDEP], +@@ -4276,6 +4276,12 @@ AS_CASE([$MACHDEP], [CTYPES_LIBS=""] ) @@ -24,7 +24,7 @@ index 894a543..d840b0a 100644 dnl detect sqlite3 from Emscripten emport PY_CHECK_EMSCRIPTEN_PORT([LIBSQLITE3], [-sUSE_SQLITE3]) -@@ -7963,8 +7969,8 @@ PY_STDLIB_MOD([_tkinter], +@@ -8003,8 +8009,8 @@ PY_STDLIB_MOD([_tkinter], [], [test "$have_tcltk" = "yes"], [$TCLTK_CFLAGS], [$TCLTK_LIBS]) PY_STDLIB_MOD([_uuid], diff --git a/mingw-w64-python3.12/0110-Enable-curses-library-on-MINGW.patch b/mingw-w64-python3.12/0110-Enable-curses-library-on-MINGW.patch index 0eb378738eaf7..012ddac28cc39 100644 --- a/mingw-w64-python3.12/0110-Enable-curses-library-on-MINGW.patch +++ b/mingw-w64-python3.12/0110-Enable-curses-library-on-MINGW.patch @@ -1,4 +1,4 @@ -From 8530c9cb494caacdb9004fa213999419dfcd40de Mon Sep 17 00:00:00 2001 +From f1aee591d3c68f6a90b6e4a39d92c919d63a1588 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Mon, 1 Jan 2024 16:43:41 +0530 Subject: [PATCH 110/N] Enable curses library on MINGW @@ -8,10 +8,10 @@ Subject: [PATCH 110/N] Enable curses library on MINGW 1 file changed, 8 insertions(+) diff --git a/configure.ac b/configure.ac -index d840b0a..444773e 100644 +index 7d9dd18..5f1eda3 100644 --- a/configure.ac +++ b/configure.ac -@@ -6817,6 +6817,14 @@ dnl have_panel=[no, panelw, panel] +@@ -6844,6 +6844,14 @@ dnl have_panel=[no, panelw, panel] have_curses=no have_panel=no diff --git a/mingw-w64-python3.12/0111-mingw_smoketests-disable-distutils-related-tests.patch b/mingw-w64-python3.12/0111-mingw_smoketests-disable-distutils-related-tests.patch index 882f7177e9fa8..e7e332bb6b9ac 100644 --- a/mingw-w64-python3.12/0111-mingw_smoketests-disable-distutils-related-tests.patch +++ b/mingw-w64-python3.12/0111-mingw_smoketests-disable-distutils-related-tests.patch @@ -1,4 +1,4 @@ -From 9c61a4117b25364b378076bbac8c7e8674991ba3 Mon Sep 17 00:00:00 2001 +From 0502c67031a50342ff856878b4d1b9ec5a2cf6bf Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 2 Feb 2024 14:43:29 +0530 Subject: [PATCH 111/N] mingw_smoketests: disable distutils related tests @@ -11,7 +11,7 @@ diff --git a/mingw_smoketests.py b/mingw_smoketests.py index 4f81c68..0ab5d3b 100644 --- a/mingw_smoketests.py +++ b/mingw_smoketests.py -@@ -61,24 +61,24 @@ def test_userdir_path_sep(self): +@@ -61,24 +61,24 @@ class Tests(unittest.TestCase): self.assertEqual(str(Path("~").expanduser()), expanduser("~")) self.assertEqual(str(Path.home()), expanduser("~")) diff --git a/mingw-w64-python3.12/0112-mingw_smoketests-skip-test_c_ext_build-for-in-tree-b.patch b/mingw-w64-python3.12/0112-mingw_smoketests-skip-test_c_ext_build-for-in-tree-b.patch index 7466d713a1921..9ff45cd39fd8d 100644 --- a/mingw-w64-python3.12/0112-mingw_smoketests-skip-test_c_ext_build-for-in-tree-b.patch +++ b/mingw-w64-python3.12/0112-mingw_smoketests-skip-test_c_ext_build-for-in-tree-b.patch @@ -1,4 +1,4 @@ -From 64f2dfd43a63b6f241a72a633aa1afafe7be45e6 Mon Sep 17 00:00:00 2001 +From 40d6d7b4fa5357a610d8cdd009bbf6b781e9c1ba Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Mon, 19 Feb 2024 19:55:55 +0530 Subject: [PATCH 112/N] mingw_smoketests: skip test_c_ext_build for in-tree @@ -12,7 +12,7 @@ diff --git a/mingw_smoketests.py b/mingw_smoketests.py index 0ab5d3b..dc31423 100644 --- a/mingw_smoketests.py +++ b/mingw_smoketests.py -@@ -283,6 +283,10 @@ def test_site(self): +@@ -283,6 +283,10 @@ class Tests(unittest.TestCase): self.assertEqual(len(site.getsitepackages()), 1) def test_c_ext_build(self): diff --git a/mingw-w64-python3.12/0113-configure.ac-use-autoconf-2.69.patch b/mingw-w64-python3.12/0113-configure.ac-use-autoconf-2.69.patch index 0a41c41ee629e..9bf9f7543a928 100644 --- a/mingw-w64-python3.12/0113-configure.ac-use-autoconf-2.69.patch +++ b/mingw-w64-python3.12/0113-configure.ac-use-autoconf-2.69.patch @@ -1,4 +1,4 @@ -From ec4403d01449c3be7a8f41cb3f3c9ee4cee48eff Mon Sep 17 00:00:00 2001 +From 7d03eb948465e487ed10e3955394a75b266c548a Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Mon, 19 Feb 2024 22:09:25 +0530 Subject: [PATCH 113/N] configure.ac: use autoconf 2.69 @@ -9,7 +9,7 @@ llvm-mingw only has autoconf 2.69 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 444773e..edebb03 100644 +index 5f1eda3..c4ececd 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ dnl diff --git a/mingw-w64-python3.12/0114-3.12-gh-114440-Close-writer-pipe-in-multiprocessing..patch b/mingw-w64-python3.12/0114-3.12-gh-114440-Close-writer-pipe-in-multiprocessing..patch deleted file mode 100644 index d72433baba584..0000000000000 --- a/mingw-w64-python3.12/0114-3.12-gh-114440-Close-writer-pipe-in-multiprocessing..patch +++ /dev/null @@ -1,67 +0,0 @@ -From 2ce1791f6bef296a36196ab70c6f7a31a3dc0286 Mon Sep 17 00:00:00 2001 -From: Petr Viktorin -Date: Wed, 24 Jan 2024 13:21:10 +0100 -Subject: [PATCH 114/N] [3.12] gh-114440: Close writer pipe in - multiprocessing.Queue, not concurrent.futures (GH-114489) - -This was left out of the 3.12 backport for three related issues: -- gh-107219 (which adds `self.call_queue._writer.close()` to `_ExecutorManagerThread` in `concurrent.futures`) -- gh-109370 (which changes this to be only called on Windows) -- gh-109047 (which moves the call to `multiprocessing.Queue`'s `_terminate_broken`) - -Without this change, ProcessPoolExecutor sometimes hangs on Windows -when a worker process is terminated. - -Co-authored-by: Victor Stinner -Co-authored-by: Serhiy Storchaka ---- - Lib/concurrent/futures/process.py | 5 ----- - Lib/multiprocessing/queues.py | 5 +++++ - .../Library/2023-09-25-02-11-14.gh-issue-114440.b2TrqG.rst | 6 ++++++ - 3 files changed, 11 insertions(+), 5 deletions(-) - create mode 100644 Misc/NEWS.d/next/Library/2023-09-25-02-11-14.gh-issue-114440.b2TrqG.rst - -diff --git a/Lib/concurrent/futures/process.py b/Lib/concurrent/futures/process.py -index 33e62fe..0e45288 100644 ---- a/Lib/concurrent/futures/process.py -+++ b/Lib/concurrent/futures/process.py -@@ -524,11 +524,6 @@ def _terminate_broken(self, cause): - - self.call_queue._terminate_broken() - -- # gh-107219: Close the connection writer which can unblock -- # Queue._feed() if it was stuck in send_bytes(). -- if sys.platform == 'win32': -- self.call_queue._writer.close() -- - # clean up resources - self._join_executor_internals(broken=True) - -diff --git a/Lib/multiprocessing/queues.py b/Lib/multiprocessing/queues.py -index d36de75..852ae87 100644 ---- a/Lib/multiprocessing/queues.py -+++ b/Lib/multiprocessing/queues.py -@@ -164,6 +164,11 @@ def _terminate_broken(self): - # gh-94777: Prevent queue writing to a pipe which is no longer read. - self._reader.close() - -+ # gh-107219: Close the connection writer which can unblock -+ # Queue._feed() if it was stuck in send_bytes(). -+ if sys.platform == 'win32': -+ self._writer.close() -+ - self.close() - self.join_thread() - -diff --git a/Misc/NEWS.d/next/Library/2023-09-25-02-11-14.gh-issue-114440.b2TrqG.rst b/Misc/NEWS.d/next/Library/2023-09-25-02-11-14.gh-issue-114440.b2TrqG.rst -new file mode 100644 -index 0000000..7231a3c ---- /dev/null -+++ b/Misc/NEWS.d/next/Library/2023-09-25-02-11-14.gh-issue-114440.b2TrqG.rst -@@ -0,0 +1,6 @@ -+On Windows, closing the connection writer when cleaning up a broken -+:class:`multiprocessing.Queue` queue is now done for all queues, rather than -+only in :mod:`concurrent.futures` manager thread. -+This can prevent a deadlock when a ``multiprocessing`` worker process terminates -+without cleaning up. -+This completes the backport of patches by Victor Stinner and Serhiy Storchaka. diff --git a/mingw-w64-python3.12/0114-CI-clean-up-ignored-tests.patch b/mingw-w64-python3.12/0114-CI-clean-up-ignored-tests.patch new file mode 100644 index 0000000000000..5742850ba74c3 --- /dev/null +++ b/mingw-w64-python3.12/0114-CI-clean-up-ignored-tests.patch @@ -0,0 +1,119 @@ +From 0789bf9b2feba05f29ae7fd4abd87532ee0ff811 Mon Sep 17 00:00:00 2001 +From: Naveen M K +Date: Tue, 20 Feb 2024 11:04:39 +0530 +Subject: [PATCH 114/N] CI: clean up ignored tests + +Remove tests which are passing now, or no longer exist, and +move tests which only fail with msvcrt into a separate file. +--- + .github/workflows/mingw.yml | 12 ++++++++++-- + Lib/test/test_wmi.py | 2 +- + mingw_ignorefile.txt | 24 +++--------------------- + mingw_ignorefile_msvcrt.txt | 8 ++++++++ + 4 files changed, 22 insertions(+), 24 deletions(-) + create mode 100644 mingw_ignorefile_msvcrt.txt + +diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml +index f0a0d92..c3001cd 100644 +--- a/.github/workflows/mingw.yml ++++ b/.github/workflows/mingw.yml +@@ -91,16 +91,24 @@ jobs: + shell: msys2 {0} + run: | + IGNOREFILE="$(pwd)/mingw_ignorefile.txt" ++ IGNOREFILE_EXTRA="$IGNOREFILE" ++ if [[ "${{ matrix.msystem }}" == "MINGW32" ]] || [[ "${{ matrix.msystem }}" == "MINGW64" ]]; then ++ IGNOREFILE_EXTRA="$(pwd)/mingw_ignorefile_msvcrt.txt" ++ fi + cd _build +- MSYSTEM= ./python.exe -m test -j8 --ignorefile "$IGNOREFILE" -W ++ MSYSTEM= ./python.exe -m test -j8 --ignorefile "$IGNOREFILE" --ignorefile "$IGNOREFILE_EXTRA" -W + + - name: Run broken tests + continue-on-error: true + shell: msys2 {0} + run: | + IGNOREFILE="$(pwd)/mingw_ignorefile.txt" ++ IGNOREFILE_EXTRA="$IGNOREFILE" ++ if [[ "${{ matrix.msystem }}" == "MINGW32" ]] || [[ "${{ matrix.msystem }}" == "MINGW64" ]]; then ++ IGNOREFILE_EXTRA="$(pwd)/mingw_ignorefile_msvcrt.txt" ++ fi + cd _build +- MSYSTEM= ./python.exe -m test -j8 --matchfile "$IGNOREFILE" -W ++ MSYSTEM= ./python.exe -m test -j8 --matchfile "$IGNOREFILE" --matchfile "$IGNOREFILE_EXTRA" -W + + - name: Install + shell: msys2 {0} +diff --git a/Lib/test/test_wmi.py b/Lib/test/test_wmi.py +index f667926..f1490a3 100644 +--- a/Lib/test/test_wmi.py ++++ b/Lib/test/test_wmi.py +@@ -7,7 +7,7 @@ from test.support import import_helper, requires_resource, LOOPBACK_TIMEOUT + + + # Do this first so test will be skipped if module doesn't exist +-_wmi = import_helper.import_module('_wmi', required_on=['win']) ++_wmi = import_helper.import_module('_wmi') + + + def wmi_exec_query(query): +diff --git a/mingw_ignorefile.txt b/mingw_ignorefile.txt +index e692d7f..550e724 100644 +--- a/mingw_ignorefile.txt ++++ b/mingw_ignorefile.txt +@@ -2,16 +2,11 @@ test.test_ctypes.test_loading.LoaderTest.test_load_dll_with_flags + distutils.tests.test_bdist_dumb.BuildDumbTestCase.test_simple_built + distutils.tests.test_cygwinccompiler.CygwinCCompilerTestCase.test_get_versions + distutils.tests.test_util.UtilTestCase.test_change_root +-test.datetimetester.TestLocalTimeDisambiguation_Fast.* +-test.datetimetester.TestLocalTimeDisambiguation_Pure.* +-test.test_cmath.CMathTests.test_specific_values +-test.test_cmd_line_script.CmdLineTest.test_consistent_sys_path_for_direct_execution + test.test_compileall.CommandLineTestsNoSourceEpoch.* + test.test_compileall.CommandLineTestsWithSourceEpoch.* + test.test_compileall.CompileallTestsWithoutSourceEpoch.* + test.test_compileall.CompileallTestsWithSourceEpoch.* + test.test_import.ImportTests.test_dll_dependency_import +-test.test_math.MathTests.* + test.test_ntpath.NtCommonTest.test_import + test.test_os.StatAttributeTests.test_stat_block_device + test.test_os.TestScandir.test_attributes +@@ -23,21 +18,8 @@ test.test_site._pthFileTests.* + test.test_site.HelperFunctionsTests.* + test.test_site.StartupImportTests.* + test.test_ssl.* +-test.test_strptime.CalculationTests.* +-test.test_strptime.StrptimeTests.test_weekday +-test.test_strptime.TimeRETests.test_compile +-test.test_tools.test_i18n.Test_pygettext.test_POT_Creation_Date + test.test_venv.BasicTest.* + test.test_venv.EnsurePipTest.* +-test.test_sysconfig.TestSysConfig.test_user_similar +-test.test_tcl.TclTest.testLoadWithUNC +-test.test_wmi +-# flaky +-test.test__xxsubinterpreters.* +-test.test_asyncio.test_subprocess.SubprocessProactorTests.test_stdin_broken_pipe +-test.test_asynchat.TestAsynchat.test_line_terminator2 +-test.test_asyncgen.AsyncGenAsyncioTest.test_async_gen_asyncio_gc_aclose_09 +-test.test_concurrent_futures.ThreadPoolShutdownTest.test_interpreter_shutdown +-test.test_asynchat.TestNotConnected.test_disallow_negative_terminator +-test.test_logging.SysLogHandlerTest.* +-test.test_logging.IPv6SysLogHandlerTest.* ++ ++test.test_dict.DictTest.test_splittable_to_generic_combinedtable ++test.test_capi.test_run.CAPITest.test_run_fileexflags +diff --git a/mingw_ignorefile_msvcrt.txt b/mingw_ignorefile_msvcrt.txt +new file mode 100644 +index 0000000..be363bd +--- /dev/null ++++ b/mingw_ignorefile_msvcrt.txt +@@ -0,0 +1,8 @@ ++test.datetimetester.TestLocalTimeDisambiguation_Fast.* ++test.datetimetester.TestLocalTimeDisambiguation_Pure.* ++test.test_cmath.CMathTests.test_specific_values ++test.test_math.MathTests.* ++test.test_strptime.CalculationTests.* ++test.test_strptime.StrptimeTests.test_weekday ++test.test_strptime.TimeRETests.test_compile ++test.test_tools.test_i18n.Test_pygettext.test_POT_Creation_Date diff --git a/mingw-w64-python3.12/0115-3.12-gh-115133-Fix-tests-for-XMLPullParser-with-Expa.patch b/mingw-w64-python3.12/0115-3.12-gh-115133-Fix-tests-for-XMLPullParser-with-Expa.patch deleted file mode 100644 index c8995a83540ed..0000000000000 --- a/mingw-w64-python3.12/0115-3.12-gh-115133-Fix-tests-for-XMLPullParser-with-Expa.patch +++ /dev/null @@ -1,109 +0,0 @@ -From ad679e523044da983f8feeeb5de35472f48a1df9 Mon Sep 17 00:00:00 2001 -From: "Miss Islington (bot)" - <31488909+miss-islington@users.noreply.github.com> -Date: Sun, 11 Feb 2024 11:34:04 +0100 -Subject: [PATCH 115/N] [3.12] gh-115133: Fix tests for XMLPullParser with - Expat 2.6.0 (GH-115164) (GH-115288) - -Feeding the parser by too small chunks defers parsing to prevent -CVE-2023-52425. Future versions of Expat may be more reactive. -(cherry picked from commit 4a08e7b3431cd32a0daf22a33421cd3035343dc4) - -Co-authored-by: Serhiy Storchaka ---- - Lib/test/test_xml_etree.py | 58 ++++++++++++------- - ...-02-08-14-21-28.gh-issue-115133.ycl4ko.rst | 2 + - 2 files changed, 38 insertions(+), 22 deletions(-) - create mode 100644 Misc/NEWS.d/next/Library/2024-02-08-14-21-28.gh-issue-115133.ycl4ko.rst - -diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py -index 53a4e9f..1cf6ce8 100644 ---- a/Lib/test/test_xml_etree.py -+++ b/Lib/test/test_xml_etree.py -@@ -13,6 +13,7 @@ - import operator - import os - import pickle -+import pyexpat - import sys - import textwrap - import types -@@ -120,6 +121,10 @@ - - """ - -+fails_with_expat_2_6_0 = (unittest.expectedFailure -+ if pyexpat.version_info >= (2, 6, 0) else -+ lambda test: test) -+ - def checkwarnings(*filters, quiet=False): - def decorator(test): - def newtest(*args, **kwargs): -@@ -1398,28 +1403,37 @@ def assert_event_tags(self, parser, expected, max_events=None): - self.assertEqual([(action, elem.tag) for action, elem in events], - expected) - -- def test_simple_xml(self): -- for chunk_size in (None, 1, 5): -- with self.subTest(chunk_size=chunk_size): -- parser = ET.XMLPullParser() -- self.assert_event_tags(parser, []) -- self._feed(parser, "\n", chunk_size) -- self.assert_event_tags(parser, []) -- self._feed(parser, -- "\n text\n", chunk_size) -- self.assert_event_tags(parser, [('end', 'element')]) -- self._feed(parser, "texttail\n", chunk_size) -- self._feed(parser, "\n", chunk_size) -- self.assert_event_tags(parser, [ -- ('end', 'element'), -- ('end', 'empty-element'), -- ]) -- self._feed(parser, "\n", chunk_size) -- self.assert_event_tags(parser, [('end', 'root')]) -- self.assertIsNone(parser.close()) -+ def test_simple_xml(self, chunk_size=None): -+ parser = ET.XMLPullParser() -+ self.assert_event_tags(parser, []) -+ self._feed(parser, "\n", chunk_size) -+ self.assert_event_tags(parser, []) -+ self._feed(parser, -+ "\n text\n", chunk_size) -+ self.assert_event_tags(parser, [('end', 'element')]) -+ self._feed(parser, "texttail\n", chunk_size) -+ self._feed(parser, "\n", chunk_size) -+ self.assert_event_tags(parser, [ -+ ('end', 'element'), -+ ('end', 'empty-element'), -+ ]) -+ self._feed(parser, "\n", chunk_size) -+ self.assert_event_tags(parser, [('end', 'root')]) -+ self.assertIsNone(parser.close()) -+ -+ @fails_with_expat_2_6_0 -+ def test_simple_xml_chunk_1(self): -+ self.test_simple_xml(chunk_size=1) -+ -+ @fails_with_expat_2_6_0 -+ def test_simple_xml_chunk_5(self): -+ self.test_simple_xml(chunk_size=5) -+ -+ def test_simple_xml_chunk_22(self): -+ self.test_simple_xml(chunk_size=22) - - def test_feed_while_iterating(self): - parser = ET.XMLPullParser() -diff --git a/Misc/NEWS.d/next/Library/2024-02-08-14-21-28.gh-issue-115133.ycl4ko.rst b/Misc/NEWS.d/next/Library/2024-02-08-14-21-28.gh-issue-115133.ycl4ko.rst -new file mode 100644 -index 0000000..6f10152 ---- /dev/null -+++ b/Misc/NEWS.d/next/Library/2024-02-08-14-21-28.gh-issue-115133.ycl4ko.rst -@@ -0,0 +1,2 @@ -+Fix tests for :class:`~xml.etree.ElementTree.XMLPullParser` with Expat -+2.6.0. diff --git a/mingw-w64-python3.12/0117-gcc-make-incompatible-pointer-types-as-warning.patch b/mingw-w64-python3.12/0115-gcc-make-incompatible-pointer-types-as-warning.patch similarity index 89% rename from mingw-w64-python3.12/0117-gcc-make-incompatible-pointer-types-as-warning.patch rename to mingw-w64-python3.12/0115-gcc-make-incompatible-pointer-types-as-warning.patch index e8b68bb5a9ab8..18810e28ac171 100644 --- a/mingw-w64-python3.12/0117-gcc-make-incompatible-pointer-types-as-warning.patch +++ b/mingw-w64-python3.12/0115-gcc-make-incompatible-pointer-types-as-warning.patch @@ -1,7 +1,7 @@ -From 1e278fca29ca3bbae3f28dc359e9eb4b710b763d Mon Sep 17 00:00:00 2001 +From d97008f0b0808f6d1df0d0b7985dd2492bc70de4 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Thu, 11 Jul 2024 13:58:20 +0530 -Subject: [PATCH 117/N] gcc: make `incompatible-pointer-types` as warning +Subject: [PATCH 115/N] gcc: make `incompatible-pointer-types` as warning gcc 14 changed `incompatible-pointer-types` from warning to error for now, make it as warning to avoid build failure @@ -11,10 +11,10 @@ for now, make it as warning to avoid build failure 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 9717caf..ac6388d 100644 +index a13dc45..eec14cd 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -823,10 +823,10 @@ $(BUILDPYTHON): Programs/python.o $(LINK_PYTHON_DEPS) python_exe.o +@@ -827,10 +827,10 @@ $(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 $(BUILDVENVLAUNCHER): $(BUILDPYTHON) venvlauncher.o $(srcdir)/PC/launcher.c @@ -28,10 +28,10 @@ index 9717caf..ac6388d 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 diff --git a/configure.ac b/configure.ac -index edebb03..c663c7c 100644 +index c4ececd..9c8fa1e 100644 --- a/configure.ac +++ b/configure.ac -@@ -2496,6 +2496,14 @@ case $GCC in +@@ -2504,6 +2504,14 @@ case $GCC in yes) CFLAGS_NODIST="$CFLAGS_NODIST -std=c11" diff --git a/mingw-w64-python3.12/0116-CI-clean-up-ignored-tests.patch b/mingw-w64-python3.12/0116-CI-clean-up-ignored-tests.patch deleted file mode 100644 index daf38d40f8bcb..0000000000000 --- a/mingw-w64-python3.12/0116-CI-clean-up-ignored-tests.patch +++ /dev/null @@ -1,258 +0,0 @@ -From 4d9ee66b36192b8ba489110f781e44428f0c9afd Mon Sep 17 00:00:00 2001 -From: Naveen M K -Date: Tue, 20 Feb 2024 11:04:39 +0530 -Subject: [PATCH 116/N] CI: clean up ignored tests - -Remove tests which are passing now, or no longer exist, and -move tests which only fail with msvcrt into a separate file. ---- - .github/workflows/mingw.yml | 12 ++- - Lib/test/test_wmi.py | 148 ++++++++++++++++++------------------ - mingw_ignorefile.txt | 23 +----- - mingw_ignorefile_msvcrt.txt | 8 ++ - 4 files changed, 94 insertions(+), 97 deletions(-) - create mode 100644 mingw_ignorefile_msvcrt.txt - -diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml -index f0a0d92..c3001cd 100644 ---- a/.github/workflows/mingw.yml -+++ b/.github/workflows/mingw.yml -@@ -91,16 +91,24 @@ jobs: - shell: msys2 {0} - run: | - IGNOREFILE="$(pwd)/mingw_ignorefile.txt" -+ IGNOREFILE_EXTRA="$IGNOREFILE" -+ if [[ "${{ matrix.msystem }}" == "MINGW32" ]] || [[ "${{ matrix.msystem }}" == "MINGW64" ]]; then -+ IGNOREFILE_EXTRA="$(pwd)/mingw_ignorefile_msvcrt.txt" -+ fi - cd _build -- MSYSTEM= ./python.exe -m test -j8 --ignorefile "$IGNOREFILE" -W -+ MSYSTEM= ./python.exe -m test -j8 --ignorefile "$IGNOREFILE" --ignorefile "$IGNOREFILE_EXTRA" -W - - - name: Run broken tests - continue-on-error: true - shell: msys2 {0} - run: | - IGNOREFILE="$(pwd)/mingw_ignorefile.txt" -+ IGNOREFILE_EXTRA="$IGNOREFILE" -+ if [[ "${{ matrix.msystem }}" == "MINGW32" ]] || [[ "${{ matrix.msystem }}" == "MINGW64" ]]; then -+ IGNOREFILE_EXTRA="$(pwd)/mingw_ignorefile_msvcrt.txt" -+ fi - cd _build -- MSYSTEM= ./python.exe -m test -j8 --matchfile "$IGNOREFILE" -W -+ MSYSTEM= ./python.exe -m test -j8 --matchfile "$IGNOREFILE" --matchfile "$IGNOREFILE_EXTRA" -W - - - name: Install - shell: msys2 {0} -diff --git a/Lib/test/test_wmi.py b/Lib/test/test_wmi.py -index 3445702..542dbc1 100644 ---- a/Lib/test/test_wmi.py -+++ b/Lib/test/test_wmi.py -@@ -1,74 +1,74 @@ --# Test the internal _wmi module on Windows --# This is used by the platform module, and potentially others -- --import unittest --from test.support import import_helper, requires_resource -- -- --# Do this first so test will be skipped if module doesn't exist --_wmi = import_helper.import_module('_wmi', required_on=['win']) -- -- --class WmiTests(unittest.TestCase): -- def test_wmi_query_os_version(self): -- r = _wmi.exec_query("SELECT Version FROM Win32_OperatingSystem").split("\0") -- self.assertEqual(1, len(r)) -- k, eq, v = r[0].partition("=") -- self.assertEqual("=", eq, r[0]) -- self.assertEqual("Version", k, r[0]) -- # Best we can check for the version is that it's digits, dot, digits, anything -- # Otherwise, we are likely checking the result of the query against itself -- self.assertRegex(v, r"\d+\.\d+.+$", r[0]) -- -- def test_wmi_query_repeated(self): -- # Repeated queries should not break -- for _ in range(10): -- self.test_wmi_query_os_version() -- -- def test_wmi_query_error(self): -- # Invalid queries fail with OSError -- try: -- _wmi.exec_query("SELECT InvalidColumnName FROM InvalidTableName") -- except OSError as ex: -- if ex.winerror & 0xFFFFFFFF == 0x80041010: -- # This is the expected error code. All others should fail the test -- return -- self.fail("Expected OSError") -- -- def test_wmi_query_repeated_error(self): -- for _ in range(10): -- self.test_wmi_query_error() -- -- def test_wmi_query_not_select(self): -- # Queries other than SELECT are blocked to avoid potential exploits -- with self.assertRaises(ValueError): -- _wmi.exec_query("not select, just in case someone tries something") -- -- @requires_resource('cpu') -- def test_wmi_query_overflow(self): -- # Ensure very big queries fail -- # Test multiple times to ensure consistency -- for _ in range(2): -- with self.assertRaises(OSError): -- _wmi.exec_query("SELECT * FROM CIM_DataFile") -- -- def test_wmi_query_multiple_rows(self): -- # Multiple instances should have an extra null separator -- r = _wmi.exec_query("SELECT ProcessId FROM Win32_Process WHERE ProcessId < 1000") -- self.assertFalse(r.startswith("\0"), r) -- self.assertFalse(r.endswith("\0"), r) -- it = iter(r.split("\0")) -- try: -- while True: -- self.assertRegex(next(it), r"ProcessId=\d+") -- self.assertEqual("", next(it)) -- except StopIteration: -- pass -- -- def test_wmi_query_threads(self): -- from concurrent.futures import ThreadPoolExecutor -- query = "SELECT ProcessId FROM Win32_Process WHERE ProcessId < 1000" -- with ThreadPoolExecutor(4) as pool: -- task = [pool.submit(_wmi.exec_query, query) for _ in range(32)] -- for t in task: -- self.assertRegex(t.result(), "ProcessId=") -+# Test the internal _wmi module on Windows -+# This is used by the platform module, and potentially others -+ -+import unittest -+from test.support import import_helper, requires_resource -+ -+ -+# Do this first so test will be skipped if module doesn't exist -+_wmi = import_helper.import_module('_wmi') -+ -+ -+class WmiTests(unittest.TestCase): -+ def test_wmi_query_os_version(self): -+ r = _wmi.exec_query("SELECT Version FROM Win32_OperatingSystem").split("\0") -+ self.assertEqual(1, len(r)) -+ k, eq, v = r[0].partition("=") -+ self.assertEqual("=", eq, r[0]) -+ self.assertEqual("Version", k, r[0]) -+ # Best we can check for the version is that it's digits, dot, digits, anything -+ # Otherwise, we are likely checking the result of the query against itself -+ self.assertRegex(v, r"\d+\.\d+.+$", r[0]) -+ -+ def test_wmi_query_repeated(self): -+ # Repeated queries should not break -+ for _ in range(10): -+ self.test_wmi_query_os_version() -+ -+ def test_wmi_query_error(self): -+ # Invalid queries fail with OSError -+ try: -+ _wmi.exec_query("SELECT InvalidColumnName FROM InvalidTableName") -+ except OSError as ex: -+ if ex.winerror & 0xFFFFFFFF == 0x80041010: -+ # This is the expected error code. All others should fail the test -+ return -+ self.fail("Expected OSError") -+ -+ def test_wmi_query_repeated_error(self): -+ for _ in range(10): -+ self.test_wmi_query_error() -+ -+ def test_wmi_query_not_select(self): -+ # Queries other than SELECT are blocked to avoid potential exploits -+ with self.assertRaises(ValueError): -+ _wmi.exec_query("not select, just in case someone tries something") -+ -+ @requires_resource('cpu') -+ def test_wmi_query_overflow(self): -+ # Ensure very big queries fail -+ # Test multiple times to ensure consistency -+ for _ in range(2): -+ with self.assertRaises(OSError): -+ _wmi.exec_query("SELECT * FROM CIM_DataFile") -+ -+ def test_wmi_query_multiple_rows(self): -+ # Multiple instances should have an extra null separator -+ r = _wmi.exec_query("SELECT ProcessId FROM Win32_Process WHERE ProcessId < 1000") -+ self.assertFalse(r.startswith("\0"), r) -+ self.assertFalse(r.endswith("\0"), r) -+ it = iter(r.split("\0")) -+ try: -+ while True: -+ self.assertRegex(next(it), r"ProcessId=\d+") -+ self.assertEqual("", next(it)) -+ except StopIteration: -+ pass -+ -+ def test_wmi_query_threads(self): -+ from concurrent.futures import ThreadPoolExecutor -+ query = "SELECT ProcessId FROM Win32_Process WHERE ProcessId < 1000" -+ with ThreadPoolExecutor(4) as pool: -+ task = [pool.submit(_wmi.exec_query, query) for _ in range(32)] -+ for t in task: -+ self.assertRegex(t.result(), "ProcessId=") -diff --git a/mingw_ignorefile.txt b/mingw_ignorefile.txt -index e692d7f..ec94c35 100644 ---- a/mingw_ignorefile.txt -+++ b/mingw_ignorefile.txt -@@ -2,16 +2,11 @@ test.test_ctypes.test_loading.LoaderTest.test_load_dll_with_flags - distutils.tests.test_bdist_dumb.BuildDumbTestCase.test_simple_built - distutils.tests.test_cygwinccompiler.CygwinCCompilerTestCase.test_get_versions - distutils.tests.test_util.UtilTestCase.test_change_root --test.datetimetester.TestLocalTimeDisambiguation_Fast.* --test.datetimetester.TestLocalTimeDisambiguation_Pure.* --test.test_cmath.CMathTests.test_specific_values --test.test_cmd_line_script.CmdLineTest.test_consistent_sys_path_for_direct_execution - test.test_compileall.CommandLineTestsNoSourceEpoch.* - test.test_compileall.CommandLineTestsWithSourceEpoch.* - test.test_compileall.CompileallTestsWithoutSourceEpoch.* - test.test_compileall.CompileallTestsWithSourceEpoch.* - test.test_import.ImportTests.test_dll_dependency_import --test.test_math.MathTests.* - test.test_ntpath.NtCommonTest.test_import - test.test_os.StatAttributeTests.test_stat_block_device - test.test_os.TestScandir.test_attributes -@@ -23,21 +18,7 @@ test.test_site._pthFileTests.* - test.test_site.HelperFunctionsTests.* - test.test_site.StartupImportTests.* - test.test_ssl.* --test.test_strptime.CalculationTests.* --test.test_strptime.StrptimeTests.test_weekday --test.test_strptime.TimeRETests.test_compile --test.test_tools.test_i18n.Test_pygettext.test_POT_Creation_Date - test.test_venv.BasicTest.* - test.test_venv.EnsurePipTest.* --test.test_sysconfig.TestSysConfig.test_user_similar --test.test_tcl.TclTest.testLoadWithUNC --test.test_wmi --# flaky --test.test__xxsubinterpreters.* --test.test_asyncio.test_subprocess.SubprocessProactorTests.test_stdin_broken_pipe --test.test_asynchat.TestAsynchat.test_line_terminator2 --test.test_asyncgen.AsyncGenAsyncioTest.test_async_gen_asyncio_gc_aclose_09 --test.test_concurrent_futures.ThreadPoolShutdownTest.test_interpreter_shutdown --test.test_asynchat.TestNotConnected.test_disallow_negative_terminator --test.test_logging.SysLogHandlerTest.* --test.test_logging.IPv6SysLogHandlerTest.* -+ -+test.test_dict.DictTest.test_splittable_to_generic_combinedtable -diff --git a/mingw_ignorefile_msvcrt.txt b/mingw_ignorefile_msvcrt.txt -new file mode 100644 -index 0000000..be363bd ---- /dev/null -+++ b/mingw_ignorefile_msvcrt.txt -@@ -0,0 +1,8 @@ -+test.datetimetester.TestLocalTimeDisambiguation_Fast.* -+test.datetimetester.TestLocalTimeDisambiguation_Pure.* -+test.test_cmath.CMathTests.test_specific_values -+test.test_math.MathTests.* -+test.test_strptime.CalculationTests.* -+test.test_strptime.StrptimeTests.test_weekday -+test.test_strptime.TimeRETests.test_compile -+test.test_tools.test_i18n.Test_pygettext.test_POT_Creation_Date diff --git a/mingw-w64-python3.12/0116-CI-normalize-path-in-test_makefile.patch b/mingw-w64-python3.12/0116-CI-normalize-path-in-test_makefile.patch new file mode 100644 index 0000000000000..3011326fc1955 --- /dev/null +++ b/mingw-w64-python3.12/0116-CI-normalize-path-in-test_makefile.patch @@ -0,0 +1,27 @@ +From ce773f350d14515528180d29b90810ae68809190 Mon Sep 17 00:00:00 2001 +From: Naveen M K +Date: Sun, 8 Sep 2024 15:04:42 +0530 +Subject: [PATCH 116/N] CI: normalize path in test_makefile + +--- + Lib/test/test_tools/test_makefile.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Lib/test/test_tools/test_makefile.py b/Lib/test/test_tools/test_makefile.py +index e253bd0..68f8db8 100644 +--- a/Lib/test/test_tools/test_makefile.py ++++ b/Lib/test/test_tools/test_makefile.py +@@ -33,11 +33,12 @@ class TestMakefile(unittest.TestCase): + if '\t' not in line: + break + result.append(line.replace('\\', '').strip()) ++ result = [os.path.normpath(d) for d in result if d] + return result + + def test_makefile_test_folders(self): + test_dirs = self.list_test_dirs() +- idle_test = 'idlelib/idle_test' ++ idle_test = os.path.join('idlelib', 'idle_test') + self.assertIn(idle_test, test_dirs) + + used = [idle_test] diff --git a/mingw-w64-python3.12/PKGBUILD b/mingw-w64-python3.12/PKGBUILD index 165a8090029dd..330f8605eacfa 100644 --- a/mingw-w64-python3.12/PKGBUILD +++ b/mingw-w64-python3.12/PKGBUILD @@ -22,8 +22,8 @@ else pkgbase="mingw-w64-${_realname}${_pybasever}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}${_pybasever}") fi -pkgver=${_pybasever}.1 -pkgrel=2 +pkgver=${_pybasever}.5 +pkgrel=1 pkgdesc="A high-level scripting language (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -166,10 +166,9 @@ source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz 0111-mingw_smoketests-disable-distutils-related-tests.patch 0112-mingw_smoketests-skip-test_c_ext_build-for-in-tree-b.patch 0113-configure.ac-use-autoconf-2.69.patch - 0114-3.12-gh-114440-Close-writer-pipe-in-multiprocessing..patch - 0115-3.12-gh-115133-Fix-tests-for-XMLPullParser-with-Expa.patch - 0116-CI-clean-up-ignored-tests.patch - 0117-gcc-make-incompatible-pointer-types-as-warning.patch) + 0114-CI-clean-up-ignored-tests.patch + 0115-gcc-make-incompatible-pointer-types-as-warning.patch + 0116-CI-normalize-path-in-test_makefile.patch) # Helper macros to help make tasks easier # apply_patch_with_msg() { @@ -296,10 +295,9 @@ prepare() { 0111-mingw_smoketests-disable-distutils-related-tests.patch \ 0112-mingw_smoketests-skip-test_c_ext_build-for-in-tree-b.patch \ 0113-configure.ac-use-autoconf-2.69.patch \ - 0114-3.12-gh-114440-Close-writer-pipe-in-multiprocessing..patch \ - 0115-3.12-gh-115133-Fix-tests-for-XMLPullParser-with-Expa.patch \ - 0116-CI-clean-up-ignored-tests.patch \ - 0117-gcc-make-incompatible-pointer-types-as-warning.patch + 0114-CI-clean-up-ignored-tests.patch \ + 0115-gcc-make-incompatible-pointer-types-as-warning.patch \ + 0116-CI-normalize-path-in-test_makefile.patch autoreconf -vfi } @@ -402,121 +400,120 @@ package() { fi } -sha256sums=('8dfb8f426fcd226657f9e2bd5f1e96e53264965176fa17d32658e873591aeb21' - '6c5823575f95eb6b90fc3af8e41a21a751a5eb468d577ffeb2cfa208f22eac21' - '974901e51bc56dc6c4491268b70097ad2da3cd143d3b901262244d6311be1647' - '8829bf445930c4a9d291e57f0c685d7b0eb5d55a4affd2f3f5fe379888b0021b' - 'b48031bff04737b328666576b0aa00317f4ab65461ada8f1287e7736b33e421b' - '85af01023d3f0d3031eccfe040ceda80a89db36e73834c1f6c6b79f5db63ecc9' - '0385461974ed561c829b07c5a03f7e8ababe61aec1752bf9815ada85c2266522' - 'b1df0b35c0ebe1f9c9af8b9869b3252b3dac3a29b4f969892bce40c54dbd54b3' - 'aabed2633fb1e16ce13bfb80a2b4c3dd092ad75a723d68f960a423e85f3597e0' - '9cb6958cad84f20b214f56d296bbd62ca4b471359506ed448029cd7d17fb6385' - '39698aeb0b7dde92d51d65376a2ea82da433e0dfde28b3ddddcfc8139c71e999' - '17b29ab32edbaab2d8f3f85789cdae0fb39f724ae8ee6cf74e9c25ab679e9b6b' - 'f73a3257ee245da2dab835eed109f5302c2d86e3c5f82f6ed59a61e5828ade4c' - '9fc2f9f6fda4c0a9109d0fb8c5cfb040d52c2320160d8c42ac33c46cd557ca0b' - '9efd32e2e4a1a2dc97982f9a4d3de058264d26d16f4c4fc7971f901b86ac7fce' - '4f7fc3b3cb9e79aa150e31dc45b7188a165d9f99718bc83923b8fa7284d1a2e8' - '55fcb105f3edc18a58500b456b93bf8f52e3bc4371a5f1ac9b71f5557b84e175' - 'c4cd31cff6d102b23b05cd307c3843a8084df8e7cbc6926bee869d227354139e' - 'b19e6969a854be6cb559a668e511f92f6e483e077ce76319823cc88c1bf137dd' - 'e3816a3e35da68331b5798971bff7b4fac8659bbe2fbe51ab42318892eac651c' - '4b38722139d674cd43769ee6a809a066dec29a5cad6f496271c7a3c5b286cdef' - '7ab904dc6f2dd20e4a37de41d2b068fd01a8b2bcaa8f26ab9de47bfcd0af29eb' - '5aa635ba408c3ae3ef99085931e68510737d42e14aa20a1aaa062e8bdd56e18e' - '6abd089d6e5765c1fb456cdc2a83d4cd109eb0218951746a42c6666de8833b13' - '7eb3a4f85d24f8fb3a19615943ac8bce5b22abb1a06e5ff1f3a814200f0b4b64' - '9896e323d525fa374e57743cd02518e0ab7088e98af8dead1fe6761c4afb85ab' - 'f77293ab63decb3c67aab838e8e6ef4ce5b8226cdf91f0951b1497a52720777d' - '995cda1be8d68cdaa2287388f7b053a5d36dd8e369a5d6ab87d499bc7c6d5f0e' - '7b33479166b802cf5d04306eca18405e15383a6da5b364a5e1dad255770192a3' - '2394beace7839129db69e5cf988e45eb32bed6795a68249a507f8d8793bfecc1' - 'eeb068fac16b6c83955331c174f5d4e12e6bc8d61ac08e07b112f6e7047f1879' - '901fcb3b71fef5df9eb8ccce84a819683d5c2ec5b6e9b827ca70355b13e1d8d8' - '406769f09a81860de41ae55497426f62d6291193efc9e166dda31360039aeb7f' - '841e265ce5276bf7cddddb988b3cc612c30874d0bc630fffe3a0ef895388784a' - '6529bd2bb410be421f20738006a060bd0a5efbe4a2bcfc3f1be2d36e3af434e8' - '0bfc586f4c2608875a9a9c080f2a2562954ec4f52793e2b591af0ee8e981af88' - 'bc46aee3fc5951b907ad70fc7d996af50caac04f955effdc2eb6520f4a06b795' - 'a7aff6d1611455462bee252f87b3c1311121c641013285ad9feff2a8c6bd4ec5' - '4c052cf9ebaf1e201a1df0f8f882488f353e3c7d9c85f13fca0e44e6d4f35e9a' - '5793ca15086e913810fb61c9d7ab54281d5e40c39e0abe940ab86518b5425c2d' - 'bdefd9f00bd72acd348e9e7ee7a6faa450648ca7e5199db72c150f695fa0b7c4' - 'd0a28482b42b057c0b0d536b76604d4c52dcfcd8bde97c7026d14742bf4cca0c' - 'a2d070fef8174fad9c23330f12b29687ec873a83ce75fc0d43b8616a92321b79' - '2c9e1ff6ca6936311732492a66445e1b9635ed5ab12fac3d55216b4972c49ee4' - 'ca95b16a0457fff45baebb3dff59c216e97d059cb3c13fc2c55268474225bc99' - '53f75c6b78091ae49c1e9c102eac4bd540593be5808a715e5848d281c466c93a' - '80e792e261fde2e44b7000bb0cacc7aff50e92de3d5cf81fc27bebb07de752e8' - '9b64fd7eb17d4dae659016afd56f9e4528957ddac16de70e89e7cc1b5f048146' - '64db622bf6b55360294f40dac787a3b790c3fe388222b6d9d3b5b14465ada35b' - '4b31f79cf49dfa993d7dc96950ceab8dc492e42b244b403856d2658ceacb66f7' - 'e555e05fa039d6d631e8cc6bc7b1f81b23c86d386cdd8054f2ea7ad2ac09bd9d' - 'db10596451811a2e809f766dd7c7a8bc20c2f6e7cc697ce99b37c91e2f21397d' - 'dd1d6604e7a044187952e4510c9ef522325887434d0083f34e36cf061493db26' - '9d199724bc9b2df5188d0511e629908ab1af74bbf6b83a43f956ea91eb1e61ca' - 'f50523ac8910e6bbcccd3fead5661336fadc081fb156e275ca32b5114c43f486' - '874fc8349df235cc0aac86573df342568f2a20d198076a2a57cad97d4b3a3e92' - 'a5f0a463be5f46e1c582d06cd43c288369a760e22cdf5a30558c20b472b7fb0b' - '4cf015d3f76d8156ba7298e651a8ad349145778e63e6bfceced6f5952b4bd9d3' - 'de7ab0b941c846cdf20354fc17fb9713b5e6b68af06f22ad12421c83a8756a4f' - '6a1fc29b6266e23012bbf9a6c47cd632721e7411e6ecb56a03665ed41b285dec' - '944205af4998130e70819ca9914576a74fbaf7c253a4d52dc437eacfaba6aed9' - 'ee4a089073fabd8c9bbfafa75a7979d08eaf375e673ba8e7a4e790980347c4ed' - '36b8c5a12f00434f399003f2075e4f1362b0d3208b6ddac584d96542c0dd63db' - '4817828133facc9fbe8da5b9e51d3679b73068f53e4ed1ec85de12a588f02110' - '31ab086b18bc84bd8aee7d9d9f10e3994f6a963743eeeeb1e7e60d23d11f5161' - '0562703c27272ad3590666b5f561ab1aa2e1fac5e17d54ee6ceb5f8c8457b781' - '2b54f9ecfa02745e2763f8c7e6be090348a7b31be2f3ea4ff155c7ca864cfa43' - '5194630766cc3317b627020de13cf3b316d2c98ab532567d7e7f52ad2ea21d8f' - 'a3cdd52975a4a08e37db8f64f167ffdd571c453c4e33980fa3e80d446b168b9f' - '7c549c11edb177dad4df5ae13c0471d209fca3228b53d2c4ef689749d9096a0e' - 'dc3d8f3d20964a3930baaa5ebf46917737b33abac2e8e298bf5b5aa052dc8179' - '5adb594d450e499d6d81cb029180627a58ed1be8750f9bbb41c1225227da16b9' - 'cb497acfca1400081e853f7747d3e0d83fa847d9258dc839070b6bbd386e699e' - '233041bfd389c7c1b59b76575de68d18b50210d804737b442bd96b007003449f' - 'dc86b127566c6da91bf5cbdebafb15fa9823c9e048592eaae65b967413ea3c65' - '9438225342a441557d5434d7c3d077dc20fcf1aeb6246c7deb86387d665628e9' - '1b2770cd03232ec8c74abc8997a8415451ae8858da51aec755e8b9670b899116' - '1672402e935fd1bab3c338b53bd2affa6c9b2faec807cb5579593d9272b82b2f' - '79891611c8a0877ad6e05bf1c0899ee8f86859db53801b85b9fdc91df7fea9c3' - 'f649d891f5e454a50bdbf14dff4afa76e33df93ffdb2c65b9e55766479ca0957' - '1aab6926fc625ab921d591c8018c40731722cbd9901e2c5dc2f903cb89a14331' - 'f71a61882d89447ced9928ace3c8458f8845485e66d198e344f3e1dbe97e4e6c' - 'd98bc94e23482472aeed37961545914e6cb197972999753f29d1f9894c876e01' - '9463f117d07a80c02f019e065e582a312efdf12e193cd7217e74e389a2f2fe3e' - '7821d6b2fb50da634e67ce2397538c0b2ab5438f03eebe6622d95c7f89a078c9' - 'd67b4e9185e539eaa0cf149c4f668c4251848cd608d6d80b12c88e8f6468f5f8' - '5de364962e82bca4cceffcabcba2617535f6004f92b57ed316d5cfa82421ecb2' - 'f2036c41acd1dae55ab80ca8fcc48c8c1127263a755736655baba3ab279182e6' - '65dd7bad62e60d321bd0bac9a200fb4ddebf75c05ec7ed2a9c4530a36a4c74eb' - 'b73e0fd84616466e13dc18711f76f1d02ec2b33fcb85479a5b55655116a11464' - '7a7a1206ea71ecdd18051679c3eb8c466c7d9f4e598e06fce84a625c40587ca6' - 'adcc06e1e2adfe34b4fa8bb6e5c41b97596afb373e65aa5f6fa03cfe78fb89e4' - 'dfbd82deaa19f2a9baafc5601ba4d6047c2bb5d4a4e956a7a082287ce486b1ec' - '219cfd1f6f35de824084ca5186becac10a32bc3d0c0178a49cd58859b7c065d5' - 'e4c0d521127b49fffef50da9320cff2dd762f148c1d1b2e204237450ba522065' - '962ee212b159dccc9e44aad6b565efca41c5d4dba3ecad83fb24009b263e796b' - '596c0684268adaf5cdf820f2c55b8b96d39c15c7707b0e443d5d14b4a883241d' - 'd77322b2e6bc5ce7ae36d710081edc933085e4010595b92f2fe5793e1c60ae75' - 'ba3cc1aafa3e046d856e13054cc8d9dd14ce98fc53d4f854a0788b81fbb2839c' - '94f1d0ac6c29059a3e21f7495d678bf71ca8fe53cc9eed0003cbfecab01a4806' - '329f83b7f7aac69f65124595e339cf908677075e56d6a3121b15039e159d1da5' - '58ad318f885a5fe76fcb9bbc5cd2c3e8b39ec4170348e8018b3259d6996c9f05' - '76e970d55dc3d61c203d05008d4771da2e9808548444e347d5e2c8b2d7654299' - 'b290144e98300fc88cf19e6c9bf33b4080f6dcc437f3f5323662c5ffb0b32045' - '59b155e6597e3be2b9188e7b7468381d7d65c6e4aee188cdacb5eebaa695f071' - '34caa4c8e68f970a031f65bef0c2e4e6dd97d6fb6e13da9121069840cfd6bafa' - '757c0a45fd77ddb74f91cd141304d5fb0530ff8c52809d133c679d32c9c8326d' - '922101eec57956f4c6a52522e87d3755c52cfe90e68186b1b480424455c8efef' - '54c1abee4b13278090fd26a7b725c10dbeee0d8deffc46843be031f9b824364b' - 'e745ad7e0b75a858d1b1755d845d20cf5d70d10309ea68c9067a287991866726' - '2ec6b6c7c64ae20b2e53a43cfba93eb03b8971dcb92bddddaf8d4c3df2e43520' - 'ccbdcf61a06f0a1a4fbdc78f03c4ecd449c3793c07e117e6d9c2f80b197f151c' - '72fd7b38599091fe73028cddcda1223d2359832145a7cd0b5a3f1e28de96ebf2' - '7a9a917e64d8e0b01b3be4fc1144268eb8bf55faf4cf69b59dc95483e6350231' - 'f2dab1281f7e64aba1eca657b7c1f87a5facbc52edd57bc00c4f3d81a2e1cbaa' - 'cb37d5377f0ca0411da99749dc2fee0c5edcb81bb8162fa43fca164590c84eaf' - 'a343e4063d59cbc7f4837dd0b6ca30b89c5887c33bb82acf05d3774e3553533b' - '67cbe0824f78a6c71bade9a79cbc4d96dfca4abafb6a38c621b18cabb91359ec') +sha256sums=('fa8a2e12c5e620b09f53e65bcd87550d2e5a1e2e04bf8ba991dcc55113876397' + 'c25c4d3b262438814ceefbc938f7710766071b541f5e46c017162b1cf564a59e' + 'cacfd20cd8d5050d92967bd7f73fed374fe051ee0a8e44e5edbc2ac2cf21b5c6' + '2f9841e5eb70404d20b4fb0fecf95b75438e50ae6b0080e370edb1fd6f58b710' + 'c7fdf7fe1d3fa68495dcce49b8456f4da288c6d7b919f535c0888cab99f8bd77' + 'a377c41bba88659aa9ba52710ec93b466ddb0948b535b8166731042aa9b6634c' + '18485e3197aeb4b88e32d91a92b1895aa6fc41a88fe1f7930237676dea1c7d43' + '98bc8fe39d01c47330056e9ccf61367858eca788f051036814ede2ea1e9f9134' + 'bf853393ef38f83cd875ac8bb7ec5abfbe3cc9532010458c05b28e40da8c7fb4' + '810e1d7fe6599e380baee7ac9b0dbf8a0a565c56ebd62a442c205a366dcc15c8' + 'f1fe09a03acb12163f8f219d902c605ffc6dd8b2ab871fd9d6ecca77155991ca' + '671c8a85556ddc20d011ee69e9a5c49ababed9892d9727f34d4a0b479684717e' + 'f919795a736ebffb5eba27caab369ca9d9d306e79139c66654d1ea626b630c2a' + '0931ff6f5b749a1286faf6ea45722adec4a81c4bc44d61e201640d37d2df8696' + '360b54765b0688e8e472aa38dc5e3c0b2b8565398d78c8580e00a9d1967086c3' + 'f14bc2b07e512b1615a6d04f9bec7e1abaa52be4df06ae408e1699520112fc91' + '4c1c096c5717bd0d0b43d4ca2997df61f73b678bd88797d65a0cd9af6681f036' + '6eac3c3975dd6792201de33432592d43373a5b24dc39c033b59a7eef9583fa21' + 'aebb3ad40380da3f5fc2ff3612c8a99d287edef62bc6cdb79a9dd8289d14e570' + 'f437d1360a4ffccc865c594d902712a1a1cd7e67160e59afdb97bfe9d26b6251' + '8841bed95aba2b7e532a4853d36bd7ed43116778c017787e40b8f055066de211' + '25c5cbf1ea24b2c24439c499c9c6d349c0b4c34f673cddfa2fe7906d74f299c8' + 'c9ff01f5531f083a8fbc86603df07d06f2829e97e620300463b92e2789b918d7' + '41480c96a6b4d3de413373772bb79402cf6543cc3b8972c1a47f87d24fd00e12' + '072d56ca654dea5aad415359876853abdfbe1d9eea7ffd985692fc56ab79fd77' + '88b67f7cda7eb56273f5886798f9cf6f27c7b9544827b8467b1f98640dca6331' + '425e3d3a770ac8b88dc70435f6825a03df47df5b3485dc7b94a1fcfc7702814b' + '532c7ebd7ec9e3af5082dba46cd5e6b34c41ca9e83ac6beb0ef2bab4f94f087f' + '56813d3d6065fc08d76ed89ac746ffccc23759ab9a3041a0df6413cef6974a4e' + '889ab9286669db4d5171af3fd20e54de4fe7e0f91cc62e25ec22ab7d8bd529fb' + 'c53a86ea2b42184975001c3cebac90c8ccd1c253d44021a8e565849d2d9c259c' + '2334dca72beb517c8e76b12a10745f809dfb6e0d85e4712505e854c78930a3ab' + 'c214dc5380fb259a9a8d503e9988f1ba19407ff0a9e061f684c7f615438eb58e' + '67f31b192cd8ddcf55a2152ecc9fad242880f4302ffcf58bfd995f6209d63879' + 'a19f7140dc0b2b36dcac893f65b098d1eda84bce9e33c0188e9054bf15f33a06' + '232c284456215c866aef0aa55b14598f476ab14b2ce5a66afca73d92060bdbb4' + 'bcbbdfc2131b70b3267339273b8f93565e898d02eb95d794afd978ac1548c742' + 'd1c626aae31940b7f537c0188b84a094e83fb7819ea9ec223251a5417e43eafc' + 'eba32acac52825d19559371e6755fbb2c67315198b15263047bae2fe8f70e31a' + '7726fa0cece07869a48057bbffb2f8d861700210e336bbea861c580bf318e791' + '021b4424c1bb7d10a53ae33050179104204b3fe523ca06b2ed81d58848fe856e' + '341e1f13f59c051f4c727d7d7372ad40adad7a1d591a19d8fe28727a00052ee1' + '107f02abd8a019a98a8dc880c3b599c7858cbc5d749a5330847b1ac60d986c79' + '5692833312d6da773f787e4b70c5bd47149899b7457330789781085b57e3cc30' + '02a22cbee10484d7cc122597388dbaed10e9ed1ec2d38f12ea40e418649be094' + '2221057d7a26e5e97abc71a71a59d0a127adff24cc60641ba7becfeafa5fa486' + '8bb9afa628c843793cdee86688ffede2b736ea8996a120d03fcd709980f9a824' + '7e4e3f7d46cae8fcfe4fd5e26eff96cd1f182b5e0b7e67d760ffbba9389f8c51' + '563b473ec3f64749c27abfd479de09b0fba1f3f1e1ecb10a526dca1a221ff576' + '1a70c15f0a11bae576b1477d196a3209b7bad9253154d7ea86d5fbd2fed31810' + 'ad45e88d6d8e7c1f161767be3a4854cfbb8065a8467fd99e2e1c9b6d41989794' + 'e21280e92fd3ded0cce162f8f4b44e9d79b72c47052b2cd756402be96cce7a07' + '1e37855c0d2e14acb0c9f2991a5138d6c2335d75e44909664ea86c0ba8ba00c7' + '2b12fbe9f868245ccd785eba0564bc00f66cafd97d7e66d0ddb4beb837ccc809' + '675648f73d9e31f5fa9f83c2d1598d672ec21cf3b95ae97f71ea51373cb717d8' + 'a4a5c68d4d6db89c402b34dd736ce17e3b7b16843d3bf9bde2cd7fa56fd3bf4b' + '49f0791da90b9419e8e026ca9ddb85629575545f4dd802f89c008ab7da31580f' + '6b88645adb09c36c81cf122e55e690a20619e1462cebe5e5a3de0ed0cc979b2a' + '6b74aa57b62be98d6d438ca79e3da066cc1a3d5866fc4d5ad270c4a7c759c7c0' + '1cebaf432ed2a346a1303781d0dd41f4a7053c9f755213d04a76bab04b520c7d' + 'c1d39a8f84cfab4c001dda4123a8828acb4d72a2d0ec5c13f700c28270e763f0' + '8a5c71412680c15c83e66d8cf12de4b9be0e6941ac7061257cc6e13cd7dfb4cc' + '2503e4116a83fff438f942c983077b23f9e8740b91b4e11e11fe5f872173f753' + 'a48251fcde2022444439e5505944788474e2304ccadb445ded4d93bdee7b5735' + 'c0fe721440973292a1af4754ee616c1b85d4061c97ccf9007fc4f9e6d734c4e7' + '7e4acb32e3f54f44c548021553aeb58d4c092217d667b2a3481ce914075bae6c' + 'fb8445182d46bba8b670c8321d6caa67d92cb32d485300d9b60e74ff59f70d13' + '2c1fc34f2fd4dc204107c55e1ae3770225a144762d43e61365b8ca86579a4942' + '8e171b146158518aa659f2cb7bddc16719cc03a8c66b8ccd5753f8f87e79f94f' + '0b5f40ef0b636941ec3fbb23bce1d3f48d2461bbf8ddb71df63cef160ad4d0d6' + '293db09c835a4703ff44361f1a8f5461260e91d973c34fd59451848e3022b14e' + '2b41f60ccbcf90f8ab1bfc4bcbf4eb156972c2e9d50ed07d9c2b1392e4702554' + 'f0587036c6cd7baf01d7515e7502b3f235aaf1182a4fc1014acec786eea8e19b' + 'a2f1329b3b7d0983e8de53af12526effedd6fa4436516069c52873fb180ae322' + '060bd4d6ff899c2ec26056b326e87bfc7db8ef2c3fbedec0884bebce2d29622e' + 'b36e5217dc0e90608abbd3b9d06bf4b66e9b660b59952e9e9e089f3aa4a0f232' + 'e9267b0e1e41fbd8f09e623db4baba0fdbd8d0f5dd68028e983a54fdb7142898' + '4303115f760a8c3aeed02a756626f44ebf0195fcd3d8d4d57685bfa418d3916e' + '22a975e989cf315e4a5e1ccf00975482355f0ea1d9a01175a10b4c517afe371c' + 'daeb68eade973f185a13cd56a490efdf4de50b01cac21a4c81ca507a6f0468a1' + '7f608dfd39f57a0354d2ff129808323847240ea1c812144ccfc80bbeb2debef9' + 'bd853e3207d6a00a8b13efd6c65fcc7179fb58dd6cf7d9fea6c25a4ec66a1c63' + '9b50f116b774cbbedc18f8842a10553c0c2ff1d4d1c377dc955a55bdf9d913db' + 'e049c06e0071e09a4c3fba2689abf2eaa0f27cdf2e2e87cd91886e33ade4493c' + '15f413de6a2c0c3b1c1f1ff6e5a1f826c2380dec1680837bc7d7cdd66d8e8b2f' + 'efa4175539b2aaab3d7cbb6612dcffe92ad832eb6f55d7592cbed21a91b8a70a' + '2a59e95a378839429b641572bac2da60f9c231a92387b3d6056d09edeaaa2656' + 'b67aa678f2ab263b8400de5689556d10bf1ac245f5ba09668431ff7ab7bc7275' + 'ebecb789440ab81229004250718569b4925648d755bdaf4cd3c325dcefc1630a' + 'ab0457fbb31ae51fb83fe8701a6f206ed25c1b48c9c51cca753e54dc9b602198' + '404b3eb4a1b490de63d2eb605a4c8d21852031659aeba794e0a83cbb9947f6fb' + '22497ac33c46f899d83d9267d4b3b78be6ad513f287afe5c7a097be5bf9f1a95' + '0d0d21e63cf033337a49c72003dc1f9db2cbd5f9b0862cc01e3512b313fc5523' + '669ca04b047289be486c6663fff15dffb0d68ce7024d084b1b0784e6e509f4c3' + 'cf437a540dfdb71cdffb6313e0877d46d2b753872b6c985bed15c2e8e1bab2c9' + 'b5f1581890272e4b79b1a708b96f367091834587a18fa76cd76fabfc8925b09a' + '7fb7a91af74fa5564b9f48c5907ee8d63cb1c59d1ceb0a15e1ad2e744983e0cd' + 'fac78a18ca32a8184c309b2a43781ebae516e9d000d399f05b42c0b31cb73629' + 'e908675f6c6f7bfd786b4b1b8823a0bf9f70d7d0ea6c9b6ab4dade013a047c03' + '13d7a478e07ee4f1707cb3a35288d4ca713d81d5b8c9d214f0e04139b015ac7b' + 'ba2be70def813b46272f5012810a874063d0ea38de17371f8ca5e4cfbc256b19' + '9b2945be2e19f1c4c008243c169ef5fffdc00f25739bf5d785ce4cd4275bb254' + '93ba81299d33d4b2f847d20387289d700c944fcf7e6d0661df7cca5ee5b0ebe7' + '43327d72a9d02528ad9557fcb7d929b2195fa51aaf8e4b5a998ba7c920807cda' + 'e4309a6adf07d43f1c9f10d5470ecf054de997b7b32e45e18590af7f1e345c11' + 'd0751014d0c7d33d70d518c520d7c913686c626ad617cb522c9c4821b166ad99' + '22e8113efe1f656777b69b1b044a1879fead5c0572be6b1c6aa42ec4f07fc3a1' + 'cc438b936f2fb926cf49036fce03a45d92d679e6176abf52ff4e9ee1fa382be3' + 'ba6798051312410d4e76afde2be5be74edd8b9b737a7786f09e7c7fb4e8a90ca' + '6bcb38312d83f07afc9f322a803e8b1d87838c26ce1df65aefb0b7c73c7d06cc' + 'c6e5ae239c8807c6464fd140b7b9cdc975e7a8e7587102a96720c59817a74f74' + '2ee660ee38cf01a52280f06c555e130086cecfed80f76f38bedead2acc571103' + 'a5f803cf99a69f9779993ead2ec9637ed01f00a3898303a11dd3503d295659b3' + '0063447ae2b64db0515092f4b9e78c59a02f76fd5a5e97e1cae05a939328451b' + '9550fbc946b080eaf67e2dc10bf0998b3e9a6c8325ed4b7115c9069d7a71c25a' + '889b3085e874a040c3bc70c7f7777b650790f91ac18a5886f96abfc57cb68920' + '69f5601520eb0c944cc489f6dda009a6b5c714cb22f94af3d24cdba2ea81ed6a')