From 3f6dd6cf5e2ed0885e51fccdc6cd3b737d480dcc Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Thu, 1 Jul 2021 18:18:04 +0530 Subject: [PATCH] python3.9: update to v3.9.6 --- ...1-make-_sysconfigdata.py-relocatable.patch | 2 +- .../0002-restore-setup-config.patch | 10 +- .../0003-MINGW-BASE-use-NT-thread-model.patch | 32 +-- ...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 | 6 +- ...0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch | 6 +- .../0009-MINGW-init-system-calls.patch | 4 +- ...INGW-build-in-windows-modules-winreg.patch | 6 +- ...etermine-if-pwdmodule-should-be-used.patch | 6 +- ...ler-customize-mingw-cygwin-compilers.patch | 2 +- ...0013-MINGW-compiler-enable-new-dtags.patch | 2 +- ...-Mingw-recognition-to-pyport.h-to-al.patch | 2 +- ...015-MINGW-configure-for-shared-build.patch | 8 +- .../0016-MINGW-dynamic-loading-support.patch | 12 +- ...nore-main-program-for-frozen-scripts.patch | 8 +- ...-MINGW-setup-_multiprocessing-module.patch | 2 +- .../0019-MINGW-setup-select-module.patch | 2 +- ...up-_ctypes-module-with-system-libffi.patch | 2 +- ...ct-winsock2-and-setup-_socket-module.patch | 14 +- ...0022-MINGW-exclude-unix-only-modules.patch | 2 +- ...NGW-setup-msvcrt-and-_winapi-modules.patch | 2 +- ...0024-MINGW-build-extensions-with-GCC.patch | 2 +- ...2CCompiler-as-default-compiler-for-m.patch | 2 +- .../0026-MINGW-find-import-library.patch | 2 +- .../0027-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 +- ...ular-dependency-from-time-module-dur.patch | 2 +- ...tion-of-posix-build-in-distutils-sys.patch | 2 +- .../0033-MINGW-customize-site.patch | 2 +- .../0034-add-python-config-sh.patch | 2 +- .../0035-cross-darwin-feature.patch | 14 +- ...036-py3k-mingw-ntthreads-vs-pthreads.patch | 2 +- .../0037-mingw-system-libffi.patch | 2 +- ...sys-mingw-prefer-unix-sep-if-MSYSTEM.patch | 2 +- .../0039-mingw-use-posix-getpath.patch | 26 +-- ...mingw-add-ModuleFileName-dir-to-PATH.patch | 6 +- ...dd-BUILDIN_WIN32_MODULEs-time-msvcrt.patch | 2 +- ...s-cygwin-semi-native-build-sysconfig.patch | 6 +- .../0043-mingw-sysconfig-like-posix.patch | 2 +- ..._builtin_for_Popen_in_cygwinccompile.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 +- .../0048-allow-static-tcltk.patch | 2 +- .../0049-mingw-pdcurses_ISPAD.patch | 2 +- mingw-w64-python3.9/0050-grammar-fixes.patch | 2 +- mingw-w64-python3.9/0051-builddir-fixes.patch | 4 +- ...sys-monkeypatch-os-system-via-sh-exe.patch | 2 +- ...place-slashes-used-in-io-redirection.patch | 2 +- .../0054-mingw-install-layout-as-posix.patch | 2 +- .../0055-remove_path_max.default.patch | 2 +- .../0056-dont-link-with-gettext.patch | 6 +- .../0057-ctypes-python-dll.patch | 2 +- .../0058-gdbm-module-includes.patch | 2 +- .../0059-use-gnu_printf-in-format.patch | 2 +- ...w-fix-ssl-dont-use-enum_certificates.patch | 2 +- .../0061-mingw-build-optimized-ext.patch | 2 +- ...mpiler-dont-strip-modules-if-pydebug.patch | 2 +- ...fix-using-dllhandle-and-winver-mingw.patch | 2 +- ...0064-mingw-add-LIBPL-to-library-dirs.patch | 2 +- ...-config-so-msvccompiler-get_build_ve.patch | 2 +- ...6-MINGW-link-with-additional-library.patch | 6 +- mingw-w64-python3.9/0067-install-msilib.patch | 4 +- ...068-dont-include-system-ncurses-path.patch | 6 +- .../0069-fix-signal-module-build.patch | 2 +- .../0070-build-winconsoleio.patch | 2 +- .../0071-expose-sem_unlink.patch | 2 +- mingw-w64-python3.9/0072-cygpty-isatty.patch | 8 +- .../0073-disable-broken-gdbm-module.patch | 2 +- ...win-resource-files-and-build-pythonw.patch | 8 +- .../0075-3.7-mpdec-mingw.patch | 2 +- .../0076-disable-readline.patch | 2 +- .../0077-fix-isselectable.patch | 2 +- ...78-use-_wcsnicmp-instead-wcsncasecmp.patch | 4 +- .../0079-_xxsubinterpretersmodule.patch | 2 +- .../0080-sqlite3-module-defines.patch | 2 +- .../0081-configure-have-inet-pton.patch | 6 +- .../0082-fix-msvc9-import.patch | 2 +- .../0083-set-venv-activate-path-unix.patch | 2 +- .../0084-venv-creation-fixes.patch | 2 +- .../0085-pass-gen-profile-ldflags.patch | 4 +- ...tutils-add-windmc-to-cygwinccompiler.patch | 2 +- ...indows-must-link-ext-with-python-lib.patch | 6 +- .../0088-importlib-bootstrap-path-sep.patch | 4 +- .../0089-pathlib-path-sep.patch | 4 +- mingw-w64-python3.9/0090-warnings-fixes.patch | 6 +- .../0091-fix-build-testinternalcapi.patch | 2 +- .../0092-extend-MS_WINDOWS-flag.patch | 2 +- mingw-w64-python3.9/0093-clang-arm64.patch | 2 +- .../0094-MINGW-stack-reserve.patch | 6 +- ...Add-support-for-Windows-7-Python-3.9.patch | 6 +- ...097-Don-t-use-os.pathsep-to-find-EOF.patch | 2 +- ...ion-suffix-for-c-extensions-on-mingw.patch | 14 +- ...latform-method-in-sysconfig-and-dist.patch | 2 +- mingw-w64-python3.9/PKGBUILD | 202 +++++++++--------- 99 files changed, 303 insertions(+), 303 deletions(-) diff --git a/mingw-w64-python3.9/0001-make-_sysconfigdata.py-relocatable.patch b/mingw-w64-python3.9/0001-make-_sysconfigdata.py-relocatable.patch index 140391974b..119d5ccdd5 100644 --- a/mingw-w64-python3.9/0001-make-_sysconfigdata.py-relocatable.patch +++ b/mingw-w64-python3.9/0001-make-_sysconfigdata.py-relocatable.patch @@ -1,4 +1,4 @@ -From 6a1ea73cdc8c8d00b196fa6319b352d1a7196e2f Mon Sep 17 00:00:00 2001 +From 601fde65f126300e8fd67ec491cbbbf4ecda0571 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:51:10 +0530 Subject: [PATCH 001/N] make _sysconfigdata.py relocatable diff --git a/mingw-w64-python3.9/0002-restore-setup-config.patch b/mingw-w64-python3.9/0002-restore-setup-config.patch index 62a42daf46..c268c922cf 100644 --- a/mingw-w64-python3.9/0002-restore-setup-config.patch +++ b/mingw-w64-python3.9/0002-restore-setup-config.patch @@ -1,4 +1,4 @@ -From 4116e31a23d6b32e61ccae0b444a03aa581a6348 Mon Sep 17 00:00:00 2001 +From 65c19d285901d1791ae1bc3628550c9c4db948c1 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 0c3981c..7f591e3 100644 +index 2b68571..f738b3b 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -714,10 +714,12 @@ oldsharedmods: $(SHAREDMODS) @@ -56,10 +56,10 @@ index 0000000..5c1299d +# based on configure-time options. + diff --git a/configure.ac b/configure.ac -index b1e4c6c..a5ca784 100644 +index 8fe5fa5..6ae56e1 100644 --- a/configure.ac +++ b/configure.ac -@@ -5825,7 +5825,7 @@ AC_DEFINE_UNQUOTED(PY_BUILTIN_HASHLIB_HASHES, "$default_hashlib_hashes") +@@ -5844,7 +5844,7 @@ AC_DEFINE_UNQUOTED(PY_BUILTIN_HASHLIB_HASHES, "$default_hashlib_hashes") ]) # generate output files @@ -68,7 +68,7 @@ index b1e4c6c..a5ca784 100644 AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix]) AC_OUTPUT -@@ -5837,7 +5837,7 @@ fi +@@ -5856,7 +5856,7 @@ fi echo "creating Makefile" >&AS_MESSAGE_FD $SHELL $srcdir/Modules/makesetup -c $srcdir/Modules/config.c.in \ diff --git a/mingw-w64-python3.9/0003-MINGW-BASE-use-NT-thread-model.patch b/mingw-w64-python3.9/0003-MINGW-BASE-use-NT-thread-model.patch index a8d186ecb1..6f354d3538 100644 --- a/mingw-w64-python3.9/0003-MINGW-BASE-use-NT-thread-model.patch +++ b/mingw-w64-python3.9/0003-MINGW-BASE-use-NT-thread-model.patch @@ -1,4 +1,4 @@ -From 40e31674ce05a531746af50cac90b53ad0bb7cab Mon Sep 17 00:00:00 2001 +From 51eb50d174eed9942b5edb3f227e1866d9eee092 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 @@ -30,10 +30,10 @@ index fe78135..344b76e 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 a5ca784..ff84557 100644 +index 6ae56e1..005fc8f 100644 --- a/configure.ac +++ b/configure.ac -@@ -2037,6 +2037,46 @@ then +@@ -2040,6 +2040,46 @@ then BASECFLAGS="$BASECFLAGS $ac_arch_flags" fi @@ -80,7 +80,7 @@ index a5ca784..ff84557 100644 # On some compilers, pthreads are available without further options # (e.g. MacOS X). On some of these systems, the compiler will not # complain if unaccepted options are passed (e.g. gcc on Mac OS X). -@@ -2155,6 +2195,8 @@ CC="$ac_save_cc"]) +@@ -2158,6 +2198,8 @@ CC="$ac_save_cc"]) AC_MSG_RESULT($ac_cv_pthread) fi @@ -89,7 +89,7 @@ index a5ca784..ff84557 100644 # If we have set a CC compiler flag for thread support then # check if it works for CXX, too. ac_cv_cxx_thread=no -@@ -2175,6 +2217,10 @@ elif test "$ac_cv_pthread" = "yes" +@@ -2178,6 +2220,10 @@ elif test "$ac_cv_pthread" = "yes" then CXX="$CXX -pthread" ac_cv_cxx_thread=yes @@ -100,7 +100,7 @@ index a5ca784..ff84557 100644 fi if test $ac_cv_cxx_thread = yes -@@ -2207,8 +2253,8 @@ dnl AC_MSG_RESULT($cpp_type) +@@ -2210,8 +2256,8 @@ dnl AC_MSG_RESULT($cpp_type) AC_HEADER_STDC AC_CHECK_HEADERS(asm/types.h crypt.h conio.h direct.h dlfcn.h errno.h \ fcntl.h grp.h \ @@ -111,7 +111,7 @@ index a5ca784..ff84557 100644 utime.h \ poll.h sys/devpoll.h sys/epoll.h sys/poll.h \ sys/audioio.h sys/xattr.h sys/bsdtty.h sys/event.h sys/file.h sys/ioctl.h \ -@@ -2222,6 +2268,14 @@ sys/endian.h sys/sysmacros.h linux/memfd.h linux/wait.h sys/memfd.h sys/mman.h) +@@ -2225,6 +2271,14 @@ sys/endian.h sys/sysmacros.h linux/memfd.h linux/wait.h sys/memfd.h sys/mman.h) AC_HEADER_DIRENT AC_HEADER_MAJOR @@ -126,7 +126,7 @@ index a5ca784..ff84557 100644 # bluetooth/bluetooth.h has been known to not compile with -std=c99. # http://permalink.gmane.org/gmane.linux.bluez.kernel/22294 SAVE_CFLAGS=$CFLAGS -@@ -2419,6 +2473,10 @@ fi +@@ -2422,6 +2476,10 @@ fi AC_MSG_CHECKING(for pthread_t) have_pthread_t=no @@ -137,7 +137,7 @@ index a5ca784..ff84557 100644 AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[#include ]], [[pthread_t x; x = *(pthread_t*)0;]]) ],[have_pthread_t=yes],[]) -@@ -2449,6 +2507,7 @@ if test "$ac_cv_sizeof_pthread_key_t" -eq "$ac_cv_sizeof_int" ; then +@@ -2452,6 +2510,7 @@ if test "$ac_cv_sizeof_pthread_key_t" -eq "$ac_cv_sizeof_int" ; then else AC_MSG_RESULT(no) fi @@ -145,7 +145,7 @@ index a5ca784..ff84557 100644 CC="$ac_save_cc" AC_SUBST(OTHER_LIBTOOL_OPT) -@@ -2894,10 +2953,15 @@ void *x = uuid_enc_be +@@ -2897,10 +2956,15 @@ void *x = uuid_enc_be [AC_MSG_RESULT(no)] ) @@ -161,7 +161,7 @@ index a5ca784..ff84557 100644 # check if we need libintl for locale functions AC_CHECK_LIB(intl, textdomain, -@@ -3229,6 +3293,11 @@ then +@@ -3232,6 +3296,11 @@ then CXX="$CXX -pthread" fi posix_threads=yes @@ -173,7 +173,7 @@ index a5ca784..ff84557 100644 else if test ! -z "$withval" -a -d "$withval" then LDFLAGS="$LDFLAGS -L$withval" -@@ -3689,6 +3758,15 @@ else +@@ -3692,6 +3761,15 @@ else fi # checks for library functions @@ -189,7 +189,7 @@ index a5ca784..ff84557 100644 AC_CHECK_FUNCS(alarm accept4 setitimer getitimer bind_textdomain_codeset chown \ clock confstr copy_file_range ctermid dup3 execv explicit_bzero explicit_memset \ faccessat fchmod fchmodat fchown fchownat \ -@@ -4610,6 +4688,10 @@ AC_CHECK_DECLS([isinf, isnan, isfinite], [], [], [[#include ]]) +@@ -4613,6 +4691,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. @@ -200,7 +200,7 @@ index a5ca784..ff84557 100644 AC_MSG_CHECKING(whether POSIX semaphores are enabled) AC_CACHE_VAL(ac_cv_posix_semaphores_enabled, AC_RUN_IFELSE([AC_LANG_SOURCE([[ -@@ -4643,6 +4725,14 @@ fi +@@ -4646,6 +4728,14 @@ fi # Multiprocessing check for broken sem_getvalue AC_MSG_CHECKING(for broken sem_getvalue) @@ -216,10 +216,10 @@ index a5ca784..ff84557 100644 AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include diff --git a/pyconfig.h.in b/pyconfig.h.in -index 8510c87..e84708e 100644 +index 6358e56..5f63cae 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in -@@ -1355,6 +1355,9 @@ +@@ -1359,6 +1359,9 @@ /* Define if mvwdelch in curses.h is an expression. */ #undef MVWDELCH_IS_EXPRESSION diff --git a/mingw-w64-python3.9/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch b/mingw-w64-python3.9/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch index d4efd8817a..bf0b6159c7 100644 --- a/mingw-w64-python3.9/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch +++ b/mingw-w64-python3.9/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch @@ -1,4 +1,4 @@ -From c0de4a6d61bbf0d860b2b0fa619a229e26147bd6 Mon Sep 17 00:00:00 2001 +From 42ac5c820eafdec381202e36f73ce50b588ce8a7 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-python3.9/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch b/mingw-w64-python3.9/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch index d8d990e484..1d90fd3be1 100644 --- a/mingw-w64-python3.9/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch +++ b/mingw-w64-python3.9/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch @@ -1,4 +1,4 @@ -From 79fa18e79ac161d80ff9ab6699c06c26137aaaee Mon Sep 17 00:00:00 2001 +From fa68425708485de2cea225d6c3ff58bff6965ab5 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 @@ -31,7 +31,7 @@ index 81a0f7a..636b0a8 100644 #define PLATFORM "unknown" #endif diff --git a/configure.ac b/configure.ac -index ff84557..e1e4ccb 100644 +index 005fc8f..ecdf22d 100644 --- a/configure.ac +++ b/configure.ac @@ -383,6 +383,17 @@ AC_DEFINE_UNQUOTED(_PYTHONFRAMEWORK, "${PYTHONFRAMEWORK}", [framework name]) diff --git a/mingw-w64-python3.9/0006-MINGW-preset-configure-defaults.patch b/mingw-w64-python3.9/0006-MINGW-preset-configure-defaults.patch index ed49649433..144c4f1248 100644 --- a/mingw-w64-python3.9/0006-MINGW-preset-configure-defaults.patch +++ b/mingw-w64-python3.9/0006-MINGW-preset-configure-defaults.patch @@ -1,4 +1,4 @@ -From 8e857fbb3aae73e0c64893be92094f86f86faaff Mon Sep 17 00:00:00 2001 +From 7c50215fdb389f4c094e15411732fe218b4fa261 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 e1e4ccb..bdfe905 100644 +index ecdf22d..6058002 100644 --- a/configure.ac +++ b/configure.ac @@ -920,6 +920,28 @@ if test x$MULTIARCH != x; then diff --git a/mingw-w64-python3.9/0007-MINGW-configure-largefile-support-for-windows-builds.patch b/mingw-w64-python3.9/0007-MINGW-configure-largefile-support-for-windows-builds.patch index 262f920843..c743829006 100644 --- a/mingw-w64-python3.9/0007-MINGW-configure-largefile-support-for-windows-builds.patch +++ b/mingw-w64-python3.9/0007-MINGW-configure-largefile-support-for-windows-builds.patch @@ -1,4 +1,4 @@ -From 41ae0ae95098c28faeb4510637eeca828cf59b2d Mon Sep 17 00:00:00 2001 +From c4ec9b26b76ebaa442ed3ae3fa10442869e66038 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,10 +14,10 @@ Co-authored-by: Christoph Reiter 1 file changed, 12 insertions(+) diff --git a/configure.ac b/configure.ac -index bdfe905..8471604 100644 +index 6058002..4c964ae 100644 --- a/configure.ac +++ b/configure.ac -@@ -2484,8 +2484,20 @@ AC_CHECK_SIZEOF(off_t, [], [ +@@ -2487,8 +2487,20 @@ AC_CHECK_SIZEOF(off_t, [], [ ]) AC_MSG_CHECKING(whether to enable large file support) diff --git a/mingw-w64-python3.9/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch b/mingw-w64-python3.9/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch index 6a37709757..8a3d7b5e5c 100644 --- a/mingw-w64-python3.9/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch +++ b/mingw-w64-python3.9/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch @@ -1,4 +1,4 @@ -From dc17d51b15cf63c5235984e7cb74f2560c2f590e Mon Sep 17 00:00:00 2001 +From 8dbbd779f9d2b7d01bc143deb70f3e522978f0b8 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 8471604..2230067 100644 +index 4c964ae..f335c48 100644 --- a/configure.ac +++ b/configure.ac -@@ -5623,8 +5623,21 @@ do +@@ -5642,8 +5642,21 @@ do THREADHEADERS="$THREADHEADERS \$(srcdir)/$h" done diff --git a/mingw-w64-python3.9/0009-MINGW-init-system-calls.patch b/mingw-w64-python3.9/0009-MINGW-init-system-calls.patch index c757351576..c7a18c9280 100644 --- a/mingw-w64-python3.9/0009-MINGW-init-system-calls.patch +++ b/mingw-w64-python3.9/0009-MINGW-init-system-calls.patch @@ -1,4 +1,4 @@ -From 0404a199cbe3adb2fa425c5fd070e0fe7fe55ff1 Mon Sep 17 00:00:00 2001 +From c6e239410fcc24e73eb239b391b5670f7ec41c2f 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 @@ -101,7 +101,7 @@ index c984e2e..3f3e1f3 100644 static PyObject * convertenviron(void) diff --git a/configure.ac b/configure.ac -index 2230067..d8977f7 100644 +index f335c48..19c3ec2 100644 --- a/configure.ac +++ b/configure.ac @@ -601,6 +601,14 @@ then diff --git a/mingw-w64-python3.9/0010-MINGW-build-in-windows-modules-winreg.patch b/mingw-w64-python3.9/0010-MINGW-build-in-windows-modules-winreg.patch index e2f8480adc..63e63c3c0a 100644 --- a/mingw-w64-python3.9/0010-MINGW-build-in-windows-modules-winreg.patch +++ b/mingw-w64-python3.9/0010-MINGW-build-in-windows-modules-winreg.patch @@ -1,4 +1,4 @@ -From 9329bd4f6860fe9664a6629465c8242288513073 Mon Sep 17 00:00:00 2001 +From d00c155c97977adb8109f0764efb1100d6079800 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,10 +57,10 @@ index fd1ccb7..b6f1a8f 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 d8977f7..b78a9b4 100644 +index 19c3ec2..e307fe3 100644 --- a/configure.ac +++ b/configure.ac -@@ -3323,6 +3323,13 @@ else +@@ -3326,6 +3326,13 @@ else fi]) AC_MSG_RESULT($with_dbmliborder) diff --git a/mingw-w64-python3.9/0011-MINGW-determine-if-pwdmodule-should-be-used.patch b/mingw-w64-python3.9/0011-MINGW-determine-if-pwdmodule-should-be-used.patch index b26471bdc7..58ff71c09b 100644 --- a/mingw-w64-python3.9/0011-MINGW-determine-if-pwdmodule-should-be-used.patch +++ b/mingw-w64-python3.9/0011-MINGW-determine-if-pwdmodule-should-be-used.patch @@ -1,4 +1,4 @@ -From 606adec077293ec07b9f5f6f28a0b830dd0bae2a Mon Sep 17 00:00:00 2001 +From 40d6aaa0260b733a5bb004fd90287148e09a249c 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,10 +43,10 @@ index 612cabd..d071a74 100644 @USE_WIN32_MODULE@winreg ../PC/winreg.c diff --git a/configure.ac b/configure.ac -index b78a9b4..5320f26 100644 +index e307fe3..52b3120 100644 --- a/configure.ac +++ b/configure.ac -@@ -3330,6 +3330,13 @@ case $host in +@@ -3333,6 +3333,13 @@ case $host in *-*-mingw*) USE_WIN32_MODULE=;; esac diff --git a/mingw-w64-python3.9/0012-MINGW-compiler-customize-mingw-cygwin-compilers.patch b/mingw-w64-python3.9/0012-MINGW-compiler-customize-mingw-cygwin-compilers.patch index c0d3c02c31..b5fd650acb 100644 --- a/mingw-w64-python3.9/0012-MINGW-compiler-customize-mingw-cygwin-compilers.patch +++ b/mingw-w64-python3.9/0012-MINGW-compiler-customize-mingw-cygwin-compilers.patch @@ -1,4 +1,4 @@ -From 8063c2d1bef0aa75fdeac5f768fd2669f3f08f7a Mon Sep 17 00:00:00 2001 +From 2f233ca6cfa1122c784219e130e50ce9d0276777 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-python3.9/0013-MINGW-compiler-enable-new-dtags.patch b/mingw-w64-python3.9/0013-MINGW-compiler-enable-new-dtags.patch index dddd60e57a..5e46bbea97 100644 --- a/mingw-w64-python3.9/0013-MINGW-compiler-enable-new-dtags.patch +++ b/mingw-w64-python3.9/0013-MINGW-compiler-enable-new-dtags.patch @@ -1,4 +1,4 @@ -From 4d87fad7b9ab33833ec986fd9434181f2c762629 Mon Sep 17 00:00:00 2001 +From d96bd363de3b94dccbe4e685796c5fd482fac63d 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-python3.9/0014-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch b/mingw-w64-python3.9/0014-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch index 1f989a2aff..b5e8cb1bca 100644 --- a/mingw-w64-python3.9/0014-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch +++ b/mingw-w64-python3.9/0014-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch @@ -1,4 +1,4 @@ -From 128ba7236216058f94f7030245dcacd09c82de1e Mon Sep 17 00:00:00 2001 +From 5cf0ca1ebaec17df425a2b2829f6520e355f81cc 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-python3.9/0015-MINGW-configure-for-shared-build.patch b/mingw-w64-python3.9/0015-MINGW-configure-for-shared-build.patch index c39dcdd09e..de3942af82 100644 --- a/mingw-w64-python3.9/0015-MINGW-configure-for-shared-build.patch +++ b/mingw-w64-python3.9/0015-MINGW-configure-for-shared-build.patch @@ -1,4 +1,4 @@ -From 391120bfde1bea508237ae8478e75064f9e423b0 Mon Sep 17 00:00:00 2001 +From 914f08e27ac82a95ce0ddedfbb15d53415406050 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 5320f26..a55413f 100644 +index 52b3120..592b61a 100644 --- a/configure.ac +++ b/configure.ac @@ -1240,6 +1240,13 @@ if test $enable_shared = "yes"; then @@ -41,7 +41,7 @@ index 5320f26..a55413f 100644 fi if test "$cross_compiling" = yes; then -@@ -2840,6 +2851,12 @@ then +@@ -2843,6 +2854,12 @@ then LDCXXSHARED="g++ -shared -Wl,--enable-auto-image-base";; *) LDSHARED="ld";; esac @@ -54,7 +54,7 @@ index 5320f26..a55413f 100644 fi AC_MSG_RESULT($LDSHARED) LDCXXSHARED=${LDCXXSHARED-$LDSHARED} -@@ -5651,7 +5668,8 @@ case $host in +@@ -5670,7 +5687,8 @@ case $host in dnl "errmap.h" from $srcdir/PC. dnl Note we cannot use BASECPPFLAGS as autogenerated pyconfig.h dnl has to be before customized located in ../PC. diff --git a/mingw-w64-python3.9/0016-MINGW-dynamic-loading-support.patch b/mingw-w64-python3.9/0016-MINGW-dynamic-loading-support.patch index f81a27baf0..c87ab362f0 100644 --- a/mingw-w64-python3.9/0016-MINGW-dynamic-loading-support.patch +++ b/mingw-w64-python3.9/0016-MINGW-dynamic-loading-support.patch @@ -1,4 +1,4 @@ -From 35fc50f08aa08c33ff0ac6b1a034269ef9d6f067 Mon Sep 17 00:00:00 2001 +From ae8ad2a897af02bb36b723276f7382c5dd240447 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, 28 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 7f591e3..71d0056 100644 +index f738b3b..9f2475d 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -823,6 +823,12 @@ Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile @@ -59,10 +59,10 @@ index 81787e5..9d7690e 100644 /* restore old error mode settings */ diff --git a/configure.ac b/configure.ac -index a55413f..16b8e96 100644 +index 592b61a..dfe55ad 100644 --- a/configure.ac +++ b/configure.ac -@@ -2715,6 +2715,9 @@ if test -z "$SHLIB_SUFFIX"; then +@@ -2718,6 +2718,9 @@ if test -z "$SHLIB_SUFFIX"; then CYGWIN*) SHLIB_SUFFIX=.dll;; *) SHLIB_SUFFIX=.so;; esac @@ -72,7 +72,7 @@ index a55413f..16b8e96 100644 fi AC_MSG_RESULT($SHLIB_SUFFIX) -@@ -3828,6 +3831,12 @@ then +@@ -3831,6 +3834,12 @@ then fi ;; esac @@ -85,7 +85,7 @@ index a55413f..16b8e96 100644 fi AC_MSG_RESULT($DYNLOADFILE) if test "$DYNLOADFILE" != "dynload_stub.o" -@@ -5648,6 +5657,12 @@ case "$ac_cv_computed_gotos" in yes*) +@@ -5667,6 +5676,12 @@ case "$ac_cv_computed_gotos" in yes*) AC_DEFINE(HAVE_COMPUTED_GOTOS, 1, [Define if the C compiler supports computed gotos.]) esac diff --git a/mingw-w64-python3.9/0017-MINGW-ignore-main-program-for-frozen-scripts.patch b/mingw-w64-python3.9/0017-MINGW-ignore-main-program-for-frozen-scripts.patch index 4c911ac872..cc205a5a78 100644 --- a/mingw-w64-python3.9/0017-MINGW-ignore-main-program-for-frozen-scripts.patch +++ b/mingw-w64-python3.9/0017-MINGW-ignore-main-program-for-frozen-scripts.patch @@ -1,4 +1,4 @@ -From ec428fdd03d073280e6e335e2b94e5a57e2cba79 Mon Sep 17 00:00:00 2001 +From 5230e91dc7c783925a609e8fec18955546a0cbe7 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 71d0056..f58b701 100644 +index 9f2475d..223a266 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -352,7 +352,7 @@ PYTHON_OBJS= \ @@ -27,10 +27,10 @@ index 71d0056..f58b701 100644 Python/getargs.o \ Python/getcompiler.o \ diff --git a/configure.ac b/configure.ac -index 16b8e96..f7d668a 100644 +index dfe55ad..ccc558e 100644 --- a/configure.ac +++ b/configure.ac -@@ -5688,6 +5688,16 @@ case $host in +@@ -5707,6 +5707,16 @@ case $host in ;; esac diff --git a/mingw-w64-python3.9/0018-MINGW-setup-_multiprocessing-module.patch b/mingw-w64-python3.9/0018-MINGW-setup-_multiprocessing-module.patch index e3f259dcf4..6020e8f266 100644 --- a/mingw-w64-python3.9/0018-MINGW-setup-_multiprocessing-module.patch +++ b/mingw-w64-python3.9/0018-MINGW-setup-_multiprocessing-module.patch @@ -1,4 +1,4 @@ -From aab5093a1e1fa6e96d97b693319e705a5428395f Mon Sep 17 00:00:00 2001 +From ad9ea63b35c8eb32a43f69530ebc798b5ac12553 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-python3.9/0019-MINGW-setup-select-module.patch b/mingw-w64-python3.9/0019-MINGW-setup-select-module.patch index ba68077b6e..1883143880 100644 --- a/mingw-w64-python3.9/0019-MINGW-setup-select-module.patch +++ b/mingw-w64-python3.9/0019-MINGW-setup-select-module.patch @@ -1,4 +1,4 @@ -From 756659799bc95a9c798fcdf772899518fce6f04a Mon Sep 17 00:00:00 2001 +From d8df9cbea83b1d7c1cd27cd1ab52feb6b6a882f7 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-python3.9/0020-MINGW-setup-_ctypes-module-with-system-libffi.patch b/mingw-w64-python3.9/0020-MINGW-setup-_ctypes-module-with-system-libffi.patch index d7711dbaa5..3006e0ebd8 100644 --- a/mingw-w64-python3.9/0020-MINGW-setup-_ctypes-module-with-system-libffi.patch +++ b/mingw-w64-python3.9/0020-MINGW-setup-_ctypes-module-with-system-libffi.patch @@ -1,4 +1,4 @@ -From 188887b42ba6d0275fc7fed4e24651ffb5a4c343 Mon Sep 17 00:00:00 2001 +From 63b12b21aae2268da35cd557e526b241a65198c2 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-python3.9/0021-MINGW-defect-winsock2-and-setup-_socket-module.patch b/mingw-w64-python3.9/0021-MINGW-defect-winsock2-and-setup-_socket-module.patch index bcec99de3d..f7240eeba2 100644 --- a/mingw-w64-python3.9/0021-MINGW-defect-winsock2-and-setup-_socket-module.patch +++ b/mingw-w64-python3.9/0021-MINGW-defect-winsock2-and-setup-_socket-module.patch @@ -1,4 +1,4 @@ -From 4b846b0a795f43be6fcdc4b16aa8c191cc2f25e6 Mon Sep 17 00:00:00 2001 +From 9b48dc123e5baf45c7e2180d46b13ae3aaeead8b 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 8953185..d15bb4f 100644 # include "addrinfo.h" #endif diff --git a/configure.ac b/configure.ac -index f7d668a..46a7c81 100644 +index ccc558e..fc287de 100644 --- a/configure.ac +++ b/configure.ac -@@ -4439,21 +4439,36 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +@@ -4442,21 +4442,36 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ],[]) AC_MSG_RESULT($was_it_defined) @@ -105,7 +105,7 @@ index f7d668a..46a7c81 100644 [ac_cv_struct_sockaddr_storage=yes], [ac_cv_struct_sockaddr_storage=no])) AC_MSG_RESULT($ac_cv_struct_sockaddr_storage) -@@ -5578,7 +5593,10 @@ fi +@@ -5597,7 +5612,10 @@ fi AC_CHECK_TYPE(socklen_t,, AC_DEFINE(socklen_t,int, @@ -118,7 +118,7 @@ index f7d668a..46a7c81 100644 #include #endif diff --git a/pyconfig.h.in b/pyconfig.h.in -index e84708e..574189a 100644 +index 5f63cae..b69a7c7 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -54,7 +54,7 @@ @@ -130,7 +130,7 @@ index e84708e..574189a 100644 #undef HAVE_ADDRINFO /* Define to 1 if you have the `alarm' function. */ -@@ -1338,6 +1338,9 @@ +@@ -1342,6 +1342,9 @@ /* Define if libssl has X509_VERIFY_PARAM_set1_host and related function */ #undef HAVE_X509_VERIFY_PARAM_SET1_HOST @@ -140,7 +140,7 @@ index e84708e..574189a 100644 /* Define if the zlib library has inflateCopy */ #undef HAVE_ZLIB_COPY -@@ -1654,7 +1657,7 @@ +@@ -1658,7 +1661,7 @@ /* Define to `unsigned int' if does not define. */ #undef size_t diff --git a/mingw-w64-python3.9/0022-MINGW-exclude-unix-only-modules.patch b/mingw-w64-python3.9/0022-MINGW-exclude-unix-only-modules.patch index 7c54624948..f69bb3c4b8 100644 --- a/mingw-w64-python3.9/0022-MINGW-exclude-unix-only-modules.patch +++ b/mingw-w64-python3.9/0022-MINGW-exclude-unix-only-modules.patch @@ -1,4 +1,4 @@ -From e213cbcfa0d1431ffc9b702bc211b139dcc40490 Mon Sep 17 00:00:00 2001 +From 44e8fbcb587f72cbfb477128f50524cb3c1ad021 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-python3.9/0023-MINGW-setup-msvcrt-and-_winapi-modules.patch b/mingw-w64-python3.9/0023-MINGW-setup-msvcrt-and-_winapi-modules.patch index c0d15da107..01567a20ea 100644 --- a/mingw-w64-python3.9/0023-MINGW-setup-msvcrt-and-_winapi-modules.patch +++ b/mingw-w64-python3.9/0023-MINGW-setup-msvcrt-and-_winapi-modules.patch @@ -1,4 +1,4 @@ -From 20ceea30c5c1835866fc69c51367d01ac3a6b45b Mon Sep 17 00:00:00 2001 +From 78ba60f537dc443ef5bc912e650e688619b9e798 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 diff --git a/mingw-w64-python3.9/0024-MINGW-build-extensions-with-GCC.patch b/mingw-w64-python3.9/0024-MINGW-build-extensions-with-GCC.patch index 5c9662837e..6dc1bd1010 100644 --- a/mingw-w64-python3.9/0024-MINGW-build-extensions-with-GCC.patch +++ b/mingw-w64-python3.9/0024-MINGW-build-extensions-with-GCC.patch @@ -1,4 +1,4 @@ -From e1fdcc07f1b62c8c380561cfe174855d888f98dc Mon Sep 17 00:00:00 2001 +From 386008948b544e74ebe06620dc41a6a555195170 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:34 +0530 diff --git a/mingw-w64-python3.9/0025-MINGW-use-Mingw32CCompiler-as-default-compiler-for-m.patch b/mingw-w64-python3.9/0025-MINGW-use-Mingw32CCompiler-as-default-compiler-for-m.patch index bcb2e91c06..ca5bc25822 100644 --- a/mingw-w64-python3.9/0025-MINGW-use-Mingw32CCompiler-as-default-compiler-for-m.patch +++ b/mingw-w64-python3.9/0025-MINGW-use-Mingw32CCompiler-as-default-compiler-for-m.patch @@ -1,4 +1,4 @@ -From 3de841304c79b647ae07d5a4f2feb261ade5c956 Mon Sep 17 00:00:00 2001 +From 88fba0fa0fcc87ea40fbd329f5e21ab6ebbe6f29 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-python3.9/0026-MINGW-find-import-library.patch b/mingw-w64-python3.9/0026-MINGW-find-import-library.patch index bcb4627e84..7987c37ba7 100644 --- a/mingw-w64-python3.9/0026-MINGW-find-import-library.patch +++ b/mingw-w64-python3.9/0026-MINGW-find-import-library.patch @@ -1,4 +1,4 @@ -From a9a0d4789170e68d46a57a75d7c94f95ee2ba809 Mon Sep 17 00:00:00 2001 +From 193124357e5d484853f54fdc1ecc1e131bfc3794 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-python3.9/0027-MINGW-setup-_ssl-module.patch b/mingw-w64-python3.9/0027-MINGW-setup-_ssl-module.patch index 8c590b03d1..b2a0402511 100644 --- a/mingw-w64-python3.9/0027-MINGW-setup-_ssl-module.patch +++ b/mingw-w64-python3.9/0027-MINGW-setup-_ssl-module.patch @@ -1,4 +1,4 @@ -From 910384b221ffc5af984e8de945dfde1a1ed63e26 Mon Sep 17 00:00:00 2001 +From be2b7c5a9e045188cece8694358871525686d77c 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-python3.9/0028-MINGW-generalization-of-posix-build-in-sysconfig.py.patch b/mingw-w64-python3.9/0028-MINGW-generalization-of-posix-build-in-sysconfig.py.patch index 6e2868adc1..95509fdd38 100644 --- a/mingw-w64-python3.9/0028-MINGW-generalization-of-posix-build-in-sysconfig.py.patch +++ b/mingw-w64-python3.9/0028-MINGW-generalization-of-posix-build-in-sysconfig.py.patch @@ -1,4 +1,4 @@ -From 55628e9cab822879556e1bee2b1fb5cdf6960977 Mon Sep 17 00:00:00 2001 +From b29739b0545771c80eadc505b6f661b0678ed0cf 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-python3.9/0029-MINGW-support-stdcall-without-underscore.patch b/mingw-w64-python3.9/0029-MINGW-support-stdcall-without-underscore.patch index 476b23c6ab..8275227ab4 100644 --- a/mingw-w64-python3.9/0029-MINGW-support-stdcall-without-underscore.patch +++ b/mingw-w64-python3.9/0029-MINGW-support-stdcall-without-underscore.patch @@ -1,4 +1,4 @@ -From 84dfb7132e843e81cf6ace7f858b6956b4b77a48 Mon Sep 17 00:00:00 2001 +From 8353a7f30f7dc0a33111f43ad2ce7acfa6de0a32 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-python3.9/0030-use-replace-instead-rename-to-avoid-failure-on-windo.patch b/mingw-w64-python3.9/0030-use-replace-instead-rename-to-avoid-failure-on-windo.patch index fa43bcc8bc..c8af1f19f2 100644 --- a/mingw-w64-python3.9/0030-use-replace-instead-rename-to-avoid-failure-on-windo.patch +++ b/mingw-w64-python3.9/0030-use-replace-instead-rename-to-avoid-failure-on-windo.patch @@ -1,4 +1,4 @@ -From 87c6be7c71ae6ad3b60e620cac3a3fb04cdf6e04 Mon Sep 17 00:00:00 2001 +From 8ce7dcc50395d138e1ec6b303c46a89ae7b98c24 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-python3.9/0031-MINGW-avoid-circular-dependency-from-time-module-dur.patch b/mingw-w64-python3.9/0031-MINGW-avoid-circular-dependency-from-time-module-dur.patch index 5567b61ff0..fb2fc5ebe8 100644 --- a/mingw-w64-python3.9/0031-MINGW-avoid-circular-dependency-from-time-module-dur.patch +++ b/mingw-w64-python3.9/0031-MINGW-avoid-circular-dependency-from-time-module-dur.patch @@ -1,4 +1,4 @@ -From f494a42a1460e94f7cf210f338cc0b75be4ba7a5 Mon Sep 17 00:00:00 2001 +From 4ffbd9b3c17b527f172d805010b5e20679165833 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-python3.9/0032-MINGW-generalization-of-posix-build-in-distutils-sys.patch b/mingw-w64-python3.9/0032-MINGW-generalization-of-posix-build-in-distutils-sys.patch index be7b1e737c..6993dfc415 100644 --- a/mingw-w64-python3.9/0032-MINGW-generalization-of-posix-build-in-distutils-sys.patch +++ b/mingw-w64-python3.9/0032-MINGW-generalization-of-posix-build-in-distutils-sys.patch @@ -1,4 +1,4 @@ -From e88398a38a7f2cf4f2649149c12290e3bdddd392 Mon Sep 17 00:00:00 2001 +From 2b69618ed982a6f174a7bc666b08c90eee83c268 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-python3.9/0033-MINGW-customize-site.patch b/mingw-w64-python3.9/0033-MINGW-customize-site.patch index af0f85c96e..bf0282aaab 100644 --- a/mingw-w64-python3.9/0033-MINGW-customize-site.patch +++ b/mingw-w64-python3.9/0033-MINGW-customize-site.patch @@ -1,4 +1,4 @@ -From 21c349e1638e5bc0960504f00ec472ef06b979bd Mon Sep 17 00:00:00 2001 +From 8baa74769c98ae5a10f2766806f282d8a5980cf3 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-python3.9/0034-add-python-config-sh.patch b/mingw-w64-python3.9/0034-add-python-config-sh.patch index fbc75e4b19..3f8d14a3ed 100644 --- a/mingw-w64-python3.9/0034-add-python-config-sh.patch +++ b/mingw-w64-python3.9/0034-add-python-config-sh.patch @@ -1,4 +1,4 @@ -From 6dc04395fc45b3dde8eee803bcad431eabdd0431 Mon Sep 17 00:00:00 2001 +From b650a9cb9202cbb9acedc6cc043c622bf815ab1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:43 +0530 diff --git a/mingw-w64-python3.9/0035-cross-darwin-feature.patch b/mingw-w64-python3.9/0035-cross-darwin-feature.patch index 18c5d54415..b3efb781a1 100644 --- a/mingw-w64-python3.9/0035-cross-darwin-feature.patch +++ b/mingw-w64-python3.9/0035-cross-darwin-feature.patch @@ -1,4 +1,4 @@ -From 5d6d323f954f9f9f14c2bec6aad287f99a3a518b Mon Sep 17 00:00:00 2001 +From a75a88113ad8b46cb82be6a75de750d2407bf2fa 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 46a7c81..986052c 100644 +index fc287de..453b80f 100644 --- a/configure.ac +++ b/configure.ac @@ -398,6 +398,7 @@ if test -z "$MACHDEP" @@ -70,7 +70,7 @@ index 46a7c81..986052c 100644 *) # for now, limit cross builds to known configurations MACHDEP="unknown" -@@ -1659,6 +1683,26 @@ AC_SUBST(BASECFLAGS) +@@ -1662,6 +1686,26 @@ AC_SUBST(BASECFLAGS) AC_SUBST(CFLAGS_NODIST) AC_SUBST(LDFLAGS_NODIST) @@ -97,7 +97,7 @@ index 46a7c81..986052c 100644 # The -arch flags for universal builds on macOS UNIVERSAL_ARCH_FLAGS= AC_SUBST(UNIVERSAL_ARCH_FLAGS) -@@ -2037,7 +2081,7 @@ yes) +@@ -2040,7 +2084,7 @@ yes) ;; esac else @@ -106,7 +106,7 @@ index 46a7c81..986052c 100644 then # 10.4 was the first release to support Intel archs cur_target="10.4" -@@ -2603,7 +2647,7 @@ case $ac_sys_system/$ac_sys_release in +@@ -2606,7 +2650,7 @@ case $ac_sys_system/$ac_sys_release in if test "${enable_universalsdk}"; then : else @@ -115,7 +115,7 @@ index 46a7c81..986052c 100644 fi LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';; -@@ -2628,7 +2672,7 @@ case $ac_sys_system/$ac_sys_release in +@@ -2631,7 +2675,7 @@ case $ac_sys_system/$ac_sys_release in ]])],[ac_osx_32bit=yes],[ac_osx_32bit=no],[ac_osx_32bit=yes]) if test "${ac_osx_32bit}" = "yes"; then @@ -124,7 +124,7 @@ index 46a7c81..986052c 100644 i386) MACOSX_DEFAULT_ARCH="i386" ;; -@@ -2640,7 +2684,7 @@ case $ac_sys_system/$ac_sys_release in +@@ -2643,7 +2687,7 @@ case $ac_sys_system/$ac_sys_release in ;; esac else diff --git a/mingw-w64-python3.9/0036-py3k-mingw-ntthreads-vs-pthreads.patch b/mingw-w64-python3.9/0036-py3k-mingw-ntthreads-vs-pthreads.patch index ba648ede39..ec8870b6b8 100644 --- a/mingw-w64-python3.9/0036-py3k-mingw-ntthreads-vs-pthreads.patch +++ b/mingw-w64-python3.9/0036-py3k-mingw-ntthreads-vs-pthreads.patch @@ -1,4 +1,4 @@ -From a39dffbb9b7b4e7800bb7ce39964632f23e41313 Mon Sep 17 00:00:00 2001 +From cef46d4d01202b0297badf3d715928e3b7406357 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-python3.9/0037-mingw-system-libffi.patch b/mingw-w64-python3.9/0037-mingw-system-libffi.patch index f526438652..2a2c2330f6 100644 --- a/mingw-w64-python3.9/0037-mingw-system-libffi.patch +++ b/mingw-w64-python3.9/0037-mingw-system-libffi.patch @@ -1,4 +1,4 @@ -From a6908e10a4c1179a6b427bb530a84a703366597f Mon Sep 17 00:00:00 2001 +From db3e4998d4ab6a11e3e263a848ebd332f25d77c6 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-python3.9/0038-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch b/mingw-w64-python3.9/0038-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch index 244fb22b46..cfe1e8cc17 100644 --- a/mingw-w64-python3.9/0038-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch +++ b/mingw-w64-python3.9/0038-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch @@ -1,4 +1,4 @@ -From 348346a3ce94c0dd3780e271d78bea5c5c70752c Mon Sep 17 00:00:00 2001 +From 8264c28205f988c0e7147f4f82c68511bb5ec611 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:51:46 +0530 Subject: [PATCH 038/N] msys mingw prefer unix sep if MSYSTEM diff --git a/mingw-w64-python3.9/0039-mingw-use-posix-getpath.patch b/mingw-w64-python3.9/0039-mingw-use-posix-getpath.patch index ee7a0c1f00..608e6aa648 100644 --- a/mingw-w64-python3.9/0039-mingw-use-posix-getpath.patch +++ b/mingw-w64-python3.9/0039-mingw-use-posix-getpath.patch @@ -1,4 +1,4 @@ -From 36195df97050360b3ed614c2cb48dc18739df3dc Mon Sep 17 00:00:00 2001 +From afe9fc7a1ffad8f5054050ecdc79203359c55d60 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 @@ -47,7 +47,7 @@ index 4eec669..b34f110 100644 #endif diff --git a/Modules/getpath.c b/Modules/getpath.c -index 4035819..6851a3b 100644 +index 728ecad..3010182 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -13,6 +13,11 @@ @@ -335,7 +335,7 @@ index 4035819..6851a3b 100644 reduce(calculate->argv0_path); -@@ -1328,6 +1415,8 @@ calculate_zip_path(PyCalculatePath *calculate) +@@ -1329,6 +1416,8 @@ calculate_zip_path(PyCalculatePath *calculate) calculate->zip_path[len - 6] = VERSION[0]; calculate->zip_path[len - 5] = VERSION[2]; @@ -344,7 +344,7 @@ index 4035819..6851a3b 100644 res = _PyStatus_OK(); done: -@@ -1367,7 +1456,14 @@ calculate_module_search_path(PyCalculatePath *calculate, +@@ -1368,7 +1457,14 @@ calculate_module_search_path(PyCalculatePath *calculate, } bufsz += wcslen(calculate->zip_path) + 1; @@ -359,7 +359,7 @@ index 4035819..6851a3b 100644 /* Allocate the buffer */ wchar_t *buf = PyMem_RawMalloc(bufsz * sizeof(wchar_t)); -@@ -1395,7 +1491,7 @@ calculate_module_search_path(PyCalculatePath *calculate, +@@ -1396,7 +1492,7 @@ calculate_module_search_path(PyCalculatePath *calculate, if (!_Py_isabs(defpath)) { wcscat(buf, calculate->prefix); @@ -368,7 +368,7 @@ index 4035819..6851a3b 100644 defpath[0] != (delim ? DELIM : L'\0')) { /* not empty */ -@@ -1417,8 +1513,15 @@ calculate_module_search_path(PyCalculatePath *calculate, +@@ -1418,8 +1514,15 @@ calculate_module_search_path(PyCalculatePath *calculate, } wcscat(buf, delimiter); @@ -384,7 +384,7 @@ index 4035819..6851a3b 100644 pathconfig->module_search_path = buf; return _PyStatus_OK(); -@@ -1447,14 +1550,17 @@ calculate_init(PyCalculatePath *calculate, const PyConfig *config) +@@ -1448,14 +1551,17 @@ calculate_init(PyCalculatePath *calculate, const PyConfig *config) if (!calculate->pythonpath_macro) { return DECODE_LOCALE_ERR("PYTHONPATH macro", len); } @@ -402,7 +402,7 @@ index 4035819..6851a3b 100644 calculate->vpath_macro = Py_DecodeLocale(VPATH, &len); if (!calculate->vpath_macro) { return DECODE_LOCALE_ERR("VPATH macro", len); -@@ -1465,6 +1571,7 @@ calculate_init(PyCalculatePath *calculate, const PyConfig *config) +@@ -1466,6 +1572,7 @@ calculate_init(PyCalculatePath *calculate, const PyConfig *config) if (!pyversion) { return DECODE_LOCALE_ERR("VERSION macro", len); } @@ -410,7 +410,7 @@ index 4035819..6851a3b 100644 calculate->lib_python = joinpath2(config->platlibdir, pyversion); PyMem_RawFree(pyversion); if (calculate->lib_python == NULL) { -@@ -1481,6 +1588,7 @@ calculate_free(PyCalculatePath *calculate) +@@ -1482,6 +1589,7 @@ calculate_free(PyCalculatePath *calculate) PyMem_RawFree(calculate->pythonpath_macro); PyMem_RawFree(calculate->prefix_macro); PyMem_RawFree(calculate->exec_prefix_macro); @@ -418,7 +418,7 @@ index 4035819..6851a3b 100644 PyMem_RawFree(calculate->vpath_macro); PyMem_RawFree(calculate->lib_python); PyMem_RawFree(calculate->path_env); -@@ -1496,6 +1604,8 @@ calculate_path(PyCalculatePath *calculate, _PyPathConfig *pathconfig) +@@ -1497,6 +1605,8 @@ calculate_path(PyCalculatePath *calculate, _PyPathConfig *pathconfig) { PyStatus status; @@ -427,7 +427,7 @@ index 4035819..6851a3b 100644 if (pathconfig->program_full_path == NULL) { status = calculate_program(calculate, pathconfig); if (_PyStatus_EXCEPTION(status)) { -@@ -1596,6 +1706,7 @@ _PyPathConfig_Calculate(_PyPathConfig *pathconfig, const PyConfig *config) +@@ -1597,6 +1707,7 @@ _PyPathConfig_Calculate(_PyPathConfig *pathconfig, const PyConfig *config) { PyStatus status; PyCalculatePath calculate; @@ -463,10 +463,10 @@ index 9d7690e..bd34310 100644 _Py_COMP_DIAG_PUSH _Py_COMP_DIAG_IGNORE_DEPR_DECLS diff --git a/Python/fileutils.c b/Python/fileutils.c -index 769ab59..3a3b00a 100644 +index 45ea204..d5f8b79 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c -@@ -1818,13 +1818,31 @@ _Py_wrealpath(const wchar_t *path, +@@ -1924,13 +1924,31 @@ _Py_wrealpath(const wchar_t *path, #endif diff --git a/mingw-w64-python3.9/0040-mingw-add-ModuleFileName-dir-to-PATH.patch b/mingw-w64-python3.9/0040-mingw-add-ModuleFileName-dir-to-PATH.patch index 66c3887c65..c04ca93b16 100644 --- a/mingw-w64-python3.9/0040-mingw-add-ModuleFileName-dir-to-PATH.patch +++ b/mingw-w64-python3.9/0040-mingw-add-ModuleFileName-dir-to-PATH.patch @@ -1,4 +1,4 @@ -From 2caf8f6a25d482e5ccf1dc3afb31d0cac46e2be8 Mon Sep 17 00:00:00 2001 +From a8c10ce1867cef6470abf110d26cfc47ed4c5e5a Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:51:48 +0530 Subject: [PATCH 040/N] mingw add ModuleFileName dir to PATH @@ -13,10 +13,10 @@ Co-authored-by: Christoph Reiter 1 file changed, 30 insertions(+) diff --git a/Modules/getpath.c b/Modules/getpath.c -index 6851a3b..750d5c3 100644 +index 3010182..c52e0df 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c -@@ -1640,6 +1640,36 @@ calculate_path(PyCalculatePath *calculate, _PyPathConfig *pathconfig) +@@ -1641,6 +1641,36 @@ calculate_path(PyCalculatePath *calculate, _PyPathConfig *pathconfig) return status; } diff --git a/mingw-w64-python3.9/0041-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch b/mingw-w64-python3.9/0041-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch index c3aace3776..a16cf46bfc 100644 --- a/mingw-w64-python3.9/0041-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch +++ b/mingw-w64-python3.9/0041-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch @@ -1,4 +1,4 @@ -From cf5b072fc27877641adacacd249d4e4e59cd1ca8 Mon Sep 17 00:00:00 2001 +From 6bd3b909a390939df82bdecf650f75509b752bd2 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-python3.9/0042-msys-cygwin-semi-native-build-sysconfig.patch b/mingw-w64-python3.9/0042-msys-cygwin-semi-native-build-sysconfig.patch index d6026979f4..010c212942 100644 --- a/mingw-w64-python3.9/0042-msys-cygwin-semi-native-build-sysconfig.patch +++ b/mingw-w64-python3.9/0042-msys-cygwin-semi-native-build-sysconfig.patch @@ -1,4 +1,4 @@ -From c50c25e2d32cf7a94ce87eb03dc8398725bfb824 Mon Sep 17 00:00:00 2001 +From ae4be49d5a7fbdcbc2c82aa1359e7ead2c393854 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 d4298f7..5d336d8 100644 vars.update(done) return vars diff --git a/Makefile.pre.in b/Makefile.pre.in -index f58b701..c20434e 100644 +index 223a266..5271dd8 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -137,6 +137,13 @@ exec_prefix= @exec_prefix@ @@ -52,7 +52,7 @@ index f58b701..c20434e 100644 BINDIR= @bindir@ LIBDIR= @libdir@ diff --git a/configure.ac b/configure.ac -index 986052c..acb5bea 100644 +index 453b80f..4586602 100644 --- a/configure.ac +++ b/configure.ac @@ -625,6 +625,65 @@ then diff --git a/mingw-w64-python3.9/0043-mingw-sysconfig-like-posix.patch b/mingw-w64-python3.9/0043-mingw-sysconfig-like-posix.patch index 8515af357e..71703067e9 100644 --- a/mingw-w64-python3.9/0043-mingw-sysconfig-like-posix.patch +++ b/mingw-w64-python3.9/0043-mingw-sysconfig-like-posix.patch @@ -1,4 +1,4 @@ -From 862d4ae13e9dbe2b79e23eeede207129de0675d0 Mon Sep 17 00:00:00 2001 +From 893ba3a5e55dc3e07bac6407075e3461a24f979f 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 diff --git a/mingw-w64-python3.9/0044-mingw-_winapi_as_builtin_for_Popen_in_cygwinccompile.patch b/mingw-w64-python3.9/0044-mingw-_winapi_as_builtin_for_Popen_in_cygwinccompile.patch index ccd3a3634f..5f109c9cdc 100644 --- a/mingw-w64-python3.9/0044-mingw-_winapi_as_builtin_for_Popen_in_cygwinccompile.patch +++ b/mingw-w64-python3.9/0044-mingw-_winapi_as_builtin_for_Popen_in_cygwinccompile.patch @@ -1,4 +1,4 @@ -From 2cb08e2d866eba2c0a8fa7f99808865c2c849d20 Mon Sep 17 00:00:00 2001 +From c4507430c95893ad2be0a1796f8dc7a7962ef789 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:51 +0530 diff --git a/mingw-w64-python3.9/0045-cross-dont-add-multiarch-paths-if-cross-compiling.patch b/mingw-w64-python3.9/0045-cross-dont-add-multiarch-paths-if-cross-compiling.patch index a1e8b40419..e65d5bb1aa 100644 --- a/mingw-w64-python3.9/0045-cross-dont-add-multiarch-paths-if-cross-compiling.patch +++ b/mingw-w64-python3.9/0045-cross-dont-add-multiarch-paths-if-cross-compiling.patch @@ -1,4 +1,4 @@ -From 06682f8d898c1d1989be5ba8bff6bea4c9c5f420 Mon Sep 17 00:00:00 2001 +From c919ed9405978c2261712b8e8e860b12f7001057 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-python3.9/0046-mingw-use-backslashes-in-compileall-py.patch b/mingw-w64-python3.9/0046-mingw-use-backslashes-in-compileall-py.patch index b00ab17ad0..f7a383a0b5 100644 --- a/mingw-w64-python3.9/0046-mingw-use-backslashes-in-compileall-py.patch +++ b/mingw-w64-python3.9/0046-mingw-use-backslashes-in-compileall-py.patch @@ -1,4 +1,4 @@ -From 922cca40d51358770fa41a9b80659cc455fea8b8 Mon Sep 17 00:00:00 2001 +From 0525d209616594f74c395e8db04aa745f6b190e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:53 +0530 diff --git a/mingw-w64-python3.9/0047-msys-convert_path-fix-and-root-hack.patch b/mingw-w64-python3.9/0047-msys-convert_path-fix-and-root-hack.patch index 0b34cc9ad5..75425a9ed9 100644 --- a/mingw-w64-python3.9/0047-msys-convert_path-fix-and-root-hack.patch +++ b/mingw-w64-python3.9/0047-msys-convert_path-fix-and-root-hack.patch @@ -1,4 +1,4 @@ -From 5fa3a3a0d7125267116e51d535fa62d04537589d Mon Sep 17 00:00:00 2001 +From c96759da7b85fe3100ea018eabcce4fb11008212 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 @@ -83,7 +83,7 @@ index 7b2e1e0..75a369d 100644 else: raise DistutilsPlatformError("nothing known about platform '%s'" % os.name) diff --git a/Makefile.pre.in b/Makefile.pre.in -index c20434e..4c8bb01 100644 +index 5271dd8..72be72d 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1707,6 +1707,12 @@ libainstall: @DEF_MAKE_RULE@ python-config diff --git a/mingw-w64-python3.9/0048-allow-static-tcltk.patch b/mingw-w64-python3.9/0048-allow-static-tcltk.patch index 2bfbb7a28f..328021e72e 100644 --- a/mingw-w64-python3.9/0048-allow-static-tcltk.patch +++ b/mingw-w64-python3.9/0048-allow-static-tcltk.patch @@ -1,4 +1,4 @@ -From b5fb27c8f83ac741ad8a983430316214df8cf8f6 Mon Sep 17 00:00:00 2001 +From 6777f17ccae090e6687d6317b4dafcb0c8899f8f 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-python3.9/0049-mingw-pdcurses_ISPAD.patch b/mingw-w64-python3.9/0049-mingw-pdcurses_ISPAD.patch index 336e38e81d..1417c8f469 100644 --- a/mingw-w64-python3.9/0049-mingw-pdcurses_ISPAD.patch +++ b/mingw-w64-python3.9/0049-mingw-pdcurses_ISPAD.patch @@ -1,4 +1,4 @@ -From 30f4a5a6f752600870d2045ade63cecf2fc8483e Mon Sep 17 00:00:00 2001 +From 88deca4afdb3762987227d4aa3cd50cfc8658ea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:55 +0530 diff --git a/mingw-w64-python3.9/0050-grammar-fixes.patch b/mingw-w64-python3.9/0050-grammar-fixes.patch index 56604bc789..cc3d5f8eb0 100644 --- a/mingw-w64-python3.9/0050-grammar-fixes.patch +++ b/mingw-w64-python3.9/0050-grammar-fixes.patch @@ -1,4 +1,4 @@ -From 19250ed6838ce7ca85fca4c563bf0716738ffee8 Mon Sep 17 00:00:00 2001 +From ece4431ade66c4abb835a489cacc002545ccb13a 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:56 +0530 diff --git a/mingw-w64-python3.9/0051-builddir-fixes.patch b/mingw-w64-python3.9/0051-builddir-fixes.patch index 8ffe1204b3..b23275dc87 100644 --- a/mingw-w64-python3.9/0051-builddir-fixes.patch +++ b/mingw-w64-python3.9/0051-builddir-fixes.patch @@ -1,4 +1,4 @@ -From 04925982f8d6c8a3254e9c891b18d82ed11b20cc Mon Sep 17 00:00:00 2001 +From 6e9ed94084c501600e2ba6fdaac4b49b252e654d 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 4c8bb01..38256f5 100644 +index 72be72d..7badeec 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -741,20 +741,20 @@ Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) diff --git a/mingw-w64-python3.9/0052-msys-monkeypatch-os-system-via-sh-exe.patch b/mingw-w64-python3.9/0052-msys-monkeypatch-os-system-via-sh-exe.patch index c568d5a4c5..185b774730 100644 --- a/mingw-w64-python3.9/0052-msys-monkeypatch-os-system-via-sh-exe.patch +++ b/mingw-w64-python3.9/0052-msys-monkeypatch-os-system-via-sh-exe.patch @@ -1,4 +1,4 @@ -From fde7aaa6d2286bb35c39adc60a961b4d248e7f7e Mon Sep 17 00:00:00 2001 +From 2cafb98ac994c8befe0d053e6e1524af8ec6e180 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-python3.9/0053-msys-replace-slashes-used-in-io-redirection.patch b/mingw-w64-python3.9/0053-msys-replace-slashes-used-in-io-redirection.patch index fe3b5a73b7..2d9f4a5aee 100644 --- a/mingw-w64-python3.9/0053-msys-replace-slashes-used-in-io-redirection.patch +++ b/mingw-w64-python3.9/0053-msys-replace-slashes-used-in-io-redirection.patch @@ -1,4 +1,4 @@ -From 327d9358a207dfc8171c3996a9707a7198acec82 Mon Sep 17 00:00:00 2001 +From c403bd9ac50aeda60b91f6c990f4f34bedf93bd3 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-python3.9/0054-mingw-install-layout-as-posix.patch b/mingw-w64-python3.9/0054-mingw-install-layout-as-posix.patch index 0aa9288c45..4e160b71bb 100644 --- a/mingw-w64-python3.9/0054-mingw-install-layout-as-posix.patch +++ b/mingw-w64-python3.9/0054-mingw-install-layout-as-posix.patch @@ -1,4 +1,4 @@ -From c965eeaccbdd5d3c607fa6dff4bdf2f5747a96f3 Mon Sep 17 00:00:00 2001 +From d2e564612e1c443c7e8b523e8d7e9ac34e522fc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:59 +0530 diff --git a/mingw-w64-python3.9/0055-remove_path_max.default.patch b/mingw-w64-python3.9/0055-remove_path_max.default.patch index ff28a27220..864103a08d 100644 --- a/mingw-w64-python3.9/0055-remove_path_max.default.patch +++ b/mingw-w64-python3.9/0055-remove_path_max.default.patch @@ -1,4 +1,4 @@ -From 848fa1607dd6df33db5be9e11fb8ffd1c63d1112 Mon Sep 17 00:00:00 2001 +From d7ddae846cd17e00caca8c969b55a057f3589fec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:59 +0530 diff --git a/mingw-w64-python3.9/0056-dont-link-with-gettext.patch b/mingw-w64-python3.9/0056-dont-link-with-gettext.patch index 7a049fa16b..29901d402e 100644 --- a/mingw-w64-python3.9/0056-dont-link-with-gettext.patch +++ b/mingw-w64-python3.9/0056-dont-link-with-gettext.patch @@ -1,4 +1,4 @@ -From 4b35cc22538ecba9fcd0fb69495d9f5919ee775e Mon Sep 17 00:00:00 2001 +From fbe0b754bebcb09130fe8303ca180ef2221a8372 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,10 +32,10 @@ index 2e353bb..ea222af 100644 #include #include diff --git a/configure.ac b/configure.ac -index acb5bea..c09b5fb 100644 +index 4586602..1599c74 100644 --- a/configure.ac +++ b/configure.ac -@@ -3151,10 +3151,19 @@ AC_SEARCH_LIBS(sem_init, pthread rt posix4) +@@ -3154,10 +3154,19 @@ AC_SEARCH_LIBS(sem_init, pthread rt posix4) fi # check if we need libintl for locale functions diff --git a/mingw-w64-python3.9/0057-ctypes-python-dll.patch b/mingw-w64-python3.9/0057-ctypes-python-dll.patch index d1445f3f97..20359a481e 100644 --- a/mingw-w64-python3.9/0057-ctypes-python-dll.patch +++ b/mingw-w64-python3.9/0057-ctypes-python-dll.patch @@ -1,4 +1,4 @@ -From 36014b954c10629033948204a4c8a39bfc03542d Mon Sep 17 00:00:00 2001 +From 3347f3abb6dac9690e21055bb8a823870d4c9edd 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-python3.9/0058-gdbm-module-includes.patch b/mingw-w64-python3.9/0058-gdbm-module-includes.patch index 743ea7745b..95e45acf78 100644 --- a/mingw-w64-python3.9/0058-gdbm-module-includes.patch +++ b/mingw-w64-python3.9/0058-gdbm-module-includes.patch @@ -1,4 +1,4 @@ -From 48b0fefa0389e88d0340500cd68d8add22434502 Mon Sep 17 00:00:00 2001 +From 886617c8d1d880ef0206debff313a068669e4e6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:02 +0530 diff --git a/mingw-w64-python3.9/0059-use-gnu_printf-in-format.patch b/mingw-w64-python3.9/0059-use-gnu_printf-in-format.patch index d3d6566df3..adab14b23a 100644 --- a/mingw-w64-python3.9/0059-use-gnu_printf-in-format.patch +++ b/mingw-w64-python3.9/0059-use-gnu_printf-in-format.patch @@ -1,4 +1,4 @@ -From 19c04060e9c1ddde6be136678196c2545e76591e Mon Sep 17 00:00:00 2001 +From 3f773a3fb7c2ff965f5ec8dadb348a99ca5c2874 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-python3.9/0060-mingw-fix-ssl-dont-use-enum_certificates.patch b/mingw-w64-python3.9/0060-mingw-fix-ssl-dont-use-enum_certificates.patch index e385ad33c2..92472c3da3 100644 --- a/mingw-w64-python3.9/0060-mingw-fix-ssl-dont-use-enum_certificates.patch +++ b/mingw-w64-python3.9/0060-mingw-fix-ssl-dont-use-enum_certificates.patch @@ -1,4 +1,4 @@ -From 01c84b07e61e069b42a997c1fd96a1fb16888e35 Mon Sep 17 00:00:00 2001 +From 1d256fa194a67c65adab63f98e3129f203b0f3fa Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:52:03 +0530 Subject: [PATCH 060/N] mingw fix ssl dont use enum_certificates diff --git a/mingw-w64-python3.9/0061-mingw-build-optimized-ext.patch b/mingw-w64-python3.9/0061-mingw-build-optimized-ext.patch index 40c74a89ef..118ab56d11 100644 --- a/mingw-w64-python3.9/0061-mingw-build-optimized-ext.patch +++ b/mingw-w64-python3.9/0061-mingw-build-optimized-ext.patch @@ -1,4 +1,4 @@ -From 92f04d669d2a2283416e2b75108d13a06ff5f5db Mon Sep 17 00:00:00 2001 +From af81cead554790e55ac7297c78c7cf0751741b40 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-python3.9/0062-cygwinccompiler-dont-strip-modules-if-pydebug.patch b/mingw-w64-python3.9/0062-cygwinccompiler-dont-strip-modules-if-pydebug.patch index 2d6bc170ae..14ca139a1b 100644 --- a/mingw-w64-python3.9/0062-cygwinccompiler-dont-strip-modules-if-pydebug.patch +++ b/mingw-w64-python3.9/0062-cygwinccompiler-dont-strip-modules-if-pydebug.patch @@ -1,4 +1,4 @@ -From 61736a3c5ea3e737347d4565a7a6b40197fc76b7 Mon Sep 17 00:00:00 2001 +From 01a2e7616c9e8d8cb554a125ef768eb010275dee Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:52:05 +0530 Subject: [PATCH 062/N] cygwinccompiler dont strip modules if pydebug diff --git a/mingw-w64-python3.9/0063-fix-using-dllhandle-and-winver-mingw.patch b/mingw-w64-python3.9/0063-fix-using-dllhandle-and-winver-mingw.patch index 55a120eee8..71966ad3c2 100644 --- a/mingw-w64-python3.9/0063-fix-using-dllhandle-and-winver-mingw.patch +++ b/mingw-w64-python3.9/0063-fix-using-dllhandle-and-winver-mingw.patch @@ -1,4 +1,4 @@ -From 822c48301dd2ba9c46e8753aed20f06039410a8a Mon Sep 17 00:00:00 2001 +From 86c9d4a3a9b44f10b1c4c638243ed1f0b783901a 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-python3.9/0064-mingw-add-LIBPL-to-library-dirs.patch b/mingw-w64-python3.9/0064-mingw-add-LIBPL-to-library-dirs.patch index 3cf9ddb0b6..70c10f774f 100644 --- a/mingw-w64-python3.9/0064-mingw-add-LIBPL-to-library-dirs.patch +++ b/mingw-w64-python3.9/0064-mingw-add-LIBPL-to-library-dirs.patch @@ -1,4 +1,4 @@ -From a5a17cbdffa08bfb3256ed55eacae5b20db918e8 Mon Sep 17 00:00:00 2001 +From 01ffe9fb03e551372f0b54912d938f3256e4c5cd 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-python3.9/0065-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch b/mingw-w64-python3.9/0065-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch index 3231b925cc..b9981c9427 100644 --- a/mingw-w64-python3.9/0065-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch +++ b/mingw-w64-python3.9/0065-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch @@ -1,4 +1,4 @@ -From 4a27f5ec3d5715a4d0396cb667917e78a9660e95 Mon Sep 17 00:00:00 2001 +From 1c81c81b5e7f5ba55927e8ae64e148731ed9b04f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:07 +0530 diff --git a/mingw-w64-python3.9/0066-MINGW-link-with-additional-library.patch b/mingw-w64-python3.9/0066-MINGW-link-with-additional-library.patch index 82bb521d3d..490e2703cb 100644 --- a/mingw-w64-python3.9/0066-MINGW-link-with-additional-library.patch +++ b/mingw-w64-python3.9/0066-MINGW-link-with-additional-library.patch @@ -1,4 +1,4 @@ -From 4238747aeb62b40be9d9ea7e3ce02958976eb554 Mon Sep 17 00:00:00 2001 +From 5e0de2a63f9534dabbdfbe422cb7952afa4b7ce2 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 066/N] MINGW link with additional library 1 file changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac -index c09b5fb..7cec63a 100644 +index 1599c74..28b69be 100644 --- a/configure.ac +++ b/configure.ac -@@ -5841,6 +5841,15 @@ for dir in $SRCDIRS; do +@@ -5860,6 +5860,15 @@ for dir in $SRCDIRS; do done AC_MSG_RESULT(done) diff --git a/mingw-w64-python3.9/0067-install-msilib.patch b/mingw-w64-python3.9/0067-install-msilib.patch index fb92bed937..d8df55c7ae 100644 --- a/mingw-w64-python3.9/0067-install-msilib.patch +++ b/mingw-w64-python3.9/0067-install-msilib.patch @@ -1,4 +1,4 @@ -From 127df4dd7e79146ad61612f843f3f6b568852e94 Mon Sep 17 00:00:00 2001 +From 408a59388df34c484cc3bfc7d7465ca7ea9c6f05 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 067/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 38256f5..20e434a 100644 +index 7badeec..f6d0247 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1497,6 +1497,7 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ diff --git a/mingw-w64-python3.9/0068-dont-include-system-ncurses-path.patch b/mingw-w64-python3.9/0068-dont-include-system-ncurses-path.patch index c53c9bfbbb..59bf520622 100644 --- a/mingw-w64-python3.9/0068-dont-include-system-ncurses-path.patch +++ b/mingw-w64-python3.9/0068-dont-include-system-ncurses-path.patch @@ -1,4 +1,4 @@ -From c40518a519539a80341ef6ad76f3c6d5959ac446 Mon Sep 17 00:00:00 2001 +From 430aee7255b2ebf1947c8670db95f017e41aecc6 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 @@ -9,10 +9,10 @@ Subject: [PATCH 068/N] dont include system ncurses path 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 7cec63a..b452ca3 100644 +index 28b69be..25aecf9 100644 --- a/configure.ac +++ b/configure.ac -@@ -5460,9 +5460,15 @@ fi +@@ -5479,9 +5479,15 @@ fi # first curses header check ac_save_cppflags="$CPPFLAGS" diff --git a/mingw-w64-python3.9/0069-fix-signal-module-build.patch b/mingw-w64-python3.9/0069-fix-signal-module-build.patch index 46d373c499..5bd32b1ba2 100644 --- a/mingw-w64-python3.9/0069-fix-signal-module-build.patch +++ b/mingw-w64-python3.9/0069-fix-signal-module-build.patch @@ -1,4 +1,4 @@ -From 9da0b6e321fc0346bc0a8d29260dd5001c9f2c27 Mon Sep 17 00:00:00 2001 +From a79c0b4716a86e95e7b41f9f64a51492ad2440a6 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:10 +0530 Subject: [PATCH 069/N] fix signal module build diff --git a/mingw-w64-python3.9/0070-build-winconsoleio.patch b/mingw-w64-python3.9/0070-build-winconsoleio.patch index 8c739586c2..54a404c3c8 100644 --- a/mingw-w64-python3.9/0070-build-winconsoleio.patch +++ b/mingw-w64-python3.9/0070-build-winconsoleio.patch @@ -1,4 +1,4 @@ -From 484153a97c8d286295a1e67bdab4e79163e2e131 Mon Sep 17 00:00:00 2001 +From a6869a3b49e6a333b907061339eeef622a6d4e08 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:11 +0530 Subject: [PATCH 070/N] build winconsoleio diff --git a/mingw-w64-python3.9/0071-expose-sem_unlink.patch b/mingw-w64-python3.9/0071-expose-sem_unlink.patch index ba030bf948..579f5f02f2 100644 --- a/mingw-w64-python3.9/0071-expose-sem_unlink.patch +++ b/mingw-w64-python3.9/0071-expose-sem_unlink.patch @@ -1,4 +1,4 @@ -From fa940ac106793d80ca2e39adbf8a47b85364615b Mon Sep 17 00:00:00 2001 +From 15f50a4e53545b16eaaf9b9fade68a828a6e0503 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:12 +0530 Subject: [PATCH 071/N] expose sem_unlink diff --git a/mingw-w64-python3.9/0072-cygpty-isatty.patch b/mingw-w64-python3.9/0072-cygpty-isatty.patch index db462615ae..21031bac83 100644 --- a/mingw-w64-python3.9/0072-cygpty-isatty.patch +++ b/mingw-w64-python3.9/0072-cygpty-isatty.patch @@ -1,4 +1,4 @@ -From 9d10068ec68ceb8db0c0f814ecb82d725394df01 Mon Sep 17 00:00:00 2001 +From 9fb465b60da98040bbc8ee649f17cfb6dbe3f293 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:14 +0530 Subject: [PATCH 072/N] cygpty isatty @@ -71,7 +71,7 @@ index 0000000..82fd0af + +#endif /* _ISCYGPTY_H */ diff --git a/Makefile.pre.in b/Makefile.pre.in -index 20e434a..55f0ad7 100644 +index f6d0247..126131c 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -372,6 +372,7 @@ PYTHON_OBJS= \ @@ -205,7 +205,7 @@ index 614012d..d29d06d 100644 } diff --git a/Python/fileutils.c b/Python/fileutils.c -index 3a3b00a..560109b 100644 +index d5f8b79..a47f12b 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c @@ -1,4 +1,5 @@ @@ -214,7 +214,7 @@ index 3a3b00a..560109b 100644 #include "pycore_fileutils.h" #include "osdefs.h" // SEP #include -@@ -66,7 +67,7 @@ _Py_device_encoding(int fd) +@@ -70,7 +71,7 @@ _Py_device_encoding(int fd) #endif int valid; _Py_BEGIN_SUPPRESS_IPH diff --git a/mingw-w64-python3.9/0073-disable-broken-gdbm-module.patch b/mingw-w64-python3.9/0073-disable-broken-gdbm-module.patch index 05929d3a60..79a3c181d2 100644 --- a/mingw-w64-python3.9/0073-disable-broken-gdbm-module.patch +++ b/mingw-w64-python3.9/0073-disable-broken-gdbm-module.patch @@ -1,4 +1,4 @@ -From a1196d0f036301ba6b96332aa0d3c365785ea40a Mon Sep 17 00:00:00 2001 +From e486b493d937ef113c8cfc1904362196a31ba605 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:15 +0530 Subject: [PATCH 073/N] disable broken gdbm module diff --git a/mingw-w64-python3.9/0074-link-win-resource-files-and-build-pythonw.patch b/mingw-w64-python3.9/0074-link-win-resource-files-and-build-pythonw.patch index b856179d63..cf72ae35c9 100644 --- a/mingw-w64-python3.9/0074-link-win-resource-files-and-build-pythonw.patch +++ b/mingw-w64-python3.9/0074-link-win-resource-files-and-build-pythonw.patch @@ -1,4 +1,4 @@ -From 3eb535665e450ad0385c152365c3f573259787f4 Mon Sep 17 00:00:00 2001 +From d25e8cea94e811159605490e7b383521024c563b Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:16 +0530 Subject: [PATCH 074/N] link win resource files and build pythonw @@ -13,7 +13,7 @@ Co-authored-by: Алексей 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 55f0ad7..499f877 100644 +index 126131c..7c1a775 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -38,6 +38,7 @@ CXX= @CXX@ @@ -98,7 +98,7 @@ index 55f0ad7..499f877 100644 $(INSTALL_PROGRAM) $(STRIPFLAG) Mac/pythonw $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \ fi diff --git a/configure.ac b/configure.ac -index b452ca3..87746f8 100644 +index 25aecf9..cea888c 100644 --- a/configure.ac +++ b/configure.ac @@ -1350,6 +1350,9 @@ fi @@ -111,7 +111,7 @@ index b452ca3..87746f8 100644 AC_SUBST(AR) AC_CHECK_TOOLS(AR, ar aal, ar) -@@ -5851,10 +5854,17 @@ AC_MSG_RESULT(done) +@@ -5870,10 +5873,17 @@ AC_MSG_RESULT(done) case $host in *-*-mingw*) LIBS="$LIBS -lversion -lshlwapi -lpathcch" diff --git a/mingw-w64-python3.9/0075-3.7-mpdec-mingw.patch b/mingw-w64-python3.9/0075-3.7-mpdec-mingw.patch index f80829972e..ede7f5473b 100644 --- a/mingw-w64-python3.9/0075-3.7-mpdec-mingw.patch +++ b/mingw-w64-python3.9/0075-3.7-mpdec-mingw.patch @@ -1,4 +1,4 @@ -From d8aa1eb5c0ddad129864a25e48a5f0c1928622bd Mon Sep 17 00:00:00 2001 +From 0669b928b1aeaedc039a0c7bc1e688b4190fdf8e 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:17 +0530 diff --git a/mingw-w64-python3.9/0076-disable-readline.patch b/mingw-w64-python3.9/0076-disable-readline.patch index bac45d0b25..8790fec552 100644 --- a/mingw-w64-python3.9/0076-disable-readline.patch +++ b/mingw-w64-python3.9/0076-disable-readline.patch @@ -1,4 +1,4 @@ -From 060c412a247ea7edbd28fc4f6422a977b2e8d809 Mon Sep 17 00:00:00 2001 +From 9e98fd461e9504b1275c883f7edb59258d2cf087 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:17 +0530 Subject: [PATCH 076/N] disable readline diff --git a/mingw-w64-python3.9/0077-fix-isselectable.patch b/mingw-w64-python3.9/0077-fix-isselectable.patch index 60abf58fe3..fe0657173b 100644 --- a/mingw-w64-python3.9/0077-fix-isselectable.patch +++ b/mingw-w64-python3.9/0077-fix-isselectable.patch @@ -1,4 +1,4 @@ -From 2807758c581d2d735010fafed4a39cc9d135656a Mon Sep 17 00:00:00 2001 +From 83d74ec0106b0a55fbb29324eb4961d1f5f92cef Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:18 +0530 Subject: [PATCH 077/N] fix isselectable diff --git a/mingw-w64-python3.9/0078-use-_wcsnicmp-instead-wcsncasecmp.patch b/mingw-w64-python3.9/0078-use-_wcsnicmp-instead-wcsncasecmp.patch index 1831417484..bd889d2c6f 100644 --- a/mingw-w64-python3.9/0078-use-_wcsnicmp-instead-wcsncasecmp.patch +++ b/mingw-w64-python3.9/0078-use-_wcsnicmp-instead-wcsncasecmp.patch @@ -1,4 +1,4 @@ -From 50eb966efe2e9b8e8cfdfe8ddf59671f8474f8e4 Mon Sep 17 00:00:00 2001 +From bc513cec0134febc13c4033ea8e9d839c3f3d6d1 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 @@ -9,7 +9,7 @@ Subject: [PATCH 078/N] use _wcsnicmp instead wcsncasecmp 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/getpath.c b/Modules/getpath.c -index 750d5c3..45ec1ff 100644 +index c52e0df..2018495 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -427,7 +427,7 @@ add_exe_suffix(wchar_t **progpath_p) diff --git a/mingw-w64-python3.9/0079-_xxsubinterpretersmodule.patch b/mingw-w64-python3.9/0079-_xxsubinterpretersmodule.patch index e533ec9039..be85e20e8e 100644 --- a/mingw-w64-python3.9/0079-_xxsubinterpretersmodule.patch +++ b/mingw-w64-python3.9/0079-_xxsubinterpretersmodule.patch @@ -1,4 +1,4 @@ -From 3c4a2594e4cb486e2bb8d5bf31cb2e2c61deefdc Mon Sep 17 00:00:00 2001 +From c20ac221468e3770baa22b7f853395e2e8a9df33 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-python3.9/0080-sqlite3-module-defines.patch b/mingw-w64-python3.9/0080-sqlite3-module-defines.patch index 5bd6e19a92..0677a1ba60 100644 --- a/mingw-w64-python3.9/0080-sqlite3-module-defines.patch +++ b/mingw-w64-python3.9/0080-sqlite3-module-defines.patch @@ -1,4 +1,4 @@ -From 0956ea225d9a546750741ead24a2ebda4b556d86 Mon Sep 17 00:00:00 2001 +From 5fd45d9433577159d5ca4080fc338030f7a9e367 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:21 +0530 Subject: [PATCH 080/N] sqlite3 module defines diff --git a/mingw-w64-python3.9/0081-configure-have-inet-pton.patch b/mingw-w64-python3.9/0081-configure-have-inet-pton.patch index 23fa750b15..a233867adc 100644 --- a/mingw-w64-python3.9/0081-configure-have-inet-pton.patch +++ b/mingw-w64-python3.9/0081-configure-have-inet-pton.patch @@ -1,4 +1,4 @@ -From 0a9848f4d3bdedb47f2ae47f2b29b936cb6cb42d Mon Sep 17 00:00:00 2001 +From a59150eaa982d06c28e04305056e6064de57bcd0 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:23 +0530 Subject: [PATCH 081/N] configure have inet pton @@ -12,10 +12,10 @@ Co-authored-by: Алексей 1 file changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac -index 87746f8..d9a30ee 100644 +index cea888c..fb15812 100644 --- a/configure.ac +++ b/configure.ac -@@ -4270,10 +4270,14 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +@@ -4273,10 +4273,14 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ AC_MSG_CHECKING(for inet_pton) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ diff --git a/mingw-w64-python3.9/0082-fix-msvc9-import.patch b/mingw-w64-python3.9/0082-fix-msvc9-import.patch index e42024da86..0d73ce2b41 100644 --- a/mingw-w64-python3.9/0082-fix-msvc9-import.patch +++ b/mingw-w64-python3.9/0082-fix-msvc9-import.patch @@ -1,4 +1,4 @@ -From d957c00a5e06c6cb841a64f1784ba9db00e9dc17 Mon Sep 17 00:00:00 2001 +From 5db67822f24f57c96ef4424c7738aca59e0dd7aa Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:24 +0530 Subject: [PATCH 082/N] fix msvc9 import diff --git a/mingw-w64-python3.9/0083-set-venv-activate-path-unix.patch b/mingw-w64-python3.9/0083-set-venv-activate-path-unix.patch index 04e4057a89..4788ec5e85 100644 --- a/mingw-w64-python3.9/0083-set-venv-activate-path-unix.patch +++ b/mingw-w64-python3.9/0083-set-venv-activate-path-unix.patch @@ -1,4 +1,4 @@ -From d5f60c9e82c5229862b2624833a3b9a8dcf8ce4a Mon Sep 17 00:00:00 2001 +From d13ab42085ab58f7114dbe9e50a9431dd0a5b9f4 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Thu, 17 Jun 2021 18:52:25 +0530 Subject: [PATCH 083/N] set venv activate path unix diff --git a/mingw-w64-python3.9/0084-venv-creation-fixes.patch b/mingw-w64-python3.9/0084-venv-creation-fixes.patch index 2dad484e80..1b84a22799 100644 --- a/mingw-w64-python3.9/0084-venv-creation-fixes.patch +++ b/mingw-w64-python3.9/0084-venv-creation-fixes.patch @@ -1,4 +1,4 @@ -From 155393c4fb3c28969c24e06179d47d59020836b0 Mon Sep 17 00:00:00 2001 +From eb0b0f383d56454cc6fde8f19ea056bf5bed75ce Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:26 +0530 Subject: [PATCH 084/N] venv creation fixes diff --git a/mingw-w64-python3.9/0085-pass-gen-profile-ldflags.patch b/mingw-w64-python3.9/0085-pass-gen-profile-ldflags.patch index a32c57434e..b67e10c61e 100644 --- a/mingw-w64-python3.9/0085-pass-gen-profile-ldflags.patch +++ b/mingw-w64-python3.9/0085-pass-gen-profile-ldflags.patch @@ -1,4 +1,4 @@ -From 1895c16630d1f0647588a2f5efb44971ebadbfce Mon Sep 17 00:00:00 2001 +From d7dcc7c569482c7b1d2bc811b12e1f6a82d75cb3 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:27 +0530 Subject: [PATCH 085/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 499f877..4f3ed6b 100644 +index 7c1a775..3331d5c 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -729,7 +729,7 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \ diff --git a/mingw-w64-python3.9/0086-distutils-add-windmc-to-cygwinccompiler.patch b/mingw-w64-python3.9/0086-distutils-add-windmc-to-cygwinccompiler.patch index a47cdbd324..07a7a0bee9 100644 --- a/mingw-w64-python3.9/0086-distutils-add-windmc-to-cygwinccompiler.patch +++ b/mingw-w64-python3.9/0086-distutils-add-windmc-to-cygwinccompiler.patch @@ -1,4 +1,4 @@ -From b199aa82b2ca265ebb7bfe6188289a8eee01d84d Mon Sep 17 00:00:00 2001 +From 4f1841b7211dd4d9557a868525b5005e4d67e55e 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-python3.9/0087-pkg-config-windows-must-link-ext-with-python-lib.patch b/mingw-w64-python3.9/0087-pkg-config-windows-must-link-ext-with-python-lib.patch index 3e9ad1a4e1..0110603636 100644 --- a/mingw-w64-python3.9/0087-pkg-config-windows-must-link-ext-with-python-lib.patch +++ b/mingw-w64-python3.9/0087-pkg-config-windows-must-link-ext-with-python-lib.patch @@ -1,4 +1,4 @@ -From ff36dc8eed893cf3aabf4ddaf9fe1bb9c6cdecb6 Mon Sep 17 00:00:00 2001 +From 2834911199728b44d81ab258423b7fdbabd4753a 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 d9a30ee..610dbb0 100644 +index fb15812..d8b1eb3 100644 --- a/configure.ac +++ b/configure.ac -@@ -5130,7 +5130,7 @@ AC_MSG_RESULT($LDVERSION) +@@ -5149,7 +5149,7 @@ AC_MSG_RESULT($LDVERSION) # On Android and Cygwin the shared libraries must be linked with libpython. AC_SUBST(LIBPYTHON) diff --git a/mingw-w64-python3.9/0088-importlib-bootstrap-path-sep.patch b/mingw-w64-python3.9/0088-importlib-bootstrap-path-sep.patch index 83d3da4fd3..f16c8398ec 100644 --- a/mingw-w64-python3.9/0088-importlib-bootstrap-path-sep.patch +++ b/mingw-w64-python3.9/0088-importlib-bootstrap-path-sep.patch @@ -1,4 +1,4 @@ -From 6ae966f872297165132dcc9d4b6983a657ab8eda Mon Sep 17 00:00:00 2001 +From 70b8703cafcfd25608f53a4a70403700dd695202 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:30 +0530 Subject: [PATCH 088/N] importlib bootstrap path sep @@ -12,7 +12,7 @@ Co-authored-by: Алексей 1 file changed, 4 insertions(+) diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py -index 7c41573..c2a20f7 100644 +index fe31f43..229d9aa 100644 --- a/Lib/importlib/_bootstrap_external.py +++ b/Lib/importlib/_bootstrap_external.py @@ -1674,6 +1674,10 @@ def _setup(_bootstrap_module): diff --git a/mingw-w64-python3.9/0089-pathlib-path-sep.patch b/mingw-w64-python3.9/0089-pathlib-path-sep.patch index 4dbafec329..ca87d8ae15 100644 --- a/mingw-w64-python3.9/0089-pathlib-path-sep.patch +++ b/mingw-w64-python3.9/0089-pathlib-path-sep.patch @@ -1,4 +1,4 @@ -From 20c7a5e3ee78a82547bb81a8397e4debdff743fb Mon Sep 17 00:00:00 2001 +From df3c78d7fbec2a02d559d26315c00d8f29e0a6c8 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:31 +0530 Subject: [PATCH 089/N] pathlib path sep @@ -8,7 +8,7 @@ Subject: [PATCH 089/N] pathlib path sep 1 file changed, 2 insertions(+) diff --git a/Lib/pathlib.py b/Lib/pathlib.py -index 756d389..cbf6921 100644 +index 60e2855..9fc9f38 100644 --- a/Lib/pathlib.py +++ b/Lib/pathlib.py @@ -123,6 +123,8 @@ class _WindowsFlavour(_Flavour): diff --git a/mingw-w64-python3.9/0090-warnings-fixes.patch b/mingw-w64-python3.9/0090-warnings-fixes.patch index a4a3659a40..2c4719a261 100644 --- a/mingw-w64-python3.9/0090-warnings-fixes.patch +++ b/mingw-w64-python3.9/0090-warnings-fixes.patch @@ -1,4 +1,4 @@ -From 7c7b892502d138ef7310718a10fef4eb2b6984a7 Mon Sep 17 00:00:00 2001 +From 2a8d3bf3a58d3caad9a27783240c25e9f720d137 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 @@ -112,10 +112,10 @@ index b6f1a8f..19cc104 100644 if (retDataSize == 0) { Py_INCREF(Py_None); diff --git a/Python/thread_nt.h b/Python/thread_nt.h -index 05b982d..e16311f 100644 +index 0ce5e94..6a6fe7e 100644 --- a/Python/thread_nt.h +++ b/Python/thread_nt.h -@@ -343,8 +343,9 @@ PyThread_release_lock(PyThread_type_lock aLock) +@@ -349,8 +349,9 @@ PyThread_release_lock(PyThread_type_lock aLock) { dprintf(("%lu: PyThread_release_lock(%p) called\n", PyThread_get_thread_ident(),aLock)); diff --git a/mingw-w64-python3.9/0091-fix-build-testinternalcapi.patch b/mingw-w64-python3.9/0091-fix-build-testinternalcapi.patch index d410e44a83..1a3648a5f2 100644 --- a/mingw-w64-python3.9/0091-fix-build-testinternalcapi.patch +++ b/mingw-w64-python3.9/0091-fix-build-testinternalcapi.patch @@ -1,4 +1,4 @@ -From f86726755971a0f674b929e8c58585c4c5ac13d9 Mon Sep 17 00:00:00 2001 +From c7083b0b392333103cf09f4f33d66f07b0b5ac18 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:34 +0530 Subject: [PATCH 091/N] fix build testinternalcapi diff --git a/mingw-w64-python3.9/0092-extend-MS_WINDOWS-flag.patch b/mingw-w64-python3.9/0092-extend-MS_WINDOWS-flag.patch index 0404b9fd68..2430614ce7 100644 --- a/mingw-w64-python3.9/0092-extend-MS_WINDOWS-flag.patch +++ b/mingw-w64-python3.9/0092-extend-MS_WINDOWS-flag.patch @@ -1,4 +1,4 @@ -From 00c28115bc3a33be2cb9343f56de779bf43270e3 Mon Sep 17 00:00:00 2001 +From 1cdb69057f1fa189eaf8ef57c6a6ec946f681aaf Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Thu, 17 Jun 2021 18:52:34 +0530 Subject: [PATCH 092/N] extend MS_WINDOWS flag diff --git a/mingw-w64-python3.9/0093-clang-arm64.patch b/mingw-w64-python3.9/0093-clang-arm64.patch index 165b870401..60f11671c6 100644 --- a/mingw-w64-python3.9/0093-clang-arm64.patch +++ b/mingw-w64-python3.9/0093-clang-arm64.patch @@ -1,4 +1,4 @@ -From 1c04ca989eb4a31a2fbf1831b03fb93816c25f59 Mon Sep 17 00:00:00 2001 +From 025cefb3dca7317d7476fa2a40938206e65eaa80 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 093/N] clang arm64 diff --git a/mingw-w64-python3.9/0094-MINGW-stack-reserve.patch b/mingw-w64-python3.9/0094-MINGW-stack-reserve.patch index 2cf5b209dd..b790b9a932 100644 --- a/mingw-w64-python3.9/0094-MINGW-stack-reserve.patch +++ b/mingw-w64-python3.9/0094-MINGW-stack-reserve.patch @@ -1,4 +1,4 @@ -From 9f8f8e52c51f4f78c7a88fed810bd37cfcd1e669 Mon Sep 17 00:00:00 2001 +From f20f69a24d26de4f570e0c3806b8e328fe54a2b5 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 094/N] MINGW stack reserve @@ -8,10 +8,10 @@ Subject: [PATCH 094/N] MINGW stack reserve 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac -index 610dbb0..a1c1c21 100644 +index d8b1eb3..d76db66 100644 --- a/configure.ac +++ b/configure.ac -@@ -3062,6 +3062,11 @@ then +@@ -3065,6 +3065,11 @@ then VxWorks*) LINKFORSHARED='--export-dynamic';; esac diff --git a/mingw-w64-python3.9/0095-Add-support-for-Windows-7-Python-3.9.patch b/mingw-w64-python3.9/0095-Add-support-for-Windows-7-Python-3.9.patch index 6c70b1c4d3..44c514d30b 100644 --- a/mingw-w64-python3.9/0095-Add-support-for-Windows-7-Python-3.9.patch +++ b/mingw-w64-python3.9/0095-Add-support-for-Windows-7-Python-3.9.patch @@ -1,4 +1,4 @@ -From 89c8d0b78bb3d3db241785853c32afd043e00191 Mon Sep 17 00:00:00 2001 +From 71fba9ef0080a54dcd80fa5ff6c85c567101206d Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Thu, 17 Jun 2021 18:52:39 +0530 Subject: [PATCH 095/N] Add support for Windows 7 Python 3.9 @@ -159,10 +159,10 @@ index 53da3a6..40b0db3 100644 return _PyStatus_OK(); } diff --git a/configure.ac b/configure.ac -index a1c1c21..ef7ab81 100644 +index d76db66..7cf6519 100644 --- a/configure.ac +++ b/configure.ac -@@ -5862,7 +5862,7 @@ AC_MSG_RESULT(done) +@@ -5881,7 +5881,7 @@ AC_MSG_RESULT(done) # For mingw build need additional library for linking case $host in *-*-mingw*) diff --git a/mingw-w64-python3.9/0097-Don-t-use-os.pathsep-to-find-EOF.patch b/mingw-w64-python3.9/0097-Don-t-use-os.pathsep-to-find-EOF.patch index 8263e3b83b..b0845a03e7 100644 --- a/mingw-w64-python3.9/0097-Don-t-use-os.pathsep-to-find-EOF.patch +++ b/mingw-w64-python3.9/0097-Don-t-use-os.pathsep-to-find-EOF.patch @@ -1,4 +1,4 @@ -From bc0395a45b7f5244e10c18666c654495f661c104 Mon Sep 17 00:00:00 2001 +From d0241e1a50f2bd27876a54ee3047487d7ce66cc5 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 18 Jun 2021 12:38:11 +0530 Subject: [PATCH 097/N] Don't use os.pathsep to find EOF not all diff --git a/mingw-w64-python3.9/0098-Fix-extension-suffix-for-c-extensions-on-mingw.patch b/mingw-w64-python3.9/0098-Fix-extension-suffix-for-c-extensions-on-mingw.patch index 828ce94a72..226494752d 100644 --- a/mingw-w64-python3.9/0098-Fix-extension-suffix-for-c-extensions-on-mingw.patch +++ b/mingw-w64-python3.9/0098-Fix-extension-suffix-for-c-extensions-on-mingw.patch @@ -1,4 +1,4 @@ -From e6c7e2012bfbfc01cc75683ee3e1c16404da228c Mon Sep 17 00:00:00 2001 +From 07a8e1ed1285bf5e2708036b1c1cc72fc87dfa21 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Wed, 23 Jun 2021 18:12:12 +0530 Subject: [PATCH 098/N] Fix extension suffix for c-extensions on mingw @@ -21,7 +21,7 @@ Signed-off-by: Naveen M K 3 files changed, 71 insertions(+), 17 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 4f3ed6b..c39c284 100644 +index 3331d5c..e18239f 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -165,6 +165,7 @@ CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(LDVERSION) @@ -69,10 +69,10 @@ index bd34310..60fb603 100644 PYD_UNTAGGED_SUFFIX, NULL diff --git a/configure.ac b/configure.ac -index ef7ab81..dfa95d3 100644 +index 7cf6519..bba2006 100644 --- a/configure.ac +++ b/configure.ac -@@ -2822,7 +2822,7 @@ if test -z "$SHLIB_SUFFIX"; then +@@ -2825,7 +2825,7 @@ if test -z "$SHLIB_SUFFIX"; then *) SHLIB_SUFFIX=.so;; esac case $host_os in @@ -81,7 +81,7 @@ index ef7ab81..dfa95d3 100644 esac fi AC_MSG_RESULT($SHLIB_SUFFIX) -@@ -5095,6 +5095,67 @@ fi +@@ -5114,6 +5114,67 @@ esac # check for endianness AC_C_BIGENDIAN @@ -149,7 +149,7 @@ index ef7ab81..dfa95d3 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 -@@ -5127,7 +5188,12 @@ if test "$Py_DEBUG" = 'true' -a "$with_trace_refs" != "yes"; then +@@ -5146,7 +5207,12 @@ if test "$Py_DEBUG" = 'true' -a "$with_trace_refs" != "yes"; then fi AC_SUBST(EXT_SUFFIX) @@ -163,7 +163,7 @@ index ef7ab81..dfa95d3 100644 AC_MSG_CHECKING(LDVERSION) LDVERSION='$(VERSION)$(ABIFLAGS)' -@@ -5805,12 +5871,6 @@ case "$ac_cv_computed_gotos" in yes*) +@@ -5824,12 +5890,6 @@ case "$ac_cv_computed_gotos" in yes*) AC_DEFINE(HAVE_COMPUTED_GOTOS, 1, [Define if the C compiler supports computed gotos.]) esac diff --git a/mingw-w64-python3.9/0099-Change-the-get_platform-method-in-sysconfig-and-dist.patch b/mingw-w64-python3.9/0099-Change-the-get_platform-method-in-sysconfig-and-dist.patch index 8c836785c0..07dd2e3f79 100644 --- a/mingw-w64-python3.9/0099-Change-the-get_platform-method-in-sysconfig-and-dist.patch +++ b/mingw-w64-python3.9/0099-Change-the-get_platform-method-in-sysconfig-and-dist.patch @@ -1,4 +1,4 @@ -From d77cfdaf4cc39995c46d0deac452580d13080b63 Mon Sep 17 00:00:00 2001 +From 0e71a45f5306c61085b972fb6799dad58cc51b83 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Mon, 28 Jun 2021 17:31:35 +0530 Subject: [PATCH 099/N] Change the `get_platform()` method in sysconfig and diff --git a/mingw-w64-python3.9/PKGBUILD b/mingw-w64-python3.9/PKGBUILD index 809a025d66..c75918eee7 100644 --- a/mingw-w64-python3.9/PKGBUILD +++ b/mingw-w64-python3.9/PKGBUILD @@ -28,8 +28,8 @@ else pkgbase="mingw-w64-${_realname}${_pybasever}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}${_pybasever}") fi -pkgver=${_pybasever}.5 -pkgrel=7 +pkgver=${_pybasever}.6 +pkgrel=2 pkgdesc="A high-level scripting language (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -464,103 +464,103 @@ package() { cp venvwlauncher.exe "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/venv/scripts/nt/pythonw.exe } -sha256sums=('0c5a140665436ec3dbfbb79e2dfb6d192655f26ef4a29aeffcb6d1820d716d83' +sha256sums=('397920af33efc5b97f2e0b57e91923512ef89fc5b3c1d21dbfc8c4828ce0108a' '7188e017a1efba4a87cb64a38b63ed2d8a469e2e74c3fd35b6538d5bc6e370e5' - '97af070c4e89e717ab1620e0d51ff2341e311d003883b60f47ea6ebd39e34aab' - 'dcf751d73aecd036c81bd7a1ad72ab4023abef5c9461614e5e0c7061ac02f681' - '9f00f503389253f7124686a76b132aedf3826da99b51167a23b3294c56190d00' - '3fde82b931873d0d14f0a6c47cc94bd65689883be4d793705592efd37427037d' - 'e15de050ce0982ccf1b2c9a0a40950974fe54ee7248888622595da8599be6ac3' - '1d503439324e2e462338653e7e38e57ffbd5611c99bb4c03e3ea97b88933524e' - '78867a942e8a883d0c41fa663da24cd4a108f2af52fcece1fe0ea86a1845299a' - '470790b6b89a9fa2a126fb39502d981644a3b09036579612ef95dad413573828' - '118d49b6f090b697222c6ed9a956d46dbf4c9e763bf64f13740dce326b6d3040' - '2fe332625fe7715f11227bd21a0e9029202ca93f1c2d54122ace7a2272f2795f' - '882592f8d9a28a790018431d5c0c6075b2a7ea4d2156f9a712954a7f08d2f7da' - 'b8b8cc2b8c0296d4473189c3be93d0de23bcd50e124fd3c4dcbdd9128849715b' - '7c0d3743b4f40ddec2f55d5b55676ebdf62f288cec5757913051bcaf8f3737e6' - '40205c34fdf9d0fbb983112ee48804a5df1e8b033be243e50f115768d133ee8e' - 'd66ec5d18920c657d93a1331f3a4e4283fefeba225cd94a6720c90647027c5d5' - '2a5bf6decd9b620aeb1a0419412de45ad0f6831713a19bf26cff5f2710c0b3da' - 'f7d6a5dececd1ee2008473aadc7017e8d3a2b072b551308dc8ac2c17d75f3262' - 'f5b0874c16c96b3558a4160ce6f373f090cb3c760d42583a8805cf6a8bacfb7c' - '6cf7a49bee63868cf792dd9df1ef2db97b4cd606fce3f813deb72fdc530277e6' - '4431c0139e3edb52ae01e7f8b48a08753c846c558511aae691a3fc23f7aafef9' - '82f483691ef309e1c50e0747856aeb06775b6e5f17dc66d63640a6b1def2e162' - '8dec7227b3c8fc83aee9452bb134a84c564403b1bbb6f268a4c735bc5f8c83dd' - 'df05fea7e5b6c238e06aeb0d4dd7eb56721528dd7b74c2b5648b1f0a737f146a' - '9cba0a497bf9fcdbd6833b33eda72510b0dc3717ca888f7e3a923f1b24362a90' - '0bf7492a25be177da6691b6102d5fc0aa548f5a0bde626ef4b07dd774f5a95e0' - 'c1510ac994893cb0ab664d890bd2bbbcb3ed00a19741d48ec860a23ee19b6770' - '1d4549dfde9469312bd01335565e708497c09fdb01f5a4deb9b5311dfd411e7e' - '663e69340bfaba445eed23ec1c6448fc4103de3fa5365e60e82f9127ac307461' - 'd3a36ae2246649b4d0fe5879413639f6743389c7e1099d3ca4c647cc0b28af9e' - '10db03bc60f442a9ac14e66e4038ddf768ec567b51fcfe7db46f58bfe9b7027b' - '349103c429b300d4a96f2f8a952365a64177435840199132eca3e351efaa1df2' - 'e698253ffd731402bb21a0c72763dab4abc9d0fad961a690f9e93df86419d46c' - '2fdbb35da1118e846a73108f46dfb3a9cd061a2bae41ff0f384e17e8d91daf5d' - 'd2344aef9e119e50f267877a4c9907154db237653a819eb465b73d063dd9fa51' - '7b42b2e6a95cc054dde479a0b235e5172342b28cf0aed653027d092ee4989c0a' - '4e50dcaf2719868b57e61690d0af576a4b45ee598929fd4c3fa2b335b0bf5751' - 'c954f66e19658def5af836a599c6a716c7f212077eef86e4bf1f1850abcc1d59' - 'dfa87394d99bcbdc2b97b632b5b61298edb1734c9040d680dc123ca8ca6fabea' - '36f5b5c7d25e67cd43e78e12732417c709dc45cb0db8a5b03439e4a3262d3913' - 'c0e3c944bcf871ee216dc22cca671c457997c8dc26deb9f3f686114b8fe2cf6b' - '55b41cc4bb96d0a5b3492103f5425612f6c789cd274a7f0003b887ff474fd07b' - '0da36dbefdfce7bc6d69e4d6b7866c357e590fbe3cf37fd751e2ad30907ee6b7' - '62544d2035295a7d2ca1122ce750281fd188755ef7d59626c39b508f291f5885' - '895b7f94ffa6bb750cafad0f54f95bac3ee728ecb19a98c44d0e1b1ff0dda20f' - 'a17e4632d6e7472370d368a5610c64e518d907041cec0449abf48b2617ad79d8' - 'fd8418f6dbdb8d7388b8f509e16ae7280a3b5f08083dd3ab90be1bc1366bb4ae' - '7f5a848e84e793548be233b0fa6f50a2ca3b9054505950c247c01a0c34770e1e' - 'f4de3e6ab7b952c0383bc64ffdb0da3c53ef9944f03135d82f9b0dc18170587a' - '173054f907a36d0e86ca7bff7d95e248ae9b8f2dca9a5155a7e358d6570c674f' - '5181e44ba283959e6dfa6dd9f2f4cd9e7182bc6a3a37218f2c971579799d89c4' - 'b0bfe1ce9321f51b626ce6e82d750cddd0a8cddf3902a2004cbf5b4de4367a05' - 'f1312828b7a007729d351e85cd470a9208575cd0af2e9fb8cd70c5ec0eef417a' - '211cc6e456b3ba97d07125959fd1d6b520c0fe803ff929858ea25c888b69cf5a' - '6e9ee9c2bb921693f4f34ae0b09d4ebe6ccf06e1cf58cab2a823eab3625c2404' - '143a1ced4eff06da2c036c40a1ed75726b6b5665ec78a97742265ca0cb4d1f58' - '6355766012652f51774982313c7bf2458dc8888789d983f85259e11e2f0b8a42' - 'f51129bd8284b71e88ba9cd54d14454634f4b33d835f04cc416ffa2d3c91fa88' - 'f43e789c001ce186015c61c63ac7cd1b8ec71257ab34492a7c79551aeb3b1a9c' - '4e885475cb16d41a9be70d3e999a4351719daa7c597356505965a10927d6a8fe' - '7577f4fa7894f5e1a2c160b6652463423544ccafa8219d8d081eb3bdc6cec976' - '6ada7211c2cf83ef7b9cb75d09a412336a5d9eec3cf83bdff8972d9ae54a50a2' - 'd1cca9980931932f848e2e610c80ca758f85a1f42d0a948de7541b5785624d9a' - 'd5cdc70218a35132db5c8d68b5664b01c600c1643b357b8df1e2205d3fa0c91c' - '21ed4afe73810c2f14988ace91695b4802582dc14f3e17bd12c1f86116906854' - 'a5d3f8ef300039808f555fb3af67aa6d1eb6e22d3cc33edf2f14a158b1a348c6' - '2a5d78a306832a8dd6d8a1163945eb4ea6edf9afc4d525f479192fd9d8edf617' - '26d59e97027dd11efd0ee837a9c487b12fa26775c66969099b045fdf7e3f28a2' - 'a1b6041e32e8e071b20fa42a0be441a45c85053a853b8b6199b07fe7134bdf19' - '953db26945098ec397b4e562ce623baff1f984227bd5151b27cf754e621037bd' - '24981c88fe2da71ce1979fab0ede910e659ddeaae5b58fc9bf7eb5a1f96710d2' - 'bb96f6cf991f545ee4b4c9d58d15493d2db201f426fe64d29a94fa2046dfee9f' - 'bd5568fe6b760280842f39b5ac20d7e03e6b9a55b843d14b9d7352708b41898d' - '6c64bb1ca76d8e2f5d67e7d3d96da37428e6869ac06fca8234efbe4625403926' - 'b68dde66e5d84d99b8cba828aa94522c28e5455b3cf2f2a7ed65311f9e0ffe16' - '1a86c41f94de419ee81d2df00afaafa2ac0e8c46a22f2c7908f68d74409be5a0' - 'fb9ebb2347a5ed7b261f068686a05c8327931348f5230a005fdfce58d25217bc' - 'bdbbaac0c1f208f69c747292adc5554854336db713747d0f342d5ce681814e80' - 'b182d1dae60661152097db3e2f397766484ca5cacfb990e6f6b97d9e99ba5095' - '3be57efbddc0804b12bafd145c2c0c7ff273a75c4da8b33a5da67c539f00f599' - '762382f5b98029f87d55771a4013bda18421f2e446119a443671569ae1d1bc4b' - '3ab0ccd427cff46af1a98ef2e9c075a5d7ce34075fcdf7b6481879367801598e' - 'a9709e8bef6ad8b6bd102a5230006b24d5867dfd747f7018c7bade2fe07de4a2' - '3ac8bc719def91f885afce4c37837a987616a9b9b5d3abdd2b97a253328c3089' - '85c1b62c3800e04614fc1fd63da6ae906d82ad672c0f51b2d4ad2127e5d33fec' - '682978650b0290c8536cb72dbd3db91b08df46c7aa0fad35871bafbf14857d7c' - '727779bee3186fbe17241e9ab039ad388f9ea53db26bcc9d37a05bcc87381544' - '6e3938276852db6dcf75e342821cc9c2d1547a543af8b754a259065f9d67ad70' - '0ee37dcb116fec19191dfba12bf08805282c2263d72303b35d39a15587a88d62' - '0fe3d55032b81867cb594a9bc16cc86573fdc855b913510552d11da06a78c1fd' - '25146bf21975298b5a6a63f61f7f0eb56c91aaf88a0ed9ee4a585fa2d8ba9551' - '9cdd9a70075c0280ee3eb8fb6b0f08b69c719707dfd7cf72eeb16c4499f90708' - '7c240ce0377c32c6b895065efe900a22851bcc91896c905e648c763bc5c4786b' - 'e074eacb9e55994e5dc243623da26f15796d844470769e6e32961da3bcaf847a' - 'd7e4f9e399a51080fee96185cc5983459c66f827476984f99c8ed366398e7fec' - '25c0e1e082f1f593185331373e8ab24896827be667f664511f05bb5bc7a50acf' - '7fc4a71ad074786eecd19531711c0482623666e9e0b0310ec6ec57e8cbabcaa0' - 'eda6c193ed4cbdff62650b534bead2feb3335930f36bba5b1f0f153ec7716774' - '342273c53623edd5863f42461d0b6cc67fd8d8d65d7b461462ceabdc77007aa6') + '621cbe4120c2f83c39eff9c03aba62b4240c657aaacff6c6063968e597a94f88' + '382f4d6b59da0e3c0ccea985864bd0e1389d97bd6517f068f175a624615f192d' + '36a13e324c8d4001f60799b60e87255db4f5ae9f2a04c2396b2a154fa8c7eb4c' + 'a3aeeeafbeaf8fd0f0884a29e4066e5ce2af0f8d4945b51e420dfdaa4dbfe4b9' + '852be8186f71c46b7f7907a8cef3fd1936f3a288ffeeedba843d73cd2e65caaf' + 'db5a158f9545d554dfad95290aae15fc71f03550c3594e1dabdbc0cfbb0ced29' + 'a8a6eb37672dbe4cfcd6df4ccd755217ee5e433b36b67591a407edcbb262c0eb' + '380a25c2b7cfafb1b9ddff91a94ba8eb7db00fb6a37c5f6bdb1e12ffbdcf2076' + '354b523f924dd066520f6df3f61fb752a7bdfe63b6422d32cb3b860445040878' + 'ac85eca34438d4e38f195da6614663a10e7f3f659e5c9879670a1e9a46a8a1c1' + 'fa0010a847b7156b07aadc7fe976b675d8913df0fa4efdfe5a148a529ff41ec1' + '0581eeba3aab8d851a1af2bf7ac29479d36adf19f7db7f0210d6d5e3ca22b9d8' + 'ff8375e55445678ab17a3d1dff62908dd22d15609160acb670e0fe67198736ee' + 'effc7117a72e0f3cadce63135f18ad513516880e3a6b8121037f6dbfddfc1e46' + '8f515fc87a457462c2d412326907c58dbc4253de95630718c4d56610db24a6de' + '3f833597807e08a85ca5e1fc26a2872f1127a01bfe2336c85f2c78cc547f40c3' + 'e2e9b0439a0e6c9a054c2f35c8f454ec2a4100e7bca9505ea94cd1011dfe7ee3' + '4f4d34bf0b1d3a979988d1dab3cc34d43d267c3b1b3ea1debf3358424302752d' + '02d3058ffe6439033055834f1452edebca5df686d38c2d48bc62f290b11de1a9' + '5185d0763ac3ff351d86b4403421ba8bbb9dac477ceb2816054caf4eb62873a5' + '86e39c652691e6dac338d617d262d0413f7468d74d12305cf8a12806f5e07b5e' + 'e28cfe596fa3087172b00fcdc1f313e1050f97b433a6b4f322a291866b80fc95' + 'fce14bcae4019a1d82b66cf18ad80e2c131eafcb585c1e70843b1f2a7b46a059' + '91499de0d6b5541aae4b544a84af4f85ce25d8bea030dd61cff0f5af2950e26e' + '67e10d47d4fd13b6ca691e9e04aa73a230a7df95318251e232455f8ab5c1eec4' + 'dae01ea768c270bf7e04f909000156d785881116dd05c48f2d6c5c64992943af' + 'f6214537de4f5ab1bc1c9c287bcd9f4108f6bf444b8930a985759753a96241e6' + 'd332fa50c6b6de4cba8b849c18687a420da1448cfc1bbdaafa8e724976fc0ee0' + '8363c5a8baf8dbde51c94413cffc1f9b6da3e3881c98995b30f9264cbf587845' + '5df74f664abbba7302642b7a9791ce891a1a00df2848cb0ac243cf61ca2617dd' + '339d65c6309431bd871810be26eb28ac84468b0dc287d443a40e5116ea7e45c7' + '1e5d15016f9866db88bf0efebe2cabef93955a6a9c54efe254e2219a9938bcba' + '9e3c9dcecb70a1394c2d2ed36ac2161014f95456a7a28fb206ebe14d6e944e28' + '516327a3e0dddd923c20a23dffbfafbad83d9ae782477eb36650a14526e0237f' + '008613913e1d861093ffe980999c1999da8c415f6d6e1f2a630ad872e018048b' + '6a0798d4f3a832bd0a09a22896b59fa4bc69638d99230d81ff3bc45ff16cde82' + '6346ca038c76011ade842ed2fe629897cc53ee7c2517ede0a300d7c8bab13ab0' + 'cd2614a5d8fef3132e08a0037ba66eeec9acfab386df086de8637e39bbd93cef' + '5a7d072a9b3c731818288ee0fe51fdabe5dc257b885eeb5fac6f200bbfc8a63a' + 'a155c770a98ee6bb96cfa0a6f9a5ddb4dce993ea818b83532d90cf57b1615c09' + '4915b4b4ff6c293426671d6bc91c174cc2b2cd7d3d1099a67e9cfe53cd7320b9' + '0d3061a67c8ed855ec78c01f682c12632e36e473d42c3e7008f999dc13bbc5b0' + 'e0c2d8aaa24425aa9f1cfd576d8f0a67d2e39c7108edadc7f322f618cdf9f97e' + '18f30eea4c1efb0f2c7f608a7daa7491c021c15476a1df2323a4f48849b6f77d' + '8ce17fdb9665dcd384744527a1eb155e1d1ff137a0a2a75d275dca0230830645' + '8b34737a4018920ecd31ee40d3a0db1545478258e58028061935e50024ee6b6c' + 'e4060c8d2158d3b2dcf7f8c79eca7490d23ef4897fa8a24388321f77c340fd88' + 'd47c18f14276c6151176c9c7f0780d334a582adcf4b6c71145f328377960bb94' + '25002a2be534ef4b4dbcfbc5598832ef4b64aa0ac849c3b44d796b49e10a3906' + 'c6a731c103ef31589296f60b9e220fe70b0113b49696248c4e379bb3b39ddf03' + 'c5ccfdb8f8695f94f23e9ecd0304ec91b5f4f00f9d6f43426ede4e0038479f24' + '58f5f50ce9e8a6dd4b484f174ad174db397ac5b2b248b56db65acae2122ed805' + '077ce1a4e5fd69de839c5f1bfb24a3bb5d2d548fb4a51250097692626d7c5d6b' + '3b1659b05b3353938a84b9a9f23a1add6f0dc38bb1d81e58010651e07c719a95' + '17d44817baccadcfb23289c15ca23f19fa185aa2a7dd12c88524de8d888f3507' + '54031e5b3f02cc4b80ce6b1702d7c33c6e9251136e1410012c7faa861abffe84' + '3741637112ae6fa0bcc15d73e80810b5e5c6986b8e8a4333f8a08c30c5e21ddb' + '11314e843829ef3fd8058434311dd55eeb7dd512ec8730f28c5b8bc6e101a654' + 'b87f41523bbcb61a8076a46a83b61480a2da79b49c3af3d0310aff02fb3eff7d' + '12f619eb1bcc3dc3a05d3ac077d0970860a8b97ecbd95f735fc95436bc910c1d' + '22f256ab9b1f19aa6ad41ef2ef23bcc67b8d9a2fc24315bac39e5eff4a3d5ef0' + '453be8620a5b47567fd750bdc7226baa2a7bae84d280c082ceea6c822c0152d4' + '167fc8fe20a0122fa0a5dfd7adcf343ba71379732bd0f6ade5a958f4c4c07c84' + 'f99bc96d13d181c0e3604b0b6f3405450cb23504739812cd05d12bb4796d6a4d' + '4e1fed573d0b564faad7770fa1a79525864acb02dd3996bbd28813201d80e941' + 'dcbf48794825acdcfc00e08ae358f2dc51dc8dfde8fc3cf7e304c570b8c477d2' + '3a9876035372157298f0b340c86806a43c193c09a1f732cb116262a8baa6658b' + '4446250eb39ed7afd9d0c79da92f15586bf8dc8c2ba9dec2edaa5d92136e95e6' + '385935abdaedf42ae27e21e895707471a3171a73310d0b97218823d13a1cff52' + '2b890e0612c9aaa0243b3cc86219b47c8f6823af2c57d8f3f100dcc5f664d13e' + '02b98c859ffc4c0d47667e7fa4579699249eb9052b8a985d051630c33d2304ff' + '92c3ed2cbcc0c9bd28a0b669ec68e445be7c5245201bda1c06172712c54d1a17' + '72e51a8f9374766b9afc452a5fbf7646390e89d1ae9f1ec158e22aac6dedf1db' + '5891a8c56eb49b1a9d2c22ee895821c34086a341b4a7e7e57b9e78196dc346a4' + 'e02409488b5cbd9157b6c80abd78ea2972e49092949e902811dabbf56f3f6d0c' + 'adba48cb1daf77542162e4da61caf498c83b2de5abbc5545f68a8ac290fe7b4a' + 'bf1960038604a3ad0ab11bc47007f8d7a97941c3b7f44d4487e2d79d742ca870' + '836723f0d3ec3d10b5ddabd09f7dddc76eefa261b6105b544f9dae7f4416146e' + 'b64e7a874532fe0475d4b3c192fb215948c06392a7ad04fd47a28289cc809967' + 'b49ab150e95bd390101225ba6ac3983df2a5a0bbc47d506a88c9caeefbd4ed3f' + '79f1646fa548a9da9986ded4a51842751cdea7ec579d28e6cc5d86e4a5a89f27' + '233318923f5fd7dd4605c79bb2adfbcdd2e8cc7e242b1e080e59aed1f6b86a29' + 'ceba0f6e583570db571ee9c3fe64b74ea58a474d114847cadd3ad70386c7c199' + 'fb3bee9ba5e4f9b2e8b7e8ec2fb08e12d85542bae8b86e7a4c69f698f720253b' + 'b01320b3c9037bb1fed03c7b8002e7b6af52fc7bb85cdf84cfc96842c7c9657d' + 'e3c10b3eb07b41e804b6a500c848def6f72cb04d94d00657dab307e68e891536' + '5e8113ca39795b59a0144b68db88a197c43c3b907c3f7bf2a5e1c1dd3a41b19c' + '4130af022a9ec1717cac82e3d3d5a7144a9c17611ac4db5150f8adede4ed3276' + '24e9029d664255a96c0346f7e53316640be6a6480bd77fcd7532a2b88881b485' + '754d84bc288da89cdec4b1cf5d216195aaa2f3d4046043d8b487bdd2f5a4c837' + '2d6ce50423f65dded048f64eb0dafe62448ad4786add9295d90fcfa6f316412a' + 'b3ba2ac22cd4263419f3daf93334745bccd1c70c429812c95821ed1e2d649159' + 'a74c4203ccc6f858fa9ee2c203cad1bf5de2bd868650d18c65034897e29e2b5d' + 'fe6bb4725238cbd00b856ed757392bdd2f0e7adb5216ee7738654b7a74594810' + '6fcc769d47e71afd496eef16a6c77d0e1eff983a20b16a7fadb6f4cc1c8ee6d7' + '432b51884bad4e578a64a7a24a8652de025c71c9129d0d3cd4120c71a7d0d57c' + '034a036cbdcbe33bb17a7951658da438ff7047f4f86fe8e5ebac5d84438ed0bd' + '703846000b96d426c50b400f5efbc8c2c877ce7c844f64ecdba86275035577b3')