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 4aaef12830..e266de7f04 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 e3af38085c2e263cf6efe1dc199b9f6c6af05310 Mon Sep 17 00:00:00 2001 +From 99e44b2d8d428c89d25895e2fb6dd7f2900b2f74 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 daf9f00..eadb99c 100644 # Create file used for sys.path fixup -- see Modules/getpath.c with open('pybuilddir.txt', 'w', encoding='utf8') as f: -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0002-restore-setup-config.patch b/mingw-w64-python/0002-restore-setup-config.patch index 0b3fdc8a6f..aa54909cb4 100644 --- a/mingw-w64-python/0002-restore-setup-config.patch +++ b/mingw-w64-python/0002-restore-setup-config.patch @@ -1,4 +1,4 @@ -From b2fc3648ddb0e95e0e9124110a320d5735420537 Mon Sep 17 00:00:00 2001 +From 5222241d75faac7f80be805dfde7d4b8b24d23fc Mon Sep 17 00:00:00 2001 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 763fc69..c613ff9 100644 mv config.c Modules -- -2.36.1 +2.37.2 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 e686381369..933fffe99d 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 78665b6b1358df650539ac6dff43f18bff49191c Mon Sep 17 00:00:00 2001 +From 03affbe5f8fb6e99beda2ffbd0b2208bb5659b21 Mon Sep 17 00:00:00 2001 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 57c84e5..3bb38bf 100644 #undef PACKAGE_BUGREPORT -- -2.36.1 +2.37.2 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 ef277978d8..a75a1cf177 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 db8685c749a79528988873883ba064ab4d1f1947 Mon Sep 17 00:00:00 2001 +From f53442c2e44c2cbb277aa5ae759f298b438c255e Mon Sep 17 00:00:00 2001 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 6ab0ae4..a27bedf 100644 Symbols and macros to supply platform-independent interfaces to basic C language & library operations whose spellings vary across platforms. -- -2.36.1 +2.37.2 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 1cbead1cf7..53d01742e8 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 7626cf038215b03d5e83ed4c9e33f0a9efc86693 Mon Sep 17 00:00:00 2001 +From 8cd6f5e8dbd46d5c6f42fef86e1b41925eb0ede0 Mon Sep 17 00:00:00 2001 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 d556d59..21da400 100644 # Some systems cannot stand _XOPEN_SOURCE being defined at all; they -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0006-MINGW-preset-configure-defaults.patch b/mingw-w64-python/0006-MINGW-preset-configure-defaults.patch index 0385e0827e..181bfed48e 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 c5820dc0374e4297f407f14a12c209527ad453df Mon Sep 17 00:00:00 2001 +From 738f8a7f9fdacebd00ac9a342f4bc94719c06f2f Mon Sep 17 00:00:00 2001 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 21da400..fee20ae 100644 save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -Wl,--no-as-needed" -- -2.36.1 +2.37.2 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 c3f0820de7..09d2716f27 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 2f10a8b42519828fcc1b5cf2d30b6bfa6db19348 Mon Sep 17 00:00:00 2001 +From 892dbe3d562a5fe06a4870c5e5093cdbf9aa3628 Mon Sep 17 00:00:00 2001 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 fee20ae..cbbf65d 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.36.1 +2.37.2 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 8ce2560c2d..f25e69057b 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 6255fc060119cfef7bff770f19c9717042a548a0 Mon Sep 17 00:00:00 2001 +From 8193582be2c2ab30ebb05cd40682e8acc12a93a6 Mon Sep 17 00:00:00 2001 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 cbbf65d..264dd06 100644 for dir in $SRCDIRS; do if test ! -d $dir; then -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0009-MINGW-init-system-calls.patch b/mingw-w64-python/0009-MINGW-init-system-calls.patch index 44d8c6c2df..b3c33817ce 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 c0ddc90c687cd154d83a98cde93ec15e41d7f178 Mon Sep 17 00:00:00 2001 +From 60539f18076974931467adb694ce72760c2b4bdc Mon Sep 17 00:00:00 2001 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 26c8e7b..21bf71f 100644 +index 3d74b22..1aa2b85 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -316,6 +316,27 @@ corresponding Unix manual entries for more information on calls."); @@ -120,5 +120,5 @@ index 264dd06..61cc317 100644 # it may influence the way we can build extensions, so distutils # needs to check it -- -2.36.1 +2.37.2 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 f469c44231..96093a9c74 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 3aff64e1b6897d1382152dd70d565c463656cbe9 Mon Sep 17 00:00:00 2001 +From 7bd2a09cccc4f955536c624b1df59ff01d793d97 Mon Sep 17 00:00:00 2001 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 61cc317..12fa784 100644 # For a single AC_DEFINE, no template is needed. AH_TEMPLATE(_REENTRANT, -- -2.36.1 +2.37.2 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 27fd64c363..15062e92ca 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 9fd313ac6a7e84d2c41556f2f2b2f0fda82796f6 Mon Sep 17 00:00:00 2001 +From dd794bf43aaf4ba8828ffa6fcf107a8cbd94f4dd Mon Sep 17 00:00:00 2001 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 12fa784..7c0b771 100644 # For a single AC_DEFINE, no template is needed. AH_TEMPLATE(_REENTRANT, -- -2.36.1 +2.37.2 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 8484342382..a6e77b1480 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 96a389061300758e0d0cef30c3a35a450360acbc Mon Sep 17 00:00:00 2001 +From 40f42645155a8844bfdb6a26b89a53422fb8818b Mon Sep 17 00:00:00 2001 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 @@ -64,7 +64,7 @@ index a27bedf..dedc3b8 100644 /* module init functions outside the core must be exported */ # if defined(__cplusplus) diff --git a/setup.py b/setup.py -index e74a275..0a253b9 100644 +index 85a2b26..d971083 100644 --- a/setup.py +++ b/setup.py @@ -474,6 +474,9 @@ class PyBuildExt(build_ext): @@ -78,5 +78,5 @@ index e74a275..0a253b9 100644 self.detect_modules() -- -2.36.1 +2.37.2 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 4a5268d1b4..733211cafb 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 dcfcf616fa29dc73da906f8d9b3b32ed6fb3d7f2 Mon Sep 17 00:00:00 2001 +From 15de2cbe43a644a13f556e706bfb74b6bada3b3b Mon Sep 17 00:00:00 2001 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 7c0b771..746ec95 100644 esac -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0014-MINGW-dynamic-loading-support.patch b/mingw-w64-python/0014-MINGW-dynamic-loading-support.patch index bfb840af7e..9cad361578 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 871f0c8f12bd667dd5e3335647e54856be39bc49 Mon Sep 17 00:00:00 2001 +From d8c5c3568a0160757e7f743ce5ef25bcca35c2e9 Mon Sep 17 00:00:00 2001 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 746ec95..ed97fb7 100644 case $ac_sys_system in AIX*) -- -2.36.1 +2.37.2 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 34fabb72b4..55de6d905f 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 4a7e296f81146a053212f3722b135a49f5d293d9 Mon Sep 17 00:00:00 2001 +From 8b2a882f10baccebc433ef1006c010511336c1f4 Mon Sep 17 00:00:00 2001 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 ed97fb7..f54d4dd 100644 SRCDIRS="Parser Objects Python Modules Modules/_io Programs" case $host in -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0016-MINGW-setup-_multiprocessing-module.patch b/mingw-w64-python/0016-MINGW-setup-_multiprocessing-module.patch index 5c1f9116ab..dbfa697dee 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 1745047594f5eb85ccfa550f681ecca844b6540a Mon Sep 17 00:00:00 2001 +From f1a0ccf341053790071675cd0653d9e343be6a18 Mon Sep 17 00:00:00 2001 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 @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 5 insertions(+) diff --git a/setup.py b/setup.py -index 0a253b9..09f685a 100644 +index d971083..2528af0 100644 --- a/setup.py +++ b/setup.py -@@ -1850,7 +1850,12 @@ class PyBuildExt(build_ext): +@@ -1852,7 +1852,12 @@ class PyBuildExt(build_ext): if (sysconfig.get_config_var('HAVE_SEM_OPEN') and not sysconfig.get_config_var('POSIX_SEMAPHORES_NOT_ENABLED')): multiprocessing_srcs.append('_multiprocessing/semaphore.c') @@ -30,5 +30,5 @@ index 0a253b9..09f685a 100644 if (not MS_WINDOWS and -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0017-MINGW-setup-select-module.patch b/mingw-w64-python/0017-MINGW-setup-select-module.patch index 2aa64f52c8..97120a46ed 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 baa222e1ce7aebc13943c8363360fd88cd28ab44 Mon Sep 17 00:00:00 2001 +From 33a85f1c248fd433f34e71145cdd9ae504670c3d Mon Sep 17 00:00:00 2001 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 @@ -39,10 +39,10 @@ index 3afcb0e..6e2903d 100644 /* add object and its file descriptor to the list */ diff --git a/setup.py b/setup.py -index 09f685a..8e14098 100644 +index 2528af0..79542fe 100644 --- a/setup.py +++ b/setup.py -@@ -1006,7 +1006,11 @@ class PyBuildExt(build_ext): +@@ -1005,7 +1005,11 @@ class PyBuildExt(build_ext): self.missing.append('spwd') # select(2); not on ancient System V @@ -56,5 +56,5 @@ index 09f685a..8e14098 100644 # Memory-mapped files (also works on Win32). self.add(Extension('mmap', ['mmapmodule.c'])) -- -2.36.1 +2.37.2 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 197734af26..2b5c0d387f 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 7c2ed351d2c026f492083165aa73ab398f02a259 Mon Sep 17 00:00:00 2001 +From 91454638b2ae8164d43a73e18122a28e26f9913e Mon Sep 17 00:00:00 2001 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 @@ -14,10 +14,10 @@ Co-authored-by: Christoph Reiter 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 8e14098..a40f224 100644 +index 79542fe..9e33748 100644 --- a/setup.py +++ b/setup.py -@@ -2277,9 +2277,12 @@ class PyBuildExt(build_ext): +@@ -2279,9 +2279,12 @@ class PyBuildExt(build_ext): self.add(ext) if TEST_EXTENSIONS: # function my_sqrt() needs libm for sqrt() @@ -31,7 +31,7 @@ index 8e14098..a40f224 100644 ffi_inc = sysconfig.get_config_var("LIBFFI_INCLUDEDIR") ffi_lib = None -@@ -2324,6 +2327,8 @@ class PyBuildExt(build_ext): +@@ -2326,6 +2329,8 @@ class PyBuildExt(build_ext): ext.include_dirs.append(ffi_inc) ext.libraries.append(ffi_lib) @@ -41,5 +41,5 @@ index 8e14098..a40f224 100644 if sysconfig.get_config_var('HAVE_LIBDL'): -- -2.36.1 +2.37.2 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 b60260596b..e1d3a63f88 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 135e74d458b6fa6753d90f4f4eae973baf84a17e Mon Sep 17 00:00:00 2001 +From e242264a57926b545d3fe5ece192f83f8c6da76f Mon Sep 17 00:00:00 2001 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 392cc32..fd2411c 100644 +index 6a9ac2c..9f2de27 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -265,7 +265,7 @@ shutdown(how) -- shut down traffic in one or both directions\n\ @@ -140,10 +140,10 @@ index 3bb38bf..e36c306 100644 /* Define to `int' if doesn't define. */ diff --git a/setup.py b/setup.py -index a40f224..fdf5ac5 100644 +index 9e33748..35f904f 100644 --- a/setup.py +++ b/setup.py -@@ -1249,6 +1249,8 @@ class PyBuildExt(build_ext): +@@ -1248,6 +1248,8 @@ class PyBuildExt(build_ext): if MACOS: # Issue #35569: Expose RFC 3542 socket options. kwargs['extra_compile_args'] = ['-D__APPLE_USE_RFC_3542'] @@ -153,5 +153,5 @@ index a40f224..fdf5ac5 100644 self.add(Extension('_socket', ['socketmodule.c'], **kwargs)) -- -2.36.1 +2.37.2 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 9fc2a46abc..b7be40b9f6 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 6261a9e820c4264c7cb3d3b846388549333808e7 Mon Sep 17 00:00:00 2001 +From c57f51fbd6ea647bcec7193c1e64f855bac2be23 Mon Sep 17 00:00:00 2001 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 @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/setup.py b/setup.py -index fdf5ac5..fff0039 100644 +index 35f904f..e9a7957 100644 --- a/setup.py +++ b/setup.py -@@ -989,13 +989,21 @@ class PyBuildExt(build_ext): +@@ -988,13 +988,21 @@ class PyBuildExt(build_ext): if (self.config_h_vars.get('FLOCK_NEEDS_LIBBSD', False)): # May be necessary on AIX for flock function libs = ['bsd'] @@ -42,7 +42,7 @@ index fdf5ac5..fff0039 100644 # spwd, shadow passwords if (self.config_h_vars.get('HAVE_GETSPNAM', False) or self.config_h_vars.get('HAVE_GETSPENT', False)): -@@ -1017,7 +1025,10 @@ class PyBuildExt(build_ext): +@@ -1016,7 +1024,10 @@ class PyBuildExt(build_ext): # Lance Ellinghaus's syslog module # syslog daemon interface @@ -54,7 +54,7 @@ index fdf5ac5..fff0039 100644 # Python interface to subinterpreter C-API. self.add(Extension('_xxsubinterpreters', ['_xxsubinterpretersmodule.c'])) -@@ -1043,8 +1054,11 @@ class PyBuildExt(build_ext): +@@ -1042,8 +1053,11 @@ class PyBuildExt(build_ext): self.add(Extension('_csv', ['_csv.c'])) # POSIX subprocess module helper. @@ -67,7 +67,7 @@ index fdf5ac5..fff0039 100644 def detect_test_extensions(self): # Python C API test module -@@ -1236,12 +1250,15 @@ class PyBuildExt(build_ext): +@@ -1235,12 +1249,15 @@ class PyBuildExt(build_ext): self.missing.append('_crypt') return @@ -89,5 +89,5 @@ index fdf5ac5..fff0039 100644 def detect_socket(self): # socket(2) -- -2.36.1 +2.37.2 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 b094f6c714..11205ddc4c 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 64fc6257258f36bdd65f163d38b7112cba7fc4b4 Mon Sep 17 00:00:00 2001 +From 324b10085ad5c934ea11834e8a778dfe4d331b77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:33 +0530 @@ -16,7 +16,7 @@ Co-authored-by: Алексей 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/Modules/_winapi.c b/Modules/_winapi.c -index 3e24d51..e7e8c6a 100644 +index 9b30a90..4d88e33 100644 --- a/Modules/_winapi.c +++ b/Modules/_winapi.c @@ -41,7 +41,9 @@ @@ -57,10 +57,10 @@ index 7febaa0..70d5b3d 100644 #endif diff --git a/setup.py b/setup.py -index fff0039..e3110e8 100644 +index e9a7957..bb47896 100644 --- a/setup.py +++ b/setup.py -@@ -1699,6 +1699,27 @@ class PyBuildExt(build_ext): +@@ -1701,6 +1701,27 @@ class PyBuildExt(build_ext): '-framework', 'SystemConfiguration', '-framework', 'CoreFoundation'])) @@ -89,5 +89,5 @@ index fff0039..e3110e8 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.36.1 +2.37.2 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 29b4d03d76..f1eec1468c 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 199f619989a36e5e96fd65c2a5038abb1133c042 Mon Sep 17 00:00:00 2001 +From a91bc5270cb0d8bc61d8dedca0e1132864d120cc 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 eadb99c..6381bcd 100644 return 'win-amd64' if '(arm)' in sys.version.lower(): -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0023-MINGW-setup-_ssl-module.patch b/mingw-w64-python/0023-MINGW-setup-_ssl-module.patch index 7e39dd54bb..6ab0b08574 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 465cdd5bcdc843c7f74268646b23c61a71d64406 Mon Sep 17 00:00:00 2001 +From f74779044a1a87310a09bca9470f035ae11a2550 Mon Sep 17 00:00:00 2001 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 @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py -index e3110e8..d799a02 100644 +index bb47896..79a88c2 100644 --- a/setup.py +++ b/setup.py -@@ -2510,6 +2510,8 @@ class PyBuildExt(build_ext): +@@ -2512,6 +2512,8 @@ class PyBuildExt(build_ext): openssl_libdirs = split_var('OPENSSL_LDFLAGS', '-L') openssl_libs = split_var('OPENSSL_LIBS', '-l') openssl_rpath = config_vars.get('OPENSSL_RPATH') @@ -26,5 +26,5 @@ index e3110e8..d799a02 100644 # libssl and libcrypto not found self.missing.extend(['_ssl', '_hashlib']) -- -2.36.1 +2.37.2 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 4a7c9ad7c7..36150b2552 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 d9d50d3dc8f2b192736ea8aa6578517e7b93d6ff Mon Sep 17 00:00:00 2001 +From 5a50554cdd6135a394cbb334e42a15e4f4b1fcf9 Mon Sep 17 00:00:00 2001 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 @@ -85,5 +85,5 @@ index 6381bcd..c9ab982 100644 # If srcdir is a relative path (typically '.' or '..') # then it should be interpreted relative to the directory -- -2.36.1 +2.37.2 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 8266d60ad3..fbbd7e3473 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 caf8afbaa548a8bfe12bb9a8763d76c1cde7805f Mon Sep 17 00:00:00 2001 +From 573a4416fdd24906f6e0078eb9b3d8c9dcfaba6d Mon Sep 17 00:00:00 2001 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 @@ -50,5 +50,5 @@ index 84378c4..723edd3 100644 return NULL; #endif -- -2.36.1 +2.37.2 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 402198f9b1..1b5eb55fff 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 0d4f58fec360ebf5a926fd67fbeae77d97f3d9e9 Mon Sep 17 00:00:00 2001 +From b49a9d16e9234649857970710fc3a1a60a5b220b Mon Sep 17 00:00:00 2001 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 @@ -14,10 +14,10 @@ Co-authored-by: Christoph Reiter 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index d799a02..022ca28 100644 +index 79a88c2..48ab69f 100644 --- a/setup.py +++ b/setup.py -@@ -2754,7 +2754,7 @@ class PyBuildScripts(build_scripts): +@@ -2756,7 +2756,7 @@ class PyBuildScripts(build_scripts): else: newfilename = filename + minoronly log.info(f'renaming {filename} to {newfilename}') @@ -27,5 +27,5 @@ index d799a02..022ca28 100644 if filename in updated_files: newupdated_files.append(newfilename) -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0027-MINGW-customize-site.patch b/mingw-w64-python/0027-MINGW-customize-site.patch index e278601de8..314b6730e9 100644 --- a/mingw-w64-python/0027-MINGW-customize-site.patch +++ b/mingw-w64-python/0027-MINGW-customize-site.patch @@ -1,4 +1,4 @@ -From 3527bd92cf1fd57c220e8cb5aedd94a231d621f2 Mon Sep 17 00:00:00 2001 +From d6bf26926edd2078537c27c9f18d2d67d380d7b8 Mon Sep 17 00:00:00 2001 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 @@ -58,5 +58,5 @@ index 939893e..e460a3d 100644 path = os.path.join(prefix, libdir, "python%d.%d" % sys.version_info[:2], -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0028-add-python-config-sh.patch b/mingw-w64-python/0028-add-python-config-sh.patch index 86906ef8f3..39510b78a8 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 d79feb22be5f7864c46ed6d65917f4104f04d525 Mon Sep 17 00:00:00 2001 +From e5864d47b599fa1c4437350739d6a48a0099238d Mon Sep 17 00:00:00 2001 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.36.1 +2.37.2 diff --git a/mingw-w64-python/0029-cross-darwin-feature.patch b/mingw-w64-python/0029-cross-darwin-feature.patch index 8047a94367..acae71ae9f 100644 --- a/mingw-w64-python/0029-cross-darwin-feature.patch +++ b/mingw-w64-python/0029-cross-darwin-feature.patch @@ -1,4 +1,4 @@ -From a5d9fc9f4e198cf33ce1581fcf6cbc7945f31fa1 Mon Sep 17 00:00:00 2001 +From ca2dbed69aca7c05476dc18e1c45c96c5733df35 Mon Sep 17 00:00:00 2001 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 40afa50..6941b57 100644 MACOSX_DEFAULT_ARCH="x86_64" ;; -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0030-mingw-system-libffi.patch b/mingw-w64-python/0030-mingw-system-libffi.patch index 341dcdb57a..88d5476d3d 100644 --- a/mingw-w64-python/0030-mingw-system-libffi.patch +++ b/mingw-w64-python/0030-mingw-system-libffi.patch @@ -1,4 +1,4 @@ -From cb8b68040b1932c4a2778acbbc734c7140c59ef9 Mon Sep 17 00:00:00 2001 +From 1e80183bfa5740e8f3a0b1b85d0afaefa003f3ec Mon Sep 17 00:00:00 2001 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 @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py -index 022ca28..0ce7288 100644 +index 48ab69f..828692f 100644 --- a/setup.py +++ b/setup.py -@@ -2369,6 +2369,8 @@ class PyBuildExt(build_ext): +@@ -2371,6 +2371,8 @@ class PyBuildExt(build_ext): ext.libraries.append(ffi_lib) if MS_WINDOWS: ext.libraries.extend(['ole32', 'oleaut32', 'uuid']) @@ -26,5 +26,5 @@ index 022ca28..0ce7288 100644 if sysconfig.get_config_var('HAVE_LIBDL'): -- -2.36.1 +2.37.2 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 1837d96149..b2f3f17ae9 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 6070d400d8dbcc9fac45292669cf1b6894a27298 Mon Sep 17 00:00:00 2001 +From 8c456abe7f81a28622b0603affd315198b5e391e 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 @@ -11,12 +11,12 @@ Co-authored-by: Christoph Reiter Co-authored-by: cat --- Include/pylifecycle.h | 6 ++ - Lib/ntpath.py | 79 +++++++++++++----------- + Lib/ntpath.py | 82 ++++++++++++++----------- Modules/posixmodule.c | 2 + Python/initconfig.c | 4 +- Python/pathconfig.c | 135 ++++++++++++++++++++++++++++++++++++++++++ Python/traceback.c | 2 +- - 6 files changed, 191 insertions(+), 37 deletions(-) + 6 files changed, 192 insertions(+), 39 deletions(-) diff --git a/Include/pylifecycle.h b/Include/pylifecycle.h index 2df7fe6..17d403c 100644 @@ -36,7 +36,7 @@ index 2df7fe6..17d403c 100644 /* Py_PyAtExit is for the atexit module, Py_AtExit is for low-level * exit functions. diff --git a/Lib/ntpath.py b/Lib/ntpath.py -index 527c7ae..1f1b441 100644 +index 97edfa5..9a404ab 100644 --- a/Lib/ntpath.py +++ b/Lib/ntpath.py @@ -11,9 +11,7 @@ module as os.path. @@ -49,7 +49,7 @@ index 527c7ae..1f1b441 100644 defpath = '.;C:\\bin' devnull = 'nul' -@@ -23,6 +21,15 @@ import stat +@@ -23,6 +21,14 @@ import stat import genericpath from genericpath import * @@ -61,11 +61,10 @@ index 527c7ae..1f1b441 100644 + altsep = '/' +bsep = str.encode(sep) +baltsep = str.encode(altsep) -+ + __all__ = ["normcase","isabs","join","splitdrive","split","splitext", "basename","dirname","commonprefix","getsize","getmtime", - "getatime","getctime", "islink","exists","lexists","isdir","isfile", -@@ -33,9 +40,27 @@ __all__ = ["normcase","isabs","join","splitdrive","split","splitext", +@@ -34,9 +40,27 @@ __all__ = ["normcase","isabs","join","splitdrive","split","splitext", def _get_bothseps(path): if isinstance(path, bytes): @@ -77,14 +76,14 @@ index 527c7ae..1f1b441 100644 +def _get_sep(path): + if isinstance(path, bytes): + return bsep -+ else: + else: +- return '\\/' + return sep + +def _get_altsep(path): + if isinstance(path, bytes): + return baltsep - else: -- return '\\/' ++ else: + return altsep + +def _get_colon(path): @@ -95,19 +94,35 @@ index 527c7ae..1f1b441 100644 # Normalize the case of a pathname and map slashes to backslashes. # Other normalizations (such as optimizing '../' away) are not done -@@ -47,9 +72,9 @@ def normcase(s): - Makes all characters lowercase and all slashes into backslashes.""" - s = os.fspath(s) - if isinstance(s, bytes): -- return s.replace(b'/', b'\\').lower() -+ return s.replace(baltsep, bsep).lower() - else: +@@ -58,14 +82,14 @@ try: + return s + if isinstance(s, bytes): + encoding = sys.getfilesystemencoding() +- s = s.decode(encoding, 'surrogateescape').replace('/', '\\') ++ s = s.decode(encoding, 'surrogateescape').replace(altsep, sep) + s = _LCMapStringEx(_LOCALE_NAME_INVARIANT, + _LCMAP_LOWERCASE, s) + return s.encode(encoding, 'surrogateescape') + else: + return _LCMapStringEx(_LOCALE_NAME_INVARIANT, + _LCMAP_LOWERCASE, +- s.replace('/', '\\')) ++ s.replace(altsep, sep)) + except ImportError: + def normcase(s): + """Normalize case of pathname. +@@ -74,8 +98,8 @@ except ImportError: + """ + s = os.fspath(s) + if isinstance(s, bytes): +- return os.fsencode(os.fsdecode(s).replace('/', '\\').lower()) - return s.replace('/', '\\').lower() ++ return os.fsencode(os.fsdecode(s).replace(altsep, sep).lower()) + return s.replace(altsep, sep).lower() # Return whether a path is absolute. -@@ -76,14 +101,9 @@ def isabs(s): +@@ -102,14 +126,9 @@ def isabs(s): # Join two (or more) paths. def join(path, *paths): path = os.fspath(path) @@ -125,7 +140,7 @@ index 527c7ae..1f1b441 100644 try: if not paths: path[:0] + sep #23780: Ensure compatible data type even if p is null. -@@ -142,14 +162,9 @@ def splitdrive(p): +@@ -168,14 +187,9 @@ def splitdrive(p): """ p = os.fspath(p) if len(p) >= 2: @@ -143,7 +158,7 @@ index 527c7ae..1f1b441 100644 normp = p.replace(altsep, sep) if (normp[0:2] == sep*2) and (normp[2:3] != sep): # is a UNC path: -@@ -203,9 +218,9 @@ def split(p): +@@ -229,9 +243,9 @@ def split(p): def splitext(p): p = os.fspath(p) if isinstance(p, bytes): @@ -155,7 +170,7 @@ index 527c7ae..1f1b441 100644 splitext.__doc__ = genericpath._splitext.__doc__ -@@ -463,15 +478,13 @@ def expandvars(path): +@@ -489,15 +503,13 @@ def expandvars(path): def normpath(path): """Normalize path, eliminating double slashes, etc.""" path = os.fspath(path) @@ -173,7 +188,7 @@ index 527c7ae..1f1b441 100644 curdir = '.' pardir = '..' special_prefixes = ('\\\\.\\', '\\\\?\\') -@@ -683,6 +696,7 @@ else: +@@ -709,6 +721,7 @@ else: # strip the prefix anyway. if ex.winerror == initial_winerror: path = spath @@ -181,7 +196,7 @@ index 527c7ae..1f1b441 100644 return path -@@ -693,12 +707,11 @@ supports_unicode_filenames = (hasattr(sys, "getwindowsversion") and +@@ -719,12 +732,11 @@ supports_unicode_filenames = (hasattr(sys, "getwindowsversion") and def relpath(path, start=None): """Return a relative version of a path""" path = os.fspath(path) @@ -195,7 +210,7 @@ index 527c7ae..1f1b441 100644 curdir = '.' pardir = '..' -@@ -753,13 +766,11 @@ def commonpath(paths): +@@ -779,13 +791,11 @@ def commonpath(paths): raise ValueError('commonpath() arg is an empty sequence') paths = tuple(map(os.fspath, paths)) @@ -212,7 +227,7 @@ index 527c7ae..1f1b441 100644 try: diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 21bf71f..b40c0fe 100644 +index 1aa2b85..b551769 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -3817,6 +3817,7 @@ posix_getcwd(int use_bytes) @@ -420,5 +435,5 @@ index 7d6f7f4..f49a606 100644 tail = filepath; else -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0032-mingw-use-posix-getpath.patch b/mingw-w64-python/0032-mingw-use-posix-getpath.patch index 5389c3e658..3d12e84895 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 d395585e2ae03e557dc30ad03bd4e8aa59443952 Mon Sep 17 00:00:00 2001 +From a7e81b8875ddbb311bb647b44da53b74251e8ebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:47 +0530 @@ -435,7 +435,7 @@ index ef6dd59..4cb6738 100644 status = calculate_init(&calculate, config); diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index b40c0fe..545fd4c 100644 +index b551769..1a0312b 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -4107,7 +4107,7 @@ _listdir_windows_no_opendir(path_t *path, PyObject *list) @@ -500,5 +500,5 @@ index 3b53baa..1ee5476 100644 /* Get an absolute path. -- -2.36.1 +2.37.2 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 d5b2d2b710..124f99395e 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 b35c7f11a9c0b3c223b2322ec5ccc4e89eb7988b Mon Sep 17 00:00:00 2001 +From c5ad0d2d0e3afc6c3ac7890c75699202b3cb9543 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 4cb6738..e05787b 100644 && calculate->warnings) { -- -2.36.1 +2.37.2 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 473e4d3816..88945a663a 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 9f6079330789af8fa8086282fa2d0bb1a7a373fc Mon Sep 17 00:00:00 2001 +From 8003d41a0c42f44761c63721f7eba95fc6075de9 Mon Sep 17 00:00:00 2001 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.36.1 +2.37.2 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 6a66bbd653..fd6b192204 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 8ed66f65ecda3ccdb1e23bc203823e5ad66dd846 Mon Sep 17 00:00:00 2001 +From 941d7c0820d566452c30b3b7b81d8221439398b9 Mon Sep 17 00:00:00 2001 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 6941b57..b6debe0 100644 AC_SUBST(INITSYS) case $host in -- -2.36.1 +2.37.2 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 7376491b74..87714b2d8a 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 45e8c2898b56a47f7452d87d90cb6b59440b4c52 Mon Sep 17 00:00:00 2001 +From 32c9a23ced5538155b173e56389934291342dace 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 @@ -61,5 +61,5 @@ index 5c3b03c..d435b40 100644 vars['TZPATH'] = '' -- -2.36.1 +2.37.2 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 db7e6b9042..7e05f384c3 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 41cce9e486343283d7e9e8a7939b19ecf3f29276 Mon Sep 17 00:00:00 2001 +From 135c650c9fa3c0d722db375c0758c120d1165494 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 @@ -20,10 +20,10 @@ index 825ce5d..b4e7ff7 100644 +@USE_WIN32_MODULE@_winapi _winapi.c diff --git a/setup.py b/setup.py -index 0ce7288..e36dd4f 100644 +index 828692f..5e9bcdf 100644 --- a/setup.py +++ b/setup.py -@@ -1707,7 +1707,9 @@ class PyBuildExt(build_ext): +@@ -1709,7 +1709,9 @@ class PyBuildExt(build_ext): self.add(Extension('msvcrt', [os.path.join(pc_srcdir, p) for p in ['msvcrtmodule.c']])) @@ -35,5 +35,5 @@ index 0ce7288..e36dd4f 100644 self.add(Extension('_msi', [os.path.join(pc_srcdir, p) for p in ['_msi.c']], -- -2.36.1 +2.37.2 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 6b6e089548..db81a5bfde 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 7e52afabdbaf3354f995664947535b9e43fbacf2 Mon Sep 17 00:00:00 2001 +From 638c4116333169d74ad71d47d5c870d0da9c7870 Mon Sep 17 00:00:00 2001 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 @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index e36dd4f..1eb8b40 100644 +index 5e9bcdf..5ca51b0 100644 --- a/setup.py +++ b/setup.py -@@ -832,10 +832,10 @@ class PyBuildExt(build_ext): +@@ -831,10 +831,10 @@ class PyBuildExt(build_ext): if not CROSS_COMPILING: add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') @@ -29,5 +29,5 @@ index e36dd4f..1eb8b40 100644 def init_inc_lib_dirs(self): -- -2.36.1 +2.37.2 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 a673ed34a0..012329a86c 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 fcbb7bd0a509c8b96b6f8ceaa969d92379a833dd Mon Sep 17 00:00:00 2001 +From 621b8408ff7c58c9ece2987174d39fb82767c134 Mon Sep 17 00:00:00 2001 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 3755e76..046efbf 100644 yield fullname elif (maxlevels > 0 and name != os.curdir and name != os.pardir and -- -2.36.1 +2.37.2 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 809cee848a..d4c3187182 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 21ef73c204327ccd8782323bd98e8a6dd7925c46 Mon Sep 17 00:00:00 2001 +From 18667100cab6360ecb7fb02f7cffeacf8917e43f 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 2d10ccd..1610c7e 100644 # Here are a couple of targets for MacOSX again, to install a full # framework-based Python. frameworkinstall installs everything, the -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0041-allow-static-tcltk.patch b/mingw-w64-python/0041-allow-static-tcltk.patch index 0a33ad89ce..05c5d4dc1d 100644 --- a/mingw-w64-python/0041-allow-static-tcltk.patch +++ b/mingw-w64-python/0041-allow-static-tcltk.patch @@ -1,4 +1,4 @@ -From 41ffea6f968c0ad38b5c53ad4a1d035d4ee2e648 Mon Sep 17 00:00:00 2001 +From c8e1d102de0ec2347f52cddf8cc9385f045a3732 Mon Sep 17 00:00:00 2001 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 @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/setup.py b/setup.py -index 1eb8b40..08d6c17 100644 +index 5ca51b0..811756b 100644 --- a/setup.py +++ b/setup.py -@@ -881,7 +881,7 @@ class PyBuildExt(build_ext): +@@ -880,7 +880,7 @@ class PyBuildExt(build_ext): if HOST_PLATFORM == 'hp-ux11': self.lib_dirs += ['/usr/lib/hpux64', '/usr/lib/hpux32'] @@ -25,7 +25,7 @@ index 1eb8b40..08d6c17 100644 # This should work on any unixy platform ;-) # If the user has bothered specifying additional -I and -L flags # in OPT and LDFLAGS we might as well use them here. -@@ -891,6 +891,8 @@ class PyBuildExt(build_ext): +@@ -890,6 +890,8 @@ class PyBuildExt(build_ext): # directories with whitespace in the name to store libraries. cflags, ldflags = sysconfig.get_config_vars( 'CFLAGS', 'LDFLAGS') @@ -34,7 +34,7 @@ index 1eb8b40..08d6c17 100644 for item in cflags.split(): if item.startswith('-I'): self.inc_dirs.append(item[2:]) -@@ -2170,14 +2172,19 @@ class PyBuildExt(build_ext): +@@ -2172,14 +2174,19 @@ class PyBuildExt(build_ext): # The versions with dots are used on Unix, and the versions without # dots on Windows, for detection by cygwin. tcllib = tklib = tcl_includes = tk_includes = None @@ -62,7 +62,7 @@ index 1eb8b40..08d6c17 100644 break # Now check for the header files -@@ -2248,10 +2255,18 @@ class PyBuildExt(build_ext): +@@ -2250,10 +2257,18 @@ class PyBuildExt(build_ext): # Add the Tcl/Tk libraries libs.append('tk'+ version) libs.append('tcl'+ version) @@ -83,5 +83,5 @@ index 1eb8b40..08d6c17 100644 # XXX handle these, but how to detect? # *** Uncomment and edit for PIL (TkImaging) extension only: -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch b/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch index ed788bff47..394c3e589f 100644 --- a/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch +++ b/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch @@ -1,4 +1,4 @@ -From ca96f71268cf0a68abc6a420b78230b78c9e24b3 Mon Sep 17 00:00:00 2001 +From d036bf58941fbf0bdf551c4f45fe02ff0e360cb0 Mon Sep 17 00:00:00 2001 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.36.1 +2.37.2 diff --git a/mingw-w64-python/0043-builddir-fixes.patch b/mingw-w64-python/0043-builddir-fixes.patch index 88789ee0f5..ed1b55d854 100644 --- a/mingw-w64-python/0043-builddir-fixes.patch +++ b/mingw-w64-python/0043-builddir-fixes.patch @@ -1,4 +1,4 @@ -From cf267851b45b9f40f01ffd87b4eabbc821e651d5 Mon Sep 17 00:00:00 2001 +From c5ccb5267d666baff65953be312b4566fff10e0f Mon Sep 17 00:00:00 2001 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.36.1 +2.37.2 diff --git a/mingw-w64-python/0044-msys-monkeypatch-os-system-via-sh-exe.patch b/mingw-w64-python/0044-msys-monkeypatch-os-system-via-sh-exe.patch index b7d3c8ef29..b53796eaaa 100644 --- a/mingw-w64-python/0044-msys-monkeypatch-os-system-via-sh-exe.patch +++ b/mingw-w64-python/0044-msys-monkeypatch-os-system-via-sh-exe.patch @@ -1,4 +1,4 @@ -From 696c2b5e870b0bc8840f0f93836f4881196ffa2f Mon Sep 17 00:00:00 2001 +From 009d484b277af84d6d5726c41616b21cad5cf785 Mon Sep 17 00:00:00 2001 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 @@ -13,7 +13,7 @@ Co-authored-by: Алексей 1 file changed, 11 insertions(+) diff --git a/setup.py b/setup.py -index 08d6c17..4790540 100644 +index 811756b..001c777 100644 --- a/setup.py +++ b/setup.py @@ -79,6 +79,17 @@ def get_platform(): @@ -35,5 +35,5 @@ index 08d6c17..4790540 100644 HOST_PLATFORM = get_platform() MS_WINDOWS = (HOST_PLATFORM == 'win32') -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0045-msys-replace-slashes-used-in-io-redirection.patch b/mingw-w64-python/0045-msys-replace-slashes-used-in-io-redirection.patch index d72ef9dd20..473ebe5770 100644 --- a/mingw-w64-python/0045-msys-replace-slashes-used-in-io-redirection.patch +++ b/mingw-w64-python/0045-msys-replace-slashes-used-in-io-redirection.patch @@ -1,4 +1,4 @@ -From 804cf6110dd9bade301f082b47364750621a68c5 Mon Sep 17 00:00:00 2001 +From 044d5739d5727b29ba33dac6c197eb00a4426ca9 Mon Sep 17 00:00:00 2001 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 @@ -15,10 +15,10 @@ Co-authored-by: Naveen M K 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py -index 4790540..4f5f988 100644 +index 001c777..d9fa7de 100644 --- a/setup.py +++ b/setup.py -@@ -681,7 +681,7 @@ class PyBuildExt(build_ext): +@@ -680,7 +680,7 @@ class PyBuildExt(build_ext): def add_multiarch_paths(self): # Debian/Ubuntu multiarch support. # https://wiki.ubuntu.com/MultiarchSpec @@ -27,7 +27,7 @@ index 4790540..4f5f988 100644 if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) ret = run_command( -@@ -706,7 +706,7 @@ class PyBuildExt(build_ext): +@@ -705,7 +705,7 @@ class PyBuildExt(build_ext): opt = '' if CROSS_COMPILING: opt = '-t' + sysconfig.get_config_var('HOST_GNU_TYPE') @@ -36,7 +36,7 @@ index 4790540..4f5f988 100644 if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) ret = run_command( -@@ -768,7 +768,7 @@ class PyBuildExt(build_ext): +@@ -767,7 +767,7 @@ class PyBuildExt(build_ext): pass def add_cross_compiling_paths(self): @@ -45,7 +45,7 @@ index 4790540..4f5f988 100644 if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) # bpo-38472: With a German locale, GCC returns "gcc-Version 9.1.0 -@@ -1101,7 +1101,7 @@ class PyBuildExt(build_ext): +@@ -1100,7 +1100,7 @@ class PyBuildExt(build_ext): readline_termcap_library = "" curses_library = "" # Cannot use os.popen here in py3k. @@ -54,7 +54,7 @@ index 4790540..4f5f988 100644 if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) # Determine if readline is already linked against curses or tinfo. -@@ -2121,12 +2121,12 @@ class PyBuildExt(build_ext): +@@ -2123,12 +2123,12 @@ class PyBuildExt(build_ext): cflags = sysconfig.get_config_vars('CFLAGS')[0] archs = re.findall(r'-arch\s+(\w+)', cflags) @@ -70,5 +70,5 @@ index 4790540..4f5f988 100644 with open(tmpfile) as fp: detected_archs = [] -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0046-remove_path_max.default.patch b/mingw-w64-python/0046-remove_path_max.default.patch index b750534337..bd838de11a 100644 --- a/mingw-w64-python/0046-remove_path_max.default.patch +++ b/mingw-w64-python/0046-remove_path_max.default.patch @@ -1,4 +1,4 @@ -From 8fb71b8410eda189ec0b9c1950ae5686d7e67e0d Mon Sep 17 00:00:00 2001 +From 1abe2d3f87a1e3de84984b541197247424e5c9c0 Mon Sep 17 00:00:00 2001 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.36.1 +2.37.2 diff --git a/mingw-w64-python/0047-dont-link-with-gettext.patch b/mingw-w64-python/0047-dont-link-with-gettext.patch index 3f2f62e5e9..c71ac1f9ff 100644 --- a/mingw-w64-python/0047-dont-link-with-gettext.patch +++ b/mingw-w64-python/0047-dont-link-with-gettext.patch @@ -1,4 +1,4 @@ -From da24063c406dd0152363a6836d87b95703a40cf9 Mon Sep 17 00:00:00 2001 +From f15312bd7dddfc87bd8e01fe763c01358e4a9e54 Mon Sep 17 00:00:00 2001 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 b6debe0..6a21db0 100644 # checks for system dependent C++ extensions support case "$ac_sys_system" in -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0048-ctypes-python-dll.patch b/mingw-w64-python/0048-ctypes-python-dll.patch index 412440fd8e..62c5b14bfa 100644 --- a/mingw-w64-python/0048-ctypes-python-dll.patch +++ b/mingw-w64-python/0048-ctypes-python-dll.patch @@ -1,4 +1,4 @@ -From 7ed86d3bd8120043f6f545dfa4c5d70c44be390e Mon Sep 17 00:00:00 2001 +From 36216900959fa97924943143d90843362075eaff Mon Sep 17 00:00:00 2001 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.36.1 +2.37.2 diff --git a/mingw-w64-python/0049-gdbm-module-includes.patch b/mingw-w64-python/0049-gdbm-module-includes.patch index 00fcf3e233..c114f7627e 100644 --- a/mingw-w64-python/0049-gdbm-module-includes.patch +++ b/mingw-w64-python/0049-gdbm-module-includes.patch @@ -1,4 +1,4 @@ -From df824195c72a4ea5a3b5950b0072652a24777eb8 Mon Sep 17 00:00:00 2001 +From a48ae1cc2da7632b6f9ae0db74545ce12bb1e4b7 Mon Sep 17 00:00:00 2001 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 a7fb6a3..98f2c09 100644 extern const char * gdbm_strerror(gdbm_error); #endif -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0050-use-gnu_printf-in-format.patch b/mingw-w64-python/0050-use-gnu_printf-in-format.patch index 645e67ac21..3e43a8755f 100644 --- a/mingw-w64-python/0050-use-gnu_printf-in-format.patch +++ b/mingw-w64-python/0050-use-gnu_printf-in-format.patch @@ -1,4 +1,4 @@ -From 4b8a9e77555a47be7d2b320490f585a8b3773df8 Mon Sep 17 00:00:00 2001 +From 984620a37803640c665dd854797c6b6b0bf5710a Mon Sep 17 00:00:00 2001 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.36.1 +2.37.2 diff --git a/mingw-w64-python/0051-mingw-fix-ssl-dont-use-enum_certificates.patch b/mingw-w64-python/0051-mingw-fix-ssl-dont-use-enum_certificates.patch index 49764ecc9d..27dc6ac51b 100644 --- a/mingw-w64-python/0051-mingw-fix-ssl-dont-use-enum_certificates.patch +++ b/mingw-w64-python/0051-mingw-fix-ssl-dont-use-enum_certificates.patch @@ -1,4 +1,4 @@ -From 7373d3f824b7d75d106dd12acc41d2f7018d8c27 Mon Sep 17 00:00:00 2001 +From e99b7fd5a39d5c75d748d258a3fc28b9a575c97f Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:52:03 +0530 Subject: [PATCH 051/N] mingw fix ssl dont use enum_certificates @@ -35,5 +35,5 @@ index b09d684..0be1a27 100644 self._load_windows_store_certs(storename, purpose) self.set_default_verify_paths() -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0052-fix-using-dllhandle-and-winver-mingw.patch b/mingw-w64-python/0052-fix-using-dllhandle-and-winver-mingw.patch index 87a2c3bafa..fa26d0ac67 100644 --- a/mingw-w64-python/0052-fix-using-dllhandle-and-winver-mingw.patch +++ b/mingw-w64-python/0052-fix-using-dllhandle-and-winver-mingw.patch @@ -1,4 +1,4 @@ -From f0060f564ff23b82b785fcdea5fb8b1d83c0013c Mon Sep 17 00:00:00 2001 +From e667de1c8198b09a6c89482d207ef9b5676ec406 Mon Sep 17 00:00:00 2001 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 ac49f78..d91a606 100644 SET_SYS_FROM_STRING("winver", PyWin_DLLVersionString); #endif -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0053-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch b/mingw-w64-python/0053-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch index ed9822520e..54f2077b02 100644 --- a/mingw-w64-python/0053-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch +++ b/mingw-w64-python/0053-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch @@ -1,4 +1,4 @@ -From 72615a49aa5f522171169c6ffd134989d2001ad0 Mon Sep 17 00:00:00 2001 +From f52eeb016960fa5b7e7598989c066cee700ddea7 Mon Sep 17 00:00:00 2001 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 a5d2623..3e31c80 100644 #elif defined(__cplusplus) #define COMPILER "[C++]" -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0054-MINGW-link-with-additional-library.patch b/mingw-w64-python/0054-MINGW-link-with-additional-library.patch index 444cab3dc0..d6349829b0 100644 --- a/mingw-w64-python/0054-MINGW-link-with-additional-library.patch +++ b/mingw-w64-python/0054-MINGW-link-with-additional-library.patch @@ -1,4 +1,4 @@ -From 7163c9282b556004cc6a4912d2639c2c3485b9e7 Mon Sep 17 00:00:00 2001 +From 3be1d811a0f8b279afa69c81cb962d59ce786811 Mon Sep 17 00:00:00 2001 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 6a21db0..283aeb8 100644 AC_MSG_CHECKING(for -O2) saved_cflags="$CFLAGS" -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0055-install-msilib.patch b/mingw-w64-python/0055-install-msilib.patch index 5e67dc14ff..540c5ccec7 100644 --- a/mingw-w64-python/0055-install-msilib.patch +++ b/mingw-w64-python/0055-install-msilib.patch @@ -1,4 +1,4 @@ -From 0a6fb86d64ed57770f91a542759206c73c86f00d Mon Sep 17 00:00:00 2001 +From c18759017ec10694724b7278ffa8764449f7deb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Thu, 17 Jun 2021 18:52:09 +0530 Subject: [PATCH 055/N] install msilib @@ -26,5 +26,5 @@ index 7220d6b..cfb6ff1 100644 urllib \ venv venv/scripts venv/scripts/common venv/scripts/posix \ -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0056-fix-signal-module-build.patch b/mingw-w64-python/0056-fix-signal-module-build.patch index 416c1af17d..ae16870953 100644 --- a/mingw-w64-python/0056-fix-signal-module-build.patch +++ b/mingw-w64-python/0056-fix-signal-module-build.patch @@ -1,4 +1,4 @@ -From 9d456590318d8b1d8a7e7b1fe50a3a6c9d78a271 Mon Sep 17 00:00:00 2001 +From b7d605e3184168cf6d71b5b671f759b7230fec12 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:10 +0530 Subject: [PATCH 056/N] fix signal module build @@ -25,5 +25,5 @@ index e765e05..ecd64fe 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.36.1 +2.37.2 diff --git a/mingw-w64-python/0057-build-build-winconsoleio-and-_testconsole.patch b/mingw-w64-python/0057-build-build-winconsoleio-and-_testconsole.patch index 42d084a54c..2e28e249cd 100644 --- a/mingw-w64-python/0057-build-build-winconsoleio-and-_testconsole.patch +++ b/mingw-w64-python/0057-build-build-winconsoleio-and-_testconsole.patch @@ -1,4 +1,4 @@ -From 2511285f77301aef5c7e92c51fecba1ea45bdbf1 Mon Sep 17 00:00:00 2001 +From 9c4cc63b7d0eefad879e4701f236dfb2118f5636 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:11 +0530 Subject: [PATCH 057/N] build: build winconsoleio and _testconsole @@ -26,10 +26,10 @@ index ecd64fe..3097db6 100644 # faulthandler module faulthandler faulthandler.c diff --git a/setup.py b/setup.py -index 4f5f988..1df8b5f 100644 +index d9fa7de..1dddfb3 100644 --- a/setup.py +++ b/setup.py -@@ -1096,6 +1096,9 @@ class PyBuildExt(build_ext): +@@ -1095,6 +1095,9 @@ class PyBuildExt(build_ext): ['_xxtestfuzz/_xxtestfuzz.c', '_xxtestfuzz/fuzzer.c'])) @@ -40,5 +40,5 @@ index 4f5f988..1df8b5f 100644 # readline readline_termcap_library = "" -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0058-expose-sem_unlink.patch b/mingw-w64-python/0058-expose-sem_unlink.patch index 2ad48b6f29..a0c7826688 100644 --- a/mingw-w64-python/0058-expose-sem_unlink.patch +++ b/mingw-w64-python/0058-expose-sem_unlink.patch @@ -1,4 +1,4 @@ -From 8626b560670c7545aa1b268022d29fa0f3f7e1c8 Mon Sep 17 00:00:00 2001 +From 6be23a61796cea4e7dcda5c1fc83b4527e1ee91d Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:12 +0530 Subject: [PATCH 058/N] expose sem_unlink @@ -25,5 +25,5 @@ index bec2351..72a34d0 100644 #endif {NULL} -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0059-cygpty-isatty.patch b/mingw-w64-python/0059-cygpty-isatty.patch index c944f1319b..c8a607da6f 100644 --- a/mingw-w64-python/0059-cygpty-isatty.patch +++ b/mingw-w64-python/0059-cygpty-isatty.patch @@ -1,4 +1,4 @@ -From 93c91af594973caac660c4e534f6818522e91752 Mon Sep 17 00:00:00 2001 +From 4b2db19f1345db74129db1049d7734e548aa6b92 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:14 +0530 Subject: [PATCH 059/N] cygpty isatty @@ -15,11 +15,11 @@ Co-authored-by: Алексей Modules/posixmodule.c | 3 +- Objects/fileobject.c | 3 +- Python/bltinmodule.c | 5 +- - Python/fileutils.c | 3 +- + Python/fileutils.c | 7 +- Python/frozenmain.c | 3 +- Python/iscygpty.c | 185 ++++++++++++++++++++++++++++++++++++++++++ - Python/pylifecycle.c | 3 +- - 11 files changed, 245 insertions(+), 9 deletions(-) + Python/pylifecycle.c | 5 +- + 11 files changed, 248 insertions(+), 12 deletions(-) create mode 100644 Include/iscygpty.h create mode 100644 Python/iscygpty.c @@ -133,7 +133,7 @@ index 2684d23..9ee34a3 100644 diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 545fd4c..d00ce48 100644 +index 1a0312b..d84e916 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -42,6 +42,7 @@ @@ -205,7 +205,7 @@ index b0162e5..af694f3 100644 } diff --git a/Python/fileutils.c b/Python/fileutils.c -index 1ee5476..cab07a7 100644 +index 1ee5476..45598c2 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c @@ -1,4 +1,5 @@ @@ -223,6 +223,21 @@ index 1ee5476..cab07a7 100644 _Py_END_SUPPRESS_IPH Py_END_ALLOW_THREADS if (!valid) +@@ -1785,12 +1786,12 @@ _Py_write_impl(int fd, const void *buf, size_t count, int gil_held) + depending on heap usage). */ + if (gil_held) { + Py_BEGIN_ALLOW_THREADS +- if (isatty(fd)) { ++ if (isatty(fd) || is_cygpty(fd)) { + count = 32767; + } + Py_END_ALLOW_THREADS + } else { +- if (isatty(fd)) { ++ if (isatty(fd) || is_cygpty(fd)) { + count = 32767; + } + } diff --git a/Python/frozenmain.c b/Python/frozenmain.c index dd04d60..6607762 100644 --- a/Python/frozenmain.c @@ -436,7 +451,7 @@ index 0000000..722f88f + +/* vim: set ts=4 sw=4: */ diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c -index eeaf20b..916e6d7 100644 +index eeaf20b..6605621 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -15,6 +15,7 @@ @@ -456,6 +471,15 @@ index eeaf20b..916e6d7 100644 return 1; if (!Py_InteractiveFlag) return 0; +@@ -2885,7 +2886,7 @@ Py_FdIsInteractive(FILE *fp, const char *filename) + int + _Py_FdIsInteractive(FILE *fp, PyObject *filename) + { +- if (isatty((int)fileno(fp))) { ++ if (isatty((int)fileno(fp)) || is_cygpty((int)fileno(fp))) { + return 1; + } + if (!Py_InteractiveFlag) { -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0060-disable-broken-gdbm-module.patch b/mingw-w64-python/0060-disable-broken-gdbm-module.patch index 9e7f961142..a0b79ebc12 100644 --- a/mingw-w64-python/0060-disable-broken-gdbm-module.patch +++ b/mingw-w64-python/0060-disable-broken-gdbm-module.patch @@ -1,4 +1,4 @@ -From a0bcd1cfe9d74258febee80f116cc9f93b5381a4 Mon Sep 17 00:00:00 2001 +From 8b15628243eeb3106e2211d76ed891e1dfc2b24e Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:15 +0530 Subject: [PATCH 060/N] disable broken gdbm module @@ -12,10 +12,10 @@ Co-authored-by: Алексей 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 1df8b5f..e3d8abd 100644 +index 1dddfb3..9340053 100644 --- a/setup.py +++ b/setup.py -@@ -1506,7 +1506,7 @@ class PyBuildExt(build_ext): +@@ -1505,7 +1505,7 @@ class PyBuildExt(build_ext): if dbm_args: dbm_order = [arg.split('=')[-1] for arg in dbm_args][-1].split(":") else: @@ -25,5 +25,5 @@ index 1df8b5f..e3d8abd 100644 for cand in dbm_order: if cand == "ndbm": -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0061-build-link-win-resource-files-and-build-pythonw.patch b/mingw-w64-python/0061-build-link-win-resource-files-and-build-pythonw.patch index b22450af74..2219d1ed77 100644 --- a/mingw-w64-python/0061-build-link-win-resource-files-and-build-pythonw.patch +++ b/mingw-w64-python/0061-build-link-win-resource-files-and-build-pythonw.patch @@ -1,4 +1,4 @@ -From 993d3d830089557799760278f082f360a2169ca2 Mon Sep 17 00:00:00 2001 +From f5230943b71d88c84319852efa7a74ae38350dbe Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:16 +0530 Subject: [PATCH 061/N] build: link win resource files and build pythonw @@ -143,5 +143,5 @@ index 283aeb8..6470b82 100644 # Availability of -O2: AC_MSG_CHECKING(for -O2) -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0062-disable-readline.patch b/mingw-w64-python/0062-disable-readline.patch index d1ad9fa36d..aa78967ba0 100644 --- a/mingw-w64-python/0062-disable-readline.patch +++ b/mingw-w64-python/0062-disable-readline.patch @@ -1,4 +1,4 @@ -From d42f940e19bc173336e58e2879b85587c4e5f091 Mon Sep 17 00:00:00 2001 +From 0b5f0711041eed43d321502fedb095393ea7e0a1 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:17 +0530 Subject: [PATCH 062/N] disable readline @@ -12,10 +12,10 @@ Co-authored-by: Алексей 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py -index e3d8abd..c4febce 100644 +index 9340053..dd3d902 100644 --- a/setup.py +++ b/setup.py -@@ -1167,6 +1167,8 @@ class PyBuildExt(build_ext): +@@ -1166,6 +1166,8 @@ class PyBuildExt(build_ext): # readline package if find_file('readline/rlconf.h', self.inc_dirs, []) is None: do_readline = False @@ -25,5 +25,5 @@ index e3d8abd..c4febce 100644 if MACOS and os_release < 9: # In every directory on the search path search for a dynamic -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0063-fix-isselectable.patch b/mingw-w64-python/0063-fix-isselectable.patch index 887bb0dc06..7e7d173dca 100644 --- a/mingw-w64-python/0063-fix-isselectable.patch +++ b/mingw-w64-python/0063-fix-isselectable.patch @@ -1,4 +1,4 @@ -From 15e6b7fe7348a73d7072f916b0026bea801c82ec Mon Sep 17 00:00:00 2001 +From 0b4d682f0e108bf94fd30d58a27d8bc7014a1064 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:18 +0530 Subject: [PATCH 063/N] fix isselectable @@ -25,5 +25,5 @@ index 6ec2994..a80f195 100644 #define _PyIsSelectable_fd(FD) (1) #else -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0064-use-_wcsnicmp-instead-wcsncasecmp.patch b/mingw-w64-python/0064-use-_wcsnicmp-instead-wcsncasecmp.patch index dc7bec79ca..a55efe9644 100644 --- a/mingw-w64-python/0064-use-_wcsnicmp-instead-wcsncasecmp.patch +++ b/mingw-w64-python/0064-use-_wcsnicmp-instead-wcsncasecmp.patch @@ -1,4 +1,4 @@ -From 8671fa819505ff9863da2e33269590603abcd3da Mon Sep 17 00:00:00 2001 +From edf2cfc411805abd4415e49ccbd554fb6b14ed2c Mon Sep 17 00:00:00 2001 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 e05787b..2b4ae28 100644 } -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0065-_xxsubinterpretersmodule.patch b/mingw-w64-python/0065-_xxsubinterpretersmodule.patch index 2ebbf30ab7..6c2f8b00fb 100644 --- a/mingw-w64-python/0065-_xxsubinterpretersmodule.patch +++ b/mingw-w64-python/0065-_xxsubinterpretersmodule.patch @@ -1,4 +1,4 @@ -From 46a5fa27bc6589a229856343388cc5dfba7a760a Mon Sep 17 00:00:00 2001 +From d7aedf010291ac3d42928a25fb692c3da2663a15 Mon Sep 17 00:00:00 2001 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 9290255..9d2952b 100644 sizeof(channelid), /* tp_basicsize */ 0, /* tp_itemsize */ -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0066-sqlite3-module-defines.patch b/mingw-w64-python/0066-sqlite3-module-defines.patch index fcbe77c649..bb16eef464 100644 --- a/mingw-w64-python/0066-sqlite3-module-defines.patch +++ b/mingw-w64-python/0066-sqlite3-module-defines.patch @@ -1,4 +1,4 @@ -From b0c2184655b5aa587ae3c188abee9cb2f93c2ad5 Mon Sep 17 00:00:00 2001 +From fac265514e0d7ba24b5f587a698526d1020b94e7 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:21 +0530 Subject: [PATCH 066/N] sqlite3 module defines @@ -8,10 +8,10 @@ Subject: [PATCH 066/N] sqlite3 module defines 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py -index c4febce..72b02e1 100644 +index dd3d902..f6923e1 100644 --- a/setup.py +++ b/setup.py -@@ -1658,6 +1658,7 @@ class PyBuildExt(build_ext): +@@ -1657,6 +1657,7 @@ class PyBuildExt(build_ext): '_sqlite/statement.c', '_sqlite/util.c', ] sqlite_defines = [] @@ -20,5 +20,5 @@ index c4febce..72b02e1 100644 # Enable support for loadable extensions in the sqlite3 module # if --enable-loadable-sqlite-extensions configure option is used. -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0067-configure.ac-fix-inet_pton-check.patch b/mingw-w64-python/0067-configure.ac-fix-inet_pton-check.patch index 941bd20245..c02573448a 100644 --- a/mingw-w64-python/0067-configure.ac-fix-inet_pton-check.patch +++ b/mingw-w64-python/0067-configure.ac-fix-inet_pton-check.patch @@ -1,4 +1,4 @@ -From b25dcd3d34692f94898f9385565d943c1b3d7ebe Mon Sep 17 00:00:00 2001 +From ccb9af0bd83edc00d19c2b44b5984f64fdfcd5d3 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:23 +0530 Subject: [PATCH 067/N] configure.ac: fix inet_pton check @@ -31,5 +31,5 @@ index 6470b82..7aedbda 100644 [AC_DEFINE(HAVE_INET_PTON, 1, Define if you have the 'inet_pton' function.) AC_MSG_RESULT(yes)], -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0068-set-venv-activate-path-unix.patch b/mingw-w64-python/0068-set-venv-activate-path-unix.patch index b9606ea653..eec8a96888 100644 --- a/mingw-w64-python/0068-set-venv-activate-path-unix.patch +++ b/mingw-w64-python/0068-set-venv-activate-path-unix.patch @@ -1,4 +1,4 @@ -From 52f53e9c8348cbe60d20c718ecb8a4d4ce37c88a Mon Sep 17 00:00:00 2001 +From 90374a87dd7e485e3ce83c01a773e74a51d86940 Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Thu, 17 Jun 2021 18:52:25 +0530 Subject: [PATCH 068/N] set venv activate path unix @@ -25,5 +25,5 @@ index 6fbc2b8..9c3d58d 100644 _OLD_VIRTUAL_PATH="$PATH" -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0069-venv-creation-fixes.patch b/mingw-w64-python/0069-venv-creation-fixes.patch index a3a20cbfaf..ec0d777133 100644 --- a/mingw-w64-python/0069-venv-creation-fixes.patch +++ b/mingw-w64-python/0069-venv-creation-fixes.patch @@ -1,4 +1,4 @@ -From 6a2f755016c73bff582fff6e8cef62eb4d818b63 Mon Sep 17 00:00:00 2001 +From e69ef5cbe5966927c8a9d5e75ca7952132e4cb59 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:26 +0530 Subject: [PATCH 069/N] venv creation fixes @@ -67,5 +67,5 @@ index 6f1af29..83ba0bc 100644 def setup_scripts(self, context): """ -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0070-pass-gen-profile-ldflags.patch b/mingw-w64-python/0070-pass-gen-profile-ldflags.patch index 3914d8a0ed..49e9038227 100644 --- a/mingw-w64-python/0070-pass-gen-profile-ldflags.patch +++ b/mingw-w64-python/0070-pass-gen-profile-ldflags.patch @@ -1,4 +1,4 @@ -From d19878ce27d2cc949387cb605cf5e4cea9f717fd Mon Sep 17 00:00:00 2001 +From a7178b757207d94fa2d011b189921653b5d470f1 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:27 +0530 Subject: [PATCH 070/N] pass gen profile ldflags @@ -25,5 +25,5 @@ index 66bf887..1c227c4 100644 fi -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0071-pkg-config-windows-must-link-ext-with-python-lib.patch b/mingw-w64-python/0071-pkg-config-windows-must-link-ext-with-python-lib.patch index 4dbc7fb34b..8bf9887df0 100644 --- a/mingw-w64-python/0071-pkg-config-windows-must-link-ext-with-python-lib.patch +++ b/mingw-w64-python/0071-pkg-config-windows-must-link-ext-with-python-lib.patch @@ -1,4 +1,4 @@ -From d03e104a5dfc424d194f075ccfff829df628069b Mon Sep 17 00:00:00 2001 +From 403c332d2c4330512c2efb4dd2be9cdd121cb264 Mon Sep 17 00:00:00 2001 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 7aedbda..d20c809 100644 else LIBPYTHON='' -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0072-importlib-bootstrap-path-sep.patch b/mingw-w64-python/0072-importlib-bootstrap-path-sep.patch index d4881ef3ff..c83573bd57 100644 --- a/mingw-w64-python/0072-importlib-bootstrap-path-sep.patch +++ b/mingw-w64-python/0072-importlib-bootstrap-path-sep.patch @@ -1,4 +1,4 @@ -From 16779ffefc3bb5d949c871dc9abb2b30862bfa53 Mon Sep 17 00:00:00 2001 +From 39d00fe6da27b532d85f680f7262c8c03567c852 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:30 +0530 Subject: [PATCH 072/N] importlib bootstrap path sep @@ -28,5 +28,5 @@ index 49bcaea..3a9f876 100644 assert all(len(sep) == 1 for sep in path_separators) path_sep = path_separators[0] -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0073-pathlib-path-sep.patch b/mingw-w64-python/0073-pathlib-path-sep.patch index 172d84c653..180427ee2b 100644 --- a/mingw-w64-python/0073-pathlib-path-sep.patch +++ b/mingw-w64-python/0073-pathlib-path-sep.patch @@ -1,4 +1,4 @@ -From d7be88162983221acd763ca2b95e0fc327063426 Mon Sep 17 00:00:00 2001 +From 7b21344431ecdb015d73bbfa7f529bd7c5b024fa Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:31 +0530 Subject: [PATCH 073/N] pathlib path sep @@ -21,5 +21,5 @@ index 97b23ca..035892f 100644 pathmod = ntpath -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0074-warnings-fixes.patch b/mingw-w64-python/0074-warnings-fixes.patch index c7c9f60721..6c402287f6 100644 --- a/mingw-w64-python/0074-warnings-fixes.patch +++ b/mingw-w64-python/0074-warnings-fixes.patch @@ -1,4 +1,4 @@ -From 6cca0269d57b4c7941e9e672a3ff08a3657a8c52 Mon Sep 17 00:00:00 2001 +From 49060f46a7e273670e8401b507e66eb591a7ad71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:33 +0530 @@ -15,7 +15,7 @@ Subject: [PATCH 074/N] warnings fixes 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Modules/_winapi.c b/Modules/_winapi.c -index e7e8c6a..b09fce7 100644 +index 4d88e33..c479a92 100644 --- a/Modules/_winapi.c +++ b/Modules/_winapi.c @@ -959,7 +959,7 @@ getattributelist(PyObject *obj, const char *name, AttributeList *attribute_list) @@ -28,7 +28,7 @@ index e7e8c6a..b09fce7 100644 SIZE_T attribute_list_size = 0; diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index d00ce48..7cb99be 100644 +index d84e916..25b7c01 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -5401,7 +5401,7 @@ os_utime_impl(PyObject *module, path_t *path, PyObject *times, PyObject *ns, @@ -127,5 +127,5 @@ index 0ce5e94..6a6fe7e 100644 /* minimum/maximum thread stack sizes supported */ -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0075-fix-build-testinternalcapi.patch b/mingw-w64-python/0075-fix-build-testinternalcapi.patch index 329495dbf6..1830bd7c31 100644 --- a/mingw-w64-python/0075-fix-build-testinternalcapi.patch +++ b/mingw-w64-python/0075-fix-build-testinternalcapi.patch @@ -1,4 +1,4 @@ -From 9c8384efea586af2310b615f236dd9a30e5e0544 Mon Sep 17 00:00:00 2001 +From 51df8a3516f1d6a13b524b7ae008af31744fedb8 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:34 +0530 Subject: [PATCH 075/N] fix build testinternalcapi @@ -8,10 +8,10 @@ Subject: [PATCH 075/N] fix build testinternalcapi 1 file changed, 4 insertions(+) diff --git a/setup.py b/setup.py -index 72b02e1..42c271f 100644 +index f6923e1..ff49ea9 100644 --- a/setup.py +++ b/setup.py -@@ -1079,7 +1079,11 @@ class PyBuildExt(build_ext): +@@ -1078,7 +1078,11 @@ class PyBuildExt(build_ext): depends=['testcapi_long.h'])) # Python Internal C API test module @@ -24,5 +24,5 @@ index 72b02e1..42c271f 100644 # Python PEP-3118 (buffer protocol) test module -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0076-extend-MS_WINDOWS-flag.patch b/mingw-w64-python/0076-extend-MS_WINDOWS-flag.patch index a66573562b..de51031a91 100644 --- a/mingw-w64-python/0076-extend-MS_WINDOWS-flag.patch +++ b/mingw-w64-python/0076-extend-MS_WINDOWS-flag.patch @@ -1,4 +1,4 @@ -From 1476aa6ee5970e826dc7ca840239b8949e7a346c Mon Sep 17 00:00:00 2001 +From 7047820917e7ba063e07a99bd6a30b27afdd02ea Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Thu, 17 Jun 2021 18:52:34 +0530 Subject: [PATCH 076/N] extend MS_WINDOWS flag @@ -8,7 +8,7 @@ Subject: [PATCH 076/N] extend MS_WINDOWS flag 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 42c271f..859c96a 100644 +index ff49ea9..d486529 100644 --- a/setup.py +++ b/setup.py @@ -92,7 +92,7 @@ if sys.platform == "win32" and "MSYSTEM" in os.environ: @@ -21,5 +21,5 @@ index 42c271f..859c96a 100644 MACOS = (HOST_PLATFORM == 'darwin') AIX = (HOST_PLATFORM.startswith('aix')) -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0077-clang-arm64.patch b/mingw-w64-python/0077-clang-arm64.patch index 5f2228c994..633819f7f0 100644 --- a/mingw-w64-python/0077-clang-arm64.patch +++ b/mingw-w64-python/0077-clang-arm64.patch @@ -1,4 +1,4 @@ -From a919ca854e4fc7bce919f74e036c34f9c4a8e71f Mon Sep 17 00:00:00 2001 +From bb35289d40b34eb9ce9e4a2cb0dd6fec36ca3892 Mon Sep 17 00:00:00 2001 From: jeremyd2019 <4524874+jeremyd2019@users.noreply.github.com> Date: Thu, 17 Jun 2021 18:52:36 +0530 Subject: [PATCH 077/N] clang arm64 @@ -46,5 +46,5 @@ index 3e31c80..7e7be71 100644 #elif defined(__cplusplus) #define COMPILER "[C++]" -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0078-configure.ac-set-MINGW-stack-reserve.patch b/mingw-w64-python/0078-configure.ac-set-MINGW-stack-reserve.patch index fe2a25fa4a..095a41e10d 100644 --- a/mingw-w64-python/0078-configure.ac-set-MINGW-stack-reserve.patch +++ b/mingw-w64-python/0078-configure.ac-set-MINGW-stack-reserve.patch @@ -1,4 +1,4 @@ -From 90a603d2b2690eb46b02fbd70181064d55f1d573 Mon Sep 17 00:00:00 2001 +From e1e8d827859e96a8eaf1ec2ff8342757eea53030 Mon Sep 17 00:00:00 2001 From: jeremyd2019 <4524874+jeremyd2019@users.noreply.github.com> Date: Thu, 17 Jun 2021 18:52:37 +0530 Subject: [PATCH 078/N] configure.ac: set MINGW stack reserve @@ -24,5 +24,5 @@ index d20c809..428293e 100644 AC_MSG_RESULT($LINKFORSHARED) -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0079-Don-t-use-os.pathsep-to-find-EOF.patch b/mingw-w64-python/0079-Don-t-use-os.pathsep-to-find-EOF.patch index 685017c925..d92913ff2a 100644 --- a/mingw-w64-python/0079-Don-t-use-os.pathsep-to-find-EOF.patch +++ b/mingw-w64-python/0079-Don-t-use-os.pathsep-to-find-EOF.patch @@ -1,4 +1,4 @@ -From 534986937a6506b7563cf84788476c0a7d9239d3 Mon Sep 17 00:00:00 2001 +From 4e5ee19fb86f34db5e74fe79932b49623d1de6d6 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 18 Jun 2021 12:38:11 +0530 Subject: [PATCH 079/N] Don't use os.pathsep to find EOF not all @@ -23,5 +23,5 @@ index e460a3d..49c6ce0 100644 else: eof = 'Ctrl-D (i.e. EOF)' -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0080-Fix-extension-suffix-for-c-extensions-on-mingw.patch b/mingw-w64-python/0080-Fix-extension-suffix-for-c-extensions-on-mingw.patch index 9fc938aaca..5b1f0232ba 100644 --- a/mingw-w64-python/0080-Fix-extension-suffix-for-c-extensions-on-mingw.patch +++ b/mingw-w64-python/0080-Fix-extension-suffix-for-c-extensions-on-mingw.patch @@ -1,4 +1,4 @@ -From 817eea32208ff6711a747781258598b8ffec04c8 Mon Sep 17 00:00:00 2001 +From ba4d9367ea023d36a891f52d4aaa31d52dd3a86c Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Wed, 23 Jun 2021 18:12:12 +0530 Subject: [PATCH 080/N] Fix extension suffix for c-extensions on mingw @@ -178,5 +178,5 @@ index 428293e..5d7148a 100644 case $ac_sys_system in AIX*) -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0081-Change-the-get_platform-method-in-sysconfig.patch b/mingw-w64-python/0081-Change-the-get_platform-method-in-sysconfig.patch index 761a0a4285..9a224c2853 100644 --- a/mingw-w64-python/0081-Change-the-get_platform-method-in-sysconfig.patch +++ b/mingw-w64-python/0081-Change-the-get_platform-method-in-sysconfig.patch @@ -1,4 +1,4 @@ -From 723b34f7414c48f421552b73e346d1856cfe4a2c Mon Sep 17 00:00:00 2001 +From 7a7dafdc2a09780da4ce3c2f41dcc2c8c8909f74 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:36:58 +0200 Subject: [PATCH 081/N] Change the `get_platform()` method in sysconfig @@ -60,5 +60,5 @@ index 7e7be71..275f799 100644 #elif defined(__cplusplus) #define COMPILER "[C++]" -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0082-distutils-compiler-customize-mingw-cygwin-compilers.patch b/mingw-w64-python/0082-distutils-compiler-customize-mingw-cygwin-compilers.patch index f0eecf5ece..96fec26cc7 100644 --- a/mingw-w64-python/0082-distutils-compiler-customize-mingw-cygwin-compilers.patch +++ b/mingw-w64-python/0082-distutils-compiler-customize-mingw-cygwin-compilers.patch @@ -1,4 +1,4 @@ -From 5ea0fb15edd71b57609c501ec07b2f82a90bf94d Mon Sep 17 00:00:00 2001 +From 33deb4c30c3fb87b9ac416c2acb53dafdd12745d Mon Sep 17 00:00:00 2001 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 @@ -39,5 +39,5 @@ index 3414a76..cb39cd6 100644 # Perform first-time customization of compiler-related # config vars on OS X now that we know we need a compiler. -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0083-distutils-compiler-enable-new-dtags.patch b/mingw-w64-python/0083-distutils-compiler-enable-new-dtags.patch index a9a0ed8ad5..48a86cbe7b 100644 --- a/mingw-w64-python/0083-distutils-compiler-enable-new-dtags.patch +++ b/mingw-w64-python/0083-distutils-compiler-enable-new-dtags.patch @@ -1,4 +1,4 @@ -From 83147959de241831a81d501eb98ac0554d7d9ba7 Mon Sep 17 00:00:00 2001 +From be9103a529243b18339141f7e19f1478280d1cbc Mon Sep 17 00:00:00 2001 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.36.1 +2.37.2 diff --git a/mingw-w64-python/0084-distutils-MINGW-build-extensions-with-GCC.patch b/mingw-w64-python/0084-distutils-MINGW-build-extensions-with-GCC.patch index c6b7d55340..6dec7a0f61 100644 --- a/mingw-w64-python/0084-distutils-MINGW-build-extensions-with-GCC.patch +++ b/mingw-w64-python/0084-distutils-MINGW-build-extensions-with-GCC.patch @@ -1,4 +1,4 @@ -From 7bef201cd415a018614115907a1e15d2f9506756 Mon Sep 17 00:00:00 2001 +From e6e869d407b0f067041a858fc45e5d15b1c3bdba Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 20:52:22 +0200 Subject: [PATCH 084/N] distutils: MINGW build extensions with GCC @@ -56,5 +56,5 @@ index 2ce5c5b..fb7d1ad 100644 return 'win-amd64' if '(arm)' in sys.version.lower(): -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0085-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch b/mingw-w64-python/0085-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch index 9936d6a38b..5781c6bc67 100644 --- a/mingw-w64-python/0085-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch +++ b/mingw-w64-python/0085-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch @@ -1,4 +1,4 @@ -From 96f7766d228e5caef4c0a2dd6bb68f6e6a2f3079 Mon Sep 17 00:00:00 2001 +From d38fd358d4cb464ab600163b3da1e10f24358194 Mon Sep 17 00:00:00 2001 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.36.1 +2.37.2 diff --git a/mingw-w64-python/0086-distutils-find-import-library.patch b/mingw-w64-python/0086-distutils-find-import-library.patch index 99d0178753..f394357001 100644 --- a/mingw-w64-python/0086-distutils-find-import-library.patch +++ b/mingw-w64-python/0086-distutils-find-import-library.patch @@ -1,4 +1,4 @@ -From b79e1336f07bd50b3e35a60f9a466046bdd9bfee Mon Sep 17 00:00:00 2001 +From 61ff5997fb2f83c8bdca8521eff8fa539ae8a5eb Mon Sep 17 00:00:00 2001 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.36.1 +2.37.2 diff --git a/mingw-w64-python/0087-distutils-avoid-circular-dependency-from-time-module.patch b/mingw-w64-python/0087-distutils-avoid-circular-dependency-from-time-module.patch index af4bddb4c0..b130bb51f2 100644 --- a/mingw-w64-python/0087-distutils-avoid-circular-dependency-from-time-module.patch +++ b/mingw-w64-python/0087-distutils-avoid-circular-dependency-from-time-module.patch @@ -1,4 +1,4 @@ -From 1476697aaf3f889c5e1386acbb237b14693502fb Mon Sep 17 00:00:00 2001 +From 3a049c688b4de584f14622a9db4c919fa660c7da Mon Sep 17 00:00:00 2001 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.36.1 +2.37.2 diff --git a/mingw-w64-python/0088-distutils-generalization-of-posix-build-in-distutils.patch b/mingw-w64-python/0088-distutils-generalization-of-posix-build-in-distutils.patch index 1707ae2a1a..3645c96ce5 100644 --- a/mingw-w64-python/0088-distutils-generalization-of-posix-build-in-distutils.patch +++ b/mingw-w64-python/0088-distutils-generalization-of-posix-build-in-distutils.patch @@ -1,4 +1,4 @@ -From c6f2ca86bab152f17fe7ec4823c3252a79078496 Mon Sep 17 00:00:00 2001 +From 98884950b6f664b45e81d8b47bfca759bb57b54c Mon Sep 17 00:00:00 2001 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 @@ -58,5 +58,5 @@ index cb39cd6..3c7b766 100644 # Platform-specific modules (any module from a non-pure-Python # module distribution) or standard Python library modules. -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0089-distutils-mingw-sysconfig-like-posix.patch b/mingw-w64-python/0089-distutils-mingw-sysconfig-like-posix.patch index c9e557e6f1..dc2c4b1c69 100644 --- a/mingw-w64-python/0089-distutils-mingw-sysconfig-like-posix.patch +++ b/mingw-w64-python/0089-distutils-mingw-sysconfig-like-posix.patch @@ -1,4 +1,4 @@ -From 7e556733cf1d08cead61d2c749c6bdaf99874aef Mon Sep 17 00:00:00 2001 +From bc3d6c0932efa766e1662e54cd0e9ccfc2c2098e Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 20:53:29 +0200 Subject: [PATCH 089/N] distutils: mingw sysconfig like posix @@ -24,5 +24,5 @@ index 1c9d471..1dbdfe0 100644 # building python standard extensions self.library_dirs.append('.') -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0090-distutils-get_versions-fixes.patch b/mingw-w64-python/0090-distutils-get_versions-fixes.patch index f63b2cb6a6..1cd2e204f9 100644 --- a/mingw-w64-python/0090-distutils-get_versions-fixes.patch +++ b/mingw-w64-python/0090-distutils-get_versions-fixes.patch @@ -1,4 +1,4 @@ -From 24b9a6d18a6215a73f65d54f346ba4c39fd0e60b Mon Sep 17 00:00:00 2001 +From da579ab839873f76e239230d98203cfeee7e9c83 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:14:31 +0200 Subject: [PATCH 090/N] distutils: get_versions() fixes @@ -52,5 +52,5 @@ index 5b281e2..fba3485 100644 def is_cygwingcc(): -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0091-distutils-install-layout-as-posix.patch b/mingw-w64-python/0091-distutils-install-layout-as-posix.patch index 2294e37f8c..f4123dc4ad 100644 --- a/mingw-w64-python/0091-distutils-install-layout-as-posix.patch +++ b/mingw-w64-python/0091-distutils-install-layout-as-posix.patch @@ -1,4 +1,4 @@ -From a8bc7c628f8f61647f5f85e011a4a8faaf12920e Mon Sep 17 00:00:00 2001 +From 0f45767b9af9068e25d220e61a25762d763bf15f Mon Sep 17 00:00:00 2001 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 01d5331..0421a06 100644 } -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0092-distutils-msys-convert_path-fix-and-root-hack.patch b/mingw-w64-python/0092-distutils-msys-convert_path-fix-and-root-hack.patch index b8ea37bd78..138a39f4dd 100644 --- a/mingw-w64-python/0092-distutils-msys-convert_path-fix-and-root-hack.patch +++ b/mingw-w64-python/0092-distutils-msys-convert_path-fix-and-root-hack.patch @@ -1,4 +1,4 @@ -From d17b9a557a5a85f33f9dd582cd64109bb9aedfcc Mon Sep 17 00:00:00 2001 +From fbe9b62417a1302d3ba8c93638b64b730c72ad58 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:18:50 +0200 Subject: [PATCH 092/N] distutils: msys convert_path fix and root hack @@ -76,5 +76,5 @@ index fb7d1ad..ed9d509 100644 else: raise DistutilsPlatformError("nothing known about platform '%s'" % os.name) -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0093-distutils-mingw-build-optimized-ext.patch b/mingw-w64-python/0093-distutils-mingw-build-optimized-ext.patch index a29ea6f1b1..53c4d2bf24 100644 --- a/mingw-w64-python/0093-distutils-mingw-build-optimized-ext.patch +++ b/mingw-w64-python/0093-distutils-mingw-build-optimized-ext.patch @@ -1,4 +1,4 @@ -From 24772f9ac05fba99edbdc4034b12235859a4bc60 Mon Sep 17 00:00:00 2001 +From 72f8bbe56b5bd05a6ddd37c94763e9c50c2f11ee Mon Sep 17 00:00:00 2001 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.36.1 +2.37.2 diff --git a/mingw-w64-python/0094-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch b/mingw-w64-python/0094-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch index afc45ea936..885bd2aaa5 100644 --- a/mingw-w64-python/0094-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch +++ b/mingw-w64-python/0094-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch @@ -1,4 +1,4 @@ -From ae03d9522f8cbe63950be946970d5170e45e7327 Mon Sep 17 00:00:00 2001 +From baf20edee3fc67d7a2002a20a326c90dd7d1175c Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:52:05 +0530 Subject: [PATCH 094/N] distutils: cygwinccompiler dont strip modules if @@ -26,5 +26,5 @@ index bb97880..c134525 100644 UnixCCompiler.link(self, target_desc, objects, output_filename, -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0095-distutils-get-compilers-from-env-vars.patch b/mingw-w64-python/0095-distutils-get-compilers-from-env-vars.patch index 98fef40c4d..9f6c631680 100644 --- a/mingw-w64-python/0095-distutils-get-compilers-from-env-vars.patch +++ b/mingw-w64-python/0095-distutils-get-compilers-from-env-vars.patch @@ -1,4 +1,4 @@ -From f9b12beb419ad00e81e27c73bf5a486f82b1cbd1 Mon Sep 17 00:00:00 2001 +From 90913ace64f9feecca9eebb6cb4289bd9d0e28d1 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Tue, 17 Aug 2021 20:26:05 +0700 Subject: [PATCH 095/N] distutils: get compilers from env vars @@ -157,5 +157,5 @@ index c134525..75bc17b 100644 + out_string = check_output([cc, '-dumpmachine']) return out_string.strip().endswith(b'cygwin') -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0096-distutils-add-windmc-to-cygwinccompiler.patch b/mingw-w64-python/0096-distutils-add-windmc-to-cygwinccompiler.patch index e08509b069..aa4db12a41 100644 --- a/mingw-w64-python/0096-distutils-add-windmc-to-cygwinccompiler.patch +++ b/mingw-w64-python/0096-distutils-add-windmc-to-cygwinccompiler.patch @@ -1,4 +1,4 @@ -From 17791791cd151a6a0abc94cbf85b3392af4d71d6 Mon Sep 17 00:00:00 2001 +From dadf18b11187a17dd53dc84bfad7a49aa48285cb Mon Sep 17 00:00:00 2001 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.36.1 +2.37.2 diff --git a/mingw-w64-python/0097-distutils-fix-msvc9-import.patch b/mingw-w64-python/0097-distutils-fix-msvc9-import.patch index 733f3b271e..8b88bb699c 100644 --- a/mingw-w64-python/0097-distutils-fix-msvc9-import.patch +++ b/mingw-w64-python/0097-distutils-fix-msvc9-import.patch @@ -1,4 +1,4 @@ -From a44ca94e59dd45e8b31b05efc0b448ed1789178f Mon Sep 17 00:00:00 2001 +From dd7dd4081d7cc5f2041be41fbf1c01edca3c53b3 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:24 +0530 Subject: [PATCH 097/N] distutils: fix msvc9 import @@ -34,5 +34,5 @@ index a7976fb..c341679 100644 self.__root = r"Software\Microsoft\VisualStudio" # self.__macros = MACROS -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0098-distutils-mingw-add-LIBPL-to-library-dirs.patch b/mingw-w64-python/0098-distutils-mingw-add-LIBPL-to-library-dirs.patch index 6f22f0357d..a0bac72ab1 100644 --- a/mingw-w64-python/0098-distutils-mingw-add-LIBPL-to-library-dirs.patch +++ b/mingw-w64-python/0098-distutils-mingw-add-LIBPL-to-library-dirs.patch @@ -1,4 +1,4 @@ -From 23ed352deaa1ee11c8546b72b61828565b5046ad Mon Sep 17 00:00:00 2001 +From f7e73918b56054ec45bf2927ec1739a223244370 Mon Sep 17 00:00:00 2001 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.36.1 +2.37.2 diff --git a/mingw-w64-python/0099-distutils-Change-the-get_platform-method-in-distutil.patch b/mingw-w64-python/0099-distutils-Change-the-get_platform-method-in-distutil.patch index 66bffd3521..b916297150 100644 --- a/mingw-w64-python/0099-distutils-Change-the-get_platform-method-in-distutil.patch +++ b/mingw-w64-python/0099-distutils-Change-the-get_platform-method-in-distutil.patch @@ -1,4 +1,4 @@ -From 20e2dc72d001e52ad61f2a949cba0bd2dd5d1b02 Mon Sep 17 00:00:00 2001 +From 28dc5435882db18ce22076ce5b1e9cb9fb105611 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:37:23 +0200 Subject: [PATCH 099/N] distutils: Change the `get_platform()` method in @@ -40,5 +40,5 @@ index ed9d509..28e623b 100644 return 'win-amd64' if '(arm)' in sys.version.lower(): -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0100-build-Fix-ncursesw-include-lookup.patch b/mingw-w64-python/0100-build-Fix-ncursesw-include-lookup.patch index e060688e31..f2779c0dae 100644 --- a/mingw-w64-python/0100-build-Fix-ncursesw-include-lookup.patch +++ b/mingw-w64-python/0100-build-Fix-ncursesw-include-lookup.patch @@ -1,4 +1,4 @@ -From 137e43ac721f9e97a0bf22a7dda2551e6f04375f Mon Sep 17 00:00:00 2001 +From b4164f4dc3c10e3b90f9a340c692debf1a21143b Mon Sep 17 00:00:00 2001 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 @@ -48,10 +48,10 @@ index 5d7148a..0fb6ae7 100644 AC_CHECK_HEADERS(curses.h ncurses.h) diff --git a/setup.py b/setup.py -index 859c96a..5706aa3 100644 +index d486529..900d78b 100644 --- a/setup.py +++ b/setup.py -@@ -1208,7 +1208,7 @@ class PyBuildExt(build_ext): +@@ -1207,7 +1207,7 @@ class PyBuildExt(build_ext): if curses_library == 'ncursesw': curses_defines.append(('HAVE_NCURSESW', '1')) if not CROSS_COMPILING: @@ -61,5 +61,5 @@ index 859c96a..5706aa3 100644 # _curses_panel.so must link with panelw. panel_library = 'panelw' -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0101-tests-fix-test_bytes.patch b/mingw-w64-python/0101-tests-fix-test_bytes.patch index 39b6cb0431..22a4a220dc 100644 --- a/mingw-w64-python/0101-tests-fix-test_bytes.patch +++ b/mingw-w64-python/0101-tests-fix-test_bytes.patch @@ -1,4 +1,4 @@ -From 0c8278933eae25a930654c4398264182d749c2df Mon Sep 17 00:00:00 2001 +From 6912c305d098faf62a1a452c9772cb5bc4c69289 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 23 Jul 2021 08:51:32 +0200 Subject: [PATCH 101/N] tests: fix test_bytes @@ -10,7 +10,7 @@ Change the test to the mingw-w64 variant. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py -index 13ad238..65181e0 100644 +index 72c5e18..b830c50 100644 --- a/Lib/test/test_bytes.py +++ b/Lib/test/test_bytes.py @@ -1075,7 +1075,7 @@ class BytesTest(BaseBytesTest, unittest.TestCase): @@ -23,5 +23,5 @@ index 13ad238..65181e0 100644 return (ptr_format % ptr) else: -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0102-time-fix-strftime-not-raising-for-invalid-year-value.patch b/mingw-w64-python/0102-time-fix-strftime-not-raising-for-invalid-year-value.patch index 1cf6e6515b..c57c0fc5f1 100644 --- a/mingw-w64-python/0102-time-fix-strftime-not-raising-for-invalid-year-value.patch +++ b/mingw-w64-python/0102-time-fix-strftime-not-raising-for-invalid-year-value.patch @@ -1,4 +1,4 @@ -From 49517de0ff27aff01a69aa61ebe495a7d641f017 Mon Sep 17 00:00:00 2001 +From 2e4291610645f7262379948aa9433b6b2eab86e1 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 23 Jul 2021 08:52:50 +0200 Subject: [PATCH 102/N] time: fix strftime not raising for invalid year @@ -24,5 +24,5 @@ index 4caacc3..4787fa3 100644 PyErr_SetString(PyExc_ValueError, "strftime() requires year in [1; 9999]"); -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0103-ctypes-find_library-c-should-return-None-with-ucrt.patch b/mingw-w64-python/0103-ctypes-find_library-c-should-return-None-with-ucrt.patch index 4895ab3750..f5129dff23 100644 --- a/mingw-w64-python/0103-ctypes-find_library-c-should-return-None-with-ucrt.patch +++ b/mingw-w64-python/0103-ctypes-find_library-c-should-return-None-with-ucrt.patch @@ -1,4 +1,4 @@ -From b0913c2cc014d02cbf0b22d9534609eb27e62d34 Mon Sep 17 00:00:00 2001 +From 069829aff0bb3b50dedca50c05cb27ffcf5bb4bb Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 23 Jul 2021 18:23:58 +0200 Subject: [PATCH 103/N] ctypes: find_library('c') should return None with @@ -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.36.1 +2.37.2 diff --git a/mingw-w64-python/0104-build-Disable-checks-for-dlopen-dlfcn.patch b/mingw-w64-python/0104-build-Disable-checks-for-dlopen-dlfcn.patch index 671828faa0..82bc8ea6c1 100644 --- a/mingw-w64-python/0104-build-Disable-checks-for-dlopen-dlfcn.patch +++ b/mingw-w64-python/0104-build-Disable-checks-for-dlopen-dlfcn.patch @@ -1,4 +1,4 @@ -From 252cf62ca82d33fc56a55360768316cb50507546 Mon Sep 17 00:00:00 2001 +From 66f99966d73301cc514713471d07a72b45f52b8b Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 13:54:12 +0200 Subject: [PATCH 104/N] build: Disable checks for dlopen/dlfcn @@ -62,5 +62,5 @@ index 0fb6ae7..2cee721 100644 # determine what size digit to use for Python's longs AC_MSG_CHECKING([digit size for Python's longs]) -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0105-Fix-install-location-of-the-import-library.patch b/mingw-w64-python/0105-Fix-install-location-of-the-import-library.patch index 5359240aad..0074119f38 100644 --- a/mingw-w64-python/0105-Fix-install-location-of-the-import-library.patch +++ b/mingw-w64-python/0105-Fix-install-location-of-the-import-library.patch @@ -1,4 +1,4 @@ -From f96d0a8139c908bccb9b9c3fe10cf9b18dada424 Mon Sep 17 00:00:00 2001 +From dc5053de2a6d6b067330875938b850f52e63fb89 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 15:46:01 +0200 Subject: [PATCH 105/N] Fix install location of the import library @@ -21,5 +21,5 @@ index 2b6ab0c..b71c4cc 100644 $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ fi; \ -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0106-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch b/mingw-w64-python/0106-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch index baa8a7cca1..dd888e14cc 100644 --- a/mingw-w64-python/0106-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch +++ b/mingw-w64-python/0106-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch @@ -1,4 +1,4 @@ -From fe53600f11b45b3cba204bd5a154a5b90c903bb0 Mon Sep 17 00:00:00 2001 +From 8d2a8a09794d66a3f7bc11bd17e5e7ced7d48c75 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 15:46:54 +0200 Subject: [PATCH 106/N] Set MSYS2_ARG_CONV_EXCL for the shared Python module @@ -22,5 +22,5 @@ index b71c4cc..3b623ba 100644 --prefix=$(prefix) \ --install-scripts=$(BINDIR) \ -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0107-build-Integrate-venvlauncher-build-installation-into.patch b/mingw-w64-python/0107-build-Integrate-venvlauncher-build-installation-into.patch index 8577545941..e89a69c897 100644 --- a/mingw-w64-python/0107-build-Integrate-venvlauncher-build-installation-into.patch +++ b/mingw-w64-python/0107-build-Integrate-venvlauncher-build-installation-into.patch @@ -1,4 +1,4 @@ -From 04a166aba10c54069ab33c5667a7834a580c7d24 Mon Sep 17 00:00:00 2001 +From 715629fe060ed5cdefb2ae687f5dd33878803caa Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 16:53:35 +0200 Subject: [PATCH 107/N] build: Integrate venvlauncher build/installation into @@ -75,5 +75,5 @@ index 3b623ba..6b1cfce 100644 $(INSTALL_PROGRAM) $(STRIPFLAG) Mac/pythonw $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \ fi -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0108-configure.ac-set-_WIN32_WINNT-version.patch b/mingw-w64-python/0108-configure.ac-set-_WIN32_WINNT-version.patch index 3704ef243d..eb27e0e158 100644 --- a/mingw-w64-python/0108-configure.ac-set-_WIN32_WINNT-version.patch +++ b/mingw-w64-python/0108-configure.ac-set-_WIN32_WINNT-version.patch @@ -1,4 +1,4 @@ -From cc9cabf86dc4c97c776fcfcf0bb31d02b5b7aef6 Mon Sep 17 00:00:00 2001 +From 8639571c48bd86e037a0c6a7c487b36f2dc4f1b2 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 1 Aug 2021 15:18:50 +0200 Subject: [PATCH 108/N] configure.ac: set _WIN32_WINNT version @@ -24,5 +24,5 @@ index 2cee721..2d7c11c 100644 AC_SUBST(USE_WIN32_MODULE) USE_WIN32_MODULE='#' -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0109-configure.ac-don-t-check-for-clock_-functions.patch b/mingw-w64-python/0109-configure.ac-don-t-check-for-clock_-functions.patch index 1084735d2e..7c4764da1b 100644 --- a/mingw-w64-python/0109-configure.ac-don-t-check-for-clock_-functions.patch +++ b/mingw-w64-python/0109-configure.ac-don-t-check-for-clock_-functions.patch @@ -1,4 +1,4 @@ -From ae94a40f9799969b8c16f9b28dab91b5b7727b0e Mon Sep 17 00:00:00 2001 +From 983cf53dc5de1e882a5a59fd2a674a39466793be Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 1 Aug 2021 18:35:17 +0200 Subject: [PATCH 109/N] configure.ac: don't check for clock_ functions @@ -32,5 +32,5 @@ index 2d7c11c..c5fe816 100644 AC_MSG_CHECKING(for major, minor, and makedev) AC_LINK_IFELSE([AC_LANG_PROGRAM([[ -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0110-expanduser-normpath-paths-coming-from-env-vars.patch b/mingw-w64-python/0110-expanduser-normpath-paths-coming-from-env-vars.patch index 350cd0b3a9..b73300300c 100644 --- a/mingw-w64-python/0110-expanduser-normpath-paths-coming-from-env-vars.patch +++ b/mingw-w64-python/0110-expanduser-normpath-paths-coming-from-env-vars.patch @@ -1,4 +1,4 @@ -From a2ee2df6a27a8188b615fc1373bdf98d362aaa51 Mon Sep 17 00:00:00 2001 +From bfdc5472c4fab2147fa07f0d98fa190eb899e662 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 8 Aug 2021 10:17:35 +0200 Subject: [PATCH 110/N] expanduser: normpath paths coming from env vars @@ -9,10 +9,10 @@ This makes sure we get the same paths as with related functions in pathlib. 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/ntpath.py b/Lib/ntpath.py -index 1f1b441..0ecde0c 100644 +index 9a404ab..5f6fad4 100644 --- a/Lib/ntpath.py +++ b/Lib/ntpath.py -@@ -319,7 +319,7 @@ def expanduser(path): +@@ -344,7 +344,7 @@ def expanduser(path): if 'USERPROFILE' in os.environ: userhome = os.environ['USERPROFILE'] elif not 'HOMEPATH' in os.environ: @@ -21,7 +21,7 @@ index 1f1b441..0ecde0c 100644 else: try: drive = os.environ['HOMEDRIVE'] -@@ -346,7 +346,7 @@ def expanduser(path): +@@ -371,7 +371,7 @@ def expanduser(path): if isinstance(path, bytes): userhome = os.fsencode(userhome) @@ -31,5 +31,5 @@ index 1f1b441..0ecde0c 100644 # Expand paths containing shell variable substitutions. -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0111-Add-support-for-Windows-7-Python-3.10.patch b/mingw-w64-python/0111-Add-support-for-Windows-7-Python-3.10.patch index 57dcb1d78b..106ac856a9 100644 --- a/mingw-w64-python/0111-Add-support-for-Windows-7-Python-3.10.patch +++ b/mingw-w64-python/0111-Add-support-for-Windows-7-Python-3.10.patch @@ -1,4 +1,4 @@ -From d03b552eb4133e77c7e7cc09a1825602b87932e7 Mon Sep 17 00:00:00 2001 +From 519b51d6f5dacf5e348ffd579b8460fdcbed3f08 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Thu, 17 Jun 2021 18:52:39 +0530 Subject: [PATCH 111/N] Add support for Windows 7 Python 3.10 @@ -11,7 +11,7 @@ Co-authored-by: Naveen M K 3 files changed, 69 insertions(+), 13 deletions(-) diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 7cb99be..ff82a53 100644 +index 25b7c01..73fcb17 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -20,7 +20,7 @@ @@ -174,5 +174,5 @@ index c5fe816..f3dcc1c 100644 if test "$AWK" = "gawk"; then awk_extra_flag="--non-decimal-data" -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0112-CI-test-the-build-and-add-some-mingw-specific-tests.patch b/mingw-w64-python/0112-CI-test-the-build-and-add-some-mingw-specific-tests.patch index eaa6d508be..f87cc55ce9 100644 --- a/mingw-w64-python/0112-CI-test-the-build-and-add-some-mingw-specific-tests.patch +++ b/mingw-w64-python/0112-CI-test-the-build-and-add-some-mingw-specific-tests.patch @@ -1,4 +1,4 @@ -From fd73bff6ae48781e12ebb0050928120374cb708c Mon Sep 17 00:00:00 2001 +From f9bec1534b76964c123efd0b5472c458c61cde74 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 18 Jun 2021 17:51:59 +0530 Subject: [PATCH 112/N] CI: test the build and add some mingw specific tests @@ -585,5 +585,5 @@ index 0000000..70acbd1 +if __name__ == '__main__': + unittest.main(defaultTest='suite') -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0113-smoketests-test-that-_decimal-exists.patch b/mingw-w64-python/0113-smoketests-test-that-_decimal-exists.patch index fd759b393d..fc40767ea6 100644 --- a/mingw-w64-python/0113-smoketests-test-that-_decimal-exists.patch +++ b/mingw-w64-python/0113-smoketests-test-that-_decimal-exists.patch @@ -1,4 +1,4 @@ -From 6c59f274bc48e1c41392cad7486323b975f73fbc Mon Sep 17 00:00:00 2001 +From c7cfa075c5a8dfaf81084012bbd3171bb1d2a408 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 23 Sep 2021 09:57:56 +0200 Subject: [PATCH 113/N] smoketests: test that _decimal exists @@ -22,5 +22,5 @@ index 70acbd1..527aafb 100644 import socket self.assertTrue(hasattr(socket, "inet_ntop")) -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0114-Prefer-sysconfig.python_build.patch b/mingw-w64-python/0114-Prefer-sysconfig.python_build.patch index d2bc6e7d91..5e9375a44d 100644 --- a/mingw-w64-python/0114-Prefer-sysconfig.python_build.patch +++ b/mingw-w64-python/0114-Prefer-sysconfig.python_build.patch @@ -1,4 +1,4 @@ -From ed7cc4ffa2cc01f72e21ad84e52f6f2ddef6a9cb Mon Sep 17 00:00:00 2001 +From f3b09a5c22121e46ca0b468952b27fd7d112bf9e Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Fri, 1 Oct 2021 07:28:36 +0700 Subject: [PATCH 114/N] Prefer sysconfig.python_build @@ -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.36.1 +2.37.2 diff --git a/mingw-w64-python/0115-Define-PY3_DLLNAME-to-fix-build.patch b/mingw-w64-python/0115-Define-PY3_DLLNAME-to-fix-build.patch index 48b26630fe..7a6596f0bc 100644 --- a/mingw-w64-python/0115-Define-PY3_DLLNAME-to-fix-build.patch +++ b/mingw-w64-python/0115-Define-PY3_DLLNAME-to-fix-build.patch @@ -1,4 +1,4 @@ -From b162db6ea52cbaf08b729e26c864d19d32d6463a Mon Sep 17 00:00:00 2001 +From 6b0af243df386ce10af28798e7e343db19dddd39 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Tue, 12 Oct 2021 18:35:21 +0530 Subject: [PATCH 115/N] Define PY3_DLLNAME to fix build @@ -25,5 +25,5 @@ index f3dcc1c..a26cc03 100644 esac fi -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0116-distutils-remove-checks-for-ancient-gcc-binutils.patch b/mingw-w64-python/0116-distutils-remove-checks-for-ancient-gcc-binutils.patch index b542acf188..cec5fe608f 100644 --- a/mingw-w64-python/0116-distutils-remove-checks-for-ancient-gcc-binutils.patch +++ b/mingw-w64-python/0116-distutils-remove-checks-for-ancient-gcc-binutils.patch @@ -1,4 +1,4 @@ -From 561f958d241cad371cce1d03f6269c80f969d462 Mon Sep 17 00:00:00 2001 +From 1b569de6a1698dc242f0c9d3402fd90ef68e9069 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 7 Nov 2021 23:06:13 +0100 Subject: [PATCH 116/N] distutils: remove checks for ancient gcc/binutils @@ -256,5 +256,5 @@ index 9dc869d..f525ab4 100644 # none -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0117-distutils-split-CC-env-var-before-passing-to-subproc.patch b/mingw-w64-python/0117-distutils-split-CC-env-var-before-passing-to-subproc.patch index 096c5240e9..136b68769a 100644 --- a/mingw-w64-python/0117-distutils-split-CC-env-var-before-passing-to-subproc.patch +++ b/mingw-w64-python/0117-distutils-split-CC-env-var-before-passing-to-subproc.patch @@ -1,4 +1,4 @@ -From 5a85f6dc5e32eb4ea0282705275fb4b586a087de Mon Sep 17 00:00:00 2001 +From 67ee5035ae816110c314aad018d7c8882b4e50cb Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 7 Nov 2021 23:12:10 +0100 Subject: [PATCH 117/N] distutils: split CC env var before passing to @@ -32,5 +32,5 @@ index 2804f69..6e22555 100644 + out_string = check_output(shlex.split(cc) + ['-dumpmachine']) return out_string.strip().endswith(b'cygwin') -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0118-_testconsole.c-Fix-casing-path-sep.patch b/mingw-w64-python/0118-_testconsole.c-Fix-casing-path-sep.patch index 3ceed9bbea..d996c59f34 100644 --- a/mingw-w64-python/0118-_testconsole.c-Fix-casing-path-sep.patch +++ b/mingw-w64-python/0118-_testconsole.c-Fix-casing-path-sep.patch @@ -1,4 +1,4 @@ -From d4e4cae407257db9ac662c820a2686d0606bd1a3 Mon Sep 17 00:00:00 2001 +From d1bac03e4f476f6f1f0c2df780c62da75804ff42 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Sun, 14 Nov 2021 14:55:35 +0700 Subject: [PATCH 118/N] _testconsole.c: Fix casing & path sep @@ -30,5 +30,5 @@ index db84f73..eecf2f9 100644 PyMethodDef testconsole_methods[] = { _TESTCONSOLE_WRITE_INPUT_METHODDEF -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0119-Return-consistent-architecture-markers-for-python-on.patch b/mingw-w64-python/0119-Return-consistent-architecture-markers-for-python-on.patch index 87edc33fad..d144c55d22 100644 --- a/mingw-w64-python/0119-Return-consistent-architecture-markers-for-python-on.patch +++ b/mingw-w64-python/0119-Return-consistent-architecture-markers-for-python-on.patch @@ -1,4 +1,4 @@ -From bdcc2fe1a821c741a04e372975009ebea43496ea Mon Sep 17 00:00:00 2001 +From 6ce5f4b8851474503778a5b256a7fd090dc2ab51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Fri, 19 Nov 2021 12:18:06 +0200 Subject: [PATCH 119/N] Return consistent architecture markers for python on @@ -65,5 +65,5 @@ index a26cc03..53c6179 100644 AC_MSG_RESULT($PYD_PLATFORM_TAG) esac -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0120-distutils-add-back-gcc_version.patch b/mingw-w64-python/0120-distutils-add-back-gcc_version.patch index f31181279e..1526749c0e 100644 --- a/mingw-w64-python/0120-distutils-add-back-gcc_version.patch +++ b/mingw-w64-python/0120-distutils-add-back-gcc_version.patch @@ -1,4 +1,4 @@ -From 80c41b352ce0da99d1d8f0f6720f028fc01748c4 Mon Sep 17 00:00:00 2001 +From e03b44c1d700e9ec10209ace3462623761cba01c Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 21 Nov 2021 14:00:06 +0100 Subject: [PATCH 120/N] distutils: add back gcc_version @@ -34,5 +34,5 @@ index 6e22555..d8c8428 100644 shared_option = "-shared" -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0121-fix-mingw-cross-compiling-in-setup.py.patch b/mingw-w64-python/0121-fix-mingw-cross-compiling-in-setup.py.patch index 8cad5ad19a..c543f836be 100644 --- a/mingw-w64-python/0121-fix-mingw-cross-compiling-in-setup.py.patch +++ b/mingw-w64-python/0121-fix-mingw-cross-compiling-in-setup.py.patch @@ -1,4 +1,4 @@ -From 28ef8ea33c400fdf811e1cca4a51694aefcedaa7 Mon Sep 17 00:00:00 2001 +From da59acca6a05b84e6b09baf1ff3089c8fe8d7d5c Mon Sep 17 00:00:00 2001 From: jeremyd2019 Date: Mon, 22 Nov 2021 13:15:12 -0800 Subject: [PATCH 121/N] fix mingw cross compiling in setup.py @@ -11,10 +11,10 @@ clang does not output `LIBRARY_PATH` with `-E -v`, so add an extra call to `-pri 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py -index 5706aa3..c86ed36 100644 +index 900d78b..6835de5 100644 --- a/setup.py +++ b/setup.py -@@ -790,14 +790,25 @@ class PyBuildExt(build_ext): +@@ -789,14 +789,25 @@ class PyBuildExt(build_ext): elif line.startswith("End of search list"): in_incdirs = False elif (is_gcc or is_clang) and line.startswith("LIBRARY_PATH"): @@ -43,5 +43,5 @@ index 5706aa3..c86ed36 100644 os.unlink(tmpfile) -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0122-Use-actions-setup-python-for-setting-up-correct-vers.patch b/mingw-w64-python/0122-Use-actions-setup-python-for-setting-up-correct-vers.patch index ee2f4601f0..8fedb37a0f 100644 --- a/mingw-w64-python/0122-Use-actions-setup-python-for-setting-up-correct-vers.patch +++ b/mingw-w64-python/0122-Use-actions-setup-python-for-setting-up-correct-vers.patch @@ -1,4 +1,4 @@ -From 741eb57d3cefa35fa5f8fb34697a24955a4872e9 Mon Sep 17 00:00:00 2001 +From 51e994c5829043bf8d9ab321bfcbef437d42293a Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 21 Jan 2022 19:25:44 +0530 Subject: [PATCH 122/N] Use actions/setup-python for setting up correct @@ -34,5 +34,5 @@ index 122ac03..7170818 100644 - name: Build run: | -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0123-handle-ncursesw-pkg-config-when-cross-compiling.patch b/mingw-w64-python/0123-handle-ncursesw-pkg-config-when-cross-compiling.patch index 44fe600346..4b66a5cf86 100644 --- a/mingw-w64-python/0123-handle-ncursesw-pkg-config-when-cross-compiling.patch +++ b/mingw-w64-python/0123-handle-ncursesw-pkg-config-when-cross-compiling.patch @@ -1,4 +1,4 @@ -From 60f388a3d15e7357901d72615eb529cc2648b7d3 Mon Sep 17 00:00:00 2001 +From 04702042beda1bb51a9f80ab24a6153247aa024a Mon Sep 17 00:00:00 2001 From: jeremyd2019 Date: Mon, 22 Nov 2021 16:04:41 -0800 Subject: [PATCH 123/N] handle ncursesw pkg-config when cross-compiling @@ -45,10 +45,10 @@ index 53c6179..d48d9f7 100644 AC_CHECK_HEADERS(curses.h ncurses.h) diff --git a/setup.py b/setup.py -index c86ed36..9ce0489 100644 +index 6835de5..1973c7d 100644 --- a/setup.py +++ b/setup.py -@@ -1218,8 +1218,7 @@ class PyBuildExt(build_ext): +@@ -1217,8 +1217,7 @@ class PyBuildExt(build_ext): panel_library = 'panel' if curses_library == 'ncursesw': curses_defines.append(('HAVE_NCURSESW', '1')) @@ -59,5 +59,5 @@ index c86ed36..9ce0489 100644 # _curses_panel.so must link with panelw. panel_library = 'panelw' -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0124-CI-add-cross-llvm-mingw-jobs.patch b/mingw-w64-python/0124-CI-add-cross-llvm-mingw-jobs.patch index fecdff6ff2..ca35005292 100644 --- a/mingw-w64-python/0124-CI-add-cross-llvm-mingw-jobs.patch +++ b/mingw-w64-python/0124-CI-add-cross-llvm-mingw-jobs.patch @@ -1,4 +1,4 @@ -From b903845ab871064fa89c42ecfc7c867d086af30a Mon Sep 17 00:00:00 2001 +From 022937c9ec06c9875d29a50b92a466c5eed3645d Mon Sep 17 00:00:00 2001 From: Jeremy Drake Date: Fri, 21 Jan 2022 17:47:04 -0800 Subject: [PATCH 124/N] CI: add cross llvm-mingw jobs @@ -119,5 +119,5 @@ index 7170818..5b75c43 100644 + + -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0125-Skip-building-c-extensions-if-python-is-running-in-b.patch b/mingw-w64-python/0125-Skip-building-c-extensions-if-python-is-running-in-b.patch deleted file mode 100644 index 7d62d92e3f..0000000000 --- a/mingw-w64-python/0125-Skip-building-c-extensions-if-python-is-running-in-b.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 77c1c9340da9fe43e744cc4e9f42ec98c6d278f0 Mon Sep 17 00:00:00 2001 -From: Naveen M K -Date: Fri, 21 Jan 2022 20:50:25 +0530 -Subject: [PATCH 125/N] Skip building c-extensions if python is running in - build tree - ---- - mingw_smoketests.py | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/mingw_smoketests.py b/mingw_smoketests.py -index 527aafb..2c5e2a0 100644 ---- a/mingw_smoketests.py -+++ b/mingw_smoketests.py -@@ -226,6 +226,13 @@ class Tests(unittest.TestCase): - import textwrap - from pathlib import Path - -+ if sysconfig.is_python_build(): -+ # we are running this test without installing and is known -+ # to cause errors with building c-extensions -+ # so we are skipping this test -+ raise unittest.SkipTest("Skipping test as building c-extension isn't supported \ -+ without installing python") -+ - with tempfile.TemporaryDirectory() as tmppro: - subprocess.check_call([sys.executable, "-m", "ensurepip", "--user"]) - with Path(tmppro, "setup.py").open("w") as f: --- -2.36.1 - diff --git a/mingw-w64-python/0126-mingw_smoketests-fix-_UCRT-condition.patch b/mingw-w64-python/0125-mingw_smoketests-fix-_UCRT-condition.patch similarity index 81% rename from mingw-w64-python/0126-mingw_smoketests-fix-_UCRT-condition.patch rename to mingw-w64-python/0125-mingw_smoketests-fix-_UCRT-condition.patch index c19bbfd9e1..847c1109b0 100644 --- a/mingw-w64-python/0126-mingw_smoketests-fix-_UCRT-condition.patch +++ b/mingw-w64-python/0125-mingw_smoketests-fix-_UCRT-condition.patch @@ -1,7 +1,7 @@ -From 3e5e19eeab6c3440ce89ba07e8d791d920b40f41 Mon Sep 17 00:00:00 2001 +From d2dbc4308b774c5c571cbd23ba60aca438efe43d Mon Sep 17 00:00:00 2001 From: jeremyd2019 Date: Sat, 22 Jan 2022 11:33:00 -0800 -Subject: [PATCH 126/N] mingw_smoketests: fix _UCRT condition +Subject: [PATCH 125/N] mingw_smoketests: fix _UCRT condition The prior detection missed ARM (32 and 64) being UCRT. Since there are fewer non-UCRT platforms, list those two instead of trying to extend the list of UCRT. --- @@ -9,7 +9,7 @@ The prior detection missed ARM (32 and 64) being UCRT. Since there are fewer no 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw_smoketests.py b/mingw_smoketests.py -index 2c5e2a0..15356fd 100644 +index 527aafb..a3e50f9 100644 --- a/mingw_smoketests.py +++ b/mingw_smoketests.py @@ -34,7 +34,7 @@ if "MSYSTEM" in os.environ: @@ -22,5 +22,5 @@ index 2c5e2a0..15356fd 100644 class Tests(unittest.TestCase): -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0127-CI-fix-sed-pattern-for-python-config.py-shebang.patch b/mingw-w64-python/0126-CI-fix-sed-pattern-for-python-config.py-shebang.patch similarity index 90% rename from mingw-w64-python/0127-CI-fix-sed-pattern-for-python-config.py-shebang.patch rename to mingw-w64-python/0126-CI-fix-sed-pattern-for-python-config.py-shebang.patch index 3ff98b73fe..09295d2ad5 100644 --- a/mingw-w64-python/0127-CI-fix-sed-pattern-for-python-config.py-shebang.patch +++ b/mingw-w64-python/0126-CI-fix-sed-pattern-for-python-config.py-shebang.patch @@ -1,7 +1,7 @@ -From 52842e297c31941322f072384e9034dcc3802687 Mon Sep 17 00:00:00 2001 +From 67147e582a4b793e1fc64bf88af2799c36fdc669 Mon Sep 17 00:00:00 2001 From: jeremyd2019 Date: Sat, 22 Jan 2022 12:08:33 -0800 -Subject: [PATCH 127/N] CI: fix sed pattern for python-config.py shebang +Subject: [PATCH 126/N] CI: fix sed pattern for python-config.py shebang The shebang (`#!`) does not include `${pkgdir}` so this sed did nothing --- @@ -22,5 +22,5 @@ index 5b75c43..999ccf9 100644 # Create version-less aliases cp "${pkgdir}${MINGW_PREFIX}"/bin/python3.exe "${pkgdir}${MINGW_PREFIX}"/bin/python.exe -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0128-Modify-sys.winver-to-match-upstream.patch b/mingw-w64-python/0127-Modify-sys.winver-to-match-upstream.patch similarity index 94% rename from mingw-w64-python/0128-Modify-sys.winver-to-match-upstream.patch rename to mingw-w64-python/0127-Modify-sys.winver-to-match-upstream.patch index 118d0c2e85..f78a0b4a77 100644 --- a/mingw-w64-python/0128-Modify-sys.winver-to-match-upstream.patch +++ b/mingw-w64-python/0127-Modify-sys.winver-to-match-upstream.patch @@ -1,7 +1,7 @@ -From 1669b23d9f7c67a7aa9d9467370fe9edec32918a Mon Sep 17 00:00:00 2001 +From c94aa291e05f84d406bb33b569cfb0d0836bf6f8 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Wed, 19 Jan 2022 19:39:20 +0530 -Subject: [PATCH 128/N] Modify `sys.winver` to match upstream +Subject: [PATCH 127/N] Modify `sys.winver` to match upstream With this change `sys.winver` will add the Arch for which python was compiled on, for example in 32-bits, `sys.winver` @@ -48,7 +48,7 @@ index d48d9f7..a11d3e9 100644 fi AC_MSG_RESULT($DYNLOADFILE) diff --git a/mingw_smoketests.py b/mingw_smoketests.py -index 15356fd..8e4bd50 100644 +index a3e50f9..4f17e16 100644 --- a/mingw_smoketests.py +++ b/mingw_smoketests.py @@ -214,7 +214,14 @@ class Tests(unittest.TestCase): @@ -68,5 +68,5 @@ index 15356fd..8e4bd50 100644 self.assertEqual(platform.system(), "Windows") self.assertTrue(isinstance(sys.api_version, int) and sys.api_version > 0) -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0129-Change-user-site-packages-path-to-include-the-enviro.patch b/mingw-w64-python/0128-Change-user-site-packages-path-to-include-the-enviro.patch similarity index 98% rename from mingw-w64-python/0129-Change-user-site-packages-path-to-include-the-enviro.patch rename to mingw-w64-python/0128-Change-user-site-packages-path-to-include-the-enviro.patch index 4a66840f87..4b4ba8bef2 100644 --- a/mingw-w64-python/0129-Change-user-site-packages-path-to-include-the-enviro.patch +++ b/mingw-w64-python/0128-Change-user-site-packages-path-to-include-the-enviro.patch @@ -1,7 +1,7 @@ -From a90841d86da5e055295b836527f02e1a83e7bad0 Mon Sep 17 00:00:00 2001 +From 6e33198ea26908ee43b94a5a551019f55c5bc288 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Wed, 19 Jan 2022 20:01:45 +0530 -Subject: [PATCH 129/N] Change user site-packages path to include the +Subject: [PATCH 128/N] Change user site-packages path to include the environment info This should avoid mixing of user site-packages between python @@ -149,5 +149,5 @@ index a44efe0..9e1df5d 100644 """Return a string that identifies the current platform. -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0136-configure-Include-a-header-in-the-check-for-_beginth.patch b/mingw-w64-python/0129-configure-Include-a-header-in-the-check-for-_beginth.patch similarity index 89% rename from mingw-w64-python/0136-configure-Include-a-header-in-the-check-for-_beginth.patch rename to mingw-w64-python/0129-configure-Include-a-header-in-the-check-for-_beginth.patch index 45f400d78c..195caab871 100644 --- a/mingw-w64-python/0136-configure-Include-a-header-in-the-check-for-_beginth.patch +++ b/mingw-w64-python/0129-configure-Include-a-header-in-the-check-for-_beginth.patch @@ -1,7 +1,7 @@ -From 0a102ba8616fe01c7e0fc644b76455ecb405280a Mon Sep 17 00:00:00 2001 +From 6ddcfddca0a614545f3465022a73453a52b17b7f 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 136/N] configure: Include a header in the check for +Subject: [PATCH 129/N] configure: Include a header in the check for _beginthread Previously, the test tried compiling a call to the @@ -32,5 +32,5 @@ index a11d3e9..ba35f32 100644 [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([failed to link with nt-threads])]) -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0130-Build-venvlauncher.exe-from-PC-launcher.c.patch b/mingw-w64-python/0130-Build-venvlauncher.exe-from-PC-launcher.c.patch deleted file mode 100644 index 624ccbab95..0000000000 --- a/mingw-w64-python/0130-Build-venvlauncher.exe-from-PC-launcher.c.patch +++ /dev/null @@ -1,99 +0,0 @@ -From e2da91afbf121b680bed7d66911819a53552ef90 Mon Sep 17 00:00:00 2001 -From: Naveen M K -Date: Sat, 29 Jan 2022 17:39:19 +0530 -Subject: [PATCH 130/N] Build venvlauncher.exe from PC/launcher.c - -Also, fix warnings in PC/pylauncher.rc ---- - Makefile.pre.in | 21 +++++++++++++-------- - PC/pylauncher.rc | 20 ++++++++++---------- - 2 files changed, 23 insertions(+), 18 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 6b1cfce..ea3481b 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -609,6 +609,12 @@ pythonw_exe.o: $(srcdir)/PC/pythonw_exe.rc - python_nt.o: $(srcdir)/PC/python_nt.rc - $(WINDRES) $(RCFLAGS) -DORIGINAL_FILENAME=\\\"$(DLLLIBRARY)\\\" -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/python_nt.rc $@ - -+venvlauncher.o: $(srcdir)/PC/pylauncher.rc -+ $(WINDRES) $(RCFLAGS) -DPY_ICON -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/pylauncher.rc $@ -+ -+venvwlauncher.o: $(srcdir)/PC/pylauncher.rc -+ $(WINDRES) $(RCFLAGS) -DPYW_ICON -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/pylauncher.rc $@ -+ - $(BUILDPYTHONW): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) pythonw_exe.o - $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -municode -mwindows -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) pythonw_exe.o - -@@ -616,13 +622,12 @@ $(BUILDPYTHONW): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) pythonw - $(BUILDPYTHON): Programs/python.o $(LIBRARY_DEPS) python_exe.o - $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -municode -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) python_exe.o - --# FIXME: build these from PC/launcher.c instead --$(BUILDVENVLAUNCHER): $(BUILDPYTHON) -- cp $(BUILDPYTHON) $(BUILDVENVLAUNCHER) -+$(BUILDVENVLAUNCHER): $(BUILDPYTHON) venvlauncher.o $(srcdir)/PC/launcher.c -+ $(LINKCC) -D_CONSOLE -DVENV_REDIRECT -municode -static -static-libgcc -static-libstdc++ venvlauncher.o $(srcdir)/PC/launcher.c -o $@ -lversion -+ -+$(BUILDVENVWLAUNCHER): $(BUILDPYTHONW) venvwlauncher.o $(srcdir)/PC/launcher.c -+ $(LINKCC) -D_WINDOWS -DVENV_REDIRECT -mwindows -municode -static -static-libgcc -static-libstdc++ venvwlauncher.o $(srcdir)/PC/launcher.c -o $@ -lversion - --# FIXME: build these from PC/launcher.c instead --$(BUILDVENVWLAUNCHER): $(BUILDPYTHONW) -- cp $(BUILDPYTHONW) $(BUILDVENVWLAUNCHER) - - platform: $(BUILDPYTHON) pybuilddir.txt - $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print("%s-%d.%d" % (get_platform(), *sys.version_info[:2]))' >platform -@@ -1368,8 +1373,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@ - if test "$(PYTHONFRAMEWORKDIR)" = "no-framework" ; then \ - $(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \ - $(INSTALL_PROGRAM) $(BUILDPYTHONW) $(DESTDIR)$(BINDIR)/python3w$(EXE); \ -- $(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(VENVLAUNCHERDIR)/python$(EXE); \ -- $(INSTALL_PROGRAM) $(BUILDPYTHONW) $(DESTDIR)$(VENVLAUNCHERDIR)/pythonw$(EXE); \ -+ $(INSTALL_PROGRAM) $(BUILDVENVLAUNCHER) $(DESTDIR)$(VENVLAUNCHERDIR)/python$(EXE); \ -+ $(INSTALL_PROGRAM) $(BUILDVENVWLAUNCHER) $(DESTDIR)$(VENVLAUNCHERDIR)/pythonw$(EXE); \ - else \ - $(INSTALL_PROGRAM) $(STRIPFLAG) Mac/pythonw $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \ - fi -diff --git a/PC/pylauncher.rc b/PC/pylauncher.rc -index ff7e71e..5716bf4 100644 ---- a/PC/pylauncher.rc -+++ b/PC/pylauncher.rc -@@ -12,17 +12,17 @@ - 1 RT_MANIFEST "python.manifest" - - #if defined(PY_ICON) --1 ICON DISCARDABLE "icons\python.ico" -+1 ICON DISCARDABLE "icons/python.ico" - #elif defined(PYW_ICON) --1 ICON DISCARDABLE "icons\pythonw.ico" -+1 ICON DISCARDABLE "icons/pythonw.ico" - #else --1 ICON DISCARDABLE "icons\launcher.ico" --2 ICON DISCARDABLE "icons\py.ico" --3 ICON DISCARDABLE "icons\pyc.ico" --4 ICON DISCARDABLE "icons\pyd.ico" --5 ICON DISCARDABLE "icons\python.ico" --6 ICON DISCARDABLE "icons\pythonw.ico" --7 ICON DISCARDABLE "icons\setup.ico" -+1 ICON DISCARDABLE "icons/launcher.ico" -+2 ICON DISCARDABLE "icons/py.ico" -+3 ICON DISCARDABLE "icons/pyc.ico" -+4 ICON DISCARDABLE "icons/pyd.ico" -+5 ICON DISCARDABLE "icons/python.ico" -+6 ICON DISCARDABLE "icons/pythonw.ico" -+7 ICON DISCARDABLE "icons/setup.ico" - #endif - - ///////////////////////////////////////////////////////////////////////////// -@@ -61,4 +61,4 @@ BEGIN - BEGIN - VALUE "Translation", 0x0, 1200 - END --END -\ No newline at end of file -+END --- -2.36.1 - diff --git a/mingw-w64-python/0137-configure.ac-Default-to-without-c-locale-coercion-on.patch b/mingw-w64-python/0130-configure.ac-Default-to-without-c-locale-coercion-on.patch similarity index 89% rename from mingw-w64-python/0137-configure.ac-Default-to-without-c-locale-coercion-on.patch rename to mingw-w64-python/0130-configure.ac-Default-to-without-c-locale-coercion-on.patch index dd83f9c231..344242aba0 100644 --- a/mingw-w64-python/0137-configure.ac-Default-to-without-c-locale-coercion-on.patch +++ b/mingw-w64-python/0130-configure.ac-Default-to-without-c-locale-coercion-on.patch @@ -1,7 +1,7 @@ -From 86981ba54cc0be7031c1ea042a7d9a06783b9f16 Mon Sep 17 00:00:00 2001 +From af587aa2b04e2db9e984ee17f4f0d7ae53ce08e5 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 22 Apr 2022 17:31:19 +0200 -Subject: [PATCH 137/N] configure.ac: Default to --without-c-locale-coercion +Subject: [PATCH 130/N] configure.ac: Default to --without-c-locale-coercion on Windows --with-c-locale-coercion otherwise defaults to yes and enables code @@ -36,5 +36,5 @@ index ba35f32..eb1555b 100644 if test "$with_c_locale_coercion" != "no" then -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0138-CI-remove-without-c-locale-coercion.patch b/mingw-w64-python/0131-CI-remove-without-c-locale-coercion.patch similarity index 87% rename from mingw-w64-python/0138-CI-remove-without-c-locale-coercion.patch rename to mingw-w64-python/0131-CI-remove-without-c-locale-coercion.patch index 1ac429fc9c..e3b3b4aad3 100644 --- a/mingw-w64-python/0138-CI-remove-without-c-locale-coercion.patch +++ b/mingw-w64-python/0131-CI-remove-without-c-locale-coercion.patch @@ -1,7 +1,7 @@ -From d21d27260b98325fc5592116f50355a9a5391e3f Mon Sep 17 00:00:00 2001 +From b9553867bd588636da197b8e0ba2556d0bfa6944 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 22 Apr 2022 17:37:23 +0200 -Subject: [PATCH 138/N] CI: remove --without-c-locale-coercion +Subject: [PATCH 131/N] CI: remove --without-c-locale-coercion No longer needed since the default now works on Windows --- @@ -29,5 +29,5 @@ index 999ccf9..40b1d5e 100644 make -j8 -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0131-PC-launcher.c-Use-function-available-in-original-msv.patch b/mingw-w64-python/0131-PC-launcher.c-Use-function-available-in-original-msv.patch deleted file mode 100644 index ba6406db0d..0000000000 --- a/mingw-w64-python/0131-PC-launcher.c-Use-function-available-in-original-msv.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 39617bb9006502c089e49003489acdf397ba67dd Mon Sep 17 00:00:00 2001 -From: Naveen M K -Date: Tue, 8 Mar 2022 21:27:36 +0530 -Subject: [PATCH 131/N] PC/launcher.c: Use function available in original - msvcrt.dll - -_wdupenv_s -> _wgetenv_s -fread_s -> fread ---- - PC/launcher.c | 30 +++++++++++++++++------------- - 1 file changed, 17 insertions(+), 13 deletions(-) - -diff --git a/PC/launcher.c b/PC/launcher.c -index 734e753..b8dea55 100644 ---- a/PC/launcher.c -+++ b/PC/launcher.c -@@ -925,7 +925,7 @@ static COMMAND path_command; - static COMMAND * find_on_path(wchar_t * name) - { - wchar_t * pathext; -- size_t varsize; -+ size_t requiredSize; - wchar_t * context = NULL; - wchar_t * extension; - COMMAND * result = NULL; -@@ -941,19 +941,23 @@ static COMMAND * find_on_path(wchar_t * name) - } - } - else { -- /* No extension - search using registered extensions. */ -- rc = _wdupenv_s(&pathext, &varsize, L"PATHEXT"); -- if (rc == 0) { -- extension = wcstok_s(pathext, L";", &context); -- while (extension) { -- len = SearchPathW(NULL, name, extension, MSGSIZE, path_command.value, NULL); -- if (len) { -- result = &path_command; -- break; -+ _wgetenv_s(&requiredSize, NULL, 0, L"PATHEXT"); -+ if (requiredSize > 0) { -+ pathext = (wchar_t *)malloc(requiredSize * sizeof(wchar_t)); -+ /* No extension - search using registered extensions. */ -+ rc = _wgetenv_s(&requiredSize, pathext, requiredSize, L"PATHEXT"); -+ if (rc == 0) { -+ extension = wcstok_s(pathext, L";", &context); -+ while (extension) { -+ len = SearchPathW(NULL, name, extension, MSGSIZE, path_command.value, NULL); -+ if (len) { -+ result = &path_command; -+ break; -+ } -+ extension = wcstok_s(NULL, L";", &context); - } -- extension = wcstok_s(NULL, L";", &context); -+ free(pathext); - } -- free(pathext); - } - } - return result; -@@ -1910,7 +1914,7 @@ process(int argc, wchar_t ** argv) - if (_wfopen_s(&f, venv_cfg_path, L"r")) { - error(RC_BAD_VENV_CFG, L"Cannot read '%ls'", venv_cfg_path); - } -- cb = fread_s(buffer, sizeof(buffer), sizeof(buffer[0]), -+ cb = fread(buffer, sizeof(buffer[0]), - sizeof(buffer) / sizeof(buffer[0]), f); - fclose(f); - --- -2.36.1 - diff --git a/mingw-w64-python/0132-Add-a-test-for-checking-the-new-launchers.patch b/mingw-w64-python/0132-Add-a-test-for-checking-the-new-launchers.patch deleted file mode 100644 index 2ba31ceccc..0000000000 --- a/mingw-w64-python/0132-Add-a-test-for-checking-the-new-launchers.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 6cf9a3f4d4d6eeb38a08ed212d566af5f35987de Mon Sep 17 00:00:00 2001 -From: Naveen M K -Date: Wed, 9 Mar 2022 11:05:51 +0530 -Subject: [PATCH 132/N] Add a test for checking the new launchers - ---- - mingw_smoketests.py | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/mingw_smoketests.py b/mingw_smoketests.py -index 8e4bd50..fa03ddf 100644 ---- a/mingw_smoketests.py -+++ b/mingw_smoketests.py -@@ -193,6 +193,19 @@ class Tests(unittest.TestCase): - assert os.path.exists(os.path.join(tmp, "bin", "python.exe")) - assert os.path.exists(os.path.join(tmp, "bin", "python3.exe")) - subprocess.check_call([shutil.which("bash.exe"), os.path.join(tmp, "bin", "activate")]) -+ # This will not work in in-tree build -+ if not sysconfig.is_python_build(): -+ env = os.environ.copy() -+ env['PATH'] = 'foo;bar' -+ subprocess.check_call( -+ [ -+ os.path.join(tmp, "bin", "python.exe"), -+ "-c", -+ "print('Hello World')" -+ ], -+ env=env, -+ cwd=tmp, -+ ) - - def test_has_mktime(self): - from time import mktime, gmtime --- -2.36.1 - diff --git a/mingw-w64-python/0139-Commit-regenerated-importlib.patch b/mingw-w64-python/0132-Commit-regenerated-importlib.patch similarity index 99% rename from mingw-w64-python/0139-Commit-regenerated-importlib.patch rename to mingw-w64-python/0132-Commit-regenerated-importlib.patch index f02c991d40..f77f4dc5d7 100644 --- a/mingw-w64-python/0139-Commit-regenerated-importlib.patch +++ b/mingw-w64-python/0132-Commit-regenerated-importlib.patch @@ -1,7 +1,7 @@ -From 6eed0e0f73b2dc8e9a44aa7e4e77823e2e97deb5 Mon Sep 17 00:00:00 2001 +From 6f0fc60919b88ab9ea011d9377b212676bd95e3f Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 24 Apr 2022 21:51:39 +0200 -Subject: [PATCH 139/N] Commit regenerated importlib +Subject: [PATCH 132/N] Commit regenerated importlib It needs a native Python when building which isn't available when cross compiling @@ -5522,5 +5522,5 @@ index dcf5505..9a5bce7 100644 + 0,127,14,32,0,127,10,30,8,23,8,11,12,5, }; -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0141-Fix-failing-tests.patch b/mingw-w64-python/0133-Fix-failing-tests.patch similarity index 95% rename from mingw-w64-python/0141-Fix-failing-tests.patch rename to mingw-w64-python/0133-Fix-failing-tests.patch index 296601962a..cdb6903759 100644 --- a/mingw-w64-python/0141-Fix-failing-tests.patch +++ b/mingw-w64-python/0133-Fix-failing-tests.patch @@ -1,7 +1,7 @@ -From 0e258edd1220261e3491a1f99796f973b146c8d9 Mon Sep 17 00:00:00 2001 +From 35f3f7ed718ddcfa54015522217f7e63fb146c76 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Sun, 5 Jun 2022 20:28:53 +0530 -Subject: [PATCH 141/N] Fix failing tests +Subject: [PATCH 133/N] Fix failing tests - In `test_sysconfig`, ignore `test_sysconfig.TestSysConfig.test_user_similar` test failure. - Copy `get_platform()` from from distutils.utils to test_importlib/test_windows.py. @@ -58,5 +58,5 @@ index dc3802e..02e950d 100644 +test.test_asynchat.TestAsynchat.test_line_terminator2 + -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0133-Revert-Add-a-test-for-checking-the-new-launchers.patch b/mingw-w64-python/0133-Revert-Add-a-test-for-checking-the-new-launchers.patch deleted file mode 100644 index 1d7823db29..0000000000 --- a/mingw-w64-python/0133-Revert-Add-a-test-for-checking-the-new-launchers.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 23b045af0b039deac4562e2edec66db5d7a206f1 Mon Sep 17 00:00:00 2001 -From: Naveen M K -Date: Sat, 19 Mar 2022 15:32:30 +0530 -Subject: [PATCH 133/N] Revert "Add a test for checking the new launchers" - -This reverts commit 1a4e8165d1b63e99a31321d4effbe4ce887a3b1c. ---- - mingw_smoketests.py | 13 ------------- - 1 file changed, 13 deletions(-) - -diff --git a/mingw_smoketests.py b/mingw_smoketests.py -index fa03ddf..8e4bd50 100644 ---- a/mingw_smoketests.py -+++ b/mingw_smoketests.py -@@ -193,19 +193,6 @@ class Tests(unittest.TestCase): - assert os.path.exists(os.path.join(tmp, "bin", "python.exe")) - assert os.path.exists(os.path.join(tmp, "bin", "python3.exe")) - subprocess.check_call([shutil.which("bash.exe"), os.path.join(tmp, "bin", "activate")]) -- # This will not work in in-tree build -- if not sysconfig.is_python_build(): -- env = os.environ.copy() -- env['PATH'] = 'foo;bar' -- subprocess.check_call( -- [ -- os.path.join(tmp, "bin", "python.exe"), -- "-c", -- "print('Hello World')" -- ], -- env=env, -- cwd=tmp, -- ) - - def test_has_mktime(self): - from time import mktime, gmtime --- -2.36.1 - diff --git a/mingw-w64-python/0134-Revert-PC-launcher.c-Use-function-available-in-origi.patch b/mingw-w64-python/0134-Revert-PC-launcher.c-Use-function-available-in-origi.patch deleted file mode 100644 index ada8ef7b9c..0000000000 --- a/mingw-w64-python/0134-Revert-PC-launcher.c-Use-function-available-in-origi.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 1aa9a02506288f7ae8be50b7f43863dd1878e0ac Mon Sep 17 00:00:00 2001 -From: Naveen M K -Date: Sat, 19 Mar 2022 15:32:54 +0530 -Subject: [PATCH 134/N] Revert "PC/launcher.c: Use function available in - original msvcrt.dll" - -This reverts commit 1fb7e56d33a4e9813b67a66995baad3bf16b7320. ---- - PC/launcher.c | 30 +++++++++++++----------------- - 1 file changed, 13 insertions(+), 17 deletions(-) - -diff --git a/PC/launcher.c b/PC/launcher.c -index b8dea55..734e753 100644 ---- a/PC/launcher.c -+++ b/PC/launcher.c -@@ -925,7 +925,7 @@ static COMMAND path_command; - static COMMAND * find_on_path(wchar_t * name) - { - wchar_t * pathext; -- size_t requiredSize; -+ size_t varsize; - wchar_t * context = NULL; - wchar_t * extension; - COMMAND * result = NULL; -@@ -941,23 +941,19 @@ static COMMAND * find_on_path(wchar_t * name) - } - } - else { -- _wgetenv_s(&requiredSize, NULL, 0, L"PATHEXT"); -- if (requiredSize > 0) { -- pathext = (wchar_t *)malloc(requiredSize * sizeof(wchar_t)); -- /* No extension - search using registered extensions. */ -- rc = _wgetenv_s(&requiredSize, pathext, requiredSize, L"PATHEXT"); -- if (rc == 0) { -- extension = wcstok_s(pathext, L";", &context); -- while (extension) { -- len = SearchPathW(NULL, name, extension, MSGSIZE, path_command.value, NULL); -- if (len) { -- result = &path_command; -- break; -- } -- extension = wcstok_s(NULL, L";", &context); -+ /* No extension - search using registered extensions. */ -+ rc = _wdupenv_s(&pathext, &varsize, L"PATHEXT"); -+ if (rc == 0) { -+ extension = wcstok_s(pathext, L";", &context); -+ while (extension) { -+ len = SearchPathW(NULL, name, extension, MSGSIZE, path_command.value, NULL); -+ if (len) { -+ result = &path_command; -+ break; - } -- free(pathext); -+ extension = wcstok_s(NULL, L";", &context); - } -+ free(pathext); - } - } - return result; -@@ -1914,7 +1910,7 @@ process(int argc, wchar_t ** argv) - if (_wfopen_s(&f, venv_cfg_path, L"r")) { - error(RC_BAD_VENV_CFG, L"Cannot read '%ls'", venv_cfg_path); - } -- cb = fread(buffer, sizeof(buffer[0]), -+ cb = fread_s(buffer, sizeof(buffer), sizeof(buffer[0]), - sizeof(buffer) / sizeof(buffer[0]), f); - fclose(f); - --- -2.36.1 - diff --git a/mingw-w64-python/0142-distutils-add-build-root-to-libdirs-when-building-un.patch b/mingw-w64-python/0134-distutils-add-build-root-to-libdirs-when-building-un.patch similarity index 92% rename from mingw-w64-python/0142-distutils-add-build-root-to-libdirs-when-building-un.patch rename to mingw-w64-python/0134-distutils-add-build-root-to-libdirs-when-building-un.patch index ddc5977640..53d82d4537 100644 --- a/mingw-w64-python/0142-distutils-add-build-root-to-libdirs-when-building-un.patch +++ b/mingw-w64-python/0134-distutils-add-build-root-to-libdirs-when-building-un.patch @@ -1,7 +1,7 @@ -From e31e5e01d7ee2504378d219a8557803ac41a8646 Mon Sep 17 00:00:00 2001 +From 426cf769a26c6f602f10e8687df2e9a6377ffeb2 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Mon, 6 Jun 2022 16:24:55 +0200 -Subject: [PATCH 142/N] distutils: add build root to libdirs when building +Subject: [PATCH 134/N] distutils: add build root to libdirs when building uninstalled The distutils test suite builds extensions which need to link @@ -36,5 +36,5 @@ index 82a21d2..ab1a3e7 100644 # The argument parsing will result in self.define being a string, but # it has to be a list of 2-tuples. All the preprocessor symbols -- -2.36.1 +2.37.2 diff --git a/mingw-w64-python/0135-Avoid-some-macros-only-available-in-Win7.patch b/mingw-w64-python/0135-Avoid-some-macros-only-available-in-Win7.patch new file mode 100644 index 0000000000..790dd307e8 --- /dev/null +++ b/mingw-w64-python/0135-Avoid-some-macros-only-available-in-Win7.patch @@ -0,0 +1,34 @@ +From 114a770e7685dd41041a6acfc8e70b0cc0702303 Mon Sep 17 00:00:00 2001 +From: Christoph Reiter +Date: Fri, 5 Aug 2022 07:39:48 +0200 +Subject: [PATCH 135/N] Avoid some macros only available in >Win7 + +They got added in 9041b00283737f77acbb for 3.10.6. +--- + Modules/_winapi.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/Modules/_winapi.c b/Modules/_winapi.c +index c479a92..124dbc8 100644 +--- a/Modules/_winapi.c ++++ b/Modules/_winapi.c +@@ -1528,10 +1528,16 @@ _winapi_LCMapStringEx_impl(PyObject *module, PyObject *locale, DWORD flags, + PyObject *src) + /*[clinic end generated code: output=8ea4c9d85a4a1f23 input=2fa6ebc92591731b]*/ + { ++#if WINVER >= 0x0602 + if (flags & (LCMAP_SORTHANDLE | LCMAP_HASH | LCMAP_BYTEREV | + LCMAP_SORTKEY)) { + return PyErr_Format(PyExc_ValueError, "unsupported flags"); + } ++#else ++ if (flags & (LCMAP_BYTEREV | LCMAP_SORTKEY)) { ++ return PyErr_Format(PyExc_ValueError, "unsupported flags"); ++ } ++#endif + + wchar_t *locale_ = PyUnicode_AsWideCharString(locale, NULL); + if (!locale_) { +-- +2.37.2 + diff --git a/mingw-w64-python/0135-Revert-Build-venvlauncher.exe-from-PC-launcher.c.patch b/mingw-w64-python/0135-Revert-Build-venvlauncher.exe-from-PC-launcher.c.patch deleted file mode 100644 index bdfa04c392..0000000000 --- a/mingw-w64-python/0135-Revert-Build-venvlauncher.exe-from-PC-launcher.c.patch +++ /dev/null @@ -1,99 +0,0 @@ -From e1c61ef32352b4295a0eed3a24a1da41554cde59 Mon Sep 17 00:00:00 2001 -From: Naveen M K -Date: Sat, 19 Mar 2022 15:33:05 +0530 -Subject: [PATCH 135/N] Revert "Build venvlauncher.exe from PC/launcher.c" - -This reverts commit 8f8ec42a9e503fb39bcede30bdc352c75eef3a51. ---- - Makefile.pre.in | 21 ++++++++------------- - PC/pylauncher.rc | 20 ++++++++++---------- - 2 files changed, 18 insertions(+), 23 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index ea3481b..6b1cfce 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -609,12 +609,6 @@ pythonw_exe.o: $(srcdir)/PC/pythonw_exe.rc - python_nt.o: $(srcdir)/PC/python_nt.rc - $(WINDRES) $(RCFLAGS) -DORIGINAL_FILENAME=\\\"$(DLLLIBRARY)\\\" -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/python_nt.rc $@ - --venvlauncher.o: $(srcdir)/PC/pylauncher.rc -- $(WINDRES) $(RCFLAGS) -DPY_ICON -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/pylauncher.rc $@ -- --venvwlauncher.o: $(srcdir)/PC/pylauncher.rc -- $(WINDRES) $(RCFLAGS) -DPYW_ICON -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/pylauncher.rc $@ -- - $(BUILDPYTHONW): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) pythonw_exe.o - $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -municode -mwindows -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) pythonw_exe.o - -@@ -622,12 +616,13 @@ $(BUILDPYTHONW): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) pythonw - $(BUILDPYTHON): Programs/python.o $(LIBRARY_DEPS) python_exe.o - $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -municode -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) python_exe.o - --$(BUILDVENVLAUNCHER): $(BUILDPYTHON) venvlauncher.o $(srcdir)/PC/launcher.c -- $(LINKCC) -D_CONSOLE -DVENV_REDIRECT -municode -static -static-libgcc -static-libstdc++ venvlauncher.o $(srcdir)/PC/launcher.c -o $@ -lversion -- --$(BUILDVENVWLAUNCHER): $(BUILDPYTHONW) venvwlauncher.o $(srcdir)/PC/launcher.c -- $(LINKCC) -D_WINDOWS -DVENV_REDIRECT -mwindows -municode -static -static-libgcc -static-libstdc++ venvwlauncher.o $(srcdir)/PC/launcher.c -o $@ -lversion -+# FIXME: build these from PC/launcher.c instead -+$(BUILDVENVLAUNCHER): $(BUILDPYTHON) -+ cp $(BUILDPYTHON) $(BUILDVENVLAUNCHER) - -+# FIXME: build these from PC/launcher.c instead -+$(BUILDVENVWLAUNCHER): $(BUILDPYTHONW) -+ cp $(BUILDPYTHONW) $(BUILDVENVWLAUNCHER) - - platform: $(BUILDPYTHON) pybuilddir.txt - $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print("%s-%d.%d" % (get_platform(), *sys.version_info[:2]))' >platform -@@ -1373,8 +1368,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@ - if test "$(PYTHONFRAMEWORKDIR)" = "no-framework" ; then \ - $(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \ - $(INSTALL_PROGRAM) $(BUILDPYTHONW) $(DESTDIR)$(BINDIR)/python3w$(EXE); \ -- $(INSTALL_PROGRAM) $(BUILDVENVLAUNCHER) $(DESTDIR)$(VENVLAUNCHERDIR)/python$(EXE); \ -- $(INSTALL_PROGRAM) $(BUILDVENVWLAUNCHER) $(DESTDIR)$(VENVLAUNCHERDIR)/pythonw$(EXE); \ -+ $(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(VENVLAUNCHERDIR)/python$(EXE); \ -+ $(INSTALL_PROGRAM) $(BUILDPYTHONW) $(DESTDIR)$(VENVLAUNCHERDIR)/pythonw$(EXE); \ - else \ - $(INSTALL_PROGRAM) $(STRIPFLAG) Mac/pythonw $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \ - fi -diff --git a/PC/pylauncher.rc b/PC/pylauncher.rc -index 5716bf4..ff7e71e 100644 ---- a/PC/pylauncher.rc -+++ b/PC/pylauncher.rc -@@ -12,17 +12,17 @@ - 1 RT_MANIFEST "python.manifest" - - #if defined(PY_ICON) --1 ICON DISCARDABLE "icons/python.ico" -+1 ICON DISCARDABLE "icons\python.ico" - #elif defined(PYW_ICON) --1 ICON DISCARDABLE "icons/pythonw.ico" -+1 ICON DISCARDABLE "icons\pythonw.ico" - #else --1 ICON DISCARDABLE "icons/launcher.ico" --2 ICON DISCARDABLE "icons/py.ico" --3 ICON DISCARDABLE "icons/pyc.ico" --4 ICON DISCARDABLE "icons/pyd.ico" --5 ICON DISCARDABLE "icons/python.ico" --6 ICON DISCARDABLE "icons/pythonw.ico" --7 ICON DISCARDABLE "icons/setup.ico" -+1 ICON DISCARDABLE "icons\launcher.ico" -+2 ICON DISCARDABLE "icons\py.ico" -+3 ICON DISCARDABLE "icons\pyc.ico" -+4 ICON DISCARDABLE "icons\pyd.ico" -+5 ICON DISCARDABLE "icons\python.ico" -+6 ICON DISCARDABLE "icons\pythonw.ico" -+7 ICON DISCARDABLE "icons\setup.ico" - #endif - - ///////////////////////////////////////////////////////////////////////////// -@@ -61,4 +61,4 @@ BEGIN - BEGIN - VALUE "Translation", 0x0, 1200 - END --END -+END -\ No newline at end of file --- -2.36.1 - diff --git a/mingw-w64-python/0136-Make-sure-we-always-use-the-stdlib-distutils.patch b/mingw-w64-python/0136-Make-sure-we-always-use-the-stdlib-distutils.patch new file mode 100644 index 0000000000..01e0fad1a4 --- /dev/null +++ b/mingw-w64-python/0136-Make-sure-we-always-use-the-stdlib-distutils.patch @@ -0,0 +1,48 @@ +From 7cc6274cdc5651b8ef54ecd4a3c1efe45cfc435a Mon Sep 17 00:00:00 2001 +From: Christoph Reiter +Date: Fri, 5 Aug 2022 08:04:54 +0200 +Subject: [PATCH 136/N] Make sure we always use the stdlib distutils + +--- + .github/workflows/mingw.yml | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml +index 40b1d5e..6f88865 100644 +--- a/.github/workflows/mingw.yml ++++ b/.github/workflows/mingw.yml +@@ -84,6 +84,7 @@ jobs: + - name: Run Smoke Test (build) + shell: msys2 {0} + run: | ++ export SETUPTOOLS_USE_DISTUTILS=stdlib + SMOKETESTS="$(pwd)/mingw_smoketests.py" + cd _build + ./python.exe "$SMOKETESTS" +@@ -92,6 +93,7 @@ jobs: + - name: Run tests + shell: msys2 {0} + run: | ++ export SETUPTOOLS_USE_DISTUTILS=stdlib + IGNOREFILE="$(pwd)/mingw_ignorefile.txt" + cd _build + MSYSTEM= ./python.exe -m test -j8 --ignorefile "$IGNOREFILE" -W +@@ -100,6 +102,7 @@ jobs: + continue-on-error: true + shell: msys2 {0} + run: | ++ export SETUPTOOLS_USE_DISTUTILS=stdlib + IGNOREFILE="$(pwd)/mingw_ignorefile.txt" + cd _build + MSYSTEM= ./python.exe -m test -j8 --matchfile "$IGNOREFILE" -W +@@ -131,6 +134,7 @@ jobs: + - name: Run Smoke Test (installed) + shell: msys2 {0} + run: | ++ export SETUPTOOLS_USE_DISTUTILS=stdlib + export PYTHONTZPATH="${MINGW_PREFIX}/share/zoneinfo" + SMOKETESTS="$(pwd)/mingw_smoketests.py" + cd _build +-- +2.37.2 + diff --git a/mingw-w64-python/0137-CI-skip-some-more-flaky-tests.patch b/mingw-w64-python/0137-CI-skip-some-more-flaky-tests.patch new file mode 100644 index 0000000000..769a8b925b --- /dev/null +++ b/mingw-w64-python/0137-CI-skip-some-more-flaky-tests.patch @@ -0,0 +1,24 @@ +From 3003c676b39dec0abdbcaf4429b6eab6ef5fa4b1 Mon Sep 17 00:00:00 2001 +From: Christoph Reiter +Date: Fri, 12 Aug 2022 16:04:11 +0200 +Subject: [PATCH 137/N] CI: skip some more flaky tests + +--- + mingw_ignorefile.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/mingw_ignorefile.txt b/mingw_ignorefile.txt +index 02e950d..78181a9 100644 +--- a/mingw_ignorefile.txt ++++ b/mingw_ignorefile.txt +@@ -35,4 +35,6 @@ test.test_tcl.TclTest.testLoadWithUNC + test.test__xxsubinterpreters.* + test.test_asyncio.test_subprocess.SubprocessProactorTests.test_stdin_broken_pipe + test.test_asynchat.TestAsynchat.test_line_terminator2 +- ++test.test_asyncgen.AsyncGenAsyncioTest.test_async_gen_asyncio_gc_aclose_09 ++test.test_concurrent_futures.ThreadPoolShutdownTest.test_interpreter_shutdown ++test.test_asynchat.TestNotConnected.test_disallow_negative_terminator +-- +2.37.2 + diff --git a/mingw-w64-python/0140-fixup-cygpty-isatty.patch b/mingw-w64-python/0140-fixup-cygpty-isatty.patch deleted file mode 100644 index b1cc2a1136..0000000000 --- a/mingw-w64-python/0140-fixup-cygpty-isatty.patch +++ /dev/null @@ -1,45 +0,0 @@ -From cce2e52c843842a89d945e406ef651a530a33b1d Mon Sep 17 00:00:00 2001 -From: Naveen M K -Date: Fri, 27 May 2022 20:51:59 +0530 -Subject: [PATCH 140/N] fixup! cygpty isatty - ---- - Python/fileutils.c | 4 ++-- - Python/pylifecycle.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Python/fileutils.c b/Python/fileutils.c -index cab07a7..45598c2 100644 ---- a/Python/fileutils.c -+++ b/Python/fileutils.c -@@ -1786,12 +1786,12 @@ _Py_write_impl(int fd, const void *buf, size_t count, int gil_held) - depending on heap usage). */ - if (gil_held) { - Py_BEGIN_ALLOW_THREADS -- if (isatty(fd)) { -+ if (isatty(fd) || is_cygpty(fd)) { - count = 32767; - } - Py_END_ALLOW_THREADS - } else { -- if (isatty(fd)) { -+ if (isatty(fd) || is_cygpty(fd)) { - count = 32767; - } - } -diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c -index 916e6d7..6605621 100644 ---- a/Python/pylifecycle.c -+++ b/Python/pylifecycle.c -@@ -2886,7 +2886,7 @@ Py_FdIsInteractive(FILE *fp, const char *filename) - int - _Py_FdIsInteractive(FILE *fp, PyObject *filename) - { -- if (isatty((int)fileno(fp))) { -+ if (isatty((int)fileno(fp)) || is_cygpty((int)fileno(fp))) { - return 1; - } - if (!Py_InteractiveFlag) { --- -2.36.1 - diff --git a/mingw-w64-python/PKGBUILD b/mingw-w64-python/PKGBUILD index f6ed2df82d..bc2a4a7892 100644 --- a/mingw-w64-python/PKGBUILD +++ b/mingw-w64-python/PKGBUILD @@ -21,8 +21,8 @@ else pkgbase="mingw-w64-${_realname}${_pybasever}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}${_pybasever}") fi -pkgver=${_pybasever}.5 -pkgrel=4 +pkgver=${_pybasever}.6 +pkgrel=1 pkgdesc="A high-level scripting language (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -172,24 +172,19 @@ source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz 0122-Use-actions-setup-python-for-setting-up-correct-vers.patch 0123-handle-ncursesw-pkg-config-when-cross-compiling.patch 0124-CI-add-cross-llvm-mingw-jobs.patch - 0125-Skip-building-c-extensions-if-python-is-running-in-b.patch - 0126-mingw_smoketests-fix-_UCRT-condition.patch - 0127-CI-fix-sed-pattern-for-python-config.py-shebang.patch - 0128-Modify-sys.winver-to-match-upstream.patch - 0129-Change-user-site-packages-path-to-include-the-enviro.patch - 0130-Build-venvlauncher.exe-from-PC-launcher.c.patch - 0131-PC-launcher.c-Use-function-available-in-original-msv.patch - 0132-Add-a-test-for-checking-the-new-launchers.patch - 0133-Revert-Add-a-test-for-checking-the-new-launchers.patch - 0134-Revert-PC-launcher.c-Use-function-available-in-origi.patch - 0135-Revert-Build-venvlauncher.exe-from-PC-launcher.c.patch - 0136-configure-Include-a-header-in-the-check-for-_beginth.patch - 0137-configure.ac-Default-to-without-c-locale-coercion-on.patch - 0138-CI-remove-without-c-locale-coercion.patch - 0139-Commit-regenerated-importlib.patch - 0140-fixup-cygpty-isatty.patch - 0141-Fix-failing-tests.patch - 0142-distutils-add-build-root-to-libdirs-when-building-un.patch) + 0125-mingw_smoketests-fix-_UCRT-condition.patch + 0126-CI-fix-sed-pattern-for-python-config.py-shebang.patch + 0127-Modify-sys.winver-to-match-upstream.patch + 0128-Change-user-site-packages-path-to-include-the-enviro.patch + 0129-configure-Include-a-header-in-the-check-for-_beginth.patch + 0130-configure.ac-Default-to-without-c-locale-coercion-on.patch + 0131-CI-remove-without-c-locale-coercion.patch + 0132-Commit-regenerated-importlib.patch + 0133-Fix-failing-tests.patch + 0134-distutils-add-build-root-to-libdirs-when-building-un.patch + 0135-Avoid-some-macros-only-available-in-Win7.patch + 0136-Make-sure-we-always-use-the-stdlib-distutils.patch + 0137-CI-skip-some-more-flaky-tests.patch) # Helper macros to help make tasks easier # apply_patch_with_msg() { @@ -327,24 +322,19 @@ prepare() { 0122-Use-actions-setup-python-for-setting-up-correct-vers.patch \ 0123-handle-ncursesw-pkg-config-when-cross-compiling.patch \ 0124-CI-add-cross-llvm-mingw-jobs.patch \ - 0125-Skip-building-c-extensions-if-python-is-running-in-b.patch \ - 0126-mingw_smoketests-fix-_UCRT-condition.patch \ - 0127-CI-fix-sed-pattern-for-python-config.py-shebang.patch \ - 0128-Modify-sys.winver-to-match-upstream.patch \ - 0129-Change-user-site-packages-path-to-include-the-enviro.patch \ - 0130-Build-venvlauncher.exe-from-PC-launcher.c.patch \ - 0131-PC-launcher.c-Use-function-available-in-original-msv.patch \ - 0132-Add-a-test-for-checking-the-new-launchers.patch \ - 0133-Revert-Add-a-test-for-checking-the-new-launchers.patch \ - 0134-Revert-PC-launcher.c-Use-function-available-in-origi.patch \ - 0135-Revert-Build-venvlauncher.exe-from-PC-launcher.c.patch \ - 0136-configure-Include-a-header-in-the-check-for-_beginth.patch \ - 0137-configure.ac-Default-to-without-c-locale-coercion-on.patch \ - 0138-CI-remove-without-c-locale-coercion.patch \ - 0139-Commit-regenerated-importlib.patch \ - 0140-fixup-cygpty-isatty.patch \ - 0141-Fix-failing-tests.patch \ - 0142-distutils-add-build-root-to-libdirs-when-building-un.patch + 0125-mingw_smoketests-fix-_UCRT-condition.patch \ + 0126-CI-fix-sed-pattern-for-python-config.py-shebang.patch \ + 0127-Modify-sys.winver-to-match-upstream.patch \ + 0128-Change-user-site-packages-path-to-include-the-enviro.patch \ + 0129-configure-Include-a-header-in-the-check-for-_beginth.patch \ + 0130-configure.ac-Default-to-without-c-locale-coercion-on.patch \ + 0131-CI-remove-without-c-locale-coercion.patch \ + 0132-Commit-regenerated-importlib.patch \ + 0133-Fix-failing-tests.patch \ + 0134-distutils-add-build-root-to-libdirs-when-building-un.patch \ + 0135-Avoid-some-macros-only-available-in-Win7.patch \ + 0136-Make-sure-we-always-use-the-stdlib-distutils.patch \ + 0137-CI-skip-some-more-flaky-tests.patch autoreconf -vfi } @@ -441,146 +431,141 @@ package() { fi } -sha256sums=('8437efd5b106ef0a75aabfbf23d880625120a73a86a22ade4d2e2e68d7b74486' - '8179ade28e913c666d6ec3aeb91e445af24673f0e5983578ab308011bab29229' - '6215c693331d57a909738e03838d65e0ba0b69f2168d3147b47b2b705b850a7c' - '1a95b4b1c852bcdbdd7f926ba2cef39bfe45c93f320fd98d30975549e30e34a1' - 'c92e6b3336b5f42373ca51f17d9841ca846fa75c5137ceefae3d069021695747' - 'e5c4cc4c15231f9726d6757c880569f0d1eee13f206398174e217da98372bb44' - '694458c0525a183d6a654d89c093968aa625dbd32028aae0391497baa739d0d6' - '18c483c6541be6db2f86e558608e96090446abeaac1002eb00c76fccbebe7070' - '8002d624cae5ab684079cef52ea2950502e6dfbdd794f19f0ed8a707df6a45b6' - '0c361cc8e246099c6afd38b0552a4ffb6fc6f2a524c26fa8877da5504c8bfa56' - '8f3159cf4511cc9fb36bdd6932b7ddfca4ecb0b0d22bb163c6db2d00a311b892' - '41eb733cb2f6c9f7d0e7fa187fb9a1bd6aa904ac77b019a4689ad23d380d74e7' - 'd31e31e92b9202d47143b2304b2da8611ec9836933e4ba7e9167d3a924d518e5' - '1df5f640ccb98f28dca9875d6dd3a299587bfc986d0a3976f41c552cf2113deb' - 'e2eac3a7441b60b8559fe851468da7152ae55c25a638655c5c3f51b6a0940116' - 'e4db7043d238ede046e3774aa6061de6513abe640826a816340770ccf0711562' - '082db2e2132376b16d475e4b1a3bf5630fbd80b645f485e0a50b3e8c2887bf02' - 'f057f65f0de5d6bcbdc7166c3a24233a9c5bd615e27e179e739579708290eb0b' - 'a8988b8ef2bcddc98e967e7d2e7c1c6f7133e62433a3c8ef942a70353c065dbc' - '59910d2e67e690ee78f2dfc89de65b064ea2c2cd3ecb055466b4002762005ac8' - '398292cdb26f31cd8c75d2ef18ae4decf3e5a9dd52bf8e8ff6b81e89ecc6df9d' - '487aaf372987d6abf7db0201fb7cbe6f15e5355e123756eb435df2a66d239dce' - '7de3fef1b2e6a2171bac65c2bd9738388b1e62bd9024b1ee3c1a5b85d5141779' - 'ea49584a7877300432da6b372d59b1c28b2b4314e9cc2d3f9809ecabd9e755f4' - 'c76129330c037916e7093174a522ba751794c76880461db0863090e792ba639e' - '53c068a281a4090227af897e0918b61ec163ca737475d9795e14b3fca1be3657' - '5c1a1371eb7ecd00ec22fcb7f0871e5851fa8943e1da93af3b04338bcfe8721b' - '49d29ddd102b5838a0282fb6d534a42164ed23dc023849bfee41ac30e8f323b3' - '03ad89d8e7425419dcba6de13956f11497c8372a0a9de568e79533934b0497ea' - '6b8dbe6e413a1e77c3dcc9c5cb3097bfd0f02272b229253e925ad3abdc22d324' - '1312aeea7667006be3a0bb3f7e7127295d80f58603f3092877f960e6259fa6f7' - '97db86e3f70dd4b3a4b9d1c73969f3558d44d948d5945166390f03e4139ddb22' - '94f3759a71a66058915b07d4caaf646aa55749399d8d09df0f1197f270178121' - '8391d7740214c927bd66236ddc15d2379f630a09a9a02b10880320c73000ce22' - 'e7b0b2fe715da7c7d35308bcff94c8acc4645156d5746129e05197eda6979b1b' - '294bfe6a0475a8c0b973cb6f7fade020a8ee53754825f8f9eb0b660b3822b795' - 'aa6b408832094ea616a90e06d3a598006e3d76c5d7ae9324c54b00921d6cedb8' - '0858220e65157b16ab736f5ef7c68b24751e5df19d8b823b9d2539b18c52746f' - 'e7adef72fdc63d2602afb89894fd9306ef8d1716e5a8e1ab90a99b6d475e5502' - 'cc7ff916cd1594df8501d0e42e6806ec1723953a5de53b79ea00d1d24277d60e' - '76b2a13dc029bf85bd19722f70c07a553736b9593d9cbf5ebb43247f3c7a7244' - 'ab8906966c9e507bc84a09bce71900c84fe75d5057b8964b2af48ed261f8786c' - '6c8e87fa80b45a817220bf2eea41301370037a9c1a1fd4b162e9971291e01ee2' - 'db9ceae0f1e66c84135104ccbfb17050dcb4bc5f9f448ba15eaaf7c68645a2a4' - 'cf4376c66235cd4b770a953a27cb0ac025151700dae61517582c9593363d9325' - '3c694c395d826267b641ae835acd757f3e512496a2965388ca19fca1acedb983' - 'a19ed7149e8ff7d63aa978da0819631edb59f190a3cb44d3c449dda5b91dfaa5' - '74d39dcfdd151f38c3c656f3d6bfde639e16103b5239aeb998f1890eda113e10' - 'bbac7af0cb17c4e592439137b495c1f193a6b7f0f4fa7a3c208113f7a8e7eb9a' - '06ba6927270fd0a12470a6c983cb22d43cfd67b925bec3df14f90a85fe5ffefe' - '56c7f3604422a6ba6d1d03bfc42ad04622cc825eb52bc11e932d3f9a5904184f' - '44ba5bc0caf933302434bc6e07b22b99b03852503dea54f6419b2e3b2512a4b5' - 'eb0255a6bd260e7c444dc425c1173d813f8a4f701910b402d8513abd8cadebac' - '2a213ec7588f253a15aa3a2379a2234fc7df918a28a10c5c1fc392bee479e0bc' - '5c8d8afd15f527091f23520983bb70374676c31f2792199ab2d477e3ac6bcfcb' - 'ee4234ca3eb6aa613e0a819aa1c62b118114b73701c78cb671a116e83fdea49a' - '83a04542c51804eeaa95c6e0b609bc828be57a1e765e6d52840c2a67dc16b9f8' - 'b93da93a21e6c7180c1a439e89d1e38eff4943f4ad87c4fb869183ba06df73e2' - '268292f77d09fb574895dacdd665609bda5635813f78ea555c55b6d553acba59' - '856a900a257e13d999e9772d0e6cffa9e32e4dd0c94a04a1e54ee1a49b15ced2' - '969acf62b483b4f93f3e3409cf380c4a2ff78f4b97e8e63991d71ca3b36b5a6f' - 'ce8e36db34260f6ee60f495e08295e160282b2338f87dc47b00d39cd07b0f764' - '6b0358f7afe1e564c2074714b480c5ae3eb48164e54972063810d6dfb9c69741' - 'cbdeba0f43d3dcc68598e9e7c965591a5837f3cbb7e06af8868a9a70e8c2af07' - '7bb6b9ede91ec46085103ccdf61bd7a1ee012b234e945959c9c5e6f63b44a214' - '83b2dae29b3c0cbd0739e98ff3914b3259f2201c570e4090f955296944180d61' - '6e9715b10b1f5969aa7ccc990846561d7f5f7d263b014ee865fa6c61ae0f3ba5' - '8ea7007cdfbb3284ef295ef8ec4ad396ebfaf17bcdb884630759533567a25781' - '698b9c5ec98d74c82e0187385d726ad24fef0329ff9c16b7a9a8d3c1e3f5459c' - 'f09adc9624db9f1f153b421b0da9a3abe8505a7d9c47c4dcef8e360a4f6337b7' - '0c6dda49fd846fcbe48d7cd67e4cfc89d124f4ec4705b8f6f2110238deeeb812' - 'fccc437c4ec57441ec8c96e822255d2107964d451337176a1fef1f06940efa69' - '392fa6cb36c3a0e8a0d3381cc34c7fe41b2f90f7f031fc20e512a39fb08cbb1c' - '576928325ef7341e6a913360c1d3f9d58ef61e9570d6abcd8f602364d81f9fca' - 'd6f1839bffaf6621bb5fa7a80bf48dfd279da31f7324013d1912e6546682cddd' - '59c550ef19d8bdfdece93f2be933ae93455ddc8e53bde3f46f3f274375a26708' - '6e07373a2dd56c7b3076c841db8cad8f3a73090fa1ae8cae639e673d97afff72' - '5a2b9aab82f5dba4478bfc978d468a74d8defd47ac176999b9d08d449b64d107' - 'ca3bb9647f624a3c97e0712e9bda0bcfc322b5d0d5a049d2b3bbb96a5071e313' - 'c890e010cf518495b551b97b53fc15d5fb048bb84f1e0159bd15a649b08ec1dd' - 'a7c3c9f2addd841d93a2a7ed4786833d117fa5861742d85e1b7eaa86c11e146f' - '1c2b674196759afc2a27a626d247fc518f319541defec4dee3951691f717bb02' - 'd2e9c7a069fd79ccf293cb0d4d217f5bdb34af9461500b7e51b6fa2cc80b1cf1' - 'dd471fb3ac570d5642dc4069193e96d4ee4a5ff3354f5277c2caed1d46fa731d' - '31ace548f9f96426a398e94fb3add7caa39ec4e43afc4b16d33babd7e2c077fe' - '37111bb5140be3e0f8e6d6b41925d303ae2d567201b9a2ff86f2a01f3c3bd5b7' - 'c111516d3f76d06d5d8541a7275fe9c4b02fb4e57d5e1e67f22532a5d3a14740' - '3dcf30c73560a889419f9a0d1f8a25ae94ff183c460c3a7dd828bce4d7004437' - '5c0f52bac3b761cff67add5af3a449af8c311a0998f51f2bc85cb769e3f8db07' - '9fb6c7c85503b88ef78f69a976a403b92a317dc36033995f0f868dbd3fa3e8c4' - '9803fd3de6262d40685e6336d75eb88c5adc782239d2cdeaebe725c14952ae87' - '499b4851aa1f303eb4f2427f87b356e6d62846e1796d5a878285963e84a1e05e' - '810e9ac1dccdc3ad88910d5d68284c175daafb7dafbb7af95ce7e8f7201a4c60' - 'e224f1cafbef386282cb47aeecdf8d7b699afd4443e553e04c2b354a61bfa426' - 'c3071926ec2519e53abcf43cfb68a0042a8fe09a70be57febf38d4bbefbe0547' - '38aa9dd83bd0187412e45c82ce6a4a579a67b8ba0ce7c8110a2b3798695ced04' - '7ddbef8acbb527290758eb811866aae094ce643be5311b4b74bd40cecd3cade3' - '905ce1e0d9a5d6bff42bdcc94f1421e04c7ddfe4b418d524afc438a484a0be5e' - 'f91f5a0e7f0c039036a4ae615a0e651282bacbf72ebc896c646db94c8c5fb820' - 'a70db3ef033a57263e336b2be71e28a669c02e9acbae8908c4bed1b2fdaa03f9' - '6506d7726b6ae2cdfcd04ce74fd61005e3c3d9833ae785ec6d8563856487f20f' - 'b5a67f11381e2400016e212e7991ecd7c56cd2a285e433bfc6ae49e808b47624' - 'e000fcbcf1f10994ca7f220cc5031e67ebef1301e25dc626a163bff3d61c682c' - 'fbb9cdd4733e3e167af4ac99d78d33e11fb6b84ed4794ae89b63c885b7af9d88' - '84653556f9d5457788268057c4c9db238e8afeeb0a15381e2433a07024593b5c' - '9003f81a8a842e23bf57c1c5d575e9aff295b28ffa841cee045c45fe929433a9' - '666819a7bba15dd2f40a38dca729817777f1d6d0b14821838bb8282e8969dad0' - 'ba25ebf0d98acaf37e25f0a654dead307bc303f512ac5f97466a1335229b3472' - 'cbc342a4580678c31ec8a770baebc2149b0bdd08e8fb7c52a177df87f8ede591' - '2ea6f5cd8af168f4ae899509562a6e7c606f9a5ead123e76e344a74eaf58635c' - 'bd77affb9d4e9e803235f6d47f0d85c33d5b8e3f22f772eb2453c88b9e1c652a' - 'a1db8cf604ee8728e4a8c210638edcffcdabb11af3a3cc4e334b5c0461659c4e' - '254feb446692029e05b51ce15a9548fcb6e56bef183d6b8bb8b23e83d960bee2' - '536256c1e767245ff121077a365b792269758aeada8231de574bf5f9d421bfd2' - '14dad5647116d552eb3360d2b85ad45116ea2d6e8fbceae7424e0303b3591db8' - '618c244176587b1dacfe5159140588b2b71ee050be3c587cb1e7ce7b79443273' - '75276bd46003ba9961999653df5b50b5c47ba8893eebba83116d1bfd3ebb9e85' - 'c569d7da18fc2c54fdb7d3849a4cd09d20e4dae09cb3e1cc7d8967a8fc33be88' - '3d941a4f9cbbb54840d355605529e9eba6dc3f16f3b505d9e3d88769019c93c9' - '989fda2d113974fb32460e9b3deca08eb8e8f92bd889435653ed12a6e57247d3' - 'c2d53ff9edff55ede5b422d1fcf39634f693dcb47f71e55803ec4c2c703e93e3' - 'a215825182ddbdea82741599294b706ffbb3c6e9a4afa2131df486fc1a2f7251' - '1b4271bdd600511386d6fa73116b5004aecf988718110363ce439219a3a5c63e' - '42bd8900d2bdf61b2e9394aa71eeae1734289cdfb579d840b9367f1ada8a5d76' - '0c6ed1ef95eba1b3700d3d5e328bd90592990b799f91675fc5876f69bbd6f97e' - '882b2a1a7806ee99d674b127268d8e250d7760fc7cc3b011af9c6b1547ca49bc' - '9e14f9f562cca4cb3b15fe3ab96c5372495d2dea0a5ab1957a97ba5c8aa5983b' - 'fb83985c92386bbd255cb1a504dab17b363de50a9f60460afd1c510d1cf05b1f' - 'c7a2d8b8ff8bfa82d6211ef191d24fae5c50cd57229ab62614d763fc4dcab207' - '39b82294d0bcbcf1bd25f63700d599be71bba9552fd42593e53672de9bf1491e' - '79a586c3c5520555ccf245139a8cf8222412847120036e2031a254c9b0baeae9' - '4aaa2e7cda6f7713f738bd255e232796f8c0895074ea621b95639a9495272ac9' - '5109ade01feac9af80db0e663aca973fc56c372ec0743ba9aa3f0f0a8d3d746a' - 'afdab668539ecc7bf26ddf4aa44037566f5bea33ac654f789caf3d918ac56bba' - 'aaef2f1279204b5aa06e4854b437f6dad35d1aec6e99a3dd9c1eb6271b9f66a3' - 'ec4b4cded1c7f9859c1461868d594d4a7e5e6d691f4b96fcedf7001ec832d09e' - 'eb44d038eafdb3f2f29ccaa16493b93c71bbd205761cd03540164c17e351061d' - '5a34503b5dbf27d7569a0154057f3607066e598d71358d297618022bfb011842' - '73f888b8cc71dc12460530ed46a349044b70b04f78c4abcf2a710f9dd12405b1' - '2ffd218b1e4b20e70e21f880f7949e5f7b811ffdd3d1897880c7f5221737dc3b' - '88420b76eb5fabf6062bd2af390a51bf5c392cbeb84e8cbc8232d6fa11c4cd42' - '71ead9b8932aee75793e3e3e168bcb2dd5996933510156719325c47158b179a4' - '674d5111a7fde354a238b97676ac617b2896693c205813590129d88cd933e743') +sha256sums=('f795ff87d11d4b0c7c33bc8851b0c28648d8a4583aa2100a98c22b4326b6d3f3' + '518fb058f2f4d4df1d6295f59a04587682d6dedd1b64fa8b098900051a384ce0' + '67d8310a22afbac23ff49f0f670ba1f9e5687041e6b2b580d16dd110874e44bd' + 'c3e8519f6667ab2ddb55b2ca0a6be1b8c8668aad5cbb52aa2565e2b98335d993' + 'd1e2283270fc66fe8659f7b179fe66114248e023a69b0953ee8df063fc1047e2' + '84bf0e3154c89529d639360d62a8dde437fb029cfe6f09461a1bf085f4e00161' + '4bf5586fcbba145ff4ab568543efbb1fcccf1dde8fcb36d0d10faae0cfa2ecf0' + '6e4271e874929c2c97282c2eb0ea9400dc98fd25ba01ded4c1f220c889fdf112' + 'b49122eb0057abf215dcd6e4dafa12d21d43045224713148f515350c44c61cbf' + 'a7834739c6871f57423b035dcf4c86468310d6ac6c4a7cbbc2568c1c90ca40e7' + '937950ca5965fc240b13b9d854e2bda79b8d70b66dcae4b07f9b3b8b13595a4f' + '55ee1857c9d2bd0efa8c8d6d9eb8ee6eebb1eda0e3e187710125a4266322c7b8' + 'ee44565381d8423a70000898a64f28ee5aadb7ed82e4671f003b3291e42adcc3' + '1bda1f03fdc94fcbf7ad69e07b53ae3cbe774ebc6261d4218e1f91582612c3e4' + '1d480641d5923737d3f8fe55aaece4e15c854206cc8d5ea8c229f48f36d12416' + 'a7cb96aa8e894000f035d30d6f96df0a4e6cbd9d41ffc731a79348eb43281c2c' + 'c4eec7bb4b231c3a9b5be0e59b768c7160e35952b56a0fd5e1d53403f3cf04b6' + '5f27c19b2a7447370d67b104226e19c6c8376e64a27be2616f74e12a0fb52d79' + 'fab17f28f49cbb669632cfd4dbd48946ce3fe9f1739642fb6ac75131d8834992' + 'f4a68ce36b7a0b2840a46fdc74b12862069753af52bb1f36b85044c3df3e00ca' + '964311f4a9abf747d5bdeee10e66251524f3fcfbea2071e4efc843ddf116a1a3' + '7fd8af7d3c5484b2fa078bb8d220c35d4cd47254827726fcb062be12d7fc1f92' + 'e1b869aaf6e10079a4b72d0b18c95d6d1602ba772b09b7d961a7dca059ea90ab' + '5b0c72ccfaf034ef93125f9f82006b00924bcfd31c39491bc79ab725d4e12adf' + '05f85e2594dff4fca8f996bf715dabb0211fd00d5b308f1ea347f866b7f3969f' + 'b46c6ec82623508c026db9e75cad6cd4ee8b7dda4b969e11c56e12bfd26f4837' + '6f1bad1cdde674b4008b016d16536d70b58e73b2fa3d97cc5964427744e3f33d' + 'be14bfd5a2998de7859a5b89229a1a34c3e19b52bf66cfd0b340f9ee6d4efce1' + '016841e62c76298700170a7d18f17820ef388540cb6d2a0289c7c2f1ae89d91f' + '6c2f5991e9ac0b7d0f09517162aa40d019906d592f66c45fd6ff91ff62dd2501' + 'ed43289510cf9cf5c04a9729c237f41e65d3c905b40844953e6f4324f47e2778' + '3f3311392fd26237938fe307502aa2cbf0395575f0a921a63e3bfcfd82980b07' + '4ee25d7d73180a78d341d17ec8e56b239674e3d0f486bb0fc967799e51dbad98' + '3ffa9a340eb004d2904cf97c394a89f61af794bcaacfcc4827152f1c1725d1ba' + 'fe3fc2639366f259d147e07e811bd9994e61948f571445e3c755b0fb81fa50dc' + '66acf7a32b1caa24331e519387a02a8550c69b1de124fdcc6b9174ff190e6459' + 'cf5fffce2cfd486bedddb3481e2acf593d5f48b01915c0e5d5b3d9aeeda99db0' + '8e22a525da45745906d01034d9c808b8fffab46bbc1a269103134185a67b65c7' + 'a81443fcccf8a14e83257da1ad6237a0a7d9286b7d6d0d20856ccaee9b84158d' + 'c8e994aa14494d3701b4c00e422cafb07c65d1f51906497828ffeb46b411186f' + 'c91fd8d71d59ecd32a0d56838b94bbf57817fc505522087f2e25186dade25a12' + 'b0b418fab41be154653fe212fddba2741519e65523ea883f0d195e03a990253d' + 'ff0184d286c50706391c0d064cc528fa9acefc68d7d07ecaae6234e6af2ff06a' + 'aacf9bd1f52e206470466b517db98b983746154e6b0d196afaf257f438fa33ea' + '79ff9060fda71d037f11ad5f25c0bce33a7b426099885553703619a6c47cc9ae' + '9848a727e2ab655b8dcf111a8dda4a2405d6630112c7b55ee8cd2acc124d9b0d' + '3ee8c00113c05380168f76a0578c30b0ef7185ba4ac62cae1b824e5ca351cc71' + '68e44df483e2a28bf1d73f47aad0c272fa05e9e1510d585f9c09fd66ad9eecfc' + 'f7c22a75d1a7eb47987386e04f25458eee4b8fd2a535e3c420048066784e64df' + '6a5c8ad13a1e9fd7b8ba52a91c4b44ade39e08584d27bb8dae1faebe88043f2b' + '4b2d8d3e751409ba34c3d2e5667d3453adddffcf39ebe8b1facdc2567cbc5915' + 'a5a55ecafd90137aca30b58e340e33c236b8307d9cd76fe82f4d44a3a7804cf2' + 'bea8979a9d4b32f335b687c21afa8246f6e87eb83aad79f1bceb5751838fab43' + '6f1f40a0de43dfd351a2a88e58d2ae5d1f1a36fa79754fe5b00559f3ff6056de' + 'bc1fb967657adc69a2aa77b1838b567e08f1db3d6bc67854a263c66dd98c23d9' + '3c79de94c27a9fb8d13c73988f4de347e8725a9e90c6b035d90542a1dd0ded5d' + '5f7ea4366f7cf7e93e69910b5fb872df4739c44c003efb6a49071655fd5a3e9f' + '616eee28512b4801b53280f0de541dac49df45811a1b6aad699d1ef26fdcee90' + '2a18d01a2fa2b717221a18f1aad8d245aad1bb58f40862735122fbf47ed54e6b' + 'fb98cf58fcb112da68cb8828ec9d6d32c1d1fe3e6ade9734edc006ae89b4ccdf' + '69a80e99b0a4d8ff267226d2ef394f257ee164059b63314a25fa02c10e0adb70' + '78b970c447748562917e1340e7cae5e7afdbea54907cd71d18d78ec63aa2a763' + 'ed2145ea692be7fe4240a10d6cf34950c1fbc4fe6bcfca0a85337a142e0d7977' + '2c487ad265410d188caa14bc4fa30518a58e6318e9ccf3dfb7706e2c41d5ce22' + '83fa083dc949b7e28d4e5e1a2710401571c396aac43ba10dbf8a6d4d106b1927' + 'f9a8291b69afc339493dfa2764fc096e15efc12718485ad36e1aa89d3b49885c' + '463d0d3f02268c40c657175d50c9ac6c3d96c1f5490f7a817ba1474fdd6e9105' + 'ec8ffe7844ee2705245baaf5af860bad2291eeee65e8bee9bb125885d59742c9' + '2d7432c067e1b0b5d6556122c2d9d519bef8a4ea42752695f1454e91426e9d6c' + '64bde811807d083d5949233a7b59aafa2e062dfe2b0556f9e4eb278da5307f17' + '67859771f5ad58fc0353b45bc8e782dbc2561df6df1805f88644019bec2a72d4' + '481d42fc41c29bc093930d46e7e4026a9a72a5b261d98dc87f156810df0504f1' + 'a547fb2ec1c3ba1ff64605bf8f54767fe1b29d789777093cbf4d17f516605db3' + '064820ff1ab6b0bee313faa4432dbd40fc22365e492205e2847be42a154cdc7c' + '7812736235d53e549d5c93b2101e348c8f63656ce448ebb153de300772a22f36' + '8d7c8e8e1e457bdd4b9f5d22b0193c529e2d5bd2b9c38634e556ca38f5d3d5fc' + 'f2abfe88d862d09c9b11c03e7663af0dd6d348a68223cc04db554bbffa42cd29' + 'b1ef20fc2106fa72ae0a5ecce11c606341fa8b4d58f433e28d85031d14ef4586' + 'c6c79262cf2d92780659e66cb69cc2f496a78ee87938b4e68a91330059114e78' + '7f4561bdfafc07e92f87b5e46b48f3882c03d3153c98dfaca8fe0d3c598d83c3' + '53fe3be41657656e575dbb1deeebd7b2def385af5c92b1e5d7030e2e9f055aa0' + 'b2e816e213199f28c07963272b25fe1fceeec1c438da35fb89346ac59d215d54' + 'db30d79a3c77fd8a2d2fd42904edb8587e6f9065a20df568138054136e2dfd70' + '05241687e3705f3ff9688daef94b0d228d7bc451b09bf1fa61825887ff159441' + '0abfd399ea1213b96b416cb19f0ceb7f0e1394a1ca700762519e03654d53a3b4' + '04dcb33ea28b3678ed0dce3c23ddf9dec28227bdd3169b67658bcaeffd1a05e5' + '63ea9357af2c837857d72385bcfad89db3e429605ec935414238294852df84e6' + '0dc5ffb77acfa72db36403f08d9e7bf039c2e7e94121a83470e375cc36108750' + '43442c218b6d0567b3e8a01b7630d397410d0c53554c14fee6cdad34752d04d4' + '7c496e8ae33a951d7491e6f5c36396ed7fe661430294534e7c270026337992f4' + 'd6f5ddf766fe4f1350d60804fb633e8078a65817a55ee8329937d4cd4bdbce77' + '0b6b5a035b88c68b68a3a9b183d5c002ccf07fb6500f55c94adf42eb81973de2' + 'c018cd809049ff000f94f6a4ab28bc7da8f590ccc6f8fa06cad0268db8c7dd2d' + '05a5d5380a16d73462b8e710e99df0a8df8b644e6a4ecb10e47f00109f5a106b' + 'a4784bb41f43dbbc9555fb35522d1e0975e69910266033f43058d84847b8526d' + '4b9c0fabc83d1ca01725a64db4d73e0c5d742ca707804eb0b234e3cf9e9d23d1' + 'b6284b521cdca728da711430505f37186bb62f0b80c69f2348ad3a02722f51e8' + '9ecb7f6a0167174f3fae5a7bf7458a10e65323d9f05ccd036d70261c311bfd25' + '67161531174bc46e4e860056f0a4b9366d47f6a5914218af39b7bacc3c263eed' + '20522bcd9eab0d9a6fd4fc3072f295fcf2029839b7625e7150aacf804a1b66e3' + '84cf4fd35efed72ab3840735acd55b08cdc4e821fff0d7f640aa36b5d680ee98' + '3bb09f37eb1afc4be7ea847d3f2903e44b1db670891febbaa45f9a3f8d365c6e' + 'eac539ed1760e2e42cc8bb67191cfdfd867be75859f480aeec4817843dea21fa' + '39d065db9679f08ac259ba758065762cfb411f68f2f5751eea72ee649a45a304' + 'bcb0b9125bbba20342de3b03460febd689a1d2ded10f83a14209ffd931e63c92' + '281b89528bff5b9b4f2c687917fe0121fb46739b083786379971b24d0a992f82' + '2a63babd0319de4c4e3c84c0e0b75cdbab26a7f3590c1c6a508ee6b2a13e14f4' + 'b9bf5b71383c54aeca2569a0aba450dc3a10b609301d706784d7f67ea8a17457' + 'fa3a87ee713acf23b13e79ad21a4952c50b2d37d201afa3559c2598c618053c8' + '9cbe7a9a70a2ea8d4e6fb33ef865311a8a902e0e1c155c57188f088d43e15f4b' + '0c62ca475471f311f16db449e33afe1728bb81c1f28a34df761dcc948daa0801' + 'bc7b67cfb1af0b0bdc3801ff01410dcbf3cf4ec43dcd92131474901c1b1ee0ae' + 'ff8c4f2c488fba1fbe76d5a5790de9c3275eb8dfe99d72fa247d2b2295104c76' + 'b953546b0efbf42bb3a0553cb877c23f79628fea9134f2e51acdff01f2f917f0' + 'c60f5d3ee5edf0e8309fc166dd91613d27386332db3829695f92dc2b90a2deae' + '8cf5d61b67ee93c6ab05c9775fb0edfe338d559c5c51a15ba5dc3e4e619b5325' + '17aa22eca14b0d1b5e8cfa9070a1e9746e1dd8e2219885dae33d298be288d3fa' + '789f55156ee47431b58b0edd6ba743881926acd6947010071243339791d3c966' + 'f4e8a58c36c32a295486c96c15473baab12869c27d456bd09a1d79d875f2fdfe' + 'b4b5cbb4a9311bc4bb1412c3f999024011495a7b2a91afcf03e4ccff9da6226f' + 'f35a8c471665b12b3dfa6058b2850b613fca4d96ea494136fcb1dcb9a6d9d2b6' + 'c1afb1b426e8ab30182ba573bdb3619fb0e2a81ff4b03c8028819725d40af4e1' + '11884cffacb839bc46e3f74540071343abc7254acb9f1c48bf6cdbd951fa6c32' + 'b6e8443fc69a64f23aaed7231185c34f76ce843996fbf50589c5517d0753c3f1' + '993be19346f1dc6665f664b4bf36e0c0d0fa339e19ccd65363c95ea87ad0093f' + 'd0d0eba4e8df44563d62368e8cccbf9fb0d1ed0bccff6165bb2458bdf25858cb' + 'd47672c0fefc21be0c61ffe364f974668f7feb6a244f02b3287d0752f0b4f48a' + 'bb2785c50aae23a2e687dd7edef43317cdb38e6e4dd8cff3788bd5712635cced' + '7babf5169e8a7e684c967591ef7cb6fe32d30b25b3fe50fcf06c6cc4c904058a' + '4cea6705d75b968a9e9ef3071a2457969d5ddceda37439d096651b8784fe2e20' + '34e2a091606aa09cf7ec620bbd01f49a4d96e2b9c39ad8beb60dea93aceaf044' + 'a3bbe6713c4462077e66b3159fa4cbdb0cf431d539bdb242abd27e2c8f48845f' + 'd3db2787bbf2f5c7ee1be4fd1c5efc1f03f1dd1a71f352e7182df58d92f1ee85' + 'a2c00daec28bbe23c06bf18fe2d22caafbe2482d93e757da50b90fb6ebe25ec8' + '50ab37027b59e1d36a4804eee4aaea6196a728bfe5e90684440827b6a34040df' + 'caaf4f79a6ff6eb364a85dffb21fad8589dbc7569d79b2c94902de90f46ed7fb' + 'be6d7e21641026c927905dc7a6bd0b2153b38950700990d9b03dfac23fa0ac75' + 'daf5efa6e732d20e0ad2960909f3289fd730879c9fce699eb696060c065ccc7c')