From f3391df5ef7dbdd416d6ecbbdf55d8672947d8ec Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sat, 10 Dec 2022 09:03:25 +0100 Subject: [PATCH] python: Update to 3.10.9 --- ...g-make-_sysconfigdata.py-relocatable.patch | 2 +- .../0002-restore-setup-config.patch | 10 +- ...t-threads-and-make-it-default-on-min.patch | 10 +- ...gcc-internal-defines-to-python-platf.patch | 2 +- ...igure-MACHDEP-and-platform-for-build.patch | 4 +- ...0006-MINGW-preset-configure-defaults.patch | 4 +- ...largefile-support-for-windows-builds.patch | 4 +- ...0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch | 6 +- .../0009-MINGW-init-system-calls.patch | 20 +- ...INGW-build-in-windows-modules-winreg.patch | 4 +- ...etermine-if-pwdmodule-should-be-used.patch | 4 +- ...-Mingw-recognition-to-pyport.h-to-al.patch | 2 +- ...013-MINGW-configure-for-shared-build.patch | 6 +- .../0014-MINGW-dynamic-loading-support.patch | 10 +- ...nore-main-program-for-frozen-scripts.patch | 8 +- ...-MINGW-setup-_multiprocessing-module.patch | 2 +- .../0017-MINGW-setup-select-module.patch | 2 +- ...up-_ctypes-module-with-system-libffi.patch | 2 +- ...ct-winsock2-and-setup-_socket-module.patch | 8 +- ...0020-MINGW-exclude-unix-only-modules.patch | 2 +- ...NGW-setup-msvcrt-and-_winapi-modules.patch | 4 +- ...nfig-MINGW-build-extensions-with-GCC.patch | 2 +- .../0023-MINGW-setup-_ssl-module.patch | 2 +- ...ation-of-posix-build-in-sysconfig.py.patch | 2 +- ...W-support-stdcall-without-underscore.patch | 2 +- ...ead-rename-to-avoid-failure-on-windo.patch | 2 +- .../0027-MINGW-customize-site.patch | 2 +- .../0028-add-python-config-sh.patch | 2 +- .../0029-cross-darwin-feature.patch | 4 +- .../0030-mingw-system-libffi.patch | 2 +- ...sys-mingw-prefer-unix-sep-if-MSYSTEM.patch | 8 +- .../0032-mingw-use-posix-getpath.patch | 6 +- ...mingw-add-ModuleFileName-dir-to-PATH.patch | 2 +- ...dd-BUILDIN_WIN32_MODULEs-time-msvcrt.patch | 2 +- ...s-cygwin-semi-native-build-sysconfig.patch | 6 +- ...sysconfig-mingw-sysconfig-like-posix.patch | 2 +- ...rlier-so-we-can-use-it-in-distutils-.patch | 2 +- ...d-multiarch-paths-if-cross-compiling.patch | 2 +- ...ngw-use-backslashes-in-compileall-py.patch | 2 +- ...-msys-convert_path-fix-and-root-hack.patch | 4 +- .../0041-allow-static-tcltk.patch | 2 +- .../0042-mingw-pdcurses_ISPAD.patch | 2 +- mingw-w64-python/0043-builddir-fixes.patch | 4 +- ...sys-monkeypatch-os-system-via-sh-exe.patch | 2 +- ...place-slashes-used-in-io-redirection.patch | 2 +- .../0046-remove_path_max.default.patch | 2 +- .../0047-dont-link-with-gettext.patch | 4 +- mingw-w64-python/0048-ctypes-python-dll.patch | 2 +- .../0049-gdbm-module-includes.patch | 2 +- .../0050-use-gnu_printf-in-format.patch | 2 +- ...w-fix-ssl-dont-use-enum_certificates.patch | 2 +- ...fix-using-dllhandle-and-winver-mingw.patch | 6 +- ...-config-so-msvccompiler-get_build_ve.patch | 2 +- ...4-MINGW-link-with-additional-library.patch | 6 +- mingw-w64-python/0055-install-msilib.patch | 4 +- .../0056-fix-signal-module-build.patch | 2 +- ...-build-winconsoleio-and-_testconsole.patch | 2 +- mingw-w64-python/0058-expose-sem_unlink.patch | 2 +- mingw-w64-python/0059-cygpty-isatty.patch | 14 +- .../0060-disable-broken-gdbm-module.patch | 2 +- ...win-resource-files-and-build-pythonw.patch | 8 +- mingw-w64-python/0062-disable-readline.patch | 2 +- mingw-w64-python/0063-fix-isselectable.patch | 2 +- ...64-use-_wcsnicmp-instead-wcsncasecmp.patch | 2 +- .../0065-_xxsubinterpretersmodule.patch | 2 +- .../0066-sqlite3-module-defines.patch | 2 +- ...067-configure.ac-fix-inet_pton-check.patch | 6 +- .../0068-set-venv-activate-path-unix.patch | 2 +- .../0069-venv-creation-fixes.patch | 27 +- .../0070-pass-gen-profile-ldflags.patch | 4 +- ...indows-must-link-ext-with-python-lib.patch | 6 +- .../0072-importlib-bootstrap-path-sep.patch | 2 +- mingw-w64-python/0073-pathlib-path-sep.patch | 2 +- mingw-w64-python/0074-warnings-fixes.patch | 12 +- .../0075-fix-build-testinternalcapi.patch | 2 +- .../0076-extend-MS_WINDOWS-flag.patch | 2 +- mingw-w64-python/0077-clang-arm64.patch | 2 +- ...configure.ac-set-MINGW-stack-reserve.patch | 4 +- ...079-Don-t-use-os.pathsep-to-find-EOF.patch | 2 +- ...ion-suffix-for-c-extensions-on-mingw.patch | 12 +- ...the-get_platform-method-in-sysconfig.patch | 2 +- ...ler-customize-mingw-cygwin-compilers.patch | 2 +- ...-distutils-compiler-enable-new-dtags.patch | 2 +- ...tils-MINGW-build-extensions-with-GCC.patch | 2 +- ...ngw32CCompiler-as-default-compiler-f.patch | 2 +- .../0086-distutils-find-import-library.patch | 2 +- ...circular-dependency-from-time-module.patch | 2 +- ...lization-of-posix-build-in-distutils.patch | 2 +- ...distutils-mingw-sysconfig-like-posix.patch | 2 +- .../0090-distutils-get_versions-fixes.patch | 2 +- ...91-distutils-install-layout-as-posix.patch | 2 +- ...-msys-convert_path-fix-and-root-hack.patch | 2 +- ...-distutils-mingw-build-optimized-ext.patch | 2 +- ...ccompiler-dont-strip-modules-if-pyde.patch | 2 +- ...istutils-get-compilers-from-env-vars.patch | 2 +- ...tutils-add-windmc-to-cygwinccompiler.patch | 2 +- .../0097-distutils-fix-msvc9-import.patch | 2 +- ...tils-mingw-add-LIBPL-to-library-dirs.patch | 2 +- ...-the-get_platform-method-in-distutil.patch | 2 +- ...00-build-Fix-ncursesw-include-lookup.patch | 8 +- .../0101-tests-fix-test_bytes.patch | 2 +- ...e-not-raising-for-invalid-year-value.patch | 2 +- ...brary-c-should-return-None-with-ucrt.patch | 2 +- ...uild-Disable-checks-for-dlopen-dlfcn.patch | 6 +- ...stall-location-of-the-import-library.patch | 4 +- ...NV_EXCL-for-the-shared-Python-module.patch | 4 +- ...venvlauncher-build-installation-into.patch | 4 +- ...onfigure.ac-set-_WIN32_WINNT-version.patch | 4 +- ....ac-don-t-check-for-clock_-functions.patch | 8 +- ...-normpath-paths-coming-from-env-vars.patch | 2 +- ...dd-support-for-Windows-7-Python-3.10.patch | 20 +- ...ld-and-add-some-mingw-specific-tests.patch | 2 +- ...smoketests-test-that-_decimal-exists.patch | 2 +- .../0114-Prefer-sysconfig.python_build.patch | 2 +- ...0115-Define-PY3_DLLNAME-to-fix-build.patch | 6 +- ...move-checks-for-ancient-gcc-binutils.patch | 2 +- ...CC-env-var-before-passing-to-subproc.patch | 2 +- ...8-_testconsole.c-Fix-casing-path-sep.patch | 2 +- ...t-architecture-markers-for-python-on.patch | 6 +- .../0120-distutils-add-back-gcc_version.patch | 2 +- ...ix-mingw-cross-compiling-in-setup.py.patch | 2 +- ...p-python-for-setting-up-correct-vers.patch | 2 +- ...sesw-pkg-config-when-cross-compiling.patch | 8 +- .../0124-CI-add-cross-llvm-mingw-jobs.patch | 2 +- ...mingw_smoketests-fix-_UCRT-condition.patch | 2 +- ...pattern-for-python-config.py-shebang.patch | 2 +- ...-Modify-sys.winver-to-match-upstream.patch | 6 +- ...-packages-path-to-include-the-enviro.patch | 2 +- ...e-a-header-in-the-check-for-_beginth.patch | 4 +- ...ault-to-without-c-locale-coercion-on.patch | 6 +- ...-CI-remove-without-c-locale-coercion.patch | 2 +- mingw-w64-python/0132-Fix-failing-tests.patch | 2 +- ...ild-root-to-libdirs-when-building-un.patch | 2 +- ...d-some-macros-only-available-in-Win7.patch | 6 +- ...e-we-always-use-the-stdlib-distutils.patch | 2 +- .../0136-CI-skip-some-more-flaky-tests.patch | 2 +- ...sep-with-an-empty-MSYSTEM-env-var-no.patch | 2 +- .../0138-Commit-regenerated-importlib.patch | 2 +- mingw-w64-python/PKGBUILD | 282 +++++++++--------- 139 files changed, 402 insertions(+), 407 deletions(-) diff --git a/mingw-w64-python/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch b/mingw-w64-python/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch index 9b6c2c4d8a..c892b75ca9 100644 --- a/mingw-w64-python/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch +++ b/mingw-w64-python/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch @@ -1,4 +1,4 @@ -From eb40dfd1e798821c71114a414c898bc967e2990f Mon Sep 17 00:00:00 2001 +From 0205260ac90e59182d21e1a1e05c16f306a188ec Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:51:10 +0530 Subject: [PATCH 001/N] sysconfig: make _sysconfigdata.py relocatable diff --git a/mingw-w64-python/0002-restore-setup-config.patch b/mingw-w64-python/0002-restore-setup-config.patch index e1948dfd8c..d98839c76c 100644 --- a/mingw-w64-python/0002-restore-setup-config.patch +++ b/mingw-w64-python/0002-restore-setup-config.patch @@ -1,4 +1,4 @@ -From 461d489bdb3ba9e6bf0d52e139daf5ec85696aed Mon Sep 17 00:00:00 2001 +From dbcea75db669207c53f5b9f03c43d151c812c2c1 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 @@ -12,7 +12,7 @@ Subject: [PATCH 002/N] restore setup config create mode 100644 Modules/Setup.config.in diff --git a/Makefile.pre.in b/Makefile.pre.in -index 8ee44bf..cad42bc 100644 +index 51c31b9..ada6a88 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -710,10 +710,12 @@ oldsharedmods: $(SHAREDMODS) @@ -56,10 +56,10 @@ index 0000000..5c1299d +# based on configure-time options. + diff --git a/configure.ac b/configure.ac -index cc69015..a468f61 100644 +index ac3be38..91f63db 100644 --- a/configure.ac +++ b/configure.ac -@@ -6006,7 +6006,7 @@ AC_SUBST(TEST_MODULES) +@@ -6010,7 +6010,7 @@ AC_SUBST(TEST_MODULES) # generate output files @@ -68,7 +68,7 @@ index cc69015..a468f61 100644 AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix]) AC_OUTPUT -@@ -6018,7 +6018,7 @@ fi +@@ -6022,7 +6022,7 @@ fi echo "creating Makefile" >&AS_MESSAGE_FD $SHELL $srcdir/Modules/makesetup -c $srcdir/Modules/config.c.in \ diff --git a/mingw-w64-python/0003-build-add-with-nt-threads-and-make-it-default-on-min.patch b/mingw-w64-python/0003-build-add-with-nt-threads-and-make-it-default-on-min.patch index 1895522f27..d41bff1268 100644 --- a/mingw-w64-python/0003-build-add-with-nt-threads-and-make-it-default-on-min.patch +++ b/mingw-w64-python/0003-build-add-with-nt-threads-and-make-it-default-on-min.patch @@ -1,4 +1,4 @@ -From bdf37e4e5fd9d6b17b339d7b775b606dd2ba02cd Mon Sep 17 00:00:00 2001 +From a2a1db4a1771b6bfc5fe8d13463a75ca78b0579a 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 @@ -78,7 +78,7 @@ index 277963b..07bb047 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 a468f61..a2a7abf 100644 +index 91f63db..3d31ecb 100644 --- a/configure.ac +++ b/configure.ac @@ -2044,6 +2044,53 @@ then @@ -228,7 +228,7 @@ index a468f61..a2a7abf 100644 else if test ! -z "$withval" -a -d "$withval" then LDFLAGS="$LDFLAGS -L$withval" -@@ -3706,6 +3782,15 @@ else +@@ -3707,6 +3783,15 @@ else fi # checks for library functions @@ -244,7 +244,7 @@ index a468f61..a2a7abf 100644 AC_CHECK_FUNCS(alarm accept4 setitimer getitimer bind_textdomain_codeset chown \ clock confstr close_range copy_file_range ctermid dup3 execv explicit_bzero \ explicit_memset faccessat fchmod fchmodat fchown fchownat \ -@@ -4637,6 +4722,10 @@ AC_CHECK_DECLS([isinf, isnan, isfinite], [], [], [[#include ]]) +@@ -4638,6 +4723,10 @@ AC_CHECK_DECLS([isinf, isnan, isfinite], [], [], [[#include ]]) # the kernel module that provides POSIX semaphores # isn't loaded by default, so an attempt to call # sem_open results in a 'Signal 12' error. @@ -255,7 +255,7 @@ index a468f61..a2a7abf 100644 AC_MSG_CHECKING(whether POSIX semaphores are enabled) AC_CACHE_VAL(ac_cv_posix_semaphores_enabled, AC_RUN_IFELSE([AC_LANG_SOURCE([[ -@@ -4670,6 +4759,14 @@ fi +@@ -4671,6 +4760,14 @@ fi # Multiprocessing check for broken sem_getvalue AC_MSG_CHECKING(for broken sem_getvalue) diff --git a/mingw-w64-python/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch b/mingw-w64-python/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch index 3f0d25f37a..f20121d280 100644 --- a/mingw-w64-python/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch +++ b/mingw-w64-python/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch @@ -1,4 +1,4 @@ -From 43133b521e79f62d4d473a2c5ad9a1b8dafacbdf Mon Sep 17 00:00:00 2001 +From 4d867e6d74be13f5b894c02103bd38c239943a9e 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 diff --git a/mingw-w64-python/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch b/mingw-w64-python/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch index a89d9b35f5..d7b7068a2d 100644 --- a/mingw-w64-python/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch +++ b/mingw-w64-python/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch @@ -1,4 +1,4 @@ -From 07eb1b65a25cc13f8e60647dbb9a49f51e0242bc Mon Sep 17 00:00:00 2001 +From 35f943d0c3ed3683bc5866d4660e01c1215aa4e9 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 a2a7abf..f7c34a4 100644 +index 3d31ecb..ce26031 100644 --- a/configure.ac +++ b/configure.ac @@ -400,6 +400,9 @@ then diff --git a/mingw-w64-python/0006-MINGW-preset-configure-defaults.patch b/mingw-w64-python/0006-MINGW-preset-configure-defaults.patch index c77d1219df..05c10c9370 100644 --- a/mingw-w64-python/0006-MINGW-preset-configure-defaults.patch +++ b/mingw-w64-python/0006-MINGW-preset-configure-defaults.patch @@ -1,4 +1,4 @@ -From afb9a2b539e23db3ea55e1831f33fd87721e8066 Mon Sep 17 00:00:00 2001 +From ae09cdbf80e0e96ff187d2916eaedcc6e8db42c1 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 f7c34a4..1f24830 100644 +index ce26031..e208b3d 100644 --- a/configure.ac +++ b/configure.ac @@ -910,6 +910,28 @@ if test x$MULTIARCH != x; then diff --git a/mingw-w64-python/0007-MINGW-configure-largefile-support-for-windows-builds.patch b/mingw-w64-python/0007-MINGW-configure-largefile-support-for-windows-builds.patch index 0095241eb5..cd665b017b 100644 --- a/mingw-w64-python/0007-MINGW-configure-largefile-support-for-windows-builds.patch +++ b/mingw-w64-python/0007-MINGW-configure-largefile-support-for-windows-builds.patch @@ -1,4 +1,4 @@ -From 668a889c4eb7b7bd0572156e243446dc14fb4af2 Mon Sep 17 00:00:00 2001 +From 9735b61959317b02ba1275b453d9f915a149355c 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 @@ -14,7 +14,7 @@ Co-authored-by: Christoph Reiter 1 file changed, 12 insertions(+) diff --git a/configure.ac b/configure.ac -index 1f24830..a0ce0df 100644 +index e208b3d..18c4db4 100644 --- a/configure.ac +++ b/configure.ac @@ -2494,8 +2494,20 @@ AC_CHECK_SIZEOF(off_t, [], [ diff --git a/mingw-w64-python/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch b/mingw-w64-python/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch index 7edc8b9cb5..9112f267e7 100644 --- a/mingw-w64-python/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch +++ b/mingw-w64-python/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch @@ -1,4 +1,4 @@ -From 491a5b182f240b11018581670331cf4e908fc2ad Mon Sep 17 00:00:00 2001 +From cb26a5c2cbb4a0b0ae0e3c0c81c063aae5d1ed7c 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 @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 13 insertions(+) diff --git a/configure.ac b/configure.ac -index a0ce0df..95434a7 100644 +index 18c4db4..d55e695 100644 --- a/configure.ac +++ b/configure.ac -@@ -5714,8 +5714,21 @@ do +@@ -5716,8 +5716,21 @@ do THREADHEADERS="$THREADHEADERS \$(srcdir)/$h" done diff --git a/mingw-w64-python/0009-MINGW-init-system-calls.patch b/mingw-w64-python/0009-MINGW-init-system-calls.patch index 4b757ef630..f0186b43df 100644 --- a/mingw-w64-python/0009-MINGW-init-system-calls.patch +++ b/mingw-w64-python/0009-MINGW-init-system-calls.patch @@ -1,4 +1,4 @@ -From 92502cfa7067061c98af1d8210c9198564c9a0cd Mon Sep 17 00:00:00 2001 +From c2ab4493238d36a199128ca4ea15bcc29feea1f2 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 @@ -39,10 +39,10 @@ index 5c1299d..9b364fe 100644 +@INITSYS@ -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal posixmodule.c + diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index f92e2ae..9bbf69a 100644 +index 62b81a1..26c47ee 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c -@@ -320,6 +320,27 @@ corresponding Unix manual entries for more information on calls."); +@@ -323,6 +323,27 @@ corresponding Unix manual entries for more information on calls."); # define HAVE_CWAIT 1 # define HAVE_FSYNC 1 # define fsync _commit @@ -70,7 +70,7 @@ index f92e2ae..9bbf69a 100644 # else /* Unix functions that the configure script doesn't check for */ # ifndef __VXWORKS__ -@@ -420,7 +441,7 @@ extern char *ctermid_r(char *); +@@ -423,7 +444,7 @@ extern char *ctermid_r(char *); # endif #endif @@ -79,16 +79,16 @@ index f92e2ae..9bbf69a 100644 # ifdef HAVE_DIRECT_H # include # endif -@@ -442,7 +463,7 @@ extern char *ctermid_r(char *); - # include // ShellExecute() - # include // UNLEN - # define HAVE_SYMLINK +@@ -434,7 +455,7 @@ extern char *ctermid_r(char *); + # include + # endif + # include -#endif /* _MSC_VER */ +#endif /* MS_WINDOWS */ #ifndef MAXPATHLEN # if defined(PATH_MAX) && PATH_MAX > 1024 -@@ -1591,9 +1612,9 @@ win32_get_reparse_tag(HANDLE reparse_point_handle, ULONG *reparse_tag) +@@ -1583,9 +1604,9 @@ win32_get_reparse_tag(HANDLE reparse_point_handle, ULONG *reparse_tag) ** man environ(7). */ #include @@ -101,7 +101,7 @@ index f92e2ae..9bbf69a 100644 static PyObject * convertenviron(void) diff --git a/configure.ac b/configure.ac -index 95434a7..51ff31a 100644 +index d55e695..28c707f 100644 --- a/configure.ac +++ b/configure.ac @@ -584,6 +584,14 @@ then diff --git a/mingw-w64-python/0010-MINGW-build-in-windows-modules-winreg.patch b/mingw-w64-python/0010-MINGW-build-in-windows-modules-winreg.patch index 9a6a028d27..4fe953b6cf 100644 --- a/mingw-w64-python/0010-MINGW-build-in-windows-modules-winreg.patch +++ b/mingw-w64-python/0010-MINGW-build-in-windows-modules-winreg.patch @@ -1,4 +1,4 @@ -From c3ffc461de90502772b113ae355014c80d492d3a Mon Sep 17 00:00:00 2001 +From 2b63fc2a55edca864cd780b07327f8424ef6fb28 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 @@ -57,7 +57,7 @@ index 4fefcdc..00de52b 100644 static BOOL clinic_HKEY_converter(PyObject *ob, void *p); static PyObject *PyHKEY_FromHKEY(HKEY h); diff --git a/configure.ac b/configure.ac -index 51ff31a..d83dedf 100644 +index 28c707f..763abcc 100644 --- a/configure.ac +++ b/configure.ac @@ -3346,6 +3346,13 @@ else diff --git a/mingw-w64-python/0011-MINGW-determine-if-pwdmodule-should-be-used.patch b/mingw-w64-python/0011-MINGW-determine-if-pwdmodule-should-be-used.patch index 0cdb744f1e..4efd971b6d 100644 --- a/mingw-w64-python/0011-MINGW-determine-if-pwdmodule-should-be-used.patch +++ b/mingw-w64-python/0011-MINGW-determine-if-pwdmodule-should-be-used.patch @@ -1,4 +1,4 @@ -From 40f457711805ccd9f635ef3467a862d0f77f3c49 Mon Sep 17 00:00:00 2001 +From f041316c69a478a2dcc54f36bad69a34e90a2a5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:21 +0530 @@ -43,7 +43,7 @@ index 612cabd..d071a74 100644 @USE_WIN32_MODULE@winreg ../PC/winreg.c diff --git a/configure.ac b/configure.ac -index d83dedf..f5acdfd 100644 +index 763abcc..996c984 100644 --- a/configure.ac +++ b/configure.ac @@ -3353,6 +3353,13 @@ case $host in diff --git a/mingw-w64-python/0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch b/mingw-w64-python/0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch index 82384061e8..7f744d0663 100644 --- a/mingw-w64-python/0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch +++ b/mingw-w64-python/0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch @@ -1,4 +1,4 @@ -From 680a5a8aed43506aa8b474947cc3b279e40dfe50 Mon Sep 17 00:00:00 2001 +From 0a88d9fad9adf4e33d1635daaf2d513376d9928e 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 diff --git a/mingw-w64-python/0013-MINGW-configure-for-shared-build.patch b/mingw-w64-python/0013-MINGW-configure-for-shared-build.patch index e51b6e0d3d..d77846251a 100644 --- a/mingw-w64-python/0013-MINGW-configure-for-shared-build.patch +++ b/mingw-w64-python/0013-MINGW-configure-for-shared-build.patch @@ -1,4 +1,4 @@ -From 6a50448af007468549e48de8985c27d81e83ccf4 Mon Sep 17 00:00:00 2001 +From 5379d6b4bbd32beb891e66f6244f51193a07c8ed 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 @@ -13,7 +13,7 @@ Co-authored-by: Алексей 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index f5acdfd..73dfc74 100644 +index 996c984..63467e3 100644 --- a/configure.ac +++ b/configure.ac @@ -1227,6 +1227,13 @@ if test $enable_shared = "yes"; then @@ -54,7 +54,7 @@ index f5acdfd..73dfc74 100644 fi AC_MSG_RESULT($LDSHARED) LDCXXSHARED=${LDCXXSHARED-$LDSHARED} -@@ -5742,7 +5759,8 @@ case $host in +@@ -5744,7 +5761,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-python/0014-MINGW-dynamic-loading-support.patch b/mingw-w64-python/0014-MINGW-dynamic-loading-support.patch index bc9994d346..7f2a7b8d5b 100644 --- a/mingw-w64-python/0014-MINGW-dynamic-loading-support.patch +++ b/mingw-w64-python/0014-MINGW-dynamic-loading-support.patch @@ -1,4 +1,4 @@ -From 66efcc595c20982aed82453b9aa0ffdcd8cfb4ae Mon Sep 17 00:00:00 2001 +From 1f5a5668fb75338a34bf604512a3073197e51e08 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,7 +15,7 @@ Co-authored-by: Алексей 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index cad42bc..8a039e5 100644 +index ada6a88..6f7e485 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -825,6 +825,12 @@ Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile @@ -59,7 +59,7 @@ index 5702ab2..6b53780 100644 #if !USE_UNICODE_WCHAR_CACHE PyMem_Free(wpathname); diff --git a/configure.ac b/configure.ac -index 73dfc74..a3a993e 100644 +index 63467e3..de947d6 100644 --- a/configure.ac +++ b/configure.ac @@ -2768,6 +2768,9 @@ if test -z "$SHLIB_SUFFIX"; then @@ -72,7 +72,7 @@ index 73dfc74..a3a993e 100644 fi AC_MSG_RESULT($SHLIB_SUFFIX) -@@ -3845,6 +3848,13 @@ then +@@ -3846,6 +3849,13 @@ then fi ;; esac @@ -86,7 +86,7 @@ index 73dfc74..a3a993e 100644 fi AC_MSG_RESULT($DYNLOADFILE) if test "$DYNLOADFILE" != "dynload_stub.o" -@@ -5739,6 +5749,12 @@ case "$ac_cv_computed_gotos" in yes*) +@@ -5741,6 +5751,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-python/0015-MINGW-ignore-main-program-for-frozen-scripts.patch b/mingw-w64-python/0015-MINGW-ignore-main-program-for-frozen-scripts.patch index 51ab6f5bd5..4721514b14 100644 --- a/mingw-w64-python/0015-MINGW-ignore-main-program-for-frozen-scripts.patch +++ b/mingw-w64-python/0015-MINGW-ignore-main-program-for-frozen-scripts.patch @@ -1,4 +1,4 @@ -From ed0bf4a1d8f78fe307b5c6cc5d42795960f43234 Mon Sep 17 00:00:00 2001 +From a86501488ec7ff475d832907392959c7e8a3c455 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 8a039e5..0d8ea11 100644 +index 6f7e485..b07735c 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -349,7 +349,7 @@ PYTHON_OBJS= \ @@ -27,10 +27,10 @@ index 8a039e5..0d8ea11 100644 Python/getargs.o \ Python/getcompiler.o \ diff --git a/configure.ac b/configure.ac -index a3a993e..41d01a1 100644 +index de947d6..9c0e6dc 100644 --- a/configure.ac +++ b/configure.ac -@@ -5780,6 +5780,16 @@ case $host in +@@ -5782,6 +5782,16 @@ case $host in ;; esac diff --git a/mingw-w64-python/0016-MINGW-setup-_multiprocessing-module.patch b/mingw-w64-python/0016-MINGW-setup-_multiprocessing-module.patch index 2e6f722ccc..13807e5739 100644 --- a/mingw-w64-python/0016-MINGW-setup-_multiprocessing-module.patch +++ b/mingw-w64-python/0016-MINGW-setup-_multiprocessing-module.patch @@ -1,4 +1,4 @@ -From fc1b8748a79e636f7b6c2104b42772171503cd1c Mon Sep 17 00:00:00 2001 +From 8caff32dc234910a46db641fc4499441c9e5b140 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 diff --git a/mingw-w64-python/0017-MINGW-setup-select-module.patch b/mingw-w64-python/0017-MINGW-setup-select-module.patch index b985ab8227..bf62f544bf 100644 --- a/mingw-w64-python/0017-MINGW-setup-select-module.patch +++ b/mingw-w64-python/0017-MINGW-setup-select-module.patch @@ -1,4 +1,4 @@ -From 58a2202c36f97a944885bdb4bfdc3edeb8b760fd Mon Sep 17 00:00:00 2001 +From 385420c7a6a4636812da4034ae36600835fad6d5 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:29 +0530 diff --git a/mingw-w64-python/0018-MINGW-setup-_ctypes-module-with-system-libffi.patch b/mingw-w64-python/0018-MINGW-setup-_ctypes-module-with-system-libffi.patch index 428f4a6714..d4321b55c0 100644 --- a/mingw-w64-python/0018-MINGW-setup-_ctypes-module-with-system-libffi.patch +++ b/mingw-w64-python/0018-MINGW-setup-_ctypes-module-with-system-libffi.patch @@ -1,4 +1,4 @@ -From 77a92f8a22d445675bd0f885cb3c23a09128d6c0 Mon Sep 17 00:00:00 2001 +From 27e1e52951fce8ed882fd362f90301551249158f 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 diff --git a/mingw-w64-python/0019-MINGW-defect-winsock2-and-setup-_socket-module.patch b/mingw-w64-python/0019-MINGW-defect-winsock2-and-setup-_socket-module.patch index ef53a9fe04..1423407f84 100644 --- a/mingw-w64-python/0019-MINGW-defect-winsock2-and-setup-_socket-module.patch +++ b/mingw-w64-python/0019-MINGW-defect-winsock2-and-setup-_socket-module.patch @@ -1,4 +1,4 @@ -From 8efb51c4e795bcd8268945915ec40ed0a3b97336 Mon Sep 17 00:00:00 2001 +From 55a3a51b68fc505d15bb6f4efd43168a7c9d3e3c 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 @@ -61,10 +61,10 @@ index 6a9ac2c..9f2de27 100644 # include "addrinfo.h" #endif diff --git a/configure.ac b/configure.ac -index 41d01a1..d906f58 100644 +index 9c0e6dc..367ef82 100644 --- a/configure.ac +++ b/configure.ac -@@ -4468,21 +4468,36 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +@@ -4469,21 +4469,36 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ],[]) AC_MSG_RESULT($was_it_defined) @@ -105,7 +105,7 @@ index 41d01a1..d906f58 100644 [ac_cv_struct_sockaddr_storage=yes], [ac_cv_struct_sockaddr_storage=no])) AC_MSG_RESULT($ac_cv_struct_sockaddr_storage) -@@ -5670,7 +5685,10 @@ fi +@@ -5671,7 +5686,10 @@ fi AC_CHECK_TYPE(socklen_t,, AC_DEFINE(socklen_t,int, diff --git a/mingw-w64-python/0020-MINGW-exclude-unix-only-modules.patch b/mingw-w64-python/0020-MINGW-exclude-unix-only-modules.patch index 9e175520d3..9014852c57 100644 --- a/mingw-w64-python/0020-MINGW-exclude-unix-only-modules.patch +++ b/mingw-w64-python/0020-MINGW-exclude-unix-only-modules.patch @@ -1,4 +1,4 @@ -From 197b72839fad82f51a0934f6782586bcaf4cefe1 Mon Sep 17 00:00:00 2001 +From d36c1a4b773e9331b88231b23b476983e1376a14 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:31 +0530 diff --git a/mingw-w64-python/0021-MINGW-setup-msvcrt-and-_winapi-modules.patch b/mingw-w64-python/0021-MINGW-setup-msvcrt-and-_winapi-modules.patch index 640ca576a4..1a9751928c 100644 --- a/mingw-w64-python/0021-MINGW-setup-msvcrt-and-_winapi-modules.patch +++ b/mingw-w64-python/0021-MINGW-setup-msvcrt-and-_winapi-modules.patch @@ -1,4 +1,4 @@ -From a046badbb7431ba7c99a98dc39ab45e38ec219c6 Mon Sep 17 00:00:00 2001 +From f2b6e85df4c4a9db6638d225944951cc92e04c8b 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:33 +0530 @@ -16,7 +16,7 @@ Co-authored-by: Алексей 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/Modules/_winapi.c b/Modules/_winapi.c -index 9b30a90..4d88e33 100644 +index f6bb07f..0dc06cc 100644 --- a/Modules/_winapi.c +++ b/Modules/_winapi.c @@ -41,7 +41,9 @@ diff --git a/mingw-w64-python/0022-sysconfig-MINGW-build-extensions-with-GCC.patch b/mingw-w64-python/0022-sysconfig-MINGW-build-extensions-with-GCC.patch index a0e17470a1..19dab841db 100644 --- a/mingw-w64-python/0022-sysconfig-MINGW-build-extensions-with-GCC.patch +++ b/mingw-w64-python/0022-sysconfig-MINGW-build-extensions-with-GCC.patch @@ -1,4 +1,4 @@ -From 5db8a56abdeb66ebcf071b061738984cd7c44bbb Mon Sep 17 00:00:00 2001 +From cdd83345585161f0b1152f9be5669f88f563b224 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 20:52:42 +0200 Subject: [PATCH 022/N] sysconfig: MINGW build extensions with GCC diff --git a/mingw-w64-python/0023-MINGW-setup-_ssl-module.patch b/mingw-w64-python/0023-MINGW-setup-_ssl-module.patch index d429751eab..1dff9a015f 100644 --- a/mingw-w64-python/0023-MINGW-setup-_ssl-module.patch +++ b/mingw-w64-python/0023-MINGW-setup-_ssl-module.patch @@ -1,4 +1,4 @@ -From 8f3d75ca9af2b4f262192bc9ee47c0c664e92fec Mon Sep 17 00:00:00 2001 +From 2a70688efc1039e0756ef70e4ad7e2658713f648 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:37 +0530 diff --git a/mingw-w64-python/0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch b/mingw-w64-python/0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch index 776db8d503..281353b193 100644 --- a/mingw-w64-python/0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch +++ b/mingw-w64-python/0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch @@ -1,4 +1,4 @@ -From 0a27e13666d43ff4e83fa68480a7d3d5ee57cc01 Mon Sep 17 00:00:00 2001 +From b1d7f22f98c1f99a676954017b97ce306c0988d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:38 +0530 diff --git a/mingw-w64-python/0025-MINGW-support-stdcall-without-underscore.patch b/mingw-w64-python/0025-MINGW-support-stdcall-without-underscore.patch index b45e47dfe2..21b1799e0b 100644 --- a/mingw-w64-python/0025-MINGW-support-stdcall-without-underscore.patch +++ b/mingw-w64-python/0025-MINGW-support-stdcall-without-underscore.patch @@ -1,4 +1,4 @@ -From 96ceb5402ee3276483455dc27338bacc7c0cf66a Mon Sep 17 00:00:00 2001 +From 2737f0674ecae506600288a7b46eac1cf302d2ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:39 +0530 diff --git a/mingw-w64-python/0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch b/mingw-w64-python/0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch index f86e7b93e7..d36914a4a9 100644 --- a/mingw-w64-python/0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch +++ b/mingw-w64-python/0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch @@ -1,4 +1,4 @@ -From 08569ef8ebaa7b80ee57dad5a47e8ae4e9fb2661 Mon Sep 17 00:00:00 2001 +From 015342d55ac52df1897417f37252492f7646ae81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:40 +0530 diff --git a/mingw-w64-python/0027-MINGW-customize-site.patch b/mingw-w64-python/0027-MINGW-customize-site.patch index f19639677d..c8fcb49e92 100644 --- a/mingw-w64-python/0027-MINGW-customize-site.patch +++ b/mingw-w64-python/0027-MINGW-customize-site.patch @@ -1,4 +1,4 @@ -From 78fdf2b59b174a94b430ec82987fa8aeb5656f13 Mon Sep 17 00:00:00 2001 +From ca5758079f567960aa6107c234568813366080df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:42 +0530 diff --git a/mingw-w64-python/0028-add-python-config-sh.patch b/mingw-w64-python/0028-add-python-config-sh.patch index cb0b468588..39a537aaf1 100644 --- a/mingw-w64-python/0028-add-python-config-sh.patch +++ b/mingw-w64-python/0028-add-python-config-sh.patch @@ -1,4 +1,4 @@ -From dc3b1c42ba2ba89b57cf3a7e177188a9be852a07 Mon Sep 17 00:00:00 2001 +From d83ae3ec525fee817b4d23013e01fe16aba43885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:43 +0530 diff --git a/mingw-w64-python/0029-cross-darwin-feature.patch b/mingw-w64-python/0029-cross-darwin-feature.patch index ab1457ae8c..c955f5ac4c 100644 --- a/mingw-w64-python/0029-cross-darwin-feature.patch +++ b/mingw-w64-python/0029-cross-darwin-feature.patch @@ -1,4 +1,4 @@ -From 0ce42ef5c43c256e0c4fc4bdbf9fc9c902ec3073 Mon Sep 17 00:00:00 2001 +From 68c3092857ef549e3c9c13dad5590debf55c5c6e 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:44 +0530 @@ -13,7 +13,7 @@ Co-authored-by: Алексей 1 file changed, 49 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac -index d906f58..0ad6a55 100644 +index 367ef82..8998e44 100644 --- a/configure.ac +++ b/configure.ac @@ -387,6 +387,7 @@ if test -z "$MACHDEP" diff --git a/mingw-w64-python/0030-mingw-system-libffi.patch b/mingw-w64-python/0030-mingw-system-libffi.patch index d34d245d4e..13a759a742 100644 --- a/mingw-w64-python/0030-mingw-system-libffi.patch +++ b/mingw-w64-python/0030-mingw-system-libffi.patch @@ -1,4 +1,4 @@ -From 50b8169e9f39ec90aeda46c00c6b79da028c9e83 Mon Sep 17 00:00:00 2001 +From 72c9bbc7fd68154164b47e1edc1dd43522c157ac 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:45 +0530 diff --git a/mingw-w64-python/0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch b/mingw-w64-python/0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch index da1cb7eab9..27efe593ba 100644 --- a/mingw-w64-python/0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch +++ b/mingw-w64-python/0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch @@ -1,4 +1,4 @@ -From 6ba40ced4aec171591cdff33ddd27f4f24ced764 Mon Sep 17 00:00:00 2001 +From 269239add2f6ec889ce536d68e2bb0060df4e248 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:51:46 +0530 Subject: [PATCH 031/N] msys mingw prefer unix sep if MSYSTEM @@ -227,10 +227,10 @@ index 97edfa5..9a404ab 100644 try: diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 9bbf69a..057d10a 100644 +index 26c47ee..c2a822a 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c -@@ -3821,6 +3821,7 @@ posix_getcwd(int use_bytes) +@@ -3813,6 +3813,7 @@ posix_getcwd(int use_bytes) return PyErr_SetFromWindowsErr(0); } @@ -238,7 +238,7 @@ index 9bbf69a..057d10a 100644 PyObject *resobj = PyUnicode_FromWideChar(wbuf2, len); if (wbuf2 != wbuf) { PyMem_RawFree(wbuf2); -@@ -4384,6 +4385,7 @@ os__getfinalpathname_impl(PyObject *module, path_t *path) +@@ -4376,6 +4377,7 @@ os__getfinalpathname_impl(PyObject *module, path_t *path) target_path = tmp; } diff --git a/mingw-w64-python/0032-mingw-use-posix-getpath.patch b/mingw-w64-python/0032-mingw-use-posix-getpath.patch index 5cdf60d8af..a3813f36ca 100644 --- a/mingw-w64-python/0032-mingw-use-posix-getpath.patch +++ b/mingw-w64-python/0032-mingw-use-posix-getpath.patch @@ -1,4 +1,4 @@ -From 314d9dfb18cd865fb0b42177d4d14c12311204c7 Mon Sep 17 00:00:00 2001 +From 729e6152717c6e966e67f5c76b86690d9532d349 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:47 +0530 @@ -435,10 +435,10 @@ index ef6dd59..4cb6738 100644 status = calculate_init(&calculate, config); diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 057d10a..98e998e 100644 +index c2a822a..738954d 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c -@@ -4111,7 +4111,7 @@ _listdir_windows_no_opendir(path_t *path, PyObject *list) +@@ -4103,7 +4103,7 @@ _listdir_windows_no_opendir(path_t *path, PyObject *list) Py_END_ALLOW_THREADS /* FindNextFile sets error to ERROR_NO_MORE_FILES if it got to the end of the directory. */ diff --git a/mingw-w64-python/0033-mingw-add-ModuleFileName-dir-to-PATH.patch b/mingw-w64-python/0033-mingw-add-ModuleFileName-dir-to-PATH.patch index c9703c2cea..7ad40c075b 100644 --- a/mingw-w64-python/0033-mingw-add-ModuleFileName-dir-to-PATH.patch +++ b/mingw-w64-python/0033-mingw-add-ModuleFileName-dir-to-PATH.patch @@ -1,4 +1,4 @@ -From 090cda04cfcce5c0f5404d7def164024a72ddc52 Mon Sep 17 00:00:00 2001 +From fb66c1d2537e27014b2aceb10fd1a436e25f8189 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:51:48 +0530 Subject: [PATCH 033/N] mingw add ModuleFileName dir to PATH diff --git a/mingw-w64-python/0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch b/mingw-w64-python/0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch index 6a528a72c9..ab028ecc42 100644 --- a/mingw-w64-python/0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch +++ b/mingw-w64-python/0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch @@ -1,4 +1,4 @@ -From da9db6ada573d508521b2ca7bf937333f0ed47e6 Mon Sep 17 00:00:00 2001 +From e7d9579fca32e4d56322d15f8759f9d34cb918c1 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:49 +0530 diff --git a/mingw-w64-python/0035-msys-cygwin-semi-native-build-sysconfig.patch b/mingw-w64-python/0035-msys-cygwin-semi-native-build-sysconfig.patch index ef4d4ea2a2..6f275d649f 100644 --- a/mingw-w64-python/0035-msys-cygwin-semi-native-build-sysconfig.patch +++ b/mingw-w64-python/0035-msys-cygwin-semi-native-build-sysconfig.patch @@ -1,4 +1,4 @@ -From bbe9a724d75d6861affbcb6726f6faa6973a5740 Mon Sep 17 00:00:00 2001 +From a3f81aa3f7ddf03ac7b5e33c4e511958ae5d369d 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 c9ab982..5c3b03c 100644 vars.update(done) return vars diff --git a/Makefile.pre.in b/Makefile.pre.in -index 0d8ea11..8f762e4 100644 +index b07735c..8d2a88a 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -136,6 +136,13 @@ exec_prefix= @exec_prefix@ @@ -52,7 +52,7 @@ index 0d8ea11..8f762e4 100644 BINDIR= @bindir@ LIBDIR= @libdir@ diff --git a/configure.ac b/configure.ac -index 0ad6a55..1d78c2c 100644 +index 8998e44..7473ed1 100644 --- a/configure.ac +++ b/configure.ac @@ -608,6 +608,65 @@ then diff --git a/mingw-w64-python/0036-sysconfig-mingw-sysconfig-like-posix.patch b/mingw-w64-python/0036-sysconfig-mingw-sysconfig-like-posix.patch index 8122803cbc..993d504ebb 100644 --- a/mingw-w64-python/0036-sysconfig-mingw-sysconfig-like-posix.patch +++ b/mingw-w64-python/0036-sysconfig-mingw-sysconfig-like-posix.patch @@ -1,4 +1,4 @@ -From ec8f8d3e5fb95bf3c08cc8d1f1c892da782a8e26 Mon Sep 17 00:00:00 2001 +From 98cb06031dce00bee05a95ec1cb6332493f34a2f Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 20:53:59 +0200 Subject: [PATCH 036/N] sysconfig: mingw sysconfig like posix diff --git a/mingw-w64-python/0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch b/mingw-w64-python/0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch index c12405c466..62da6afa83 100644 --- a/mingw-w64-python/0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch +++ b/mingw-w64-python/0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch @@ -1,4 +1,4 @@ -From e2b0ad44039dd18cbfaa18f442fca18461ff93b1 Mon Sep 17 00:00:00 2001 +From 726f61915ff7798d7776d435549f15d1974bd9dc Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:13:57 +0200 Subject: [PATCH 037/N] build _winapi earlier so we can use it in distutils diff --git a/mingw-w64-python/0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch b/mingw-w64-python/0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch index 2ffee7aa98..a5eba3060e 100644 --- a/mingw-w64-python/0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch +++ b/mingw-w64-python/0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch @@ -1,4 +1,4 @@ -From 1dc74093ad8d5db0886fe319d259c2f5ca6df448 Mon Sep 17 00:00:00 2001 +From cc3de7933a845fcd59be6ae955fe9edbcb7a1996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:52 +0530 diff --git a/mingw-w64-python/0039-mingw-use-backslashes-in-compileall-py.patch b/mingw-w64-python/0039-mingw-use-backslashes-in-compileall-py.patch index 9c442783c6..b2105d8726 100644 --- a/mingw-w64-python/0039-mingw-use-backslashes-in-compileall-py.patch +++ b/mingw-w64-python/0039-mingw-use-backslashes-in-compileall-py.patch @@ -1,4 +1,4 @@ -From 04ae38b0c142d068d1220d40ae1e543e0a837172 Mon Sep 17 00:00:00 2001 +From 04bb129883944500f7e9b375ebc3c7221546eaa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:53 +0530 diff --git a/mingw-w64-python/0040-msys-convert_path-fix-and-root-hack.patch b/mingw-w64-python/0040-msys-convert_path-fix-and-root-hack.patch index 718657f6fe..7f954a7a03 100644 --- a/mingw-w64-python/0040-msys-convert_path-fix-and-root-hack.patch +++ b/mingw-w64-python/0040-msys-convert_path-fix-and-root-hack.patch @@ -1,4 +1,4 @@ -From f33b21255ca66937edfbb78814c167b2f624eff4 Mon Sep 17 00:00:00 2001 +From 0da7af64e63fbfd623606df28e79d8574e13a9f3 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:18:36 +0200 Subject: [PATCH 040/N] msys convert_path fix and root hack @@ -8,7 +8,7 @@ Subject: [PATCH 040/N] msys convert_path fix and root hack 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 8f762e4..6a9f63d 100644 +index 8d2a88a..9b62db4 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1760,6 +1760,12 @@ libainstall: @DEF_MAKE_RULE@ python-config diff --git a/mingw-w64-python/0041-allow-static-tcltk.patch b/mingw-w64-python/0041-allow-static-tcltk.patch index 71ae1fe4e3..d859c9046c 100644 --- a/mingw-w64-python/0041-allow-static-tcltk.patch +++ b/mingw-w64-python/0041-allow-static-tcltk.patch @@ -1,4 +1,4 @@ -From 31edbb649b2bb34048432bf8ae3d87eb789e106d Mon Sep 17 00:00:00 2001 +From 8d09549efa5dfe072b2b5e274c387be55ccd0679 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:54 +0530 diff --git a/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch b/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch index c334afe840..ac7623591f 100644 --- a/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch +++ b/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch @@ -1,4 +1,4 @@ -From 45e47f24820c33adefec5e6ef6dc6def8b54c956 Mon Sep 17 00:00:00 2001 +From 8397748ea1b4adebc0740107fe30fce840f42b6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:55 +0530 diff --git a/mingw-w64-python/0043-builddir-fixes.patch b/mingw-w64-python/0043-builddir-fixes.patch index deffaa2125..d7f731b6ab 100644 --- a/mingw-w64-python/0043-builddir-fixes.patch +++ b/mingw-w64-python/0043-builddir-fixes.patch @@ -1,4 +1,4 @@ -From d6f3fae0d0d57e6ef070b7024b7e1925a0a8d3a5 Mon Sep 17 00:00:00 2001 +From 6cd6eac05704da740fadfc87ac35c28e903cdd9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:57 +0530 @@ -15,7 +15,7 @@ Co-authored-by: Christoph Reiter 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 6a9f63d..b1630b8 100644 +index 9b62db4..e3fe7e5 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -737,20 +737,20 @@ Programs/_testembed: Programs/_testembed.o $(LIBRARY_DEPS) diff --git a/mingw-w64-python/0044-msys-monkeypatch-os-system-via-sh-exe.patch b/mingw-w64-python/0044-msys-monkeypatch-os-system-via-sh-exe.patch index c34f7d35bf..c6e8db386c 100644 --- a/mingw-w64-python/0044-msys-monkeypatch-os-system-via-sh-exe.patch +++ b/mingw-w64-python/0044-msys-monkeypatch-os-system-via-sh-exe.patch @@ -1,4 +1,4 @@ -From 979abaa57b61d27c14629f2900b46b70ec565115 Mon Sep 17 00:00:00 2001 +From d0c36cafc0a39ab0cda9392c45dfe1899d5baf29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:57 +0530 diff --git a/mingw-w64-python/0045-msys-replace-slashes-used-in-io-redirection.patch b/mingw-w64-python/0045-msys-replace-slashes-used-in-io-redirection.patch index 1392a947bd..7745ff6707 100644 --- a/mingw-w64-python/0045-msys-replace-slashes-used-in-io-redirection.patch +++ b/mingw-w64-python/0045-msys-replace-slashes-used-in-io-redirection.patch @@ -1,4 +1,4 @@ -From 9afdda3edca9b762145175729fb839275d08850f Mon Sep 17 00:00:00 2001 +From 11b630af54868a256f112051dd0a36dbcae7b6c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:58 +0530 diff --git a/mingw-w64-python/0046-remove_path_max.default.patch b/mingw-w64-python/0046-remove_path_max.default.patch index 032377f9fd..5c69005625 100644 --- a/mingw-w64-python/0046-remove_path_max.default.patch +++ b/mingw-w64-python/0046-remove_path_max.default.patch @@ -1,4 +1,4 @@ -From 1b44bafe35fed270aee37e52c3cf50ea4ffb3f23 Mon Sep 17 00:00:00 2001 +From fd51b194d0241b31a38f56dc1dc8596abe01247b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:59 +0530 diff --git a/mingw-w64-python/0047-dont-link-with-gettext.patch b/mingw-w64-python/0047-dont-link-with-gettext.patch index 015cfd09b3..970879a99a 100644 --- a/mingw-w64-python/0047-dont-link-with-gettext.patch +++ b/mingw-w64-python/0047-dont-link-with-gettext.patch @@ -1,4 +1,4 @@ -From 4ff5090a7e24653791a58ff33f1f5a55e95c1120 Mon Sep 17 00:00:00 2001 +From d91f4f321446d2e96446f5a469b12abe558ae54c 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 @@ -32,7 +32,7 @@ index 564f559..71c8412 100644 #include #include diff --git a/configure.ac b/configure.ac -index 1d78c2c..d09fcd6 100644 +index 7473ed1..7ded98e 100644 --- a/configure.ac +++ b/configure.ac @@ -3206,10 +3206,19 @@ AC_SEARCH_LIBS(sem_init, pthread rt posix4) diff --git a/mingw-w64-python/0048-ctypes-python-dll.patch b/mingw-w64-python/0048-ctypes-python-dll.patch index 8dd978536f..3d1e7f75b0 100644 --- a/mingw-w64-python/0048-ctypes-python-dll.patch +++ b/mingw-w64-python/0048-ctypes-python-dll.patch @@ -1,4 +1,4 @@ -From f7ff379c524449e14a92761143fa48c3dd94be88 Mon Sep 17 00:00:00 2001 +From c792264b63a4316af16ee846b28daf320e1e7bbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:01 +0530 diff --git a/mingw-w64-python/0049-gdbm-module-includes.patch b/mingw-w64-python/0049-gdbm-module-includes.patch index c194df00ec..fbc7db2d67 100644 --- a/mingw-w64-python/0049-gdbm-module-includes.patch +++ b/mingw-w64-python/0049-gdbm-module-includes.patch @@ -1,4 +1,4 @@ -From 07e41010f247b4ed8f8629839fbdf3bb105c4dba Mon Sep 17 00:00:00 2001 +From 249a68cacd40442c35a43ad366359ca2876abf5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:02 +0530 diff --git a/mingw-w64-python/0050-use-gnu_printf-in-format.patch b/mingw-w64-python/0050-use-gnu_printf-in-format.patch index b166ffc20f..9735d8e73c 100644 --- a/mingw-w64-python/0050-use-gnu_printf-in-format.patch +++ b/mingw-w64-python/0050-use-gnu_printf-in-format.patch @@ -1,4 +1,4 @@ -From 42b4b1945fdd57d5cef3a35bc7c7ee081a1f0570 Mon Sep 17 00:00:00 2001 +From ab10e201378a055cb2d9f1646115723839feb9d3 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 diff --git a/mingw-w64-python/0051-mingw-fix-ssl-dont-use-enum_certificates.patch b/mingw-w64-python/0051-mingw-fix-ssl-dont-use-enum_certificates.patch index 23c2bf0ea9..d33166e273 100644 --- a/mingw-w64-python/0051-mingw-fix-ssl-dont-use-enum_certificates.patch +++ b/mingw-w64-python/0051-mingw-fix-ssl-dont-use-enum_certificates.patch @@ -1,4 +1,4 @@ -From d7e022857de1711d26702c18209ac6ec44751de1 Mon Sep 17 00:00:00 2001 +From e7ff6acc2ee6cce1060b9806762fa1ba093eca4c Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:52:03 +0530 Subject: [PATCH 051/N] mingw fix ssl dont use enum_certificates diff --git a/mingw-w64-python/0052-fix-using-dllhandle-and-winver-mingw.patch b/mingw-w64-python/0052-fix-using-dllhandle-and-winver-mingw.patch index 4a20641569..aa7c5426cb 100644 --- a/mingw-w64-python/0052-fix-using-dllhandle-and-winver-mingw.patch +++ b/mingw-w64-python/0052-fix-using-dllhandle-and-winver-mingw.patch @@ -1,4 +1,4 @@ -From 018544abfc2a29dc389229911aa314ab963fa0d4 Mon Sep 17 00:00:00 2001 +From 6014c121974c73d2999f7954566ad4b685509f51 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 1d5a06a..e4a15cd 100644 +index 2b5c9d3..c2cfc2b 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -39,7 +39,7 @@ Data members: @@ -25,7 +25,7 @@ index 1d5a06a..e4a15cd 100644 extern void *PyWin_DLLhModule; /* A string loaded from the DLL at startup: */ extern const char *PyWin_DLLVersionString; -@@ -2845,7 +2845,7 @@ _PySys_InitCore(PyThreadState *tstate, PyObject *sysdict) +@@ -2847,7 +2847,7 @@ _PySys_InitCore(PyThreadState *tstate, PyObject *sysdict) SET_SYS_FROM_STRING("byteorder", "little"); #endif diff --git a/mingw-w64-python/0053-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch b/mingw-w64-python/0053-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch index d3a6518c0b..1614da1e6a 100644 --- a/mingw-w64-python/0053-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch +++ b/mingw-w64-python/0053-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch @@ -1,4 +1,4 @@ -From 4da557f544b9037505b920ef99ece3a8ec134519 Mon Sep 17 00:00:00 2001 +From 0f0596a0d683b5efd62c916d306b94b25f74eccb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:07 +0530 diff --git a/mingw-w64-python/0054-MINGW-link-with-additional-library.patch b/mingw-w64-python/0054-MINGW-link-with-additional-library.patch index 9fde288070..37c632e51f 100644 --- a/mingw-w64-python/0054-MINGW-link-with-additional-library.patch +++ b/mingw-w64-python/0054-MINGW-link-with-additional-library.patch @@ -1,4 +1,4 @@ -From a0c62a997a91fd548eaef84af1b8a12eb6379ca5 Mon Sep 17 00:00:00 2001 +From fb0bdd90ab001413feeb600bc0557bd64134ebf8 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 054/N] MINGW link with additional library 1 file changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac -index d09fcd6..e6c41d7 100644 +index 7ded98e..3f42f4e 100644 --- a/configure.ac +++ b/configure.ac -@@ -5933,6 +5933,15 @@ for dir in $SRCDIRS; do +@@ -5935,6 +5935,15 @@ for dir in $SRCDIRS; do done AC_MSG_RESULT(done) diff --git a/mingw-w64-python/0055-install-msilib.patch b/mingw-w64-python/0055-install-msilib.patch index 37ffa92d4b..6fabd7e642 100644 --- a/mingw-w64-python/0055-install-msilib.patch +++ b/mingw-w64-python/0055-install-msilib.patch @@ -1,4 +1,4 @@ -From 3c96c5c11fd83c3789707e03991b141afd4b88b8 Mon Sep 17 00:00:00 2001 +From 926def757d7b50bd6a4692b288d3f9d3098fc536 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 055/N] install msilib @@ -14,7 +14,7 @@ Co-authored-by: Ray Donnelly 1 file changed, 1 insertion(+) diff --git a/Makefile.pre.in b/Makefile.pre.in -index b1630b8..2823bea 100644 +index e3fe7e5..e38de12 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1459,6 +1459,7 @@ LIBSUBDIRS= asyncio \ diff --git a/mingw-w64-python/0056-fix-signal-module-build.patch b/mingw-w64-python/0056-fix-signal-module-build.patch index fdf4608465..60f067a5d1 100644 --- a/mingw-w64-python/0056-fix-signal-module-build.patch +++ b/mingw-w64-python/0056-fix-signal-module-build.patch @@ -1,4 +1,4 @@ -From 36e63bcafe9f7610349e4b664687fd2338f52eef Mon Sep 17 00:00:00 2001 +From e58125ccf0e80bd7bed0eedb66610638d24f3095 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:10 +0530 Subject: [PATCH 056/N] fix signal module build diff --git a/mingw-w64-python/0057-build-build-winconsoleio-and-_testconsole.patch b/mingw-w64-python/0057-build-build-winconsoleio-and-_testconsole.patch index 590d84de24..13887baa92 100644 --- a/mingw-w64-python/0057-build-build-winconsoleio-and-_testconsole.patch +++ b/mingw-w64-python/0057-build-build-winconsoleio-and-_testconsole.patch @@ -1,4 +1,4 @@ -From 8742de2a646c1140075ac62dd76aa0dc00a395e0 Mon Sep 17 00:00:00 2001 +From a7b52eb685b5ba8cb505fba8972f36d0b7f5adb2 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:11 +0530 Subject: [PATCH 057/N] build: build winconsoleio and _testconsole diff --git a/mingw-w64-python/0058-expose-sem_unlink.patch b/mingw-w64-python/0058-expose-sem_unlink.patch index cfc4919765..aee17f22c4 100644 --- a/mingw-w64-python/0058-expose-sem_unlink.patch +++ b/mingw-w64-python/0058-expose-sem_unlink.patch @@ -1,4 +1,4 @@ -From bfb72572d2771b608f6405d0bebfedc59281145e Mon Sep 17 00:00:00 2001 +From 35a4dc45b68f783d7f3f8a471081d139015271f8 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:12 +0530 Subject: [PATCH 058/N] expose sem_unlink diff --git a/mingw-w64-python/0059-cygpty-isatty.patch b/mingw-w64-python/0059-cygpty-isatty.patch index 9f363d4108..170a9ff473 100644 --- a/mingw-w64-python/0059-cygpty-isatty.patch +++ b/mingw-w64-python/0059-cygpty-isatty.patch @@ -1,4 +1,4 @@ -From 17ca0d16908282291777c62b731d61d78c200901 Mon Sep 17 00:00:00 2001 +From 37aef9a8c0abab3d11d2d339c1c4cacefd3f8806 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:14 +0530 Subject: [PATCH 059/N] cygpty isatty @@ -71,7 +71,7 @@ index 0000000..82fd0af + +#endif /* _ISCYGPTY_H */ diff --git a/Makefile.pre.in b/Makefile.pre.in -index 2823bea..50d802b 100644 +index e38de12..d58980e 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -368,6 +368,7 @@ PYTHON_OBJS= \ @@ -91,7 +91,7 @@ index 2823bea..50d802b 100644 $(srcdir)/Include/listobject.h \ $(srcdir)/Include/longintrepr.h \ diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c -index b9856b3..66932d7 100644 +index bf34b7c..a7b7eea 100644 --- a/Modules/_io/fileio.c +++ b/Modules/_io/fileio.c @@ -19,6 +19,7 @@ @@ -102,7 +102,7 @@ index b9856b3..66932d7 100644 /* * Known likely problems: -@@ -1127,7 +1128,7 @@ _io_FileIO_isatty_impl(fileio *self) +@@ -1131,7 +1132,7 @@ _io_FileIO_isatty_impl(fileio *self) return err_closed(); Py_BEGIN_ALLOW_THREADS _Py_BEGIN_SUPPRESS_IPH @@ -133,10 +133,10 @@ index 2684d23..9ee34a3 100644 diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 98e998e..7977e7e 100644 +index 738954d..7da4e5a 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c -@@ -42,6 +42,7 @@ +@@ -45,6 +45,7 @@ #ifdef __ANDROID__ # undef HAVE_FACCESSAT #endif @@ -144,7 +144,7 @@ index 98e998e..7977e7e 100644 #include /* needed for ctermid() */ -@@ -10115,7 +10116,7 @@ os_isatty_impl(PyObject *module, int fd) +@@ -10107,7 +10108,7 @@ os_isatty_impl(PyObject *module, int fd) int return_value; Py_BEGIN_ALLOW_THREADS _Py_BEGIN_SUPPRESS_IPH diff --git a/mingw-w64-python/0060-disable-broken-gdbm-module.patch b/mingw-w64-python/0060-disable-broken-gdbm-module.patch index 5f03afa9f2..c108094b4a 100644 --- a/mingw-w64-python/0060-disable-broken-gdbm-module.patch +++ b/mingw-w64-python/0060-disable-broken-gdbm-module.patch @@ -1,4 +1,4 @@ -From 74f8964ec444f56ebcb9464cb0c0b883db650de4 Mon Sep 17 00:00:00 2001 +From e6a6f3a96ef34fa7dcf00f7d366f2812a8f2436b Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:15 +0530 Subject: [PATCH 060/N] disable broken gdbm module diff --git a/mingw-w64-python/0061-build-link-win-resource-files-and-build-pythonw.patch b/mingw-w64-python/0061-build-link-win-resource-files-and-build-pythonw.patch index 66a278a616..7e4cdeb29c 100644 --- a/mingw-w64-python/0061-build-link-win-resource-files-and-build-pythonw.patch +++ b/mingw-w64-python/0061-build-link-win-resource-files-and-build-pythonw.patch @@ -1,4 +1,4 @@ -From 8826ac6768cf435757dec6afdf0c45ae3484a868 Mon Sep 17 00:00:00 2001 +From d82579de5a43f48313f14b594a71cd7ecd5f6845 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:16 +0530 Subject: [PATCH 061/N] build: link win resource files and build pythonw @@ -13,7 +13,7 @@ Co-authored-by: Алексей 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 50d802b..c0924a2 100644 +index d58980e..f4bbfa8 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -38,6 +38,7 @@ CXX= @CXX@ @@ -95,7 +95,7 @@ index 50d802b..c0924a2 100644 $(INSTALL_PROGRAM) $(STRIPFLAG) Mac/pythonw $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \ fi diff --git a/configure.ac b/configure.ac -index e6c41d7..f73c9e6 100644 +index 3f42f4e..b28492b 100644 --- a/configure.ac +++ b/configure.ac @@ -1337,6 +1337,9 @@ fi @@ -108,7 +108,7 @@ index e6c41d7..f73c9e6 100644 AC_SUBST(AR) AC_CHECK_TOOLS(AR, ar aal, ar) -@@ -5937,10 +5940,33 @@ AC_MSG_RESULT(done) +@@ -5939,10 +5942,33 @@ AC_MSG_RESULT(done) case $host in *-*-mingw*) LIBS="$LIBS -lversion -lshlwapi -lpathcch" diff --git a/mingw-w64-python/0062-disable-readline.patch b/mingw-w64-python/0062-disable-readline.patch index 6be1d3f38d..b32aef8e4c 100644 --- a/mingw-w64-python/0062-disable-readline.patch +++ b/mingw-w64-python/0062-disable-readline.patch @@ -1,4 +1,4 @@ -From 1f53554e26ad15a0ae1162b68f8aa5174f79c0dd Mon Sep 17 00:00:00 2001 +From ee3546a70a3141a3eae5d929dce91df60ad3303e Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:17 +0530 Subject: [PATCH 062/N] disable readline diff --git a/mingw-w64-python/0063-fix-isselectable.patch b/mingw-w64-python/0063-fix-isselectable.patch index 96e8bd53f4..e0908f3829 100644 --- a/mingw-w64-python/0063-fix-isselectable.patch +++ b/mingw-w64-python/0063-fix-isselectable.patch @@ -1,4 +1,4 @@ -From 83aa8cc71561688ab63e240f01e64bd234b2568d Mon Sep 17 00:00:00 2001 +From a17aafcc2e4824f6e96131d3ccde60e3e962d0df Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:18 +0530 Subject: [PATCH 063/N] fix isselectable diff --git a/mingw-w64-python/0064-use-_wcsnicmp-instead-wcsncasecmp.patch b/mingw-w64-python/0064-use-_wcsnicmp-instead-wcsncasecmp.patch index 652efe34c9..c169383488 100644 --- a/mingw-w64-python/0064-use-_wcsnicmp-instead-wcsncasecmp.patch +++ b/mingw-w64-python/0064-use-_wcsnicmp-instead-wcsncasecmp.patch @@ -1,4 +1,4 @@ -From 1a797d60b66a3152f0056e592f4a75789eedf54c Mon Sep 17 00:00:00 2001 +From 84d11b27126f3752c5fd40c49c4193d972f4f6e6 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:19 +0530 diff --git a/mingw-w64-python/0065-_xxsubinterpretersmodule.patch b/mingw-w64-python/0065-_xxsubinterpretersmodule.patch index 0ec33ca472..ac946bc3a7 100644 --- a/mingw-w64-python/0065-_xxsubinterpretersmodule.patch +++ b/mingw-w64-python/0065-_xxsubinterpretersmodule.patch @@ -1,4 +1,4 @@ -From d2682efdc16a5cba3f9fafa54144521e9d368e14 Mon Sep 17 00:00:00 2001 +From 354b10b8485e9bbe94d9d1b08c63c9c2221416d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:20 +0530 diff --git a/mingw-w64-python/0066-sqlite3-module-defines.patch b/mingw-w64-python/0066-sqlite3-module-defines.patch index 9909a15644..c9519a418f 100644 --- a/mingw-w64-python/0066-sqlite3-module-defines.patch +++ b/mingw-w64-python/0066-sqlite3-module-defines.patch @@ -1,4 +1,4 @@ -From 27d5fd93127e211401a9e38f6ad5c561d017dd1c Mon Sep 17 00:00:00 2001 +From 15a9ba70ddc22c5f473ed9ff5e923d701c574252 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:21 +0530 Subject: [PATCH 066/N] sqlite3 module defines diff --git a/mingw-w64-python/0067-configure.ac-fix-inet_pton-check.patch b/mingw-w64-python/0067-configure.ac-fix-inet_pton-check.patch index 5f563ae6f9..5680b4bd17 100644 --- a/mingw-w64-python/0067-configure.ac-fix-inet_pton-check.patch +++ b/mingw-w64-python/0067-configure.ac-fix-inet_pton-check.patch @@ -1,4 +1,4 @@ -From 3c9cb1b60828b06793798078689400a6117af559 Mon Sep 17 00:00:00 2001 +From a237e1e8e47a79fe745074c08bcdb15cdfea13b4 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:23 +0530 Subject: [PATCH 067/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 f73c9e6..dc1c49a 100644 +index b28492b..dad3868 100644 --- a/configure.ac +++ b/configure.ac -@@ -4299,10 +4299,14 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +@@ -4300,10 +4300,14 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ AC_MSG_CHECKING(for inet_pton) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ diff --git a/mingw-w64-python/0068-set-venv-activate-path-unix.patch b/mingw-w64-python/0068-set-venv-activate-path-unix.patch index d2f7e9ccef..ced80e4983 100644 --- a/mingw-w64-python/0068-set-venv-activate-path-unix.patch +++ b/mingw-w64-python/0068-set-venv-activate-path-unix.patch @@ -1,4 +1,4 @@ -From 5de0c034634afd90a79a2352af831f317d9d69ec Mon Sep 17 00:00:00 2001 +From 75ab9413fc29bfb74de5d461dba1713dc836ce83 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Thu, 17 Jun 2021 18:52:25 +0530 Subject: [PATCH 068/N] set venv activate path unix diff --git a/mingw-w64-python/0069-venv-creation-fixes.patch b/mingw-w64-python/0069-venv-creation-fixes.patch index 90cba2d037..4f7523efc3 100644 --- a/mingw-w64-python/0069-venv-creation-fixes.patch +++ b/mingw-w64-python/0069-venv-creation-fixes.patch @@ -1,15 +1,15 @@ -From 8dd652fbba83e70b8ba1a2ff2d5d78d5d92bf41e Mon Sep 17 00:00:00 2001 +From 74b2dc9fb9fadef5a066ad39a1c3f8e4618b7d9d Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:26 +0530 Subject: [PATCH 069/N] venv creation fixes Co-authored-by: Naveen M K --- - Lib/venv/__init__.py | 17 +++++++++++++---- - 1 file changed, 13 insertions(+), 4 deletions(-) + Lib/venv/__init__.py | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py -index 8852008..86f9900 100644 +index 69155e5..49ac80e 100644 --- a/Lib/venv/__init__.py +++ b/Lib/venv/__init__.py @@ -11,6 +11,7 @@ import subprocess @@ -53,16 +53,11 @@ index 8852008..86f9900 100644 # copy init.tcl for root, dirs, files in os.walk(context.python_dir): if 'init.tcl' in files: -@@ -313,9 +320,11 @@ class EnvBuilder: - # We run ensurepip in isolated mode to avoid side effects from - # environment vars, the current directory and anything else - # intended for the global Python environment -+ env = os.environ.copy() +@@ -319,6 +326,7 @@ class EnvBuilder: + env['VIRTUAL_ENV'] = context.env_dir + env.pop('PYTHONHOME', None) + env.pop('PYTHONPATH', None) + env.pop("MSYSTEM", None) - cmd = [context.env_exec_cmd, '-Im', 'ensurepip', '--upgrade', - '--default-pip'] -- subprocess.check_output(cmd, stderr=subprocess.STDOUT) -+ subprocess.check_call(cmd, stderr=subprocess.STDOUT, env=env) - - def setup_scripts(self, context): - """ + kwargs['cwd'] = context.env_dir + kwargs['executable'] = context.env_exec_cmd + subprocess.check_output(args, **kwargs) diff --git a/mingw-w64-python/0070-pass-gen-profile-ldflags.patch b/mingw-w64-python/0070-pass-gen-profile-ldflags.patch index 4e59d13d56..4107224feb 100644 --- a/mingw-w64-python/0070-pass-gen-profile-ldflags.patch +++ b/mingw-w64-python/0070-pass-gen-profile-ldflags.patch @@ -1,4 +1,4 @@ -From a3eea4caf328a13a707a05aaf7c9e638bf6f6006 Mon Sep 17 00:00:00 2001 +From 372af7cd938c895bd99e4192eaf7325c87e7ced1 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:27 +0530 Subject: [PATCH 070/N] pass gen profile ldflags @@ -12,7 +12,7 @@ Co-authored-by: Алексей 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index c0924a2..887770b 100644 +index f4bbfa8..bea32ab 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -722,7 +722,7 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \ diff --git a/mingw-w64-python/0071-pkg-config-windows-must-link-ext-with-python-lib.patch b/mingw-w64-python/0071-pkg-config-windows-must-link-ext-with-python-lib.patch index 29812147be..311447fd58 100644 --- a/mingw-w64-python/0071-pkg-config-windows-must-link-ext-with-python-lib.patch +++ b/mingw-w64-python/0071-pkg-config-windows-must-link-ext-with-python-lib.patch @@ -1,4 +1,4 @@ -From c843bf54970f70bce0b14d90b20e3e5d71fec71b Mon Sep 17 00:00:00 2001 +From 10ac3ecbbc31a0d61e653e73c6f68b21e3d9f226 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 @@ -21,10 +21,10 @@ index 87e04de..3900190 100644 +Libs: -L${libdir} -lpython@VERSION@@ABIFLAGS@ Cflags: -I${includedir}/python@VERSION@@ABIFLAGS@ diff --git a/configure.ac b/configure.ac -index dc1c49a..bc9ac12 100644 +index dad3868..721d1ad 100644 --- a/configure.ac +++ b/configure.ac -@@ -5174,7 +5174,7 @@ AC_MSG_RESULT($LDVERSION) +@@ -5175,7 +5175,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-python/0072-importlib-bootstrap-path-sep.patch b/mingw-w64-python/0072-importlib-bootstrap-path-sep.patch index f5612e93f6..9f43267773 100644 --- a/mingw-w64-python/0072-importlib-bootstrap-path-sep.patch +++ b/mingw-w64-python/0072-importlib-bootstrap-path-sep.patch @@ -1,4 +1,4 @@ -From e7c49a908adfabdf7e3dbf6cd5c38bd1d4a22221 Mon Sep 17 00:00:00 2001 +From 50c8ffc77aee932c7ea51de34ebbcd80f33139fd Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:30 +0530 Subject: [PATCH 072/N] importlib bootstrap path sep diff --git a/mingw-w64-python/0073-pathlib-path-sep.patch b/mingw-w64-python/0073-pathlib-path-sep.patch index 6847c5c2bc..1a0d0c0408 100644 --- a/mingw-w64-python/0073-pathlib-path-sep.patch +++ b/mingw-w64-python/0073-pathlib-path-sep.patch @@ -1,4 +1,4 @@ -From e8871d5b6c8dd351a20b5549526cbb0ab4b03d64 Mon Sep 17 00:00:00 2001 +From 9d9b89f6b191f016837f0c231cc287bc61122a66 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:31 +0530 Subject: [PATCH 073/N] pathlib path sep diff --git a/mingw-w64-python/0074-warnings-fixes.patch b/mingw-w64-python/0074-warnings-fixes.patch index 3ac35bf085..8af73d0b9c 100644 --- a/mingw-w64-python/0074-warnings-fixes.patch +++ b/mingw-w64-python/0074-warnings-fixes.patch @@ -1,4 +1,4 @@ -From a162a1d6105e20d0645b0b8f343676185267eec2 Mon Sep 17 00:00:00 2001 +From af320d0cb957c6f32ddd59acbb28802c81ecffd2 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 @@ -15,7 +15,7 @@ Subject: [PATCH 074/N] warnings fixes 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Modules/_winapi.c b/Modules/_winapi.c -index 4d88e33..c479a92 100644 +index 0dc06cc..56f3306 100644 --- a/Modules/_winapi.c +++ b/Modules/_winapi.c @@ -959,7 +959,7 @@ getattributelist(PyObject *obj, const char *name, AttributeList *attribute_list) @@ -28,10 +28,10 @@ index 4d88e33..c479a92 100644 SIZE_T attribute_list_size = 0; diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 7977e7e..0334759 100644 +index 7da4e5a..ab46dca 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c -@@ -5406,7 +5406,7 @@ os_utime_impl(PyObject *module, path_t *path, PyObject *times, PyObject *ns, +@@ -5398,7 +5398,7 @@ os_utime_impl(PyObject *module, path_t *path, PyObject *times, PyObject *ns, /*[clinic end generated code: output=cfcac69d027b82cf input=2fbd62a2f228f8f4]*/ { #ifdef MS_WINDOWS @@ -40,7 +40,7 @@ index 7977e7e..0334759 100644 FILETIME atime, mtime; #else int result; -@@ -14593,7 +14593,7 @@ os__add_dll_directory_impl(PyObject *module, path_t *path) +@@ -14585,7 +14585,7 @@ os__add_dll_directory_impl(PyObject *module, path_t *path) loaded. */ Py_BEGIN_ALLOW_THREADS if (!(hKernel32 = GetModuleHandleW(L"kernel32")) || @@ -49,7 +49,7 @@ index 7977e7e..0334759 100644 hKernel32, "AddDllDirectory")) || !(cookie = (*AddDllDirectory)(path->wide))) { err = GetLastError(); -@@ -14643,7 +14643,7 @@ os__remove_dll_directory_impl(PyObject *module, PyObject *cookie) +@@ -14635,7 +14635,7 @@ os__remove_dll_directory_impl(PyObject *module, PyObject *cookie) loaded. */ Py_BEGIN_ALLOW_THREADS if (!(hKernel32 = GetModuleHandleW(L"kernel32")) || diff --git a/mingw-w64-python/0075-fix-build-testinternalcapi.patch b/mingw-w64-python/0075-fix-build-testinternalcapi.patch index 3ad3440252..ddc7da758a 100644 --- a/mingw-w64-python/0075-fix-build-testinternalcapi.patch +++ b/mingw-w64-python/0075-fix-build-testinternalcapi.patch @@ -1,4 +1,4 @@ -From 5101712ef1c038585bf8e80e6eec25480029c0a8 Mon Sep 17 00:00:00 2001 +From f33e549268bd1c3bcc0fe3e27987ccf9fd0f7806 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:34 +0530 Subject: [PATCH 075/N] fix build testinternalcapi diff --git a/mingw-w64-python/0076-extend-MS_WINDOWS-flag.patch b/mingw-w64-python/0076-extend-MS_WINDOWS-flag.patch index 2334cd5d80..083e9262ff 100644 --- a/mingw-w64-python/0076-extend-MS_WINDOWS-flag.patch +++ b/mingw-w64-python/0076-extend-MS_WINDOWS-flag.patch @@ -1,4 +1,4 @@ -From 285997eefe2e38e10e751494a8002ad064652ef3 Mon Sep 17 00:00:00 2001 +From 1eeb8dd0c8022be700dfadcae1a2bdbbdfd98da7 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Thu, 17 Jun 2021 18:52:34 +0530 Subject: [PATCH 076/N] extend MS_WINDOWS flag diff --git a/mingw-w64-python/0077-clang-arm64.patch b/mingw-w64-python/0077-clang-arm64.patch index 699be53d3a..6da10523eb 100644 --- a/mingw-w64-python/0077-clang-arm64.patch +++ b/mingw-w64-python/0077-clang-arm64.patch @@ -1,4 +1,4 @@ -From 19e72e5452c42cedae7ab4690707cd1c88be9535 Mon Sep 17 00:00:00 2001 +From c066ae8950cb1323636dae9a1b9c30726ac84b93 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 077/N] clang arm64 diff --git a/mingw-w64-python/0078-configure.ac-set-MINGW-stack-reserve.patch b/mingw-w64-python/0078-configure.ac-set-MINGW-stack-reserve.patch index dd5f9f9bdd..c612782d93 100644 --- a/mingw-w64-python/0078-configure.ac-set-MINGW-stack-reserve.patch +++ b/mingw-w64-python/0078-configure.ac-set-MINGW-stack-reserve.patch @@ -1,4 +1,4 @@ -From 77ae4969234e68d4ec03ca2b357909f2d9d24b52 Mon Sep 17 00:00:00 2001 +From 3d4e443e3b05a518e6a02e096382c2855ae0e2f2 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 078/N] configure.ac: set MINGW stack reserve @@ -8,7 +8,7 @@ Subject: [PATCH 078/N] configure.ac: set MINGW stack reserve 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac -index bc9ac12..20514be 100644 +index 721d1ad..b0eb68c 100644 --- a/configure.ac +++ b/configure.ac @@ -3112,6 +3112,11 @@ then diff --git a/mingw-w64-python/0079-Don-t-use-os.pathsep-to-find-EOF.patch b/mingw-w64-python/0079-Don-t-use-os.pathsep-to-find-EOF.patch index 7fc284e10f..7b9b2b7838 100644 --- a/mingw-w64-python/0079-Don-t-use-os.pathsep-to-find-EOF.patch +++ b/mingw-w64-python/0079-Don-t-use-os.pathsep-to-find-EOF.patch @@ -1,4 +1,4 @@ -From d22b4354caac766648b511ae6f6340b61599eb48 Mon Sep 17 00:00:00 2001 +From ffa97daa641db406936326df43eb5f96c5990b26 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 18 Jun 2021 12:38:11 +0530 Subject: [PATCH 079/N] Don't use os.pathsep to find EOF not all diff --git a/mingw-w64-python/0080-Fix-extension-suffix-for-c-extensions-on-mingw.patch b/mingw-w64-python/0080-Fix-extension-suffix-for-c-extensions-on-mingw.patch index 34705fb798..ddd1fbdb10 100644 --- a/mingw-w64-python/0080-Fix-extension-suffix-for-c-extensions-on-mingw.patch +++ b/mingw-w64-python/0080-Fix-extension-suffix-for-c-extensions-on-mingw.patch @@ -1,4 +1,4 @@ -From 347d8e4b1dd5e783b02a8310495a613a22ac17ae Mon Sep 17 00:00:00 2001 +From 75825f5f77bafc3e27f9f1366bb21d55f1830598 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Wed, 23 Jun 2021 18:12:12 +0530 Subject: [PATCH 080/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 887770b..77730b8 100644 +index bea32ab..a01b1fd 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -166,6 +166,7 @@ CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(LDVERSION) @@ -69,7 +69,7 @@ index 1083fe8..c46061c 100644 PYD_UNTAGGED_SUFFIX, NULL diff --git a/configure.ac b/configure.ac -index 20514be..a66b92f 100644 +index b0eb68c..814e439 100644 --- a/configure.ac +++ b/configure.ac @@ -2875,7 +2875,7 @@ if test -z "$SHLIB_SUFFIX"; then @@ -81,7 +81,7 @@ index 20514be..a66b92f 100644 esac fi AC_MSG_RESULT($SHLIB_SUFFIX) -@@ -5139,6 +5139,68 @@ esac +@@ -5140,6 +5140,68 @@ esac # check for endianness AC_C_BIGENDIAN @@ -150,7 +150,7 @@ index 20514be..a66b92f 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 -@@ -5171,7 +5233,12 @@ if test "$Py_DEBUG" = 'true' -a "$with_trace_refs" != "yes"; then +@@ -5172,7 +5234,12 @@ if test "$Py_DEBUG" = 'true' -a "$with_trace_refs" != "yes"; then fi AC_SUBST(EXT_SUFFIX) @@ -164,7 +164,7 @@ index 20514be..a66b92f 100644 AC_MSG_CHECKING(LDVERSION) LDVERSION='$(VERSION)$(ABIFLAGS)' -@@ -5891,12 +5958,6 @@ case "$ac_cv_computed_gotos" in yes*) +@@ -5893,12 +5960,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-python/0081-Change-the-get_platform-method-in-sysconfig.patch b/mingw-w64-python/0081-Change-the-get_platform-method-in-sysconfig.patch index cdb91e9555..aa5346611f 100644 --- a/mingw-w64-python/0081-Change-the-get_platform-method-in-sysconfig.patch +++ b/mingw-w64-python/0081-Change-the-get_platform-method-in-sysconfig.patch @@ -1,4 +1,4 @@ -From 8ce3fed649369681a7b0d55aaec9a8d8fa9509af Mon Sep 17 00:00:00 2001 +From 2ede8e1fc345ad5dd8f55aa5d171fe7e823c88c4 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:36:58 +0200 Subject: [PATCH 081/N] Change the `get_platform()` method in sysconfig diff --git a/mingw-w64-python/0082-distutils-compiler-customize-mingw-cygwin-compilers.patch b/mingw-w64-python/0082-distutils-compiler-customize-mingw-cygwin-compilers.patch index 3a44f03a15..4c7537cef7 100644 --- a/mingw-w64-python/0082-distutils-compiler-customize-mingw-cygwin-compilers.patch +++ b/mingw-w64-python/0082-distutils-compiler-customize-mingw-cygwin-compilers.patch @@ -1,4 +1,4 @@ -From 457dc70f46b1b4f89da88785ddb984fc67d10268 Mon Sep 17 00:00:00 2001 +From 1404c9f145b9a94bae7d38ebd21801ed3cf2a3ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:21 +0530 diff --git a/mingw-w64-python/0083-distutils-compiler-enable-new-dtags.patch b/mingw-w64-python/0083-distutils-compiler-enable-new-dtags.patch index 0b6303dc0d..b38287b90e 100644 --- a/mingw-w64-python/0083-distutils-compiler-enable-new-dtags.patch +++ b/mingw-w64-python/0083-distutils-compiler-enable-new-dtags.patch @@ -1,4 +1,4 @@ -From 09974601655abb83f0713745f365f2e00e939f01 Mon Sep 17 00:00:00 2001 +From d599d8627a8def1bbc89cc1f839828c26faef247 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:22 +0530 diff --git a/mingw-w64-python/0084-distutils-MINGW-build-extensions-with-GCC.patch b/mingw-w64-python/0084-distutils-MINGW-build-extensions-with-GCC.patch index ea12b9aa91..db16f9d4fe 100644 --- a/mingw-w64-python/0084-distutils-MINGW-build-extensions-with-GCC.patch +++ b/mingw-w64-python/0084-distutils-MINGW-build-extensions-with-GCC.patch @@ -1,4 +1,4 @@ -From f8dbbfce50ed4b42c899e9ad364656f788f25a39 Mon Sep 17 00:00:00 2001 +From d6bdea1127e7b6cf40ae1e45454112f54045e5f5 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 20:52:22 +0200 Subject: [PATCH 084/N] distutils: MINGW build extensions with GCC diff --git a/mingw-w64-python/0085-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch b/mingw-w64-python/0085-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch index aec2f7c24e..ec768634d0 100644 --- a/mingw-w64-python/0085-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch +++ b/mingw-w64-python/0085-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch @@ -1,4 +1,4 @@ -From 64b97c8480ede9a949be0c3e0544baab662403d1 Mon Sep 17 00:00:00 2001 +From 5715a9f5b8290ec28e32b02e047c8424c1db257e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:35 +0530 diff --git a/mingw-w64-python/0086-distutils-find-import-library.patch b/mingw-w64-python/0086-distutils-find-import-library.patch index 84b62d1dbb..5a05b4f2eb 100644 --- a/mingw-w64-python/0086-distutils-find-import-library.patch +++ b/mingw-w64-python/0086-distutils-find-import-library.patch @@ -1,4 +1,4 @@ -From d2b7729abf961a200b889c3534a6eb15ad7e8cc9 Mon Sep 17 00:00:00 2001 +From 0604e948cfa1b2102827147a7c42ed4595890e1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:36 +0530 diff --git a/mingw-w64-python/0087-distutils-avoid-circular-dependency-from-time-module.patch b/mingw-w64-python/0087-distutils-avoid-circular-dependency-from-time-module.patch index fd014e839d..d38af7f973 100644 --- a/mingw-w64-python/0087-distutils-avoid-circular-dependency-from-time-module.patch +++ b/mingw-w64-python/0087-distutils-avoid-circular-dependency-from-time-module.patch @@ -1,4 +1,4 @@ -From 1886ce36ebe4eaf3dc12c70a600d12f24ce9490a Mon Sep 17 00:00:00 2001 +From 271b9a6e36e008cfdd7b5cf1dcb3669dcf4edb31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:41 +0530 diff --git a/mingw-w64-python/0088-distutils-generalization-of-posix-build-in-distutils.patch b/mingw-w64-python/0088-distutils-generalization-of-posix-build-in-distutils.patch index 2c4314d01c..baf6d33c56 100644 --- a/mingw-w64-python/0088-distutils-generalization-of-posix-build-in-distutils.patch +++ b/mingw-w64-python/0088-distutils-generalization-of-posix-build-in-distutils.patch @@ -1,4 +1,4 @@ -From 248ecc3d2a819008923eb17ceb76e94368bc05ed Mon Sep 17 00:00:00 2001 +From 0a8f983a53a4639b59637a2346135fb4c098ba86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:41 +0530 diff --git a/mingw-w64-python/0089-distutils-mingw-sysconfig-like-posix.patch b/mingw-w64-python/0089-distutils-mingw-sysconfig-like-posix.patch index 8c05fbcd2d..26bac6e1c9 100644 --- a/mingw-w64-python/0089-distutils-mingw-sysconfig-like-posix.patch +++ b/mingw-w64-python/0089-distutils-mingw-sysconfig-like-posix.patch @@ -1,4 +1,4 @@ -From e816e9144a7a8891355bd932c500670681211c2c Mon Sep 17 00:00:00 2001 +From 1f3cd7e9c945ecaf5c7af6715869ff7a3bd13d5e Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 20:53:29 +0200 Subject: [PATCH 089/N] distutils: mingw sysconfig like posix diff --git a/mingw-w64-python/0090-distutils-get_versions-fixes.patch b/mingw-w64-python/0090-distutils-get_versions-fixes.patch index 2fefda82d2..2be9348a19 100644 --- a/mingw-w64-python/0090-distutils-get_versions-fixes.patch +++ b/mingw-w64-python/0090-distutils-get_versions-fixes.patch @@ -1,4 +1,4 @@ -From 41212c0c42127688871f79fef778df187dcaf296 Mon Sep 17 00:00:00 2001 +From fff2b862b7720d0dade35b40107cda4e94ddf5c8 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:14:31 +0200 Subject: [PATCH 090/N] distutils: get_versions() fixes diff --git a/mingw-w64-python/0091-distutils-install-layout-as-posix.patch b/mingw-w64-python/0091-distutils-install-layout-as-posix.patch index ef83584d69..e4f0b6e6ee 100644 --- a/mingw-w64-python/0091-distutils-install-layout-as-posix.patch +++ b/mingw-w64-python/0091-distutils-install-layout-as-posix.patch @@ -1,4 +1,4 @@ -From ba867c3bd80c7e13919e7d3ab6391827e04f33ae Mon Sep 17 00:00:00 2001 +From 251c8739a2974a7c61d213c185aa5b1d4f0d5790 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:59 +0530 diff --git a/mingw-w64-python/0092-distutils-msys-convert_path-fix-and-root-hack.patch b/mingw-w64-python/0092-distutils-msys-convert_path-fix-and-root-hack.patch index 64de44aca6..b356d72650 100644 --- a/mingw-w64-python/0092-distutils-msys-convert_path-fix-and-root-hack.patch +++ b/mingw-w64-python/0092-distutils-msys-convert_path-fix-and-root-hack.patch @@ -1,4 +1,4 @@ -From da04832245a33f3318b6559634f2bb48999006f8 Mon Sep 17 00:00:00 2001 +From 0f631ed82f4d689f58d516434529bbd5195c8793 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:18:50 +0200 Subject: [PATCH 092/N] distutils: msys convert_path fix and root hack diff --git a/mingw-w64-python/0093-distutils-mingw-build-optimized-ext.patch b/mingw-w64-python/0093-distutils-mingw-build-optimized-ext.patch index 8ccd96f81f..dc0844f5f8 100644 --- a/mingw-w64-python/0093-distutils-mingw-build-optimized-ext.patch +++ b/mingw-w64-python/0093-distutils-mingw-build-optimized-ext.patch @@ -1,4 +1,4 @@ -From f17be501c2b0661111115d67fc7418f054b0dac2 Mon Sep 17 00:00:00 2001 +From 8714eb109129c181b77253ef683b97fdbdbc3608 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:04 +0530 diff --git a/mingw-w64-python/0094-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch b/mingw-w64-python/0094-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch index 88472a4e42..8a289341f7 100644 --- a/mingw-w64-python/0094-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch +++ b/mingw-w64-python/0094-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch @@ -1,4 +1,4 @@ -From 4d516290854fac73a0778123a7d40672c242c32c Mon Sep 17 00:00:00 2001 +From 1199b0be2280829b24d7916f55d7784c74b7b31e Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:52:05 +0530 Subject: [PATCH 094/N] distutils: cygwinccompiler dont strip modules if diff --git a/mingw-w64-python/0095-distutils-get-compilers-from-env-vars.patch b/mingw-w64-python/0095-distutils-get-compilers-from-env-vars.patch index 560e03e4a2..29b145d63d 100644 --- a/mingw-w64-python/0095-distutils-get-compilers-from-env-vars.patch +++ b/mingw-w64-python/0095-distutils-get-compilers-from-env-vars.patch @@ -1,4 +1,4 @@ -From 1a6ce1dfb144883a1a895b5884a73714687f9e77 Mon Sep 17 00:00:00 2001 +From 48ce0f5a0f1469900bb9fa8cdcba53deb53cf90a Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Tue, 17 Aug 2021 20:26:05 +0700 Subject: [PATCH 095/N] distutils: get compilers from env vars diff --git a/mingw-w64-python/0096-distutils-add-windmc-to-cygwinccompiler.patch b/mingw-w64-python/0096-distutils-add-windmc-to-cygwinccompiler.patch index c46e4af386..79a6139e8e 100644 --- a/mingw-w64-python/0096-distutils-add-windmc-to-cygwinccompiler.patch +++ b/mingw-w64-python/0096-distutils-add-windmc-to-cygwinccompiler.patch @@ -1,4 +1,4 @@ -From e2dd953a88e2a2ba0fb11138a9ede844dbf281ee Mon Sep 17 00:00:00 2001 +From c54b19c77e1eb4c83549d67f8a1b8190fa1e8dbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:28 +0530 diff --git a/mingw-w64-python/0097-distutils-fix-msvc9-import.patch b/mingw-w64-python/0097-distutils-fix-msvc9-import.patch index 103aeb9d3e..7d2c5cfdf1 100644 --- a/mingw-w64-python/0097-distutils-fix-msvc9-import.patch +++ b/mingw-w64-python/0097-distutils-fix-msvc9-import.patch @@ -1,4 +1,4 @@ -From b074ec65f38ded0c9f9a2cf6ab1e990639b7fa1b Mon Sep 17 00:00:00 2001 +From 082a206e67676c5dbc8caec576c1a8ecb4ce4299 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:24 +0530 Subject: [PATCH 097/N] distutils: fix msvc9 import diff --git a/mingw-w64-python/0098-distutils-mingw-add-LIBPL-to-library-dirs.patch b/mingw-w64-python/0098-distutils-mingw-add-LIBPL-to-library-dirs.patch index 8ccbb5b50a..413525bbf1 100644 --- a/mingw-w64-python/0098-distutils-mingw-add-LIBPL-to-library-dirs.patch +++ b/mingw-w64-python/0098-distutils-mingw-add-LIBPL-to-library-dirs.patch @@ -1,4 +1,4 @@ -From f2c94fd9d22a7449d8407f37047053f9093c9510 Mon Sep 17 00:00:00 2001 +From f194a8475c5a9f636fda39405996ef98772f19ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:06 +0530 diff --git a/mingw-w64-python/0099-distutils-Change-the-get_platform-method-in-distutil.patch b/mingw-w64-python/0099-distutils-Change-the-get_platform-method-in-distutil.patch index 12eb85d1e8..5156308863 100644 --- a/mingw-w64-python/0099-distutils-Change-the-get_platform-method-in-distutil.patch +++ b/mingw-w64-python/0099-distutils-Change-the-get_platform-method-in-distutil.patch @@ -1,4 +1,4 @@ -From 810193f21f4ed86dac614602b3b6066104bfb0c9 Mon Sep 17 00:00:00 2001 +From 13f85093666208186b9a55e981efee1101bccec9 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:37:23 +0200 Subject: [PATCH 099/N] distutils: Change the `get_platform()` method in diff --git a/mingw-w64-python/0100-build-Fix-ncursesw-include-lookup.patch b/mingw-w64-python/0100-build-Fix-ncursesw-include-lookup.patch index 8135f47bdf..df8204753e 100644 --- a/mingw-w64-python/0100-build-Fix-ncursesw-include-lookup.patch +++ b/mingw-w64-python/0100-build-Fix-ncursesw-include-lookup.patch @@ -1,4 +1,4 @@ -From 6cd4db4429c38242a866fbdebd7a8b293b03fb14 Mon Sep 17 00:00:00 2001 +From ff00902d1384011d4a79658754e179d76f5761f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:09 +0530 @@ -13,7 +13,7 @@ pkg-config and use the exported path via sysconfig in setup.py 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 77730b8..a4527cf 100644 +index a01b1fd..6e615b5 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -318,6 +318,7 @@ IO_OBJS= \ @@ -25,10 +25,10 @@ index 77730b8..a4527cf 100644 ########################################################################## # Parser diff --git a/configure.ac b/configure.ac -index a66b92f..d9cbb5d 100644 +index 814e439..e16948b 100644 --- a/configure.ac +++ b/configure.ac -@@ -5629,10 +5629,17 @@ then +@@ -5630,10 +5630,17 @@ then [Define if you have struct stat.st_mtimensec]) fi diff --git a/mingw-w64-python/0101-tests-fix-test_bytes.patch b/mingw-w64-python/0101-tests-fix-test_bytes.patch index ab7c23b228..31e027d853 100644 --- a/mingw-w64-python/0101-tests-fix-test_bytes.patch +++ b/mingw-w64-python/0101-tests-fix-test_bytes.patch @@ -1,4 +1,4 @@ -From cb3e2b22efa4b13bbe76aec344024574c7324144 Mon Sep 17 00:00:00 2001 +From b931ed2b1c524c0f27879a801cc355e360307921 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 23 Jul 2021 08:51:32 +0200 Subject: [PATCH 101/N] tests: fix test_bytes diff --git a/mingw-w64-python/0102-time-fix-strftime-not-raising-for-invalid-year-value.patch b/mingw-w64-python/0102-time-fix-strftime-not-raising-for-invalid-year-value.patch index d9b790f618..73e94d1303 100644 --- a/mingw-w64-python/0102-time-fix-strftime-not-raising-for-invalid-year-value.patch +++ b/mingw-w64-python/0102-time-fix-strftime-not-raising-for-invalid-year-value.patch @@ -1,4 +1,4 @@ -From 72dee9602032f9900cea5cb193d5df17673b437c Mon Sep 17 00:00:00 2001 +From 407bf2f465e0e28aabd4ab6947e068ac666c2090 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 23 Jul 2021 08:52:50 +0200 Subject: [PATCH 102/N] time: fix strftime not raising for invalid year diff --git a/mingw-w64-python/0103-ctypes-find_library-c-should-return-None-with-ucrt.patch b/mingw-w64-python/0103-ctypes-find_library-c-should-return-None-with-ucrt.patch index 4ea26927d6..ee08172a5f 100644 --- a/mingw-w64-python/0103-ctypes-find_library-c-should-return-None-with-ucrt.patch +++ b/mingw-w64-python/0103-ctypes-find_library-c-should-return-None-with-ucrt.patch @@ -1,4 +1,4 @@ -From 8c77da69b3454486f63dfedc28c66de755029f98 Mon Sep 17 00:00:00 2001 +From bb33955629ad4c6d1980eb5e2607f91d9ef2b582 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 23 Jul 2021 18:23:58 +0200 Subject: [PATCH 103/N] ctypes: find_library('c') should return None with diff --git a/mingw-w64-python/0104-build-Disable-checks-for-dlopen-dlfcn.patch b/mingw-w64-python/0104-build-Disable-checks-for-dlopen-dlfcn.patch index 004a5a6b3b..4154fec4e1 100644 --- a/mingw-w64-python/0104-build-Disable-checks-for-dlopen-dlfcn.patch +++ b/mingw-w64-python/0104-build-Disable-checks-for-dlopen-dlfcn.patch @@ -1,4 +1,4 @@ -From 9b2842a05a751f3897f3aa0abd25f392a5713ee0 Mon Sep 17 00:00:00 2001 +From abcc91922714343863f3af57fa86f364dc0a0ea9 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 13:54:12 +0200 Subject: [PATCH 104/N] build: Disable checks for dlopen/dlfcn @@ -10,7 +10,7 @@ checks for it. 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index d9cbb5d..60332d1 100644 +index e16948b..ced0d09 100644 --- a/configure.ac +++ b/configure.ac @@ -2427,7 +2427,7 @@ dnl AC_MSG_RESULT($cpp_type) @@ -49,7 +49,7 @@ index d9cbb5d..60332d1 100644 AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX # checks for uuid.h location -@@ -5038,7 +5049,10 @@ then +@@ -5039,7 +5050,10 @@ then [define to 1 if your sem_getvalue is broken.]) fi diff --git a/mingw-w64-python/0105-Fix-install-location-of-the-import-library.patch b/mingw-w64-python/0105-Fix-install-location-of-the-import-library.patch index 58f132d889..fd7d23dad5 100644 --- a/mingw-w64-python/0105-Fix-install-location-of-the-import-library.patch +++ b/mingw-w64-python/0105-Fix-install-location-of-the-import-library.patch @@ -1,4 +1,4 @@ -From a7ad326ef45a4fde11d09b4fcfcd80f790ddf7e0 Mon Sep 17 00:00:00 2001 +From e5d1f4a1198c7e09890961f4967afa5dc70cb83e Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 15:46:01 +0200 Subject: [PATCH 105/N] Fix install location of the import library @@ -8,7 +8,7 @@ Subject: [PATCH 105/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 a4527cf..562a29b 100644 +index 6e615b5..523fcf9 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1742,7 +1742,7 @@ libainstall: @DEF_MAKE_RULE@ python-config diff --git a/mingw-w64-python/0106-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch b/mingw-w64-python/0106-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch index 594a72b47d..119ee93bc0 100644 --- a/mingw-w64-python/0106-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch +++ b/mingw-w64-python/0106-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch @@ -1,4 +1,4 @@ -From 522a0288b9acca5fb67faa818a71ca5e4ddabb45 Mon Sep 17 00:00:00 2001 +From 8e4c33ca2213fafe273b195d38e27124fd212075 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 15:46:54 +0200 Subject: [PATCH 106/N] Set MSYS2_ARG_CONV_EXCL for the shared Python module @@ -10,7 +10,7 @@ Otherwise one has to set it when calling "make install". 1 file changed, 1 insertion(+) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 562a29b..7f1f3e1 100644 +index 523fcf9..00486ba 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1789,6 +1789,7 @@ endif diff --git a/mingw-w64-python/0107-build-Integrate-venvlauncher-build-installation-into.patch b/mingw-w64-python/0107-build-Integrate-venvlauncher-build-installation-into.patch index c0c849f8e0..2cc62fa40c 100644 --- a/mingw-w64-python/0107-build-Integrate-venvlauncher-build-installation-into.patch +++ b/mingw-w64-python/0107-build-Integrate-venvlauncher-build-installation-into.patch @@ -1,4 +1,4 @@ -From b129ef5c3288390996be40b3fbbf4f3a4412b47f Mon Sep 17 00:00:00 2001 +From 13bb5c3324f0b96c84a49becb1cc35e4e01ede02 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 16:53:35 +0200 Subject: [PATCH 107/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 7f1f3e1..46d203d 100644 +index 00486ba..d2e3b01 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -162,6 +162,7 @@ BINLIBDEST= @BINLIBDEST@ diff --git a/mingw-w64-python/0108-configure.ac-set-_WIN32_WINNT-version.patch b/mingw-w64-python/0108-configure.ac-set-_WIN32_WINNT-version.patch index 2cdd6c969e..2510264b73 100644 --- a/mingw-w64-python/0108-configure.ac-set-_WIN32_WINNT-version.patch +++ b/mingw-w64-python/0108-configure.ac-set-_WIN32_WINNT-version.patch @@ -1,4 +1,4 @@ -From 9e6fad823471e0f455d1445459a1104d1105b07b Mon Sep 17 00:00:00 2001 +From 029416febb56e1725e2b68d7e966b8ee6c9197f4 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 1 Aug 2021 15:18:50 +0200 Subject: [PATCH 108/N] configure.ac: set _WIN32_WINNT version @@ -8,7 +8,7 @@ Subject: [PATCH 108/N] configure.ac: set _WIN32_WINNT version 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac -index 60332d1..2ba3b29 100644 +index ced0d09..8923bb8 100644 --- a/configure.ac +++ b/configure.ac @@ -3497,6 +3497,11 @@ else diff --git a/mingw-w64-python/0109-configure.ac-don-t-check-for-clock_-functions.patch b/mingw-w64-python/0109-configure.ac-don-t-check-for-clock_-functions.patch index eaf8a96fc7..ebbe232293 100644 --- a/mingw-w64-python/0109-configure.ac-don-t-check-for-clock_-functions.patch +++ b/mingw-w64-python/0109-configure.ac-don-t-check-for-clock_-functions.patch @@ -1,4 +1,4 @@ -From a021e49d19ce45434a87cc0327550b6bb8e170ba Mon Sep 17 00:00:00 2001 +From 58e4a03340f7a5fb0189fe8cdaf9b2b64c2bb076 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 1 Aug 2021 18:35:17 +0200 Subject: [PATCH 109/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 2ba3b29..c2254b6 100644 +index 8923bb8..dee6098 100644 --- a/configure.ac +++ b/configure.ac -@@ -4394,6 +4394,9 @@ char *r = crypt_r("", "", &d); +@@ -4395,6 +4395,9 @@ char *r = crypt_r("", "", &d); []) ) @@ -22,7 +22,7 @@ index 2ba3b29..c2254b6 100644 AC_CHECK_FUNCS(clock_gettime, [], [ AC_CHECK_LIB(rt, clock_gettime, [ LIBS="$LIBS -lrt" -@@ -4414,6 +4417,8 @@ AC_CHECK_FUNCS(clock_settime, [], [ +@@ -4415,6 +4418,8 @@ AC_CHECK_FUNCS(clock_settime, [], [ AC_DEFINE(HAVE_CLOCK_SETTIME, 1) ]) ]) diff --git a/mingw-w64-python/0110-expanduser-normpath-paths-coming-from-env-vars.patch b/mingw-w64-python/0110-expanduser-normpath-paths-coming-from-env-vars.patch index 812af89475..654ea33522 100644 --- a/mingw-w64-python/0110-expanduser-normpath-paths-coming-from-env-vars.patch +++ b/mingw-w64-python/0110-expanduser-normpath-paths-coming-from-env-vars.patch @@ -1,4 +1,4 @@ -From bfcf5fcf03063ed65994b74ba0440a6a1920fb3e Mon Sep 17 00:00:00 2001 +From a33101f2f42410009a6d866508474844543e751d Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 8 Aug 2021 10:17:35 +0200 Subject: [PATCH 110/N] expanduser: normpath paths coming from env vars diff --git a/mingw-w64-python/0111-Add-support-for-Windows-7-Python-3.10.patch b/mingw-w64-python/0111-Add-support-for-Windows-7-Python-3.10.patch index 8a4c9d865e..750d650481 100644 --- a/mingw-w64-python/0111-Add-support-for-Windows-7-Python-3.10.patch +++ b/mingw-w64-python/0111-Add-support-for-Windows-7-Python-3.10.patch @@ -1,4 +1,4 @@ -From eec344a21939bc677658bba448b944a01074d2b8 Mon Sep 17 00:00:00 2001 +From 6cc9765321921447515171dd29167c38ab228f03 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Thu, 17 Jun 2021 18:52:39 +0530 Subject: [PATCH 111/N] Add support for Windows 7 Python 3.10 @@ -11,7 +11,7 @@ Co-authored-by: Naveen M K 3 files changed, 69 insertions(+), 13 deletions(-) diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 0334759..5506e65 100644 +index ab46dca..1e6be8a 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -20,7 +20,7 @@ @@ -20,10 +20,10 @@ index 0334759..5506e65 100644 # include -# include +# include - #endif - - #ifdef __VXWORKS__ -@@ -4464,7 +4464,6 @@ os__path_splitroot_impl(PyObject *module, path_t *path) + # include // UNLEN + # include "osdefs.h" // SEP + # define HAVE_SYMLINK +@@ -4456,7 +4456,6 @@ os__path_splitroot_impl(PyObject *module, path_t *path) wchar_t *buffer; wchar_t *end; PyObject *result = NULL; @@ -31,7 +31,7 @@ index 0334759..5506e65 100644 buffer = (wchar_t*)PyMem_Malloc(sizeof(wchar_t) * (wcslen(path->wide) + 1)); if (!buffer) { -@@ -4476,18 +4475,26 @@ os__path_splitroot_impl(PyObject *module, path_t *path) +@@ -4468,18 +4467,26 @@ os__path_splitroot_impl(PyObject *module, path_t *path) } Py_BEGIN_ALLOW_THREADS @@ -63,7 +63,7 @@ index 0334759..5506e65 100644 } PyMem_Free(buffer); -@@ -4495,6 +4502,7 @@ os__path_splitroot_impl(PyObject *module, path_t *path) +@@ -4487,6 +4494,7 @@ os__path_splitroot_impl(PyObject *module, path_t *path) } @@ -161,10 +161,10 @@ index 7c0eeab..2d03b74 100644 return _PyStatus_OK(); } diff --git a/configure.ac b/configure.ac -index c2254b6..a1131d8 100644 +index dee6098..f0ba5be 100644 --- a/configure.ac +++ b/configure.ac -@@ -6040,7 +6040,7 @@ AC_MSG_RESULT(done) +@@ -6042,7 +6042,7 @@ AC_MSG_RESULT(done) # For mingw build need additional library for linking case $host in *-*-mingw*) diff --git a/mingw-w64-python/0112-CI-test-the-build-and-add-some-mingw-specific-tests.patch b/mingw-w64-python/0112-CI-test-the-build-and-add-some-mingw-specific-tests.patch index 6398b216db..b4cc1df2e9 100644 --- a/mingw-w64-python/0112-CI-test-the-build-and-add-some-mingw-specific-tests.patch +++ b/mingw-w64-python/0112-CI-test-the-build-and-add-some-mingw-specific-tests.patch @@ -1,4 +1,4 @@ -From 6d5b71a3d313b6de348f044cb54310871014834e Mon Sep 17 00:00:00 2001 +From 2541c361b3f74d3e51c5def73f45d3088cc383bc Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 18 Jun 2021 17:51:59 +0530 Subject: [PATCH 112/N] CI: test the build and add some mingw specific tests diff --git a/mingw-w64-python/0113-smoketests-test-that-_decimal-exists.patch b/mingw-w64-python/0113-smoketests-test-that-_decimal-exists.patch index 31dbf671a3..2d7de9b2d5 100644 --- a/mingw-w64-python/0113-smoketests-test-that-_decimal-exists.patch +++ b/mingw-w64-python/0113-smoketests-test-that-_decimal-exists.patch @@ -1,4 +1,4 @@ -From cf3b23938a0484790267d468175a764bf17108aa Mon Sep 17 00:00:00 2001 +From fdf1c76656dd0043cbb9dd751c3c9835fe0dfc9a Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 23 Sep 2021 09:57:56 +0200 Subject: [PATCH 113/N] smoketests: test that _decimal exists diff --git a/mingw-w64-python/0114-Prefer-sysconfig.python_build.patch b/mingw-w64-python/0114-Prefer-sysconfig.python_build.patch index 5da73a61eb..a3aa56b87a 100644 --- a/mingw-w64-python/0114-Prefer-sysconfig.python_build.patch +++ b/mingw-w64-python/0114-Prefer-sysconfig.python_build.patch @@ -1,4 +1,4 @@ -From ab48de8138560997ad9fce42d9d6d2cf16af3cfc Mon Sep 17 00:00:00 2001 +From 23988830e501580c1e9e8a41d795f7fb4dad5480 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Fri, 1 Oct 2021 07:28:36 +0700 Subject: [PATCH 114/N] Prefer sysconfig.python_build diff --git a/mingw-w64-python/0115-Define-PY3_DLLNAME-to-fix-build.patch b/mingw-w64-python/0115-Define-PY3_DLLNAME-to-fix-build.patch index e54d472700..a7312c507f 100644 --- a/mingw-w64-python/0115-Define-PY3_DLLNAME-to-fix-build.patch +++ b/mingw-w64-python/0115-Define-PY3_DLLNAME-to-fix-build.patch @@ -1,4 +1,4 @@ -From 2caabd36e70ec8ca662ffb02f30b77f421493c36 Mon Sep 17 00:00:00 2001 +From d11e656da5959ede3d1f1960a421b1d8cdc6aa1e Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Tue, 12 Oct 2021 18:35:21 +0530 Subject: [PATCH 115/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 a1131d8..b99bb52 100644 +index f0ba5be..5113f95 100644 --- a/configure.ac +++ b/configure.ac -@@ -3988,7 +3988,7 @@ then +@@ -3989,7 +3989,7 @@ then *-*-mingw*) DYNLOADFILE="dynload_win.o" extra_machdep_objs="$extra_machdep_objs PC/dl_nt.o" diff --git a/mingw-w64-python/0116-distutils-remove-checks-for-ancient-gcc-binutils.patch b/mingw-w64-python/0116-distutils-remove-checks-for-ancient-gcc-binutils.patch index 87f16f8967..1befaf2428 100644 --- a/mingw-w64-python/0116-distutils-remove-checks-for-ancient-gcc-binutils.patch +++ b/mingw-w64-python/0116-distutils-remove-checks-for-ancient-gcc-binutils.patch @@ -1,4 +1,4 @@ -From f3590568b8b51da9e668f40a208a0bab9d417c3f Mon Sep 17 00:00:00 2001 +From 2d5d855c4d3f044aab705a50ff091c3914202e64 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 7 Nov 2021 23:06:13 +0100 Subject: [PATCH 116/N] distutils: remove checks for ancient gcc/binutils diff --git a/mingw-w64-python/0117-distutils-split-CC-env-var-before-passing-to-subproc.patch b/mingw-w64-python/0117-distutils-split-CC-env-var-before-passing-to-subproc.patch index 0c01da0a70..16c6693343 100644 --- a/mingw-w64-python/0117-distutils-split-CC-env-var-before-passing-to-subproc.patch +++ b/mingw-w64-python/0117-distutils-split-CC-env-var-before-passing-to-subproc.patch @@ -1,4 +1,4 @@ -From 951d58c847dc548cbb1cf4793429220d8d615d80 Mon Sep 17 00:00:00 2001 +From ba17628ba64dce1fd574dc5c9666284baf450809 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 7 Nov 2021 23:12:10 +0100 Subject: [PATCH 117/N] distutils: split CC env var before passing to diff --git a/mingw-w64-python/0118-_testconsole.c-Fix-casing-path-sep.patch b/mingw-w64-python/0118-_testconsole.c-Fix-casing-path-sep.patch index 5db70560fd..41436b59d1 100644 --- a/mingw-w64-python/0118-_testconsole.c-Fix-casing-path-sep.patch +++ b/mingw-w64-python/0118-_testconsole.c-Fix-casing-path-sep.patch @@ -1,4 +1,4 @@ -From ab5770169dacec08eb7bce5d3ffa57884a93f8c3 Mon Sep 17 00:00:00 2001 +From 1348c0cea90b9d405ec9ed1847b563059e58141c Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Sun, 14 Nov 2021 14:55:35 +0700 Subject: [PATCH 118/N] _testconsole.c: Fix casing & path sep diff --git a/mingw-w64-python/0119-Return-consistent-architecture-markers-for-python-on.patch b/mingw-w64-python/0119-Return-consistent-architecture-markers-for-python-on.patch index 26ed324b8d..cea8b008b0 100644 --- a/mingw-w64-python/0119-Return-consistent-architecture-markers-for-python-on.patch +++ b/mingw-w64-python/0119-Return-consistent-architecture-markers-for-python-on.patch @@ -1,4 +1,4 @@ -From 27de30a567cfc4d42cbb0f98ca3f5c3d1853907e Mon Sep 17 00:00:00 2001 +From 36288e2ec56ba6b3093e78e47aa85ea2542a9928 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 119/N] Return consistent architecture markers for python on @@ -51,10 +51,10 @@ index 275f799..4b0b9b3 100644 #define ARCH_SUFFIX " 32 bit" #endif diff --git a/configure.ac b/configure.ac -index b99bb52..ef7d20d 100644 +index 5113f95..b5e32bb 100644 --- a/configure.ac +++ b/configure.ac -@@ -5221,6 +5221,9 @@ case $host_os in +@@ -5222,6 +5222,9 @@ case $host_os in aarch64-*-mingw*) PYD_PLATFORM_TAG+="mingw_aarch64" ;; diff --git a/mingw-w64-python/0120-distutils-add-back-gcc_version.patch b/mingw-w64-python/0120-distutils-add-back-gcc_version.patch index 09275526f6..bab90eefd2 100644 --- a/mingw-w64-python/0120-distutils-add-back-gcc_version.patch +++ b/mingw-w64-python/0120-distutils-add-back-gcc_version.patch @@ -1,4 +1,4 @@ -From 46b1b45a039656e5b9ec71bd63ffa6ecc7d5964e Mon Sep 17 00:00:00 2001 +From 5ec328745e724bfb92ea96609fe0ca72288c9837 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 21 Nov 2021 14:00:06 +0100 Subject: [PATCH 120/N] distutils: add back gcc_version diff --git a/mingw-w64-python/0121-fix-mingw-cross-compiling-in-setup.py.patch b/mingw-w64-python/0121-fix-mingw-cross-compiling-in-setup.py.patch index 4b62216eeb..01cb53bd41 100644 --- a/mingw-w64-python/0121-fix-mingw-cross-compiling-in-setup.py.patch +++ b/mingw-w64-python/0121-fix-mingw-cross-compiling-in-setup.py.patch @@ -1,4 +1,4 @@ -From 7035cb3d29504bdfab7bac343c4e16e7226b3e8f Mon Sep 17 00:00:00 2001 +From 5a3750665e2edeb78f22cc36b10a93d3eddfdd50 Mon Sep 17 00:00:00 2001 From: jeremyd2019 Date: Mon, 22 Nov 2021 13:15:12 -0800 Subject: [PATCH 121/N] fix mingw cross compiling in setup.py diff --git a/mingw-w64-python/0122-Use-actions-setup-python-for-setting-up-correct-vers.patch b/mingw-w64-python/0122-Use-actions-setup-python-for-setting-up-correct-vers.patch index 990cd399bd..2b9972bc6c 100644 --- a/mingw-w64-python/0122-Use-actions-setup-python-for-setting-up-correct-vers.patch +++ b/mingw-w64-python/0122-Use-actions-setup-python-for-setting-up-correct-vers.patch @@ -1,4 +1,4 @@ -From e52e780c2843065a6c1b96aa45c6cbce082f2072 Mon Sep 17 00:00:00 2001 +From f93696693ac09b0c1a98f99aa049d70cf858a56c Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 21 Jan 2022 19:25:44 +0530 Subject: [PATCH 122/N] Use actions/setup-python for setting up correct diff --git a/mingw-w64-python/0123-handle-ncursesw-pkg-config-when-cross-compiling.patch b/mingw-w64-python/0123-handle-ncursesw-pkg-config-when-cross-compiling.patch index 98881c4d5a..34cffe75c8 100644 --- a/mingw-w64-python/0123-handle-ncursesw-pkg-config-when-cross-compiling.patch +++ b/mingw-w64-python/0123-handle-ncursesw-pkg-config-when-cross-compiling.patch @@ -1,4 +1,4 @@ -From f753888a47a45c157ed12ad33e637a4c5d3e0751 Mon Sep 17 00:00:00 2001 +From 9328be20bcab90f8090e850c5fadd89dc10795c9 Mon Sep 17 00:00:00 2001 From: jeremyd2019 Date: Mon, 22 Nov 2021 16:04:41 -0800 Subject: [PATCH 123/N] handle ncursesw pkg-config when cross-compiling @@ -12,7 +12,7 @@ Use pkg-config ncursesw include dir even if cross-compiling (PKG_CONFIG_PATH sho 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac -index ef7d20d..34b2a03 100644 +index b5e32bb..655d903 100644 --- a/configure.ac +++ b/configure.ac @@ -3406,7 +3406,7 @@ else @@ -24,7 +24,7 @@ index ef7d20d..34b2a03 100644 else LIBFFI_INCLUDEDIR="" fi -@@ -5657,7 +5657,7 @@ then +@@ -5658,7 +5658,7 @@ then fi if test -n "$PKG_CONFIG"; then @@ -33,7 +33,7 @@ index ef7d20d..34b2a03 100644 else NCURSESW_INCLUDEDIR="" fi -@@ -5665,9 +5665,7 @@ AC_SUBST(NCURSESW_INCLUDEDIR) +@@ -5666,9 +5666,7 @@ AC_SUBST(NCURSESW_INCLUDEDIR) # first curses header check ac_save_cppflags="$CPPFLAGS" diff --git a/mingw-w64-python/0124-CI-add-cross-llvm-mingw-jobs.patch b/mingw-w64-python/0124-CI-add-cross-llvm-mingw-jobs.patch index aa550145ba..5f7ff2de3e 100644 --- a/mingw-w64-python/0124-CI-add-cross-llvm-mingw-jobs.patch +++ b/mingw-w64-python/0124-CI-add-cross-llvm-mingw-jobs.patch @@ -1,4 +1,4 @@ -From 27fe82d981894031ffc9ca59586f7f281ee4ca82 Mon Sep 17 00:00:00 2001 +From 4d1b67ad51786e0e97386d914338a7ddb2305667 Mon Sep 17 00:00:00 2001 From: Jeremy Drake Date: Fri, 21 Jan 2022 17:47:04 -0800 Subject: [PATCH 124/N] CI: add cross llvm-mingw jobs diff --git a/mingw-w64-python/0125-mingw_smoketests-fix-_UCRT-condition.patch b/mingw-w64-python/0125-mingw_smoketests-fix-_UCRT-condition.patch index d2e1cc1227..1c43c21b12 100644 --- a/mingw-w64-python/0125-mingw_smoketests-fix-_UCRT-condition.patch +++ b/mingw-w64-python/0125-mingw_smoketests-fix-_UCRT-condition.patch @@ -1,4 +1,4 @@ -From f3a9fc208b7cb826b57b32cf383954e8e80101d5 Mon Sep 17 00:00:00 2001 +From daa1e6f2c7c9ce52ffea0a821f309ac44be1b321 Mon Sep 17 00:00:00 2001 From: jeremyd2019 Date: Sat, 22 Jan 2022 11:33:00 -0800 Subject: [PATCH 125/N] mingw_smoketests: fix _UCRT condition diff --git a/mingw-w64-python/0126-CI-fix-sed-pattern-for-python-config.py-shebang.patch b/mingw-w64-python/0126-CI-fix-sed-pattern-for-python-config.py-shebang.patch index e0d544e7cf..8cfeab48ae 100644 --- a/mingw-w64-python/0126-CI-fix-sed-pattern-for-python-config.py-shebang.patch +++ b/mingw-w64-python/0126-CI-fix-sed-pattern-for-python-config.py-shebang.patch @@ -1,4 +1,4 @@ -From 055c9211173b4d80ab2729adf8c8faa8de3cc150 Mon Sep 17 00:00:00 2001 +From 31ab082e30231edce3a2df66e0de9dcc3a6156d4 Mon Sep 17 00:00:00 2001 From: jeremyd2019 Date: Sat, 22 Jan 2022 12:08:33 -0800 Subject: [PATCH 126/N] CI: fix sed pattern for python-config.py shebang diff --git a/mingw-w64-python/0127-Modify-sys.winver-to-match-upstream.patch b/mingw-w64-python/0127-Modify-sys.winver-to-match-upstream.patch index 6bad2a9325..0f05e3d798 100644 --- a/mingw-w64-python/0127-Modify-sys.winver-to-match-upstream.patch +++ b/mingw-w64-python/0127-Modify-sys.winver-to-match-upstream.patch @@ -1,4 +1,4 @@ -From 0d9fd1576a7b4b447d92dd1fac727ea3deb5e6a9 Mon Sep 17 00:00:00 2001 +From 1092b1087231efda2a1e840df9e6b8fa561671d5 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Wed, 19 Jan 2022 19:39:20 +0530 Subject: [PATCH 127/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 34b2a03..79a5feb 100644 +index 655d903..209410c 100644 --- a/configure.ac +++ b/configure.ac -@@ -3986,10 +3986,24 @@ then +@@ -3987,10 +3987,24 @@ then esac case $host in *-*-mingw*) diff --git a/mingw-w64-python/0128-Change-user-site-packages-path-to-include-the-enviro.patch b/mingw-w64-python/0128-Change-user-site-packages-path-to-include-the-enviro.patch index 62f2524f6b..b864eafc90 100644 --- a/mingw-w64-python/0128-Change-user-site-packages-path-to-include-the-enviro.patch +++ b/mingw-w64-python/0128-Change-user-site-packages-path-to-include-the-enviro.patch @@ -1,4 +1,4 @@ -From f29faf5cf4bab7fd6d6f9ac471b20680ee908a27 Mon Sep 17 00:00:00 2001 +From afc6bc03197ea76ef308dfa1c0954149937c711a Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Wed, 19 Jan 2022 20:01:45 +0530 Subject: [PATCH 128/N] Change user site-packages path to include the diff --git a/mingw-w64-python/0129-configure-Include-a-header-in-the-check-for-_beginth.patch b/mingw-w64-python/0129-configure-Include-a-header-in-the-check-for-_beginth.patch index 8a79b20150..339af056dd 100644 --- a/mingw-w64-python/0129-configure-Include-a-header-in-the-check-for-_beginth.patch +++ b/mingw-w64-python/0129-configure-Include-a-header-in-the-check-for-_beginth.patch @@ -1,4 +1,4 @@ -From e82317c98a5b145b5528bd4b6dd9723c645d1e51 Mon Sep 17 00:00:00 2001 +From ee71d220e97ceeeda35794d6c1f9ca3a7ad23c04 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 129/N] configure: Include a header in the check for @@ -19,7 +19,7 @@ in C99 mode (or newer). 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 79a5feb..8d7ec7a 100644 +index 209410c..9ccf893 100644 --- a/configure.ac +++ b/configure.ac @@ -2239,7 +2239,7 @@ AC_MSG_RESULT([$with_nt_threads]) diff --git a/mingw-w64-python/0130-configure.ac-Default-to-without-c-locale-coercion-on.patch b/mingw-w64-python/0130-configure.ac-Default-to-without-c-locale-coercion-on.patch index 947ab2d5c6..9c92f02792 100644 --- a/mingw-w64-python/0130-configure.ac-Default-to-without-c-locale-coercion-on.patch +++ b/mingw-w64-python/0130-configure.ac-Default-to-without-c-locale-coercion-on.patch @@ -1,4 +1,4 @@ -From 5a6ee053758e333e1e28de40a717f663e0dcd63c Mon Sep 17 00:00:00 2001 +From e234fae46ed9b2fe0b0c501d4469b1e5fe71c037 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 22 Apr 2022 17:31:19 +0200 Subject: [PATCH 130/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 8d7ec7a..6666a89 100644 +index 9ccf893..d175394 100644 --- a/configure.ac +++ b/configure.ac -@@ -3892,11 +3892,14 @@ AC_MSG_RESULT($with_pymalloc) +@@ -3893,11 +3893,14 @@ AC_MSG_RESULT($with_pymalloc) AC_MSG_CHECKING(for --with-c-locale-coercion) AC_ARG_WITH(c-locale-coercion, AS_HELP_STRING([--with-c-locale-coercion], diff --git a/mingw-w64-python/0131-CI-remove-without-c-locale-coercion.patch b/mingw-w64-python/0131-CI-remove-without-c-locale-coercion.patch index 34ae1fe683..fc89bb213f 100644 --- a/mingw-w64-python/0131-CI-remove-without-c-locale-coercion.patch +++ b/mingw-w64-python/0131-CI-remove-without-c-locale-coercion.patch @@ -1,4 +1,4 @@ -From 54fe5dd7215e8f0f32e20c64927527fc6e7d9909 Mon Sep 17 00:00:00 2001 +From 83ed2d504234858d3d59f430ca94302ce46fef0a Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 22 Apr 2022 17:37:23 +0200 Subject: [PATCH 131/N] CI: remove --without-c-locale-coercion diff --git a/mingw-w64-python/0132-Fix-failing-tests.patch b/mingw-w64-python/0132-Fix-failing-tests.patch index ebe93013f0..d98e7000e7 100644 --- a/mingw-w64-python/0132-Fix-failing-tests.patch +++ b/mingw-w64-python/0132-Fix-failing-tests.patch @@ -1,4 +1,4 @@ -From 8f96f64f90057b5b2817f92ccdd3309961aa8cf3 Mon Sep 17 00:00:00 2001 +From 8a36517990f753436303a018b84cd50b2133e330 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Sun, 5 Jun 2022 20:28:53 +0530 Subject: [PATCH 132/N] Fix failing tests diff --git a/mingw-w64-python/0133-distutils-add-build-root-to-libdirs-when-building-un.patch b/mingw-w64-python/0133-distutils-add-build-root-to-libdirs-when-building-un.patch index bd87e826fc..23d88cf06d 100644 --- a/mingw-w64-python/0133-distutils-add-build-root-to-libdirs-when-building-un.patch +++ b/mingw-w64-python/0133-distutils-add-build-root-to-libdirs-when-building-un.patch @@ -1,4 +1,4 @@ -From dcd50e88196ab74dad079e0f50a856dfc4841ed5 Mon Sep 17 00:00:00 2001 +From 7789a900640ab765756320ef2aba86b85a292111 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Mon, 6 Jun 2022 16:24:55 +0200 Subject: [PATCH 133/N] distutils: add build root to libdirs when building diff --git a/mingw-w64-python/0134-Avoid-some-macros-only-available-in-Win7.patch b/mingw-w64-python/0134-Avoid-some-macros-only-available-in-Win7.patch index 914935ce49..d9ca41fb8b 100644 --- a/mingw-w64-python/0134-Avoid-some-macros-only-available-in-Win7.patch +++ b/mingw-w64-python/0134-Avoid-some-macros-only-available-in-Win7.patch @@ -1,4 +1,4 @@ -From a8d50d2698246b7333284ef11b299f48e002a973 Mon Sep 17 00:00:00 2001 +From 04ca91cac019d0023b56c47d80195f7b336c66ee Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 5 Aug 2022 07:39:48 +0200 Subject: [PATCH 134/N] Avoid some macros only available in >Win7 @@ -9,10 +9,10 @@ They got added in 9041b00283737f77acbb for 3.10.6. 1 file changed, 6 insertions(+) diff --git a/Modules/_winapi.c b/Modules/_winapi.c -index c479a92..124dbc8 100644 +index 56f3306..c459157 100644 --- a/Modules/_winapi.c +++ b/Modules/_winapi.c -@@ -1528,10 +1528,16 @@ _winapi_LCMapStringEx_impl(PyObject *module, PyObject *locale, DWORD flags, +@@ -1552,10 +1552,16 @@ _winapi_LCMapStringEx_impl(PyObject *module, PyObject *locale, DWORD flags, PyObject *src) /*[clinic end generated code: output=8ea4c9d85a4a1f23 input=2fa6ebc92591731b]*/ { diff --git a/mingw-w64-python/0135-Make-sure-we-always-use-the-stdlib-distutils.patch b/mingw-w64-python/0135-Make-sure-we-always-use-the-stdlib-distutils.patch index 6f7ce16858..296d5e5922 100644 --- a/mingw-w64-python/0135-Make-sure-we-always-use-the-stdlib-distutils.patch +++ b/mingw-w64-python/0135-Make-sure-we-always-use-the-stdlib-distutils.patch @@ -1,4 +1,4 @@ -From e3758945d7d9d101bb1a1f450bcaf95c8916f754 Mon Sep 17 00:00:00 2001 +From 206185160a6601affd12f3b989958888cd74d703 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 5 Aug 2022 08:04:54 +0200 Subject: [PATCH 135/N] Make sure we always use the stdlib distutils diff --git a/mingw-w64-python/0136-CI-skip-some-more-flaky-tests.patch b/mingw-w64-python/0136-CI-skip-some-more-flaky-tests.patch index 8e94c1a061..145e69e4b0 100644 --- a/mingw-w64-python/0136-CI-skip-some-more-flaky-tests.patch +++ b/mingw-w64-python/0136-CI-skip-some-more-flaky-tests.patch @@ -1,4 +1,4 @@ -From ba69e91559ac999ce3d494a6cd07ed097327bf3d Mon Sep 17 00:00:00 2001 +From be8554eada304ffce37e4a42cf28ab652fc2b624 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 12 Aug 2022 16:04:11 +0200 Subject: [PATCH 136/N] CI: skip some more flaky tests diff --git a/mingw-w64-python/0137-Don-t-change-os.sep-with-an-empty-MSYSTEM-env-var-no.patch b/mingw-w64-python/0137-Don-t-change-os.sep-with-an-empty-MSYSTEM-env-var-no.patch index 9d21040cca..7a5252e892 100644 --- a/mingw-w64-python/0137-Don-t-change-os.sep-with-an-empty-MSYSTEM-env-var-no.patch +++ b/mingw-w64-python/0137-Don-t-change-os.sep-with-an-empty-MSYSTEM-env-var-no.patch @@ -1,4 +1,4 @@ -From 1583995cb212c421d0c850f8ba08a4f263ee306a Mon Sep 17 00:00:00 2001 +From 51cc7c49e414bdd2268e637d4e900a4469e91936 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 22 Sep 2022 17:51:33 +0200 Subject: [PATCH 137/N] Don't change os.sep with an empty MSYSTEM env var, diff --git a/mingw-w64-python/0138-Commit-regenerated-importlib.patch b/mingw-w64-python/0138-Commit-regenerated-importlib.patch index 30e2d401a9..a01b5b1a00 100644 --- a/mingw-w64-python/0138-Commit-regenerated-importlib.patch +++ b/mingw-w64-python/0138-Commit-regenerated-importlib.patch @@ -1,4 +1,4 @@ -From eca05b9051adbc73d825e68f1363798c36124618 Mon Sep 17 00:00:00 2001 +From 101c2b0778f1a02169d7d649511e7b75fb93fbfa Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sat, 15 Oct 2022 13:02:13 +0200 Subject: [PATCH 138/N] Commit regenerated importlib diff --git a/mingw-w64-python/PKGBUILD b/mingw-w64-python/PKGBUILD index 0147541ec4..c2d182f036 100644 --- a/mingw-w64-python/PKGBUILD +++ b/mingw-w64-python/PKGBUILD @@ -21,8 +21,8 @@ else pkgbase="mingw-w64-${_realname}${_pybasever}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}${_pybasever}") fi -pkgver=${_pybasever}.8 -pkgrel=2 +pkgver=${_pybasever}.9 +pkgrel=1 pkgdesc="A high-level scripting language (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -439,142 +439,142 @@ package() { fi } -sha256sums=('6a30ecde59c47048013eb5a658c9b5dec277203d2793667f578df7671f7f03f3' - '8651b49b24c55d4ec71185377c4004ea82a4d851c165333933a04bcf8d14dae8' - '232d9ceb0d53172698017d72da19a5499d1fc86a2bed7d8425cc783474b18b99' - '7de4f010d930f00b62843fbab0d46025cf602b5a0d6e2f18cc9d4ee745abab03' - '245327476e99f7d5e3775021856f8d5002cc6b9d9a3da87abc0baa7107395994' - '03b65312705f7f3a5b84df0a943e2573232a5c38ce6c34793dd7039b0d669398' - '37901967d7ad33a594a32f1f2efdea01612a8ffc4ff274ef856cb82f526a7c1f' - '500719d3414b342ca034a3a172773577b8ae6b013e48fbb4ef3bfdba1d854cf7' - '1e55bb78195908832c583014c79d8ece90b112730f3cf4d337f6a79d109adf41' - '3d7bf0ebf9965de668c2132b5881aeecd504dce4ef13abdddc356d2a54505869' - 'f6d33e352096deaae20612fb0fa73f934e30c8a632cd97ef0574523a360a5185' - '624d4b3de7a963507d73ffcae2a64eb42386d5937a474326984653bdab534d62' - 'e19353d6d7b84f85563f4904b812648433643dcb3955b3e7073ab49bcc4bf794' - '14b1b451d1248305ab57c5b335ad928dd47c1a086de0b8fed29b1bbbf6e5ac88' - 'c55e32857e1be37afb6e6e271baab9c55d9f50ac7e84bba0498a0d355d325f4a' - '5a329b589cde1f7116fb1f7450b6bfb3cad1327e8731a1017d6f06c66a3d91e8' - '3de1db9cd88b18cbb5766c0ea4adc57f829d104dce67dfbd1e4cc549ae34a4e2' - '76d7c72d9c876e3ac8234f2564501cb109d10b91ba9f9b0430cd4b920cbb955e' - '059aa394841ff057f83c4f014185a883c2b4e73549d737944903a19fb9f8ec54' - '1f36bac190bc0423600c123b803baeafb3beaf0c25c85832c23ea9452d693f6d' - 'd6793137eba2e7b7fdc9937501f67ec8fbed53cb3e876205f1cd497a4b4cf7e3' - '9c0d6722d3a788f9fa673ed61178fb3730fe77b3483ebf951e5f2ec4d63baf92' - '3e213255ae1001f7fb19069b124b5f362a38df545c2add7e389d83e5a9453e74' - '20e1827a98643679683829631864aa699cf8cc742fc589bb94f34887382c9565' - '1dc316f62e31d77f384aec75b44b6b7bf955230218b65d866baecdb3d537ef0c' - '97e185a90653d659ed5bd52dfbfa1fdd28d01eda4b8755a265eaa3a455e790c9' - 'a6cfcddcf2449ae12190cdeeca41bb47b182dbb8ed34f2f0b41ad5944d40aebb' - 'd0271518b6825ffe0a4b5b287e50deae073ada6a94f2f2eabbb1a03c88a11da3' - 'efae861c2f1d7b7df499c4894f45fbfe90fcb00ae46e7e60c3384c2807363b52' - '3bc46167afa8e30f5cbf88bd86f2433bb8dc8374f4391eebb420da48710237a5' - 'b98a30f5a4e4677f54fba741d1bec0e10754b6439843178db7713447f22fb0f9' - 'd2ed1e655e6201fc9d935fc2a9d63b2cd00602773f78877b0e0c408483e64855' - '6d9388e7546f7aa3a014f7b3a96aa35eedaee9f43a66796596c80afadbfafecd' - 'c1b07fcfde7e463c985597fa8254ef327639b0e8d04fff653f4348658bcd3e79' - '63fa17d8c22f58885bf8cf7d32266593229b2ea4bfd9229498c0dee3946948a5' - 'b909093ce5e50d34eb7389645c4dd01dd8dfe708aa6fa09f61a09813e6e98924' - 'e8aa7a4a598d5f78fabaf7d40fd20e03ee2ab29c4fdc7eaafcb3166c56d8997e' - '6d8f369e3ebeab0ca5ba097f662124089b71573d5dc2df0a3bee20fe22b0d438' - '896bada5c63872fbdc29c4f8bc94adb4086ea151b46397d2e2eb587be76b49b0' - '10bc979296e463c2ea67bfb11df9f6694056a88b1901f51849b88b938ef76757' - '176a31a0e58365e17ad908944bf3b497581f4f88615fbdfecd57dba0d1aae48f' - 'f8b4195e6a120c836e3b2c346efedcf3903841b00d0acf156ead516f53330fc8' - '536e23c228a56913cec4c4e72523063b4afba848305eff67ead46b0c7609d6eb' - '4620f4553336a702f156b10b1dfcca04f4ca5430a0e0b6c61fe0525414d871c0' - '970e3d8e869f19480fad530ff992fb60f49d7cfe8cb549161272509ac08fa1fb' - '6e44d3139fe6e8c107081f3cd635f9867aa90de75ceded6e8b3e25735f0b7892' - 'b7717e638c0a0726b48d61430df0b10d14a71a562da80ada4d938cbf1ec6d775' - '02974194b25454b350b23618e75d5d5b88f8b942a802ccff4acbe622a2578bca' - '41a3bd77c83475c8a5076337a17fe0ea6bbb0c7f10a2de7c08e0b69e7df51569' - '263dd5b0c548f0fd6032d71eabfe24c8754ee413245a196c66b46c3062066df5' - '1c3b06cadc2780b4b95be0c57d559fd75d550171ea99c82dc299f8c15d9c90ab' - '8978675f66c27096f1007e660662574676ab50432b7dc5840252d5fee0eb24c7' - '7898f40d0ba4887e9456b189e325c3700edacfa87812445ae3a205cc15eb6035' - '47db35d774f6f1100bc770cbf80061297791e1ef3ee9fe4849620061a5dbe61b' - '1946d8cbcce723b9596feaae76bd6b49fc0b8ce80710b9e8ff4cdc6668151867' - '5f6df8fa43bd4d2c067406585e5004af21003ac36fde54dfbae3d395e5da18a8' - '73d0e8c29d9efad4c8e068a7a44d1c824ed6b7299ccba28344923d64442fffef' - 'eee1e6cd347b1d7da7f37acf4834ab4bec32342fa2d5853988c99729f70c5a68' - 'f33fe9694338e6b99651b862f9de86565adb1871999b6b93bcdbd471f481a551' - '2121c0d6c34ef320d8674196514c465b3974ea2c5acdb9b922d1b4341abbb2b7' - '32f830b93d8f3bbda0051b712ba8a24d4b7a93a237060e18bbcfcac54ecf4f85' - 'bba2312552872f0ff70e5b2d81a957861e67148efa4aee86212591e9ba5b5618' - 'd6754c14eb935471bc263c7a6ee8736a98d78a9c93f8b36c91e65da967b98e70' - '75fd66e4a7d49521add87d66750e918cbe335fc4941766dd1e72812e60a0ec31' - 'dec43dbc7d318020261daec0eae9802629edf029b08e5c60bec46b9686456244' - 'f3faf1e0c0a03cf7337f3e3249860709886f0f7a838b89934193b64c373aff5f' - '96efeabc3787fde73d9d49745041a5d31c1fb66c8b79613491adef7c1cf3db0f' - '02334d3d7add354c47e4153cde48c2c4b169ede7131b13528da6bb7970afacb5' - 'd0100771aa901842666e1c477abea8e6adae0e98a5bf33295bf0acaf32c47a2d' - '007cdb31693579f92f7dbce9a08f21adadb4d77e81b69d3bb50e0a4173d91b5c' - 'dbcbd9c11c4d097783d4df17fa06993ce5b1a5c13fb81732a1b5498de4d37dd3' - '9facc0151f6ce07408f3933708fcc7722388135a2b3f2c2e4b2120a962be1e81' - '222af80fbc8671e9b8802f324644915e07006e3f7e7a7e9f4af6289a54bb1a66' - 'e4558b8ccbb742e371338eb55ff43cb5ed6f99593cf3a015c7224fff82edd761' - 'd56d3f6c2f69f5f0cfa8bd8bcdd6897cbc1e9d97918a424af11f2596ecebcc36' - '80ece640e5a8aa3facf482f8adb64759af417f551d48440b139d4d68c3965132' - '0c638b259e347d001da8eede1a28a5114787a18e5f0b7d569ff03b328f04993c' - '4c4adb0d919a35ebf8f22c01215c542265a3f339ab3ac49d08e8fca7c709a83e' - '00b9d89a859035097b9a9252de67fb55a7d206dd4d47f7768472ad121325d7a1' - 'ffb72d26132dffc964ce2f4b3d76cc5e1fa77642ce4120bd0091d092ea074a3b' - '4da94267b68ab3289de920c9382fc23c09216c7c6d9ad413542d35d5c551a184' - 'e458a55b123e528b4039c5dbeec957f9471f23d0960ea1606ef640ceff4f426c' - '8e3484692148f5dbcf8f38aa1d66c4ce5545a541db5f5724142aaf455026eac4' - '78ed97cdcd86a1c927a43aabe81507258ea933f14019f86b1708dbfdfd0ba434' - 'abe798494ff6f547f4061d47bcbd20913c9b48d3ee51edf98665c610832f8228' - '0522a6bfa0b698a647c3de1b7e09885e66fd960ed58a61d66720bbfb3e7a3c0c' - '5b925752654d30505cf46705589a91779413bac61feb7a46e34ad007c1c04780' - '29f62b427f7098670b418f0b429aa7f890c8614186f7ff41c178994154233a98' - '9ebc74110b1a8b853011bae360b75cc8fdee03f1d78a04457d295d98570592c3' - 'cd2d975b85e547f66faf8818e40d7c7f933b39e46e0448eb5ecbc3b65885b407' - 'd0d06253e0ae44420d9e0a24bb6e7f2947f7ebb219fc8f2194e3ac3a3cbffa8a' - '76faa6307fa3242f7511ff3405322b95a4e03f0c08dc37b1ef6df432b62eb0c7' - '31309a3e3286942e1ac13f00e2946b0be3476e28a2ddd5090e96b62a35fb17d5' - '63a6c1b9a9362f23d241310a24a015c127da579c6f0f5f4d1f5d5659e713dc00' - 'a895adfcf6fe71c5bac9d3b1ab19e82e258d0e76ad75ef76e0a4b025b3d5db91' - '82797935fcf93270cb48e89638f8e28e70647cb555b08e39663285b5b8590176' - 'b4d5c567667b2d741d7d6658ed558e30e841ac3fd28b63a304346320e0c3f714' - '00d014d61983b939830ae08ce4a4f6a08e90b06603312aaabe68d7f5b5535379' - 'f52ff116026998f666c9668ee143a0a9214a493b0227425363faca6240eeb1f2' - '58a882116f1dea76d5030630944cf6dff064270043f66cb1f746a17a608be675' - '3ac3b315a1b47103bfd89ca8dc2f7b6a831aa69eed738586959dbeaf1ac285d0' - 'fb07fe0e368b18a144e431a65213dc64d9ba9d119055600fb019ccd9f953e1f4' - 'addda34fbbebba07469c59fda278893823128005b550d42eba4b42e9c3461938' - '59970237cdd14da58f80b7605645dd2e83d6c11355a4335fc9430895dd201a37' - '964760ab5ccb0446cc604b5a29c45d02ef39a9c783ebe20510339da90a797f41' - '5d088656bf341e7dacd7886db8f65263fb01113d0c3e5012afdfe6f9c422019d' - '3a156478bd49efe41b1bdb6b2ebac3854e009edf5de49e3d9166e592467e4ed5' - '0604d40cc64dbf23a3a4dd19a5ab913c99cae7a7e81b4d32f5bd8c52def64a8f' - 'f344466d6f78459f772e7a4d2acc4da2db203710aaca72ac915aac3cda0c0047' - 'a22d19d5dbb398e957424bb502445360c16f6f71616c366c17b87c9025b4579e' - '24f37e696b6ace07e3fc560e48cf393263d93e032008ef82a4b1943b97740927' - '4fdfc417e330a5f7e8fa5f5b668ac4869828058f8a48014b71b32bd69a6c38cf' - 'e454559af72acd9fb59b2b91b19d587d4163fe4f7dcd09912501c59f1ec795ce' - '8b52c40e7960f1f59af350c910042ad24cf4cac5721591adf56528082792a25a' - 'd404c9ccb5bd980e2c0a53539e3944c1b85cacff38925d7a63a754a1d2f95342' - '7e5a9efa280e473a0a2da9162704c07d89b41cb7b1ba10b652295abad1c8f9a8' - '9728ade59997ca1c1f651537da9d91a4eceaaf4ca6c2106b6dbabc7abd8bffd0' - 'f1972e98e63ad2f1cae923a6f1410c032cb4144b1867676924d08486bbe552f1' - '518d446575db38ff734a411158e062b88ee7bd86c28da5863b3adb66cc13b04a' - 'a9bf006d88723215eec213cf4fc6601a8f9adabf20c06c941a62a49ae74202bf' - 'cd2e102dce8cf475c1ccd9aa2743c97aa36f75a7513da42c0adcbd523c82ffd4' - '3d309086c2b7d2fe907492ceced756db426dababe403b55f30768fd8834ce3d7' - 'a952ec261520b76d2f43b096f8953528cecc134c20a1bd9cd5e34aed16631d07' - 'aaabb8e9f593bd1f7f9705655dcd6ad57c6324e2b6ca120444f1a7add4355a24' - '3b86df8161b57d0171bfdbea4878d026cf6083f66ff6bd10a66afdfc8dc7ee36' - '147e4d1d399e629a5a0f77afbe9d26da46deddbbc40a50af9af52bb3e0abb5b9' - '3d7d17d4c8e6ec3c66f1fc0795967bc3767db7b8ccca66c0a28ec10f95d543e3' - '67e34174fefddbafd74e759fc00ea47b6b1e3d9c40cadc0019cb66768444ff05' - '302bfd9d8890104e0792013277f2873c65e6f0363e795e2a194aedf32a67e186' - '26d7806f92e8825ea75df53f890e2fabf6994ec4b7e005a5953a968eb639d8d2' - 'ccf561810a5e990feddf9b2ae8d3f6640b22fd1b0b274f1cde62e0d75e6dfac1' - 'dfc600ea31a9e76c85dee222b8762737bd3a06584b0268bf7021e15265b8bf24' - 'c46bb3b143714cb4475c40d0b7aa6860bf23c5e442692daf6e6797ccf30a2805' - '5664466d71c99fc81013a742a548f66ff1b8625ad1fc8e0d15c235bd8cb2975d' - '4b7133b81d102a8bc3bff3eba67b0c665641bbed4361ccc5b3540d05a5513bc2' - '26332708b7f27b6b5db5f9d9561d542416b9b01f1f98c0f7d42fd51ac5a71fdf' - '45b5ea36cf597e7fc5720fb8b1dfb8825d8f7cf24caf1d6e37bae8ce1cf22cbf' - 'c38e2cf30c7b26929debe855f0b4a7d753fd0fc3a63ea7dd44ddcb2bed04761b' - 'a4237e3846414d4d7761ee01af59bd49e2f3120c2701edee6e9e258a4abd617e') +sha256sums=('5ae03e308260164baba39921fdb4dbf8e6d03d8235a939d4582b33f0b5e46a83' + '98f7dcb419f86eb2a5ab74b7ec190c9ebbaadedbac95f3ebf8ad9251c58a2e90' + 'd2620afb8d103fc5098dfc70dcf5b1801f0e4bae7cc5fa7885a9ed250771474c' + 'b7bc16f1ed4fe44008bb054933fbd2f4214f971bcccd6f43ac48cf425acee89c' + '452101e3b9f2cdca65544787756ef33070b819913b3daf3a773a4cdaeb403e32' + 'cad47fc36d9b54613ad1fa434eb289844b54ea12679cc1614dd9cedfe9092a04' + 'e3d1ddae87f3a4caa89088d3235506cc63532ed70258c0dfe7fe20126609280f' + '26ffb4da00460af141588b869092293ef4d858e0bee86308eb3fbbc83f0e22ca' + 'c9fcd908f0f0d1d14cb3a66fd043aeca4a55af5069af4216a560a8c9e1c96ba2' + 'e37ad2b080aa595a52503a6166d95bd05dc03b9370765c79b58c963092654c20' + '2d341a136627e943be0715a6be32136d5db7200a806359a75007d6b9f6d89e9d' + 'b3348b51f524981045baa434e927181c1c66ea23f838243aea223142b6db669e' + '46ef7e90af2ac8221db4037c3b2950bf20f44987a4bca71d571440276b74cc66' + '8228996f694ea3bb6f41f1a1d4c56ffc12a14ca70a88aa16d82e215f85e125cd' + '8dd96ea1b78747dd0c9681b6ac223566629d74c071c41b2da0a0e33df5ad8c2d' + '7def1ab0e48f82150801044cd6f7c0ea6889147aa432a44509278c76b9adb394' + '0ac02f876e11906ad81a5a3460f4d6c8e3ec4d6c22318ef9a2c180c4aa7f0838' + 'e60f6c91d2ee80a861e725515d3a1559f30d6d657c6b06c65afbfffe054f2bf5' + '9966b389c21002db33d67e27243f58971905b654a3a27b882d52ad669d4e11fb' + '4324ae10237ed98d454eeaf7928a621419b5752a990b805dcd5811d0e56ec178' + '87c516330590c156855cde9bfc255886411caa19399ffb859db49d8594c13139' + 'f188eabd190efb8ec20f59044d7b4dba2ff7c1b7ba997ce1f319047b83942298' + '63641b0181b0cae770f706a3f1f97b4db2016247c17e4167425edf713149f911' + '2492f447a52debea86d49ecbe4548f7ba9b6a1f7f4d69a05f07fa4f1bcbf0606' + '6b80317a5fa7133443500fe573b797e4581e5365470542a804005b91b7e3015e' + '60c90077938401106b21e310207fb93b137bbd8a89f09b27e8845622b372b175' + 'e5370852651508876e1b9f0d7f274a0ff38413e4cf093f0ad7cb3d3536588a09' + '8607cc53eea9804eef20abe281888b612fe34cbc5cfee28a8b04eb4e415b8db7' + '046474584a917d122e365353245628afe095ed065f9dec1b7de68e2cd5716993' + '2332fca6fc489523b7c05e834cc984e78b66cd98eca20e3a5dee0d9a32b199d9' + 'f43a7872f01f35f61588d4f8068ac511635e13689e8a103d05d774e812a26390' + '6c4305b9d9629bf29a1d7363cb4513fc00f1a9f18c2aba40ddd8575bc30a7de8' + '6b9122aab9713c428f1b2747d6c4698f14e180295c8860491bc244c539fd978d' + '1c757a92c56075faf81de961afe4b4bdd8ac6cf370ca96f5cd5cd0d26e72989a' + '862aad7b061b7c311d7d7f402a810dd4cf4c28b044382cd504c4f685620565d2' + '549a2112ba255ab0e85f5d1b129fa73fdf3460ad95f7b283e3cabfbe5b77e259' + 'bf350d46e0964ef02a850cdcc1aed819fd1a2c5c5b6ad0c67420d2ee8cdfc5ab' + '8c975c759beea555cd903c1d71a5be70680c0eb0e1cad03357d42a316a7bb4e2' + '0930e47328de09d121dcf12be752f69f9cd295aab39a9537145ab76aa2ce87ef' + '7f7f3d960dc220606511de7371a75b0ed73226fff0106a10bdb9bcf4660cb8ab' + '907666cfaa8dee39af665a75aba5d31ed3cb25afe0a109dbc835fc1a6e107a91' + '7b2292fdb761a8e8828846ddb1c546a16563694ce756d0eaa8c8bca688f7c6bc' + '0b9888dce68e14fb6d61078f6824bc2dc53db3c21874234d37cf768706f34780' + 'c637125ad6d1ad2d5b446514a056a8f3484a03e6498ad435986ca1681b665bcd' + 'f9a5c0e767373240b3b10257dd79ee69c57a7c3bbf105572f17d20ffffd0e71b' + '5a8ac29ceead5188ceeac1e977c278b06f404616f6ee2b73315ce5b342b41101' + '86cb5e8bb928b3d44e94518676fe84812266c162c177bb63298600ee66a5aac1' + '53d7abdcab7468f2f533bef95807bd6440e796acb98e28fdd301dc49c72ffa11' + 'd9e3b4eec13e7429cfb802cf0bc141a72493f4041a1980e647a9fdde66103b24' + 'cf0aad01ff9a3c8a8aa7b3123ef5bf7556da254e1b1559fd5e4c4cc767f5e9fe' + 'f3516d8cda209ede9666f910ae195b09f322a1b6b691da09c2cd37cc4a74ef5d' + 'f9e0e23409a7704a56b5cefc71b940908e24d50af7d1e4d43e2b4bc771beee6f' + '50a587c6e522392a6a5025cab19eaf80332e80a057edd1cf2932c61475c82674' + '8d85abf5898041f5a7a782c4ad53d18a65c1f45c912f32e354f34d4feeaca4c2' + '5d4f1e034640810762f90e7248f7cb0d2633dffcb12229cca6d9b4d91be1f36d' + 'cb821b7610c3182b5a5a49e0b398b4f9962f005425c400c91a9584ed62429dd4' + '82c84081b6e4231afca58bbca54a96afc5247e90d04fc717f077f2c7d10f479c' + 'dcc825a5ce8c284284409cec95ba00f233f01ca5db9fadae2b75b1c75e2005ad' + 'e9f294e34a5ce3cf21f62fa00a1ebc5a86cbdc4a5f741bafc2c9c7d3078236d9' + 'e429c7b86f02f5489870f4a0f843dcc45fb8820a78de5ae737d70a6832da26e0' + '1805851653b3c5854eeabb4a988771a141aa19705434de4804fde3547385c33d' + 'ed55c79b2208fe9a7bac356d7efefba8dd991f273696df91b2a4e0ddb2127337' + '4868b72e6e841b1ee35da1967f29a36f5bfd46a693b37e203a593def383c491a' + 'de7ebffd12968c02e35d97f23700a6b2d38858acdb32297ea3eb3bd5c68bcf7f' + '046973fc1f8e304f7b42eb12a941aea1774344546dae2eddf291d5316ebc52fb' + '6b20edf1e4c0985e696fa528f6e70b7a95a43e8903459958e851d1cf3604d9bd' + 'a134c8f29283cfd0be606875dbe064074ac133e15b5310ef4e2b985dae6b6395' + 'd22f29e3fd0e11c058474ca85896ba0a658a065105bc7f146de3af8bd19a7d94' + 'c37cdbd0634e765522114d98d10401ca6de2b9cb565faa34983edc9876ffa99e' + '781e1086b35bf01356be38cc7423ca085aaf3c8214abf5b06066aee28ced2099' + '6972ba8e5d3b9d9464a9bbff86584a26a2db9b10c40fb3d527aa30a1c88c1a1b' + '68b4e316e0c5cecf18bc5345dbe8a96b8234948cfa987defc85cea5d36986192' + '976e93218c703950db0c95982945b3ac8e6009c57d27fbdb799da9d54517ee91' + 'd9fd2cdddbb6e8c28dc21049f87c8dc03c1300cae5ad63955ced56fd0f680eda' + '41cc719c7fc3bcd29d2630b901f2faad7bf8e170312f171451cf3a61b5c0257f' + '74358c5e75d7e4128f6512445b0b2b23f64f285847d576472f89df511a0f29d7' + '25c40bd9a7df4a05e6f9fdd8649260aa9a17f5cf38f9f5ade18f16aecfaeeebf' + '6798c1522390bcd1016b9e6e33f8140afe409df3b958e5abf3d443793db5102d' + 'b07b7ac5a8b1270dd585a87e0314ce5f8ce17635bfad99607fde0e2ac009229b' + '3b6ca49f25b9f05a6851088ebae9c84892c581a64f1e96e2d8f4fde7c8212a95' + 'd724a3b38d0bc6925dabe93b37bec1359772f5c0a9d26484e79af66457ba6052' + '3466de46cd11f6b6274230b8eb8e728e52ab5aa9199fef6f753313c661af330b' + '23cb984f69c0980a1f7b844b2eb7bbb59a3b64496aa36ec9ba9103ef95704750' + 'b1a2ac707f0b7e3def515f05e27d1d869f48ad83fae82dee12a7357c911fe5d4' + 'a320cb39e544fe4ed6049f3f4f15887db06d9205b95bcb295e618da61cd9d8c8' + '03f4430a9859fc5854d3046b47c726ffc68359c8cb53a839a3702729a24c81bf' + '8bad91012efa2b2cbb7b949ab10c64afe55a54a0b7cd0c69930137657f65ea39' + '4df025b9ad492efe11e5a3822c0aa51a6d50a51ea6c0b1e2047f789b4ca1aeca' + '7af4e2f4dff1603fd6cdf457cfdf1b4975fd3d0fdeb22c739b8d975b6b093966' + 'e7d88e52ce1eb564a3d01467043cd0a3f96fce16f12a9c609663562619d74402' + '4365bbdae5bba2512f4fb31c45a11204b601dddef6653981b7378a0d0f209ae1' + '997eaf23fcfcf3cdf9e638375e8cc2b41a127385274f459165bbe5d0a3ed19b2' + '3e8c76e1a616ad5c376f7a0595eb46aa2532bd0cefef029620d10d695ec87cdc' + 'f2a77713745b403c26bb07d4f41ebc912d1e6644544a45436e7358461e93c20f' + 'ae74b93ca6887ebdc7441cb3b76b98a117c22032eae5ec2eb7632ed85c1a4881' + 'd9e682c959612bfbeb5eef78cfda1ad9659b66b0ca893416e213aac754219d92' + 'adfaa7203bde4fbca73c3e39b9b1933febee26de166371e917af1e9d8b312943' + 'b558a8f54bc751b7224f89042fe9a07251fbc47bee2fc6d1faa2ee6203464041' + 'ac70d9aacaeec765a3085f96a7d9f496f6a6a0bd25d7a0545bb1e1cfdc8eeff1' + '4418a466fb34612cbae40a20c401d1ebb457fb45c1288ec6a8fcfe4ac511b50d' + '45bc61883f8a2f460eb6e55948862fcc6701ea909ca1d46ad5213fb234441df1' + '66f57fe92ea70affb8ea385db905e968e06cd00bbd55896092ba1c4eb59729c0' + '4614595b0658b762cdbdbe422179822569408f4bbe0bb9136869b408bca9865f' + '2eb47885b1e769414955d01f9d95982eddfbd85091ff8ea3b5a7d057a780b09b' + '9299c77f7175101240c26da5bd27e9722184217fc9e22d40fe3f3031c34ccc2e' + '0c8306174abef6f93d68e9cb03cff3219f0bd719ba2060cee333c46e31fc761d' + '74524b5198e5f53b4f4e6fb35f1d3aad315c98c31b25498a052c1259c8dc0e66' + '307acd471191cc1bc3185b582b160a6d5591997dcd11dfad74f43372702c232a' + '21ca9a3b70133a1b043007cf2dc88a20f79abae5806e22826c42e69d63be51c7' + 'a9e5b7f4ad4f30197dc49865e003c8cdd3f91fe84794c0f8859327f0f65691cf' + '59e62e3eb5d6c063e76efdf27a9d83432ec414a209d84213cc73c2e8c1a0ff0a' + '6dd687e2b2f0c86632576bb4694e37aece4415fa0aa34f3ffb4df831ae14cc95' + '5ff4d1451a9c2263da2048ce5a119045684c0e1df515cec79be5805840476f39' + 'e5f13e8a0091acfcf1188a8df7fda57af07e58691c753a6c3e5a6d1b362e7334' + '4a1be81dfb0b125de42f2693f5e894f47ff51cd2c54ba4f4ab5230e09220e80c' + 'dfc156c188f52784245685227828ef13faba91a9538a8e5c7674660cf157932c' + '802ad053329bd2777210710bbea6e858156218a8a616deec189aaccd435efd3c' + '7eaad18beef61cc14ba0c071a5a1405dce0ff5d5dbf0f7b73fcdf673447420d4' + '38419e4e020b0e9009dfcce3ea2ca6e2eea7d453bdce2b1ce91e2d9086cc9699' + 'f5de311fb8e08196ef3911d51774cd870151bc6441ca68e123ec780c2b9cfdb0' + '109413c70c420aa11e128386812ccc52dad2d5b84453e423337707647d44d11d' + 'ed8b4767eb1c6e0d7e7090be0519186267d65bfd5d968f9daac8ddca87aa636b' + 'd13ed8ec80832dbb792b199b7051100d08653709a1669fc5f8757ef7e34fa782' + '040d4af08e5f2504516dfeb44db97b4861bbddc4331bfbaa9eea8fa53f5a359d' + '82cb253fcd548bee5a6cbe50ce950d495d3b61b566d89a32acaa28193fba0366' + '84dfc4b02ba421a97284f85d27c678cfac88c3bc9333605610e5e32345d35c4d' + 'f546cea22ea158efa8d7b0923a592260acd6e3f393725ef2189487fe75c5fa8a' + 'dabb4c997a32be8f70e7cb7af2c8e70e8ad6871383db1a80ff37320163e9a4c4' + '76b9b05a0374de6d3b08f6fb6523e2ac822fb99e0ce8a4c9e009e2ecedc531f4' + '07684ccba1c7093d8f8f35dbe837363192971d75622a161139f09315e3a42186' + 'c4b5210a1355e104d4236dc1c58c95196385efe19231673b061683a53c2a15fb' + 'c8a1d0847d655b4b4b44413f4d63212b737099ed063e4763562c309070338d70' + '590cd4f64ae314d7d93dee9e45128f7b8939374da1d0f42cdd13b728c1a05a40' + '717b8ecc7f66026c6993668e80605db9f421524d201aff6b68b0485422d38fd1' + '9732ebc55f915527f210264f4a11cc99f91a3e6a8ac664885b5dbe7fd80e7c76' + '5540c54f42b5eacc3a2a3bad0ebef62a0190fa24a8f1e27f0cc5472b6978375f' + '6e7716145c3f8ddcf6b9698fd1a7e88b836998b4a35c515df716e196cc9ccf42' + '84ff3e4176171fcff27559e1831782ea15e89c2c9e209726b4f6e68555bfb078' + 'f059c5b2d606cda70ce3b8a6c80a9d3789782d0b5a4ab51ed6fe7ae6a182c464')