From 4b2b312732354b298738cb88d52dc6f1f04d02b9 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Wed, 18 May 2022 22:07:03 +0200 Subject: [PATCH] python: Update to 3.9.13 --- ...g-make-_sysconfigdata.py-relocatable.patch | 4 +- .../0002-restore-setup-config.patch | 4 +- ...t-threads-and-make-it-default-on-min.patch | 4 +- ...gcc-internal-defines-to-python-platf.patch | 4 +- ...igure-MACHDEP-and-platform-for-build.patch | 4 +- ...0006-MINGW-preset-configure-defaults.patch | 4 +- ...largefile-support-for-windows-builds.patch | 4 +- ...0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch | 4 +- .../0009-MINGW-init-system-calls.patch | 6 +- ...INGW-build-in-windows-modules-winreg.patch | 4 +- ...etermine-if-pwdmodule-should-be-used.patch | 4 +- ...-Mingw-recognition-to-pyport.h-to-al.patch | 4 +- ...013-MINGW-configure-for-shared-build.patch | 4 +- .../0014-MINGW-dynamic-loading-support.patch | 4 +- ...nore-main-program-for-frozen-scripts.patch | 4 +- ...-MINGW-setup-_multiprocessing-module.patch | 4 +- .../0017-MINGW-setup-select-module.patch | 4 +- ...up-_ctypes-module-with-system-libffi.patch | 4 +- ...ct-winsock2-and-setup-_socket-module.patch | 6 +- ...0020-MINGW-exclude-unix-only-modules.patch | 4 +- ...NGW-setup-msvcrt-and-_winapi-modules.patch | 4 +- ...nfig-MINGW-build-extensions-with-GCC.patch | 4 +- .../0023-MINGW-setup-_ssl-module.patch | 4 +- ...ation-of-posix-build-in-sysconfig.py.patch | 4 +- ...W-support-stdcall-without-underscore.patch | 6 +- ...ead-rename-to-avoid-failure-on-windo.patch | 4 +- .../0027-MINGW-customize-site.patch | 4 +- .../0028-add-python-config-sh.patch | 4 +- .../0029-cross-darwin-feature.patch | 4 +- .../0030-mingw-system-libffi.patch | 4 +- ...sys-mingw-prefer-unix-sep-if-MSYSTEM.patch | 10 +- .../0032-mingw-use-posix-getpath.patch | 8 +- ...mingw-add-ModuleFileName-dir-to-PATH.patch | 4 +- ...dd-BUILDIN_WIN32_MODULEs-time-msvcrt.patch | 4 +- ...s-cygwin-semi-native-build-sysconfig.patch | 4 +- ...sysconfig-mingw-sysconfig-like-posix.patch | 4 +- ...rlier-so-we-can-use-it-in-distutils-.patch | 4 +- ...d-multiarch-paths-if-cross-compiling.patch | 4 +- ...ngw-use-backslashes-in-compileall-py.patch | 4 +- ...-msys-convert_path-fix-and-root-hack.patch | 4 +- .../0041-allow-static-tcltk.patch | 4 +- .../0042-mingw-pdcurses_ISPAD.patch | 4 +- mingw-w64-python/0043-grammar-fixes.patch | 4 +- mingw-w64-python/0044-builddir-fixes.patch | 4 +- ...sys-monkeypatch-os-system-via-sh-exe.patch | 4 +- ...place-slashes-used-in-io-redirection.patch | 4 +- .../0047-remove_path_max.default.patch | 4 +- .../0048-dont-link-with-gettext.patch | 4 +- mingw-w64-python/0049-ctypes-python-dll.patch | 4 +- .../0050-gdbm-module-includes.patch | 4 +- .../0051-use-gnu_printf-in-format.patch | 4 +- ...w-fix-ssl-dont-use-enum_certificates.patch | 10 +- ...fix-using-dllhandle-and-winver-mingw.patch | 4 +- ...-config-so-msvccompiler-get_build_ve.patch | 4 +- ...5-MINGW-link-with-additional-library.patch | 4 +- mingw-w64-python/0056-install-msilib.patch | 4 +- .../0057-fix-signal-module-build.patch | 4 +- ...-build-winconsoleio-and-_testconsole.patch | 4 +- mingw-w64-python/0059-expose-sem_unlink.patch | 4 +- mingw-w64-python/0060-cygpty-isatty.patch | 8 +- .../0061-disable-broken-gdbm-module.patch | 4 +- ...win-resource-files-and-build-pythonw.patch | 4 +- mingw-w64-python/0063-3.7-mpdec-mingw.patch | 4 +- mingw-w64-python/0064-disable-readline.patch | 4 +- mingw-w64-python/0065-fix-isselectable.patch | 4 +- ...66-use-_wcsnicmp-instead-wcsncasecmp.patch | 4 +- .../0067-_xxsubinterpretersmodule.patch | 4 +- .../0068-sqlite3-module-defines.patch | 4 +- ...069-configure.ac-fix-inet_pton-check.patch | 4 +- .../0070-set-venv-activate-path-unix.patch | 4 +- .../0071-venv-creation-fixes.patch | 4 +- .../0072-pass-gen-profile-ldflags.patch | 4 +- ...indows-must-link-ext-with-python-lib.patch | 4 +- .../0074-importlib-bootstrap-path-sep.patch | 4 +- mingw-w64-python/0075-pathlib-path-sep.patch | 4 +- mingw-w64-python/0076-warnings-fixes.patch | 12 +- .../0077-fix-build-testinternalcapi.patch | 4 +- .../0078-extend-MS_WINDOWS-flag.patch | 4 +- mingw-w64-python/0079-clang-arm64.patch | 4 +- ...configure.ac-set-MINGW-stack-reserve.patch | 4 +- ...081-Don-t-use-os.pathsep-to-find-EOF.patch | 4 +- ...ion-suffix-for-c-extensions-on-mingw.patch | 4 +- ...the-get_platform-method-in-sysconfig.patch | 4 +- ...ler-customize-mingw-cygwin-compilers.patch | 4 +- ...-distutils-compiler-enable-new-dtags.patch | 4 +- ...tils-MINGW-build-extensions-with-GCC.patch | 4 +- ...ngw32CCompiler-as-default-compiler-f.patch | 4 +- .../0088-distutils-find-import-library.patch | 4 +- ...circular-dependency-from-time-module.patch | 4 +- ...lization-of-posix-build-in-distutils.patch | 4 +- ...distutils-mingw-sysconfig-like-posix.patch | 4 +- .../0092-distutils-get_versions-fixes.patch | 4 +- ...93-distutils-install-layout-as-posix.patch | 4 +- ...-msys-convert_path-fix-and-root-hack.patch | 4 +- ...-distutils-mingw-build-optimized-ext.patch | 4 +- ...ccompiler-dont-strip-modules-if-pyde.patch | 4 +- ...istutils-get-compilers-from-env-vars.patch | 4 +- ...tutils-add-windmc-to-cygwinccompiler.patch | 4 +- .../0099-distutils-fix-msvc9-import.patch | 4 +- ...tils-mingw-add-LIBPL-to-library-dirs.patch | 4 +- ...-the-get_platform-method-in-distutil.patch | 4 +- ...02-build-Fix-ncursesw-include-lookup.patch | 4 +- .../0103-tests-fix-test_bytes.patch | 4 +- ...e-not-raising-for-invalid-year-value.patch | 4 +- ...brary-c-should-return-None-with-ucrt.patch | 4 +- ...uild-Disable-checks-for-dlopen-dlfcn.patch | 4 +- ...stall-location-of-the-import-library.patch | 4 +- ...NV_EXCL-for-the-shared-Python-module.patch | 4 +- ...venvlauncher-build-installation-into.patch | 4 +- ...onfigure.ac-set-_WIN32_WINNT-version.patch | 4 +- ....ac-don-t-check-for-clock_-functions.patch | 4 +- ...-normpath-paths-coming-from-env-vars.patch | 4 +- ...Add-support-for-Windows-7-Python-3.9.patch | 12 +- ...ld-and-add-some-mingw-specific-tests.patch | 4 +- .../0115-decimal-backport-build-fixes.patch | 4 +- ...smoketests-test-that-_decimal-exists.patch | 4 +- .../0117-Prefer-sysconfig.python_build.patch | 4 +- ...move-checks-for-ancient-gcc-binutils.patch | 4 +- ...CC-env-var-before-passing-to-subproc.patch | 4 +- ...0-_testconsole.c-Fix-casing-path-sep.patch | 4 +- ...t-architecture-markers-for-python-on.patch | 4 +- .../0122-distutils-add-back-gcc_version.patch | 4 +- ...ix-mingw-cross-compiling-in-setup.py.patch | 4 +- ...p-python-for-setting-up-correct-vers.patch | 4 +- ...25-Fix-buffer-overflow-in-Py_GetSepW.patch | 4 +- ...ecessary-strlen-in-Py_NormalizeSepsW.patch | 4 +- ...sesw-pkg-config-when-cross-compiling.patch | 4 +- .../0128-Use-CC-instead-of-cc.patch | 4 +- ...est-suite-support-Expat-2.4.5-GH-314.patch | 4 +- ...130-Avoid-using-sysconfig-in-site.py.patch | 4 +- .../0131-Commit-regenerated-importlib.patch | 4 +- ...e-a-header-in-the-check-for-_beginth.patch | 4 +- ...ault-to-without-c-locale-coercion-on.patch | 4 +- ...-CI-remove-without-c-locale-coercion.patch | 4 +- mingw-w64-python/PKGBUILD | 274 +++++++++--------- 135 files changed, 426 insertions(+), 426 deletions(-) diff --git a/mingw-w64-python/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch b/mingw-w64-python/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch index fbca1137d6..00088b4b24 100644 --- a/mingw-w64-python/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch +++ b/mingw-w64-python/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch @@ -1,4 +1,4 @@ -From 41044323dae1cce3a4827bf608ff1c91d633e6d4 Mon Sep 17 00:00:00 2001 +From 9cf336304ee9441103bf04fb571abad50d8d4f3c Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:51:10 +0530 Subject: [PATCH 001/N] sysconfig: make _sysconfigdata.py relocatable @@ -56,5 +56,5 @@ index e3f79bf..45eab2a 100644 # Create file used for sys.path fixup -- see Modules/getpath.c with open('pybuilddir.txt', 'w', encoding='utf8') as f: -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0002-restore-setup-config.patch b/mingw-w64-python/0002-restore-setup-config.patch index 43ee8678ad..5dc943ba0e 100644 --- a/mingw-w64-python/0002-restore-setup-config.patch +++ b/mingw-w64-python/0002-restore-setup-config.patch @@ -1,4 +1,4 @@ -From 44e46ea469fc9a613948fa721cfaba5f6fb23f20 Mon Sep 17 00:00:00 2001 +From 8e26e7f5b30fe0f820936d2301ba1ba93234d3f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:12 +0530 @@ -78,5 +78,5 @@ index aa515da..bd41d06 100644 mv config.c Modules -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0003-build-add-with-nt-threads-and-make-it-default-on-min.patch b/mingw-w64-python/0003-build-add-with-nt-threads-and-make-it-default-on-min.patch index 970bc6efb1..20f053ea18 100644 --- a/mingw-w64-python/0003-build-add-with-nt-threads-and-make-it-default-on-min.patch +++ b/mingw-w64-python/0003-build-add-with-nt-threads-and-make-it-default-on-min.patch @@ -1,4 +1,4 @@ -From bfa4467780f0522ae1f44413339251ceeef3ebad Mon Sep 17 00:00:00 2001 +From ca8e7f49a6bde8ed51d2dba1d24cbde366b68b71 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 @@ -285,5 +285,5 @@ index bf695e9..3bb513f 100644 #undef PACKAGE_BUGREPORT -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch b/mingw-w64-python/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch index 1935866026..448f9a599e 100644 --- a/mingw-w64-python/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch +++ b/mingw-w64-python/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch @@ -1,4 +1,4 @@ -From f10e9608fb401d1eb0895bf241a4bb4d3d1120c1 Mon Sep 17 00:00:00 2001 +From 87709045ef82a4f198913df6757e75e2c597d788 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 @@ -40,5 +40,5 @@ index 4bd4eb4..475c2a8 100644 Symbols and macros to supply platform-independent interfaces to basic C language & library operations whose spellings vary across platforms. -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch b/mingw-w64-python/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch index a1fc3d6293..3b3fa4773a 100644 --- a/mingw-w64-python/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch +++ b/mingw-w64-python/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch @@ -1,4 +1,4 @@ -From a2d89908a36868e97f0dd7aa46426f19571fa9d2 Mon Sep 17 00:00:00 2001 +From faffc672cd7f9aa312d32d752f614f6ab9da9b85 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 @@ -59,5 +59,5 @@ index fecb3af..69ffb3b 100644 # Some systems cannot stand _XOPEN_SOURCE being defined at all; they -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0006-MINGW-preset-configure-defaults.patch b/mingw-w64-python/0006-MINGW-preset-configure-defaults.patch index 9d3da087dc..e16cafdb4b 100644 --- a/mingw-w64-python/0006-MINGW-preset-configure-defaults.patch +++ b/mingw-w64-python/0006-MINGW-preset-configure-defaults.patch @@ -1,4 +1,4 @@ -From 49183780947476ca2bd144de13d554d58a9dd47a Mon Sep 17 00:00:00 2001 +From 79202e60e41e8749ab7117369340fd143d0c3a57 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 @@ -86,5 +86,5 @@ index 69ffb3b..179c048 100644 save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -Wl,--no-as-needed" -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0007-MINGW-configure-largefile-support-for-windows-builds.patch b/mingw-w64-python/0007-MINGW-configure-largefile-support-for-windows-builds.patch index 5eda34d032..67a05e1df3 100644 --- a/mingw-w64-python/0007-MINGW-configure-largefile-support-for-windows-builds.patch +++ b/mingw-w64-python/0007-MINGW-configure-largefile-support-for-windows-builds.patch @@ -1,4 +1,4 @@ -From 52a2a0d1e0043deb0c3418345b96283444675dba Mon Sep 17 00:00:00 2001 +From 76ae36e5b16302eede91d47a21a99bbf0e396920 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 @@ -39,5 +39,5 @@ index 179c048..04c57b8 100644 [Defined to enable large file support when an off_t is bigger than a long and long long is at least as big as an off_t. You may need -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch b/mingw-w64-python/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch index b6ab1eff7d..d4a6826a22 100644 --- a/mingw-w64-python/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch +++ b/mingw-w64-python/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch @@ -1,4 +1,4 @@ -From b59e95c5876f943ef9bba2de5e4b863863b6b8ba Mon Sep 17 00:00:00 2001 +From 35f793246f129bc3be9dee9a4dc73b789f75bc00 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 @@ -39,5 +39,5 @@ index 04c57b8..a084b3b 100644 for dir in $SRCDIRS; do if test ! -d $dir; then -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0009-MINGW-init-system-calls.patch b/mingw-w64-python/0009-MINGW-init-system-calls.patch index 813e8fe95a..d5a97348ca 100644 --- a/mingw-w64-python/0009-MINGW-init-system-calls.patch +++ b/mingw-w64-python/0009-MINGW-init-system-calls.patch @@ -1,4 +1,4 @@ -From 1217d4af5e83b3e5a6319b728cd4f2f47779ef47 Mon Sep 17 00:00:00 2001 +From 4a879a16396e6c5456f6d462c1ca00ead53433fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:19 +0530 @@ -39,7 +39,7 @@ index 5c1299d..9b364fe 100644 +@INITSYS@ -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal posixmodule.c + diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 29d6126..3894e35 100644 +index 1270af7..c8b87a7 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -310,6 +310,27 @@ corresponding Unix manual entries for more information on calls."); @@ -120,5 +120,5 @@ index a084b3b..ebc643c 100644 # it may influence the way we can build extensions, so distutils # needs to check it -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0010-MINGW-build-in-windows-modules-winreg.patch b/mingw-w64-python/0010-MINGW-build-in-windows-modules-winreg.patch index 3a9b17c3d6..0101610dcd 100644 --- a/mingw-w64-python/0010-MINGW-build-in-windows-modules-winreg.patch +++ b/mingw-w64-python/0010-MINGW-build-in-windows-modules-winreg.patch @@ -1,4 +1,4 @@ -From 42e9a5814cbf5395cd76949da11be7102c74f301 Mon Sep 17 00:00:00 2001 +From ccf7b2bf2d530d194ab028d1773d98639053f5a3 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 @@ -75,5 +75,5 @@ index ebc643c..2211b34 100644 # For a single AC_DEFINE, no template is needed. AH_TEMPLATE(_REENTRANT, -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0011-MINGW-determine-if-pwdmodule-should-be-used.patch b/mingw-w64-python/0011-MINGW-determine-if-pwdmodule-should-be-used.patch index bd2ab5841a..247729b3b7 100644 --- a/mingw-w64-python/0011-MINGW-determine-if-pwdmodule-should-be-used.patch +++ b/mingw-w64-python/0011-MINGW-determine-if-pwdmodule-should-be-used.patch @@ -1,4 +1,4 @@ -From 25e0ac1a15f3ec3ac4c977aa8480142b3eef77b2 Mon Sep 17 00:00:00 2001 +From 712cba838026cf94e107689f7aae2d3656f69b97 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 @@ -61,5 +61,5 @@ index 2211b34..0b8d6c2 100644 # For a single AC_DEFINE, no template is needed. AH_TEMPLATE(_REENTRANT, -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch b/mingw-w64-python/0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch index 8dd92171b9..1fa9440954 100644 --- a/mingw-w64-python/0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch +++ b/mingw-w64-python/0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch @@ -1,4 +1,4 @@ -From 078d02f6b3bda047bc63e78eec5ef84f02c15506 Mon Sep 17 00:00:00 2001 +From 31ad8ecc08178ad2f54e68d4c94a25441f6cf70a 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 @@ -78,5 +78,5 @@ index 0bec170..69f8e19 100644 self.detect_modules() -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0013-MINGW-configure-for-shared-build.patch b/mingw-w64-python/0013-MINGW-configure-for-shared-build.patch index f40e3c9d66..6de688d653 100644 --- a/mingw-w64-python/0013-MINGW-configure-for-shared-build.patch +++ b/mingw-w64-python/0013-MINGW-configure-for-shared-build.patch @@ -1,4 +1,4 @@ -From 19b8974c7a399a4e10ee7eaef56babab2ac713ca Mon Sep 17 00:00:00 2001 +From e9b75a99a8daf22ce8b32283e16ad2c2d5431430 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 @@ -65,5 +65,5 @@ index 0b8d6c2..95d0a54 100644 esac -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0014-MINGW-dynamic-loading-support.patch b/mingw-w64-python/0014-MINGW-dynamic-loading-support.patch index ec94edae03..2d9bcf5cb0 100644 --- a/mingw-w64-python/0014-MINGW-dynamic-loading-support.patch +++ b/mingw-w64-python/0014-MINGW-dynamic-loading-support.patch @@ -1,4 +1,4 @@ -From 6979656573ab99d85001e8ee9a73fcb636a2489d Mon Sep 17 00:00:00 2001 +From 0bb65945f92f47a1edd777be19808ad3c43e8a83 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 @@ -100,5 +100,5 @@ index 95d0a54..d2f1deb 100644 case $ac_sys_system in AIX*) -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0015-MINGW-ignore-main-program-for-frozen-scripts.patch b/mingw-w64-python/0015-MINGW-ignore-main-program-for-frozen-scripts.patch index 86002dde06..26a5cd4cad 100644 --- a/mingw-w64-python/0015-MINGW-ignore-main-program-for-frozen-scripts.patch +++ b/mingw-w64-python/0015-MINGW-ignore-main-program-for-frozen-scripts.patch @@ -1,4 +1,4 @@ -From 7682487189a4cbcd21c61070c2841505bde2fa10 Mon Sep 17 00:00:00 2001 +From 64519dac963146338b46211276f6a321f553d982 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 @@ -48,5 +48,5 @@ index d2f1deb..746e801 100644 SRCDIRS="Parser Parser/pegen Objects Python Modules Modules/_io Programs" case $host in -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0016-MINGW-setup-_multiprocessing-module.patch b/mingw-w64-python/0016-MINGW-setup-_multiprocessing-module.patch index 149d9c4a5f..e9166ad44a 100644 --- a/mingw-w64-python/0016-MINGW-setup-_multiprocessing-module.patch +++ b/mingw-w64-python/0016-MINGW-setup-_multiprocessing-module.patch @@ -1,4 +1,4 @@ -From 881f0e5d8193e991a1859c45e18d4c20ecd8ceb9 Mon Sep 17 00:00:00 2001 +From 19735a11c84defe17e220deca90ed7eaab076987 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 @@ -30,5 +30,5 @@ index 69f8e19..ce72884 100644 def detect_uuid(self): -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0017-MINGW-setup-select-module.patch b/mingw-w64-python/0017-MINGW-setup-select-module.patch index 9e1f2b38ff..b73a96b2ae 100644 --- a/mingw-w64-python/0017-MINGW-setup-select-module.patch +++ b/mingw-w64-python/0017-MINGW-setup-select-module.patch @@ -1,4 +1,4 @@ -From 8c0dd2174c7b267e58520534eec619a04e10d7b6 Mon Sep 17 00:00:00 2001 +From bdaeb1c4307cdb79ae5f99c5cec0467e07b7621a 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 @@ -56,5 +56,5 @@ index ce72884..2142b7e 100644 # Fred Drake's interface to the Python parser self.add(Extension('parser', ['parsermodule.c'])) -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0018-MINGW-setup-_ctypes-module-with-system-libffi.patch b/mingw-w64-python/0018-MINGW-setup-_ctypes-module-with-system-libffi.patch index f1ccd5f4b6..6be7146c0d 100644 --- a/mingw-w64-python/0018-MINGW-setup-_ctypes-module-with-system-libffi.patch +++ b/mingw-w64-python/0018-MINGW-setup-_ctypes-module-with-system-libffi.patch @@ -1,4 +1,4 @@ -From aa9f572d3fbba713bd7a655997879e0e69b531c6 Mon Sep 17 00:00:00 2001 +From 4f4524df86343f8615da844733ff4f8bcfb52aa4 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 @@ -41,5 +41,5 @@ index 2142b7e..52d25e6 100644 if sysconfig.get_config_var('HAVE_LIBDL'): -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0019-MINGW-defect-winsock2-and-setup-_socket-module.patch b/mingw-w64-python/0019-MINGW-defect-winsock2-and-setup-_socket-module.patch index 06f6f8c31c..55bb825955 100644 --- a/mingw-w64-python/0019-MINGW-defect-winsock2-and-setup-_socket-module.patch +++ b/mingw-w64-python/0019-MINGW-defect-winsock2-and-setup-_socket-module.patch @@ -1,4 +1,4 @@ -From ee87185c71c832caf5653ac955996dcbf2cdeee7 Mon Sep 17 00:00:00 2001 +From 47044fca9b0a9206e1825a074d302e9e78f50391 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:30 +0530 @@ -28,7 +28,7 @@ index 513065d..9be43fd 100644 +# force detection of winsock2 functionality - require wxp or newer +ac_cv_func_getpeername=yes diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c -index a22060d..be91ad0 100644 +index 6d6c92e..c6c032a 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -302,7 +302,7 @@ http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/net/getaddrinfo.c.diff?r1=1.82& @@ -163,5 +163,5 @@ index 52d25e6..3b5f4a5 100644 self.add(Extension('_socket', ['socketmodule.c'], **kwargs)) elif self.compiler.find_library_file(self.lib_dirs, 'net'): -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0020-MINGW-exclude-unix-only-modules.patch b/mingw-w64-python/0020-MINGW-exclude-unix-only-modules.patch index 51f5ac26b1..3d0a48c2be 100644 --- a/mingw-w64-python/0020-MINGW-exclude-unix-only-modules.patch +++ b/mingw-w64-python/0020-MINGW-exclude-unix-only-modules.patch @@ -1,4 +1,4 @@ -From 6d339cfeee2cfe967b078991e3342d3fa7036048 Mon Sep 17 00:00:00 2001 +From 95b1b73dc8fd865580d90b3444ecceeff5cd2b9c 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 @@ -90,5 +90,5 @@ index 3b5f4a5..cb2fbbe 100644 def detect_socket(self): # socket(2) -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0021-MINGW-setup-msvcrt-and-_winapi-modules.patch b/mingw-w64-python/0021-MINGW-setup-msvcrt-and-_winapi-modules.patch index a68d7f2be5..55db3eb465 100644 --- a/mingw-w64-python/0021-MINGW-setup-msvcrt-and-_winapi-modules.patch +++ b/mingw-w64-python/0021-MINGW-setup-msvcrt-and-_winapi-modules.patch @@ -1,4 +1,4 @@ -From 311b656f56bd9f9bbadedc8d48568dc7b730d496 Mon Sep 17 00:00:00 2001 +From 5b2e3721c924b8c5751e6ecf82e3d93e8cf5f1d4 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 @@ -89,5 +89,5 @@ index cb2fbbe..7875daf 100644 # Andrew Kuchling's zlib module. Note that some versions of zlib # 1.1.3 have security problems. See CERT Advisory CA-2002-07: -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0022-sysconfig-MINGW-build-extensions-with-GCC.patch b/mingw-w64-python/0022-sysconfig-MINGW-build-extensions-with-GCC.patch index 79be15ccff..fb180d1497 100644 --- a/mingw-w64-python/0022-sysconfig-MINGW-build-extensions-with-GCC.patch +++ b/mingw-w64-python/0022-sysconfig-MINGW-build-extensions-with-GCC.patch @@ -1,4 +1,4 @@ -From a6af93e0e29b0717468a68a4a112d8ed96c2d84c Mon Sep 17 00:00:00 2001 +From 8a33a26323d936a562a34490a2e9b866860be741 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 20:52:42 +0200 Subject: [PATCH 022/N] sysconfig: MINGW build extensions with GCC @@ -21,5 +21,5 @@ index 45eab2a..42de9b3 100644 return 'win-amd64' if '(arm)' in sys.version.lower(): -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0023-MINGW-setup-_ssl-module.patch b/mingw-w64-python/0023-MINGW-setup-_ssl-module.patch index e0b479c227..4d75d9f6e9 100644 --- a/mingw-w64-python/0023-MINGW-setup-_ssl-module.patch +++ b/mingw-w64-python/0023-MINGW-setup-_ssl-module.patch @@ -1,4 +1,4 @@ -From 59720eb1e249424b884d34fcb782e9979855086e Mon Sep 17 00:00:00 2001 +From 04f236b4dca719e106d9d95928e4d05b8e03f9f1 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 @@ -26,5 +26,5 @@ index 7875daf..c6ee784 100644 # libssl and libcrypto not found self.missing.extend(['_ssl', '_hashlib']) -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch b/mingw-w64-python/0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch index 1a14f872a3..6533d0e5bb 100644 --- a/mingw-w64-python/0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch +++ b/mingw-w64-python/0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch @@ -1,4 +1,4 @@ -From 55c27690d7e0132e80f7fe13558f50cf7c9d9bed Mon Sep 17 00:00:00 2001 +From e594bda07d9a2a36b80d43403336f487b06ccf71 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 @@ -76,5 +76,5 @@ index 42de9b3..65cb345 100644 # If srcdir is a relative path (typically '.' or '..') # then it should be interpreted relative to the directory -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0025-MINGW-support-stdcall-without-underscore.patch b/mingw-w64-python/0025-MINGW-support-stdcall-without-underscore.patch index 27b45d5f5f..892ab38970 100644 --- a/mingw-w64-python/0025-MINGW-support-stdcall-without-underscore.patch +++ b/mingw-w64-python/0025-MINGW-support-stdcall-without-underscore.patch @@ -1,4 +1,4 @@ -From 6459c8e345fd99361f3c8d95b2eccff3e3e102ed Mon Sep 17 00:00:00 2001 +From 55f33ee5d61417f6fcd8c2e8df4d17ba875612fa 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 @@ -13,7 +13,7 @@ Co-authored-by: Алексей 1 file changed, 19 insertions(+) diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c -index ceae67e..b9cf96b 100644 +index 0ffc885..fbb5fb6 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -3406,6 +3406,18 @@ static PPROC FindAddress(void *handle, const char *name, PyObject *type) @@ -50,5 +50,5 @@ index ceae67e..b9cf96b 100644 return NULL; #endif -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch b/mingw-w64-python/0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch index f1e4cca2a4..b505d86141 100644 --- a/mingw-w64-python/0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch +++ b/mingw-w64-python/0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch @@ -1,4 +1,4 @@ -From 771032811cd2472fcf69184122861033fbd2def4 Mon Sep 17 00:00:00 2001 +From 69ec0e917c103159a8f2c7a2001aad2cbd43f5a6 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 @@ -27,5 +27,5 @@ index c6ee784..05f0bdf 100644 if filename in updated_files: newupdated_files.append(newfilename) -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0027-MINGW-customize-site.patch b/mingw-w64-python/0027-MINGW-customize-site.patch index 6eaa37868a..283ed80812 100644 --- a/mingw-w64-python/0027-MINGW-customize-site.patch +++ b/mingw-w64-python/0027-MINGW-customize-site.patch @@ -1,4 +1,4 @@ -From f205d56db21bab44d1f956d0f4f14dd60fdac88d Mon Sep 17 00:00:00 2001 +From 703e6a88ac8495cb18d104a6e933a72141e0e318 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 @@ -55,5 +55,5 @@ index 9e617af..b344f03 100644 path = os.path.join(prefix, libdir, "python%d.%d" % sys.version_info[:2], -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0028-add-python-config-sh.patch b/mingw-w64-python/0028-add-python-config-sh.patch index 8e5580dea8..eada651f5a 100644 --- a/mingw-w64-python/0028-add-python-config-sh.patch +++ b/mingw-w64-python/0028-add-python-config-sh.patch @@ -1,4 +1,4 @@ -From 1f2349347249486deb29a8f5e4e8f7fae4b163d1 Mon Sep 17 00:00:00 2001 +From 7a8239aeb52e18e5e0b0a4c5b067ffe8ad209c14 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 @@ -158,5 +158,5 @@ index 2602fe2..e0e048a 100644 esac done -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0029-cross-darwin-feature.patch b/mingw-w64-python/0029-cross-darwin-feature.patch index 7e4a9a4304..ad755cfc8b 100644 --- a/mingw-w64-python/0029-cross-darwin-feature.patch +++ b/mingw-w64-python/0029-cross-darwin-feature.patch @@ -1,4 +1,4 @@ -From b31b4c2fb7cc0a050027b630ef0cf991be02bf52 Mon Sep 17 00:00:00 2001 +From c0e0b65b69b31df3e229fdb6941b6b5326df3859 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 @@ -134,5 +134,5 @@ index 98a10d2..7a34f8b 100644 MACOSX_DEFAULT_ARCH="x86_64" ;; -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0030-mingw-system-libffi.patch b/mingw-w64-python/0030-mingw-system-libffi.patch index 570d46b2a6..9f771e471a 100644 --- a/mingw-w64-python/0030-mingw-system-libffi.patch +++ b/mingw-w64-python/0030-mingw-system-libffi.patch @@ -1,4 +1,4 @@ -From cc029e2c6ffacfd53f5a5726e7bd4e01f5c53114 Mon Sep 17 00:00:00 2001 +From 3044343edac3e0ecd86b4e70696876b700d5079b 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 @@ -26,5 +26,5 @@ index 05f0bdf..8453b28 100644 if sysconfig.get_config_var('HAVE_LIBDL'): -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch b/mingw-w64-python/0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch index 6e33bf699f..beb5522e46 100644 --- a/mingw-w64-python/0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch +++ b/mingw-w64-python/0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch @@ -1,4 +1,4 @@ -From 2446ca950db16bd455f8c25fafedc52f460adf7f Mon Sep 17 00:00:00 2001 +From 29f0955c791e24aa2fc4fb2006e5d7b5d22f5c3a Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:51:46 +0530 Subject: [PATCH 031/N] msys mingw prefer unix sep if MSYSTEM @@ -211,10 +211,10 @@ index 6f77177..77f5614 100644 try: diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 3894e35..88e2afb 100644 +index c8b87a7..795ab7a 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c -@@ -3759,6 +3759,7 @@ posix_getcwd(int use_bytes) +@@ -3769,6 +3769,7 @@ posix_getcwd(int use_bytes) return PyErr_SetFromWindowsErr(0); } @@ -222,7 +222,7 @@ index 3894e35..88e2afb 100644 PyObject *resobj = PyUnicode_FromWideChar(wbuf2, len); if (wbuf2 != wbuf) { PyMem_RawFree(wbuf2); -@@ -4322,6 +4323,7 @@ os__getfinalpathname_impl(PyObject *module, path_t *path) +@@ -4332,6 +4333,7 @@ os__getfinalpathname_impl(PyObject *module, path_t *path) target_path = tmp; } @@ -393,5 +393,5 @@ index 23d0e38..37a7670 100644 tail = filepath; else -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0032-mingw-use-posix-getpath.patch b/mingw-w64-python/0032-mingw-use-posix-getpath.patch index bf825283bf..b37397b915 100644 --- a/mingw-w64-python/0032-mingw-use-posix-getpath.patch +++ b/mingw-w64-python/0032-mingw-use-posix-getpath.patch @@ -1,4 +1,4 @@ -From 7c5b1aa054c99c6529fbc709d6ddc1190ce7d86f Mon Sep 17 00:00:00 2001 +From 14ca4c5c92a2a747e6bf8846582df6d4089e7fa5 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 @@ -436,10 +436,10 @@ index 5dbe57c..bede134 100644 status = calculate_init(&calculate, config); diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 88e2afb..add8ed5 100644 +index 795ab7a..e636aed 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c -@@ -4049,7 +4049,7 @@ _listdir_windows_no_opendir(path_t *path, PyObject *list) +@@ -4059,7 +4059,7 @@ _listdir_windows_no_opendir(path_t *path, PyObject *list) Py_END_ALLOW_THREADS /* FindNextFile sets error to ERROR_NO_MORE_FILES if it got to the end of the directory. */ @@ -501,5 +501,5 @@ index 26e97df..75ee355 100644 /* Get an absolute path. -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0033-mingw-add-ModuleFileName-dir-to-PATH.patch b/mingw-w64-python/0033-mingw-add-ModuleFileName-dir-to-PATH.patch index 7dab12af9f..b7c7d4e67e 100644 --- a/mingw-w64-python/0033-mingw-add-ModuleFileName-dir-to-PATH.patch +++ b/mingw-w64-python/0033-mingw-add-ModuleFileName-dir-to-PATH.patch @@ -1,4 +1,4 @@ -From 8aad08961158aff57cbeef2be519976cfbf58ce5 Mon Sep 17 00:00:00 2001 +From cb84ca520926c2f87a5af41b96f2e38fac9002dd Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:51:48 +0530 Subject: [PATCH 033/N] mingw add ModuleFileName dir to PATH @@ -54,5 +54,5 @@ index bede134..c782e0f 100644 && calculate->warnings) { -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch b/mingw-w64-python/0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch index c284182bd3..544a6702e6 100644 --- a/mingw-w64-python/0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch +++ b/mingw-w64-python/0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch @@ -1,4 +1,4 @@ -From 245fc12830b3d1e2a60f77596e0a53022742336d Mon Sep 17 00:00:00 2001 +From b25ee30c36845a29d62e6b4f50c6472c6684f32a 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 @@ -23,5 +23,5 @@ index d071a74..825ce5d 100644 +@USE_WIN32_MODULE@msvcrt -DPy_BUILD_CORE ../PC/msvcrtmodule.c -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0035-msys-cygwin-semi-native-build-sysconfig.patch b/mingw-w64-python/0035-msys-cygwin-semi-native-build-sysconfig.patch index 18e3305998..79dee2817b 100644 --- a/mingw-w64-python/0035-msys-cygwin-semi-native-build-sysconfig.patch +++ b/mingw-w64-python/0035-msys-cygwin-semi-native-build-sysconfig.patch @@ -1,4 +1,4 @@ -From bfc703f32d70f4a946c14ad2b4a968054d89309c Mon Sep 17 00:00:00 2001 +From 1177fe35e702c369da975f6ccb7064e800dc7d4b 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 @@ -122,5 +122,5 @@ index 7a34f8b..8965c63 100644 AC_SUBST(INITSYS) case $host in -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0036-sysconfig-mingw-sysconfig-like-posix.patch b/mingw-w64-python/0036-sysconfig-mingw-sysconfig-like-posix.patch index fc1c0b252d..eca2a4586f 100644 --- a/mingw-w64-python/0036-sysconfig-mingw-sysconfig-like-posix.patch +++ b/mingw-w64-python/0036-sysconfig-mingw-sysconfig-like-posix.patch @@ -1,4 +1,4 @@ -From 4b21dca56ae6b3c33117871ab06f1e31e5cea29c Mon Sep 17 00:00:00 2001 +From 99e889f533148e3088b717cf7a31ec0326d76c5a Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 20:53:59 +0200 Subject: [PATCH 036/N] sysconfig: mingw sysconfig like posix @@ -58,5 +58,5 @@ index f69d0db..64f7719 100644 # -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch b/mingw-w64-python/0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch index 2ec3e4344b..63392eaf7c 100644 --- a/mingw-w64-python/0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch +++ b/mingw-w64-python/0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch @@ -1,4 +1,4 @@ -From 60fef3c0e4a52d4f2ad1191d72d77b1d1fbd6f89 Mon Sep 17 00:00:00 2001 +From 785321b701049a8f8ef54bde52ff827963d291b1 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:13:57 +0200 Subject: [PATCH 037/N] build _winapi earlier so we can use it in distutils @@ -35,5 +35,5 @@ index 8453b28..eb90e21 100644 self.add(Extension('_msi', [os.path.join(pc_srcdir, p) for p in ['_msi.c']], -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch b/mingw-w64-python/0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch index c0ea73f0e2..b6f69040e1 100644 --- a/mingw-w64-python/0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch +++ b/mingw-w64-python/0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch @@ -1,4 +1,4 @@ -From bac4aed4722de7ff1985f210da8c808b0aace82a Mon Sep 17 00:00:00 2001 +From 4d09a127f4be052ebe6e1e0e9220da200a8d9549 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 @@ -29,5 +29,5 @@ index eb90e21..7d6ad97 100644 def init_inc_lib_dirs(self): -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0039-mingw-use-backslashes-in-compileall-py.patch b/mingw-w64-python/0039-mingw-use-backslashes-in-compileall-py.patch index 6428d338f8..f880c74280 100644 --- a/mingw-w64-python/0039-mingw-use-backslashes-in-compileall-py.patch +++ b/mingw-w64-python/0039-mingw-use-backslashes-in-compileall-py.patch @@ -1,4 +1,4 @@ -From 7697de24e02c12a22e372a030ab7112125614721 Mon Sep 17 00:00:00 2001 +From 5e87c3c70e3b4297c8763ab3ac6cbe029b25e332 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 @@ -26,5 +26,5 @@ index 25ad83c..f57879e 100644 yield fullname elif (maxlevels > 0 and name != os.curdir and name != os.pardir and -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0040-msys-convert_path-fix-and-root-hack.patch b/mingw-w64-python/0040-msys-convert_path-fix-and-root-hack.patch index 208dfcd780..f603613657 100644 --- a/mingw-w64-python/0040-msys-convert_path-fix-and-root-hack.patch +++ b/mingw-w64-python/0040-msys-convert_path-fix-and-root-hack.patch @@ -1,4 +1,4 @@ -From 43dfca3f7c85072826ae52a2828104b755a5ebd8 Mon Sep 17 00:00:00 2001 +From 296466bbca4585fe73f74ad4a97b90f6f9b653bb Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:18:36 +0200 Subject: [PATCH 040/N] msys convert_path fix and root hack @@ -38,5 +38,5 @@ index 3d42756..d00acbd 100644 # Here are a couple of targets for MacOSX again, to install a full # framework-based Python. frameworkinstall installs everything, the -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0041-allow-static-tcltk.patch b/mingw-w64-python/0041-allow-static-tcltk.patch index bdad0014b0..3a274a7cba 100644 --- a/mingw-w64-python/0041-allow-static-tcltk.patch +++ b/mingw-w64-python/0041-allow-static-tcltk.patch @@ -1,4 +1,4 @@ -From 28c0ab161716125bb1aa7dfba3ca737e776a01cd Mon Sep 17 00:00:00 2001 +From 02c961194aa314e853997f4c0557e899159c9a0a 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,5 +83,5 @@ index 7d6ad97..dfa9e45 100644 # XXX handle these, but how to detect? # *** Uncomment and edit for PIL (TkImaging) extension only: -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch b/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch index a57f94621a..b440615a34 100644 --- a/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch +++ b/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch @@ -1,4 +1,4 @@ -From 1b6ae4d19bcd0f043c3fd31c7673c2a6fdad1063 Mon Sep 17 00:00:00 2001 +From bc1c77f8709f8cd85f8fb877db36d543d6e811d5 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 @@ -31,5 +31,5 @@ index b70252d..0d5cee2 100644 /* configure was checking , but we will use , which has some or all these features. */ -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0043-grammar-fixes.patch b/mingw-w64-python/0043-grammar-fixes.patch index e621119ace..cd1d49c047 100644 --- a/mingw-w64-python/0043-grammar-fixes.patch +++ b/mingw-w64-python/0043-grammar-fixes.patch @@ -1,4 +1,4 @@ -From e6f8c1ea7ca1fa2cc09ebcfd6e3d7412bcce7cf3 Mon Sep 17 00:00:00 2001 +From 0b847e9a097c47ccb1ff327df912ef0c4670131d 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 @@ -41,5 +41,5 @@ index b7aa528..4a1ee9a 100644 {2, 1}, {3, 2}, -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0044-builddir-fixes.patch b/mingw-w64-python/0044-builddir-fixes.patch index d46e9f8525..ced42d17e8 100644 --- a/mingw-w64-python/0044-builddir-fixes.patch +++ b/mingw-w64-python/0044-builddir-fixes.patch @@ -1,4 +1,4 @@ -From f790c3b0e9f26d013745db54c4859c48e5f4d246 Mon Sep 17 00:00:00 2001 +From 13850d61f90694fe67f43dfb38d0ec37d40cf2cf 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 @@ -66,5 +66,5 @@ index 2e4ccbb..a8d5c31 100644 from frozen.obj. In the Makefile, frozen.o is not linked into this executable, so we define the variable here. */ -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0045-msys-monkeypatch-os-system-via-sh-exe.patch b/mingw-w64-python/0045-msys-monkeypatch-os-system-via-sh-exe.patch index 07272f913e..df535347bc 100644 --- a/mingw-w64-python/0045-msys-monkeypatch-os-system-via-sh-exe.patch +++ b/mingw-w64-python/0045-msys-monkeypatch-os-system-via-sh-exe.patch @@ -1,4 +1,4 @@ -From 96c8844bc14528b3d7ba9086611ae551692ce154 Mon Sep 17 00:00:00 2001 +From a5845df721bbe02f0606f217b46bbccc2f851cd2 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 @@ -35,5 +35,5 @@ index dfa9e45..6d282c8 100644 HOST_PLATFORM = get_platform() MS_WINDOWS = (HOST_PLATFORM == 'win32') -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0046-msys-replace-slashes-used-in-io-redirection.patch b/mingw-w64-python/0046-msys-replace-slashes-used-in-io-redirection.patch index 1061ef81b3..c1e4c41522 100644 --- a/mingw-w64-python/0046-msys-replace-slashes-used-in-io-redirection.patch +++ b/mingw-w64-python/0046-msys-replace-slashes-used-in-io-redirection.patch @@ -1,4 +1,4 @@ -From 9224a7c20b9615cd254db0f8ce46429e8047f1df Mon Sep 17 00:00:00 2001 +From 5b825a7a63d9fc28c3498c0fc9540fa935d2255a 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 @@ -69,5 +69,5 @@ index 6d282c8..1610011 100644 with open(tmpfile) as fp: detected_archs = [] -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0047-remove_path_max.default.patch b/mingw-w64-python/0047-remove_path_max.default.patch index 0eaa8fa0a4..f2529f4a5b 100644 --- a/mingw-w64-python/0047-remove_path_max.default.patch +++ b/mingw-w64-python/0047-remove_path_max.default.patch @@ -1,4 +1,4 @@ -From 750a294029c433004174a7630dfc8f710583abb3 Mon Sep 17 00:00:00 2001 +From 13103b26078cec60597a521bdc00da9a59e7dbc2 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 @@ -25,5 +25,5 @@ index 3243944..99d4977 100644 #endif -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0048-dont-link-with-gettext.patch b/mingw-w64-python/0048-dont-link-with-gettext.patch index 5ac781451e..64a3e71e40 100644 --- a/mingw-w64-python/0048-dont-link-with-gettext.patch +++ b/mingw-w64-python/0048-dont-link-with-gettext.patch @@ -1,4 +1,4 @@ -From 8b2f966a1224118bbd42dfc43bedbc721e140815 Mon Sep 17 00:00:00 2001 +From af54efca216765c9d7e8d270cc5d4bec3d937100 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 @@ -56,5 +56,5 @@ index 8965c63..773bc8a 100644 # checks for system dependent C++ extensions support case "$ac_sys_system" in -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0049-ctypes-python-dll.patch b/mingw-w64-python/0049-ctypes-python-dll.patch index e5da09acf4..1ff1b08e27 100644 --- a/mingw-w64-python/0049-ctypes-python-dll.patch +++ b/mingw-w64-python/0049-ctypes-python-dll.patch @@ -1,4 +1,4 @@ -From 5dae3f56cae62472e9ae9ecb26ee73da4c334aef Mon Sep 17 00:00:00 2001 +From c63fc44a7946da053fd37754b9d7b04158701e1c 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 @@ -29,5 +29,5 @@ index 4afa4eb..2fe2eec 100644 elif _sys.platform == "cygwin": pythonapi = PyDLL("libpython%d.%d.dll" % _sys.version_info[:2]) -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0050-gdbm-module-includes.patch b/mingw-w64-python/0050-gdbm-module-includes.patch index 178a8ee3c1..e5ea665437 100644 --- a/mingw-w64-python/0050-gdbm-module-includes.patch +++ b/mingw-w64-python/0050-gdbm-module-includes.patch @@ -1,4 +1,4 @@ -From ebf1a3c7cfcccd2e9c8d6da31e8356e554888204 Mon Sep 17 00:00:00 2001 +From d6f6f1a39a8e4ebe0dfb685426d67ab59da1029c 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 @@ -26,5 +26,5 @@ index 16b0f79..46b28b2 100644 extern const char * gdbm_strerror(gdbm_error); #endif -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0051-use-gnu_printf-in-format.patch b/mingw-w64-python/0051-use-gnu_printf-in-format.patch index 3bc038ec60..2a0f96d64f 100644 --- a/mingw-w64-python/0051-use-gnu_printf-in-format.patch +++ b/mingw-w64-python/0051-use-gnu_printf-in-format.patch @@ -1,4 +1,4 @@ -From ecbc2c8c43944add683f4f3a02bd57ce68b96ce5 Mon Sep 17 00:00:00 2001 +From 8174f02fb638fadb7c87540360124a9d18bdecf6 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 @@ -81,5 +81,5 @@ index 670e5d2..d582963 100644 PyAPI_FUNC(void) PySys_FormatStderr(const char *format, ...); -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0052-mingw-fix-ssl-dont-use-enum_certificates.patch b/mingw-w64-python/0052-mingw-fix-ssl-dont-use-enum_certificates.patch index 784f23125d..0f1f4b28d1 100644 --- a/mingw-w64-python/0052-mingw-fix-ssl-dont-use-enum_certificates.patch +++ b/mingw-w64-python/0052-mingw-fix-ssl-dont-use-enum_certificates.patch @@ -1,4 +1,4 @@ -From fd457b6a9ca4de8dede2391fc23916adc08c0e30 Mon Sep 17 00:00:00 2001 +From 0454f5e643096a3390ca233a194fbe5ee008fd26 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:52:03 +0530 Subject: [PATCH 052/N] mingw fix ssl dont use enum_certificates @@ -13,10 +13,10 @@ Co-authored-by: Christoph Reiter 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/ssl.py b/Lib/ssl.py -index 30f4e59..dda3ae1 100644 +index 0e3606b..401f375 100644 --- a/Lib/ssl.py +++ b/Lib/ssl.py -@@ -249,7 +249,7 @@ class _TLSMessageType(_IntEnum): +@@ -250,7 +250,7 @@ class _TLSMessageType(_IntEnum): CHANGE_CIPHER_SPEC = 0x0101 @@ -25,7 +25,7 @@ index 30f4e59..dda3ae1 100644 from _ssl import enum_certificates, enum_crls from socket import socket, SOCK_STREAM, create_connection -@@ -569,7 +569,7 @@ class SSLContext(_SSLContext): +@@ -570,7 +570,7 @@ class SSLContext(_SSLContext): def load_default_certs(self, purpose=Purpose.SERVER_AUTH): if not isinstance(purpose, _ASN1Object): raise TypeError(purpose) @@ -35,5 +35,5 @@ index 30f4e59..dda3ae1 100644 self._load_windows_store_certs(storename, purpose) self.set_default_verify_paths() -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0053-fix-using-dllhandle-and-winver-mingw.patch b/mingw-w64-python/0053-fix-using-dllhandle-and-winver-mingw.patch index cb48014ec9..f1cfb7c796 100644 --- a/mingw-w64-python/0053-fix-using-dllhandle-and-winver-mingw.patch +++ b/mingw-w64-python/0053-fix-using-dllhandle-and-winver-mingw.patch @@ -1,4 +1,4 @@ -From 2a28bb5e11851268b71d615c687cbea3bd448c66 Mon Sep 17 00:00:00 2001 +From bbb1fe1817cff70a426979feb8d8d3089b5706fe 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 @@ -35,5 +35,5 @@ index a52b299..e890979 100644 PyLong_FromVoidPtr(PyWin_DLLhModule)); SET_SYS_FROM_STRING("winver", -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch b/mingw-w64-python/0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch index 8008f65d3f..dfa6c1ab30 100644 --- a/mingw-w64-python/0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch +++ b/mingw-w64-python/0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch @@ -1,4 +1,4 @@ -From 563448bda41abb326960f49f7b0b724c53615163 Mon Sep 17 00:00:00 2001 +From a193e5ffd596445d5af09cd59d8e9f5a3b7bce45 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 @@ -38,5 +38,5 @@ index 59c0dbf..adccaa7 100644 #elif defined(__cplusplus) #define COMPILER "[C++]" -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0055-MINGW-link-with-additional-library.patch b/mingw-w64-python/0055-MINGW-link-with-additional-library.patch index eb1a6a79b3..2d99895824 100644 --- a/mingw-w64-python/0055-MINGW-link-with-additional-library.patch +++ b/mingw-w64-python/0055-MINGW-link-with-additional-library.patch @@ -1,4 +1,4 @@ -From 03433fac1936cb64d41f0e2058dff9eb5b89dafd Mon Sep 17 00:00:00 2001 +From 88b037e4b2a583947056e7dc221f938a5a382e16 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 @@ -29,5 +29,5 @@ index 773bc8a..ac58dc1 100644 AC_MSG_CHECKING(for -O2) saved_cflags="$CFLAGS" -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0056-install-msilib.patch b/mingw-w64-python/0056-install-msilib.patch index 7b879b99c6..0a12a2e12e 100644 --- a/mingw-w64-python/0056-install-msilib.patch +++ b/mingw-w64-python/0056-install-msilib.patch @@ -1,4 +1,4 @@ -From c3a726d8b28cb1927c44bf4592fefa0690fe252c Mon Sep 17 00:00:00 2001 +From b2aee03e06ea2bb277c426fcca83d5128d3b6b36 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 056/N] install msilib @@ -26,5 +26,5 @@ index 1895e74..1d2e16e 100644 unittest unittest/test unittest/test/testmock \ venv venv/scripts venv/scripts/common venv/scripts/posix \ -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0057-fix-signal-module-build.patch b/mingw-w64-python/0057-fix-signal-module-build.patch index 2339636589..a59755d710 100644 --- a/mingw-w64-python/0057-fix-signal-module-build.patch +++ b/mingw-w64-python/0057-fix-signal-module-build.patch @@ -1,4 +1,4 @@ -From ae97c39202fd4456df07823837761424942c693c Mon Sep 17 00:00:00 2001 +From 8d480d34440037c0ca33068a133185fb408a6ef2 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:10 +0530 Subject: [PATCH 057/N] fix signal module build @@ -25,5 +25,5 @@ index 2bafdd0..7ce4355 100644 time -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal timemodule.c # -lm # time operations and variables _thread -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal _threadmodule.c # low-level threading interface -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0058-build-build-winconsoleio-and-_testconsole.patch b/mingw-w64-python/0058-build-build-winconsoleio-and-_testconsole.patch index 1af943cc6b..e78d5f53fd 100644 --- a/mingw-w64-python/0058-build-build-winconsoleio-and-_testconsole.patch +++ b/mingw-w64-python/0058-build-build-winconsoleio-and-_testconsole.patch @@ -1,4 +1,4 @@ -From 26b037e4696d001ef94411a5ebcd4795e2e39450 Mon Sep 17 00:00:00 2001 +From 4c500bed8d814aa668fabd9a050a1097fde6ecc5 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:11 +0530 Subject: [PATCH 058/N] build: build winconsoleio and _testconsole @@ -40,5 +40,5 @@ index 1610011..8e1a822 100644 # readline do_readline = self.compiler.find_library_file(self.lib_dirs, 'readline') -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0059-expose-sem_unlink.patch b/mingw-w64-python/0059-expose-sem_unlink.patch index 9afbbe46a0..9cbe69c63b 100644 --- a/mingw-w64-python/0059-expose-sem_unlink.patch +++ b/mingw-w64-python/0059-expose-sem_unlink.patch @@ -1,4 +1,4 @@ -From 9408f1c2d1952285c330c6b1df96ed7226822ae6 Mon Sep 17 00:00:00 2001 +From 7a64e4e2736a71607cf3d223a059cd7e7077febe Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:12 +0530 Subject: [PATCH 059/N] expose sem_unlink @@ -25,5 +25,5 @@ index 806e638..d7954d1 100644 #endif {NULL} -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0060-cygpty-isatty.patch b/mingw-w64-python/0060-cygpty-isatty.patch index b7abd62739..f4e8dd8d36 100644 --- a/mingw-w64-python/0060-cygpty-isatty.patch +++ b/mingw-w64-python/0060-cygpty-isatty.patch @@ -1,4 +1,4 @@ -From 6ee33cfbb4d463fdb7de10983fd5c0fe2af89717 Mon Sep 17 00:00:00 2001 +From dbf03bae1e7fa98e84950438d8e1ae3ca69a27b1 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:14 +0530 Subject: [PATCH 060/N] cygpty isatty @@ -133,7 +133,7 @@ index 2cc891f..17469e3 100644 diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index add8ed5..27d198e 100644 +index e636aed..bd432c7 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -36,6 +36,7 @@ @@ -144,7 +144,7 @@ index add8ed5..27d198e 100644 #include /* needed for ctermid() */ -@@ -10091,7 +10092,7 @@ os_isatty_impl(PyObject *module, int fd) +@@ -10101,7 +10102,7 @@ os_isatty_impl(PyObject *module, int fd) int return_value; Py_BEGIN_ALLOW_THREADS _Py_BEGIN_SUPPRESS_IPH @@ -457,5 +457,5 @@ index 60f091c..734084c 100644 if (!Py_InteractiveFlag) return 0; -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0061-disable-broken-gdbm-module.patch b/mingw-w64-python/0061-disable-broken-gdbm-module.patch index e6b4a8c34b..705cc6231f 100644 --- a/mingw-w64-python/0061-disable-broken-gdbm-module.patch +++ b/mingw-w64-python/0061-disable-broken-gdbm-module.patch @@ -1,4 +1,4 @@ -From 64754798e0614811f862434a7c2a1363f397503b Mon Sep 17 00:00:00 2001 +From 05eeb6798b58ac38d71fae0929d43539254778d1 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:15 +0530 Subject: [PATCH 061/N] disable broken gdbm module @@ -25,5 +25,5 @@ index 8e1a822..b163d4c 100644 for cand in dbm_order: if cand == "ndbm": -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0062-build-link-win-resource-files-and-build-pythonw.patch b/mingw-w64-python/0062-build-link-win-resource-files-and-build-pythonw.patch index 29cba5e218..c135579ceb 100644 --- a/mingw-w64-python/0062-build-link-win-resource-files-and-build-pythonw.patch +++ b/mingw-w64-python/0062-build-link-win-resource-files-and-build-pythonw.patch @@ -1,4 +1,4 @@ -From 9fc2391dcc5c0def5714935e2b35742ae0c2b766 Mon Sep 17 00:00:00 2001 +From 35c0d1c6857011e720db5e4c606bd0912f69b715 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:16 +0530 Subject: [PATCH 062/N] build: link win resource files and build pythonw @@ -143,5 +143,5 @@ index ac58dc1..94f8e57 100644 # Availability of -O2: AC_MSG_CHECKING(for -O2) -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0063-3.7-mpdec-mingw.patch b/mingw-w64-python/0063-3.7-mpdec-mingw.patch index 2f12e4ba80..ed1ed47c54 100644 --- a/mingw-w64-python/0063-3.7-mpdec-mingw.patch +++ b/mingw-w64-python/0063-3.7-mpdec-mingw.patch @@ -1,4 +1,4 @@ -From 99b4a6d8885130f28e54064c6c605ed8ced33546 Mon Sep 17 00:00:00 2001 +From cab5d0f11a2919add6fec6f5e7edb5f9cd4bf875 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 @@ -22,5 +22,5 @@ index b163d4c..c2fa950 100644 depends = ['_decimal/docstrings.h'] else: -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0064-disable-readline.patch b/mingw-w64-python/0064-disable-readline.patch index d88496291e..a7056785b6 100644 --- a/mingw-w64-python/0064-disable-readline.patch +++ b/mingw-w64-python/0064-disable-readline.patch @@ -1,4 +1,4 @@ -From 212391ba1d8457cd53105e892424136c31d75e39 Mon Sep 17 00:00:00 2001 +From 442ff6d3e9940d641751effe0c4a3a5c9553470d Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:17 +0530 Subject: [PATCH 064/N] disable readline @@ -28,5 +28,5 @@ index c2fa950..5cb6340 100644 curses_library = "" # Cannot use os.popen here in py3k. -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0065-fix-isselectable.patch b/mingw-w64-python/0065-fix-isselectable.patch index bc8e50fb8b..9a8ddd80d3 100644 --- a/mingw-w64-python/0065-fix-isselectable.patch +++ b/mingw-w64-python/0065-fix-isselectable.patch @@ -1,4 +1,4 @@ -From cb24744da8d91d5aaa5f7a33865e98aa61466b61 Mon Sep 17 00:00:00 2001 +From 06ccdb890b53b953234dcd5b5eb080a8fdefcd2c Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:18 +0530 Subject: [PATCH 065/N] fix isselectable @@ -25,5 +25,5 @@ index 6ec2994..a80f195 100644 #define _PyIsSelectable_fd(FD) (1) #else -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0066-use-_wcsnicmp-instead-wcsncasecmp.patch b/mingw-w64-python/0066-use-_wcsnicmp-instead-wcsncasecmp.patch index 24471ce73e..8bbe99fe27 100644 --- a/mingw-w64-python/0066-use-_wcsnicmp-instead-wcsncasecmp.patch +++ b/mingw-w64-python/0066-use-_wcsnicmp-instead-wcsncasecmp.patch @@ -1,4 +1,4 @@ -From 6bd60558990f5d4fb65d8863fcd7163acece0340 Mon Sep 17 00:00:00 2001 +From 79c5e7dbcc6542b68a316927ec235ecf546bb9c2 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 @@ -22,5 +22,5 @@ index c782e0f..83422d3 100644 } -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0067-_xxsubinterpretersmodule.patch b/mingw-w64-python/0067-_xxsubinterpretersmodule.patch index f0ca8dff63..c2865ea543 100644 --- a/mingw-w64-python/0067-_xxsubinterpretersmodule.patch +++ b/mingw-w64-python/0067-_xxsubinterpretersmodule.patch @@ -1,4 +1,4 @@ -From 34fb7648db4c306f87909871caba5ec545d69be1 Mon Sep 17 00:00:00 2001 +From ebed5ccf00945ecc07649d2194d16d714a4f7bf0 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 @@ -22,5 +22,5 @@ index 314059d..f26e662 100644 sizeof(channelid), /* tp_basicsize */ 0, /* tp_itemsize */ -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0068-sqlite3-module-defines.patch b/mingw-w64-python/0068-sqlite3-module-defines.patch index 3300371010..71edb2c19a 100644 --- a/mingw-w64-python/0068-sqlite3-module-defines.patch +++ b/mingw-w64-python/0068-sqlite3-module-defines.patch @@ -1,4 +1,4 @@ -From ef8caf27c0993882bb69b81e34b9498e174c5abf Mon Sep 17 00:00:00 2001 +From 46e4f4c97c8eec76988a9ba31dc5432d8fbdf512 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:21 +0530 Subject: [PATCH 068/N] sqlite3 module defines @@ -24,5 +24,5 @@ index 5cb6340..0145e58 100644 # Enable support for loadable extensions in the sqlite3 module # if --enable-loadable-sqlite-extensions configure option is used. -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0069-configure.ac-fix-inet_pton-check.patch b/mingw-w64-python/0069-configure.ac-fix-inet_pton-check.patch index c51180a5fc..6d8d69f55b 100644 --- a/mingw-w64-python/0069-configure.ac-fix-inet_pton-check.patch +++ b/mingw-w64-python/0069-configure.ac-fix-inet_pton-check.patch @@ -1,4 +1,4 @@ -From 8d0e4e8392e414a0e2be53bbea61b346e974627d Mon Sep 17 00:00:00 2001 +From 039162df839a763139114269d550a62542f75574 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:23 +0530 Subject: [PATCH 069/N] configure.ac: fix inet_pton check @@ -31,5 +31,5 @@ index 94f8e57..bffc8c9 100644 [AC_DEFINE(HAVE_INET_PTON, 1, Define if you have the 'inet_pton' function.) AC_MSG_RESULT(yes)], -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0070-set-venv-activate-path-unix.patch b/mingw-w64-python/0070-set-venv-activate-path-unix.patch index 2c1f729c97..85780510a9 100644 --- a/mingw-w64-python/0070-set-venv-activate-path-unix.patch +++ b/mingw-w64-python/0070-set-venv-activate-path-unix.patch @@ -1,4 +1,4 @@ -From 45f9c7d0617640f90f548dc3d50ebf6736cc23ac Mon Sep 17 00:00:00 2001 +From 80b4548013c8f6d04f5b3f7b12a156f2848ee32e Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Thu, 17 Jun 2021 18:52:25 +0530 Subject: [PATCH 070/N] set venv activate path unix @@ -25,5 +25,5 @@ index 45af353..877b5d3 100644 _OLD_VIRTUAL_PATH="$PATH" -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0071-venv-creation-fixes.patch b/mingw-w64-python/0071-venv-creation-fixes.patch index e66aaba86b..b4ad27aa32 100644 --- a/mingw-w64-python/0071-venv-creation-fixes.patch +++ b/mingw-w64-python/0071-venv-creation-fixes.patch @@ -1,4 +1,4 @@ -From 4f9395e3ad13f42e5e45cb9bd20d5a8f3c42af6a Mon Sep 17 00:00:00 2001 +From c69dc954198e1d9410cf80844bb39f2ca02cfde9 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:26 +0530 Subject: [PATCH 071/N] venv creation fixes @@ -66,5 +66,5 @@ index 6f1af29..83ba0bc 100644 def setup_scripts(self, context): """ -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0072-pass-gen-profile-ldflags.patch b/mingw-w64-python/0072-pass-gen-profile-ldflags.patch index 605ae801a6..fba87c6b16 100644 --- a/mingw-w64-python/0072-pass-gen-profile-ldflags.patch +++ b/mingw-w64-python/0072-pass-gen-profile-ldflags.patch @@ -1,4 +1,4 @@ -From 2af806ebc1f45c34a5b41c6a309a6685fece2125 Mon Sep 17 00:00:00 2001 +From b40bfc4b0cf194d7ed6d233eef9497398e0d16ab Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:27 +0530 Subject: [PATCH 072/N] pass gen profile ldflags @@ -25,5 +25,5 @@ index fd3d142..8df163c 100644 fi -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0073-pkg-config-windows-must-link-ext-with-python-lib.patch b/mingw-w64-python/0073-pkg-config-windows-must-link-ext-with-python-lib.patch index ff1815040d..209ca7242f 100644 --- a/mingw-w64-python/0073-pkg-config-windows-must-link-ext-with-python-lib.patch +++ b/mingw-w64-python/0073-pkg-config-windows-must-link-ext-with-python-lib.patch @@ -1,4 +1,4 @@ -From 21da18a81e8956b7c8078cf2b05de85bd7540213 Mon Sep 17 00:00:00 2001 +From adcb79edfd35966001e9320d0856fc033f81a513 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 @@ -34,5 +34,5 @@ index bffc8c9..297d150 100644 else LIBPYTHON='' -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0074-importlib-bootstrap-path-sep.patch b/mingw-w64-python/0074-importlib-bootstrap-path-sep.patch index 65f6bf5149..fb0e51ccec 100644 --- a/mingw-w64-python/0074-importlib-bootstrap-path-sep.patch +++ b/mingw-w64-python/0074-importlib-bootstrap-path-sep.patch @@ -1,4 +1,4 @@ -From 57beef55b040c9ee905412eccb25f6ebca53e96e Mon Sep 17 00:00:00 2001 +From 786f52063ffdf8819c6bc7e9861fbf8e966ad94d Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:30 +0530 Subject: [PATCH 074/N] importlib bootstrap path sep @@ -27,5 +27,5 @@ index f3828b1..5dafdfe 100644 setattr(self_module, 'path_sep', path_sep) setattr(self_module, 'path_separators', ''.join(path_separators)) -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0075-pathlib-path-sep.patch b/mingw-w64-python/0075-pathlib-path-sep.patch index f6617ae3f5..3102d455ac 100644 --- a/mingw-w64-python/0075-pathlib-path-sep.patch +++ b/mingw-w64-python/0075-pathlib-path-sep.patch @@ -1,4 +1,4 @@ -From cc7970929c25d14c0c3a54e52464a75bb2dcd679 Mon Sep 17 00:00:00 2001 +From 816e349116996f19f21cc1058f56cd3aa68eadfe Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:31 +0530 Subject: [PATCH 075/N] pathlib path sep @@ -21,5 +21,5 @@ index 7aeda14..a66e754 100644 pathmod = ntpath -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0076-warnings-fixes.patch b/mingw-w64-python/0076-warnings-fixes.patch index 6d8f8f82f2..6973400846 100644 --- a/mingw-w64-python/0076-warnings-fixes.patch +++ b/mingw-w64-python/0076-warnings-fixes.patch @@ -1,4 +1,4 @@ -From 3c73b59e791f9768bdcf931a4d8258ce57c8e311 Mon Sep 17 00:00:00 2001 +From 42353a029bf9b675b19fe24dbacff45bc05d5b80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:33 +0530 @@ -28,10 +28,10 @@ index 1058184..36af7bc 100644 SIZE_T attribute_list_size = 0; diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 27d198e..590b459 100644 +index bd432c7..beb00ab 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c -@@ -5343,7 +5343,7 @@ os_utime_impl(PyObject *module, path_t *path, PyObject *times, PyObject *ns, +@@ -5353,7 +5353,7 @@ os_utime_impl(PyObject *module, path_t *path, PyObject *times, PyObject *ns, /*[clinic end generated code: output=cfcac69d027b82cf input=2fbd62a2f228f8f4]*/ { #ifdef MS_WINDOWS @@ -40,7 +40,7 @@ index 27d198e..590b459 100644 FILETIME atime, mtime; #else int result; -@@ -14370,7 +14370,7 @@ os__add_dll_directory_impl(PyObject *module, path_t *path) +@@ -14380,7 +14380,7 @@ os__add_dll_directory_impl(PyObject *module, path_t *path) loaded. */ Py_BEGIN_ALLOW_THREADS if (!(hKernel32 = GetModuleHandleW(L"kernel32")) || @@ -49,7 +49,7 @@ index 27d198e..590b459 100644 hKernel32, "AddDllDirectory")) || !(cookie = (*AddDllDirectory)(path->wide))) { err = GetLastError(); -@@ -14420,7 +14420,7 @@ os__remove_dll_directory_impl(PyObject *module, PyObject *cookie) +@@ -14430,7 +14430,7 @@ os__remove_dll_directory_impl(PyObject *module, PyObject *cookie) loaded. */ Py_BEGIN_ALLOW_THREADS if (!(hKernel32 = GetModuleHandleW(L"kernel32")) || @@ -127,5 +127,5 @@ index 0ce5e94..6a6fe7e 100644 /* minimum/maximum thread stack sizes supported */ -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0077-fix-build-testinternalcapi.patch b/mingw-w64-python/0077-fix-build-testinternalcapi.patch index e50b49bf46..17599515c5 100644 --- a/mingw-w64-python/0077-fix-build-testinternalcapi.patch +++ b/mingw-w64-python/0077-fix-build-testinternalcapi.patch @@ -1,4 +1,4 @@ -From 2494221304db449ce507238aaae8374fbecf099d Mon Sep 17 00:00:00 2001 +From ec8ca03186bdac6cf5dd79accc8641992571f6a0 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:34 +0530 Subject: [PATCH 077/N] fix build testinternalcapi @@ -24,5 +24,5 @@ index 0145e58..a31cef9 100644 # Python PEP-3118 (buffer protocol) test module -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0078-extend-MS_WINDOWS-flag.patch b/mingw-w64-python/0078-extend-MS_WINDOWS-flag.patch index fee6f358d1..900f2b1a64 100644 --- a/mingw-w64-python/0078-extend-MS_WINDOWS-flag.patch +++ b/mingw-w64-python/0078-extend-MS_WINDOWS-flag.patch @@ -1,4 +1,4 @@ -From d84e4e7bc5e055afd75d4bb5b0bfaa3951d3a2d3 Mon Sep 17 00:00:00 2001 +From 1e29997ff9431ea0d950cd1d8017710067110a11 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Thu, 17 Jun 2021 18:52:34 +0530 Subject: [PATCH 078/N] extend MS_WINDOWS flag @@ -21,5 +21,5 @@ index a31cef9..4f697e7 100644 MACOS = (HOST_PLATFORM == 'darwin') AIX = (HOST_PLATFORM.startswith('aix')) -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0079-clang-arm64.patch b/mingw-w64-python/0079-clang-arm64.patch index f7d62421f1..98e9c6ea07 100644 --- a/mingw-w64-python/0079-clang-arm64.patch +++ b/mingw-w64-python/0079-clang-arm64.patch @@ -1,4 +1,4 @@ -From 81fb2f3a822131c337cdf02a994a2afa18729769 Mon Sep 17 00:00:00 2001 +From 340e79991f0cbc6099ad655acf38e0c5e09997c4 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 079/N] clang arm64 @@ -45,5 +45,5 @@ index adccaa7..b529e29 100644 #elif defined(__cplusplus) #define COMPILER "[C++]" -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0080-configure.ac-set-MINGW-stack-reserve.patch b/mingw-w64-python/0080-configure.ac-set-MINGW-stack-reserve.patch index 739897551e..9fbf0393ba 100644 --- a/mingw-w64-python/0080-configure.ac-set-MINGW-stack-reserve.patch +++ b/mingw-w64-python/0080-configure.ac-set-MINGW-stack-reserve.patch @@ -1,4 +1,4 @@ -From 5613a4296ca7b47e667014118d1c51d8631ec04a Mon Sep 17 00:00:00 2001 +From df8c8c70c4170ba772989ec5d9f65f99f89d70b6 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 080/N] configure.ac: set MINGW stack reserve @@ -24,5 +24,5 @@ index 297d150..9729fb8 100644 AC_MSG_RESULT($LINKFORSHARED) -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0081-Don-t-use-os.pathsep-to-find-EOF.patch b/mingw-w64-python/0081-Don-t-use-os.pathsep-to-find-EOF.patch index 9bfc10b753..258ca3286d 100644 --- a/mingw-w64-python/0081-Don-t-use-os.pathsep-to-find-EOF.patch +++ b/mingw-w64-python/0081-Don-t-use-os.pathsep-to-find-EOF.patch @@ -1,4 +1,4 @@ -From 9721585754e8b24cf9a3f61c47f7c4ab665dc532 Mon Sep 17 00:00:00 2001 +From a240deae3845053f3cd571eee118d8a5667ffdde Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 18 Jun 2021 12:38:11 +0530 Subject: [PATCH 081/N] Don't use os.pathsep to find EOF not all @@ -23,5 +23,5 @@ index b344f03..474ef89 100644 else: eof = 'Ctrl-D (i.e. EOF)' -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch b/mingw-w64-python/0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch index c8aef4a929..63957c350d 100644 --- a/mingw-w64-python/0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch +++ b/mingw-w64-python/0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch @@ -1,4 +1,4 @@ -From 2d72b9c2c8a9eb21e3a3c8948224afac0ff30318 Mon Sep 17 00:00:00 2001 +From b56d60bf379caf971580caeaeef5ed2b08ee061c Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Wed, 23 Jun 2021 18:12:12 +0530 Subject: [PATCH 082/N] Fix extension suffix for c-extensions on mingw @@ -178,5 +178,5 @@ index 9729fb8..59ecc69 100644 case $ac_sys_system in AIX*) -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0083-Change-the-get_platform-method-in-sysconfig.patch b/mingw-w64-python/0083-Change-the-get_platform-method-in-sysconfig.patch index cbd540080d..db8f008e8b 100644 --- a/mingw-w64-python/0083-Change-the-get_platform-method-in-sysconfig.patch +++ b/mingw-w64-python/0083-Change-the-get_platform-method-in-sysconfig.patch @@ -1,4 +1,4 @@ -From dd58cb2e11652afa22a6486bced42bc566642281 Mon Sep 17 00:00:00 2001 +From 867b4167134dccb9e04a491480d60fe38e218e67 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:36:58 +0200 Subject: [PATCH 083/N] Change the `get_platform()` method in sysconfig @@ -60,5 +60,5 @@ index b529e29..2d935fe 100644 #elif defined(__cplusplus) #define COMPILER "[C++]" -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0084-distutils-compiler-customize-mingw-cygwin-compilers.patch b/mingw-w64-python/0084-distutils-compiler-customize-mingw-cygwin-compilers.patch index c09fa56d7a..119dcd7997 100644 --- a/mingw-w64-python/0084-distutils-compiler-customize-mingw-cygwin-compilers.patch +++ b/mingw-w64-python/0084-distutils-compiler-customize-mingw-cygwin-compilers.patch @@ -1,4 +1,4 @@ -From ddc71b4ec4155d91c2dc76596e12fa84d2fb3d54 Mon Sep 17 00:00:00 2001 +From 947bab324b86fdee320c9447a1722650a2b6e960 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 @@ -50,5 +50,5 @@ index 37feae5..bbe8e3c 100644 if not get_config_var('CUSTOMIZED_OSX_COMPILER'): import _osx_support -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0085-distutils-compiler-enable-new-dtags.patch b/mingw-w64-python/0085-distutils-compiler-enable-new-dtags.patch index db284d8b1a..9e50d2ab21 100644 --- a/mingw-w64-python/0085-distutils-compiler-enable-new-dtags.patch +++ b/mingw-w64-python/0085-distutils-compiler-enable-new-dtags.patch @@ -1,4 +1,4 @@ -From 501311b587252ca0686c2d9a0ebb70f8817ccf24 Mon Sep 17 00:00:00 2001 +From f1c725404495680ae641ac47bead4036d5ec3417 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 @@ -33,5 +33,5 @@ index d00c489..76a7d82 100644 return "-Wl,-R" + dir else: -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0086-distutils-MINGW-build-extensions-with-GCC.patch b/mingw-w64-python/0086-distutils-MINGW-build-extensions-with-GCC.patch index 1df6526888..39d81ce400 100644 --- a/mingw-w64-python/0086-distutils-MINGW-build-extensions-with-GCC.patch +++ b/mingw-w64-python/0086-distutils-MINGW-build-extensions-with-GCC.patch @@ -1,4 +1,4 @@ -From b4e50520579c13c104ebf84966a1ddeb605f6e7b Mon Sep 17 00:00:00 2001 +From 1fc596a4de88b101cd9c7e6a6307ea3416c97e4c Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 20:52:22 +0200 Subject: [PATCH 086/N] distutils: MINGW build extensions with GCC @@ -56,5 +56,5 @@ index 4b002ec..7b2e1e0 100644 return 'win-amd64' if '(arm)' in sys.version.lower(): -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch b/mingw-w64-python/0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch index d59a7ea573..0ab3fd9d56 100644 --- a/mingw-w64-python/0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch +++ b/mingw-w64-python/0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch @@ -1,4 +1,4 @@ -From 23bd6cb2d4ad7b3039850141b0dfdc108d47d642 Mon Sep 17 00:00:00 2001 +From fc4578360e09c26f69f02adf111ef7cc3b0d06ef 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 @@ -69,5 +69,5 @@ index 66c12dd..1960ef8 100644 # Because these compilers aren't configured in Python's pyconfig.h file by # default, we should at least warn the user if he is using an unmodified -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0088-distutils-find-import-library.patch b/mingw-w64-python/0088-distutils-find-import-library.patch index d0be72dac5..af5632bd36 100644 --- a/mingw-w64-python/0088-distutils-find-import-library.patch +++ b/mingw-w64-python/0088-distutils-find-import-library.patch @@ -1,4 +1,4 @@ -From 01c1cc5da39af97c66f08a31cf85800cbfa3eb82 Mon Sep 17 00:00:00 2001 +From 291b36f7ecaa96076ced35f9cd8fa507b0993039 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 @@ -25,5 +25,5 @@ index 1960ef8..39ad631 100644 shared_lib_format = "%s%s" exe_extension = ".exe" -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0089-distutils-avoid-circular-dependency-from-time-module.patch b/mingw-w64-python/0089-distutils-avoid-circular-dependency-from-time-module.patch index 2eda52511c..e71953faed 100644 --- a/mingw-w64-python/0089-distutils-avoid-circular-dependency-from-time-module.patch +++ b/mingw-w64-python/0089-distutils-avoid-circular-dependency-from-time-module.patch @@ -1,4 +1,4 @@ -From de7f42ea6e3b446d6e13dcce0f86ed853cc1015f Mon Sep 17 00:00:00 2001 +From f299a476f0cb1d1f4f77af03eb1fa4f76b4001cb 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 @@ -34,5 +34,5 @@ index 39ad631..5b281e2 100644 try: out_string = out.read() -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0090-distutils-generalization-of-posix-build-in-distutils.patch b/mingw-w64-python/0090-distutils-generalization-of-posix-build-in-distutils.patch index f2be8002dd..fa3faf83b8 100644 --- a/mingw-w64-python/0090-distutils-generalization-of-posix-build-in-distutils.patch +++ b/mingw-w64-python/0090-distutils-generalization-of-posix-build-in-distutils.patch @@ -1,4 +1,4 @@ -From 8e57a4ab89a8a8edb8fcc7cef18c45f92542b5ca Mon Sep 17 00:00:00 2001 +From 0d09aa274fa422529f868dc58fd7428b106c73ce 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 @@ -91,5 +91,5 @@ index bbe8e3c..80d3523 100644 if (not os.path.isabs(_config_vars['srcdir']) and base != os.getcwd()): -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0091-distutils-mingw-sysconfig-like-posix.patch b/mingw-w64-python/0091-distutils-mingw-sysconfig-like-posix.patch index 974be40fa3..989fb73600 100644 --- a/mingw-w64-python/0091-distutils-mingw-sysconfig-like-posix.patch +++ b/mingw-w64-python/0091-distutils-mingw-sysconfig-like-posix.patch @@ -1,4 +1,4 @@ -From fbe33bbd64db797141b68b351f56e9569d773457 Mon Sep 17 00:00:00 2001 +From a0d4bbe23c91c6cf60252f28bc5dc26ff9517a12 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 20:53:29 +0200 Subject: [PATCH 091/N] distutils: mingw sysconfig like posix @@ -24,5 +24,5 @@ index 1c9d471..1dbdfe0 100644 # building python standard extensions self.library_dirs.append('.') -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0092-distutils-get_versions-fixes.patch b/mingw-w64-python/0092-distutils-get_versions-fixes.patch index dad1ee7832..583ca67ec2 100644 --- a/mingw-w64-python/0092-distutils-get_versions-fixes.patch +++ b/mingw-w64-python/0092-distutils-get_versions-fixes.patch @@ -1,4 +1,4 @@ -From 68492252f8ec7288b738061f2d45b1054c1fb598 Mon Sep 17 00:00:00 2001 +From 81d629121ebb6192c4c9c95a51c56c4fcd34e75a Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:14:31 +0200 Subject: [PATCH 092/N] distutils: get_versions() fixes @@ -52,5 +52,5 @@ index 5b281e2..fba3485 100644 def is_cygwingcc(): -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0093-distutils-install-layout-as-posix.patch b/mingw-w64-python/0093-distutils-install-layout-as-posix.patch index d9c07e906c..876b3129a6 100644 --- a/mingw-w64-python/0093-distutils-install-layout-as-posix.patch +++ b/mingw-w64-python/0093-distutils-install-layout-as-posix.patch @@ -1,4 +1,4 @@ -From 5a230215df6a11ad7d36396a73c704d6890fb6b3 Mon Sep 17 00:00:00 2001 +From e11477a6ac491a288869f1c22035192ccda7b128 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 @@ -43,5 +43,5 @@ index aaa300e..c611252 100644 } -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0094-distutils-msys-convert_path-fix-and-root-hack.patch b/mingw-w64-python/0094-distutils-msys-convert_path-fix-and-root-hack.patch index 025ad2c918..eb3be38afd 100644 --- a/mingw-w64-python/0094-distutils-msys-convert_path-fix-and-root-hack.patch +++ b/mingw-w64-python/0094-distutils-msys-convert_path-fix-and-root-hack.patch @@ -1,4 +1,4 @@ -From 6069c12c833233f2226421f2452a0585db0539ad Mon Sep 17 00:00:00 2001 +From 17b637d65ae0c7552a5c5c866be573e3a3ac927d Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:18:50 +0200 Subject: [PATCH 094/N] distutils: msys convert_path fix and root hack @@ -75,5 +75,5 @@ index 7b2e1e0..75a369d 100644 else: raise DistutilsPlatformError("nothing known about platform '%s'" % os.name) -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0095-distutils-mingw-build-optimized-ext.patch b/mingw-w64-python/0095-distutils-mingw-build-optimized-ext.patch index c341fbca95..e0a56ad65d 100644 --- a/mingw-w64-python/0095-distutils-mingw-build-optimized-ext.patch +++ b/mingw-w64-python/0095-distutils-mingw-build-optimized-ext.patch @@ -1,4 +1,4 @@ -From 2b1be68382f9f0d540b453b56dd46b242b583785 Mon Sep 17 00:00:00 2001 +From 682ebbdc778f30e1a37eb1b2f8501398867a3218 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 @@ -30,5 +30,5 @@ index fba3485..bb97880 100644 linker_so='%s %s %s' % (self.linker_dll, shared_option, -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch b/mingw-w64-python/0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch index c85e051026..de97b79f7d 100644 --- a/mingw-w64-python/0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch +++ b/mingw-w64-python/0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch @@ -1,4 +1,4 @@ -From 3835ff861f80317149377362a3134d1a69b2fc14 Mon Sep 17 00:00:00 2001 +From bbbdce1d6c2799adf365fe0bf889737dab99339d Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:52:05 +0530 Subject: [PATCH 096/N] distutils: cygwinccompiler dont strip modules if @@ -26,5 +26,5 @@ index bb97880..c134525 100644 UnixCCompiler.link(self, target_desc, objects, output_filename, -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0097-distutils-get-compilers-from-env-vars.patch b/mingw-w64-python/0097-distutils-get-compilers-from-env-vars.patch index f19de6379b..4c87febfbe 100644 --- a/mingw-w64-python/0097-distutils-get-compilers-from-env-vars.patch +++ b/mingw-w64-python/0097-distutils-get-compilers-from-env-vars.patch @@ -1,4 +1,4 @@ -From e97732808f5c18db0f921b9b20863b630991dbd5 Mon Sep 17 00:00:00 2001 +From 43f9169826ec865999f0af87085765d57287a740 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Tue, 17 Aug 2021 20:26:05 +0700 Subject: [PATCH 097/N] distutils: get compilers from env vars @@ -157,5 +157,5 @@ index c134525..75bc17b 100644 + out_string = check_output([cc, '-dumpmachine']) return out_string.strip().endswith(b'cygwin') -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0098-distutils-add-windmc-to-cygwinccompiler.patch b/mingw-w64-python/0098-distutils-add-windmc-to-cygwinccompiler.patch index 269e44d944..7dcbae76d4 100644 --- a/mingw-w64-python/0098-distutils-add-windmc-to-cygwinccompiler.patch +++ b/mingw-w64-python/0098-distutils-add-windmc-to-cygwinccompiler.patch @@ -1,4 +1,4 @@ -From c467ffc04ee72add93701607e72e3d74198936d2 Mon Sep 17 00:00:00 2001 +From 47e3f88fb98c46147aceb4dac19d6430900c2de4 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 @@ -54,5 +54,5 @@ index 75bc17b..6a40e80 100644 (ext, src_name)) base = os.path.splitdrive(base)[1] # Chop off the drive -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0099-distutils-fix-msvc9-import.patch b/mingw-w64-python/0099-distutils-fix-msvc9-import.patch index 59637e1cc0..acb0215ee5 100644 --- a/mingw-w64-python/0099-distutils-fix-msvc9-import.patch +++ b/mingw-w64-python/0099-distutils-fix-msvc9-import.patch @@ -1,4 +1,4 @@ -From 94a1bdbdc7d30d9bff63f89727f53c530006ca5d Mon Sep 17 00:00:00 2001 +From d1e254905c7c4ae19b94462e4dca750c2c38dbae Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:24 +0530 Subject: [PATCH 099/N] distutils: fix msvc9 import @@ -34,5 +34,5 @@ index a7976fb..c341679 100644 self.__root = r"Software\Microsoft\VisualStudio" # self.__macros = MACROS -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0100-distutils-mingw-add-LIBPL-to-library-dirs.patch b/mingw-w64-python/0100-distutils-mingw-add-LIBPL-to-library-dirs.patch index 874408eb46..45f8c2b71b 100644 --- a/mingw-w64-python/0100-distutils-mingw-add-LIBPL-to-library-dirs.patch +++ b/mingw-w64-python/0100-distutils-mingw-add-LIBPL-to-library-dirs.patch @@ -1,4 +1,4 @@ -From 67c57ef9e5f9c55d72698bb2e8d823a8f86dc621 Mon Sep 17 00:00:00 2001 +From 1d317167f0a6cd0be31e5b753a0d4449c55cb797 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 @@ -22,5 +22,5 @@ index 1dbdfe0..1598735 100644 # building third party extensions config_dir_name = os.path.basename(sysconfig.get_config_var('LIBPL')) -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0101-distutils-Change-the-get_platform-method-in-distutil.patch b/mingw-w64-python/0101-distutils-Change-the-get_platform-method-in-distutil.patch index 6cfa5e051a..798273a60a 100644 --- a/mingw-w64-python/0101-distutils-Change-the-get_platform-method-in-distutil.patch +++ b/mingw-w64-python/0101-distutils-Change-the-get_platform-method-in-distutil.patch @@ -1,4 +1,4 @@ -From 11a5561b5be99d671743894470a2adc27f796b64 Mon Sep 17 00:00:00 2001 +From fcddd0e6af0488d75d445186423fa13b29b137de Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:37:23 +0200 Subject: [PATCH 101/N] distutils: Change the `get_platform()` method in @@ -40,5 +40,5 @@ index 75a369d..5b51c76 100644 return 'win-amd64' if '(arm)' in sys.version.lower(): -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0102-build-Fix-ncursesw-include-lookup.patch b/mingw-w64-python/0102-build-Fix-ncursesw-include-lookup.patch index 3d95313bba..8b94cce387 100644 --- a/mingw-w64-python/0102-build-Fix-ncursesw-include-lookup.patch +++ b/mingw-w64-python/0102-build-Fix-ncursesw-include-lookup.patch @@ -1,4 +1,4 @@ -From 228556c0bb852e9be30abc25d442d80bdf7e6f63 Mon Sep 17 00:00:00 2001 +From a05fa8b0617eb13093d288dfecf13d6729329500 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 @@ -61,5 +61,5 @@ index 4f697e7..efc9ec7 100644 # _curses_panel.so must link with panelw. panel_library = 'panelw' -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0103-tests-fix-test_bytes.patch b/mingw-w64-python/0103-tests-fix-test_bytes.patch index 75bf2d658e..6d736c31c8 100644 --- a/mingw-w64-python/0103-tests-fix-test_bytes.patch +++ b/mingw-w64-python/0103-tests-fix-test_bytes.patch @@ -1,4 +1,4 @@ -From 15bdfabc3b6ed9b2a919df7138a9f67c66b7e91a Mon Sep 17 00:00:00 2001 +From e85708bf5ddf4e49e0b70d6dc2011a4ac23bb46e Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 23 Jul 2021 08:51:32 +0200 Subject: [PATCH 103/N] tests: fix test_bytes @@ -23,5 +23,5 @@ index 227e6d7..193ce10 100644 return (ptr_format % ptr) else: -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0104-time-fix-strftime-not-raising-for-invalid-year-value.patch b/mingw-w64-python/0104-time-fix-strftime-not-raising-for-invalid-year-value.patch index 702e77c098..cd74142817 100644 --- a/mingw-w64-python/0104-time-fix-strftime-not-raising-for-invalid-year-value.patch +++ b/mingw-w64-python/0104-time-fix-strftime-not-raising-for-invalid-year-value.patch @@ -1,4 +1,4 @@ -From c492a2a595a907c1bd29d60b2f39aa5122026208 Mon Sep 17 00:00:00 2001 +From cababe938af945f933feb85bdc322e8972de846e Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 23 Jul 2021 08:52:50 +0200 Subject: [PATCH 104/N] time: fix strftime not raising for invalid year @@ -24,5 +24,5 @@ index df59f2a..ded8165 100644 PyErr_SetString(PyExc_ValueError, "strftime() requires year in [1; 9999]"); -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0105-ctypes-find_library-c-should-return-None-with-ucrt.patch b/mingw-w64-python/0105-ctypes-find_library-c-should-return-None-with-ucrt.patch index a4fd62a071..84fe452b9e 100644 --- a/mingw-w64-python/0105-ctypes-find_library-c-should-return-None-with-ucrt.patch +++ b/mingw-w64-python/0105-ctypes-find_library-c-should-return-None-with-ucrt.patch @@ -1,4 +1,4 @@ -From d8c278a2d22163036f8929504b2ff7118838223f Mon Sep 17 00:00:00 2001 +From f430257b909becc25899b4f40e4416b6d93ba6b3 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 23 Jul 2021 18:23:58 +0200 Subject: [PATCH 105/N] ctypes: find_library('c') should return None with @@ -37,5 +37,5 @@ index 0c2510e..48ddb3b 100644 # See MSDN for the REAL search order. for directory in os.environ['PATH'].split(os.pathsep): -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0106-build-Disable-checks-for-dlopen-dlfcn.patch b/mingw-w64-python/0106-build-Disable-checks-for-dlopen-dlfcn.patch index 9b5ccbaa2b..5349f3eed0 100644 --- a/mingw-w64-python/0106-build-Disable-checks-for-dlopen-dlfcn.patch +++ b/mingw-w64-python/0106-build-Disable-checks-for-dlopen-dlfcn.patch @@ -1,4 +1,4 @@ -From 892166ff51d177cc3537cbf281dfcd6a8542cca9 Mon Sep 17 00:00:00 2001 +From fa6ff806ba380ba2d034a09a241949d2eae2ffa3 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 13:54:12 +0200 Subject: [PATCH 106/N] build: Disable checks for dlopen/dlfcn @@ -62,5 +62,5 @@ index e0d48ea..431b3aa 100644 # determine what size digit to use for Python's longs AC_MSG_CHECKING([digit size for Python's longs]) -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0107-Fix-install-location-of-the-import-library.patch b/mingw-w64-python/0107-Fix-install-location-of-the-import-library.patch index fdd164fcc1..b5ae094841 100644 --- a/mingw-w64-python/0107-Fix-install-location-of-the-import-library.patch +++ b/mingw-w64-python/0107-Fix-install-location-of-the-import-library.patch @@ -1,4 +1,4 @@ -From 41aa0b7e35c6f591d688b8d8bb8d808f9d5ed296 Mon Sep 17 00:00:00 2001 +From 92e5046e053c9e6d8561b65ef66bc57a34495e9b Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 15:46:01 +0200 Subject: [PATCH 107/N] Fix install location of the import library @@ -21,5 +21,5 @@ index 99bed41..14bd6e3 100644 $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ fi; \ -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0108-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch b/mingw-w64-python/0108-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch index bfe62dee83..fcb362fd6e 100644 --- a/mingw-w64-python/0108-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch +++ b/mingw-w64-python/0108-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch @@ -1,4 +1,4 @@ -From 0c2c260bfdddb8e6cd7e2d7a9c168bc00a0374ed Mon Sep 17 00:00:00 2001 +From f61bf3177dbd13216487f7b652b0414c93515279 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 15:46:54 +0200 Subject: [PATCH 108/N] Set MSYS2_ARG_CONV_EXCL for the shared Python module @@ -22,5 +22,5 @@ index 14bd6e3..35055fb 100644 --prefix=$(prefix) \ --install-scripts=$(BINDIR) \ -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0109-build-Integrate-venvlauncher-build-installation-into.patch b/mingw-w64-python/0109-build-Integrate-venvlauncher-build-installation-into.patch index 3cebc649f9..68a81ff13a 100644 --- a/mingw-w64-python/0109-build-Integrate-venvlauncher-build-installation-into.patch +++ b/mingw-w64-python/0109-build-Integrate-venvlauncher-build-installation-into.patch @@ -1,4 +1,4 @@ -From d937db5eee48aced8aefa5df4636fc47bc9f965b Mon Sep 17 00:00:00 2001 +From 400dd6299cf3063867c3d52659ffecda6faf67f6 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 16:53:35 +0200 Subject: [PATCH 109/N] build: Integrate venvlauncher build/installation into @@ -75,5 +75,5 @@ index 35055fb..498186f 100644 $(INSTALL_PROGRAM) $(STRIPFLAG) Mac/pythonw $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \ fi -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0110-configure.ac-set-_WIN32_WINNT-version.patch b/mingw-w64-python/0110-configure.ac-set-_WIN32_WINNT-version.patch index 2e72849d2c..c7e74545b4 100644 --- a/mingw-w64-python/0110-configure.ac-set-_WIN32_WINNT-version.patch +++ b/mingw-w64-python/0110-configure.ac-set-_WIN32_WINNT-version.patch @@ -1,4 +1,4 @@ -From ba0b794bdf258a9cad3734a2b37d4b84f4d4c8cc Mon Sep 17 00:00:00 2001 +From db1f1151b13293610938b3855ce8f477e8164691 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 1 Aug 2021 15:18:50 +0200 Subject: [PATCH 110/N] configure.ac: set _WIN32_WINNT version @@ -24,5 +24,5 @@ index 431b3aa..fb1f40d 100644 AC_SUBST(USE_WIN32_MODULE) USE_WIN32_MODULE='#' -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0111-configure.ac-don-t-check-for-clock_-functions.patch b/mingw-w64-python/0111-configure.ac-don-t-check-for-clock_-functions.patch index 1ddf3f3fcd..0e5b51c161 100644 --- a/mingw-w64-python/0111-configure.ac-don-t-check-for-clock_-functions.patch +++ b/mingw-w64-python/0111-configure.ac-don-t-check-for-clock_-functions.patch @@ -1,4 +1,4 @@ -From b08d16df7ef855ecdf2efcd4eeb0251c7aa474f1 Mon Sep 17 00:00:00 2001 +From f0af25a4b7ff95b970f58f1eed69e69fd1321d99 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 1 Aug 2021 18:35:17 +0200 Subject: [PATCH 111/N] configure.ac: don't check for clock_ functions @@ -32,5 +32,5 @@ index fb1f40d..15ddeda 100644 AC_MSG_CHECKING(for major, minor, and makedev) AC_LINK_IFELSE([AC_LANG_PROGRAM([[ -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0112-expanduser-normpath-paths-coming-from-env-vars.patch b/mingw-w64-python/0112-expanduser-normpath-paths-coming-from-env-vars.patch index 9ea49a71c5..d92f6694d5 100644 --- a/mingw-w64-python/0112-expanduser-normpath-paths-coming-from-env-vars.patch +++ b/mingw-w64-python/0112-expanduser-normpath-paths-coming-from-env-vars.patch @@ -1,4 +1,4 @@ -From 7598b8ec6c6dc0ef06fee42d75c5db4601e4ed4f Mon Sep 17 00:00:00 2001 +From 6f5070da21454f3f5795692bc85355df046971b6 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 8 Aug 2021 10:17:35 +0200 Subject: [PATCH 112/N] expanduser: normpath paths coming from env vars @@ -31,5 +31,5 @@ index 77f5614..5d1c6b9 100644 # Expand paths containing shell variable substitutions. -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0113-Add-support-for-Windows-7-Python-3.9.patch b/mingw-w64-python/0113-Add-support-for-Windows-7-Python-3.9.patch index 3e9cbbca0a..c48a9268c6 100644 --- a/mingw-w64-python/0113-Add-support-for-Windows-7-Python-3.9.patch +++ b/mingw-w64-python/0113-Add-support-for-Windows-7-Python-3.9.patch @@ -1,4 +1,4 @@ -From 779bcb166dddb489b35f688323145c206e98d896 Mon Sep 17 00:00:00 2001 +From 32d4a3d2e6ab34172c164110aed7d798f2f8e092 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Thu, 17 Jun 2021 18:52:39 +0530 Subject: [PATCH 113/N] Add support for Windows 7 Python 3.9 @@ -10,7 +10,7 @@ Subject: [PATCH 113/N] Add support for Windows 7 Python 3.9 3 files changed, 69 insertions(+), 13 deletions(-) diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 590b459..1b627df 100644 +index beb00ab..14fb676 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -18,7 +18,7 @@ @@ -22,7 +22,7 @@ index 590b459..1b627df 100644 #endif #include "pycore_ceval.h" // _PyEval_ReInitThreads() -@@ -4402,7 +4402,6 @@ os__path_splitroot_impl(PyObject *module, path_t *path) +@@ -4412,7 +4412,6 @@ os__path_splitroot_impl(PyObject *module, path_t *path) wchar_t *buffer; wchar_t *end; PyObject *result = NULL; @@ -30,7 +30,7 @@ index 590b459..1b627df 100644 buffer = (wchar_t*)PyMem_Malloc(sizeof(wchar_t) * (wcslen(path->wide) + 1)); if (!buffer) { -@@ -4414,18 +4413,26 @@ os__path_splitroot_impl(PyObject *module, path_t *path) +@@ -4424,18 +4423,26 @@ os__path_splitroot_impl(PyObject *module, path_t *path) } Py_BEGIN_ALLOW_THREADS @@ -62,7 +62,7 @@ index 590b459..1b627df 100644 } PyMem_Free(buffer); -@@ -4433,6 +4440,7 @@ os__path_splitroot_impl(PyObject *module, path_t *path) +@@ -4443,6 +4450,7 @@ os__path_splitroot_impl(PyObject *module, path_t *path) } @@ -173,5 +173,5 @@ index 15ddeda..780b63d 100644 if test "$AWK" = "gawk"; then awk_extra_flag="--non-decimal-data" -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0114-CI-test-the-build-and-add-some-mingw-specific-tests.patch b/mingw-w64-python/0114-CI-test-the-build-and-add-some-mingw-specific-tests.patch index 36c767e96c..2ad7a718f8 100644 --- a/mingw-w64-python/0114-CI-test-the-build-and-add-some-mingw-specific-tests.patch +++ b/mingw-w64-python/0114-CI-test-the-build-and-add-some-mingw-specific-tests.patch @@ -1,4 +1,4 @@ -From 5949f2c1a58436e656ca766682a1807db9115509 Mon Sep 17 00:00:00 2001 +From bcf40f9b75a3469c30151e8989a115f32e4e6de0 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 18 Jun 2021 17:51:59 +0530 Subject: [PATCH 114/N] CI: test the build and add some mingw specific tests @@ -585,5 +585,5 @@ index 0000000..70acbd1 +if __name__ == '__main__': + unittest.main(defaultTest='suite') -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0115-decimal-backport-build-fixes.patch b/mingw-w64-python/0115-decimal-backport-build-fixes.patch index b1d47cb941..d245821023 100644 --- a/mingw-w64-python/0115-decimal-backport-build-fixes.patch +++ b/mingw-w64-python/0115-decimal-backport-build-fixes.patch @@ -1,4 +1,4 @@ -From ad61aa0491786e29425ded6330a02bbdc485a304 Mon Sep 17 00:00:00 2001 +From ce1088caeb381a0a16c6dae89b56503c61f2044a Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 23 Sep 2021 09:55:32 +0200 Subject: [PATCH 115/N] decimal: backport build fixes @@ -31,5 +31,5 @@ index d80d791..28fd209 100644 sep = dotsep_as_utf8(spec.sep); if (sep == NULL) { -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0116-smoketests-test-that-_decimal-exists.patch b/mingw-w64-python/0116-smoketests-test-that-_decimal-exists.patch index 38db70df8a..843e58cf2b 100644 --- a/mingw-w64-python/0116-smoketests-test-that-_decimal-exists.patch +++ b/mingw-w64-python/0116-smoketests-test-that-_decimal-exists.patch @@ -1,4 +1,4 @@ -From b6fe411e3f2dca2447fa85ba30bedc1b6fd00d8a Mon Sep 17 00:00:00 2001 +From ed163fc061a261f24be75c684529a133b8692e37 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 23 Sep 2021 09:57:56 +0200 Subject: [PATCH 116/N] smoketests: test that _decimal exists @@ -22,5 +22,5 @@ index 70acbd1..527aafb 100644 import socket self.assertTrue(hasattr(socket, "inet_ntop")) -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0117-Prefer-sysconfig.python_build.patch b/mingw-w64-python/0117-Prefer-sysconfig.python_build.patch index b9c7ec5cfd..539232435f 100644 --- a/mingw-w64-python/0117-Prefer-sysconfig.python_build.patch +++ b/mingw-w64-python/0117-Prefer-sysconfig.python_build.patch @@ -1,4 +1,4 @@ -From 88857dfffec88cc6526fe79ce8c471f7b56ddb45 Mon Sep 17 00:00:00 2001 +From 5a8b8646f2dfa0961b568e36cb212887db9950ff Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Fri, 1 Oct 2021 07:28:36 +0700 Subject: [PATCH 117/N] Prefer sysconfig.python_build @@ -21,5 +21,5 @@ index 1598735..82a21d2 100644 config_dir_name = os.path.basename(sysconfig.get_config_var('LIBPL')) self.library_dirs.append(os.path.join(sys.prefix, "lib", -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0118-distutils-remove-checks-for-ancient-gcc-binutils.patch b/mingw-w64-python/0118-distutils-remove-checks-for-ancient-gcc-binutils.patch index fcb79b841f..d609dbe44c 100644 --- a/mingw-w64-python/0118-distutils-remove-checks-for-ancient-gcc-binutils.patch +++ b/mingw-w64-python/0118-distutils-remove-checks-for-ancient-gcc-binutils.patch @@ -1,4 +1,4 @@ -From 1473fd54edec0cc91f7a45be4237cde1f45fcc01 Mon Sep 17 00:00:00 2001 +From d3d8a30511bab2f69b7bf2738c82310614cb17e8 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 7 Nov 2021 23:06:13 +0100 Subject: [PATCH 118/N] distutils: remove checks for ancient gcc/binutils @@ -256,5 +256,5 @@ index 9dc869d..f525ab4 100644 # none -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0119-distutils-split-CC-env-var-before-passing-to-subproc.patch b/mingw-w64-python/0119-distutils-split-CC-env-var-before-passing-to-subproc.patch index 1cb97d692e..9d7b3cc447 100644 --- a/mingw-w64-python/0119-distutils-split-CC-env-var-before-passing-to-subproc.patch +++ b/mingw-w64-python/0119-distutils-split-CC-env-var-before-passing-to-subproc.patch @@ -1,4 +1,4 @@ -From bd80176fea7e8abd4d47eb5ed9877defe0ce7e24 Mon Sep 17 00:00:00 2001 +From 35f21ce548fa20acc7846773f8d36ec17e33e4d5 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 7 Nov 2021 23:12:10 +0100 Subject: [PATCH 119/N] distutils: split CC env var before passing to @@ -32,5 +32,5 @@ index 2804f69..6e22555 100644 + out_string = check_output(shlex.split(cc) + ['-dumpmachine']) return out_string.strip().endswith(b'cygwin') -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0120-_testconsole.c-Fix-casing-path-sep.patch b/mingw-w64-python/0120-_testconsole.c-Fix-casing-path-sep.patch index e736358c96..b7b798e6a7 100644 --- a/mingw-w64-python/0120-_testconsole.c-Fix-casing-path-sep.patch +++ b/mingw-w64-python/0120-_testconsole.c-Fix-casing-path-sep.patch @@ -1,4 +1,4 @@ -From d9f5c6f259acecfec9d189756bb29a22da5be92f Mon Sep 17 00:00:00 2001 +From 6122688dd79029c8f1eb8e70828e243ef9accfff Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Sun, 14 Nov 2021 14:55:35 +0700 Subject: [PATCH 120/N] _testconsole.c: Fix casing & path sep @@ -30,5 +30,5 @@ index b62f21c..c8b9593 100644 PyMethodDef testconsole_methods[] = { _TESTCONSOLE_WRITE_INPUT_METHODDEF -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0121-Return-consistent-architecture-markers-for-python-on.patch b/mingw-w64-python/0121-Return-consistent-architecture-markers-for-python-on.patch index 06ebde8aa0..6bac74d981 100644 --- a/mingw-w64-python/0121-Return-consistent-architecture-markers-for-python-on.patch +++ b/mingw-w64-python/0121-Return-consistent-architecture-markers-for-python-on.patch @@ -1,4 +1,4 @@ -From e28db3b8feaf94017a1276db7ce7979362e345df Mon Sep 17 00:00:00 2001 +From 15ff2963e70a8e280bf2bd48ae07c02765cabdcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Fri, 19 Nov 2021 12:18:06 +0200 Subject: [PATCH 121/N] Return consistent architecture markers for python on @@ -65,5 +65,5 @@ index 780b63d..62dd074 100644 AC_MSG_RESULT($PYD_PLATFORM_TAG) esac -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0122-distutils-add-back-gcc_version.patch b/mingw-w64-python/0122-distutils-add-back-gcc_version.patch index 30ee3929d4..0ab38f4d67 100644 --- a/mingw-w64-python/0122-distutils-add-back-gcc_version.patch +++ b/mingw-w64-python/0122-distutils-add-back-gcc_version.patch @@ -1,4 +1,4 @@ -From b97165accc80b3fecfdda99457d9ffedc678b441 Mon Sep 17 00:00:00 2001 +From d2d5fe97875c5c841ba9111454c32bcc027c1d40 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 21 Nov 2021 14:00:06 +0100 Subject: [PATCH 122/N] distutils: add back gcc_version @@ -34,5 +34,5 @@ index 6e22555..d8c8428 100644 shared_option = "-shared" -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0123-fix-mingw-cross-compiling-in-setup.py.patch b/mingw-w64-python/0123-fix-mingw-cross-compiling-in-setup.py.patch index 6072b5a34c..02889638a6 100644 --- a/mingw-w64-python/0123-fix-mingw-cross-compiling-in-setup.py.patch +++ b/mingw-w64-python/0123-fix-mingw-cross-compiling-in-setup.py.patch @@ -1,4 +1,4 @@ -From 6aaa33aa3c8098b6be1012354b2c77dbece6a9c0 Mon Sep 17 00:00:00 2001 +From 4911be4e3f93956218ebaed70cd8208ea08a97f6 Mon Sep 17 00:00:00 2001 From: jeremyd2019 Date: Mon, 22 Nov 2021 13:15:12 -0800 Subject: [PATCH 123/N] fix mingw cross compiling in setup.py @@ -43,5 +43,5 @@ index efc9ec7..6b0e709 100644 os.unlink(tmpfile) -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0124-Use-actions-setup-python-for-setting-up-correct-vers.patch b/mingw-w64-python/0124-Use-actions-setup-python-for-setting-up-correct-vers.patch index 7bc4f9b230..090ce97db0 100644 --- a/mingw-w64-python/0124-Use-actions-setup-python-for-setting-up-correct-vers.patch +++ b/mingw-w64-python/0124-Use-actions-setup-python-for-setting-up-correct-vers.patch @@ -1,4 +1,4 @@ -From 78fb0ba6c06113530ee9392f2bdc9d59483b6849 Mon Sep 17 00:00:00 2001 +From b2f3c1d01b4b0e6f3218bf5421a1fb3e6e0ff132 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 21 Jan 2022 19:25:44 +0530 Subject: [PATCH 124/N] Use actions/setup-python for setting up correct @@ -32,5 +32,5 @@ index eb27adc..ffd6ecb 100644 - name: Build run: | -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0125-Fix-buffer-overflow-in-Py_GetSepW.patch b/mingw-w64-python/0125-Fix-buffer-overflow-in-Py_GetSepW.patch index 68cdc375c8..d708dfbc9b 100644 --- a/mingw-w64-python/0125-Fix-buffer-overflow-in-Py_GetSepW.patch +++ b/mingw-w64-python/0125-Fix-buffer-overflow-in-Py_GetSepW.patch @@ -1,4 +1,4 @@ -From f50a2d7b97a9a6eee45aaa127f73356d88bd3332 Mon Sep 17 00:00:00 2001 +From 04523c08dca87a86a5251d74d97078fb4b00582e Mon Sep 17 00:00:00 2001 From: cat Date: Sat, 11 Dec 2021 14:21:07 +0500 Subject: [PATCH 125/N] Fix buffer overflow in Py_GetSepW(). @@ -61,5 +61,5 @@ index 222850b..7d75216 100644 return L'\\'; } -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0126-Remove-unnecessary-strlen-in-Py_NormalizeSepsW.patch b/mingw-w64-python/0126-Remove-unnecessary-strlen-in-Py_NormalizeSepsW.patch index 5e76385a9a..e8cca48f7e 100644 --- a/mingw-w64-python/0126-Remove-unnecessary-strlen-in-Py_NormalizeSepsW.patch +++ b/mingw-w64-python/0126-Remove-unnecessary-strlen-in-Py_NormalizeSepsW.patch @@ -1,4 +1,4 @@ -From c7fab0006a6a2c9cb6fcaaf6a648a7a19dc867a6 Mon Sep 17 00:00:00 2001 +From fad6087cd14fa8d66f922a50b0fd334069aead1f Mon Sep 17 00:00:00 2001 From: cat Date: Sat, 11 Dec 2021 14:23:29 +0500 Subject: [PATCH 126/N] Remove unnecessary strlen() in Py_NormalizeSepsW(). @@ -38,5 +38,5 @@ index 7d75216..d47cb6f 100644 } seps = wcschr(name, altsep); -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0127-handle-ncursesw-pkg-config-when-cross-compiling.patch b/mingw-w64-python/0127-handle-ncursesw-pkg-config-when-cross-compiling.patch index 3a664e96d2..f3fff848f9 100644 --- a/mingw-w64-python/0127-handle-ncursesw-pkg-config-when-cross-compiling.patch +++ b/mingw-w64-python/0127-handle-ncursesw-pkg-config-when-cross-compiling.patch @@ -1,4 +1,4 @@ -From b3cd1ab54a1607fcade6f73be6ecd1db6b31c3c8 Mon Sep 17 00:00:00 2001 +From 494dd549e78993974b3c4b2537a4260c31d77b5c Mon Sep 17 00:00:00 2001 From: jeremyd2019 Date: Mon, 22 Nov 2021 16:04:41 -0800 Subject: [PATCH 127/N] handle ncursesw pkg-config when cross-compiling @@ -59,5 +59,5 @@ index 6b0e709..43e5ee0 100644 # _curses_panel.so must link with panelw. panel_library = 'panelw' -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0128-Use-CC-instead-of-cc.patch b/mingw-w64-python/0128-Use-CC-instead-of-cc.patch index 7899cbb5a8..8d1c4cf486 100644 --- a/mingw-w64-python/0128-Use-CC-instead-of-cc.patch +++ b/mingw-w64-python/0128-Use-CC-instead-of-cc.patch @@ -1,4 +1,4 @@ -From ea71d7beb72ec7c0e9b7a71213f7edc839cf68a0 Mon Sep 17 00:00:00 2001 +From b0a2ae4ee7063c0edbee8447ba4f209e0723c10b Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Mon, 28 Feb 2022 00:06:06 +0700 Subject: [PATCH 128/N] Use CC instead of cc @@ -21,5 +21,5 @@ index 43e5ee0..b967544 100644 with open(tmpfile) as fp: for line in fp.readlines(): -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0129-bpo-46811-Make-test-suite-support-Expat-2.4.5-GH-314.patch b/mingw-w64-python/0129-bpo-46811-Make-test-suite-support-Expat-2.4.5-GH-314.patch index b355d94d47..cad1533bdd 100644 --- a/mingw-w64-python/0129-bpo-46811-Make-test-suite-support-Expat-2.4.5-GH-314.patch +++ b/mingw-w64-python/0129-bpo-46811-Make-test-suite-support-Expat-2.4.5-GH-314.patch @@ -1,4 +1,4 @@ -From 4cb497083baf8b163d114dd797316b25366c0a75 Mon Sep 17 00:00:00 2001 +From 9916159085baca60dd77da0fd3bc54b8f5f810df Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Mon, 21 Feb 2022 08:16:23 -0800 @@ -37,5 +37,5 @@ index 0000000..6969bd1 @@ -0,0 +1 @@ +Make test suite support Expat >=2.4.5 -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0130-Avoid-using-sysconfig-in-site.py.patch b/mingw-w64-python/0130-Avoid-using-sysconfig-in-site.py.patch index f8b4ba1dd9..6387466285 100644 --- a/mingw-w64-python/0130-Avoid-using-sysconfig-in-site.py.patch +++ b/mingw-w64-python/0130-Avoid-using-sysconfig-in-site.py.patch @@ -1,4 +1,4 @@ -From 656a2a8e771a21627ee165d5fae60b0465a54911 Mon Sep 17 00:00:00 2001 +From d870e219c57d12667cf71659647cbb5e41b624ca Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Mon, 14 Mar 2022 19:28:06 +0530 Subject: [PATCH 130/N] Avoid using sysconfig in site.py @@ -58,5 +58,5 @@ index 474ef89..548f9d7 100644 if not prefix or prefix in seen: continue -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0131-Commit-regenerated-importlib.patch b/mingw-w64-python/0131-Commit-regenerated-importlib.patch index c9d2431abe..39786821a4 100644 --- a/mingw-w64-python/0131-Commit-regenerated-importlib.patch +++ b/mingw-w64-python/0131-Commit-regenerated-importlib.patch @@ -1,4 +1,4 @@ -From 171c0d65a34919c302a5605dde2afc0a09e94690 Mon Sep 17 00:00:00 2001 +From 27fcc9abcc7a21f790e526122d6c8fc0ae091e4d Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 18 Mar 2022 12:22:15 +0100 Subject: [PATCH 131/N] Commit regenerated importlib @@ -2389,5 +2389,5 @@ index 23af2cd..3c0b0a1 100644 + 14,127,0,27,10,23,8,11,8,61, }; -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0132-configure-Include-a-header-in-the-check-for-_beginth.patch b/mingw-w64-python/0132-configure-Include-a-header-in-the-check-for-_beginth.patch index f346b19e15..ca76612873 100644 --- a/mingw-w64-python/0132-configure-Include-a-header-in-the-check-for-_beginth.patch +++ b/mingw-w64-python/0132-configure-Include-a-header-in-the-check-for-_beginth.patch @@ -1,4 +1,4 @@ -From 3b11644c6ac1154cf7c363ae3a6a9afdda0ccb4f Mon Sep 17 00:00:00 2001 +From 593d57fea2a0cfd95a8f70df3d52ae634428a8fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Thu, 21 Apr 2022 14:25:51 +0300 Subject: [PATCH 132/N] configure: Include a header in the check for @@ -32,5 +32,5 @@ index 49bfa1c..78c3c49 100644 [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([failed to link with nt-threads])]) -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0133-configure.ac-Default-to-without-c-locale-coercion-on.patch b/mingw-w64-python/0133-configure.ac-Default-to-without-c-locale-coercion-on.patch index 4b68bb0059..3c2d8a37fb 100644 --- a/mingw-w64-python/0133-configure.ac-Default-to-without-c-locale-coercion-on.patch +++ b/mingw-w64-python/0133-configure.ac-Default-to-without-c-locale-coercion-on.patch @@ -1,4 +1,4 @@ -From 6a0b4b23f052bc5f1ba53706f7214d4283668e67 Mon Sep 17 00:00:00 2001 +From d9997a6b3ed4f3d07d0ba6b73abff711c4583fcf Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 22 Apr 2022 17:31:19 +0200 Subject: [PATCH 133/N] configure.ac: Default to --without-c-locale-coercion @@ -36,5 +36,5 @@ index 78c3c49..a7dd930 100644 if test "$with_c_locale_coercion" != "no" then -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/0134-CI-remove-without-c-locale-coercion.patch b/mingw-w64-python/0134-CI-remove-without-c-locale-coercion.patch index 4397c84c43..10f925f628 100644 --- a/mingw-w64-python/0134-CI-remove-without-c-locale-coercion.patch +++ b/mingw-w64-python/0134-CI-remove-without-c-locale-coercion.patch @@ -1,4 +1,4 @@ -From b7dd2caeba35f5b170d70c36cc8cba4c6630dcea Mon Sep 17 00:00:00 2001 +From ad0d7b22fced4e0808fe5aed263f13a78bd014fd Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 22 Apr 2022 17:37:23 +0200 Subject: [PATCH 134/N] CI: remove --without-c-locale-coercion @@ -29,5 +29,5 @@ index ffd6ecb..5588785 100644 make -j8 -- -2.35.3 +2.36.1 diff --git a/mingw-w64-python/PKGBUILD b/mingw-w64-python/PKGBUILD index 6c99d48a14..0e6f3eebf6 100644 --- a/mingw-w64-python/PKGBUILD +++ b/mingw-w64-python/PKGBUILD @@ -21,8 +21,8 @@ else pkgbase="mingw-w64-${_realname}${_pybasever}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}${_pybasever}") fi -pkgver=${_pybasever}.12 -pkgrel=2 +pkgver=${_pybasever}.13 +pkgrel=1 pkgdesc="A high-level scripting language (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -423,138 +423,138 @@ package() { fi } -sha256sums=('2cd94b20670e4159c6d9ab57f91dbf255b97d8c1a1451d1c35f4ec1968adf971' - 'e2ba922e130c24c448aac8c487653687ce9b3f459e178904be3748b2d54cf1ea' - '067ed869b2beacdd604bed076f13a2bb447d8364194546c96c86a19301030ff2' - 'e43c421776ab9a15ad78772d1a5c5f8dcc89ae2d31bd64b5632d575d4d9c352a' - '57cfa64b5b3bdea30d428643a455852d16dc2a5b9f97ca038da9ed8d9e621ed3' - '4e9046e9b8cae235d910eabc551f42f11db4f9b769544b5217d6a6e354543903' - '4701b6274850e2149a2194fb3f70d1498581ec37de32d46d384aee48c5d7ac61' - 'cb8ae8057ced0b94be79e195d6df64e23bb4e436f53727a713503faee67d027a' - '3b79155cbd5d164158e132ad2b70fad288a8323b6f2dfadca420220be4839df3' - '1418b24cf76046fdcb9d8dbf84de9bb3c99fc2916dccb719fb6478881a465c33' - 'd47f3a067b9b9ffc3375d7deefe1eb87e30acb10e3b6723290e4c1ea9aebef71' - '6a270d412a5ef26a002cd67d998d5456af6963abf27d2c9b767726660660f493' - '079b906e1e94fbc43a1f498a626d1be2e85f36c090ad9300b185bc526bad529c' - '6d277821a017e325133d7d3a6bc58465fa1c157635a772205069be815649b3e3' - 'c37dc1fa659b751ee6b38ceb6133d12be9078e9d2f9f07bb2dffeb0ee94e5867' - '2380ffa8ee39ee53f32cf9d5a0b9efab95439f52ee5946f2b00701ab8ec40979' - '6065bb75e67c40d058c51f5d85f306527490f94582b2ca738194c113cbc40dd8' - '2bfe430818919cb468867fa21d77f03cf4c20869f971c11828edc61fd854ea8b' - 'ce3935b2bcbd801cea6628732580b5a81eb093fd9f47a55f29d06015c943576d' - '7864f202327e4e205ce759b6d90671b7a8f381ede7cdacd47381d59392d424f7' - '08b8e0c404cb2c5a046d613cc89289c47f8511fc1a29bb965ef957b6d6c0aec8' - '860589d36a0119f93bcf247e8711826ca656f586ecc62953aadfa22428af29f8' - 'c728eea714a47c29c27d84a5a2865310cc59b1739c684f053fee13014cf22eca' - '6b7a526e4a68844a74dea82f45a2027e1d20d71b4b6b60de395191314c2005f2' - '4209376ea53450585963436128425102eaae02822d95ffa4241a8c750d5570f3' - 'ae4c50955be07ffe7a572233d3cef9509dcc4b27d44cb05bffb56d733c712ef8' - '8ba73c256cabd9c203364dbf1cc2fcd428998334ec95cc98c2681d2f49cce29a' - 'd8d217f68efdbbaf8ea1a89af911d72801e74c1659abf365f060fe95e8f8a8ea' - '606dd530e9f110b3a79823daaf68da9f8a107bb8d79d8544b5bbd6f22ae06cf2' - '9d5140d82335821ec9042c0103f1782657a013a550283ab73361be66f61fc39e' - 'aad92103d22c24324faeaf14f34af2453801f11cf4975382762f1ce17926f8c5' - '6c560e5a24b31236f9925899891adec69d53aef1171258118e81a708f93f9fbb' - '07004b72177970259239b61982295eb3249a41e8ccbc64c22c5725f86824eecc' - '33257ce619b671de1d47d11223308aa8be46f7a4b159dec49aab4fb04e82982a' - '05e4fb486d0a90d683bc366ab3cb4447da1610de20d6aa38c0151c832c302a3d' - 'c36a46be17f991c83b2ac63efddf50948af678a4b59bc1781f5bbf9ce4a508d4' - '93b885f107a26ccbacb4b395672566324361d07939a741cad7b40870ab2aff5a' - '170e1b3d545f0583d699066cb78c10b1a51deaac52e968098bdcc17d3075311a' - '94a80933fb3ec0de4cb84e9ad90b5967ffef00cd6c04c84397fa97ca1d5ceea7' - '6df775d47b0f69143824f4346043fced6ae99ff33cc35932ba0d125ca666efe4' - '1b86510bb7072c2348d76bc8fd88a7463cdab34345bccfe40f0d5a000ec7a670' - '2b52a45037f16b59c061a4c8813d9d0246bd6991d258ee6806eaf4a9e4d9c679' - 'ec3d787fda545a7490df9dc70ba96c4370c6766e8be1848b6f244827e0d4aea7' - '34eb7117f525c8d276bdf060bd4c365d3fc84b314c6637b9cba9fd80df9b40aa' - '708357a869ffda1527f220d986a5c3b30881b98070c82e024a03fb438a70baa7' - '08d79e59e5b698253c1bcb0c1bf6b9f10e3f11c5f82e37ad1750c1492eb85a99' - '16e8ea9dd5cc8600ea00a945b91af138d390d269b8cf3c2b19e4963e36ea1450' - '77294a5d356c6a1582bb2733cc1c1cdfcf730885c5160da2c444fc4dd680b113' - '2caa49f6ac19972ef3ebf9d8765dd3e06faaa6c692b60652fb22cb8c1c29351d' - 'f9d49674c84d2064eb063bd60bc629dbc4d5264eabd0fa6416244d406157a8e0' - '722c6d2a87a7242e6f0b29584f972dd4c9a90dfdad5681e45221116c7667c3e6' - 'e703cac280231e322b9d37f0dcc57f8993e789fd09fc35c147f2ce78e233d225' - 'd362ec479d8981a0660a76132304ef9dc9a4a41032250c88e174d86bbe4731a8' - 'ecc18f335d0251ad662d7ec40fd8c31df4126d73b083566344007a4d3b226efa' - '748f0f0a254b249c2117cc780840f58a151066cb84e95cae765c1382df6871aa' - 'b48b97d9ffd1f3eb60c9f79856862e2b59e10286078d00f09bb9cbccd62a5873' - 'eea6d4181a4119bada6c11617c1937cf573b81fa0e7ac33728af92df2a78c036' - '89feee7cdd43b961dfcad28afb1d1d48c149987aa7c36d7e0f5cf71306339f90' - 'bba69df1bf29a3faa2718b225410cad950fd1f2923550e6064ff57efa2b2649e' - '5ac1ca90b5724780816099da00e303506b4e70a57a33bb103e20ee3694eacf98' - '603f2a60e452d90d07f7b6247f3e856a793a102e464a15219521e64abc31e31b' - 'ae76b4058e1f9d961e5be7984b366617d3d71710701c6314cf8c843aec18020b' - '3a4efbeea95810d3d11bc9f127eafb0b5dbe6356dced7c4f2576ea3466e7bee8' - 'c1a44432fb6308fd94d7d3472d184dadf6c7d94efad7bd432242987066ac8f8a' - '2c97a863310ea3c9d34e64ef93e3e3ebc3ff03445ccbc650f4582bd66bf60377' - '9543c9b2759e38f4a6a5d30fe33c3fccea6a6493bfec599b6a17859c0ca3c4d0' - '7185eeb4f945bf3d45a027b34ecf4ace38e97e99b77a6d0867da6c494d149364' - '42cb45ba333aecc8714a4da81a75abe47ac0a4d53c0d50e0a69d32b9a07f3ac5' - '20f092f365a220e9de022124c7136b4a4a1f1853071c3116a92bcf5079a60707' - 'a7e23f648ce2cf7b08099392d0ec521f23875c8edbf5979f89b3c65b62729916' - '4c0eb9b7ef38030fc89a94708db0d84431868f706e56ba85863a378d8d692121' - 'c59b0646e9ad5b69f6bad344bcde853fbc4a64de886e55cfd57954f393f2168b' - 'f612904f4084d892d28a60edc0ee22e2cc5e8f1220038a01990256f8e5fe5907' - '4cb13ec8c08262b9ad5e172564f671a17e0171cedf4d7586a6515ecc75d4bd44' - 'ca09e0ce4599905c96a9b484a5494632fde4287b04ff0dfc950cc0a578bc1c6d' - '448414c0796aab508114635de5084060570545fa7bf236b4172f783e7dbb7677' - 'f0655258ce7eaaffbe69ab6a805a83d1462c30c2cb12175d338b15e875bb76ec' - '5fbfa6fb81b41e47880bfd424e8619933a0bd00c15c4334e08a3fd54373cac3e' - '302205cb37f86e6ab8510a6e81793b73754802f722e60592f8f3a2fff6d5056f' - '940a2e3e0c78272fdb2f358c8d2ecc76d090b57af6503f73543cd66ae5213039' - 'a819a98609bfd9c2b343ee79ff6c1845f34f1724641b4c30cb18474ab6b5dcad' - 'd0eac3905ae1208bed6a0033d60b76335f5e7e881e423f4046f171dbc8c5cf48' - 'f7c1f00e721671db368330d4d2e607088d46ddbe2ad744633a8d8ac2c2b0744e' - '34764304b9ac8c75276d1d56d427a1a823c2f1b80f9360d5d16209d3a381a1f1' - 'e5845106790f4e864fa8f16a13c1001096e9e1784ef5cf21c6ec33a3f2d4faa2' - '289f2578088e82ec69a95208a10ceb0fb265dbe1bb96f16aa5d6f510b9a5ea37' - '3226bf295ccf7dddebfd87d4521b4713862632f555f885537ea4d15bf751e356' - 'f75ce991a9fa884207d770226fbcaa80c3cfa620d0d3749e97d4c7b49bfca71d' - 'd5cd021f886bf1de05bc72531861a752749981da2fb172d030146e7a262eb31f' - '30f337bf466ea6f9c3d6d287f10717fac56d074b9c2aeca02bae2714eb63d476' - '290c9ed9742d9cad537eef95fba67a6e01b5e2750009db3c2cb04b0c1f0e2a99' - '26698398d4abaaeaf662533a9afaefcc233e5ce1c3482699ffc30c6fe0a585fc' - 'f52e9f914ff3251954fcc19ed44e28d68ac7e452232dc7784e83daac8d736322' - '393bfd3c11a3750c824f545f47caf54f8c9205156f598ce33ffaccfe3b57a1e1' - '75c60043bf709de863bb2a026c678d73c9310d9975c2aab751ce6334a8f7ef98' - '4e7c659246b13ae3d443f1e323d7b8e2809e26e0746eeac5d53e0f57a670c6c7' - 'fa13d7a3eb4512b355b28188cf5446bfa8002e04b2fd81b87029272353420dab' - 'd8b31d3677a0c40bfb2ba4322bf857b35e0530823972b33e5f109eb117e74346' - '9b2c198ad0b5288ce3e5af8cfbf909627edcef3f126b3ef084a00fc93c81c9be' - 'c3e5f2064ae470aa5e3fd2acec1b9810a999ff3fd394318784aed87b1f9d14db' - '13e680a45153b3a19f3a805a57dd2c59bf977251c67b46804b61b776d21816c7' - '029418ceeea7da1885e9d001115a56d126b603a49d0ecfbe88ffafe409dfbcb0' - '7d8bea89d15ac283d28f92607077b71d19cbd48862b613bd4f34c21f6b430eee' - '6cc22e71c74f319570ff3f066a8a3939781d0e942fe91f9d30a5331ad1f5c18a' - '7de47ed75d3d7bafb08e6bfddaa7952526c9d99edc879f392a0a63629bcc5857' - 'c2e40b5f66682ec41f1ccb7ae9949a603918eedcf17939e04d0259bb70be8a6f' - 'c6c8841a9c9622ebb628d13b9d0b844bf79e48f0ecd404e07bddf590b8650ac0' - '7c550468e6c9405bd2cb9b5684a0e9099f2d81140a4104799b14f5e37afdc972' - 'f102262e905d483c7fd1fc187cdecd782db925a2edce121d79ed9746c3d305a6' - '464eb60669f053f562f48d632327493efce3d99745abdb466f700f776189ba6a' - 'f257530052eb6831d603b18d934b5dc19fa1b2b9d59a1dd64659ee23f2a78b61' - '1148d54e44e3b0d964fffd42a26f73e9bc0bea16af2e3d3fe4ed0f582709653f' - '0bb431949c861e4adcd584e1a53b195348c9487bfad8037b37ebe9ae47e96a87' - '4218b0a52cb72380ba9b054e5aaf8edd367705d69a568aa5afb9dbde877e3f43' - '2d2a529720107b55e6c991dd53f0151359123f5be0035ec7b03b7cdd91d2058c' - 'a90fbb8f38e4c0ff97dd74f058173c9cc8b3732f68850c5d499d7d05cad3debd' - '1906267720110bb0db0145bddd878d6909729a2729fb6d7a891ee1cb22aa1e40' - 'fc12afa5a3c91f3088458b03963020be620028dd7be8fb4dcffef224f8c8b031' - '9dba90641aef38e9bb33538d357b81c2af56c50098b22cdb6c1c531442a9fc09' - 'aedd9608e6db030a30f779f97877f802ba78662f50bbe0984e5988e19b2ce592' - '49e66811d63e88b38f6154c6dec732294f9718326cf147c70ea35c3af1dc9fa5' - 'd855f39afc24607fd5bed14f06381460342ce6667d15c29711ae1d87ffa64d24' - '4e092465d2f0f47a2a49141df19b1b3327ecd6f0abc1adc361cfe4fd2cd149cd' - 'b6245c6adad6d7a67960a5224bcf5c480ae5769f35375ab71c00d95ccd65cbd5' - '6d089e47b65db6ef40b374bf7f89bebf2952e1949c2710de8c8d710707fe4943' - 'efecbe6ee639652f2253c672b4da345e400167d59daf8bbe1991e4c474e7dc76' - '66ec8dff3674523961060ecf263d9e3b2efe96c3392e445ed8707bde00fee918' - 'd251b0d1bdee189fcefa6244f529a6c16d8bfc3b17aa597fad7d15f531dc34d3' - 'd351e774edb8c318811ac4765e345c11d45fbe954a6abc5e8ca6bc9a575f15af' - '8fb7a607942882d114a6b662d5ec516343b60b3c8a3ad7623435b3054fb1ba2b' - '4a1df1a248befcb9bfebe64316b948e2c81c815a0c43879dd163809a4fb41a46' - '6c4911918aa47b505162e424663998a7319822b84a9c8385c7463405ca820e47' - '26172989d1175c66608fa1709f19f981c3d1e54c336bf992a09e556d5c3e4722' - 'd69294330356d9b870cf8066ac352f8a825bac21fe7c72f5fa87f37dd650fbeb' - 'b521b3a630be5d94d303d3813784e65eead5294df0a04e75530f243e072112d8') +sha256sums=('125b0c598f1e15d2aa65406e83f792df7d171cdf38c16803b149994316a3080f' + '6337de6bd1515c54f40575dd4fc25a659763cd530e9adbb66837485114f1cdd0' + '750ff132c254931c5d8a32080eab599046b167ce225c7ea22ddd1e370f00f51a' + 'effe5996734ecc5b52835c27ffb8734238102cc561d409a13f85ed56bd7fb053' + '5e780d6462861cf464512df6f92f9f8c37263f4b3afb52af1e44d0eecb5547f9' + 'a444adad480c2263b26fc348fa124482deb22341fa8d32138d6dbd7289a22803' + '96a9f3bab85350e2317728ad78a822fb78304aeb115edcbc30a9a211599f615f' + 'fdb5e3190bbe8aa30f0f58bbdfa40034ea451590a66af85e7a942c5728c68214' + 'e01fee47bb4bbfc1be59406e4626f2560d1ba0c6ca9f5f4ed559301baf2a14fd' + 'f3ff981854f9fef268912bc10049ec69368f5e22ccce496fe517f8c4f5440ea2' + '059f4b11f62adba16740f295267e93fb3f1766e412964b3947e98ca42247d089' + '675d3b480592a0df5bd1e84a91f43ba87f7d36d93d58bb15fcdfbcbaa727f130' + 'aa2f8774771ffda0e4306042884de1d433559ee9cb569a9ffee425a4b834e700' + 'bbb11a0537dba6d626c6920527d9771ba9cb304c93538a9460b207ad2cc0238f' + 'e59aeb573ed996af32a86ceeb4ad87a4a20bebf9f28475e1ddd923c1729378a3' + 'fc76971747491b68fb395c179b88944d6bdd7be0b987228c214db2855d8490c4' + 'ecce3420d093acb8af3ace74cf97de83a7beedc509857ccd8871c6e715342efb' + '5e0f76333682156d66031331d73f13285f38dbf9326518d50d16fbec3b8ffb9a' + '26b4690f1d6399b64f1a565410291540224b06702aae479c42a34857dad40679' + 'cc608ffa8a682e70d808d35ee6a35328acb55a014e3b4162e4ef842b4e432b30' + '5661aabac099698d261b5e27eb806a964c1876e0f2913c56c15b3d24cb79dc0c' + 'f9639eee2638ab1cd4e9f1c0f4c9c2d376a6b755a5dcf5e74a4e6e8b84322796' + '0657f9a06717bd35422e2118751a57e5373151aed3e0594c3a11e7aa3dcaaacd' + '13b13e9fa2b9f646c9e2dc4536e940b725d8dd29ae788ada213eb35389548845' + 'a6ad3701c1224a3817d40d37f78ec2567dd75de85aa1c39c38b5e5999b221827' + 'c095747279656cae53f96f5928adf615dd1245b847e7e2e2abb6a0ce99b716b3' + '6f85666af7cc28e29e07f264dee2c6b992973a846079360186a801cd82f892bc' + '3ca1f8b86af5981fb846462c6f98e9126ca4b90ebb13bf1c6a57b5c6577b7581' + '68fec7cd2add3a08a0b6db74a2d8e08be58eb3278d609662fd0c8cdafbce0839' + '52827a925c32d57603812cd9e128591a30f9bc12d5e0794700c6c520b5571eb9' + 'b9b5ab0fb8e3c167e43b05050b57f58416d3c278f98ab5af238f0bda7b41c791' + 'd08b27bb56411ee47ae93be65189642ce9285bae57a6f09d80b35e613f42c281' + '1d4ff2c3a145ce81c870f7429b0ad62e3e255ede1eca17a614eef301beec3b7a' + 'fe4aff5c29d38154d8dba6b9fe2314e8e30760549edfd1c2a416f25a4d0e8ff6' + '74f60b3badf71a9bfcd6621be0425f72925c9ac7365490d2b1944ecd87e90ff0' + 'c9aabf26a4a4f31c0f1f4c28d915057100aaf46d700cad2878d24991a104cd7e' + 'dd4ab5f06c575f7809e74a3ff08196c5b804be6806f2101591305ab0a37b812c' + '44fca7f18a25c81f7e61831a71c221e444602e71f4e73f6bb420189ab73d2eff' + '3f9354ebe9d3603499a3e931923a25a628e5a221b6198697b565e1a192a50308' + '4a58b8852715fc93b3a8790d9728e6dcf2d510edf89f51efc73adfd2915fee2a' + '910d645b734ec01fbf4d4fbdef6baa72caaaadf59b074baa4965e1cc52023784' + '855b97723c4c51aed69215bcd1b1a88112d81756633f31887f1df7d357670193' + '41b6695165acb8e97e81d8afa58112a0d58e0dd9bc2134d08b5452ad624a31c5' + '0fe52d020b4e876d0f73450bd9a95f1eb76e58bc6681474ad348e067630d78d6' + 'e74569144e093b94b8cc11791b6e5e9a35ed6ef1612d04e66861b221df262776' + 'febd6d5c65734093aab3302230dbf8198fbbcc2263e45eb47d790c7f81b0ccb2' + 'c78622fb66f2ebcde8abc0d237b9da14d447df56ef5016b17f4600ccdf2adac6' + 'da413b5b69d07ef36b21bb31a3e0ec52d2f1bcac600038ce473edabd71a0fdeb' + '920fa3c807d60beb0c3afba4b113b3838f4ee583f8c3657955182756fd6c133c' + '5a11d08a49741d2c2ec5a0d4e99289aa91a65b634e75fe567ce090ab138a0980' + 'dc8c863b98578ae5f562958105d17ded830dd83be74b0dad3f38edb6e430f09b' + '30988ae1c97cd46e2c61b2170db593bb119cbcf93f38d32fdb4ae39646ce4a14' + '2b7168e245e214a41e7841421d6f5228ba2e09d95577866fa366531f0c42a823' + 'bdbb428f0b939c2c328298292db097f4705da7930fae78e263f29da2bc5fea77' + 'e80994790eda6569fc3d5c04fe09e4e066b8ed48c8dce792958a49ba739327d1' + '26215c121bbd3bc5b8aef9f60956a0a5f7a2350d25663ae0de66b1ee6fbece98' + '7e76248277921be0e635c680d4112ada2daba5f3fc835d9c5c26dbc4c3c28adc' + '60c63fe93db91cf0166b471c45ac9018616dbd3033283bcea922b6d17d57ef5b' + 'f84e27f66304d8c58b171f76b9d8c72aa24d1a7228f3db9f6c40f46f9118ea7b' + '5facd66496328c0f01f94946b10d5e8ff0759ca82fdc5ba827c5e48c848888cc' + 'a8085a0957b507ec0cb072834f043c0def659ed7caceef2dc00c3c97033101ef' + '6f25e7f7c7e0b2258bf7bf0fec9c4a651f9f834063271c9efa694aee6fa5c307' + '12ddb02a29492333ad799ecf3e67491420bc6307d06139e02ba79cd5ac74d360' + '3e4359b59aa2a0b0ad05bd8183741003993e265d8f78c83f1e3be1e5b2c1ca0f' + '55825e220d769a9966b47e79633ae550186ebfa6fdc8dbddc253dbafa131038e' + 'f9f7a5a8c641d9a5250c22ac24a75904a85f7c6727436f6085dc5bdd3195f657' + '28434264cfdaceaae24e98b77e4b9a129eced32f5034345f4e0268e38bb231df' + '9a06366dd1f60a5ce46e07d67bdc23fbd9d112ba78b0efadb8b0355bb3b21742' + '5033eeb7937eac6f419d1331eef5dabc6840bb0a5788cc5fb9de54002d1a6cda' + 'd8da710db9ba1f92c46892b48c0ee873e37b64f35bd0fbea8138e52a1d70b1dc' + '8097545b6aa4f4323fbeed99f2dd6420be2657a9f76e2cb0b9ff7acfdd097b39' + '8df413b4c48714808b3b17b6b3a1970073a8a347581eca6bbb17d8f8fef0eb17' + 'b94da14acb2abb64b105914e08a7780acd66ce41fe77e7820ea83c6f29486b14' + '2c5dd93451d33b7ab43910b9774382af7934aba724c435e529c12cc471886fba' + '29bab6c84246fd4ac74b9995fc04c52ac275ebafbff15c2eb949e023ffba93b0' + '29676cd6ff455218f61d454c442e3140bc96588a3ea9006daeea477e98dd2a09' + '0176e51635042cda2cc56109a40f51c997268189ee8087ff1eb3ed5a2c9ff281' + '1c4d0d394e830302fce109abd4d03d45a2ed84c475aefe418b15174c474ff706' + 'df69410b3a05455ad33efb29f19baeee50a449304153d02e474c11c3ee8b159f' + '74434e0512958c19ec62ef9fedb9ea9bda0ece105f9ef8655e224ec52873253e' + '51335c151764298a0ad7a55e894c867e4f0660aec441f9b001626d53b7114d68' + '413f8dcce3a1da66490fd231f45f2a59a8f0aa2287cc4c49d8c71ee863356850' + '331932329f39e3821f52a3cb8e604f2a981a18364b5ce69cdfc040d6ab3a873b' + 'b6a43d4e909be0bd75c4d4810731aa29dac46c1d223451b81174c630558f93ed' + '87a2f7c6ce4f3dedcd46b98d81734cfc8769f3a89fe5ff781687fc077b3aab26' + '30d8ca0d81503579b2078d570996078965918b1ac3517dec648067986f1b88cd' + 'e6ba4eee7f8f8ba8ba899d7ce6c77ae60159289aa738c391b9ea7ab36babe3a4' + '739c169f9c2972ac1c69aa3d31170a942d95150f562761c10ffdff99840020db' + 'cf16834ac8d315410e63db58063dfdbfbf4037e28005f15cefdabcf16257dc17' + '178166c789c36eaf813c5f5fddb78546aaad1346d7b7ebfe329df3f574c3476b' + 'd3b581dac8dbcbe81cb5a7e0b8401bfc3cd3a517a3530a98b913592ba9064651' + '88be05f1592eb944cac33b54d23cf02129cd784e5574e977a87ffcb51b5c80c4' + '664cce172a047c46987e85bb77b5a16c0db464ba009b1ca38475a256c53b5e13' + '050b0d1323ae691bd5415da243ffd2ab1fd6b77e0ab2a4b49cf7e95ea492f98b' + '084a234b7440103a0971897b56f25b23a143cdba6b3ef77c03f4f4d27a8f5412' + '211688d60e2e8f54c3641b55cbf0a5c71fd8d15a118651f33d44f310dbe3c48e' + 'acf4cdc431ab3bf967c77c47350adda478354b86b5e277f064794e57c8202b5f' + 'd732d3d3710cf755ad7b95174ce3697d102bf7307f0a4cca28255ede9e3fa077' + '02c9f50853a2b0e2bf0477bab796a50435a6e35943a7ad53f7670c79cd9c6ae9' + '4b5cc3fbb9471fa6bc9e0efde6557b10e9b065ba17503e3520bf869719a3ff87' + '8c3284b48360e277b0df6f07a116f1be4dca9a956adfbbf4a79648a3d6685efe' + 'f9112abc71a35e143fd12b4e08fb4f35b54e299c1e18e669effd00b56ffa2fee' + '5688c14606152ec8c07e52c9e9e79197e7314111f1bdd46eeabe6bb421e68720' + '1a03fef2a3be4be474351a6cd402d6a9231d3920fa4508829037385226f0cae8' + 'cecf17130cfb23b092c737aacb41ecc819a82ad9adda1501ce2ab327b1e5cbf7' + 'fe2cb3b6d9de8a0aaa3aa63ab70a15477bcbf237002c5bb2552827f774c7f6ad' + 'c04e4e008a89cef8f1e43df3c9e42fa92d47385a2111bfa17c355bf1af1cb150' + 'a6cedf55365e8ade99627ff20165b26231e45c9070870a6527430855e02625ef' + '434d9b58322166a59ef0f81649d6961f54ae9f737881f9bd0da1febb5002969a' + '9b3008bc111d96b3dfbc1afad5d785c8a7ce30f75f29cacc6deceb09903bf0a8' + '039d749c199177f47beb30ad81df908f64debfae8b6017ef0fc4929a9803ffae' + 'ab17a40b54877323bb2b2a67940b1dee5b082c601e773abf0cdb8b92db08cc0b' + '21b615217c676aa01fad42647d731fbe9fd9e251bcc48229463f68c701d20178' + 'dc3954eaaa9894c0152904214c26b5f52f083a50e28c0e365a637b5c8ec3b1e9' + '2e8da716028cbc8d70c30416fb6d09ab6b9ed1a19feae9be44cf1b6b6397715e' + '8d0d9f7bfe02f8d0cc326e954b78495349832d9d737c836a6278cf938cc23e2b' + '76bf79e07a48d0bc32057abadc60f51b9bfceaefe95e290da7111c2bf1716ecf' + '27a42bf6bb67ef512633832ed8872eaa55e71205fb921be5480d2042dd067890' + '9f36ffc28ae51be07f7c44fe92958474d116f11f30a79735ef30c13358a0edbb' + '02b7d674a4e0e672827b10422a9b3e0804040d65529cef254e27b129e9632c31' + '78d15b9d2d7fbfd38b998a9f93928d2c840fb8988fa328755861397e4197e232' + '9c808c0f18009ea91c27954a0250233b796e80393768b2fdb4dc51c3c380c6a7' + '0bfa3fd48ef5b5997d1b691ed9010182fbc6ab631e993bc50b72b28376591f2b' + '96278fd3a29b9a5b6ef367b8e622d668f0b1a1ebb0fcec001eeecd1586285baf' + 'b02500b1d99018dc1597048c95cab384ed52abb68a71e3254b9fae0eb2193d6b' + '69b7131300b379255a3be1b7009982bee90ba04a5937cd8c4c806fb82b309818' + '764848f260ee4daa343751fb85406c8c1222247b33cd6a242c71d9602be6a32f' + 'f4af4c331f383d6b0af4379d83f6d469ca81897e19eeb0fba37823194dd137db' + 'bb0cd04429ff9127467b856df68af48894bf6bf08ad0ab98a18dfb7d445d377f' + '35c4ac6d2c4e06b8adb270a730ac3fd07a484d23f7c3963f5c901cffbd34689c' + '6eaae7e4f9e98e660aabca0463fb5b79c06d07de2bca8b6f8abea5fe5e2b8d9a' + 'f2407282efc3aa9757f46a1f9bc2e3d39247dc606343efed49622df02e54ed86' + '492d600df66b717ad050d492cb8a4ae6589b69c0450f4a271fc470412dfb2f72' + 'be8a25c121963231243427ba370760f0029460c64dc911ba6ab17295f0bbe0a2' + '78b017fb8310f13b7f12a4516ef336fac364fd5e9632ec2e5a212e6522ad0139')