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 4a5d31b085..fbca1137d6 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 8a5233378f8e907e64e86930e182da7f02347cfc Mon Sep 17 00:00:00 2001 +From 41044323dae1cce3a4827bf608ff1c91d633e6d4 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:51:10 +0530 Subject: [PATCH 001/N] sysconfig: make _sysconfigdata.py relocatable @@ -56,5 +56,5 @@ index e3f79bf..45eab2a 100644 # Create file used for sys.path fixup -- see Modules/getpath.c with open('pybuilddir.txt', 'w', encoding='utf8') as f: -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0002-restore-setup-config.patch b/mingw-w64-python/0002-restore-setup-config.patch index baadc610c5..43ee8678ad 100644 --- a/mingw-w64-python/0002-restore-setup-config.patch +++ b/mingw-w64-python/0002-restore-setup-config.patch @@ -1,4 +1,4 @@ -From 3fe86ae652c515f12abead07dad8e24592bffa78 Mon Sep 17 00:00:00 2001 +From 44e46ea469fc9a613948fa721cfaba5f6fb23f20 Mon Sep 17 00:00:00 2001 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 @@ -56,7 +56,7 @@ index 0000000..5c1299d +# based on configure-time options. + diff --git a/configure.ac b/configure.ac -index 1354cc0..bf51f19 100644 +index aa515da..bd41d06 100644 --- a/configure.ac +++ b/configure.ac @@ -5855,7 +5855,7 @@ AC_DEFINE_UNQUOTED(PY_BUILTIN_HASHLIB_HASHES, "$default_hashlib_hashes") @@ -78,5 +78,5 @@ index 1354cc0..bf51f19 100644 mv config.c Modules -- -2.35.1 +2.35.3 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 75ca2891aa..970bc6efb1 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 1cec80cfc0e957cb13608449edb13e7d11bf5ae3 Mon Sep 17 00:00:00 2001 +From bfa4467780f0522ae1f44413339251ceeef3ebad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:12 +0530 @@ -78,7 +78,7 @@ index fe78135..344b76e 100644 # include /* O_CREAT and O_EXCL */ # if defined(HAVE_SEM_OPEN) && !defined(POSIX_SEMAPHORES_NOT_ENABLED) diff --git a/configure.ac b/configure.ac -index bf51f19..d104ea7 100644 +index bd41d06..fecb3af 100644 --- a/configure.ac +++ b/configure.ac @@ -2047,6 +2047,53 @@ then @@ -166,7 +166,7 @@ index bf51f19..d104ea7 100644 utime.h \ poll.h sys/devpoll.h sys/epoll.h sys/poll.h \ sys/audioio.h sys/xattr.h sys/bsdtty.h sys/event.h sys/file.h sys/ioctl.h \ -@@ -2232,6 +2285,14 @@ sys/endian.h sys/sysmacros.h linux/auxvec.h linux/memfd.h linux/wait.h sys/memfd +@@ -2232,6 +2285,14 @@ sys/endian.h sys/sysmacros.h linux/auxvec.h sys/auxv.h linux/memfd.h linux/wait. AC_HEADER_DIRENT AC_HEADER_MAJOR @@ -271,10 +271,10 @@ index bf51f19..d104ea7 100644 AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include diff --git a/pyconfig.h.in b/pyconfig.h.in -index ce850fc..ef8fe0d 100644 +index bf695e9..3bb513f 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in -@@ -1368,6 +1368,9 @@ +@@ -1371,6 +1371,9 @@ /* Define if mvwdelch in curses.h is an expression. */ #undef MVWDELCH_IS_EXPRESSION @@ -285,5 +285,5 @@ index ce850fc..ef8fe0d 100644 #undef PACKAGE_BUGREPORT -- -2.35.1 +2.35.3 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 87b9e56aeb..1935866026 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 7647cca58c3a17b1f182dc5b91f516ab1cacce4c Mon Sep 17 00:00:00 2001 +From f10e9608fb401d1eb0895bf241a4bb4d3d1120c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:13 +0530 @@ -40,5 +40,5 @@ index 4bd4eb4..475c2a8 100644 Symbols and macros to supply platform-independent interfaces to basic C language & library operations whose spellings vary across platforms. -- -2.35.1 +2.35.3 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 6fba3d95dd..a1fc3d6293 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 e1a0fbc5d1ec37d323a94ea40c08643938b59291 Mon Sep 17 00:00:00 2001 +From a2d89908a36868e97f0dd7aa46426f19571fa9d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:14 +0530 @@ -13,7 +13,7 @@ Co-authored-by: Алексей 1 file changed, 15 insertions(+) diff --git a/configure.ac b/configure.ac -index d104ea7..bc04e7c 100644 +index fecb3af..69ffb3b 100644 --- a/configure.ac +++ b/configure.ac @@ -400,6 +400,9 @@ then @@ -59,5 +59,5 @@ index d104ea7..bc04e7c 100644 # Some systems cannot stand _XOPEN_SOURCE being defined at all; they -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0006-MINGW-preset-configure-defaults.patch b/mingw-w64-python/0006-MINGW-preset-configure-defaults.patch index 319389c689..9d3da087dc 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 80a945c3da93d0cec1a21cffce5ffbea6899abd0 Mon Sep 17 00:00:00 2001 +From 49183780947476ca2bd144de13d554d58a9dd47a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:15 +0530 @@ -53,7 +53,7 @@ index 0000000..03fde9e + +ac_cv_have_size_t_format=no diff --git a/configure.ac b/configure.ac -index bc04e7c..a3eb756 100644 +index 69ffb3b..179c048 100644 --- a/configure.ac +++ b/configure.ac @@ -920,6 +920,28 @@ if test x$MULTIARCH != x; then @@ -86,5 +86,5 @@ index bc04e7c..a3eb756 100644 save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -Wl,--no-as-needed" -- -2.35.1 +2.35.3 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 f6999f7074..5eda34d032 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 ada174fe8a8688db117c61d50b64f9e313395a47 Mon Sep 17 00:00:00 2001 +From 52a2a0d1e0043deb0c3418345b96283444675dba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:16 +0530 @@ -14,7 +14,7 @@ Co-authored-by: Christoph Reiter 1 file changed, 12 insertions(+) diff --git a/configure.ac b/configure.ac -index a3eb756..14115da 100644 +index 179c048..04c57b8 100644 --- a/configure.ac +++ b/configure.ac @@ -2494,8 +2494,20 @@ AC_CHECK_SIZEOF(off_t, [], [ @@ -39,5 +39,5 @@ index a3eb756..14115da 100644 [Defined to enable large file support when an off_t is bigger than a long and long long is at least as big as an off_t. You may need -- -2.35.1 +2.35.3 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 92066e11c0..b6ab1eff7d 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 69badeab6da91c9869e26e835bb3596ec5a843e5 Mon Sep 17 00:00:00 2001 +From b59e95c5876f943ef9bba2de5e4b863863b6b8ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:18 +0530 @@ -13,7 +13,7 @@ Co-authored-by: Алексей 1 file changed, 13 insertions(+) diff --git a/configure.ac b/configure.ac -index 14115da..03daa74 100644 +index 04c57b8..a084b3b 100644 --- a/configure.ac +++ b/configure.ac @@ -5653,8 +5653,21 @@ do @@ -39,5 +39,5 @@ index 14115da..03daa74 100644 for dir in $SRCDIRS; do if test ! -d $dir; then -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0009-MINGW-init-system-calls.patch b/mingw-w64-python/0009-MINGW-init-system-calls.patch index fed058bff7..813e8fe95a 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 d567784ad2c59b6fe15bababf0a077dfc9403eac Mon Sep 17 00:00:00 2001 +From 1217d4af5e83b3e5a6319b728cd4f2f47779ef47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:19 +0530 @@ -101,7 +101,7 @@ index 29d6126..3894e35 100644 static PyObject * convertenviron(void) diff --git a/configure.ac b/configure.ac -index 03daa74..d2e3156 100644 +index a084b3b..ebc643c 100644 --- a/configure.ac +++ b/configure.ac @@ -594,6 +594,14 @@ then @@ -120,5 +120,5 @@ index 03daa74..d2e3156 100644 # it may influence the way we can build extensions, so distutils # needs to check it -- -2.35.1 +2.35.3 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 5ebcb01a22..3a9b17c3d6 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 04c94c11e51f541660a7e27038cfa0f2e9dfea5b Mon Sep 17 00:00:00 2001 +From 42e9a5814cbf5395cd76949da11be7102c74f301 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:20 +0530 @@ -57,7 +57,7 @@ index fd1ccb7..b6f1a8f 100644 static BOOL clinic_HKEY_converter(PyObject *ob, void *p); static PyObject *PyHKEY_FromHKEY(HKEY h); diff --git a/configure.ac b/configure.ac -index d2e3156..13d9e54 100644 +index ebc643c..2211b34 100644 --- a/configure.ac +++ b/configure.ac @@ -3338,6 +3338,13 @@ else @@ -75,5 +75,5 @@ index d2e3156..13d9e54 100644 # For a single AC_DEFINE, no template is needed. AH_TEMPLATE(_REENTRANT, -- -2.35.1 +2.35.3 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 d9a671d062..bd2ab5841a 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 d5d2c27f8b6ace60b46703a02e911a14e24fc4a3 Mon Sep 17 00:00:00 2001 +From 25e0ac1a15f3ec3ac4c977aa8480142b3eef77b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:21 +0530 @@ -43,7 +43,7 @@ index 612cabd..d071a74 100644 @USE_WIN32_MODULE@winreg ../PC/winreg.c diff --git a/configure.ac b/configure.ac -index 13d9e54..e49ceef 100644 +index 2211b34..0b8d6c2 100644 --- a/configure.ac +++ b/configure.ac @@ -3345,6 +3345,13 @@ case $host in @@ -61,5 +61,5 @@ index 13d9e54..e49ceef 100644 # For a single AC_DEFINE, no template is needed. AH_TEMPLATE(_REENTRANT, -- -2.35.1 +2.35.3 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 e4b2171309..8dd92171b9 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 a6032de74f6216e4fe2c3ddc33c54473779c976e Mon Sep 17 00:00:00 2001 +From 078d02f6b3bda047bc63e78eec5ef84f02c15506 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:23 +0530 @@ -78,5 +78,5 @@ index 0bec170..69f8e19 100644 self.detect_modules() -- -2.35.1 +2.35.3 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 848521c6a6..f40e3c9d66 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 b4e580bb50341e3b195137dd0a0a7b4bb4868eb2 Mon Sep 17 00:00:00 2001 +From 19b8974c7a399a4e10ee7eaef56babab2ac713ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:24 +0530 @@ -13,7 +13,7 @@ Co-authored-by: Алексей 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index e49ceef..a6ce410 100644 +index 0b8d6c2..95d0a54 100644 --- a/configure.ac +++ b/configure.ac @@ -1240,6 +1240,13 @@ if test $enable_shared = "yes"; then @@ -65,5 +65,5 @@ index e49ceef..a6ce410 100644 esac -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0014-MINGW-dynamic-loading-support.patch b/mingw-w64-python/0014-MINGW-dynamic-loading-support.patch index 68d9ae8f39..ec94edae03 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 9bb26cb974bacee73e05ab95bf4f680dc10995b0 Mon Sep 17 00:00:00 2001 +From 6979656573ab99d85001e8ee9a73fcb636a2489d Mon Sep 17 00:00:00 2001 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 @@ -59,7 +59,7 @@ index 81787e5..9d7690e 100644 /* restore old error mode settings */ diff --git a/configure.ac b/configure.ac -index a6ce410..9f18619 100644 +index 95d0a54..d2f1deb 100644 --- a/configure.ac +++ b/configure.ac @@ -2725,6 +2725,9 @@ if test -z "$SHLIB_SUFFIX"; then @@ -100,5 +100,5 @@ index a6ce410..9f18619 100644 case $ac_sys_system in AIX*) -- -2.35.1 +2.35.3 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 de2ce57960..86002dde06 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 4cdc6c68bbb9882e579e33f73de79cfec3d4e0dc Mon Sep 17 00:00:00 2001 +From 7682487189a4cbcd21c61070c2841505bde2fa10 Mon Sep 17 00:00:00 2001 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 @@ -27,7 +27,7 @@ index 3b96788..1c46d07 100644 Python/getargs.o \ Python/getcompiler.o \ diff --git a/configure.ac b/configure.ac -index 9f18619..7c9338a 100644 +index d2f1deb..746e801 100644 --- a/configure.ac +++ b/configure.ac @@ -5719,6 +5719,16 @@ case $host in @@ -48,5 +48,5 @@ index 9f18619..7c9338a 100644 SRCDIRS="Parser Parser/pegen Objects Python Modules Modules/_io Programs" case $host in -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0016-MINGW-setup-_multiprocessing-module.patch b/mingw-w64-python/0016-MINGW-setup-_multiprocessing-module.patch index 1e830cd849..149d9c4a5f 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 2c55fbc4a84f64f04bb6644c0d30d9fecaa69d7e Mon Sep 17 00:00:00 2001 +From 881f0e5d8193e991a1859c45e18d4c20ecd8ceb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:26 +0530 @@ -30,5 +30,5 @@ index 69f8e19..ce72884 100644 def detect_uuid(self): -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0017-MINGW-setup-select-module.patch b/mingw-w64-python/0017-MINGW-setup-select-module.patch index 8d65ce89d8..9e1f2b38ff 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 dcecaf981e98163e94030b649cfacaf53adc73a3 Mon Sep 17 00:00:00 2001 +From 8c0dd2174c7b267e58520534eec619a04e10d7b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:29 +0530 @@ -56,5 +56,5 @@ index ce72884..2142b7e 100644 # Fred Drake's interface to the Python parser self.add(Extension('parser', ['parsermodule.c'])) -- -2.35.1 +2.35.3 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 3111ef279d..f1ccd5f4b6 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 b1cf47517080dddbbb8de3701b07c1c1507ec923 Mon Sep 17 00:00:00 2001 +From aa9f572d3fbba713bd7a655997879e0e69b531c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:30 +0530 @@ -41,5 +41,5 @@ index 2142b7e..52d25e6 100644 if sysconfig.get_config_var('HAVE_LIBDL'): -- -2.35.1 +2.35.3 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 9fcc78a5d9..06f6f8c31c 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 62d61783b6af56c5497a042e3b6151d4968d26b5 Mon Sep 17 00:00:00 2001 +From ee87185c71c832caf5653ac955996dcbf2cdeee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:30 +0530 @@ -61,7 +61,7 @@ index a22060d..be91ad0 100644 # include "addrinfo.h" #endif diff --git a/configure.ac b/configure.ac -index 7c9338a..29ea2e2 100644 +index 746e801..98a10d2 100644 --- a/configure.ac +++ b/configure.ac @@ -4455,21 +4455,36 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ @@ -118,7 +118,7 @@ index 7c9338a..29ea2e2 100644 #include #endif diff --git a/pyconfig.h.in b/pyconfig.h.in -index ef8fe0d..25fa98a 100644 +index 3bb513f..e0301fe 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -54,7 +54,7 @@ @@ -130,7 +130,7 @@ index ef8fe0d..25fa98a 100644 #undef HAVE_ADDRINFO /* Define to 1 if you have the `alarm' function. */ -@@ -1351,6 +1351,9 @@ +@@ -1354,6 +1354,9 @@ /* Define if libssl has X509_VERIFY_PARAM_set1_host and related function */ #undef HAVE_X509_VERIFY_PARAM_SET1_HOST @@ -140,7 +140,7 @@ index ef8fe0d..25fa98a 100644 /* Define if the zlib library has inflateCopy */ #undef HAVE_ZLIB_COPY -@@ -1662,7 +1665,7 @@ +@@ -1665,7 +1668,7 @@ /* Define to `unsigned int' if does not define. */ #undef size_t @@ -163,5 +163,5 @@ index 52d25e6..3b5f4a5 100644 self.add(Extension('_socket', ['socketmodule.c'], **kwargs)) elif self.compiler.find_library_file(self.lib_dirs, 'net'): -- -2.35.1 +2.35.3 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 bca5274080..51f5ac26b1 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 875da9783c7cf0ae21911d3160f256337e0fe197 Mon Sep 17 00:00:00 2001 +From 6d339cfeee2cfe967b078991e3342d3fa7036048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:31 +0530 @@ -90,5 +90,5 @@ index 3b5f4a5..cb2fbbe 100644 def detect_socket(self): # socket(2) -- -2.35.1 +2.35.3 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 b975eb1b1b..a68d7f2be5 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 ea1e6b37c4dba7fbf0ba747f758cc729449b88b6 Mon Sep 17 00:00:00 2001 +From 311b656f56bd9f9bbadedc8d48568dc7b730d496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:33 +0530 @@ -89,5 +89,5 @@ index cb2fbbe..7875daf 100644 # Andrew Kuchling's zlib module. Note that some versions of zlib # 1.1.3 have security problems. See CERT Advisory CA-2002-07: -- -2.35.1 +2.35.3 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 7ed2b12039..79be15ccff 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 47abd886a795668d88c9a9bd4c049173a305f913 Mon Sep 17 00:00:00 2001 +From a6af93e0e29b0717468a68a4a112d8ed96c2d84c Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 20:52:42 +0200 Subject: [PATCH 022/N] sysconfig: MINGW build extensions with GCC @@ -21,5 +21,5 @@ index 45eab2a..42de9b3 100644 return 'win-amd64' if '(arm)' in sys.version.lower(): -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0023-MINGW-setup-_ssl-module.patch b/mingw-w64-python/0023-MINGW-setup-_ssl-module.patch index 741d6c36eb..e0b479c227 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 5c726a88e4aefde5ca07fbb5ef93d3ae752e31f9 Mon Sep 17 00:00:00 2001 +From 59720eb1e249424b884d34fcb782e9979855086e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:37 +0530 @@ -26,5 +26,5 @@ index 7875daf..c6ee784 100644 # libssl and libcrypto not found self.missing.extend(['_ssl', '_hashlib']) -- -2.35.1 +2.35.3 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 3a7d208a8b..1a14f872a3 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 8969ca205e0a2546efdb9ca5f32552f8615236f1 Mon Sep 17 00:00:00 2001 +From 55c27690d7e0132e80f7fe13558f50cf7c9d9bed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:38 +0530 @@ -76,5 +76,5 @@ index 42de9b3..65cb345 100644 # If srcdir is a relative path (typically '.' or '..') # then it should be interpreted relative to the directory -- -2.35.1 +2.35.3 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 ccc85bc79d..27b45d5f5f 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 3173cb2fb401aaefea7a38cacc9603d95f8497dc Mon Sep 17 00:00:00 2001 +From 6459c8e345fd99361f3c8d95b2eccff3e3e102ed Mon Sep 17 00:00:00 2001 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 ceae67e..b9cf96b 100644 return NULL; #endif -- -2.35.1 +2.35.3 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 0ea3753ce2..f1e4cca2a4 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 89d2cef716fa55d1f5fddfce7b837d179bb92193 Mon Sep 17 00:00:00 2001 +From 771032811cd2472fcf69184122861033fbd2def4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:40 +0530 @@ -27,5 +27,5 @@ index c6ee784..05f0bdf 100644 if filename in updated_files: newupdated_files.append(newfilename) -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0027-MINGW-customize-site.patch b/mingw-w64-python/0027-MINGW-customize-site.patch index 12ca3f2451..6eaa37868a 100644 --- a/mingw-w64-python/0027-MINGW-customize-site.patch +++ b/mingw-w64-python/0027-MINGW-customize-site.patch @@ -1,4 +1,4 @@ -From 5f7f38637b00b6ab1dc0771b590fd82d42b580c5 Mon Sep 17 00:00:00 2001 +From f205d56db21bab44d1f956d0f4f14dd60fdac88d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:42 +0530 @@ -55,5 +55,5 @@ index 9e617af..b344f03 100644 path = os.path.join(prefix, libdir, "python%d.%d" % sys.version_info[:2], -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0028-add-python-config-sh.patch b/mingw-w64-python/0028-add-python-config-sh.patch index c7f9a153d6..8e5580dea8 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 cfa41f76e59f435cde19a096468b58735d726f8a Mon Sep 17 00:00:00 2001 +From 1f2349347249486deb29a8f5e4e8f7fae4b163d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:43 +0530 @@ -158,5 +158,5 @@ index 2602fe2..e0e048a 100644 esac done -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0029-cross-darwin-feature.patch b/mingw-w64-python/0029-cross-darwin-feature.patch index 3d9f71545b..7e4a9a4304 100644 --- a/mingw-w64-python/0029-cross-darwin-feature.patch +++ b/mingw-w64-python/0029-cross-darwin-feature.patch @@ -1,4 +1,4 @@ -From fc8a0f0ce53d73cd3f1530ee967a2e33edbf377c Mon Sep 17 00:00:00 2001 +From b31b4c2fb7cc0a050027b630ef0cf991be02bf52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:44 +0530 @@ -13,7 +13,7 @@ Co-authored-by: Алексей 1 file changed, 49 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac -index 29ea2e2..56ec5d5 100644 +index 98a10d2..7a34f8b 100644 --- a/configure.ac +++ b/configure.ac @@ -387,6 +387,7 @@ if test -z "$MACHDEP" @@ -134,5 +134,5 @@ index 29ea2e2..56ec5d5 100644 MACOSX_DEFAULT_ARCH="x86_64" ;; -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0030-mingw-system-libffi.patch b/mingw-w64-python/0030-mingw-system-libffi.patch index 595823bf95..570d46b2a6 100644 --- a/mingw-w64-python/0030-mingw-system-libffi.patch +++ b/mingw-w64-python/0030-mingw-system-libffi.patch @@ -1,4 +1,4 @@ -From 9d11dfe47922120125bf3512c1a10407dd6a85c6 Mon Sep 17 00:00:00 2001 +From cc029e2c6ffacfd53f5a5726e7bd4e01f5c53114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:45 +0530 @@ -26,5 +26,5 @@ index 05f0bdf..8453b28 100644 if sysconfig.get_config_var('HAVE_LIBDL'): -- -2.35.1 +2.35.3 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 3bbf0e3217..6e33bf699f 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 4b4a9f3978055f511ee83e6603f035598d178753 Mon Sep 17 00:00:00 2001 +From 2446ca950db16bd455f8c25fafedc52f460adf7f 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 @@ -393,5 +393,5 @@ index 23d0e38..37a7670 100644 tail = filepath; else -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0032-mingw-use-posix-getpath.patch b/mingw-w64-python/0032-mingw-use-posix-getpath.patch index f08dc69491..bf825283bf 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 59c58ec1201b8933acdfe13b0540b96901ebaf8f Mon Sep 17 00:00:00 2001 +From 7c5b1aa054c99c6529fbc709d6ddc1190ce7d86f Mon Sep 17 00:00:00 2001 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 @@ -501,5 +501,5 @@ index 26e97df..75ee355 100644 /* Get an absolute path. -- -2.35.1 +2.35.3 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 89cd654960..7dab12af9f 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 0ca1a9ac95b32ebf2eb2fd6953d23b3254061b21 Mon Sep 17 00:00:00 2001 +From 8aad08961158aff57cbeef2be519976cfbf58ce5 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:51:48 +0530 Subject: [PATCH 033/N] mingw add ModuleFileName dir to PATH @@ -54,5 +54,5 @@ index bede134..c782e0f 100644 && calculate->warnings) { -- -2.35.1 +2.35.3 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 a22efda8e8..c284182bd3 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 54ed5c7fd76229bf8ccd5f26d617be8b807fa89d Mon Sep 17 00:00:00 2001 +From 245fc12830b3d1e2a60f77596e0a53022742336d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:49 +0530 @@ -23,5 +23,5 @@ index d071a74..825ce5d 100644 +@USE_WIN32_MODULE@msvcrt -DPy_BUILD_CORE ../PC/msvcrtmodule.c -- -2.35.1 +2.35.3 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 0edd68a535..18e3305998 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 0fdfb849f5a5a9c810a29e87dcae7ac070c91237 Mon Sep 17 00:00:00 2001 +From bfc703f32d70f4a946c14ad2b4a968054d89309c Mon Sep 17 00:00:00 2001 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 @@ -52,7 +52,7 @@ index 1c46d07..3d42756 100644 BINDIR= @bindir@ LIBDIR= @libdir@ diff --git a/configure.ac b/configure.ac -index 56ec5d5..1c65cb9 100644 +index 7a34f8b..8965c63 100644 --- a/configure.ac +++ b/configure.ac @@ -618,6 +618,65 @@ then @@ -122,5 +122,5 @@ index 56ec5d5..1c65cb9 100644 AC_SUBST(INITSYS) case $host in -- -2.35.1 +2.35.3 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 9efe627f65..fc1c0b252d 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 1a2fa359113c56d7394f6be60d8f03a4ce71c9cb Mon Sep 17 00:00:00 2001 +From 4b21dca56ae6b3c33117871ab06f1e31e5cea29c Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 20:53:59 +0200 Subject: [PATCH 036/N] sysconfig: mingw sysconfig like posix @@ -58,5 +58,5 @@ index f69d0db..64f7719 100644 # -- -2.35.1 +2.35.3 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 d040d94154..2ec3e4344b 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 79d0d1fa9aaa141f358e28e4702e4011a3ce4417 Mon Sep 17 00:00:00 2001 +From 60fef3c0e4a52d4f2ad1191d72d77b1d1fbd6f89 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:13:57 +0200 Subject: [PATCH 037/N] build _winapi earlier so we can use it in distutils @@ -35,5 +35,5 @@ index 8453b28..eb90e21 100644 self.add(Extension('_msi', [os.path.join(pc_srcdir, p) for p in ['_msi.c']], -- -2.35.1 +2.35.3 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 4f59e73817..c0ea73f0e2 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 a133212c3e8db78d1e883982ef1069b8d6a2076a Mon Sep 17 00:00:00 2001 +From bac4aed4722de7ff1985f210da8c808b0aace82a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:52 +0530 @@ -29,5 +29,5 @@ index eb90e21..7d6ad97 100644 def init_inc_lib_dirs(self): -- -2.35.1 +2.35.3 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 ac4242b5a8..6428d338f8 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 677dbd99749de9462640475d40c836c845b8ccb3 Mon Sep 17 00:00:00 2001 +From 7697de24e02c12a22e372a030ab7112125614721 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:53 +0530 @@ -26,5 +26,5 @@ index 25ad83c..f57879e 100644 yield fullname elif (maxlevels > 0 and name != os.curdir and name != os.pardir and -- -2.35.1 +2.35.3 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 40a62054e7..208dfcd780 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 e12f50d118c834253761902334042ed87b210266 Mon Sep 17 00:00:00 2001 +From 43dfca3f7c85072826ae52a2828104b755a5ebd8 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:18:36 +0200 Subject: [PATCH 040/N] msys convert_path fix and root hack @@ -38,5 +38,5 @@ index 3d42756..d00acbd 100644 # Here are a couple of targets for MacOSX again, to install a full # framework-based Python. frameworkinstall installs everything, the -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0041-allow-static-tcltk.patch b/mingw-w64-python/0041-allow-static-tcltk.patch index 159b1bb2ef..bdad0014b0 100644 --- a/mingw-w64-python/0041-allow-static-tcltk.patch +++ b/mingw-w64-python/0041-allow-static-tcltk.patch @@ -1,4 +1,4 @@ -From 83136e79be5c629d9e429ef535fc189b058b6ad4 Mon Sep 17 00:00:00 2001 +From 28c0ab161716125bb1aa7dfba3ca737e776a01cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:54 +0530 @@ -83,5 +83,5 @@ index 7d6ad97..dfa9e45 100644 # XXX handle these, but how to detect? # *** Uncomment and edit for PIL (TkImaging) extension only: -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch b/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch index 3f77fbefde..a57f94621a 100644 --- a/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch +++ b/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch @@ -1,4 +1,4 @@ -From 45f11028ee50e2c119b4e01a1a33363cd2c3d011 Mon Sep 17 00:00:00 2001 +From 1b6ae4d19bcd0f043c3fd31c7673c2a6fdad1063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:55 +0530 @@ -31,5 +31,5 @@ index b70252d..0d5cee2 100644 /* configure was checking , but we will use , which has some or all these features. */ -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0043-grammar-fixes.patch b/mingw-w64-python/0043-grammar-fixes.patch index 76370f5cfb..e621119ace 100644 --- a/mingw-w64-python/0043-grammar-fixes.patch +++ b/mingw-w64-python/0043-grammar-fixes.patch @@ -1,4 +1,4 @@ -From ece61df7f04d99b3ecc583d104cffc1dad208335 Mon Sep 17 00:00:00 2001 +From e6f8c1ea7ca1fa2cc09ebcfd6e3d7412bcce7cf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:56 +0530 @@ -41,5 +41,5 @@ index b7aa528..4a1ee9a 100644 {2, 1}, {3, 2}, -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0044-builddir-fixes.patch b/mingw-w64-python/0044-builddir-fixes.patch index 83438914bc..d46e9f8525 100644 --- a/mingw-w64-python/0044-builddir-fixes.patch +++ b/mingw-w64-python/0044-builddir-fixes.patch @@ -1,4 +1,4 @@ -From 8a1ab51915a1206a7af777e841b13af99e7deca5 Mon Sep 17 00:00:00 2001 +From f790c3b0e9f26d013745db54c4859c48e5f4d246 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:57 +0530 @@ -66,5 +66,5 @@ index 2e4ccbb..a8d5c31 100644 from frozen.obj. In the Makefile, frozen.o is not linked into this executable, so we define the variable here. */ -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0045-msys-monkeypatch-os-system-via-sh-exe.patch b/mingw-w64-python/0045-msys-monkeypatch-os-system-via-sh-exe.patch index 3a57fb4643..07272f913e 100644 --- a/mingw-w64-python/0045-msys-monkeypatch-os-system-via-sh-exe.patch +++ b/mingw-w64-python/0045-msys-monkeypatch-os-system-via-sh-exe.patch @@ -1,4 +1,4 @@ -From 5776888c0b214d7d15551b0fd6fc8822ad5f72b9 Mon Sep 17 00:00:00 2001 +From 96c8844bc14528b3d7ba9086611ae551692ce154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:57 +0530 @@ -35,5 +35,5 @@ index dfa9e45..6d282c8 100644 HOST_PLATFORM = get_platform() MS_WINDOWS = (HOST_PLATFORM == 'win32') -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0046-msys-replace-slashes-used-in-io-redirection.patch b/mingw-w64-python/0046-msys-replace-slashes-used-in-io-redirection.patch index bb09f34406..1061ef81b3 100644 --- a/mingw-w64-python/0046-msys-replace-slashes-used-in-io-redirection.patch +++ b/mingw-w64-python/0046-msys-replace-slashes-used-in-io-redirection.patch @@ -1,4 +1,4 @@ -From 4ba6a1542ffafc24de7e339e8d719876d0cf1314 Mon Sep 17 00:00:00 2001 +From 9224a7c20b9615cd254db0f8ce46429e8047f1df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:58 +0530 @@ -69,5 +69,5 @@ index 6d282c8..1610011 100644 with open(tmpfile) as fp: detected_archs = [] -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0047-remove_path_max.default.patch b/mingw-w64-python/0047-remove_path_max.default.patch index 47ff3c1bb1..0eaa8fa0a4 100644 --- a/mingw-w64-python/0047-remove_path_max.default.patch +++ b/mingw-w64-python/0047-remove_path_max.default.patch @@ -1,4 +1,4 @@ -From 673e0e2f32d326c834747acc5799e0971190a0bc Mon Sep 17 00:00:00 2001 +From 750a294029c433004174a7630dfc8f710583abb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:59 +0530 @@ -25,5 +25,5 @@ index 3243944..99d4977 100644 #endif -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0048-dont-link-with-gettext.patch b/mingw-w64-python/0048-dont-link-with-gettext.patch index ae939aec2b..5ac781451e 100644 --- a/mingw-w64-python/0048-dont-link-with-gettext.patch +++ b/mingw-w64-python/0048-dont-link-with-gettext.patch @@ -1,4 +1,4 @@ -From d2803ce7a81a8e37313eb128c3a1736c6bc62a40 Mon Sep 17 00:00:00 2001 +From 8b2f966a1224118bbd42dfc43bedbc721e140815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:00 +0530 @@ -32,7 +32,7 @@ index 2e353bb..ea222af 100644 #include #include diff --git a/configure.ac b/configure.ac -index 1c65cb9..6408409 100644 +index 8965c63..773bc8a 100644 --- a/configure.ac +++ b/configure.ac @@ -3166,10 +3166,19 @@ AC_SEARCH_LIBS(sem_init, pthread rt posix4) @@ -56,5 +56,5 @@ index 1c65cb9..6408409 100644 # checks for system dependent C++ extensions support case "$ac_sys_system" in -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0049-ctypes-python-dll.patch b/mingw-w64-python/0049-ctypes-python-dll.patch index 1bc49fa776..e5da09acf4 100644 --- a/mingw-w64-python/0049-ctypes-python-dll.patch +++ b/mingw-w64-python/0049-ctypes-python-dll.patch @@ -1,4 +1,4 @@ -From 81f48b3ea54d0aa07a184c59054a1b322a8cfbd7 Mon Sep 17 00:00:00 2001 +From 5dae3f56cae62472e9ae9ecb26ee73da4c334aef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:01 +0530 @@ -29,5 +29,5 @@ index 4afa4eb..2fe2eec 100644 elif _sys.platform == "cygwin": pythonapi = PyDLL("libpython%d.%d.dll" % _sys.version_info[:2]) -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0050-gdbm-module-includes.patch b/mingw-w64-python/0050-gdbm-module-includes.patch index 2b07e3b3e9..178a8ee3c1 100644 --- a/mingw-w64-python/0050-gdbm-module-includes.patch +++ b/mingw-w64-python/0050-gdbm-module-includes.patch @@ -1,4 +1,4 @@ -From 7cb3d01d22817126766f6abd05ec068bfc8f10d4 Mon Sep 17 00:00:00 2001 +From ebf1a3c7cfcccd2e9c8d6da31e8356e554888204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:02 +0530 @@ -26,5 +26,5 @@ index 16b0f79..46b28b2 100644 extern const char * gdbm_strerror(gdbm_error); #endif -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0051-use-gnu_printf-in-format.patch b/mingw-w64-python/0051-use-gnu_printf-in-format.patch index 7dbc6ab84e..3bc038ec60 100644 --- a/mingw-w64-python/0051-use-gnu_printf-in-format.patch +++ b/mingw-w64-python/0051-use-gnu_printf-in-format.patch @@ -1,4 +1,4 @@ -From 8acf8c67bba722b67a000168e75e45d880acf8be Mon Sep 17 00:00:00 2001 +From ecbc2c8c43944add683f4f3a02bd57ce68b96ce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:03 +0530 @@ -81,5 +81,5 @@ index 670e5d2..d582963 100644 PyAPI_FUNC(void) PySys_FormatStderr(const char *format, ...); -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0052-mingw-fix-ssl-dont-use-enum_certificates.patch b/mingw-w64-python/0052-mingw-fix-ssl-dont-use-enum_certificates.patch index db56f606ac..784f23125d 100644 --- a/mingw-w64-python/0052-mingw-fix-ssl-dont-use-enum_certificates.patch +++ b/mingw-w64-python/0052-mingw-fix-ssl-dont-use-enum_certificates.patch @@ -1,4 +1,4 @@ -From bc632a522aa162d77abf4f7daabe044b94ff969b Mon Sep 17 00:00:00 2001 +From fd457b6a9ca4de8dede2391fc23916adc08c0e30 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:52:03 +0530 Subject: [PATCH 052/N] mingw fix ssl dont use enum_certificates @@ -35,5 +35,5 @@ index 30f4e59..dda3ae1 100644 self._load_windows_store_certs(storename, purpose) self.set_default_verify_paths() -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0053-fix-using-dllhandle-and-winver-mingw.patch b/mingw-w64-python/0053-fix-using-dllhandle-and-winver-mingw.patch index ba41c4aaa3..cb48014ec9 100644 --- a/mingw-w64-python/0053-fix-using-dllhandle-and-winver-mingw.patch +++ b/mingw-w64-python/0053-fix-using-dllhandle-and-winver-mingw.patch @@ -1,4 +1,4 @@ -From a0468ba01a418db7ee83c12fae6eff60599a2498 Mon Sep 17 00:00:00 2001 +From 2a28bb5e11851268b71d615c687cbea3bd448c66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:06 +0530 @@ -35,5 +35,5 @@ index a52b299..e890979 100644 PyLong_FromVoidPtr(PyWin_DLLhModule)); SET_SYS_FROM_STRING("winver", -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch b/mingw-w64-python/0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch index 6d5e93832b..8008f65d3f 100644 --- a/mingw-w64-python/0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch +++ b/mingw-w64-python/0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch @@ -1,4 +1,4 @@ -From 6be1bee38cff2538e6fa6e36d6deb7637091ab8f Mon Sep 17 00:00:00 2001 +From 563448bda41abb326960f49f7b0b724c53615163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:07 +0530 @@ -38,5 +38,5 @@ index 59c0dbf..adccaa7 100644 #elif defined(__cplusplus) #define COMPILER "[C++]" -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0055-MINGW-link-with-additional-library.patch b/mingw-w64-python/0055-MINGW-link-with-additional-library.patch index b19d39dbc5..eb1a6a79b3 100644 --- a/mingw-w64-python/0055-MINGW-link-with-additional-library.patch +++ b/mingw-w64-python/0055-MINGW-link-with-additional-library.patch @@ -1,4 +1,4 @@ -From fb0ec5b49cf7e6e4748ff40e47c1b96d10ec6e7f Mon Sep 17 00:00:00 2001 +From 03433fac1936cb64d41f0e2058dff9eb5b89dafd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:08 +0530 @@ -9,7 +9,7 @@ Subject: [PATCH 055/N] MINGW link with additional library 1 file changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac -index 6408409..e3dfab7 100644 +index 773bc8a..ac58dc1 100644 --- a/configure.ac +++ b/configure.ac @@ -5872,6 +5872,15 @@ for dir in $SRCDIRS; do @@ -29,5 +29,5 @@ index 6408409..e3dfab7 100644 AC_MSG_CHECKING(for -O2) saved_cflags="$CFLAGS" -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0056-install-msilib.patch b/mingw-w64-python/0056-install-msilib.patch index 178f70ce99..7b879b99c6 100644 --- a/mingw-w64-python/0056-install-msilib.patch +++ b/mingw-w64-python/0056-install-msilib.patch @@ -1,4 +1,4 @@ -From 094f2a91ae5e0e0dbb8e4dddcabc95655aa7a1bb Mon Sep 17 00:00:00 2001 +From c3a726d8b28cb1927c44bf4592fefa0690fe252c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Thu, 17 Jun 2021 18:52:09 +0530 Subject: [PATCH 056/N] install msilib @@ -26,5 +26,5 @@ index 1895e74..1d2e16e 100644 unittest unittest/test unittest/test/testmock \ venv venv/scripts venv/scripts/common venv/scripts/posix \ -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0057-fix-signal-module-build.patch b/mingw-w64-python/0057-fix-signal-module-build.patch index dbc61ccbc5..2339636589 100644 --- a/mingw-w64-python/0057-fix-signal-module-build.patch +++ b/mingw-w64-python/0057-fix-signal-module-build.patch @@ -1,4 +1,4 @@ -From 7587891b261733efcb30bc7602340abf3c07aca5 Mon Sep 17 00:00:00 2001 +From ae97c39202fd4456df07823837761424942c693c Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:10 +0530 Subject: [PATCH 057/N] fix signal module build @@ -25,5 +25,5 @@ index 2bafdd0..7ce4355 100644 time -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal timemodule.c # -lm # time operations and variables _thread -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal _threadmodule.c # low-level threading interface -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0058-build-build-winconsoleio-and-_testconsole.patch b/mingw-w64-python/0058-build-build-winconsoleio-and-_testconsole.patch index 3e2158f82c..1af943cc6b 100644 --- a/mingw-w64-python/0058-build-build-winconsoleio-and-_testconsole.patch +++ b/mingw-w64-python/0058-build-build-winconsoleio-and-_testconsole.patch @@ -1,4 +1,4 @@ -From 79f28ef15e76415698c0fa1eb036c8741902b081 Mon Sep 17 00:00:00 2001 +From 26b037e4696d001ef94411a5ebcd4795e2e39450 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:11 +0530 Subject: [PATCH 058/N] build: build winconsoleio and _testconsole @@ -40,5 +40,5 @@ index 1610011..8e1a822 100644 # readline do_readline = self.compiler.find_library_file(self.lib_dirs, 'readline') -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0059-expose-sem_unlink.patch b/mingw-w64-python/0059-expose-sem_unlink.patch index 5e98f4d824..9afbbe46a0 100644 --- a/mingw-w64-python/0059-expose-sem_unlink.patch +++ b/mingw-w64-python/0059-expose-sem_unlink.patch @@ -1,4 +1,4 @@ -From d6bd58a05f5cc14d3dd898f7dc1beed36e91efaa Mon Sep 17 00:00:00 2001 +From 9408f1c2d1952285c330c6b1df96ed7226822ae6 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:12 +0530 Subject: [PATCH 059/N] expose sem_unlink @@ -25,5 +25,5 @@ index 806e638..d7954d1 100644 #endif {NULL} -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0060-cygpty-isatty.patch b/mingw-w64-python/0060-cygpty-isatty.patch index c6b839e03b..b7abd62739 100644 --- a/mingw-w64-python/0060-cygpty-isatty.patch +++ b/mingw-w64-python/0060-cygpty-isatty.patch @@ -1,4 +1,4 @@ -From 48ecd2dcbb7123ef85dbfeb88fa3e3a75f0f13f1 Mon Sep 17 00:00:00 2001 +From 6ee33cfbb4d463fdb7de10983fd5c0fe2af89717 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:14 +0530 Subject: [PATCH 060/N] cygpty isatty @@ -457,5 +457,5 @@ index 60f091c..734084c 100644 if (!Py_InteractiveFlag) return 0; -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0061-disable-broken-gdbm-module.patch b/mingw-w64-python/0061-disable-broken-gdbm-module.patch index c4ab563536..e6b4a8c34b 100644 --- a/mingw-w64-python/0061-disable-broken-gdbm-module.patch +++ b/mingw-w64-python/0061-disable-broken-gdbm-module.patch @@ -1,4 +1,4 @@ -From 9933c616e7f8ffd6d745c2d6898b5f618e949288 Mon Sep 17 00:00:00 2001 +From 64754798e0614811f862434a7c2a1363f397503b Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:15 +0530 Subject: [PATCH 061/N] disable broken gdbm module @@ -25,5 +25,5 @@ index 8e1a822..b163d4c 100644 for cand in dbm_order: if cand == "ndbm": -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0062-build-link-win-resource-files-and-build-pythonw.patch b/mingw-w64-python/0062-build-link-win-resource-files-and-build-pythonw.patch index 1970c2033a..29cba5e218 100644 --- a/mingw-w64-python/0062-build-link-win-resource-files-and-build-pythonw.patch +++ b/mingw-w64-python/0062-build-link-win-resource-files-and-build-pythonw.patch @@ -1,4 +1,4 @@ -From 5228159754cf8fd05e571af07680856c789be803 Mon Sep 17 00:00:00 2001 +From 9fc2391dcc5c0def5714935e2b35742ae0c2b766 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:16 +0530 Subject: [PATCH 062/N] build: link win resource files and build pythonw @@ -95,7 +95,7 @@ index 6d49228..fd3d142 100644 $(INSTALL_PROGRAM) $(STRIPFLAG) Mac/pythonw $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \ fi diff --git a/configure.ac b/configure.ac -index e3dfab7..76e7c2d 100644 +index ac58dc1..94f8e57 100644 --- a/configure.ac +++ b/configure.ac @@ -1350,6 +1350,9 @@ fi @@ -143,5 +143,5 @@ index e3dfab7..76e7c2d 100644 # Availability of -O2: AC_MSG_CHECKING(for -O2) -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0063-3.7-mpdec-mingw.patch b/mingw-w64-python/0063-3.7-mpdec-mingw.patch index aa655c4c3a..2f12e4ba80 100644 --- a/mingw-w64-python/0063-3.7-mpdec-mingw.patch +++ b/mingw-w64-python/0063-3.7-mpdec-mingw.patch @@ -1,4 +1,4 @@ -From 7a0df95df28891098cfd005480db24f1ad365b8d Mon Sep 17 00:00:00 2001 +From 99b4a6d8885130f28e54064c6c605ed8ced33546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:17 +0530 @@ -22,5 +22,5 @@ index b163d4c..c2fa950 100644 depends = ['_decimal/docstrings.h'] else: -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0064-disable-readline.patch b/mingw-w64-python/0064-disable-readline.patch index 5f4c2f188c..d88496291e 100644 --- a/mingw-w64-python/0064-disable-readline.patch +++ b/mingw-w64-python/0064-disable-readline.patch @@ -1,4 +1,4 @@ -From 2b5faf6d690f858fee96f2c0cacb9d70d6dce358 Mon Sep 17 00:00:00 2001 +From 212391ba1d8457cd53105e892424136c31d75e39 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:17 +0530 Subject: [PATCH 064/N] disable readline @@ -28,5 +28,5 @@ index c2fa950..5cb6340 100644 curses_library = "" # Cannot use os.popen here in py3k. -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0065-fix-isselectable.patch b/mingw-w64-python/0065-fix-isselectable.patch index 1f52b65612..bc8e50fb8b 100644 --- a/mingw-w64-python/0065-fix-isselectable.patch +++ b/mingw-w64-python/0065-fix-isselectable.patch @@ -1,4 +1,4 @@ -From 0b3bba81ad378b3b066ff8ac731504dc43ca48a7 Mon Sep 17 00:00:00 2001 +From cb24744da8d91d5aaa5f7a33865e98aa61466b61 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:18 +0530 Subject: [PATCH 065/N] fix isselectable @@ -25,5 +25,5 @@ index 6ec2994..a80f195 100644 #define _PyIsSelectable_fd(FD) (1) #else -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0066-use-_wcsnicmp-instead-wcsncasecmp.patch b/mingw-w64-python/0066-use-_wcsnicmp-instead-wcsncasecmp.patch index b9d92805fe..24471ce73e 100644 --- a/mingw-w64-python/0066-use-_wcsnicmp-instead-wcsncasecmp.patch +++ b/mingw-w64-python/0066-use-_wcsnicmp-instead-wcsncasecmp.patch @@ -1,4 +1,4 @@ -From 0481a789688abc85515cbb7c2bce6c5116d6f3c6 Mon Sep 17 00:00:00 2001 +From 6bd60558990f5d4fb65d8863fcd7163acece0340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:19 +0530 @@ -22,5 +22,5 @@ index c782e0f..83422d3 100644 } -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0067-_xxsubinterpretersmodule.patch b/mingw-w64-python/0067-_xxsubinterpretersmodule.patch index cde64a68ea..f0ca8dff63 100644 --- a/mingw-w64-python/0067-_xxsubinterpretersmodule.patch +++ b/mingw-w64-python/0067-_xxsubinterpretersmodule.patch @@ -1,4 +1,4 @@ -From 6ce1a86d6e4ba68acda926d20673207f8743dd94 Mon Sep 17 00:00:00 2001 +From 34fb7648db4c306f87909871caba5ec545d69be1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:20 +0530 @@ -22,5 +22,5 @@ index 314059d..f26e662 100644 sizeof(channelid), /* tp_basicsize */ 0, /* tp_itemsize */ -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0068-sqlite3-module-defines.patch b/mingw-w64-python/0068-sqlite3-module-defines.patch index 9fbea17b61..3300371010 100644 --- a/mingw-w64-python/0068-sqlite3-module-defines.patch +++ b/mingw-w64-python/0068-sqlite3-module-defines.patch @@ -1,4 +1,4 @@ -From 50a2c1f39b9d347264a7ad34ef5bfcd2bf289edf Mon Sep 17 00:00:00 2001 +From ef8caf27c0993882bb69b81e34b9498e174c5abf Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:21 +0530 Subject: [PATCH 068/N] sqlite3 module defines @@ -24,5 +24,5 @@ index 5cb6340..0145e58 100644 # Enable support for loadable extensions in the sqlite3 module # if --enable-loadable-sqlite-extensions configure option is used. -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0069-configure.ac-fix-inet_pton-check.patch b/mingw-w64-python/0069-configure.ac-fix-inet_pton-check.patch index 4e52214f29..c51180a5fc 100644 --- a/mingw-w64-python/0069-configure.ac-fix-inet_pton-check.patch +++ b/mingw-w64-python/0069-configure.ac-fix-inet_pton-check.patch @@ -1,4 +1,4 @@ -From 67f0b565939896e65628dc1c3e878bbb379e1206 Mon Sep 17 00:00:00 2001 +From 8d0e4e8392e414a0e2be53bbea61b346e974627d Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:23 +0530 Subject: [PATCH 069/N] configure.ac: fix inet_pton check @@ -12,7 +12,7 @@ Co-authored-by: Алексей 1 file changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac -index 76e7c2d..00adda1 100644 +index 94f8e57..bffc8c9 100644 --- a/configure.ac +++ b/configure.ac @@ -4286,10 +4286,14 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ @@ -31,5 +31,5 @@ index 76e7c2d..00adda1 100644 [AC_DEFINE(HAVE_INET_PTON, 1, Define if you have the 'inet_pton' function.) AC_MSG_RESULT(yes)], -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0070-set-venv-activate-path-unix.patch b/mingw-w64-python/0070-set-venv-activate-path-unix.patch index b8053356bc..2c1f729c97 100644 --- a/mingw-w64-python/0070-set-venv-activate-path-unix.patch +++ b/mingw-w64-python/0070-set-venv-activate-path-unix.patch @@ -1,4 +1,4 @@ -From 2157c9f4958ffb7617ae015a2c72ad5d993f4b81 Mon Sep 17 00:00:00 2001 +From 45f9c7d0617640f90f548dc3d50ebf6736cc23ac Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Thu, 17 Jun 2021 18:52:25 +0530 Subject: [PATCH 070/N] set venv activate path unix @@ -25,5 +25,5 @@ index 45af353..877b5d3 100644 _OLD_VIRTUAL_PATH="$PATH" -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0071-venv-creation-fixes.patch b/mingw-w64-python/0071-venv-creation-fixes.patch index 94d04b2246..e66aaba86b 100644 --- a/mingw-w64-python/0071-venv-creation-fixes.patch +++ b/mingw-w64-python/0071-venv-creation-fixes.patch @@ -1,4 +1,4 @@ -From a23e3abe3a2ceb28a880b1b568bbba4f1ac2c03d Mon Sep 17 00:00:00 2001 +From 4f9395e3ad13f42e5e45cb9bd20d5a8f3c42af6a Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:26 +0530 Subject: [PATCH 071/N] venv creation fixes @@ -66,5 +66,5 @@ index 6f1af29..83ba0bc 100644 def setup_scripts(self, context): """ -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0072-pass-gen-profile-ldflags.patch b/mingw-w64-python/0072-pass-gen-profile-ldflags.patch index 450d167da6..605ae801a6 100644 --- a/mingw-w64-python/0072-pass-gen-profile-ldflags.patch +++ b/mingw-w64-python/0072-pass-gen-profile-ldflags.patch @@ -1,4 +1,4 @@ -From aa4e6ec5011ada849755b91ea8a9249576f288c1 Mon Sep 17 00:00:00 2001 +From 2af806ebc1f45c34a5b41c6a309a6685fece2125 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:27 +0530 Subject: [PATCH 072/N] pass gen profile ldflags @@ -25,5 +25,5 @@ index fd3d142..8df163c 100644 fi -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0073-pkg-config-windows-must-link-ext-with-python-lib.patch b/mingw-w64-python/0073-pkg-config-windows-must-link-ext-with-python-lib.patch index c41bcbb72a..ff1815040d 100644 --- a/mingw-w64-python/0073-pkg-config-windows-must-link-ext-with-python-lib.patch +++ b/mingw-w64-python/0073-pkg-config-windows-must-link-ext-with-python-lib.patch @@ -1,4 +1,4 @@ -From c89a342b31623f64163f47e13b93dfb82d4ee94f Mon Sep 17 00:00:00 2001 +From 21da18a81e8956b7c8078cf2b05de85bd7540213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:29 +0530 @@ -21,7 +21,7 @@ index 87e04de..3900190 100644 +Libs: -L${libdir} -lpython@VERSION@@ABIFLAGS@ Cflags: -I${includedir}/python@VERSION@@ABIFLAGS@ diff --git a/configure.ac b/configure.ac -index 00adda1..0247a1f 100644 +index bffc8c9..297d150 100644 --- a/configure.ac +++ b/configure.ac @@ -5161,7 +5161,7 @@ AC_MSG_RESULT($LDVERSION) @@ -34,5 +34,5 @@ index 00adda1..0247a1f 100644 else LIBPYTHON='' -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0074-importlib-bootstrap-path-sep.patch b/mingw-w64-python/0074-importlib-bootstrap-path-sep.patch index 4e262623a8..65f6bf5149 100644 --- a/mingw-w64-python/0074-importlib-bootstrap-path-sep.patch +++ b/mingw-w64-python/0074-importlib-bootstrap-path-sep.patch @@ -1,4 +1,4 @@ -From 320d4e20eb8cadc43ff39028866457af5ea3dd31 Mon Sep 17 00:00:00 2001 +From 57beef55b040c9ee905412eccb25f6ebca53e96e Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:30 +0530 Subject: [PATCH 074/N] importlib bootstrap path sep @@ -27,5 +27,5 @@ index f3828b1..5dafdfe 100644 setattr(self_module, 'path_sep', path_sep) setattr(self_module, 'path_separators', ''.join(path_separators)) -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0075-pathlib-path-sep.patch b/mingw-w64-python/0075-pathlib-path-sep.patch index abd427c92a..f6617ae3f5 100644 --- a/mingw-w64-python/0075-pathlib-path-sep.patch +++ b/mingw-w64-python/0075-pathlib-path-sep.patch @@ -1,4 +1,4 @@ -From 0c6bfbbfe1bedcab925cfe7c79622ce14d20d023 Mon Sep 17 00:00:00 2001 +From cc7970929c25d14c0c3a54e52464a75bb2dcd679 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:31 +0530 Subject: [PATCH 075/N] pathlib path sep @@ -21,5 +21,5 @@ index 7aeda14..a66e754 100644 pathmod = ntpath -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0076-warnings-fixes.patch b/mingw-w64-python/0076-warnings-fixes.patch index 8c319886fa..6d8f8f82f2 100644 --- a/mingw-w64-python/0076-warnings-fixes.patch +++ b/mingw-w64-python/0076-warnings-fixes.patch @@ -1,4 +1,4 @@ -From 11eaff1366c0688bc54026a2d96f1c79846b45df Mon Sep 17 00:00:00 2001 +From 3c73b59e791f9768bdcf931a4d8258ce57c8e311 Mon Sep 17 00:00:00 2001 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 @@ -127,5 +127,5 @@ index 0ce5e94..6a6fe7e 100644 /* minimum/maximum thread stack sizes supported */ -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0077-fix-build-testinternalcapi.patch b/mingw-w64-python/0077-fix-build-testinternalcapi.patch index 713f1c0e86..e50b49bf46 100644 --- a/mingw-w64-python/0077-fix-build-testinternalcapi.patch +++ b/mingw-w64-python/0077-fix-build-testinternalcapi.patch @@ -1,4 +1,4 @@ -From e6ac2710186565b91ae34f9d18b00dbee5f261ea Mon Sep 17 00:00:00 2001 +From 2494221304db449ce507238aaae8374fbecf099d Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:34 +0530 Subject: [PATCH 077/N] fix build testinternalcapi @@ -24,5 +24,5 @@ index 0145e58..a31cef9 100644 # Python PEP-3118 (buffer protocol) test module -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0078-extend-MS_WINDOWS-flag.patch b/mingw-w64-python/0078-extend-MS_WINDOWS-flag.patch index 82685ecc8c..fee6f358d1 100644 --- a/mingw-w64-python/0078-extend-MS_WINDOWS-flag.patch +++ b/mingw-w64-python/0078-extend-MS_WINDOWS-flag.patch @@ -1,4 +1,4 @@ -From 9505b3e72221f801f375de86450ea4cf6853d7dd Mon Sep 17 00:00:00 2001 +From d84e4e7bc5e055afd75d4bb5b0bfaa3951d3a2d3 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Thu, 17 Jun 2021 18:52:34 +0530 Subject: [PATCH 078/N] extend MS_WINDOWS flag @@ -21,5 +21,5 @@ index a31cef9..4f697e7 100644 MACOS = (HOST_PLATFORM == 'darwin') AIX = (HOST_PLATFORM.startswith('aix')) -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0079-clang-arm64.patch b/mingw-w64-python/0079-clang-arm64.patch index 490dbbab47..f7d62421f1 100644 --- a/mingw-w64-python/0079-clang-arm64.patch +++ b/mingw-w64-python/0079-clang-arm64.patch @@ -1,4 +1,4 @@ -From ac47103daa3f2523db1e13354a53ae9b059a61e1 Mon Sep 17 00:00:00 2001 +From 81fb2f3a822131c337cdf02a994a2afa18729769 Mon Sep 17 00:00:00 2001 From: jeremyd2019 <4524874+jeremyd2019@users.noreply.github.com> Date: Thu, 17 Jun 2021 18:52:36 +0530 Subject: [PATCH 079/N] clang arm64 @@ -45,5 +45,5 @@ index adccaa7..b529e29 100644 #elif defined(__cplusplus) #define COMPILER "[C++]" -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0080-configure.ac-set-MINGW-stack-reserve.patch b/mingw-w64-python/0080-configure.ac-set-MINGW-stack-reserve.patch index b32167d623..739897551e 100644 --- a/mingw-w64-python/0080-configure.ac-set-MINGW-stack-reserve.patch +++ b/mingw-w64-python/0080-configure.ac-set-MINGW-stack-reserve.patch @@ -1,4 +1,4 @@ -From e03291ed811edbafbee9d67189b9ba991d37ffaf Mon Sep 17 00:00:00 2001 +From 5613a4296ca7b47e667014118d1c51d8631ec04a Mon Sep 17 00:00:00 2001 From: jeremyd2019 <4524874+jeremyd2019@users.noreply.github.com> Date: Thu, 17 Jun 2021 18:52:37 +0530 Subject: [PATCH 080/N] configure.ac: set MINGW stack reserve @@ -8,7 +8,7 @@ Subject: [PATCH 080/N] configure.ac: set MINGW stack reserve 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac -index 0247a1f..8cde5ef 100644 +index 297d150..9729fb8 100644 --- a/configure.ac +++ b/configure.ac @@ -3072,6 +3072,11 @@ then @@ -24,5 +24,5 @@ index 0247a1f..8cde5ef 100644 AC_MSG_RESULT($LINKFORSHARED) -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0081-Don-t-use-os.pathsep-to-find-EOF.patch b/mingw-w64-python/0081-Don-t-use-os.pathsep-to-find-EOF.patch index 27d222ad22..9bfc10b753 100644 --- a/mingw-w64-python/0081-Don-t-use-os.pathsep-to-find-EOF.patch +++ b/mingw-w64-python/0081-Don-t-use-os.pathsep-to-find-EOF.patch @@ -1,4 +1,4 @@ -From 99a2c7b6fd09afc49c4616543c0e19e5f2ed2c4a Mon Sep 17 00:00:00 2001 +From 9721585754e8b24cf9a3f61c47f7c4ab665dc532 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 18 Jun 2021 12:38:11 +0530 Subject: [PATCH 081/N] Don't use os.pathsep to find EOF not all @@ -23,5 +23,5 @@ index b344f03..474ef89 100644 else: eof = 'Ctrl-D (i.e. EOF)' -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch b/mingw-w64-python/0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch index b8e19783a2..c8aef4a929 100644 --- a/mingw-w64-python/0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch +++ b/mingw-w64-python/0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch @@ -1,4 +1,4 @@ -From b3f3fbe2163378ad77906e6e6b47281c1cc6d565 Mon Sep 17 00:00:00 2001 +From 2d72b9c2c8a9eb21e3a3c8948224afac0ff30318 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Wed, 23 Jun 2021 18:12:12 +0530 Subject: [PATCH 082/N] Fix extension suffix for c-extensions on mingw @@ -69,7 +69,7 @@ index bd34310..60fb603 100644 PYD_UNTAGGED_SUFFIX, NULL diff --git a/configure.ac b/configure.ac -index 8cde5ef..dda57c9 100644 +index 9729fb8..59ecc69 100644 --- a/configure.ac +++ b/configure.ac @@ -2832,7 +2832,7 @@ if test -z "$SHLIB_SUFFIX"; then @@ -178,5 +178,5 @@ index 8cde5ef..dda57c9 100644 case $ac_sys_system in AIX*) -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0083-Change-the-get_platform-method-in-sysconfig.patch b/mingw-w64-python/0083-Change-the-get_platform-method-in-sysconfig.patch index ad020a02d1..cbd540080d 100644 --- a/mingw-w64-python/0083-Change-the-get_platform-method-in-sysconfig.patch +++ b/mingw-w64-python/0083-Change-the-get_platform-method-in-sysconfig.patch @@ -1,4 +1,4 @@ -From 1e2b5e19ce461468a3c7b411ce6d39dfcc159c54 Mon Sep 17 00:00:00 2001 +From dd58cb2e11652afa22a6486bced42bc566642281 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:36:58 +0200 Subject: [PATCH 083/N] Change the `get_platform()` method in sysconfig @@ -60,5 +60,5 @@ index b529e29..2d935fe 100644 #elif defined(__cplusplus) #define COMPILER "[C++]" -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0084-distutils-compiler-customize-mingw-cygwin-compilers.patch b/mingw-w64-python/0084-distutils-compiler-customize-mingw-cygwin-compilers.patch index 2011695d73..c09fa56d7a 100644 --- a/mingw-w64-python/0084-distutils-compiler-customize-mingw-cygwin-compilers.patch +++ b/mingw-w64-python/0084-distutils-compiler-customize-mingw-cygwin-compilers.patch @@ -1,4 +1,4 @@ -From 593c93c89426a4399477862f8c854f1753549f6d Mon Sep 17 00:00:00 2001 +From ddc71b4ec4155d91c2dc76596e12fa84d2fb3d54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:21 +0530 @@ -50,5 +50,5 @@ index 37feae5..bbe8e3c 100644 if not get_config_var('CUSTOMIZED_OSX_COMPILER'): import _osx_support -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0085-distutils-compiler-enable-new-dtags.patch b/mingw-w64-python/0085-distutils-compiler-enable-new-dtags.patch index 849e169b7d..db284d8b1a 100644 --- a/mingw-w64-python/0085-distutils-compiler-enable-new-dtags.patch +++ b/mingw-w64-python/0085-distutils-compiler-enable-new-dtags.patch @@ -1,4 +1,4 @@ -From eb605091656b922dae210abba844eb04ee6c846f Mon Sep 17 00:00:00 2001 +From 501311b587252ca0686c2d9a0ebb70f8817ccf24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:22 +0530 @@ -33,5 +33,5 @@ index d00c489..76a7d82 100644 return "-Wl,-R" + dir else: -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0086-distutils-MINGW-build-extensions-with-GCC.patch b/mingw-w64-python/0086-distutils-MINGW-build-extensions-with-GCC.patch index 29e76227b4..1df6526888 100644 --- a/mingw-w64-python/0086-distutils-MINGW-build-extensions-with-GCC.patch +++ b/mingw-w64-python/0086-distutils-MINGW-build-extensions-with-GCC.patch @@ -1,4 +1,4 @@ -From a6829b9208ca5e89b7cde5856fa74fda1c6fb721 Mon Sep 17 00:00:00 2001 +From b4e50520579c13c104ebf84966a1ddeb605f6e7b Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 20:52:22 +0200 Subject: [PATCH 086/N] distutils: MINGW build extensions with GCC @@ -56,5 +56,5 @@ index 4b002ec..7b2e1e0 100644 return 'win-amd64' if '(arm)' in sys.version.lower(): -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch b/mingw-w64-python/0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch index 1b917f6d28..d59a7ea573 100644 --- a/mingw-w64-python/0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch +++ b/mingw-w64-python/0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch @@ -1,4 +1,4 @@ -From a95c530b081aa2950da922ffd34ecdeef792005b Mon Sep 17 00:00:00 2001 +From 23bd6cb2d4ad7b3039850141b0dfdc108d47d642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:35 +0530 @@ -69,5 +69,5 @@ index 66c12dd..1960ef8 100644 # Because these compilers aren't configured in Python's pyconfig.h file by # default, we should at least warn the user if he is using an unmodified -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0088-distutils-find-import-library.patch b/mingw-w64-python/0088-distutils-find-import-library.patch index 12ef2e926c..d0be72dac5 100644 --- a/mingw-w64-python/0088-distutils-find-import-library.patch +++ b/mingw-w64-python/0088-distutils-find-import-library.patch @@ -1,4 +1,4 @@ -From 30226edc2050f2ee20a827457ffa6c7f923b1546 Mon Sep 17 00:00:00 2001 +From 01c1cc5da39af97c66f08a31cf85800cbfa3eb82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:36 +0530 @@ -25,5 +25,5 @@ index 1960ef8..39ad631 100644 shared_lib_format = "%s%s" exe_extension = ".exe" -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0089-distutils-avoid-circular-dependency-from-time-module.patch b/mingw-w64-python/0089-distutils-avoid-circular-dependency-from-time-module.patch index 9fd0f466f0..2eda52511c 100644 --- a/mingw-w64-python/0089-distutils-avoid-circular-dependency-from-time-module.patch +++ b/mingw-w64-python/0089-distutils-avoid-circular-dependency-from-time-module.patch @@ -1,4 +1,4 @@ -From fbe701a809e2eca1e71ccb8042aaf90ac73bcf71 Mon Sep 17 00:00:00 2001 +From de7f42ea6e3b446d6e13dcce0f86ed853cc1015f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:41 +0530 @@ -34,5 +34,5 @@ index 39ad631..5b281e2 100644 try: out_string = out.read() -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0090-distutils-generalization-of-posix-build-in-distutils.patch b/mingw-w64-python/0090-distutils-generalization-of-posix-build-in-distutils.patch index e7f8e3c388..f2be8002dd 100644 --- a/mingw-w64-python/0090-distutils-generalization-of-posix-build-in-distutils.patch +++ b/mingw-w64-python/0090-distutils-generalization-of-posix-build-in-distutils.patch @@ -1,4 +1,4 @@ -From 6b101748cfddcca92dd1212124005aca974bd8dc Mon Sep 17 00:00:00 2001 +From 8e57a4ab89a8a8edb8fcc7cef18c45f92542b5ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:41 +0530 @@ -91,5 +91,5 @@ index bbe8e3c..80d3523 100644 if (not os.path.isabs(_config_vars['srcdir']) and base != os.getcwd()): -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0091-distutils-mingw-sysconfig-like-posix.patch b/mingw-w64-python/0091-distutils-mingw-sysconfig-like-posix.patch index 0a02d9a1c4..974be40fa3 100644 --- a/mingw-w64-python/0091-distutils-mingw-sysconfig-like-posix.patch +++ b/mingw-w64-python/0091-distutils-mingw-sysconfig-like-posix.patch @@ -1,4 +1,4 @@ -From 89701176c17dbf7cbb694b1c770d0bafc25a19f4 Mon Sep 17 00:00:00 2001 +From fbe33bbd64db797141b68b351f56e9569d773457 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 20:53:29 +0200 Subject: [PATCH 091/N] distutils: mingw sysconfig like posix @@ -24,5 +24,5 @@ index 1c9d471..1dbdfe0 100644 # building python standard extensions self.library_dirs.append('.') -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0092-distutils-get_versions-fixes.patch b/mingw-w64-python/0092-distutils-get_versions-fixes.patch index c0a05887e6..dad1ee7832 100644 --- a/mingw-w64-python/0092-distutils-get_versions-fixes.patch +++ b/mingw-w64-python/0092-distutils-get_versions-fixes.patch @@ -1,4 +1,4 @@ -From 9bda981cf45ebfcff18d7e5fe2a608920fe1075a Mon Sep 17 00:00:00 2001 +From 68492252f8ec7288b738061f2d45b1054c1fb598 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:14:31 +0200 Subject: [PATCH 092/N] distutils: get_versions() fixes @@ -52,5 +52,5 @@ index 5b281e2..fba3485 100644 def is_cygwingcc(): -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0093-distutils-install-layout-as-posix.patch b/mingw-w64-python/0093-distutils-install-layout-as-posix.patch index 1a4feea546..d9c07e906c 100644 --- a/mingw-w64-python/0093-distutils-install-layout-as-posix.patch +++ b/mingw-w64-python/0093-distutils-install-layout-as-posix.patch @@ -1,4 +1,4 @@ -From 895db8936b79b07e671e80856be967c5e2149559 Mon Sep 17 00:00:00 2001 +From 5a230215df6a11ad7d36396a73c704d6890fb6b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:59 +0530 @@ -43,5 +43,5 @@ index aaa300e..c611252 100644 } -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0094-distutils-msys-convert_path-fix-and-root-hack.patch b/mingw-w64-python/0094-distutils-msys-convert_path-fix-and-root-hack.patch index 9c8e6803b5..025ad2c918 100644 --- a/mingw-w64-python/0094-distutils-msys-convert_path-fix-and-root-hack.patch +++ b/mingw-w64-python/0094-distutils-msys-convert_path-fix-and-root-hack.patch @@ -1,4 +1,4 @@ -From 6d177f751f34f631be742e28ca4a5a71f1232b66 Mon Sep 17 00:00:00 2001 +From 6069c12c833233f2226421f2452a0585db0539ad Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:18:50 +0200 Subject: [PATCH 094/N] distutils: msys convert_path fix and root hack @@ -75,5 +75,5 @@ index 7b2e1e0..75a369d 100644 else: raise DistutilsPlatformError("nothing known about platform '%s'" % os.name) -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0095-distutils-mingw-build-optimized-ext.patch b/mingw-w64-python/0095-distutils-mingw-build-optimized-ext.patch index 621eacf382..c341fbca95 100644 --- a/mingw-w64-python/0095-distutils-mingw-build-optimized-ext.patch +++ b/mingw-w64-python/0095-distutils-mingw-build-optimized-ext.patch @@ -1,4 +1,4 @@ -From 35730adeb9d2ce29f5da78e817b4bad2eb195a55 Mon Sep 17 00:00:00 2001 +From 2b1be68382f9f0d540b453b56dd46b242b583785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:04 +0530 @@ -30,5 +30,5 @@ index fba3485..bb97880 100644 linker_so='%s %s %s' % (self.linker_dll, shared_option, -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch b/mingw-w64-python/0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch index 698f063266..c85e051026 100644 --- a/mingw-w64-python/0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch +++ b/mingw-w64-python/0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch @@ -1,4 +1,4 @@ -From 8ca4acd537111c3be58a67750b6cd87b95a54545 Mon Sep 17 00:00:00 2001 +From 3835ff861f80317149377362a3134d1a69b2fc14 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:52:05 +0530 Subject: [PATCH 096/N] distutils: cygwinccompiler dont strip modules if @@ -26,5 +26,5 @@ index bb97880..c134525 100644 UnixCCompiler.link(self, target_desc, objects, output_filename, -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0097-distutils-get-compilers-from-env-vars.patch b/mingw-w64-python/0097-distutils-get-compilers-from-env-vars.patch index f3a903e8a5..f19de6379b 100644 --- a/mingw-w64-python/0097-distutils-get-compilers-from-env-vars.patch +++ b/mingw-w64-python/0097-distutils-get-compilers-from-env-vars.patch @@ -1,4 +1,4 @@ -From cbb3f88ebcaf8416869901bc0ee5a71ff22972f9 Mon Sep 17 00:00:00 2001 +From e97732808f5c18db0f921b9b20863b630991dbd5 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Tue, 17 Aug 2021 20:26:05 +0700 Subject: [PATCH 097/N] distutils: get compilers from env vars @@ -157,5 +157,5 @@ index c134525..75bc17b 100644 + out_string = check_output([cc, '-dumpmachine']) return out_string.strip().endswith(b'cygwin') -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0098-distutils-add-windmc-to-cygwinccompiler.patch b/mingw-w64-python/0098-distutils-add-windmc-to-cygwinccompiler.patch index 4dbbf44fdb..269e44d944 100644 --- a/mingw-w64-python/0098-distutils-add-windmc-to-cygwinccompiler.patch +++ b/mingw-w64-python/0098-distutils-add-windmc-to-cygwinccompiler.patch @@ -1,4 +1,4 @@ -From b71f19f775d7fc3ba41b2bd689428fc4d8199352 Mon Sep 17 00:00:00 2001 +From c467ffc04ee72add93701607e72e3d74198936d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:28 +0530 @@ -54,5 +54,5 @@ index 75bc17b..6a40e80 100644 (ext, src_name)) base = os.path.splitdrive(base)[1] # Chop off the drive -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0099-distutils-fix-msvc9-import.patch b/mingw-w64-python/0099-distutils-fix-msvc9-import.patch index 77fc6d6f55..59637e1cc0 100644 --- a/mingw-w64-python/0099-distutils-fix-msvc9-import.patch +++ b/mingw-w64-python/0099-distutils-fix-msvc9-import.patch @@ -1,4 +1,4 @@ -From 4f4ca7d009a1b52533baa54c040b13cd5760628a Mon Sep 17 00:00:00 2001 +From 94a1bdbdc7d30d9bff63f89727f53c530006ca5d Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 17 Jun 2021 18:52:24 +0530 Subject: [PATCH 099/N] distutils: fix msvc9 import @@ -34,5 +34,5 @@ index a7976fb..c341679 100644 self.__root = r"Software\Microsoft\VisualStudio" # self.__macros = MACROS -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0100-distutils-mingw-add-LIBPL-to-library-dirs.patch b/mingw-w64-python/0100-distutils-mingw-add-LIBPL-to-library-dirs.patch index 6f137e2063..874408eb46 100644 --- a/mingw-w64-python/0100-distutils-mingw-add-LIBPL-to-library-dirs.patch +++ b/mingw-w64-python/0100-distutils-mingw-add-LIBPL-to-library-dirs.patch @@ -1,4 +1,4 @@ -From c5ecc33a0ad265c08a6da56e822517c2aada6365 Mon Sep 17 00:00:00 2001 +From 67c57ef9e5f9c55d72698bb2e8d823a8f86dc621 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:06 +0530 @@ -22,5 +22,5 @@ index 1dbdfe0..1598735 100644 # building third party extensions config_dir_name = os.path.basename(sysconfig.get_config_var('LIBPL')) -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0101-distutils-Change-the-get_platform-method-in-distutil.patch b/mingw-w64-python/0101-distutils-Change-the-get_platform-method-in-distutil.patch index 909748288b..6cfa5e051a 100644 --- a/mingw-w64-python/0101-distutils-Change-the-get_platform-method-in-distutil.patch +++ b/mingw-w64-python/0101-distutils-Change-the-get_platform-method-in-distutil.patch @@ -1,4 +1,4 @@ -From 474ae21ca1335649dc8e024a2a5da466219898e2 Mon Sep 17 00:00:00 2001 +From 11a5561b5be99d671743894470a2adc27f796b64 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:37:23 +0200 Subject: [PATCH 101/N] distutils: Change the `get_platform()` method in @@ -40,5 +40,5 @@ index 75a369d..5b51c76 100644 return 'win-amd64' if '(arm)' in sys.version.lower(): -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0102-build-Fix-ncursesw-include-lookup.patch b/mingw-w64-python/0102-build-Fix-ncursesw-include-lookup.patch index 6169aafdc7..3d95313bba 100644 --- a/mingw-w64-python/0102-build-Fix-ncursesw-include-lookup.patch +++ b/mingw-w64-python/0102-build-Fix-ncursesw-include-lookup.patch @@ -1,4 +1,4 @@ -From 7a48d9483e6e3e7681283bc9e856970b4e6882c0 Mon Sep 17 00:00:00 2001 +From 228556c0bb852e9be30abc25d442d80bdf7e6f63 Mon Sep 17 00:00:00 2001 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 @@ -25,7 +25,7 @@ index 4430d21..99bed41 100644 ########################################################################## # Parser diff --git a/configure.ac b/configure.ac -index dda57c9..13bb97d 100644 +index 59ecc69..e0d48ea 100644 --- a/configure.ac +++ b/configure.ac @@ -5568,10 +5568,17 @@ then @@ -61,5 +61,5 @@ index 4f697e7..efc9ec7 100644 # _curses_panel.so must link with panelw. panel_library = 'panelw' -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0103-tests-fix-test_bytes.patch b/mingw-w64-python/0103-tests-fix-test_bytes.patch index fe56b19733..75bf2d658e 100644 --- a/mingw-w64-python/0103-tests-fix-test_bytes.patch +++ b/mingw-w64-python/0103-tests-fix-test_bytes.patch @@ -1,4 +1,4 @@ -From 4f3e0b488acf29ec0d6c27198424c0841f310fc0 Mon Sep 17 00:00:00 2001 +From 15bdfabc3b6ed9b2a919df7138a9f67c66b7e91a Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 23 Jul 2021 08:51:32 +0200 Subject: [PATCH 103/N] tests: fix test_bytes @@ -23,5 +23,5 @@ index 227e6d7..193ce10 100644 return (ptr_format % ptr) else: -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0104-time-fix-strftime-not-raising-for-invalid-year-value.patch b/mingw-w64-python/0104-time-fix-strftime-not-raising-for-invalid-year-value.patch index dfbe3c4af4..702e77c098 100644 --- a/mingw-w64-python/0104-time-fix-strftime-not-raising-for-invalid-year-value.patch +++ b/mingw-w64-python/0104-time-fix-strftime-not-raising-for-invalid-year-value.patch @@ -1,4 +1,4 @@ -From 24fa5b51121c13b1450d1cf8a9fd69445f793e1e Mon Sep 17 00:00:00 2001 +From c492a2a595a907c1bd29d60b2f39aa5122026208 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 23 Jul 2021 08:52:50 +0200 Subject: [PATCH 104/N] time: fix strftime not raising for invalid year @@ -24,5 +24,5 @@ index df59f2a..ded8165 100644 PyErr_SetString(PyExc_ValueError, "strftime() requires year in [1; 9999]"); -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0105-ctypes-find_library-c-should-return-None-with-ucrt.patch b/mingw-w64-python/0105-ctypes-find_library-c-should-return-None-with-ucrt.patch index d34884f9e2..a4fd62a071 100644 --- a/mingw-w64-python/0105-ctypes-find_library-c-should-return-None-with-ucrt.patch +++ b/mingw-w64-python/0105-ctypes-find_library-c-should-return-None-with-ucrt.patch @@ -1,4 +1,4 @@ -From 87dc4a7a0878c944af7c6544d9e18f65bd0730a1 Mon Sep 17 00:00:00 2001 +From d8c278a2d22163036f8929504b2ff7118838223f Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 23 Jul 2021 18:23:58 +0200 Subject: [PATCH 105/N] ctypes: find_library('c') should return None with @@ -37,5 +37,5 @@ index 0c2510e..48ddb3b 100644 # See MSDN for the REAL search order. for directory in os.environ['PATH'].split(os.pathsep): -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0106-build-Disable-checks-for-dlopen-dlfcn.patch b/mingw-w64-python/0106-build-Disable-checks-for-dlopen-dlfcn.patch index 745a559b6d..9b5ccbaa2b 100644 --- a/mingw-w64-python/0106-build-Disable-checks-for-dlopen-dlfcn.patch +++ b/mingw-w64-python/0106-build-Disable-checks-for-dlopen-dlfcn.patch @@ -1,4 +1,4 @@ -From 92035a57d06a23693bcab4eba21fc8d19a8b00d7 Mon Sep 17 00:00:00 2001 +From 892166ff51d177cc3537cbf281dfcd6a8542cca9 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 13:54:12 +0200 Subject: [PATCH 106/N] build: Disable checks for dlopen/dlfcn @@ -10,7 +10,7 @@ checks for it. 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 13bb97d..2c7b92b 100644 +index e0d48ea..431b3aa 100644 --- a/configure.ac +++ b/configure.ac @@ -2430,7 +2430,7 @@ dnl AC_MSG_RESULT($cpp_type) @@ -25,7 +25,7 @@ index 13bb97d..2c7b92b 100644 @@ -2444,6 +2444,12 @@ sys/times.h sys/types.h sys/uio.h sys/un.h sys/utsname.h sys/wait.h pty.h \ libutil.h sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \ linux/tipc.h linux/random.h spawn.h util.h alloca.h endian.h \ - sys/endian.h sys/sysmacros.h linux/auxvec.h linux/memfd.h linux/wait.h sys/memfd.h sys/mman.h) + sys/endian.h sys/sysmacros.h linux/auxvec.h sys/auxv.h linux/memfd.h linux/wait.h sys/memfd.h sys/mman.h) + +case $host in + *-*-mingw*) ;; @@ -62,5 +62,5 @@ index 13bb97d..2c7b92b 100644 # determine what size digit to use for Python's longs AC_MSG_CHECKING([digit size for Python's longs]) -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0107-Fix-install-location-of-the-import-library.patch b/mingw-w64-python/0107-Fix-install-location-of-the-import-library.patch index c212636bae..fdd164fcc1 100644 --- a/mingw-w64-python/0107-Fix-install-location-of-the-import-library.patch +++ b/mingw-w64-python/0107-Fix-install-location-of-the-import-library.patch @@ -1,4 +1,4 @@ -From a472d496c595905ad8f346651a9fb61d9a2a50f3 Mon Sep 17 00:00:00 2001 +From 41aa0b7e35c6f591d688b8d8bb8d808f9d5ed296 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 15:46:01 +0200 Subject: [PATCH 107/N] Fix install location of the import library @@ -21,5 +21,5 @@ index 99bed41..14bd6e3 100644 $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ fi; \ -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0108-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch b/mingw-w64-python/0108-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch index a4e7380838..bfe62dee83 100644 --- a/mingw-w64-python/0108-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch +++ b/mingw-w64-python/0108-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch @@ -1,4 +1,4 @@ -From 82ec304359ac067a5372273793047f928f02570b Mon Sep 17 00:00:00 2001 +From 0c2c260bfdddb8e6cd7e2d7a9c168bc00a0374ed Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 15:46:54 +0200 Subject: [PATCH 108/N] Set MSYS2_ARG_CONV_EXCL for the shared Python module @@ -22,5 +22,5 @@ index 14bd6e3..35055fb 100644 --prefix=$(prefix) \ --install-scripts=$(BINDIR) \ -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0109-build-Integrate-venvlauncher-build-installation-into.patch b/mingw-w64-python/0109-build-Integrate-venvlauncher-build-installation-into.patch index d577699f4e..3cebc649f9 100644 --- a/mingw-w64-python/0109-build-Integrate-venvlauncher-build-installation-into.patch +++ b/mingw-w64-python/0109-build-Integrate-venvlauncher-build-installation-into.patch @@ -1,4 +1,4 @@ -From 90a611fd2469d096e6b3936f5d6c61b7e64400ce Mon Sep 17 00:00:00 2001 +From d937db5eee48aced8aefa5df4636fc47bc9f965b Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 25 Jul 2021 16:53:35 +0200 Subject: [PATCH 109/N] build: Integrate venvlauncher build/installation into @@ -75,5 +75,5 @@ index 35055fb..498186f 100644 $(INSTALL_PROGRAM) $(STRIPFLAG) Mac/pythonw $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \ fi -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0110-configure.ac-set-_WIN32_WINNT-version.patch b/mingw-w64-python/0110-configure.ac-set-_WIN32_WINNT-version.patch index 1625852729..2e72849d2c 100644 --- a/mingw-w64-python/0110-configure.ac-set-_WIN32_WINNT-version.patch +++ b/mingw-w64-python/0110-configure.ac-set-_WIN32_WINNT-version.patch @@ -1,4 +1,4 @@ -From 9562e2886b860eb9d95a49d2ee1e8de952800ad0 Mon Sep 17 00:00:00 2001 +From ba0b794bdf258a9cad3734a2b37d4b84f4d4c8cc Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 1 Aug 2021 15:18:50 +0200 Subject: [PATCH 110/N] configure.ac: set _WIN32_WINNT version @@ -8,7 +8,7 @@ Subject: [PATCH 110/N] configure.ac: set _WIN32_WINNT version 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac -index 2c7b92b..7a7ade5 100644 +index 431b3aa..fb1f40d 100644 --- a/configure.ac +++ b/configure.ac @@ -3489,6 +3489,11 @@ else @@ -24,5 +24,5 @@ index 2c7b92b..7a7ade5 100644 AC_SUBST(USE_WIN32_MODULE) USE_WIN32_MODULE='#' -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0111-configure.ac-don-t-check-for-clock_-functions.patch b/mingw-w64-python/0111-configure.ac-don-t-check-for-clock_-functions.patch index fede115218..1ddf3f3fcd 100644 --- a/mingw-w64-python/0111-configure.ac-don-t-check-for-clock_-functions.patch +++ b/mingw-w64-python/0111-configure.ac-don-t-check-for-clock_-functions.patch @@ -1,4 +1,4 @@ -From f713187266cda921fcf061663116834d6109a8c8 Mon Sep 17 00:00:00 2001 +From b08d16df7ef855ecdf2efcd4eeb0251c7aa474f1 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 1 Aug 2021 18:35:17 +0200 Subject: [PATCH 111/N] configure.ac: don't check for clock_ functions @@ -9,7 +9,7 @@ They shouldn't be exposed on Windows and lead to winpthread being linked in 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac -index 7a7ade5..f19036d 100644 +index fb1f40d..15ddeda 100644 --- a/configure.ac +++ b/configure.ac @@ -4381,6 +4381,9 @@ char *r = crypt_r("", "", &d); @@ -32,5 +32,5 @@ index 7a7ade5..f19036d 100644 AC_MSG_CHECKING(for major, minor, and makedev) AC_LINK_IFELSE([AC_LANG_PROGRAM([[ -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0112-expanduser-normpath-paths-coming-from-env-vars.patch b/mingw-w64-python/0112-expanduser-normpath-paths-coming-from-env-vars.patch index cb42f5f37a..9ea49a71c5 100644 --- a/mingw-w64-python/0112-expanduser-normpath-paths-coming-from-env-vars.patch +++ b/mingw-w64-python/0112-expanduser-normpath-paths-coming-from-env-vars.patch @@ -1,4 +1,4 @@ -From f150637ba2355ea95234edf669aa186d3f62ec23 Mon Sep 17 00:00:00 2001 +From 7598b8ec6c6dc0ef06fee42d75c5db4601e4ed4f Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 8 Aug 2021 10:17:35 +0200 Subject: [PATCH 112/N] expanduser: normpath paths coming from env vars @@ -31,5 +31,5 @@ index 77f5614..5d1c6b9 100644 # Expand paths containing shell variable substitutions. -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0113-Add-support-for-Windows-7-Python-3.9.patch b/mingw-w64-python/0113-Add-support-for-Windows-7-Python-3.9.patch index f1ed23b988..3e9cbbca0a 100644 --- a/mingw-w64-python/0113-Add-support-for-Windows-7-Python-3.9.patch +++ b/mingw-w64-python/0113-Add-support-for-Windows-7-Python-3.9.patch @@ -1,4 +1,4 @@ -From 2528c80bd1cc9c86199aa7bd14604501c8ba0a14 Mon Sep 17 00:00:00 2001 +From 779bcb166dddb489b35f688323145c206e98d896 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Thu, 17 Jun 2021 18:52:39 +0530 Subject: [PATCH 113/N] Add support for Windows 7 Python 3.9 @@ -160,7 +160,7 @@ index 7c0eeab..2d03b74 100644 return _PyStatus_OK(); } diff --git a/configure.ac b/configure.ac -index f19036d..0aa6c8d 100644 +index 15ddeda..780b63d 100644 --- a/configure.ac +++ b/configure.ac @@ -5979,7 +5979,7 @@ AC_MSG_RESULT(done) @@ -173,5 +173,5 @@ index f19036d..0aa6c8d 100644 if test "$AWK" = "gawk"; then awk_extra_flag="--non-decimal-data" -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0114-CI-test-the-build-and-add-some-mingw-specific-tests.patch b/mingw-w64-python/0114-CI-test-the-build-and-add-some-mingw-specific-tests.patch index 4e26c7654b..36c767e96c 100644 --- a/mingw-w64-python/0114-CI-test-the-build-and-add-some-mingw-specific-tests.patch +++ b/mingw-w64-python/0114-CI-test-the-build-and-add-some-mingw-specific-tests.patch @@ -1,4 +1,4 @@ -From 877879dde596b3e3c230ef66c93ce5af5293b83f Mon Sep 17 00:00:00 2001 +From 5949f2c1a58436e656ca766682a1807db9115509 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 18 Jun 2021 17:51:59 +0530 Subject: [PATCH 114/N] CI: test the build and add some mingw specific tests @@ -585,5 +585,5 @@ index 0000000..70acbd1 +if __name__ == '__main__': + unittest.main(defaultTest='suite') -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0115-decimal-backport-build-fixes.patch b/mingw-w64-python/0115-decimal-backport-build-fixes.patch index 98eb2dbff3..b1d47cb941 100644 --- a/mingw-w64-python/0115-decimal-backport-build-fixes.patch +++ b/mingw-w64-python/0115-decimal-backport-build-fixes.patch @@ -1,4 +1,4 @@ -From ac2803d0d626ba30d73a3e4ad0ad55269e950776 Mon Sep 17 00:00:00 2001 +From ad61aa0491786e29425ded6330a02bbdc485a304 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 23 Sep 2021 09:55:32 +0200 Subject: [PATCH 115/N] decimal: backport build fixes @@ -31,5 +31,5 @@ index d80d791..28fd209 100644 sep = dotsep_as_utf8(spec.sep); if (sep == NULL) { -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0116-smoketests-test-that-_decimal-exists.patch b/mingw-w64-python/0116-smoketests-test-that-_decimal-exists.patch index 822678d726..38db70df8a 100644 --- a/mingw-w64-python/0116-smoketests-test-that-_decimal-exists.patch +++ b/mingw-w64-python/0116-smoketests-test-that-_decimal-exists.patch @@ -1,4 +1,4 @@ -From f23ad68a07a532e3d196b9c70f280874e3e42a0d Mon Sep 17 00:00:00 2001 +From b6fe411e3f2dca2447fa85ba30bedc1b6fd00d8a Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 23 Sep 2021 09:57:56 +0200 Subject: [PATCH 116/N] smoketests: test that _decimal exists @@ -22,5 +22,5 @@ index 70acbd1..527aafb 100644 import socket self.assertTrue(hasattr(socket, "inet_ntop")) -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0117-Prefer-sysconfig.python_build.patch b/mingw-w64-python/0117-Prefer-sysconfig.python_build.patch index bffd0788e9..b9c7ec5cfd 100644 --- a/mingw-w64-python/0117-Prefer-sysconfig.python_build.patch +++ b/mingw-w64-python/0117-Prefer-sysconfig.python_build.patch @@ -1,4 +1,4 @@ -From 2f6c46cdb54145bdc480d127bfaab88418ef2d67 Mon Sep 17 00:00:00 2001 +From 88857dfffec88cc6526fe79ce8c471f7b56ddb45 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Fri, 1 Oct 2021 07:28:36 +0700 Subject: [PATCH 117/N] Prefer sysconfig.python_build @@ -21,5 +21,5 @@ index 1598735..82a21d2 100644 config_dir_name = os.path.basename(sysconfig.get_config_var('LIBPL')) self.library_dirs.append(os.path.join(sys.prefix, "lib", -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0118-distutils-remove-checks-for-ancient-gcc-binutils.patch b/mingw-w64-python/0118-distutils-remove-checks-for-ancient-gcc-binutils.patch index 86e982aa3e..fcb79b841f 100644 --- a/mingw-w64-python/0118-distutils-remove-checks-for-ancient-gcc-binutils.patch +++ b/mingw-w64-python/0118-distutils-remove-checks-for-ancient-gcc-binutils.patch @@ -1,4 +1,4 @@ -From 28d3413a740ff91c3c8556d5bce7c15245ec327a Mon Sep 17 00:00:00 2001 +From 1473fd54edec0cc91f7a45be4237cde1f45fcc01 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 7 Nov 2021 23:06:13 +0100 Subject: [PATCH 118/N] distutils: remove checks for ancient gcc/binutils @@ -256,5 +256,5 @@ index 9dc869d..f525ab4 100644 # none -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0119-distutils-split-CC-env-var-before-passing-to-subproc.patch b/mingw-w64-python/0119-distutils-split-CC-env-var-before-passing-to-subproc.patch index 479689bf66..1cb97d692e 100644 --- a/mingw-w64-python/0119-distutils-split-CC-env-var-before-passing-to-subproc.patch +++ b/mingw-w64-python/0119-distutils-split-CC-env-var-before-passing-to-subproc.patch @@ -1,4 +1,4 @@ -From 1cd69ce0b6864315d371cbb8ae0824636dfff188 Mon Sep 17 00:00:00 2001 +From bd80176fea7e8abd4d47eb5ed9877defe0ce7e24 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 7 Nov 2021 23:12:10 +0100 Subject: [PATCH 119/N] distutils: split CC env var before passing to @@ -32,5 +32,5 @@ index 2804f69..6e22555 100644 + out_string = check_output(shlex.split(cc) + ['-dumpmachine']) return out_string.strip().endswith(b'cygwin') -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0120-_testconsole.c-Fix-casing-path-sep.patch b/mingw-w64-python/0120-_testconsole.c-Fix-casing-path-sep.patch index d0d9058e6c..e736358c96 100644 --- a/mingw-w64-python/0120-_testconsole.c-Fix-casing-path-sep.patch +++ b/mingw-w64-python/0120-_testconsole.c-Fix-casing-path-sep.patch @@ -1,4 +1,4 @@ -From 5cdd7f1d1a3e396543e237028c81190a24136f14 Mon Sep 17 00:00:00 2001 +From d9f5c6f259acecfec9d189756bb29a22da5be92f Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Sun, 14 Nov 2021 14:55:35 +0700 Subject: [PATCH 120/N] _testconsole.c: Fix casing & path sep @@ -30,5 +30,5 @@ index b62f21c..c8b9593 100644 PyMethodDef testconsole_methods[] = { _TESTCONSOLE_WRITE_INPUT_METHODDEF -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0121-Return-consistent-architecture-markers-for-python-on.patch b/mingw-w64-python/0121-Return-consistent-architecture-markers-for-python-on.patch index 28f9cc1184..06ebde8aa0 100644 --- a/mingw-w64-python/0121-Return-consistent-architecture-markers-for-python-on.patch +++ b/mingw-w64-python/0121-Return-consistent-architecture-markers-for-python-on.patch @@ -1,4 +1,4 @@ -From 64fbfe9373dec7d73f7e305fd590fca6274a475b Mon Sep 17 00:00:00 2001 +From e28db3b8feaf94017a1276db7ce7979362e345df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Fri, 19 Nov 2021 12:18:06 +0200 Subject: [PATCH 121/N] Return consistent architecture markers for python on @@ -51,7 +51,7 @@ index 2d935fe..fc8132c 100644 #define ARCH_SUFFIX " 32 bit" #endif diff --git a/configure.ac b/configure.ac -index 0aa6c8d..06e93ab 100644 +index 780b63d..62dd074 100644 --- a/configure.ac +++ b/configure.ac @@ -5208,6 +5208,9 @@ case $host_os in @@ -65,5 +65,5 @@ index 0aa6c8d..06e93ab 100644 AC_MSG_RESULT($PYD_PLATFORM_TAG) esac -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0122-distutils-add-back-gcc_version.patch b/mingw-w64-python/0122-distutils-add-back-gcc_version.patch index 02dbf8b87a..30ee3929d4 100644 --- a/mingw-w64-python/0122-distutils-add-back-gcc_version.patch +++ b/mingw-w64-python/0122-distutils-add-back-gcc_version.patch @@ -1,4 +1,4 @@ -From 73cc65553ca83137a5b3abe7f213f60760a1b923 Mon Sep 17 00:00:00 2001 +From b97165accc80b3fecfdda99457d9ffedc678b441 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 21 Nov 2021 14:00:06 +0100 Subject: [PATCH 122/N] distutils: add back gcc_version @@ -34,5 +34,5 @@ index 6e22555..d8c8428 100644 shared_option = "-shared" -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0123-fix-mingw-cross-compiling-in-setup.py.patch b/mingw-w64-python/0123-fix-mingw-cross-compiling-in-setup.py.patch index 2ff887c6bf..6072b5a34c 100644 --- a/mingw-w64-python/0123-fix-mingw-cross-compiling-in-setup.py.patch +++ b/mingw-w64-python/0123-fix-mingw-cross-compiling-in-setup.py.patch @@ -1,4 +1,4 @@ -From aa01d34ce3557e29dda2d614be2343f90bd20582 Mon Sep 17 00:00:00 2001 +From 6aaa33aa3c8098b6be1012354b2c77dbece6a9c0 Mon Sep 17 00:00:00 2001 From: jeremyd2019 Date: Mon, 22 Nov 2021 13:15:12 -0800 Subject: [PATCH 123/N] fix mingw cross compiling in setup.py @@ -43,5 +43,5 @@ index efc9ec7..6b0e709 100644 os.unlink(tmpfile) -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0124-Use-actions-setup-python-for-setting-up-correct-vers.patch b/mingw-w64-python/0124-Use-actions-setup-python-for-setting-up-correct-vers.patch index 13cf897477..7bc4f9b230 100644 --- a/mingw-w64-python/0124-Use-actions-setup-python-for-setting-up-correct-vers.patch +++ b/mingw-w64-python/0124-Use-actions-setup-python-for-setting-up-correct-vers.patch @@ -1,4 +1,4 @@ -From 2c29dd58940bec8ae0cdbde76cb1b607a61e689d Mon Sep 17 00:00:00 2001 +From 78fb0ba6c06113530ee9392f2bdc9d59483b6849 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 21 Jan 2022 19:25:44 +0530 Subject: [PATCH 124/N] Use actions/setup-python for setting up correct @@ -32,5 +32,5 @@ index eb27adc..ffd6ecb 100644 - name: Build run: | -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0125-Fix-buffer-overflow-in-Py_GetSepW.patch b/mingw-w64-python/0125-Fix-buffer-overflow-in-Py_GetSepW.patch index f12839b2eb..68cdc375c8 100644 --- a/mingw-w64-python/0125-Fix-buffer-overflow-in-Py_GetSepW.patch +++ b/mingw-w64-python/0125-Fix-buffer-overflow-in-Py_GetSepW.patch @@ -1,4 +1,4 @@ -From 1530d391f3d2287c65070e565e06c21c9bcd9e97 Mon Sep 17 00:00:00 2001 +From f50a2d7b97a9a6eee45aaa127f73356d88bd3332 Mon Sep 17 00:00:00 2001 From: cat Date: Sat, 11 Dec 2021 14:21:07 +0500 Subject: [PATCH 125/N] Fix buffer overflow in Py_GetSepW(). @@ -61,5 +61,5 @@ index 222850b..7d75216 100644 return L'\\'; } -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0126-Remove-unnecessary-strlen-in-Py_NormalizeSepsW.patch b/mingw-w64-python/0126-Remove-unnecessary-strlen-in-Py_NormalizeSepsW.patch index 30e058a960..5e76385a9a 100644 --- a/mingw-w64-python/0126-Remove-unnecessary-strlen-in-Py_NormalizeSepsW.patch +++ b/mingw-w64-python/0126-Remove-unnecessary-strlen-in-Py_NormalizeSepsW.patch @@ -1,4 +1,4 @@ -From be06ed5d1e2c038a4cccb8fb3b0e70869505447f Mon Sep 17 00:00:00 2001 +From c7fab0006a6a2c9cb6fcaaf6a648a7a19dc867a6 Mon Sep 17 00:00:00 2001 From: cat Date: Sat, 11 Dec 2021 14:23:29 +0500 Subject: [PATCH 126/N] Remove unnecessary strlen() in Py_NormalizeSepsW(). @@ -38,5 +38,5 @@ index 7d75216..d47cb6f 100644 } seps = wcschr(name, altsep); -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0127-handle-ncursesw-pkg-config-when-cross-compiling.patch b/mingw-w64-python/0127-handle-ncursesw-pkg-config-when-cross-compiling.patch index cd675ffeab..3a664e96d2 100644 --- a/mingw-w64-python/0127-handle-ncursesw-pkg-config-when-cross-compiling.patch +++ b/mingw-w64-python/0127-handle-ncursesw-pkg-config-when-cross-compiling.patch @@ -1,4 +1,4 @@ -From 991cbd5348887ea1f10654a0c8a62e9f72aca786 Mon Sep 17 00:00:00 2001 +From b3cd1ab54a1607fcade6f73be6ecd1db6b31c3c8 Mon Sep 17 00:00:00 2001 From: jeremyd2019 Date: Mon, 22 Nov 2021 16:04:41 -0800 Subject: [PATCH 127/N] handle ncursesw pkg-config when cross-compiling @@ -12,7 +12,7 @@ Use pkg-config ncursesw include dir even if cross-compiling (PKG_CONFIG_PATH sho 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac -index 06e93ab..5d8586e 100644 +index 62dd074..49bfa1c 100644 --- a/configure.ac +++ b/configure.ac @@ -3403,7 +3403,7 @@ else @@ -59,5 +59,5 @@ index 6b0e709..43e5ee0 100644 # _curses_panel.so must link with panelw. panel_library = 'panelw' -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0128-Use-CC-instead-of-cc.patch b/mingw-w64-python/0128-Use-CC-instead-of-cc.patch index 679f2629c6..7899cbb5a8 100644 --- a/mingw-w64-python/0128-Use-CC-instead-of-cc.patch +++ b/mingw-w64-python/0128-Use-CC-instead-of-cc.patch @@ -1,4 +1,4 @@ -From f56d833867487ffd8f27191006c3788efbc3489a Mon Sep 17 00:00:00 2001 +From ea71d7beb72ec7c0e9b7a71213f7edc839cf68a0 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Mon, 28 Feb 2022 00:06:06 +0700 Subject: [PATCH 128/N] Use CC instead of cc @@ -21,5 +21,5 @@ index 43e5ee0..b967544 100644 with open(tmpfile) as fp: for line in fp.readlines(): -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0129-bpo-46811-Make-test-suite-support-Expat-2.4.5-GH-314.patch b/mingw-w64-python/0129-bpo-46811-Make-test-suite-support-Expat-2.4.5-GH-314.patch index 0d55acaae3..b355d94d47 100644 --- a/mingw-w64-python/0129-bpo-46811-Make-test-suite-support-Expat-2.4.5-GH-314.patch +++ b/mingw-w64-python/0129-bpo-46811-Make-test-suite-support-Expat-2.4.5-GH-314.patch @@ -1,4 +1,4 @@ -From 6284f42f345c9ca9796f977c14ee26983d5223fd Mon Sep 17 00:00:00 2001 +From 4cb497083baf8b163d114dd797316b25366c0a75 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Mon, 21 Feb 2022 08:16:23 -0800 @@ -37,5 +37,5 @@ index 0000000..6969bd1 @@ -0,0 +1 @@ +Make test suite support Expat >=2.4.5 -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0130-Avoid-using-sysconfig-in-site.py.patch b/mingw-w64-python/0130-Avoid-using-sysconfig-in-site.py.patch index dcf8ce0308..f8b4ba1dd9 100644 --- a/mingw-w64-python/0130-Avoid-using-sysconfig-in-site.py.patch +++ b/mingw-w64-python/0130-Avoid-using-sysconfig-in-site.py.patch @@ -1,4 +1,4 @@ -From b3ea043fee25e904c927dfa69ff49fcbc94af20f Mon Sep 17 00:00:00 2001 +From 656a2a8e771a21627ee165d5fae60b0465a54911 Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Mon, 14 Mar 2022 19:28:06 +0530 Subject: [PATCH 130/N] Avoid using sysconfig in site.py @@ -58,5 +58,5 @@ index 474ef89..548f9d7 100644 if not prefix or prefix in seen: continue -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0131-Commit-regenerated-importlib.patch b/mingw-w64-python/0131-Commit-regenerated-importlib.patch index b48f308ced..c9d2431abe 100644 --- a/mingw-w64-python/0131-Commit-regenerated-importlib.patch +++ b/mingw-w64-python/0131-Commit-regenerated-importlib.patch @@ -1,4 +1,4 @@ -From f62f5acdeaed40aee9debba3d88f8f9090c80afd Mon Sep 17 00:00:00 2001 +From 171c0d65a34919c302a5605dde2afc0a09e94690 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 18 Mar 2022 12:22:15 +0100 Subject: [PATCH 131/N] Commit regenerated importlib @@ -2389,5 +2389,5 @@ index 23af2cd..3c0b0a1 100644 + 14,127,0,27,10,23,8,11,8,61, }; -- -2.35.1 +2.35.3 diff --git a/mingw-w64-python/0132-configure-Include-a-header-in-the-check-for-_beginth.patch b/mingw-w64-python/0132-configure-Include-a-header-in-the-check-for-_beginth.patch new file mode 100644 index 0000000000..f346b19e15 --- /dev/null +++ b/mingw-w64-python/0132-configure-Include-a-header-in-the-check-for-_beginth.patch @@ -0,0 +1,36 @@ +From 3b11644c6ac1154cf7c363ae3a6a9afdda0ccb4f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Martin=20Storsj=C3=B6?= +Date: Thu, 21 Apr 2022 14:25:51 +0300 +Subject: [PATCH 132/N] configure: Include a header in the check for + _beginthread + +Previously, the test tried compiling a call to the +_beginthread function without either declaring the function +(and its parameters) or including the corresponding header. + +Since Clang 15 (which still is under development, so this may +still change before it's released) [1], implicit function +declarations are a hard error by default, when building code +in C99 mode (or newer). + +[1] https://github.com/llvm/llvm-project/commit/7d644e1215b376ec5e915df9ea2eeb56e2d94626 +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 49bfa1c..78c3c49 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2242,7 +2242,7 @@ AC_MSG_RESULT([$with_nt_threads]) + if test $with_nt_threads = yes ; then + AC_MSG_CHECKING([whether linking with nt-threads work]) + AC_LINK_IFELSE([ +- AC_LANG_PROGRAM([[]],[[_beginthread(0, 0, 0);]]) ++ AC_LANG_PROGRAM([[#include ]],[[_beginthread(0, 0, 0);]]) + ], + [AC_MSG_RESULT([yes])], + [AC_MSG_ERROR([failed to link with nt-threads])]) +-- +2.35.3 + diff --git a/mingw-w64-python/0133-configure.ac-Default-to-without-c-locale-coercion-on.patch b/mingw-w64-python/0133-configure.ac-Default-to-without-c-locale-coercion-on.patch new file mode 100644 index 0000000000..4b68bb0059 --- /dev/null +++ b/mingw-w64-python/0133-configure.ac-Default-to-without-c-locale-coercion-on.patch @@ -0,0 +1,40 @@ +From 6a0b4b23f052bc5f1ba53706f7214d4283668e67 Mon Sep 17 00:00:00 2001 +From: Christoph Reiter +Date: Fri, 22 Apr 2022 17:31:19 +0200 +Subject: [PATCH 133/N] configure.ac: Default to --without-c-locale-coercion + on Windows + +--with-c-locale-coercion otherwise defaults to yes and enables code +that isn't compatible on Windows, mainly because the feature is Unix related. + +Default to "no" on Windows instead. + +Fixes #36 +--- + configure.ac | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 78c3c49..a7dd930 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3884,11 +3884,14 @@ AC_MSG_RESULT($with_pymalloc) + AC_MSG_CHECKING(for --with-c-locale-coercion) + AC_ARG_WITH(c-locale-coercion, + AS_HELP_STRING([--with-c-locale-coercion], +- [enable C locale coercion to a UTF-8 based locale (default is yes)])) ++ [enable C locale coercion to a UTF-8 based locale (default is yes on Unix, no on Windows)])) + + if test -z "$with_c_locale_coercion" + then +- with_c_locale_coercion="yes" ++ case $host in ++ *-*-mingw*) with_c_locale_coercion="no";; ++ *) with_c_locale_coercion="yes";; ++ esac + fi + if test "$with_c_locale_coercion" != "no" + then +-- +2.35.3 + diff --git a/mingw-w64-python/0134-CI-remove-without-c-locale-coercion.patch b/mingw-w64-python/0134-CI-remove-without-c-locale-coercion.patch new file mode 100644 index 0000000000..4397c84c43 --- /dev/null +++ b/mingw-w64-python/0134-CI-remove-without-c-locale-coercion.patch @@ -0,0 +1,33 @@ +From b7dd2caeba35f5b170d70c36cc8cba4c6630dcea Mon Sep 17 00:00:00 2001 +From: Christoph Reiter +Date: Fri, 22 Apr 2022 17:37:23 +0200 +Subject: [PATCH 134/N] CI: remove --without-c-locale-coercion + +No longer needed since the default now works on Windows +--- + .github/workflows/mingw.yml | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml +index ffd6ecb..5588785 100644 +--- a/.github/workflows/mingw.yml ++++ b/.github/workflows/mingw.yml +@@ -75,7 +75,6 @@ jobs: + --with-system-ffi \ + --with-system-libmpdec \ + --without-ensurepip \ +- --without-c-locale-coercion \ + --enable-loadable-sqlite-extensions \ + --with-tzpath=${MINGW_PREFIX}/share/zoneinfo \ + --enable-optimizations +@@ -187,7 +186,6 @@ jobs: + --with-system-ffi \ + --with-system-libmpdec \ + --without-ensurepip \ +- --without-c-locale-coercion \ + --enable-loadable-sqlite-extensions + + make -j8 +-- +2.35.3 + diff --git a/mingw-w64-python/PKGBUILD b/mingw-w64-python/PKGBUILD index 471fa8581f..3554f9a0df 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}.11 -pkgrel=2 +pkgver=${_pybasever}.12 +pkgrel=1 pkgdesc="A high-level scripting language (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -178,7 +178,10 @@ source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz 0128-Use-CC-instead-of-cc.patch 0129-bpo-46811-Make-test-suite-support-Expat-2.4.5-GH-314.patch 0130-Avoid-using-sysconfig-in-site.py.patch - 0131-Commit-regenerated-importlib.patch) + 0131-Commit-regenerated-importlib.patch + 0132-configure-Include-a-header-in-the-check-for-_beginth.patch + 0133-configure.ac-Default-to-without-c-locale-coercion-on.patch + 0134-CI-remove-without-c-locale-coercion.patch) # Helper macros to help make tasks easier # apply_patch_with_msg() { @@ -322,7 +325,10 @@ prepare() { 0128-Use-CC-instead-of-cc.patch \ 0129-bpo-46811-Make-test-suite-support-Expat-2.4.5-GH-314.patch \ 0130-Avoid-using-sysconfig-in-site.py.patch \ - 0131-Commit-regenerated-importlib.patch + 0131-Commit-regenerated-importlib.patch \ + 0132-configure-Include-a-header-in-the-check-for-_beginth.patch \ + 0133-configure.ac-Default-to-without-c-locale-coercion-on.patch \ + 0134-CI-remove-without-c-locale-coercion.patch autoreconf -vfi } @@ -351,7 +357,6 @@ build() { --with-system-ffi \ --with-system-libmpdec \ --without-ensurepip \ - --without-c-locale-coercion \ --enable-loadable-sqlite-extensions \ --with-tzpath=${MINGW_PREFIX}/share/zoneinfo \ "${_extra_config[@]}" @@ -418,135 +423,138 @@ package() { fi } -sha256sums=('66767a35309d724f370df9e503c172b4ee444f49d62b98bc4eca725123e26c49' - '14a749ffbf62f7938ad7b6b8cc27cb49ab60ea893ad9789194bbdb3e975f1be7' - 'f3c915d4ac67354fc4591b2b1b32404ae38f80e4dfd18b842cd1f758d148166b' - 'f686eb93aebdf41b4038113f90dec8100f8bf33d7bae7239979c644ac395c098' - '234fe5d89d9126a7e772f6f3ee51b8927aabb82f9cec7bc4be9e0c7a2bb4b38c' - '85e3124551921f768b830255343f1a77f7435808c137c9e7badd6ec80f268a99' - '62c8bdeeadcff23005bddaebfcbb117eee29cc7c8d1fecb313d3527d0d27f9d8' - '8138194f246de18213a36aa085a3eb6558d032f2e8126b093391c6d1068c704e' - '401ab82cc865c95eb1554129c0245679925598185ce7d18bee1caf0800b3c0b2' - '8f8034df21b5c5206dc56417d3014ef975ec1e3746baf8b7e1e752ad167ec3b8' - '68ed9d7127c9db0e7924813695c7cd7dfd6716fd30f2546428fb47792ae16327' - 'deed27b01e0ddf0f827cd616ad1a84d537bc60ef6d3c5bedec38a96579626e1f' - 'e12cc6b07d507814a2d65a20812e7106016aa7c281863f1a2c9a30b471f251eb' - 'bec2aede0a41a3c7bea6421582426bb1cb557f5665dbc32c6e25075106c26429' - '3609eb8fa3cefe0379058dfc1ed9125456b076afb383ba71773dbde99c7cfb64' - '79ba9064ec76616e691d01ba8a8f7ddf8eb391bfceaf8c99056ac9b38ef77f52' - '47d7a3252233fe4c93ce11b1559c779289eb63b9bd9c20fb3dcf49a84bfc066a' - 'd65b70b14ef8e2d214fb3c82035551856aa87dd57b9b77fdbd13ff1ed6977109' - '7c95384987414cb117eb9a31204d8c23c1ab4cd6085c311d18a7d6b818f5f5cd' - '9a4e152059d0607806b197af56d5e76430afb38297a8bd293b025ac09c727616' - '3668cf91e37847b83e28badd88ef9a5b480eda6391a0c5955a1eb256fed56b47' - '5f665b904db8ad057a0c1a4d90e3411a4db75f24cb8e4919f97a790ac0885efa' - 'fad32745e944b259e4188d648f7ded9c53b1e8ec8ca120b832fd86e8d0ab21ba' - 'c23bc6c927544e5323d2dfb7f3bb61303b7da38a96b292999922569aa3854626' - '6453f5cb70d356359747a5b2cffd19f6b6b6aa1e9f90ec6f42b37379bed089f3' - '2b69bd18c212dfc6324aa45ce1eb9fe5a995963225de6760f872d6bd95d0d1af' - '767e1aa308e249ad5fc83209a85083da690223dc6f7f7ca7755bca2fc44c4e9d' - 'e41c839b46998bda1053ae41e9d4ff8f42bcef2a8d00de9f4f54a157378aa385' - 'f213f9d562e58ffa9bf1eb9b462c29d2668ae31e005c679ab3c4df175132e422' - 'fd7af13b942906112d1f4bfc0ccc3d567072bbc34278f171c240f3b59d0848c7' - '3046aef92b342efc748ad57e3fdac327402dd7c525871dd515874cb3186bc01a' - '0356ff1b1a929a9cac5cd3e50ff71aa0149e009ecc4f1a2af8a36aa40a38e466' - 'c80368e65ac9b4a7ba7596be8ce52e2ebe25bd2acaa7f22213f11d312edcc5f1' - '2ea08fed96258198c3153139a5dfe3c3b07895cd604f6eee63459ce69c9c618a' - 'a27ec1890157e5e06a1b70fe8ba65297c8a7afc821892c399a1c13247a1cac9b' - '0e804987081c2bd5957de43dc5589386a0b8fdd9e5358b02acec3a236dd073cf' - '6a5a4a17fbebaf77e72dd5fe6ac913c44254bfc211a8dfb670b67b54b234b959' - '43302afe1c279dc5b57e9d8ebef31465d8c7573c79910b70829fcce61b6f7b6e' - '34fc9424368ebb884e5fb05b1311cf0266c158ec18968cddc2d8c1918b51fa31' - '921ee9d36673feef2ee83a11644ad7ad2d42d5175364433ed7d9706a787183a7' - '1b0389e46ff075223a4997766193423e218c6ee6852eaf9710d325d0008cdd86' - '33742cfc5f3023a82870088dd218ba5610c6e3dced04f074e2f236a05de2466d' - '45f1c3b4aa89f61e1a19db8bfbe56f255bbd2ac72a6314e07b3faebc3aa094c0' - '86d623dcf74992a459995e00720424dca5cc75abb4afd3799f3142ea04d24f24' - '8acc055168b39d642e16067472b62ff2c76f7b963ff5447a12a0b2b4d35a779a' - 'ddfd26278fe9f885ada67d690c9a88f6d12193c4c1528663d32ad9afac501513' - 'f37927f8a75f2657a653688cfb5e45af9d940cdd660ed9bb6f7c1c1a49d66195' - 'c08b648913a78fb5a4f79f650bb2211bc2c5d51729760d4d184c0e85ea95f028' - 'bcc65ccd04bff16ca2899f44a4426433c669dbf5af801e21799e2deb67bb0e91' - '1ee2398d930f3c2fccfd7921149d1213e1ac40f754f113b11ba6df7546619dc4' - '5b1861758b28cd2d6299491929ce079cb07e849cfb3ba56e1e02271624a650d7' - 'cf2b356399ecf49db665629a0f570f56a9edb012aba208343d49edecdb591550' - '8ab4e55e3e1184e29726cfc871ae92ee7132f5106bfdab3a8d7ee57c54adb6cd' - '9eda8629b8489f4654127888337886025fd930777e06a6dbeb31783e72b6faaa' - 'd262b297b2ddbe3bc06256d24f446bd5bcb2685ecd94c8d0393fdbef79ad1458' - '456f9e0eaf6e9753cc5c2b35eeb34a515beb71979666e1ad8e5bcec69a58f95d' - '3832af0787cf7a733752ab66510a9981429f4c8e5d7b686f0701d71dea6b05eb' - '3b57eb4e65a64fa4d09f0fb21099afbb1b1207590988738d9ae484f13cd24da3' - '7f799e8ee94018b8106bc094e27aa1f5019d6134d2e9f7b0cad358d63de52ede' - 'a3e66a70128f264e0ebad1686d205bae017da5af43eb6a76ba9bd65f2e7f48f1' - 'a870dd491c67337353e1db40d66be29cba219126f126be7f41fa5a254dd4fad4' - '5b40c4ef2567f4efad1b611b4a16a81e5a21eef99992a0732558e801a8902010' - '49ab79a0ea42a5e0f85ea3b9e882d5f7fb504b3c8abfb2c7032ffa4ec1c7ee55' - '323dd168cb4dae76cee09431117e9ae433c87de0aabd374ad297827317ecd166' - '99f50210bfb78cfd9808a69d08a5d1591200ca14969b512f9b4e98a430b34108' - '1b9c5a486e64259dce725e1c9ba81176fa1b0ed66205638ac90bcda7e4bd0f94' - 'cebee0fdded0aeb5bcd2dd2161220a313972ec741d1df4244c72edb363903147' - '297a7481eed78379e06e73d34318d4ad870f5e570c6f21d3fa66b74731c76e47' - '4d1bdf79df9ffe45ddba1fad74d47e7f0402dd7af7726a87b6f17db2761b1ce7' - '631d6817fc4bd9fc5434f04eb0696be8837566a137decb261bbebf0966f6c070' - 'fce9788862ed6a72634e6eb2dae8babf2a4e784a5d5827bb18e0ff0cc325037e' - '543a8cf68fe8de31e809796ef50faf2c2c2b9affe4ad83d9811eda00b5e130d8' - '4ffcb46b1effe5252edafb612e5ff79e0bf3a2f0d838d30190668475268ae1cb' - 'bcf5fcb0f3fee4eae5ab1e8af165da7ed8f8ba1f777243382f62ca3a75023c97' - 'd047528ff01646a909c968cac6bcdaecdedf24472c0cd516c4f7826973e51361' - 'cbb0e3ab10df655b5613d7878cdc66a9f705b09629d4ba7938ebbbcddd73db69' - '642f6bea45246fae0e60d41e63c32c70fe5e4c6b61a3a658299b6eadca8958bf' - '31e80c73c2cebe8a9a2dd6a5513a64e09d85f6e937551fe31ce542eb4bd5e58c' - '57e74f96722966414acf5d5a910ca9ddf34eb8ae9a80b024eaaaf0a4ac3e575e' - 'bc45165034108bf2efe2630ed947fd3c2be34f0bb27a90cfc0e9832265a0792c' - '710f5996fa7d4339d4ef41dd943af4a6dc46ee249c5a823cb3a74e48dfbc663a' - '98301a00057cf468fc25c6471b25070a30eb7bc847679b9bb74f48f39cb54d9b' - '0bf658c52b607b46f7973b68e6281b17869c98fd015448dd232049c468084645' - 'abf33c2bfe571c10485b9d5c4693dd4230e271882250825e36953618504fc542' - '5f51fee46da791b2ddc99fce0b6c6f9ab8623c4b438c9ba1845aaa350a9a83da' - 'fb1db31aac8d7d04b6bd795b0c775403cb5254568fbf7ef2c4258c7c65da8936' - '4c2845af8e21233bcedf957dd2ce61db5e4d0df9c858e1f8e372067c9cefdd93' - '696ad3460afda7a082a2d28f07754ed2728fd836d1630452a692e320ad6b2dda' - 'd7c21891764eaa94c189dfee764c26fa6964f76ef21ef7094914806c4a34e771' - 'f72584569ea1c6545e1cb5f27142b231b4b58f37de7c9dec3067708d00b7be9a' - '66cfe2ca27b793e149952fbdb7e2c756e23292f9d46f3482177a4a6086acea31' - '72b06e4dfa2eb331261cfa05d056bd0bc08b6760b32e2976ad9214050c6787d4' - 'b77b1905a095258e4b127a9b8e95caead5d56ffdd78dfddd1dc20b2d6e6dac9e' - 'e09b9d1a38f1e1dc0461317d7bd0744968d5a8e151bf8f68c57950c27b1c82c2' - '4b244d99a177bdfc1a7736c9668a280ba62e4724046981771b90633dcf580cda' - 'f90cccc7b175edbd49f9f133958ee58454ecabea3b2f3e40967884d41504b2e4' - 'd5f41cb453b8618f9e9296bea79494e6619ee968669c465c8faccde409124ee9' - 'ed045b5cd97db173f671af08633c67313c88dbf1a0ade9cf59eb1c3a67c3fa8c' - '6d77b25062b3cf9ad039b3f8596ad8bbbdf9c596b68e4853656d0bd866a93867' - '219fcb734fcb61a7f150cfe554fb90fbd87d358d32e699c0825558ab057e6534' - 'dce412e33761fc3d499d5895e238ba2ee1cde5015f52fd6a5d76aca4b0a1706a' - 'd1a335f6d041a7857b3359b67ce846cf5e7185323b8ee3f5ea97a5bd198e091c' - 'e0a0570d6e86aead9ff469e9a03cd7ee5867d159207e5fac9078122b2f9481b3' - '309f88ed6e1141bef6534643b705fb46e44a8fc83e6a9a8715b7db261e2bc355' - 'eb91aed55aae4a8025bd719cc6c89ce68a78abd215f44ab13cd3c56d1910f31e' - '02b2627ed0a1d15c7dfec8e884194b426bf04857731846d748779d2d60890c3c' - 'ceab444ffd44ec23426e03aa4e6eb2e3560f3d464a1b24dad5b4ea72e8e5b6d6' - '433f17dbe17eec49d81cc682b0ae2b55e3dc973ac519e2de7cd5ca985d62dbbf' - '3ca9b205abde5e7471d96868f283adc16631ff404d6dd3a1dc600678f9b99069' - '210e35732521462c1b7cd02bd70f3b3bfcf7ea18ebec77f8dbc81fe333655163' - '62c9b958b0e238a4f9e03dfd55726f10e571468450a445ba289889dc82d546a9' - 'b693738b865e21abac132170feb1b6cbd4d6cb91720f4ea2f878b31583c3f2de' - '753bdfef37ef99fab62eb6efec20339712ca94116885a6e6abb51b1b525e7d32' - 'cfecd98ad285d9205c7393194c5f18e8961e4e93d8a516a88a6fa6a9bf305a7e' - 'd44ccf94b9896cc20e5c2bd88821df193fddf60a173d0ca87ef72959e58fdb7f' - '571ea6e0336d74129057d50d5d1a65c09258cb4bbba9482cb0769edf39288f78' - 'a7e721c150601b58c2df7c555e615df4ccc421300fd441b69b77753060044d62' - '8a5e74d7465680077254a853fec40fb2d7e678ad26112e55bdcfee8e75b407ae' - '0b7d579cea65534a4ea6186350e2ffcc516dafdefe338e584d99233fd1285f84' - '50e58a3fe37d532a6be46966b298312fbec0a24ea3a8bab47fda61d844209950' - '40082fc50a66c23a1eef19d509992cbaeb545748bac8adde0f4fff7f4e84f9f2' - 'b53a1d7ff87c6acb07de4b2b9caea41e579fb493491258ccd118ca78f7d9eade' - 'db8520edb1013225b0b8a2a896b8fb554a12755065fe0f752004aa4dde1c0485' - '637bf002895d9505c275c7d7c668f43754d8b4e4061f794ccb750399c457ff7b' - '6d618d5017ef6455ff0fc9a1d161fa6a44f9f9f6ae25d47665110ebc5c3d6c12' - '30c0f1453b7e230db3623a5cc714c5849f087efdc862b57dc5318e8ef6bec13a' - 'fc1fa38d44660f0ee499172d4912825c24137d0fb00294c92004aee10d6caa78' - 'e341b7d562b3db13681af9d6d03c1645d182eb83bdc929cb12ea56922ccc12c9' - '0d840c8959567360976546b01e7c0949325ee00db760843fe2a75449423db990' - '9324668d2b915f6e261c864321b4f739d2bca0dec4ff9305b3a99c6c61b3a8bf' - 'ffa98d8b6e7538ab97297a49c39ab8bc7d7d9abf9fe318d398b2e68a0b3fbd90' - 'e8b39e114885e95af8da22e19272a1fc9a95d3f456a3b5c821b9611bfb220b55') +sha256sums=('2cd94b20670e4159c6d9ab57f91dbf255b97d8c1a1451d1c35f4ec1968adf971' + 'e2ba922e130c24c448aac8c487653687ce9b3f459e178904be3748b2d54cf1ea' + '067ed869b2beacdd604bed076f13a2bb447d8364194546c96c86a19301030ff2' + 'e43c421776ab9a15ad78772d1a5c5f8dcc89ae2d31bd64b5632d575d4d9c352a' + '57cfa64b5b3bdea30d428643a455852d16dc2a5b9f97ca038da9ed8d9e621ed3' + '4e9046e9b8cae235d910eabc551f42f11db4f9b769544b5217d6a6e354543903' + '4701b6274850e2149a2194fb3f70d1498581ec37de32d46d384aee48c5d7ac61' + 'cb8ae8057ced0b94be79e195d6df64e23bb4e436f53727a713503faee67d027a' + '3b79155cbd5d164158e132ad2b70fad288a8323b6f2dfadca420220be4839df3' + '1418b24cf76046fdcb9d8dbf84de9bb3c99fc2916dccb719fb6478881a465c33' + 'd47f3a067b9b9ffc3375d7deefe1eb87e30acb10e3b6723290e4c1ea9aebef71' + '6a270d412a5ef26a002cd67d998d5456af6963abf27d2c9b767726660660f493' + '079b906e1e94fbc43a1f498a626d1be2e85f36c090ad9300b185bc526bad529c' + '6d277821a017e325133d7d3a6bc58465fa1c157635a772205069be815649b3e3' + 'c37dc1fa659b751ee6b38ceb6133d12be9078e9d2f9f07bb2dffeb0ee94e5867' + '2380ffa8ee39ee53f32cf9d5a0b9efab95439f52ee5946f2b00701ab8ec40979' + '6065bb75e67c40d058c51f5d85f306527490f94582b2ca738194c113cbc40dd8' + '2bfe430818919cb468867fa21d77f03cf4c20869f971c11828edc61fd854ea8b' + 'ce3935b2bcbd801cea6628732580b5a81eb093fd9f47a55f29d06015c943576d' + '7864f202327e4e205ce759b6d90671b7a8f381ede7cdacd47381d59392d424f7' + '08b8e0c404cb2c5a046d613cc89289c47f8511fc1a29bb965ef957b6d6c0aec8' + '860589d36a0119f93bcf247e8711826ca656f586ecc62953aadfa22428af29f8' + 'c728eea714a47c29c27d84a5a2865310cc59b1739c684f053fee13014cf22eca' + '6b7a526e4a68844a74dea82f45a2027e1d20d71b4b6b60de395191314c2005f2' + '4209376ea53450585963436128425102eaae02822d95ffa4241a8c750d5570f3' + 'ae4c50955be07ffe7a572233d3cef9509dcc4b27d44cb05bffb56d733c712ef8' + '8ba73c256cabd9c203364dbf1cc2fcd428998334ec95cc98c2681d2f49cce29a' + 'd8d217f68efdbbaf8ea1a89af911d72801e74c1659abf365f060fe95e8f8a8ea' + '606dd530e9f110b3a79823daaf68da9f8a107bb8d79d8544b5bbd6f22ae06cf2' + '9d5140d82335821ec9042c0103f1782657a013a550283ab73361be66f61fc39e' + 'aad92103d22c24324faeaf14f34af2453801f11cf4975382762f1ce17926f8c5' + '6c560e5a24b31236f9925899891adec69d53aef1171258118e81a708f93f9fbb' + '07004b72177970259239b61982295eb3249a41e8ccbc64c22c5725f86824eecc' + '33257ce619b671de1d47d11223308aa8be46f7a4b159dec49aab4fb04e82982a' + '05e4fb486d0a90d683bc366ab3cb4447da1610de20d6aa38c0151c832c302a3d' + 'c36a46be17f991c83b2ac63efddf50948af678a4b59bc1781f5bbf9ce4a508d4' + '93b885f107a26ccbacb4b395672566324361d07939a741cad7b40870ab2aff5a' + '170e1b3d545f0583d699066cb78c10b1a51deaac52e968098bdcc17d3075311a' + '94a80933fb3ec0de4cb84e9ad90b5967ffef00cd6c04c84397fa97ca1d5ceea7' + '6df775d47b0f69143824f4346043fced6ae99ff33cc35932ba0d125ca666efe4' + '1b86510bb7072c2348d76bc8fd88a7463cdab34345bccfe40f0d5a000ec7a670' + '2b52a45037f16b59c061a4c8813d9d0246bd6991d258ee6806eaf4a9e4d9c679' + 'ec3d787fda545a7490df9dc70ba96c4370c6766e8be1848b6f244827e0d4aea7' + '34eb7117f525c8d276bdf060bd4c365d3fc84b314c6637b9cba9fd80df9b40aa' + '708357a869ffda1527f220d986a5c3b30881b98070c82e024a03fb438a70baa7' + '08d79e59e5b698253c1bcb0c1bf6b9f10e3f11c5f82e37ad1750c1492eb85a99' + '16e8ea9dd5cc8600ea00a945b91af138d390d269b8cf3c2b19e4963e36ea1450' + '77294a5d356c6a1582bb2733cc1c1cdfcf730885c5160da2c444fc4dd680b113' + '2caa49f6ac19972ef3ebf9d8765dd3e06faaa6c692b60652fb22cb8c1c29351d' + 'f9d49674c84d2064eb063bd60bc629dbc4d5264eabd0fa6416244d406157a8e0' + '722c6d2a87a7242e6f0b29584f972dd4c9a90dfdad5681e45221116c7667c3e6' + 'e703cac280231e322b9d37f0dcc57f8993e789fd09fc35c147f2ce78e233d225' + 'd362ec479d8981a0660a76132304ef9dc9a4a41032250c88e174d86bbe4731a8' + 'ecc18f335d0251ad662d7ec40fd8c31df4126d73b083566344007a4d3b226efa' + '748f0f0a254b249c2117cc780840f58a151066cb84e95cae765c1382df6871aa' + 'b48b97d9ffd1f3eb60c9f79856862e2b59e10286078d00f09bb9cbccd62a5873' + 'eea6d4181a4119bada6c11617c1937cf573b81fa0e7ac33728af92df2a78c036' + '89feee7cdd43b961dfcad28afb1d1d48c149987aa7c36d7e0f5cf71306339f90' + 'bba69df1bf29a3faa2718b225410cad950fd1f2923550e6064ff57efa2b2649e' + '5ac1ca90b5724780816099da00e303506b4e70a57a33bb103e20ee3694eacf98' + '603f2a60e452d90d07f7b6247f3e856a793a102e464a15219521e64abc31e31b' + 'ae76b4058e1f9d961e5be7984b366617d3d71710701c6314cf8c843aec18020b' + '3a4efbeea95810d3d11bc9f127eafb0b5dbe6356dced7c4f2576ea3466e7bee8' + 'c1a44432fb6308fd94d7d3472d184dadf6c7d94efad7bd432242987066ac8f8a' + '2c97a863310ea3c9d34e64ef93e3e3ebc3ff03445ccbc650f4582bd66bf60377' + '9543c9b2759e38f4a6a5d30fe33c3fccea6a6493bfec599b6a17859c0ca3c4d0' + '7185eeb4f945bf3d45a027b34ecf4ace38e97e99b77a6d0867da6c494d149364' + '42cb45ba333aecc8714a4da81a75abe47ac0a4d53c0d50e0a69d32b9a07f3ac5' + '20f092f365a220e9de022124c7136b4a4a1f1853071c3116a92bcf5079a60707' + 'a7e23f648ce2cf7b08099392d0ec521f23875c8edbf5979f89b3c65b62729916' + '4c0eb9b7ef38030fc89a94708db0d84431868f706e56ba85863a378d8d692121' + 'c59b0646e9ad5b69f6bad344bcde853fbc4a64de886e55cfd57954f393f2168b' + 'f612904f4084d892d28a60edc0ee22e2cc5e8f1220038a01990256f8e5fe5907' + '4cb13ec8c08262b9ad5e172564f671a17e0171cedf4d7586a6515ecc75d4bd44' + 'ca09e0ce4599905c96a9b484a5494632fde4287b04ff0dfc950cc0a578bc1c6d' + '448414c0796aab508114635de5084060570545fa7bf236b4172f783e7dbb7677' + 'f0655258ce7eaaffbe69ab6a805a83d1462c30c2cb12175d338b15e875bb76ec' + '5fbfa6fb81b41e47880bfd424e8619933a0bd00c15c4334e08a3fd54373cac3e' + '302205cb37f86e6ab8510a6e81793b73754802f722e60592f8f3a2fff6d5056f' + '940a2e3e0c78272fdb2f358c8d2ecc76d090b57af6503f73543cd66ae5213039' + 'a819a98609bfd9c2b343ee79ff6c1845f34f1724641b4c30cb18474ab6b5dcad' + 'd0eac3905ae1208bed6a0033d60b76335f5e7e881e423f4046f171dbc8c5cf48' + 'f7c1f00e721671db368330d4d2e607088d46ddbe2ad744633a8d8ac2c2b0744e' + '34764304b9ac8c75276d1d56d427a1a823c2f1b80f9360d5d16209d3a381a1f1' + 'e5845106790f4e864fa8f16a13c1001096e9e1784ef5cf21c6ec33a3f2d4faa2' + '289f2578088e82ec69a95208a10ceb0fb265dbe1bb96f16aa5d6f510b9a5ea37' + '3226bf295ccf7dddebfd87d4521b4713862632f555f885537ea4d15bf751e356' + 'f75ce991a9fa884207d770226fbcaa80c3cfa620d0d3749e97d4c7b49bfca71d' + 'd5cd021f886bf1de05bc72531861a752749981da2fb172d030146e7a262eb31f' + '30f337bf466ea6f9c3d6d287f10717fac56d074b9c2aeca02bae2714eb63d476' + '290c9ed9742d9cad537eef95fba67a6e01b5e2750009db3c2cb04b0c1f0e2a99' + '26698398d4abaaeaf662533a9afaefcc233e5ce1c3482699ffc30c6fe0a585fc' + 'f52e9f914ff3251954fcc19ed44e28d68ac7e452232dc7784e83daac8d736322' + '393bfd3c11a3750c824f545f47caf54f8c9205156f598ce33ffaccfe3b57a1e1' + '75c60043bf709de863bb2a026c678d73c9310d9975c2aab751ce6334a8f7ef98' + '4e7c659246b13ae3d443f1e323d7b8e2809e26e0746eeac5d53e0f57a670c6c7' + 'fa13d7a3eb4512b355b28188cf5446bfa8002e04b2fd81b87029272353420dab' + 'd8b31d3677a0c40bfb2ba4322bf857b35e0530823972b33e5f109eb117e74346' + '9b2c198ad0b5288ce3e5af8cfbf909627edcef3f126b3ef084a00fc93c81c9be' + 'c3e5f2064ae470aa5e3fd2acec1b9810a999ff3fd394318784aed87b1f9d14db' + '13e680a45153b3a19f3a805a57dd2c59bf977251c67b46804b61b776d21816c7' + '029418ceeea7da1885e9d001115a56d126b603a49d0ecfbe88ffafe409dfbcb0' + '7d8bea89d15ac283d28f92607077b71d19cbd48862b613bd4f34c21f6b430eee' + '6cc22e71c74f319570ff3f066a8a3939781d0e942fe91f9d30a5331ad1f5c18a' + '7de47ed75d3d7bafb08e6bfddaa7952526c9d99edc879f392a0a63629bcc5857' + 'c2e40b5f66682ec41f1ccb7ae9949a603918eedcf17939e04d0259bb70be8a6f' + 'c6c8841a9c9622ebb628d13b9d0b844bf79e48f0ecd404e07bddf590b8650ac0' + '7c550468e6c9405bd2cb9b5684a0e9099f2d81140a4104799b14f5e37afdc972' + 'f102262e905d483c7fd1fc187cdecd782db925a2edce121d79ed9746c3d305a6' + '464eb60669f053f562f48d632327493efce3d99745abdb466f700f776189ba6a' + 'f257530052eb6831d603b18d934b5dc19fa1b2b9d59a1dd64659ee23f2a78b61' + '1148d54e44e3b0d964fffd42a26f73e9bc0bea16af2e3d3fe4ed0f582709653f' + '0bb431949c861e4adcd584e1a53b195348c9487bfad8037b37ebe9ae47e96a87' + '4218b0a52cb72380ba9b054e5aaf8edd367705d69a568aa5afb9dbde877e3f43' + '2d2a529720107b55e6c991dd53f0151359123f5be0035ec7b03b7cdd91d2058c' + 'a90fbb8f38e4c0ff97dd74f058173c9cc8b3732f68850c5d499d7d05cad3debd' + '1906267720110bb0db0145bddd878d6909729a2729fb6d7a891ee1cb22aa1e40' + 'fc12afa5a3c91f3088458b03963020be620028dd7be8fb4dcffef224f8c8b031' + '9dba90641aef38e9bb33538d357b81c2af56c50098b22cdb6c1c531442a9fc09' + 'aedd9608e6db030a30f779f97877f802ba78662f50bbe0984e5988e19b2ce592' + '49e66811d63e88b38f6154c6dec732294f9718326cf147c70ea35c3af1dc9fa5' + 'd855f39afc24607fd5bed14f06381460342ce6667d15c29711ae1d87ffa64d24' + '4e092465d2f0f47a2a49141df19b1b3327ecd6f0abc1adc361cfe4fd2cd149cd' + 'b6245c6adad6d7a67960a5224bcf5c480ae5769f35375ab71c00d95ccd65cbd5' + '6d089e47b65db6ef40b374bf7f89bebf2952e1949c2710de8c8d710707fe4943' + 'efecbe6ee639652f2253c672b4da345e400167d59daf8bbe1991e4c474e7dc76' + '66ec8dff3674523961060ecf263d9e3b2efe96c3392e445ed8707bde00fee918' + 'd251b0d1bdee189fcefa6244f529a6c16d8bfc3b17aa597fad7d15f531dc34d3' + 'd351e774edb8c318811ac4765e345c11d45fbe954a6abc5e8ca6bc9a575f15af' + '8fb7a607942882d114a6b662d5ec516343b60b3c8a3ad7623435b3054fb1ba2b' + '4a1df1a248befcb9bfebe64316b948e2c81c815a0c43879dd163809a4fb41a46' + '6c4911918aa47b505162e424663998a7319822b84a9c8385c7463405ca820e47' + '26172989d1175c66608fa1709f19f981c3d1e54c336bf992a09e556d5c3e4722' + 'd69294330356d9b870cf8066ac352f8a825bac21fe7c72f5fa87f37dd650fbeb' + 'b521b3a630be5d94d303d3813784e65eead5294df0a04e75530f243e072112d8')