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 c016a15b06..368d79fd17 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 6ca397e7d4776d652e039ed57779ed4d0d4e7898 Mon Sep 17 00:00:00 2001 +From 10dfe80078d9a80e26715a8cefa37af3bb2af335 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0002-restore-setup-config.patch b/mingw-w64-python/0002-restore-setup-config.patch index bf62ea647d..a3c19981f3 100644 --- a/mingw-w64-python/0002-restore-setup-config.patch +++ b/mingw-w64-python/0002-restore-setup-config.patch @@ -1,4 +1,4 @@ -From 2a25da9a573828b206180522b02633a1a128a2dd Mon Sep 17 00:00:00 2001 +From f7d2921eac5dc47b9905f6890fb1a1eafbb6d4ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:12 +0530 @@ -12,10 +12,10 @@ Subject: [PATCH 002/N] restore setup config create mode 100644 Modules/Setup.config.in diff --git a/Makefile.pre.in b/Makefile.pre.in -index 6ce7a61..e8e8e71 100644 +index 42b1ec6..c9d3193 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -714,10 +714,12 @@ oldsharedmods: $(SHAREDMODS) +@@ -713,10 +713,12 @@ oldsharedmods: $(SHAREDMODS) Makefile Modules/config.c: Makefile.pre \ $(srcdir)/Modules/config.c.in \ $(MAKESETUP) \ @@ -28,7 +28,7 @@ index 6ce7a61..e8e8e71 100644 Modules/Setup.local \ $(srcdir)/Modules/Setup @mv config.c Modules -@@ -1669,6 +1671,7 @@ libainstall: @DEF_MAKE_RULE@ python-config +@@ -1668,6 +1670,7 @@ libainstall: @DEF_MAKE_RULE@ python-config $(INSTALL_DATA) Makefile $(DESTDIR)$(LIBPL)/Makefile $(INSTALL_DATA) $(srcdir)/Modules/Setup $(DESTDIR)$(LIBPL)/Setup $(INSTALL_DATA) Modules/Setup.local $(DESTDIR)$(LIBPL)/Setup.local @@ -36,7 +36,7 @@ index 6ce7a61..e8e8e71 100644 $(INSTALL_DATA) Misc/python.pc $(DESTDIR)$(LIBPC)/python-$(VERSION).pc $(INSTALL_DATA) Misc/python-embed.pc $(DESTDIR)$(LIBPC)/python-$(VERSION)-embed.pc $(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup -@@ -1895,6 +1898,7 @@ distclean: clobber +@@ -1894,6 +1897,7 @@ distclean: clobber if test "$$file" != "$(srcdir)/Lib/test/data/README"; then rm "$$file"; fi; \ done -rm -f core Makefile Makefile.pre config.status Modules/Setup.local \ @@ -56,10 +56,10 @@ index 0000000..5c1299d +# based on configure-time options. + diff --git a/configure.ac b/configure.ac -index 8fe5fa5..6ae56e1 100644 +index 431d661..471860c 100644 --- a/configure.ac +++ b/configure.ac -@@ -5844,7 +5844,7 @@ AC_DEFINE_UNQUOTED(PY_BUILTIN_HASHLIB_HASHES, "$default_hashlib_hashes") +@@ -5856,7 +5856,7 @@ AC_DEFINE_UNQUOTED(PY_BUILTIN_HASHLIB_HASHES, "$default_hashlib_hashes") ]) # generate output files @@ -68,7 +68,7 @@ index 8fe5fa5..6ae56e1 100644 AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix]) AC_OUTPUT -@@ -5856,7 +5856,7 @@ fi +@@ -5868,7 +5868,7 @@ fi echo "creating Makefile" >&AS_MESSAGE_FD $SHELL $srcdir/Modules/makesetup -c $srcdir/Modules/config.c.in \ @@ -78,5 +78,5 @@ index 8fe5fa5..6ae56e1 100644 mv config.c Modules -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0003-build-add-with-nt-threads-and-make-it-default-on-min.patch b/mingw-w64-python/0003-build-add-with-nt-threads-and-make-it-default-on-min.patch index 0ab80aa525..2c4f3e13fe 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 80666900d875a95b06f1baf7f9c57a38e4831764 Mon Sep 17 00:00:00 2001 +From 6e5dbed1e20ccb472c1636b22580d716c3692da3 Mon Sep 17 00:00:00 2001 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,10 +78,10 @@ index fe78135..344b76e 100644 # include /* O_CREAT and O_EXCL */ # if defined(HAVE_SEM_OPEN) && !defined(POSIX_SEMAPHORES_NOT_ENABLED) diff --git a/configure.ac b/configure.ac -index 6ae56e1..d5766cf 100644 +index 471860c..6a375e3 100644 --- a/configure.ac +++ b/configure.ac -@@ -2040,6 +2040,53 @@ then +@@ -2047,6 +2047,53 @@ then BASECFLAGS="$BASECFLAGS $ac_arch_flags" fi @@ -135,7 +135,7 @@ index 6ae56e1..d5766cf 100644 # On some compilers, pthreads are available without further options # (e.g. MacOS X). On some of these systems, the compiler will not # complain if unaccepted options are passed (e.g. gcc on Mac OS X). -@@ -2158,6 +2205,8 @@ CC="$ac_save_cc"]) +@@ -2165,6 +2212,8 @@ CC="$ac_save_cc"]) AC_MSG_RESULT($ac_cv_pthread) fi @@ -144,7 +144,7 @@ index 6ae56e1..d5766cf 100644 # If we have set a CC compiler flag for thread support then # check if it works for CXX, too. ac_cv_cxx_thread=no -@@ -2178,6 +2227,10 @@ elif test "$ac_cv_pthread" = "yes" +@@ -2185,6 +2234,10 @@ elif test "$ac_cv_pthread" = "yes" then CXX="$CXX -pthread" ac_cv_cxx_thread=yes @@ -155,7 +155,7 @@ index 6ae56e1..d5766cf 100644 fi if test $ac_cv_cxx_thread = yes -@@ -2210,8 +2263,8 @@ dnl AC_MSG_RESULT($cpp_type) +@@ -2217,8 +2270,8 @@ dnl AC_MSG_RESULT($cpp_type) AC_HEADER_STDC AC_CHECK_HEADERS(asm/types.h crypt.h conio.h direct.h dlfcn.h errno.h \ fcntl.h grp.h \ @@ -166,7 +166,7 @@ index 6ae56e1..d5766cf 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 \ -@@ -2225,6 +2278,14 @@ sys/endian.h sys/sysmacros.h linux/memfd.h linux/wait.h sys/memfd.h sys/mman.h) +@@ -2232,6 +2285,14 @@ sys/endian.h sys/sysmacros.h linux/memfd.h linux/wait.h sys/memfd.h sys/mman.h) AC_HEADER_DIRENT AC_HEADER_MAJOR @@ -181,7 +181,7 @@ index 6ae56e1..d5766cf 100644 # bluetooth/bluetooth.h has been known to not compile with -std=c99. # http://permalink.gmane.org/gmane.linux.bluez.kernel/22294 SAVE_CFLAGS=$CFLAGS -@@ -2422,6 +2483,10 @@ fi +@@ -2429,6 +2490,10 @@ fi AC_MSG_CHECKING(for pthread_t) have_pthread_t=no @@ -192,7 +192,7 @@ index 6ae56e1..d5766cf 100644 AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[#include ]], [[pthread_t x; x = *(pthread_t*)0;]]) ],[have_pthread_t=yes],[]) -@@ -2452,6 +2517,7 @@ if test "$ac_cv_sizeof_pthread_key_t" -eq "$ac_cv_sizeof_int" ; then +@@ -2459,6 +2524,7 @@ if test "$ac_cv_sizeof_pthread_key_t" -eq "$ac_cv_sizeof_int" ; then else AC_MSG_RESULT(no) fi @@ -200,7 +200,7 @@ index 6ae56e1..d5766cf 100644 CC="$ac_save_cc" AC_SUBST(OTHER_LIBTOOL_OPT) -@@ -2897,10 +2963,15 @@ void *x = uuid_enc_be +@@ -2909,10 +2975,15 @@ void *x = uuid_enc_be [AC_MSG_RESULT(no)] ) @@ -216,7 +216,7 @@ index 6ae56e1..d5766cf 100644 # check if we need libintl for locale functions AC_CHECK_LIB(intl, textdomain, -@@ -3232,6 +3303,11 @@ then +@@ -3244,6 +3315,11 @@ then CXX="$CXX -pthread" fi posix_threads=yes @@ -228,7 +228,7 @@ index 6ae56e1..d5766cf 100644 else if test ! -z "$withval" -a -d "$withval" then LDFLAGS="$LDFLAGS -L$withval" -@@ -3692,6 +3768,15 @@ else +@@ -3704,6 +3780,15 @@ else fi # checks for library functions @@ -244,7 +244,7 @@ index 6ae56e1..d5766cf 100644 AC_CHECK_FUNCS(alarm accept4 setitimer getitimer bind_textdomain_codeset chown \ clock confstr copy_file_range ctermid dup3 execv explicit_bzero explicit_memset \ faccessat fchmod fchmodat fchown fchownat \ -@@ -4613,6 +4698,10 @@ AC_CHECK_DECLS([isinf, isnan, isfinite], [], [], [[#include ]]) +@@ -4625,6 +4710,10 @@ AC_CHECK_DECLS([isinf, isnan, isfinite], [], [], [[#include ]]) # the kernel module that provides POSIX semaphores # isn't loaded by default, so an attempt to call # sem_open results in a 'Signal 12' error. @@ -255,7 +255,7 @@ index 6ae56e1..d5766cf 100644 AC_MSG_CHECKING(whether POSIX semaphores are enabled) AC_CACHE_VAL(ac_cv_posix_semaphores_enabled, AC_RUN_IFELSE([AC_LANG_SOURCE([[ -@@ -4646,6 +4735,14 @@ fi +@@ -4658,6 +4747,14 @@ fi # Multiprocessing check for broken sem_getvalue AC_MSG_CHECKING(for broken sem_getvalue) @@ -271,10 +271,10 @@ index 6ae56e1..d5766cf 100644 AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include diff --git a/pyconfig.h.in b/pyconfig.h.in -index 6358e56..5f63cae 100644 +index 188faee..1df9659 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in -@@ -1359,6 +1359,9 @@ +@@ -1365,6 +1365,9 @@ /* Define if mvwdelch in curses.h is an expression. */ #undef MVWDELCH_IS_EXPRESSION @@ -285,5 +285,5 @@ index 6358e56..5f63cae 100644 #undef PACKAGE_BUGREPORT -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch b/mingw-w64-python/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch index 1f3009e249..0eb87c1eb8 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 96c05432383cc3468538aadd7f1a440ffda4165d Mon Sep 17 00:00:00 2001 +From 543163880ae967bc44e338c6dc0b04c94a8e5add Mon Sep 17 00:00:00 2001 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch b/mingw-w64-python/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch index 3acd4d6a22..5c238f7f5e 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 c2c04f16d3f6761a9ee768507c0ca8330c976ce6 Mon Sep 17 00:00:00 2001 +From 98ab3e71389dc707d622f1b1906ab6f408c6022b Mon Sep 17 00:00:00 2001 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 d5766cf..a9936de 100644 +index 6a375e3..eb285cc 100644 --- a/configure.ac +++ b/configure.ac @@ -400,6 +400,9 @@ then @@ -59,5 +59,5 @@ index d5766cf..a9936de 100644 # Some systems cannot stand _XOPEN_SOURCE being defined at all; they -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0006-MINGW-preset-configure-defaults.patch b/mingw-w64-python/0006-MINGW-preset-configure-defaults.patch index e911813d59..8fa05777f9 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 3cdb748058d33d3538a5db1c5b07251cebbd10c9 Mon Sep 17 00:00:00 2001 +From 593c0be91e0ab8fc52245f52c48ef6b4e388b1a7 Mon Sep 17 00:00:00 2001 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,10 +53,10 @@ index 0000000..03fde9e + +ac_cv_have_size_t_format=no diff --git a/configure.ac b/configure.ac -index a9936de..a2cec23 100644 +index eb285cc..bbea587 100644 --- a/configure.ac +++ b/configure.ac -@@ -913,6 +913,28 @@ if test x$MULTIARCH != x; then +@@ -920,6 +920,28 @@ if test x$MULTIARCH != x; then fi AC_SUBST(MULTIARCH_CPPFLAGS) @@ -86,5 +86,5 @@ index a9936de..a2cec23 100644 save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -Wl,--no-as-needed" -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0007-MINGW-configure-largefile-support-for-windows-builds.patch b/mingw-w64-python/0007-MINGW-configure-largefile-support-for-windows-builds.patch index 95765e0499..1fe66bab3c 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 0d783f83aadf8f7dd64bf81684942be2cde01df6 Mon Sep 17 00:00:00 2001 +From 0c221d4dc9d63ea30e7a4fb28cbdd31af3c03ee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:16 +0530 @@ -14,10 +14,10 @@ Co-authored-by: Christoph Reiter 1 file changed, 12 insertions(+) diff --git a/configure.ac b/configure.ac -index a2cec23..61a7608 100644 +index bbea587..ea7d551 100644 --- a/configure.ac +++ b/configure.ac -@@ -2487,8 +2487,20 @@ AC_CHECK_SIZEOF(off_t, [], [ +@@ -2494,8 +2494,20 @@ AC_CHECK_SIZEOF(off_t, [], [ ]) AC_MSG_CHECKING(whether to enable large file support) @@ -39,5 +39,5 @@ index a2cec23..61a7608 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch b/mingw-w64-python/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch index 828d47888f..d544722600 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 af4cca07445296c92dedffde8191e96e3c468adf Mon Sep 17 00:00:00 2001 +From bb3504f70b2ae039c32da6405a11b82b79dbfefe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:18 +0530 @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 13 insertions(+) diff --git a/configure.ac b/configure.ac -index 61a7608..1f3c8af 100644 +index ea7d551..bb80ed8 100644 --- a/configure.ac +++ b/configure.ac -@@ -5642,8 +5642,21 @@ do +@@ -5654,8 +5654,21 @@ do THREADHEADERS="$THREADHEADERS \$(srcdir)/$h" done @@ -39,5 +39,5 @@ index 61a7608..1f3c8af 100644 for dir in $SRCDIRS; do if test ! -d $dir; then -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0009-MINGW-init-system-calls.patch b/mingw-w64-python/0009-MINGW-init-system-calls.patch index 7a36331853..80877742a2 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 a2e178675d5376e8985c489a6cb3bb463909fb41 Mon Sep 17 00:00:00 2001 +From 9968428f3157658c0b47ce4f7732c82bf4a10406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:19 +0530 @@ -39,7 +39,7 @@ index 5c1299d..9b364fe 100644 +@INITSYS@ -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal posixmodule.c + diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index c984e2e..3f3e1f3 100644 +index 29d6126..3894e35 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -310,6 +310,27 @@ corresponding Unix manual entries for more information on calls."); @@ -101,7 +101,7 @@ index c984e2e..3f3e1f3 100644 static PyObject * convertenviron(void) diff --git a/configure.ac b/configure.ac -index 1f3c8af..ba8736b 100644 +index bb80ed8..d3ee3fe 100644 --- a/configure.ac +++ b/configure.ac @@ -594,6 +594,14 @@ then @@ -120,5 +120,5 @@ index 1f3c8af..ba8736b 100644 # it may influence the way we can build extensions, so distutils # needs to check it -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0010-MINGW-build-in-windows-modules-winreg.patch b/mingw-w64-python/0010-MINGW-build-in-windows-modules-winreg.patch index 7bdf18825b..93026ca85f 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 08880ce168fbb08e6476a246fd80e141ebf2eed7 Mon Sep 17 00:00:00 2001 +From 4061aa3b0c5530615a37774fc78aa485b88ab2cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:20 +0530 @@ -57,10 +57,10 @@ index fd1ccb7..b6f1a8f 100644 static BOOL clinic_HKEY_converter(PyObject *ob, void *p); static PyObject *PyHKEY_FromHKEY(HKEY h); diff --git a/configure.ac b/configure.ac -index ba8736b..59f3edc 100644 +index d3ee3fe..fcbb02c 100644 --- a/configure.ac +++ b/configure.ac -@@ -3326,6 +3326,13 @@ else +@@ -3338,6 +3338,13 @@ else fi]) AC_MSG_RESULT($with_dbmliborder) @@ -75,5 +75,5 @@ index ba8736b..59f3edc 100644 # For a single AC_DEFINE, no template is needed. AH_TEMPLATE(_REENTRANT, -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0011-MINGW-determine-if-pwdmodule-should-be-used.patch b/mingw-w64-python/0011-MINGW-determine-if-pwdmodule-should-be-used.patch index 3fcb7cf619..807ad50e98 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 892c8b91944241a71222a04d9276fdd409479408 Mon Sep 17 00:00:00 2001 +From 5687d0c4fd9b15b0ac3c8ce0ebd35e824a3f0475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:21 +0530 @@ -43,10 +43,10 @@ index 612cabd..d071a74 100644 @USE_WIN32_MODULE@winreg ../PC/winreg.c diff --git a/configure.ac b/configure.ac -index 59f3edc..806ebe0 100644 +index fcbb02c..b797c58 100644 --- a/configure.ac +++ b/configure.ac -@@ -3333,6 +3333,13 @@ case $host in +@@ -3345,6 +3345,13 @@ case $host in *-*-mingw*) USE_WIN32_MODULE=;; esac @@ -61,5 +61,5 @@ index 59f3edc..806ebe0 100644 # For a single AC_DEFINE, no template is needed. AH_TEMPLATE(_REENTRANT, -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch b/mingw-w64-python/0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch index d0c8bf5c99..d01c68f924 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 b04a5d9e049ad86d70f3977cb2604b2e6b7e0bca Mon Sep 17 00:00:00 2001 +From 85ff42f6dea113f58dfbc588eec2ee3174c17793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:23 +0530 @@ -64,12 +64,12 @@ index 475c2a8..a05fa3a 100644 /* module init functions outside the core must be exported */ # if defined(__cplusplus) diff --git a/setup.py b/setup.py -index 54d4b94..d7a4e3f 100644 +index c6023e1..86f877b 100644 --- a/setup.py +++ b/setup.py -@@ -444,6 +444,9 @@ class PyBuildExt(build_ext): - def build_extensions(self): - self.set_srcdir() +@@ -450,6 +450,9 @@ class PyBuildExt(build_ext): + self.configure_compiler() + self.init_inc_lib_dirs() + if MS_WINDOWS: + self.compiler.define_macro("Py_BUILD_CORE_MODULE") @@ -78,5 +78,5 @@ index 54d4b94..d7a4e3f 100644 self.detect_modules() -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0013-MINGW-configure-for-shared-build.patch b/mingw-w64-python/0013-MINGW-configure-for-shared-build.patch index 73ec196ae8..bfe25a7ecd 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 ed8995bda0e5acd112b43ee5662df3640f6154f3 Mon Sep 17 00:00:00 2001 +From a987eaf37f68be6e22fdca2cbc67e6df1eb14611 Mon Sep 17 00:00:00 2001 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,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 806ebe0..6ebf250 100644 +index b797c58..b457a4b 100644 --- a/configure.ac +++ b/configure.ac -@@ -1233,6 +1233,13 @@ if test $enable_shared = "yes"; then +@@ -1240,6 +1240,13 @@ if test $enable_shared = "yes"; then ;; esac @@ -30,7 +30,7 @@ index 806ebe0..6ebf250 100644 else # shared is disabled PY_ENABLE_SHARED=0 case $ac_sys_system in -@@ -1241,6 +1248,10 @@ else # shared is disabled +@@ -1248,6 +1255,10 @@ else # shared is disabled LDLIBRARY='libpython$(LDVERSION).dll.a' ;; esac @@ -41,7 +41,7 @@ index 806ebe0..6ebf250 100644 fi if test "$cross_compiling" = yes; then -@@ -2843,6 +2854,12 @@ then +@@ -2850,6 +2861,12 @@ then LDCXXSHARED="g++ -shared -Wl,--enable-auto-image-base";; *) LDSHARED="ld";; esac @@ -54,7 +54,7 @@ index 806ebe0..6ebf250 100644 fi AC_MSG_RESULT($LDSHARED) LDCXXSHARED=${LDCXXSHARED-$LDSHARED} -@@ -5670,7 +5687,8 @@ case $host in +@@ -5682,7 +5699,8 @@ case $host in dnl "errmap.h" from $srcdir/PC. dnl Note we cannot use BASECPPFLAGS as autogenerated pyconfig.h dnl has to be before customized located in ../PC. @@ -65,5 +65,5 @@ index 806ebe0..6ebf250 100644 esac -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0014-MINGW-dynamic-loading-support.patch b/mingw-w64-python/0014-MINGW-dynamic-loading-support.patch index a85937ab06..ad4294d731 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 4eb264922b5a1abfa9400662d88c10a3b5f447bd Mon Sep 17 00:00:00 2001 +From 0aca06809a58f19465df1f1245e0383da9129835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:25 +0530 @@ -15,10 +15,10 @@ Co-authored-by: Алексей 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index e8e8e71..332f9a5 100644 +index c9d3193..3b96788 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -823,6 +823,12 @@ Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile +@@ -822,6 +822,12 @@ Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile -DSHLIB_EXT='"$(EXT_SUFFIX)"' \ -o $@ $(srcdir)/Python/dynload_hpux.c @@ -59,10 +59,10 @@ index 81787e5..9d7690e 100644 /* restore old error mode settings */ diff --git a/configure.ac b/configure.ac -index 6ebf250..a8c64a7 100644 +index b457a4b..6ba6dc7 100644 --- a/configure.ac +++ b/configure.ac -@@ -2718,6 +2718,9 @@ if test -z "$SHLIB_SUFFIX"; then +@@ -2725,6 +2725,9 @@ if test -z "$SHLIB_SUFFIX"; then CYGWIN*) SHLIB_SUFFIX=.dll;; *) SHLIB_SUFFIX=.so;; esac @@ -72,7 +72,7 @@ index 6ebf250..a8c64a7 100644 fi AC_MSG_RESULT($SHLIB_SUFFIX) -@@ -3831,6 +3834,13 @@ then +@@ -3843,6 +3846,13 @@ then fi ;; esac @@ -86,7 +86,7 @@ index 6ebf250..a8c64a7 100644 fi AC_MSG_RESULT($DYNLOADFILE) if test "$DYNLOADFILE" != "dynload_stub.o" -@@ -5667,6 +5677,12 @@ case "$ac_cv_computed_gotos" in yes*) +@@ -5679,6 +5689,12 @@ case "$ac_cv_computed_gotos" in yes*) AC_DEFINE(HAVE_COMPUTED_GOTOS, 1, [Define if the C compiler supports computed gotos.]) esac @@ -100,5 +100,5 @@ index 6ebf250..a8c64a7 100644 case $ac_sys_system in AIX*) -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0015-MINGW-ignore-main-program-for-frozen-scripts.patch b/mingw-w64-python/0015-MINGW-ignore-main-program-for-frozen-scripts.patch index e97f70e7c1..b20b4a0a84 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 bd06581551552ea5206d6af8c757181864b11066 Mon Sep 17 00:00:00 2001 +From 4d8528bd2de264a45cbcd0f2b7ac86ffa57da6d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:26 +0530 @@ -14,10 +14,10 @@ Co-authored-by: Алексей 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 332f9a5..8c8363a 100644 +index 3b96788..1c46d07 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -352,7 +352,7 @@ PYTHON_OBJS= \ +@@ -351,7 +351,7 @@ PYTHON_OBJS= \ Python/context.o \ Python/dynamic_annotations.o \ Python/errors.o \ @@ -27,10 +27,10 @@ index 332f9a5..8c8363a 100644 Python/getargs.o \ Python/getcompiler.o \ diff --git a/configure.ac b/configure.ac -index a8c64a7..7fcdd47 100644 +index 6ba6dc7..ac5061f 100644 --- a/configure.ac +++ b/configure.ac -@@ -5708,6 +5708,16 @@ case $host in +@@ -5720,6 +5720,16 @@ case $host in ;; esac @@ -48,5 +48,5 @@ index a8c64a7..7fcdd47 100644 SRCDIRS="Parser Parser/pegen Objects Python Modules Modules/_io Programs" case $host in -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0016-MINGW-setup-_multiprocessing-module.patch b/mingw-w64-python/0016-MINGW-setup-_multiprocessing-module.patch index 8bcd1ac272..37b91c9684 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 0dca777395cc304349d9d90e631407374e2c6de0 Mon Sep 17 00:00:00 2001 +From 63926d1e82cfdac69ee3fedced546db4fafb44ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:26 +0530 @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 5 insertions(+) diff --git a/setup.py b/setup.py -index d7a4e3f..a15718e 100644 +index 86f877b..f00612a 100644 --- a/setup.py +++ b/setup.py -@@ -1766,7 +1766,12 @@ class PyBuildExt(build_ext): +@@ -1771,7 +1771,12 @@ class PyBuildExt(build_ext): libraries=libs, include_dirs=["Modules/_multiprocessing"])) @@ -30,5 +30,5 @@ index d7a4e3f..a15718e 100644 def detect_uuid(self): -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0017-MINGW-setup-select-module.patch b/mingw-w64-python/0017-MINGW-setup-select-module.patch index 07c359e965..dbeb756478 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 1dcb2cc12d447b3be226f61699d2570c921b67bb Mon Sep 17 00:00:00 2001 +From 214eb1d0c11cb7ac5070765c099fcbb6eb930f1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:29 +0530 @@ -39,10 +39,10 @@ index fb71e91..ad3990c 100644 /* add object and its file descriptor to the list */ diff --git a/setup.py b/setup.py -index a15718e..7914821 100644 +index f00612a..d74f25e 100644 --- a/setup.py +++ b/setup.py -@@ -906,7 +906,11 @@ class PyBuildExt(build_ext): +@@ -909,7 +909,11 @@ class PyBuildExt(build_ext): self.missing.append('spwd') # select(2); not on ancient System V @@ -56,5 +56,5 @@ index a15718e..7914821 100644 # Fred Drake's interface to the Python parser self.add(Extension('parser', ['parsermodule.c'])) -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0018-MINGW-setup-_ctypes-module-with-system-libffi.patch b/mingw-w64-python/0018-MINGW-setup-_ctypes-module-with-system-libffi.patch index cf0da7f955..66daf0eed0 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 f863b526f355dbc2dd1539be76a0f95f7abec559 Mon Sep 17 00:00:00 2001 +From 9b7ef57e2a6bc784555d9671ed7b1101fe03f7fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:30 +0530 @@ -14,10 +14,10 @@ Co-authored-by: Christoph Reiter 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 7914821..60f6243 100644 +index d74f25e..2c3e29e 100644 --- a/setup.py +++ b/setup.py -@@ -2154,9 +2154,12 @@ class PyBuildExt(build_ext): +@@ -2156,9 +2156,12 @@ class PyBuildExt(build_ext): self.add(ext) if TEST_EXTENSIONS: # function my_sqrt() needs libm for sqrt() @@ -31,7 +31,7 @@ index 7914821..60f6243 100644 ffi_inc = sysconfig.get_config_var("LIBFFI_INCLUDEDIR") ffi_lib = None -@@ -2201,6 +2204,8 @@ class PyBuildExt(build_ext): +@@ -2203,6 +2206,8 @@ class PyBuildExt(build_ext): ext.include_dirs.append(ffi_inc) ext.libraries.append(ffi_lib) @@ -41,5 +41,5 @@ index 7914821..60f6243 100644 if sysconfig.get_config_var('HAVE_LIBDL'): -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0019-MINGW-defect-winsock2-and-setup-_socket-module.patch b/mingw-w64-python/0019-MINGW-defect-winsock2-and-setup-_socket-module.patch index 8ee66eeed1..75623d74c2 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 0a6c242ff914437f5feb80ee638b592667a519b2 Mon Sep 17 00:00:00 2001 +From 9c06f597151aafa16ed53c8d434ce60a21ca676b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:30 +0530 @@ -28,10 +28,10 @@ index 513065d..9be43fd 100644 +# force detection of winsock2 functionality - require wxp or newer +ac_cv_func_getpeername=yes diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c -index 8953185..d15bb4f 100644 +index a22060d..be91ad0 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c -@@ -305,7 +305,7 @@ http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/net/getaddrinfo.c.diff?r1=1.82& +@@ -302,7 +302,7 @@ http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/net/getaddrinfo.c.diff?r1=1.82& # endif /* Macros based on the IPPROTO enum, see: https://bugs.python.org/issue29515 */ @@ -40,7 +40,7 @@ index 8953185..d15bb4f 100644 #define IPPROTO_ICMP IPPROTO_ICMP #define IPPROTO_IGMP IPPROTO_IGMP #define IPPROTO_GGP IPPROTO_GGP -@@ -336,7 +336,7 @@ http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/net/getaddrinfo.c.diff?r1=1.82& +@@ -333,7 +333,7 @@ http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/net/getaddrinfo.c.diff?r1=1.82& #define IPPROTO_PGM IPPROTO_PGM // WinSock2 only #define IPPROTO_L2TP IPPROTO_L2TP // WinSock2 only #define IPPROTO_SCTP IPPROTO_SCTP // WinSock2 only @@ -49,7 +49,7 @@ index 8953185..d15bb4f 100644 /* Provides the IsWindows7SP1OrGreater() function */ #include -@@ -429,6 +429,10 @@ remove_unusable_flags(PyObject *m) +@@ -426,6 +426,10 @@ remove_unusable_flags(PyObject *m) /* Do not include addrinfo.h for MSVC7 or greater. 'addrinfo' and * EAI_* constants are defined in (the already included) ws2tcpip.h. */ @@ -61,10 +61,10 @@ index 8953185..d15bb4f 100644 # include "addrinfo.h" #endif diff --git a/configure.ac b/configure.ac -index 7fcdd47..5459145 100644 +index ac5061f..495cf68 100644 --- a/configure.ac +++ b/configure.ac -@@ -4443,21 +4443,36 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +@@ -4455,21 +4455,36 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ],[]) AC_MSG_RESULT($was_it_defined) @@ -105,7 +105,7 @@ index 7fcdd47..5459145 100644 [ac_cv_struct_sockaddr_storage=yes], [ac_cv_struct_sockaddr_storage=no])) AC_MSG_RESULT($ac_cv_struct_sockaddr_storage) -@@ -5598,7 +5613,10 @@ fi +@@ -5610,7 +5625,10 @@ fi AC_CHECK_TYPE(socklen_t,, AC_DEFINE(socklen_t,int, @@ -118,7 +118,7 @@ index 7fcdd47..5459145 100644 #include #endif diff --git a/pyconfig.h.in b/pyconfig.h.in -index 5f63cae..b69a7c7 100644 +index 1df9659..10255f6 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -54,7 +54,7 @@ @@ -130,7 +130,7 @@ index 5f63cae..b69a7c7 100644 #undef HAVE_ADDRINFO /* Define to 1 if you have the `alarm' function. */ -@@ -1342,6 +1342,9 @@ +@@ -1348,6 +1348,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 5f63cae..b69a7c7 100644 /* Define if the zlib library has inflateCopy */ #undef HAVE_ZLIB_COPY -@@ -1658,7 +1661,7 @@ +@@ -1664,7 +1667,7 @@ /* Define to `unsigned int' if does not define. */ #undef size_t @@ -150,10 +150,10 @@ index 5f63cae..b69a7c7 100644 /* Define to `int' if doesn't define. */ diff --git a/setup.py b/setup.py -index 60f6243..c8242ac 100644 +index 2c3e29e..2beb525 100644 --- a/setup.py +++ b/setup.py -@@ -1143,6 +1143,8 @@ class PyBuildExt(build_ext): +@@ -1146,6 +1146,8 @@ class PyBuildExt(build_ext): if MACOS: # Issue #35569: Expose RFC 3542 socket options. kwargs['extra_compile_args'] = ['-D__APPLE_USE_RFC_3542'] @@ -163,5 +163,5 @@ index 60f6243..c8242ac 100644 self.add(Extension('_socket', ['socketmodule.c'], **kwargs)) elif self.compiler.find_library_file(self.lib_dirs, 'net'): -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0020-MINGW-exclude-unix-only-modules.patch b/mingw-w64-python/0020-MINGW-exclude-unix-only-modules.patch index 1a59ca9a8c..fe51fec4ff 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 43127485a0b9ef0e6eb88436cbd3691114203324 Mon Sep 17 00:00:00 2001 +From 8935c150ff336f6ba87ab67cb0b134586c26b694 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:31 +0530 @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/setup.py b/setup.py -index c8242ac..f317bf3 100644 +index 2beb525..a35f493 100644 --- a/setup.py +++ b/setup.py -@@ -889,13 +889,21 @@ class PyBuildExt(build_ext): +@@ -892,13 +892,21 @@ class PyBuildExt(build_ext): if (self.config_h_vars.get('FLOCK_NEEDS_LIBBSD', False)): # May be necessary on AIX for flock function libs = ['bsd'] @@ -42,7 +42,7 @@ index c8242ac..f317bf3 100644 # spwd, shadow passwords if (self.config_h_vars.get('HAVE_GETSPNAM', False) or self.config_h_vars.get('HAVE_GETSPENT', False)): -@@ -920,7 +928,10 @@ class PyBuildExt(build_ext): +@@ -923,7 +931,10 @@ class PyBuildExt(build_ext): # Lance Ellinghaus's syslog module # syslog daemon interface @@ -54,7 +54,7 @@ index c8242ac..f317bf3 100644 # Python interface to subinterpreter C-API. self.add(Extension('_xxsubinterpreters', ['_xxsubinterpretersmodule.c'])) -@@ -946,7 +957,10 @@ class PyBuildExt(build_ext): +@@ -949,7 +960,10 @@ class PyBuildExt(build_ext): self.add(Extension('_csv', ['_csv.c'])) # POSIX subprocess module helper. @@ -66,7 +66,7 @@ index c8242ac..f317bf3 100644 def detect_test_extensions(self): # Python C API test module -@@ -1128,13 +1142,16 @@ class PyBuildExt(build_ext): +@@ -1131,13 +1145,16 @@ class PyBuildExt(build_ext): # the encryption. return @@ -90,5 +90,5 @@ index c8242ac..f317bf3 100644 def detect_socket(self): # socket(2) -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0021-MINGW-setup-msvcrt-and-_winapi-modules.patch b/mingw-w64-python/0021-MINGW-setup-msvcrt-and-_winapi-modules.patch index 0f36917f6a..527105bdc0 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 71342683a28f2826c9738951706c167226c2f093 Mon Sep 17 00:00:00 2001 +From 21c092964fa1524ea3e5a30995924a87d4af9fac Mon Sep 17 00:00:00 2001 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 @@ -57,10 +57,10 @@ index 7febaa0..70d5b3d 100644 #endif diff --git a/setup.py b/setup.py -index f317bf3..5466e9b 100644 +index a35f493..a802e51 100644 --- a/setup.py +++ b/setup.py -@@ -1604,6 +1604,27 @@ class PyBuildExt(build_ext): +@@ -1607,6 +1607,27 @@ class PyBuildExt(build_ext): '-framework', 'SystemConfiguration', '-framework', 'CoreFoundation'])) @@ -89,5 +89,5 @@ index f317bf3..5466e9b 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0022-sysconfig-MINGW-build-extensions-with-GCC.patch b/mingw-w64-python/0022-sysconfig-MINGW-build-extensions-with-GCC.patch index ca2b869b61..91286ee5f2 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 81df7b055662ed80b952de911ec0c25df3e40e1f Mon Sep 17 00:00:00 2001 +From 27c14e48f60c152b2dfb6031b21f26b9c79c93bb 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0023-MINGW-setup-_ssl-module.patch b/mingw-w64-python/0023-MINGW-setup-_ssl-module.patch index 29196e5156..349bcba8bf 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 3d38194a6e0ff4c07988064d51fa10ecbf7b450d Mon Sep 17 00:00:00 2001 +From ba662c4c0f3a9fc5ee296fb4a6b5c5038bc1ae79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:37 +0530 @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py -index 5466e9b..51d3f59 100644 +index a802e51..2e2578c 100644 --- a/setup.py +++ b/setup.py -@@ -2386,6 +2386,8 @@ class PyBuildExt(build_ext): +@@ -2388,6 +2388,8 @@ class PyBuildExt(build_ext): openssl_includes = split_var('OPENSSL_INCLUDES', '-I') openssl_libdirs = split_var('OPENSSL_LDFLAGS', '-L') openssl_libs = split_var('OPENSSL_LIBS', '-l') @@ -26,5 +26,5 @@ index 5466e9b..51d3f59 100644 # libssl and libcrypto not found self.missing.extend(['_ssl', '_hashlib']) -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch b/mingw-w64-python/0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch index 0e1b453276..82e3e6fa39 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 9cd7f11ee87717152eb4deebdf74217495440b11 Mon Sep 17 00:00:00 2001 +From 6b724ccae0bdef5fc26ccd45a46fbfe466c6940b Mon Sep 17 00:00:00 2001 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0025-MINGW-support-stdcall-without-underscore.patch b/mingw-w64-python/0025-MINGW-support-stdcall-without-underscore.patch index a4681827d6..6e4e534831 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 15b977a7de9a992afdb0af75ae3c3d84a524d7df Mon Sep 17 00:00:00 2001 +From 1b5307c71e0c90bc47a19b799c702619631b8b40 Mon Sep 17 00:00:00 2001 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch b/mingw-w64-python/0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch index 113352169c..ce403abc65 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 b14a7592f54a2230d5b087e15a4547d23eeed6e1 Mon Sep 17 00:00:00 2001 +From 7e4c459c2f2ce9031239e94cc141ff7aacc10c26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:40 +0530 @@ -14,10 +14,10 @@ Co-authored-by: Christoph Reiter 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 51d3f59..ea08edf 100644 +index 2e2578c..0d2740b 100644 --- a/setup.py +++ b/setup.py -@@ -2607,7 +2607,7 @@ class PyBuildScripts(build_scripts): +@@ -2609,7 +2609,7 @@ class PyBuildScripts(build_scripts): else: newfilename = filename + minoronly log.info('renaming %s to %s', filename, newfilename) @@ -27,5 +27,5 @@ index 51d3f59..ea08edf 100644 if filename in updated_files: newupdated_files.append(newfilename) -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0027-MINGW-customize-site.patch b/mingw-w64-python/0027-MINGW-customize-site.patch index 7c4e663ade..97c48d588a 100644 --- a/mingw-w64-python/0027-MINGW-customize-site.patch +++ b/mingw-w64-python/0027-MINGW-customize-site.patch @@ -1,4 +1,4 @@ -From 7edbdbe649d050d6753289b61ad5d2883b5338cd Mon Sep 17 00:00:00 2001 +From 63cf4844b28e2353500735dc156ef64fe46956bd Mon Sep 17 00:00:00 2001 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0028-add-python-config-sh.patch b/mingw-w64-python/0028-add-python-config-sh.patch index 39bda2dce1..4f9e12e27b 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 6c65a9a8245268b2260c99db33e27205d9a67837 Mon Sep 17 00:00:00 2001 +From 3070c3206e021b6427ab4483be27afbb10a959c1 Mon Sep 17 00:00:00 2001 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0029-cross-darwin-feature.patch b/mingw-w64-python/0029-cross-darwin-feature.patch index 5a3ca175ee..37e899294d 100644 --- a/mingw-w64-python/0029-cross-darwin-feature.patch +++ b/mingw-w64-python/0029-cross-darwin-feature.patch @@ -1,4 +1,4 @@ -From 28b76e2a3d4a629a2e5280c760fce8d661909ae0 Mon Sep 17 00:00:00 2001 +From 967b2ec36000c3250b99d190420064cb8f55d8a0 Mon Sep 17 00:00:00 2001 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 5459145..bd4ff50 100644 +index 495cf68..7f2bb28 100644 --- a/configure.ac +++ b/configure.ac @@ -387,6 +387,7 @@ if test -z "$MACHDEP" @@ -70,7 +70,7 @@ index 5459145..bd4ff50 100644 *) # for now, limit cross builds to known configurations MACHDEP="unknown" -@@ -1655,6 +1679,26 @@ AC_SUBST(BASECFLAGS) +@@ -1662,6 +1686,26 @@ AC_SUBST(BASECFLAGS) AC_SUBST(CFLAGS_NODIST) AC_SUBST(LDFLAGS_NODIST) @@ -97,7 +97,7 @@ index 5459145..bd4ff50 100644 # The -arch flags for universal builds on macOS UNIVERSAL_ARCH_FLAGS= AC_SUBST(UNIVERSAL_ARCH_FLAGS) -@@ -2033,7 +2077,7 @@ yes) +@@ -2040,7 +2084,7 @@ yes) ;; esac else @@ -106,7 +106,7 @@ index 5459145..bd4ff50 100644 then # 10.4 was the first release to support Intel archs cur_target="10.4" -@@ -2606,7 +2650,7 @@ case $ac_sys_system/$ac_sys_release in +@@ -2613,7 +2657,7 @@ case $ac_sys_system/$ac_sys_release in if test "${enable_universalsdk}"; then : else @@ -115,7 +115,7 @@ index 5459145..bd4ff50 100644 fi LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';; -@@ -2631,7 +2675,7 @@ case $ac_sys_system/$ac_sys_release in +@@ -2638,7 +2682,7 @@ case $ac_sys_system/$ac_sys_release in ]])],[ac_osx_32bit=yes],[ac_osx_32bit=no],[ac_osx_32bit=yes]) if test "${ac_osx_32bit}" = "yes"; then @@ -124,7 +124,7 @@ index 5459145..bd4ff50 100644 i386) MACOSX_DEFAULT_ARCH="i386" ;; -@@ -2643,7 +2687,7 @@ case $ac_sys_system/$ac_sys_release in +@@ -2650,7 +2694,7 @@ case $ac_sys_system/$ac_sys_release in ;; esac else @@ -134,5 +134,5 @@ index 5459145..bd4ff50 100644 MACOSX_DEFAULT_ARCH="x86_64" ;; -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0030-mingw-system-libffi.patch b/mingw-w64-python/0030-mingw-system-libffi.patch index 7c4a819f06..f24fe2f32e 100644 --- a/mingw-w64-python/0030-mingw-system-libffi.patch +++ b/mingw-w64-python/0030-mingw-system-libffi.patch @@ -1,4 +1,4 @@ -From 97a76defea005fff27a7f019c7ecde3f43a8ee64 Mon Sep 17 00:00:00 2001 +From 8153173167969474e8f6d593e9a29673075fcc38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:45 +0530 @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py -index ea08edf..c52fd3b 100644 +index 0d2740b..d6b0856 100644 --- a/setup.py +++ b/setup.py -@@ -2246,6 +2246,8 @@ class PyBuildExt(build_ext): +@@ -2248,6 +2248,8 @@ class PyBuildExt(build_ext): ext.libraries.append(ffi_lib) if MS_WINDOWS: ext.libraries.extend(['ole32', 'oleaut32', 'uuid']) @@ -26,5 +26,5 @@ index ea08edf..c52fd3b 100644 if sysconfig.get_config_var('HAVE_LIBDL'): -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch b/mingw-w64-python/0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch index 068d830563..a85cbddbf3 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 eef4cbef8040e29440e645138de2184bcc82c3d0 Mon Sep 17 00:00:00 2001 +From 4d5064d190e3c44030ebad8e66966f9b1b4714bf Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 17 Jun 2021 18:51:46 +0530 Subject: [PATCH 031/N] msys mingw prefer unix sep if MSYSTEM @@ -211,7 +211,7 @@ index 6f77177..77f5614 100644 try: diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 3f3e1f3..1e61545 100644 +index 3894e35..88e2afb 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -3759,6 +3759,7 @@ posix_getcwd(int use_bytes) @@ -231,7 +231,7 @@ index 3f3e1f3..1e61545 100644 if (result && path->narrow) { Py_SETREF(result, PyUnicode_EncodeFSDefault(result)); diff --git a/Python/initconfig.c b/Python/initconfig.c -index 3caed38..d8f0005 100644 +index 116ee33..af46d26 100644 --- a/Python/initconfig.c +++ b/Python/initconfig.c @@ -136,7 +136,7 @@ static const char usage_6[] = @@ -253,7 +253,7 @@ index 3caed38..d8f0005 100644 #else const wchar_t *default_program_name = L"python3"; diff --git a/Python/pathconfig.c b/Python/pathconfig.c -index 9a30221..267ee4d 100644 +index b2ce86e..222850b 100644 --- a/Python/pathconfig.c +++ b/Python/pathconfig.c @@ -15,6 +15,114 @@ @@ -380,7 +380,7 @@ index 9a30221..267ee4d 100644 diff --git a/Python/traceback.c b/Python/traceback.c -index 83f3074..c0e463a 100644 +index 23d0e38..37a7670 100644 --- a/Python/traceback.c +++ b/Python/traceback.c @@ -314,7 +314,7 @@ _Py_FindSourceFile(PyObject *filename, char* namebuf, size_t namelen, PyObject * @@ -393,5 +393,5 @@ index 83f3074..c0e463a 100644 tail = filepath; else -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0032-mingw-use-posix-getpath.patch b/mingw-w64-python/0032-mingw-use-posix-getpath.patch index 7f51c1f4a9..08f40ba9ef 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 81023c047fed86a16c63b8a185abbb34c54b023b Mon Sep 17 00:00:00 2001 +From c743ec5883ee146dde9259c54730bd48810c316c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:47 +0530 @@ -47,7 +47,7 @@ index 4eec669..b34f110 100644 #endif diff --git a/Modules/getpath.c b/Modules/getpath.c -index 728ecad..3010182 100644 +index 5dbe57c..bede134 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -13,6 +13,11 @@ @@ -436,7 +436,7 @@ index 728ecad..3010182 100644 status = calculate_init(&calculate, config); diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 1e61545..40fc270 100644 +index 88e2afb..add8ed5 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -4049,7 +4049,7 @@ _listdir_windows_no_opendir(path_t *path, PyObject *list) @@ -463,10 +463,10 @@ index 9d7690e..bd34310 100644 _Py_COMP_DIAG_PUSH _Py_COMP_DIAG_IGNORE_DEPR_DECLS diff --git a/Python/fileutils.c b/Python/fileutils.c -index 11c659d..4b299b2 100644 +index 26e97df..75ee355 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c -@@ -1925,13 +1925,31 @@ _Py_wrealpath(const wchar_t *path, +@@ -1937,13 +1937,31 @@ _Py_wrealpath(const wchar_t *path, #endif @@ -501,5 +501,5 @@ index 11c659d..4b299b2 100644 /* Get an absolute path. -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0033-mingw-add-ModuleFileName-dir-to-PATH.patch b/mingw-w64-python/0033-mingw-add-ModuleFileName-dir-to-PATH.patch index 84ee084daa..677b6cdbb4 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 1a866712f70f3f146587b0d25ad7f66b185a0afc Mon Sep 17 00:00:00 2001 +From ef90ac0fa4d305d9fa76ead9755ab7a731cd0f8c 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 @@ -13,7 +13,7 @@ Co-authored-by: Christoph Reiter 1 file changed, 30 insertions(+) diff --git a/Modules/getpath.c b/Modules/getpath.c -index 3010182..c52e0df 100644 +index bede134..c782e0f 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -1641,6 +1641,36 @@ calculate_path(PyCalculatePath *calculate, _PyPathConfig *pathconfig) @@ -54,5 +54,5 @@ index 3010182..c52e0df 100644 && calculate->warnings) { -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch b/mingw-w64-python/0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch index bc74438917..245b5a887a 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 e9e44cbc990a6d1be36bc7739de1b365bd5f3deb Mon Sep 17 00:00:00 2001 +From 970c6cc2d5fcb3b09f2735da2606e6a24bd7d505 Mon Sep 17 00:00:00 2001 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0035-msys-cygwin-semi-native-build-sysconfig.patch b/mingw-w64-python/0035-msys-cygwin-semi-native-build-sysconfig.patch index bcd94ef70a..e8b16b7240 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 87605ef6c8e472a8b1e38d0fbeaf4f75b87a9964 Mon Sep 17 00:00:00 2001 +From 73afad716d68e9fb11b05e2c0cbf27c66279934a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:50 +0530 @@ -34,10 +34,10 @@ index 65cb345..f69d0db 100644 vars.update(done) return vars diff --git a/Makefile.pre.in b/Makefile.pre.in -index 8c8363a..e0b8155 100644 +index 1c46d07..3d42756 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -137,6 +137,13 @@ exec_prefix= @exec_prefix@ +@@ -136,6 +136,13 @@ exec_prefix= @exec_prefix@ # Install prefix for data files datarootdir= @datarootdir@ @@ -52,7 +52,7 @@ index 8c8363a..e0b8155 100644 BINDIR= @bindir@ LIBDIR= @libdir@ diff --git a/configure.ac b/configure.ac -index bd4ff50..a9640e9 100644 +index 7f2bb28..a7d664c 100644 --- a/configure.ac +++ b/configure.ac @@ -618,6 +618,65 @@ then @@ -122,5 +122,5 @@ index bd4ff50..a9640e9 100644 AC_SUBST(INITSYS) case $host in -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0036-sysconfig-mingw-sysconfig-like-posix.patch b/mingw-w64-python/0036-sysconfig-mingw-sysconfig-like-posix.patch index 71ca745a75..56e151a019 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 ab96d425d200796577c4d9eef79cc1e0e62a39dc Mon Sep 17 00:00:00 2001 +From d838915f88ce43b34f41387829b86b7c0c982a44 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch b/mingw-w64-python/0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch index 4552490385..e17e0208ed 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 fa3d5a352904467d12247164a7673033c5e95d2a Mon Sep 17 00:00:00 2001 +From 57a08f6618707d6eec15884e12905a035edbd39a Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:13:57 +0200 Subject: [PATCH 037/N] build _winapi earlier so we can use it in distutils @@ -20,10 +20,10 @@ index 825ce5d..b4e7ff7 100644 +@USE_WIN32_MODULE@_winapi _winapi.c diff --git a/setup.py b/setup.py -index c52fd3b..6a352af 100644 +index d6b0856..27f7bb2 100644 --- a/setup.py +++ b/setup.py -@@ -1612,7 +1612,9 @@ class PyBuildExt(build_ext): +@@ -1615,7 +1615,9 @@ class PyBuildExt(build_ext): self.add(Extension('msvcrt', [os.path.join(pc_srcdir, p) for p in ['msvcrtmodule.c']])) @@ -35,5 +35,5 @@ index c52fd3b..6a352af 100644 self.add(Extension('_msi', [os.path.join(pc_srcdir, p) for p in ['_msi.c']], -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch b/mingw-w64-python/0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch index 3346aa8c26..2f8ecac498 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 64886b38c5ad2d78730ed147ba398693731a8e89 Mon Sep 17 00:00:00 2001 +From 94bc3a2e5f1ff3b339127ba2d6f9df68c37b1eb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:52 +0530 @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 6a352af..497abbf 100644 +index 27f7bb2..5164bf7 100644 --- a/setup.py +++ b/setup.py -@@ -737,10 +737,10 @@ class PyBuildExt(build_ext): +@@ -740,10 +740,10 @@ class PyBuildExt(build_ext): if not CROSS_COMPILING: add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') @@ -29,5 +29,5 @@ index 6a352af..497abbf 100644 def init_inc_lib_dirs(self): -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0039-mingw-use-backslashes-in-compileall-py.patch b/mingw-w64-python/0039-mingw-use-backslashes-in-compileall-py.patch index ad1793e88a..5989ff5e2e 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 47c94ca56a6ebe7423ed267a69d1b9931893da3b Mon Sep 17 00:00:00 2001 +From dacfd8590ddca1e85a5b8da81fe5074c7fcea5b2 Mon Sep 17 00:00:00 2001 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 @@ -13,7 +13,7 @@ Co-authored-by: Алексей 1 file changed, 2 insertions(+) diff --git a/Lib/compileall.py b/Lib/compileall.py -index 39f4bb3..3490c09 100644 +index 25ad83c..f57879e 100644 --- a/Lib/compileall.py +++ b/Lib/compileall.py @@ -38,6 +38,8 @@ def _walk_dir(dir, maxlevels, quiet=0): @@ -26,5 +26,5 @@ index 39f4bb3..3490c09 100644 yield fullname elif (maxlevels > 0 and name != os.curdir and name != os.pardir and -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0040-msys-convert_path-fix-and-root-hack.patch b/mingw-w64-python/0040-msys-convert_path-fix-and-root-hack.patch index 294fea7aeb..1f7943cc2a 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 22fc2593de88d46a11786898d401e4801faeb125 Mon Sep 17 00:00:00 2001 +From 8a92dacab78e822097ba9064a104c81ac1baec29 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 21 Sep 2021 21:18:36 +0200 Subject: [PATCH 040/N] msys convert_path fix and root hack @@ -8,10 +8,10 @@ Subject: [PATCH 040/N] msys convert_path fix and root hack 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index e0b8155..cf16e93 100644 +index 3d42756..d00acbd 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1707,6 +1707,12 @@ libainstall: @DEF_MAKE_RULE@ python-config +@@ -1706,6 +1706,12 @@ libainstall: @DEF_MAKE_RULE@ python-config else true; \ fi @@ -24,7 +24,7 @@ index e0b8155..cf16e93 100644 # Install the dynamically loadable modules # This goes into $(exec_prefix) sharedinstall: sharedmods -@@ -1714,9 +1720,9 @@ sharedinstall: sharedmods +@@ -1713,9 +1719,9 @@ sharedinstall: sharedmods --prefix=$(prefix) \ --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ @@ -38,5 +38,5 @@ index e0b8155..cf16e93 100644 # Here are a couple of targets for MacOSX again, to install a full # framework-based Python. frameworkinstall installs everything, the -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0041-allow-static-tcltk.patch b/mingw-w64-python/0041-allow-static-tcltk.patch index 34c237cf5b..12f26715e6 100644 --- a/mingw-w64-python/0041-allow-static-tcltk.patch +++ b/mingw-w64-python/0041-allow-static-tcltk.patch @@ -1,4 +1,4 @@ -From 096b2ca2e049158126943fbd39eb969d2e040262 Mon Sep 17 00:00:00 2001 +From 31ffe9b84ec3c7b5a09f637ca94441d501bab380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:54 +0530 @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/setup.py b/setup.py -index 497abbf..31b08de 100644 +index 5164bf7..f761245 100644 --- a/setup.py +++ b/setup.py -@@ -786,7 +786,7 @@ class PyBuildExt(build_ext): +@@ -789,7 +789,7 @@ class PyBuildExt(build_ext): if HOST_PLATFORM == 'hp-ux11': self.lib_dirs += ['/usr/lib/hpux64', '/usr/lib/hpux32'] @@ -25,7 +25,7 @@ index 497abbf..31b08de 100644 # This should work on any unixy platform ;-) # If the user has bothered specifying additional -I and -L flags # in OPT and LDFLAGS we might as well use them here. -@@ -796,6 +796,8 @@ class PyBuildExt(build_ext): +@@ -799,6 +799,8 @@ class PyBuildExt(build_ext): # directories with whitespace in the name to store libraries. cflags, ldflags = sysconfig.get_config_vars( 'CFLAGS', 'LDFLAGS') @@ -34,7 +34,7 @@ index 497abbf..31b08de 100644 for item in cflags.split(): if item.startswith('-I'): self.inc_dirs.append(item[2:]) -@@ -2047,14 +2049,19 @@ class PyBuildExt(build_ext): +@@ -2049,14 +2051,19 @@ class PyBuildExt(build_ext): # The versions with dots are used on Unix, and the versions without # dots on Windows, for detection by cygwin. tcllib = tklib = tcl_includes = tk_includes = None @@ -62,7 +62,7 @@ index 497abbf..31b08de 100644 break # Now check for the header files -@@ -2125,10 +2132,18 @@ class PyBuildExt(build_ext): +@@ -2127,10 +2134,18 @@ class PyBuildExt(build_ext): # Add the Tcl/Tk libraries libs.append('tk'+ version) libs.append('tcl'+ version) @@ -83,5 +83,5 @@ index 497abbf..31b08de 100644 # XXX handle these, but how to detect? # *** Uncomment and edit for PIL (TkImaging) extension only: -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch b/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch index 55651c47fb..c30851144b 100644 --- a/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch +++ b/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch @@ -1,4 +1,4 @@ -From 2b8402c1cab75d631728eb1aecf02eb0f0f66265 Mon Sep 17 00:00:00 2001 +From 6c38cd961b5f26566fcda0149a0b5f56314891ac Mon Sep 17 00:00:00 2001 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0043-grammar-fixes.patch b/mingw-w64-python/0043-grammar-fixes.patch index 46962a0df5..398e290fb7 100644 --- a/mingw-w64-python/0043-grammar-fixes.patch +++ b/mingw-w64-python/0043-grammar-fixes.patch @@ -1,4 +1,4 @@ -From 36b85a28791eb087338e12f796e8d473d22f3ace Mon Sep 17 00:00:00 2001 +From 7161562c97559e655f41eb22c64cbcde2b964c3c Mon Sep 17 00:00:00 2001 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0044-builddir-fixes.patch b/mingw-w64-python/0044-builddir-fixes.patch index 2a133ead0e..b7c65cbb9c 100644 --- a/mingw-w64-python/0044-builddir-fixes.patch +++ b/mingw-w64-python/0044-builddir-fixes.patch @@ -1,4 +1,4 @@ -From e835e97afda8c4c672defae902194866fc3df0a4 Mon Sep 17 00:00:00 2001 +From 9aaf5d454559ff3ae731a84bcda8c6e2fd1f5161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:57 +0530 @@ -15,10 +15,10 @@ Co-authored-by: Christoph Reiter 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index cf16e93..7b3fdf6 100644 +index d00acbd..1895e74 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -741,20 +741,20 @@ Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) +@@ -740,20 +740,20 @@ Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) Programs/_freeze_importlib.o: Programs/_freeze_importlib.c Makefile @@ -43,7 +43,7 @@ index cf16e93..7b3fdf6 100644 $(srcdir)/Lib/importlib/_bootstrap.py \ $(srcdir)/Python/importlib.h.new $(UPDATE_FILE) $(srcdir)/Python/importlib.h $(srcdir)/Python/importlib.h.new -@@ -1882,7 +1882,7 @@ clean-retain-profile: pycremoval +@@ -1881,7 +1881,7 @@ clean-retain-profile: pycremoval find build -name '*.py[co]' -exec rm -f {} ';' || true -rm -f pybuilddir.txt -rm -f Lib/lib2to3/*Grammar*.pickle @@ -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.34.0 +2.34.1 diff --git a/mingw-w64-python/0045-msys-monkeypatch-os-system-via-sh-exe.patch b/mingw-w64-python/0045-msys-monkeypatch-os-system-via-sh-exe.patch index 2955b8a96a..d1f394093e 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 74ee0fa7cbd23e29f60d03606ee32b34bc0dbc6c Mon Sep 17 00:00:00 2001 +From dd99397c2c183cc1ba25ca094458be36cedcef20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:51:57 +0530 @@ -13,7 +13,7 @@ Co-authored-by: Алексей 1 file changed, 11 insertions(+) diff --git a/setup.py b/setup.py -index 31b08de..207a61c 100644 +index f761245..8454b28 100644 --- a/setup.py +++ b/setup.py @@ -58,6 +58,17 @@ def get_platform(): @@ -35,5 +35,5 @@ index 31b08de..207a61c 100644 HOST_PLATFORM = get_platform() MS_WINDOWS = (HOST_PLATFORM == 'win32') -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0046-msys-replace-slashes-used-in-io-redirection.patch b/mingw-w64-python/0046-msys-replace-slashes-used-in-io-redirection.patch index cc3fc0b3c4..8dd35fbea7 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 a85ea70acca8b8d49c5dea8451ec512ea979d88d Mon Sep 17 00:00:00 2001 +From 6ddd49f455c6312999c2ddc4340e44b59f892915 Mon Sep 17 00:00:00 2001 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 @@ -14,19 +14,19 @@ Co-authored-by: Christoph Reiter 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py -index 207a61c..d7a60e0 100644 +index 8454b28..d4778b0 100644 --- a/setup.py +++ b/setup.py -@@ -646,7 +646,7 @@ class PyBuildExt(build_ext): +@@ -650,7 +650,7 @@ class PyBuildExt(build_ext): + def add_multiarch_paths(self): # Debian/Ubuntu multiarch support. # https://wiki.ubuntu.com/MultiarchSpec - cc = sysconfig.get_config_var('CC') - tmpfile = os.path.join(self.build_temp, 'multiarch') + tmpfile = os.path.join(self.build_temp, 'multiarch').replace('\\','/') if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) ret = run_command( -@@ -671,7 +671,7 @@ class PyBuildExt(build_ext): +@@ -675,7 +675,7 @@ class PyBuildExt(build_ext): opt = '' if CROSS_COMPILING: opt = '-t' + sysconfig.get_config_var('HOST_GNU_TYPE') @@ -35,16 +35,16 @@ index 207a61c..d7a60e0 100644 if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) ret = run_command( -@@ -690,7 +690,7 @@ class PyBuildExt(build_ext): +@@ -693,7 +693,7 @@ class PyBuildExt(build_ext): + os.unlink(tmpfile) def add_cross_compiling_paths(self): - cc = sysconfig.get_config_var('CC') - tmpfile = os.path.join(self.build_temp, 'ccpaths') + tmpfile = os.path.join(self.build_temp, 'ccpaths').replace('\\','/') if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) - ret = run_command('%s -E -v - %s 1>/dev/null' % (cc, tmpfile)) -@@ -1004,7 +1004,7 @@ class PyBuildExt(build_ext): + ret = run_command('%s -E -v - %s 1>/dev/null' % (CC, tmpfile)) +@@ -1007,7 +1007,7 @@ class PyBuildExt(build_ext): readline_termcap_library = "" curses_library = "" # Cannot use os.popen here in py3k. @@ -53,7 +53,7 @@ index 207a61c..d7a60e0 100644 if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) # Determine if readline is already linked against curses or tinfo. -@@ -2003,12 +2003,12 @@ class PyBuildExt(build_ext): +@@ -2005,12 +2005,12 @@ class PyBuildExt(build_ext): cflags = sysconfig.get_config_vars('CFLAGS')[0] archs = re.findall(r'-arch\s+(\w+)', cflags) @@ -69,5 +69,5 @@ index 207a61c..d7a60e0 100644 with open(tmpfile) as fp: detected_archs = [] -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0047-remove_path_max.default.patch b/mingw-w64-python/0047-remove_path_max.default.patch index 48a1952e09..38ddaeaf99 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 01d2127df3190c472307aff3aaa71ab65e2450e4 Mon Sep 17 00:00:00 2001 +From 208a623ac4e8cb7b3aee59425146ffb365fd4db6 Mon Sep 17 00:00:00 2001 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0048-dont-link-with-gettext.patch b/mingw-w64-python/0048-dont-link-with-gettext.patch index 03ce7b473f..74d37cd44e 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 9b3cfc647bdeedc9caa6d89cdbcb4dfcdb3490f8 Mon Sep 17 00:00:00 2001 +From eee9aaf856e742f7cac350f3d6a2c0a50d84ee72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:00 +0530 @@ -32,10 +32,10 @@ index 2e353bb..ea222af 100644 #include #include diff --git a/configure.ac b/configure.ac -index a9640e9..0e1e9e4 100644 +index a7d664c..7589b6a 100644 --- a/configure.ac +++ b/configure.ac -@@ -3154,10 +3154,19 @@ AC_SEARCH_LIBS(sem_init, pthread rt posix4) +@@ -3166,10 +3166,19 @@ AC_SEARCH_LIBS(sem_init, pthread rt posix4) fi # check if we need libintl for locale functions @@ -56,5 +56,5 @@ index a9640e9..0e1e9e4 100644 # checks for system dependent C++ extensions support case "$ac_sys_system" in -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0049-ctypes-python-dll.patch b/mingw-w64-python/0049-ctypes-python-dll.patch index 1ca5bc162a..62bf061fce 100644 --- a/mingw-w64-python/0049-ctypes-python-dll.patch +++ b/mingw-w64-python/0049-ctypes-python-dll.patch @@ -1,4 +1,4 @@ -From 2a0f9b8311884449312bb934557f43a93a7ab426 Mon Sep 17 00:00:00 2001 +From b8b76d0c3fbc1c7e2bba5f96b74004b01ab80e28 Mon Sep 17 00:00:00 2001 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0050-gdbm-module-includes.patch b/mingw-w64-python/0050-gdbm-module-includes.patch index dd168db53c..fb902479e6 100644 --- a/mingw-w64-python/0050-gdbm-module-includes.patch +++ b/mingw-w64-python/0050-gdbm-module-includes.patch @@ -1,4 +1,4 @@ -From 34ca4e0b61ce539fee85e283e71d147d4035ae72 Mon Sep 17 00:00:00 2001 +From 149095ab008febab268fb6c856993a83ccd08eb3 Mon Sep 17 00:00:00 2001 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 @@ -13,7 +13,7 @@ Co-authored-by: Алексей 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/_gdbmmodule.c b/Modules/_gdbmmodule.c -index dd4c6b1..d51015c 100644 +index 16b0f79..46b28b2 100644 --- a/Modules/_gdbmmodule.c +++ b/Modules/_gdbmmodule.c @@ -11,7 +11,7 @@ @@ -26,5 +26,5 @@ index dd4c6b1..d51015c 100644 extern const char * gdbm_strerror(gdbm_error); #endif -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0051-use-gnu_printf-in-format.patch b/mingw-w64-python/0051-use-gnu_printf-in-format.patch index 5b9554255c..a4ee1d044c 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 c25ea3b8769fa270074f16ead5f119260219d127 Mon Sep 17 00:00:00 2001 +From 0f1bebcc7b043d9273ac3870531a59fd8859326d Mon Sep 17 00:00:00 2001 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0052-mingw-fix-ssl-dont-use-enum_certificates.patch b/mingw-w64-python/0052-mingw-fix-ssl-dont-use-enum_certificates.patch index 795e7938b9..af4ebd41e0 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 f5d305af4ee0826f1dcafe85fc7493657e667cb0 Mon Sep 17 00:00:00 2001 +From b29e861982970d42e382108b4b16c8cf25d32285 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0053-fix-using-dllhandle-and-winver-mingw.patch b/mingw-w64-python/0053-fix-using-dllhandle-and-winver-mingw.patch index 1cfab1e3a4..a9a1d2cf54 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 70aae126fda0fca2f004edd82894c13f0b279b00 Mon Sep 17 00:00:00 2001 +From cb37925d62b9d617d83cc6cba9480964c10103b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:06 +0530 @@ -13,7 +13,7 @@ Co-authored-by: Алексей 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Python/sysmodule.c b/Python/sysmodule.c -index 3e4115f..839ed1c 100644 +index a52b299..e890979 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -36,7 +36,7 @@ Data members: @@ -25,7 +25,7 @@ index 3e4115f..839ed1c 100644 extern void *PyWin_DLLhModule; /* A string loaded from the DLL at startup: */ extern const char *PyWin_DLLVersionString; -@@ -2731,7 +2731,7 @@ _PySys_InitCore(PyThreadState *tstate, PyObject *sysdict) +@@ -2729,7 +2729,7 @@ _PySys_InitCore(PyThreadState *tstate, PyObject *sysdict) PyUnicode_FromString("little")); #endif @@ -35,5 +35,5 @@ index 3e4115f..839ed1c 100644 PyLong_FromVoidPtr(PyWin_DLLhModule)); SET_SYS_FROM_STRING("winver", -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch b/mingw-w64-python/0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch index c054d6bc23..42179e9368 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 887b0e7895143809d0c8170caa3a4dd2306efefd Mon Sep 17 00:00:00 2001 +From 3dbbdd2957d1209d531468bdeb6846ea769d5a14 Mon Sep 17 00:00:00 2001 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0055-MINGW-link-with-additional-library.patch b/mingw-w64-python/0055-MINGW-link-with-additional-library.patch index 8663d539d6..af5f858096 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 1d8904ee69999ae9e58bec2b177472e67493628a Mon Sep 17 00:00:00 2001 +From 19a6447da32b6e49268e27485804087170ab21fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:08 +0530 @@ -9,10 +9,10 @@ Subject: [PATCH 055/N] MINGW link with additional library 1 file changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac -index 0e1e9e4..4316338 100644 +index 7589b6a..d97844f 100644 --- a/configure.ac +++ b/configure.ac -@@ -5861,6 +5861,15 @@ for dir in $SRCDIRS; do +@@ -5873,6 +5873,15 @@ for dir in $SRCDIRS; do done AC_MSG_RESULT(done) @@ -29,5 +29,5 @@ index 0e1e9e4..4316338 100644 AC_MSG_CHECKING(for -O2) saved_cflags="$CFLAGS" -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0056-install-msilib.patch b/mingw-w64-python/0056-install-msilib.patch index 28e1bc731e..711ce0a4a7 100644 --- a/mingw-w64-python/0056-install-msilib.patch +++ b/mingw-w64-python/0056-install-msilib.patch @@ -1,4 +1,4 @@ -From 63cdce7b086866930e5d34b1ade187dc0f92309d Mon Sep 17 00:00:00 2001 +From eeee8f68e2eb0c50e61df4a7a3d9738a65faccc3 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 @@ -14,10 +14,10 @@ Co-authored-by: Ray Donnelly 1 file changed, 1 insertion(+) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 7b3fdf6..87e95ec 100644 +index 1895e74..1d2e16e 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1497,6 +1497,7 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ +@@ -1496,6 +1496,7 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ test/test_peg_generator \ test/test_tools test/test_warnings test/test_warnings/data \ turtledemo \ @@ -26,5 +26,5 @@ index 7b3fdf6..87e95ec 100644 unittest unittest/test unittest/test/testmock \ venv venv/scripts venv/scripts/common venv/scripts/posix \ -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0057-fix-signal-module-build.patch b/mingw-w64-python/0057-fix-signal-module-build.patch index 84791f772a..d872caa3b0 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 9aea35d5abfebe9c7db885e7675f29d82a253b3b Mon Sep 17 00:00:00 2001 +From cbea8b321ec418a401189e0b92f54e63e6570be7 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0058-build-build-winconsoleio-and-_testconsole.patch b/mingw-w64-python/0058-build-build-winconsoleio-and-_testconsole.patch index 2f66440ae3..879a632d72 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 3ebd25cabfc22fab766e53b0e7b8f60d04073f2f Mon Sep 17 00:00:00 2001 +From e1f2b80e5f06d3486f68af91df064b743ddd41e5 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 @@ -26,10 +26,10 @@ index 7ce4355..6bb5e51 100644 # faulthandler module faulthandler faulthandler.c diff --git a/setup.py b/setup.py -index d7a60e0..ede0e72 100644 +index d4778b0..6f4730d 100644 --- a/setup.py +++ b/setup.py -@@ -998,6 +998,9 @@ class PyBuildExt(build_ext): +@@ -1001,6 +1001,9 @@ class PyBuildExt(build_ext): ['_xxtestfuzz/_xxtestfuzz.c', '_xxtestfuzz/fuzzer.c'])) @@ -40,5 +40,5 @@ index d7a60e0..ede0e72 100644 # readline do_readline = self.compiler.find_library_file(self.lib_dirs, 'readline') -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0059-expose-sem_unlink.patch b/mingw-w64-python/0059-expose-sem_unlink.patch index d8d0bfc603..c452b2bae4 100644 --- a/mingw-w64-python/0059-expose-sem_unlink.patch +++ b/mingw-w64-python/0059-expose-sem_unlink.patch @@ -1,4 +1,4 @@ -From 9aca6a28934f67df24b2b640c1d8c40623f40afd Mon Sep 17 00:00:00 2001 +From 99ec2bf99c71fc9b81d241ead84c7044624053f2 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0060-cygpty-isatty.patch b/mingw-w64-python/0060-cygpty-isatty.patch index d96ddcd670..db0a4a3f05 100644 --- a/mingw-w64-python/0060-cygpty-isatty.patch +++ b/mingw-w64-python/0060-cygpty-isatty.patch @@ -1,4 +1,4 @@ -From 0255306a4066705227cd3d903290d9550593e295 Mon Sep 17 00:00:00 2001 +From 8a9eeefbd816e25d1e130602e0a5f824d6915b12 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 @@ -71,10 +71,10 @@ index 0000000..82fd0af + +#endif /* _ISCYGPTY_H */ diff --git a/Makefile.pre.in b/Makefile.pre.in -index 87e95ec..e351cae 100644 +index 1d2e16e..6d49228 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -372,6 +372,7 @@ PYTHON_OBJS= \ +@@ -371,6 +371,7 @@ PYTHON_OBJS= \ Python/import.o \ Python/importdl.o \ Python/initconfig.o \ @@ -82,7 +82,7 @@ index 87e95ec..e351cae 100644 Python/marshal.o \ Python/modsupport.o \ Python/mysnprintf.o \ -@@ -1070,6 +1071,7 @@ PYTHON_HEADERS= \ +@@ -1069,6 +1070,7 @@ PYTHON_HEADERS= \ $(srcdir)/Include/import.h \ $(srcdir)/Include/interpreteridobject.h \ $(srcdir)/Include/intrcheck.h \ @@ -133,7 +133,7 @@ index 2cc891f..17469e3 100644 diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 40fc270..bb1b81d 100644 +index add8ed5..27d198e 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -36,6 +36,7 @@ @@ -144,15 +144,15 @@ index 40fc270..bb1b81d 100644 #include /* needed for ctermid() */ -@@ -10082,7 +10083,7 @@ os_isatty_impl(PyObject *module, int fd) - { +@@ -10091,7 +10092,7 @@ os_isatty_impl(PyObject *module, int fd) int return_value; + Py_BEGIN_ALLOW_THREADS _Py_BEGIN_SUPPRESS_IPH - return_value = isatty(fd); + return_value = isatty(fd) || is_cygpty(fd); _Py_END_SUPPRESS_IPH + Py_END_ALLOW_THREADS return return_value; - } diff --git a/Objects/fileobject.c b/Objects/fileobject.c index 1c6ecaf..afddc4f 100644 --- a/Objects/fileobject.c @@ -205,7 +205,7 @@ index 21c70f9..58d7512 100644 } diff --git a/Python/fileutils.c b/Python/fileutils.c -index 4b299b2..573a5c2 100644 +index 75ee355..e9d15d1 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c @@ -1,4 +1,5 @@ @@ -214,15 +214,15 @@ index 4b299b2..573a5c2 100644 #include "pycore_fileutils.h" #include "osdefs.h" // SEP #include -@@ -70,7 +71,7 @@ _Py_device_encoding(int fd) - #endif +@@ -71,7 +72,7 @@ _Py_device_encoding(int fd) int valid; + Py_BEGIN_ALLOW_THREADS _Py_BEGIN_SUPPRESS_IPH - valid = isatty(fd); + valid = isatty(fd) || is_cygpty(fd); _Py_END_SUPPRESS_IPH + Py_END_ALLOW_THREADS if (!valid) - Py_RETURN_NONE; diff --git a/Python/frozenmain.c b/Python/frozenmain.c index dd04d60..6607762 100644 --- a/Python/frozenmain.c @@ -457,5 +457,5 @@ index 60f091c..734084c 100644 if (!Py_InteractiveFlag) return 0; -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0061-disable-broken-gdbm-module.patch b/mingw-w64-python/0061-disable-broken-gdbm-module.patch index 69865a695e..f179acdcac 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 391cfafdf3cd9cc56516cd6d3d8d37bf68ef870c Mon Sep 17 00:00:00 2001 +From 20e6ae1657b35dd58fec49ebd93c8388b6f2756d 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 @@ -12,10 +12,10 @@ Co-authored-by: Алексей 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index ede0e72..74b844c 100644 +index 6f4730d..4d8dc48 100644 --- a/setup.py +++ b/setup.py -@@ -1405,7 +1405,7 @@ class PyBuildExt(build_ext): +@@ -1408,7 +1408,7 @@ class PyBuildExt(build_ext): if dbm_args: dbm_order = [arg.split('=')[-1] for arg in dbm_args][-1].split(":") else: @@ -25,5 +25,5 @@ index ede0e72..74b844c 100644 for cand in dbm_order: if cand == "ndbm": -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0062-build-link-win-resource-files-and-build-pythonw.patch b/mingw-w64-python/0062-build-link-win-resource-files-and-build-pythonw.patch index f24555e70d..e1cb567ad5 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 17ac3e7063af45b116396303f85be4eb95f0e9d9 Mon Sep 17 00:00:00 2001 +From b7299adb0b8100942f45e9eb9a0e5ef951ef998d 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 @@ -13,7 +13,7 @@ Co-authored-by: Алексей 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index e351cae..afeee0e 100644 +index 6d49228..fd3d142 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -38,6 +38,7 @@ CXX= @CXX@ @@ -24,7 +24,7 @@ index e351cae..afeee0e 100644 READELF= @READELF@ SOABI= @SOABI@ LDVERSION= @LDVERSION@ -@@ -119,6 +120,7 @@ PY_CORE_CFLAGS= $(PY_STDMODULE_CFLAGS) -DPy_BUILD_CORE +@@ -118,6 +119,7 @@ PY_CORE_CFLAGS= $(PY_STDMODULE_CFLAGS) -DPy_BUILD_CORE PY_CORE_LDFLAGS=$(PY_LDFLAGS) $(PY_LDFLAGS_NODIST) # Strict or non-strict aliasing flags used to compile dtoa.c, see above CFLAGS_ALIASING=@CFLAGS_ALIASING@ @@ -32,7 +32,7 @@ index e351cae..afeee0e 100644 # Machine-dependent subdirectories -@@ -260,6 +262,7 @@ LIBOBJS= @LIBOBJS@ +@@ -259,6 +261,7 @@ LIBOBJS= @LIBOBJS@ PYTHON= python$(EXE) BUILDPYTHON= python$(BUILDEXE) @@ -40,7 +40,7 @@ index e351cae..afeee0e 100644 PYTHON_FOR_REGEN?=@PYTHON_FOR_REGEN@ UPDATE_FILE=@PYTHON_FOR_REGEN@ $(srcdir)/Tools/scripts/update_file.py -@@ -482,7 +485,7 @@ DTRACE_DEPS = \ +@@ -481,7 +484,7 @@ DTRACE_DEPS = \ # Default target all: @DEF_MAKE_ALL_RULE@ @@ -49,7 +49,7 @@ index e351cae..afeee0e 100644 Programs/_testembed python-config # Check that the source is clean when building out of source. -@@ -596,9 +599,21 @@ coverage-report: regen-grammar regen-token regen-importlib +@@ -595,9 +598,21 @@ coverage-report: regen-grammar regen-token regen-importlib clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c $(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py --make --srcdir $(srcdir) @@ -73,7 +73,7 @@ index e351cae..afeee0e 100644 platform: $(BUILDPYTHON) pybuilddir.txt $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print("%s-%d.%d" % (get_platform(), *sys.version_info[:2]))' >platform -@@ -708,10 +723,10 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \ +@@ -707,10 +722,10 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \ # This rule builds the Cygwin Python DLL and import library if configured # for a shared core library; otherwise, this rule is a noop. @@ -86,7 +86,7 @@ index e351cae..afeee0e 100644 else true; \ fi -@@ -1325,6 +1340,7 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@ +@@ -1324,6 +1339,7 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@ done if test "$(PYTHONFRAMEWORKDIR)" = "no-framework" ; then \ $(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \ @@ -95,10 +95,10 @@ index e351cae..afeee0e 100644 $(INSTALL_PROGRAM) $(STRIPFLAG) Mac/pythonw $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \ fi diff --git a/configure.ac b/configure.ac -index 4316338..be8ede9 100644 +index d97844f..9eed603 100644 --- a/configure.ac +++ b/configure.ac -@@ -1343,6 +1343,9 @@ fi +@@ -1350,6 +1350,9 @@ fi AC_MSG_RESULT($LDLIBRARY) @@ -108,7 +108,7 @@ index 4316338..be8ede9 100644 AC_SUBST(AR) AC_CHECK_TOOLS(AR, ar aal, ar) -@@ -5865,10 +5868,33 @@ AC_MSG_RESULT(done) +@@ -5877,10 +5880,33 @@ AC_MSG_RESULT(done) case $host in *-*-mingw*) LIBS="$LIBS -lversion -lshlwapi -lpathcch" @@ -143,5 +143,5 @@ index 4316338..be8ede9 100644 # Availability of -O2: AC_MSG_CHECKING(for -O2) -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0063-3.7-mpdec-mingw.patch b/mingw-w64-python/0063-3.7-mpdec-mingw.patch index d9dd567c68..41c275ab1b 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 a15d5dafd3604b7f6ddb3fa99dd26ec0757024a9 Mon Sep 17 00:00:00 2001 +From 497e7da62c91dae5885c2c008bbf4c0cf2674484 Mon Sep 17 00:00:00 2001 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 @@ -9,10 +9,10 @@ Subject: [PATCH 063/N] 3.7 mpdec mingw 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 74b844c..a4222fc 100644 +index 4d8dc48..d376299 100644 --- a/setup.py +++ b/setup.py -@@ -2291,7 +2291,7 @@ class PyBuildExt(build_ext): +@@ -2293,7 +2293,7 @@ class PyBuildExt(build_ext): undef_macros = [] if '--with-system-libmpdec' in sysconfig.get_config_var("CONFIG_ARGS"): include_dirs = [] @@ -22,5 +22,5 @@ index 74b844c..a4222fc 100644 depends = ['_decimal/docstrings.h'] else: -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0064-disable-readline.patch b/mingw-w64-python/0064-disable-readline.patch index d753323450..ea021eb7b5 100644 --- a/mingw-w64-python/0064-disable-readline.patch +++ b/mingw-w64-python/0064-disable-readline.patch @@ -1,4 +1,4 @@ -From 7dc48f709c1ac3fd9d05b0f50ce4056bd3bf5268 Mon Sep 17 00:00:00 2001 +From a082473053ab623768a491fbdfe5e8844dbef47c 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 @@ -12,10 +12,10 @@ Co-authored-by: Алексей 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index a4222fc..a4d206e 100644 +index d376299..1e4f9e5 100644 --- a/setup.py +++ b/setup.py -@@ -1003,7 +1003,10 @@ class PyBuildExt(build_ext): +@@ -1006,7 +1006,10 @@ class PyBuildExt(build_ext): def detect_readline_curses(self): # readline @@ -28,5 +28,5 @@ index a4222fc..a4d206e 100644 curses_library = "" # Cannot use os.popen here in py3k. -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0065-fix-isselectable.patch b/mingw-w64-python/0065-fix-isselectable.patch index 507030059d..6f216b4115 100644 --- a/mingw-w64-python/0065-fix-isselectable.patch +++ b/mingw-w64-python/0065-fix-isselectable.patch @@ -1,4 +1,4 @@ -From 27e5727fb44af8826b8725b2bc6de09e79e1b78f Mon Sep 17 00:00:00 2001 +From d16c515f1b7daf1ec4907bb6553a21d8aa79208f 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0066-use-_wcsnicmp-instead-wcsncasecmp.patch b/mingw-w64-python/0066-use-_wcsnicmp-instead-wcsncasecmp.patch index 11ed43b3bd..e98f5858db 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 c217628934d0d7a1b440eae998a7813702e320c2 Mon Sep 17 00:00:00 2001 +From 4ae7b41506418a80dc2207db09dcde0dee95dd25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:19 +0530 @@ -9,7 +9,7 @@ Subject: [PATCH 066/N] use _wcsnicmp instead wcsncasecmp 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/getpath.c b/Modules/getpath.c -index c52e0df..2018495 100644 +index c782e0f..83422d3 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -427,7 +427,7 @@ add_exe_suffix(wchar_t **progpath_p) @@ -22,5 +22,5 @@ index c52e0df..2018495 100644 } -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0067-_xxsubinterpretersmodule.patch b/mingw-w64-python/0067-_xxsubinterpretersmodule.patch index 229a3c24b8..e6565a1d8f 100644 --- a/mingw-w64-python/0067-_xxsubinterpretersmodule.patch +++ b/mingw-w64-python/0067-_xxsubinterpretersmodule.patch @@ -1,4 +1,4 @@ -From c392c6966b0f46197e48dfd89b9361358be823ab Mon Sep 17 00:00:00 2001 +From 6fc673a188ce4b552cf5bdd76271e159fe268667 Mon Sep 17 00:00:00 2001 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0068-sqlite3-module-defines.patch b/mingw-w64-python/0068-sqlite3-module-defines.patch index 47625f12af..34774e1456 100644 --- a/mingw-w64-python/0068-sqlite3-module-defines.patch +++ b/mingw-w64-python/0068-sqlite3-module-defines.patch @@ -1,4 +1,4 @@ -From fdb194111cc3b59ae7193577e9c63d1367a6a6f2 Mon Sep 17 00:00:00 2001 +From 085855f074cd37e9936c57e9d9c8938b3821d325 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 @@ -8,10 +8,10 @@ Subject: [PATCH 068/N] sqlite3 module defines 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/setup.py b/setup.py -index a4d206e..8458232 100644 +index 1e4f9e5..4433082 100644 --- a/setup.py +++ b/setup.py -@@ -1560,10 +1560,7 @@ class PyBuildExt(build_ext): +@@ -1563,10 +1563,7 @@ class PyBuildExt(build_ext): '_sqlite/util.c', ] sqlite_defines = [] @@ -24,5 +24,5 @@ index a4d206e..8458232 100644 # Enable support for loadable extensions in the sqlite3 module # if --enable-loadable-sqlite-extensions configure option is used. -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0069-configure.ac-fix-inet_pton-check.patch b/mingw-w64-python/0069-configure.ac-fix-inet_pton-check.patch index b7a949598c..d879d15ad4 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 e76cda7b6d05184ac17991dc46a568c42763a94a Mon Sep 17 00:00:00 2001 +From 633a10ccfe845317a554b81eacad8bc047db6006 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,10 +12,10 @@ Co-authored-by: Алексей 1 file changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac -index be8ede9..032d658 100644 +index 9eed603..d4bd1d1 100644 --- a/configure.ac +++ b/configure.ac -@@ -4274,10 +4274,14 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +@@ -4286,10 +4286,14 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ AC_MSG_CHECKING(for inet_pton) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ @@ -31,5 +31,5 @@ index be8ede9..032d658 100644 [AC_DEFINE(HAVE_INET_PTON, 1, Define if you have the 'inet_pton' function.) AC_MSG_RESULT(yes)], -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0070-set-venv-activate-path-unix.patch b/mingw-w64-python/0070-set-venv-activate-path-unix.patch index 8afc5e2d2a..9b10d01599 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 737d758a51b3e1778df4594ffbc671785c5a6425 Mon Sep 17 00:00:00 2001 +From a2adb3b1813a50dd0fe01a41dc285d2161bb795c 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0071-venv-creation-fixes.patch b/mingw-w64-python/0071-venv-creation-fixes.patch index 2e152f1226..3ac1e5811c 100644 --- a/mingw-w64-python/0071-venv-creation-fixes.patch +++ b/mingw-w64-python/0071-venv-creation-fixes.patch @@ -1,14 +1,14 @@ -From c82449ed5fed227754cfe841e67b7591b8683ed7 Mon Sep 17 00:00:00 2001 +From 69f75280a041d3c896f5349dfb6ce9a4a5436610 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 --- - Lib/venv/__init__.py | 19 ++++++++++++++----- - 1 file changed, 14 insertions(+), 5 deletions(-) + Lib/venv/__init__.py | 17 +++++++++++++---- + 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py -index 8009deb..b471006 100644 +index 6f1af29..83ba0bc 100644 --- a/Lib/venv/__init__.py +++ b/Lib/venv/__init__.py @@ -11,6 +11,7 @@ import subprocess @@ -28,7 +28,7 @@ index 8009deb..b471006 100644 binname = 'Scripts' incpath = 'Include' libpath = os.path.join(env_dir, 'Lib', 'site-packages') -@@ -252,7 +253,7 @@ class EnvBuilder: +@@ -266,7 +267,7 @@ class EnvBuilder: if not os.path.islink(path): os.chmod(path, 0o755) else: @@ -37,7 +37,7 @@ index 8009deb..b471006 100644 # For symlinking, we need a complete copy of the root directory # If symlinks fail, you'll get unnecessary copies of files, but # we assume that if you've opted into symlinks on Windows then -@@ -275,7 +276,13 @@ class EnvBuilder: +@@ -290,7 +291,13 @@ class EnvBuilder: if os.path.lexists(src): copier(src, os.path.join(binpath, suffix)) @@ -52,20 +52,19 @@ index 8009deb..b471006 100644 # copy init.tcl for root, dirs, files in os.walk(context.python_dir): if 'init.tcl' in files: -@@ -293,9 +300,11 @@ class EnvBuilder: +@@ -308,9 +315,11 @@ class EnvBuilder: # We run ensurepip in isolated mode to avoid side effects from # environment vars, the current directory and anything else # intended for the global Python environment + env = os.environ.copy() + env.pop("MSYSTEM", None) - cmd = [context.env_exe, '-Im', 'ensurepip', '--upgrade', -- '--default-pip'] + cmd = [context.env_exec_cmd, '-Im', 'ensurepip', '--upgrade', + '--default-pip'] - subprocess.check_output(cmd, stderr=subprocess.STDOUT) -+ '--default-pip'] + subprocess.check_call(cmd, stderr=subprocess.STDOUT, env=env) def setup_scripts(self, context): """ -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0072-pass-gen-profile-ldflags.patch b/mingw-w64-python/0072-pass-gen-profile-ldflags.patch index ef6d1f2d22..53f792893b 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 6e6cac92a946334a81bb08adbc54902d428b2dc5 Mon Sep 17 00:00:00 2001 +From 88ca22ab8f9389cef4f59ba22263521e9e812e4c 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 @@ -12,10 +12,10 @@ Co-authored-by: Алексей 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index afeee0e..2018514 100644 +index fd3d142..8df163c 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -726,7 +726,7 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \ +@@ -725,7 +725,7 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \ $(DLLLIBRARY) libpython$(LDVERSION).dll.a: $(LIBRARY_OBJS) python_nt.o if test -n "$(DLLLIBRARY)"; then \ $(LDSHARED) -Wl,--out-implib=$@ -o $(DLLLIBRARY) $^ \ @@ -25,5 +25,5 @@ index afeee0e..2018514 100644 fi -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0073-pkg-config-windows-must-link-ext-with-python-lib.patch b/mingw-w64-python/0073-pkg-config-windows-must-link-ext-with-python-lib.patch index 436e19c581..8297a300fe 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 95164a8cedfca44250dd81d98d92cfc8d4c7f0b1 Mon Sep 17 00:00:00 2001 +From 2347d7d4f966ff4eb69c1467934298618139c860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:29 +0530 @@ -21,10 +21,10 @@ index 87e04de..3900190 100644 +Libs: -L${libdir} -lpython@VERSION@@ABIFLAGS@ Cflags: -I${includedir}/python@VERSION@@ABIFLAGS@ diff --git a/configure.ac b/configure.ac -index 032d658..588ffd4 100644 +index d4bd1d1..da43ea0 100644 --- a/configure.ac +++ b/configure.ac -@@ -5150,7 +5150,7 @@ AC_MSG_RESULT($LDVERSION) +@@ -5162,7 +5162,7 @@ AC_MSG_RESULT($LDVERSION) # On Android and Cygwin the shared libraries must be linked with libpython. AC_SUBST(LIBPYTHON) @@ -34,5 +34,5 @@ index 032d658..588ffd4 100644 else LIBPYTHON='' -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0074-importlib-bootstrap-path-sep.patch b/mingw-w64-python/0074-importlib-bootstrap-path-sep.patch index a2d8aba676..ad02d6b0b1 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 3fa40ebd03d9cd5b0ab7341344f5d3c31647680f Mon Sep 17 00:00:00 2001 +From 00845689609c8a686c27a546f42d9885cee1430f 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 fe31f43..229d9aa 100644 setattr(self_module, 'path_sep', path_sep) setattr(self_module, 'path_separators', ''.join(path_separators)) -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0075-pathlib-path-sep.patch b/mingw-w64-python/0075-pathlib-path-sep.patch index a3c4e2764b..d40338ed5b 100644 --- a/mingw-w64-python/0075-pathlib-path-sep.patch +++ b/mingw-w64-python/0075-pathlib-path-sep.patch @@ -1,4 +1,4 @@ -From 81189e3707d4f72b57e86e40f065f811d80a97ac Mon Sep 17 00:00:00 2001 +From 9b2ffb2eae17a32f862bebb289faebbc38704ffb 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0076-warnings-fixes.patch b/mingw-w64-python/0076-warnings-fixes.patch index 195bef94bb..bea6879298 100644 --- a/mingw-w64-python/0076-warnings-fixes.patch +++ b/mingw-w64-python/0076-warnings-fixes.patch @@ -1,4 +1,4 @@ -From 92b8d29b62c51db1359f987b022cae560dc5c3c3 Mon Sep 17 00:00:00 2001 +From 9559d653daabba18d30dd3ef4ed2b1f4b7beeee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:33 +0530 @@ -28,7 +28,7 @@ index 1058184..36af7bc 100644 SIZE_T attribute_list_size = 0; diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index bb1b81d..bf19ac8 100644 +index 27d198e..590b459 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -5343,7 +5343,7 @@ os_utime_impl(PyObject *module, path_t *path, PyObject *times, PyObject *ns, @@ -40,7 +40,7 @@ index bb1b81d..bf19ac8 100644 FILETIME atime, mtime; #else int result; -@@ -14360,7 +14360,7 @@ os__add_dll_directory_impl(PyObject *module, path_t *path) +@@ -14370,7 +14370,7 @@ os__add_dll_directory_impl(PyObject *module, path_t *path) loaded. */ Py_BEGIN_ALLOW_THREADS if (!(hKernel32 = GetModuleHandleW(L"kernel32")) || @@ -49,7 +49,7 @@ index bb1b81d..bf19ac8 100644 hKernel32, "AddDllDirectory")) || !(cookie = (*AddDllDirectory)(path->wide))) { err = GetLastError(); -@@ -14410,7 +14410,7 @@ os__remove_dll_directory_impl(PyObject *module, PyObject *cookie) +@@ -14420,7 +14420,7 @@ os__remove_dll_directory_impl(PyObject *module, PyObject *cookie) loaded. */ Py_BEGIN_ALLOW_THREADS if (!(hKernel32 = GetModuleHandleW(L"kernel32")) || @@ -74,11 +74,11 @@ index ba2c9f5..81bad15 100644 # define HAVE_GETNAMEINFO # define ENABLE_IPV6 diff --git a/PC/python_exe.rc b/PC/python_exe.rc -index ae0b029..e667ffa 100644 +index c3d3bff..dde0e53 100644 --- a/PC/python_exe.rc +++ b/PC/python_exe.rc -@@ -7,7 +7,7 @@ - #include +@@ -12,7 +12,7 @@ + // current versions of Windows. 1 RT_MANIFEST "python.manifest" -1 ICON DISCARDABLE "icons\python.ico" @@ -87,11 +87,11 @@ index ae0b029..e667ffa 100644 ///////////////////////////////////////////////////////////////////////////// diff --git a/PC/pythonw_exe.rc b/PC/pythonw_exe.rc -index 88bf359..413d7d1 100644 +index 38570b7..7ce1043 100644 --- a/PC/pythonw_exe.rc +++ b/PC/pythonw_exe.rc -@@ -7,7 +7,7 @@ - #include +@@ -12,7 +12,7 @@ + // current versions of Windows. 1 RT_MANIFEST "python.manifest" -1 ICON DISCARDABLE "icons\pythonw.ico" @@ -127,5 +127,5 @@ index 0ce5e94..6a6fe7e 100644 /* minimum/maximum thread stack sizes supported */ -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0077-fix-build-testinternalcapi.patch b/mingw-w64-python/0077-fix-build-testinternalcapi.patch index d25b42276f..f88e61877c 100644 --- a/mingw-w64-python/0077-fix-build-testinternalcapi.patch +++ b/mingw-w64-python/0077-fix-build-testinternalcapi.patch @@ -1,4 +1,4 @@ -From 08145aec08b12bed92d9010aedcf60cfcc23370b Mon Sep 17 00:00:00 2001 +From 97783515a6ca364e4d9830a2d26a5fc53e565c0d 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 @@ -8,10 +8,10 @@ Subject: [PATCH 077/N] fix build testinternalcapi 1 file changed, 4 insertions(+) diff --git a/setup.py b/setup.py -index 8458232..a4e6dc1 100644 +index 4433082..e52eacd 100644 --- a/setup.py +++ b/setup.py -@@ -981,7 +981,11 @@ class PyBuildExt(build_ext): +@@ -984,7 +984,11 @@ class PyBuildExt(build_ext): depends=['testcapi_long.h'])) # Python Internal C API test module @@ -24,5 +24,5 @@ index 8458232..a4e6dc1 100644 # Python PEP-3118 (buffer protocol) test module -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0078-extend-MS_WINDOWS-flag.patch b/mingw-w64-python/0078-extend-MS_WINDOWS-flag.patch index 02a50c78e2..cab5dfaf03 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 b3cac7696a876238e11f9ea45b32d8b3ef755dc3 Mon Sep 17 00:00:00 2001 +From 708910315fbd4219dd87ff95f11b695fc9c51880 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 @@ -8,7 +8,7 @@ Subject: [PATCH 078/N] extend MS_WINDOWS flag 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index a4e6dc1..d161108 100644 +index e52eacd..71e6ea5 100644 --- a/setup.py +++ b/setup.py @@ -71,7 +71,7 @@ if sys.platform == "win32" and "MSYSTEM" in os.environ: @@ -21,5 +21,5 @@ index a4e6dc1..d161108 100644 MACOS = (HOST_PLATFORM == 'darwin') AIX = (HOST_PLATFORM.startswith('aix')) -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0079-clang-arm64.patch b/mingw-w64-python/0079-clang-arm64.patch index e9c7845b9a..0578ec32ee 100644 --- a/mingw-w64-python/0079-clang-arm64.patch +++ b/mingw-w64-python/0079-clang-arm64.patch @@ -1,4 +1,4 @@ -From 61eb03c5793ae5c6026c7a854e1165556e3c42e7 Mon Sep 17 00:00:00 2001 +From d60430d1aff530e167ab4fdfdfa23ff21e9339e6 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0080-configure.ac-set-MINGW-stack-reserve.patch b/mingw-w64-python/0080-configure.ac-set-MINGW-stack-reserve.patch index c7bc46f03b..78f98299a4 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 2a92ce2774eee311160740719a7c80e85c62ab36 Mon Sep 17 00:00:00 2001 +From 6fcebb6fa95bdf21bdc224c492b8b2ed8e4001f2 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,10 +8,10 @@ Subject: [PATCH 080/N] configure.ac: set MINGW stack reserve 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac -index 588ffd4..5b41066 100644 +index da43ea0..2ca299a 100644 --- a/configure.ac +++ b/configure.ac -@@ -3065,6 +3065,11 @@ then +@@ -3072,6 +3072,11 @@ then VxWorks*) LINKFORSHARED='--export-dynamic';; esac @@ -24,5 +24,5 @@ index 588ffd4..5b41066 100644 AC_MSG_RESULT($LINKFORSHARED) -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0081-Don-t-use-os.pathsep-to-find-EOF.patch b/mingw-w64-python/0081-Don-t-use-os.pathsep-to-find-EOF.patch index eef4a376b7..e9413452d8 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 c791a766360579cd96c1a03563f674ca4e9e5698 Mon Sep 17 00:00:00 2001 +From 0740c27a55b7944ecda9196eac7e5ba8e35fa7b3 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch b/mingw-w64-python/0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch index 550473adcb..11274d1f5c 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 cda85af5ff314ebd772e1000b48eefaddb0914b7 Mon Sep 17 00:00:00 2001 +From 4d16e070def9794b1ec6fb0ec07a0d09f6703541 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 @@ -21,10 +21,10 @@ Signed-off-by: Naveen M K 3 files changed, 72 insertions(+), 17 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 2018514..a8aecc2 100644 +index 8df163c..4430d21 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -165,6 +165,7 @@ CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(LDVERSION) +@@ -164,6 +164,7 @@ CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(LDVERSION) # Symbols used for using shared libraries SHLIB_SUFFIX= @SHLIB_SUFFIX@ EXT_SUFFIX= @EXT_SUFFIX@ @@ -32,7 +32,7 @@ index 2018514..a8aecc2 100644 LDSHARED= @LDSHARED@ $(PY_LDFLAGS) BLDSHARED= @BLDSHARED@ $(PY_CORE_LDFLAGS) LDCXXSHARED= @LDCXXSHARED@ -@@ -848,8 +849,7 @@ Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile +@@ -847,8 +848,7 @@ Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile Python/dynload_win.o: $(srcdir)/Python/dynload_win.c Makefile $(CC) -c $(PY_CORE_CFLAGS) \ @@ -42,7 +42,7 @@ index 2018514..a8aecc2 100644 -o $@ $(srcdir)/Python/dynload_win.c Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile $(srcdir)/Include/pydtrace.h -@@ -1688,7 +1688,7 @@ libainstall: @DEF_MAKE_RULE@ python-config +@@ -1687,7 +1687,7 @@ libainstall: @DEF_MAKE_RULE@ python-config done @if test -d $(LIBRARY); then :; else \ if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \ @@ -69,10 +69,10 @@ index bd34310..60fb603 100644 PYD_UNTAGGED_SUFFIX, NULL diff --git a/configure.ac b/configure.ac -index 5b41066..69cb8fb 100644 +index 2ca299a..11872dc 100644 --- a/configure.ac +++ b/configure.ac -@@ -2825,7 +2825,7 @@ if test -z "$SHLIB_SUFFIX"; then +@@ -2832,7 +2832,7 @@ if test -z "$SHLIB_SUFFIX"; then *) SHLIB_SUFFIX=.so;; esac case $host_os in @@ -81,7 +81,7 @@ index 5b41066..69cb8fb 100644 esac fi AC_MSG_RESULT($SHLIB_SUFFIX) -@@ -5115,6 +5115,68 @@ esac +@@ -5127,6 +5127,68 @@ esac # check for endianness AC_C_BIGENDIAN @@ -150,7 +150,7 @@ index 5b41066..69cb8fb 100644 # ABI version string for Python extension modules. This appears between the # periods in shared library file names, e.g. foo..so. It is calculated # from the following attributes which affect the ABI of this Python build (in -@@ -5147,7 +5209,12 @@ if test "$Py_DEBUG" = 'true' -a "$with_trace_refs" != "yes"; then +@@ -5159,7 +5221,12 @@ if test "$Py_DEBUG" = 'true' -a "$with_trace_refs" != "yes"; then fi AC_SUBST(EXT_SUFFIX) @@ -164,7 +164,7 @@ index 5b41066..69cb8fb 100644 AC_MSG_CHECKING(LDVERSION) LDVERSION='$(VERSION)$(ABIFLAGS)' -@@ -5819,12 +5886,6 @@ case "$ac_cv_computed_gotos" in yes*) +@@ -5831,12 +5898,6 @@ case "$ac_cv_computed_gotos" in yes*) AC_DEFINE(HAVE_COMPUTED_GOTOS, 1, [Define if the C compiler supports computed gotos.]) esac @@ -178,5 +178,5 @@ index 5b41066..69cb8fb 100644 case $ac_sys_system in AIX*) -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0083-Change-the-get_platform-method-in-sysconfig.patch b/mingw-w64-python/0083-Change-the-get_platform-method-in-sysconfig.patch index a85924461c..9bdfe13a73 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 ff2b019fd2d67ea53fd8431a3aa59b4508331f2c Mon Sep 17 00:00:00 2001 +From ad6c62686c8ab254bf39b12f022da558f971e746 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0084-distutils-compiler-customize-mingw-cygwin-compilers.patch b/mingw-w64-python/0084-distutils-compiler-customize-mingw-cygwin-compilers.patch index 60bff28cba..e636e3aac7 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 68b961fb34930195f208a85d0123e3a6d700f515 Mon Sep 17 00:00:00 2001 +From a7788dfddf5093a98a150ae80f07c4e422b788be Mon Sep 17 00:00:00 2001 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0085-distutils-compiler-enable-new-dtags.patch b/mingw-w64-python/0085-distutils-compiler-enable-new-dtags.patch index 64c0d482a3..57283706a6 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 fc9e160c083b5aa586615624a0000dcc901990df Mon Sep 17 00:00:00 2001 +From 3248618ff70ee55c54bc325d5dcc894f29f1b9fe Mon Sep 17 00:00:00 2001 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 @@ -13,10 +13,10 @@ Co-authored-by: Алексей 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py -index f0792de..60776bc 100644 +index d00c489..76a7d82 100644 --- a/Lib/distutils/unixccompiler.py +++ b/Lib/distutils/unixccompiler.py -@@ -248,9 +248,13 @@ class UnixCCompiler(CCompiler): +@@ -249,9 +249,13 @@ class UnixCCompiler(CCompiler): # -Wl whenever gcc was used in the past it is probably # safest to keep doing so. if sysconfig.get_config_var("GNULD") == "yes": @@ -33,5 +33,5 @@ index f0792de..60776bc 100644 return "-Wl,-R" + dir else: -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0086-distutils-MINGW-build-extensions-with-GCC.patch b/mingw-w64-python/0086-distutils-MINGW-build-extensions-with-GCC.patch index c216b1a389..319b672c90 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 bc18b4c3c94375ddff17aaf5a1bb5bd1e401997f Mon Sep 17 00:00:00 2001 +From d8641e86487fdcbb8a6cf3486e3ecfd2f0ef0eb0 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch b/mingw-w64-python/0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch index af8596a96d..b3115edced 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 40bf9e42ca67d8ac0592bc6674a9e958eabd74c3 Mon Sep 17 00:00:00 2001 +From ecb4ca01159962cbf3c66e4242583e6cdc8ccd02 Mon Sep 17 00:00:00 2001 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 @@ -15,7 +15,7 @@ Co-authored-by: Алексей 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Lib/distutils/ccompiler.py b/Lib/distutils/ccompiler.py -index b5ef143..24eafc6 100644 +index 4c47f2e..ab61a86 100644 --- a/Lib/distutils/ccompiler.py +++ b/Lib/distutils/ccompiler.py @@ -9,7 +9,7 @@ from distutils.spawn import spawn @@ -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.34.0 +2.34.1 diff --git a/mingw-w64-python/0088-distutils-find-import-library.patch b/mingw-w64-python/0088-distutils-find-import-library.patch index f1bef12fdd..b10bc84a33 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 41d8050684eb5925e8a4c979610a3aa340139e6d Mon Sep 17 00:00:00 2001 +From fbb6aa9546fe88f2ef3111958b86ab32199e890f Mon Sep 17 00:00:00 2001 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0089-distutils-avoid-circular-dependency-from-time-module.patch b/mingw-w64-python/0089-distutils-avoid-circular-dependency-from-time-module.patch index c9dc5cefbc..dedc2a922b 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 a4abb467ae7cf72e1552727b7725e40fc7412448 Mon Sep 17 00:00:00 2001 +From 7f323f7b626ea0948e135152cbd4befd47506276 Mon Sep 17 00:00:00 2001 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0090-distutils-generalization-of-posix-build-in-distutils.patch b/mingw-w64-python/0090-distutils-generalization-of-posix-build-in-distutils.patch index 98e7e86381..74e525b7ad 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 24eed4bff46abb9913a9869684eef985161155a3 Mon Sep 17 00:00:00 2001 +From 5e1dae781cfdd94792d7ee6e45a694a247e55002 Mon Sep 17 00:00:00 2001 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0091-distutils-mingw-sysconfig-like-posix.patch b/mingw-w64-python/0091-distutils-mingw-sysconfig-like-posix.patch index 7c4db6cb7f..34d0ec29eb 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 a0d9baa8dc4b4afb5e7ba33980ec6d9f3d67551c Mon Sep 17 00:00:00 2001 +From c07dcfbd45bf8440d7178f912c7c9648966042b5 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0092-distutils-get_versions-fixes.patch b/mingw-w64-python/0092-distutils-get_versions-fixes.patch index c6d704533e..9caf681604 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 985a20ad50a309a528397ec6f43cf15f848c2797 Mon Sep 17 00:00:00 2001 +From 0df2d034bb72529a6fb719c5c3e430a98b5cc211 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0093-distutils-install-layout-as-posix.patch b/mingw-w64-python/0093-distutils-install-layout-as-posix.patch index cccc53696a..3b59e29c0e 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 71cd2a0390d9e9fad42fed5c0e06d758de39edcf Mon Sep 17 00:00:00 2001 +From 1909d79d7a506d55e07b708e39b5620b2bdf27c5 Mon Sep 17 00:00:00 2001 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0094-distutils-msys-convert_path-fix-and-root-hack.patch b/mingw-w64-python/0094-distutils-msys-convert_path-fix-and-root-hack.patch index 96acea6e4b..4017cc4d58 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 1ed69d8e50d34a111c7b42951863e13d9cef1930 Mon Sep 17 00:00:00 2001 +From c9dcbae3befb667d806f882ac9fff0defb38d9a1 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0095-distutils-mingw-build-optimized-ext.patch b/mingw-w64-python/0095-distutils-mingw-build-optimized-ext.patch index f499259230..7614768fbb 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 1da2752289e00fe51e2c8a0b25138ac83f1f0983 Mon Sep 17 00:00:00 2001 +From b6462264592f88d2930107496aea431a52516f2f Mon Sep 17 00:00:00 2001 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch b/mingw-w64-python/0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch index 2ae5b3ffa5..c48b100ec4 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 6d880609657632bc2f9d93964d7f9edbb2a6e430 Mon Sep 17 00:00:00 2001 +From 9536f0bbb21ebe13c7f539540a5e38dbd875bc51 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0097-distutils-get-compilers-from-env-vars.patch b/mingw-w64-python/0097-distutils-get-compilers-from-env-vars.patch index 4c7d500e8e..0de5977b0f 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 b1f1cbeefcc5ed956ee484cd96008d5d37eb7db2 Mon Sep 17 00:00:00 2001 +From 42bab63733b59dad0ebbe18b1f6d18ba588240df 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0098-distutils-add-windmc-to-cygwinccompiler.patch b/mingw-w64-python/0098-distutils-add-windmc-to-cygwinccompiler.patch index e8f894fef1..ad88994ceb 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 0c751ecfc03048c60a59b090cf93f64d09255c4b Mon Sep 17 00:00:00 2001 +From ebe7844e3d6d1b64f155033731fd44f1770243f0 Mon Sep 17 00:00:00 2001 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0099-distutils-fix-msvc9-import.patch b/mingw-w64-python/0099-distutils-fix-msvc9-import.patch index 10ed072b07..4471e29f92 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 d947ead836ca0eead2e28103a790011387720a2f Mon Sep 17 00:00:00 2001 +From dd68c5c4b419561600a9ad34a2741395a166ac4f 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 @@ -12,7 +12,7 @@ Co-authored-by: Алексей 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/distutils/msvc9compiler.py b/Lib/distutils/msvc9compiler.py -index 6934e96..dddb2fd 100644 +index a7976fb..c341679 100644 --- a/Lib/distutils/msvc9compiler.py +++ b/Lib/distutils/msvc9compiler.py @@ -291,8 +291,6 @@ def query_vcvarsall(version, arch="x86"): @@ -34,5 +34,5 @@ index 6934e96..dddb2fd 100644 self.__root = r"Software\Microsoft\VisualStudio" # self.__macros = MACROS -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0100-distutils-mingw-add-LIBPL-to-library-dirs.patch b/mingw-w64-python/0100-distutils-mingw-add-LIBPL-to-library-dirs.patch index 2533e3438a..3c1e96b433 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 609d9e23ff0403233ae2e8a81eaa55eda54d175f Mon Sep 17 00:00:00 2001 +From 041c30f5c5e8e43c72147b50d0f4b2eefdb17d3d Mon Sep 17 00:00:00 2001 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0101-distutils-Change-the-get_platform-method-in-distutil.patch b/mingw-w64-python/0101-distutils-Change-the-get_platform-method-in-distutil.patch index 79f856f76b..27c82b5fcb 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 5a61407b52dc9d8f2949af82bff034cac2d99c2d Mon Sep 17 00:00:00 2001 +From f86f222d41d6ee022b1eefd2494c10e97d54b16e 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0102-build-Fix-ncursesw-include-lookup.patch b/mingw-w64-python/0102-build-Fix-ncursesw-include-lookup.patch index eb36242efb..3fb86977a0 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 7f0e7c96729a306b58ab87ecb4e051b460bec6ce Mon Sep 17 00:00:00 2001 +From 61995cb8065dde6dcc0eec9ecb5ef2aa3170fef8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 17 Jun 2021 18:52:09 +0530 @@ -13,10 +13,10 @@ pkg-config and use the exported path via sysconfig in setup.py 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index a8aecc2..3aca037 100644 +index 4430d21..99bed41 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -313,6 +313,7 @@ IO_OBJS= \ +@@ -312,6 +312,7 @@ IO_OBJS= \ ########################################################################## LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@ @@ -25,10 +25,10 @@ index a8aecc2..3aca037 100644 ########################################################################## # Parser diff --git a/configure.ac b/configure.ac -index 69cb8fb..6b21b79 100644 +index 11872dc..fb90929 100644 --- a/configure.ac +++ b/configure.ac -@@ -5557,10 +5557,17 @@ then +@@ -5569,10 +5569,17 @@ then [Define if you have struct stat.st_mtimensec]) fi @@ -48,10 +48,10 @@ index 69cb8fb..6b21b79 100644 AC_CHECK_HEADERS(curses.h ncurses.h) diff --git a/setup.py b/setup.py -index d161108..46de8be 100644 +index 71e6ea5..badb119 100644 --- a/setup.py +++ b/setup.py -@@ -1104,7 +1104,7 @@ class PyBuildExt(build_ext): +@@ -1107,7 +1107,7 @@ class PyBuildExt(build_ext): if curses_library == 'ncursesw': curses_defines.append(('HAVE_NCURSESW', '1')) if not CROSS_COMPILING: @@ -61,5 +61,5 @@ index d161108..46de8be 100644 # _curses_panel.so must link with panelw. panel_library = 'panelw' -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0103-tests-fix-test_bytes.patch b/mingw-w64-python/0103-tests-fix-test_bytes.patch index d3d1dbbfca..21f99362cd 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 dee249e62d0d3f610538286927b24ea6f9f5b332 Mon Sep 17 00:00:00 2001 +From 225617465f44e8c1d9a3d678f2fd63c979dca417 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0104-time-fix-strftime-not-raising-for-invalid-year-value.patch b/mingw-w64-python/0104-time-fix-strftime-not-raising-for-invalid-year-value.patch index 759ac3be0c..5aa4632cc3 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 72e058ef4fdb8aa7a5d5a1a8b45a16d9c0ef975f Mon Sep 17 00:00:00 2001 +From 5f3accecfce4d1284e7fad8fdc01165ee1bb7488 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 @@ -11,7 +11,7 @@ This fixes a test case in test_time 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/timemodule.c b/Modules/timemodule.c -index 80eab30..f0cdcfa 100644 +index df59f2a..ded8165 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -754,7 +754,7 @@ time_strftime(PyObject *self, PyObject *args) @@ -24,5 +24,5 @@ index 80eab30..f0cdcfa 100644 PyErr_SetString(PyExc_ValueError, "strftime() requires year in [1; 9999]"); -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0105-ctypes-find_library-c-should-return-None-with-ucrt.patch b/mingw-w64-python/0105-ctypes-find_library-c-should-return-None-with-ucrt.patch index 738d9ead4c..0dac44e687 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 bf97e2d2da502effd0116a00d4a02a69b7a9c2a9 Mon Sep 17 00:00:00 2001 +From fdf596a74bc3f361136eab3a23a0fedd1bc2e9e2 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0106-build-Disable-checks-for-dlopen-dlfcn.patch b/mingw-w64-python/0106-build-Disable-checks-for-dlopen-dlfcn.patch index dc7839bcde..489c1b42c8 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 33575171384e6e85efaf11ed9210463a870a7258 Mon Sep 17 00:00:00 2001 +From 54da3cecac7208fce008b7f05e19df0e45e245bc 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,10 +10,10 @@ checks for it. 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 6b21b79..12373f7 100644 +index fb90929..bfa18be 100644 --- a/configure.ac +++ b/configure.ac -@@ -2423,7 +2423,7 @@ dnl AC_MSG_RESULT($cpp_type) +@@ -2430,7 +2430,7 @@ dnl AC_MSG_RESULT($cpp_type) # checks for header files AC_HEADER_STDC @@ -22,7 +22,7 @@ index 6b21b79..12373f7 100644 fcntl.h grp.h \ ieeefp.h io.h langinfo.h libintl.h process.h \ shadow.h signal.h stropts.h termios.h \ -@@ -2437,6 +2437,12 @@ sys/times.h sys/types.h sys/uio.h sys/un.h sys/utsname.h sys/wait.h pty.h \ +@@ -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/memfd.h linux/wait.h sys/memfd.h sys/mman.h) @@ -35,7 +35,7 @@ index 6b21b79..12373f7 100644 AC_HEADER_DIRENT AC_HEADER_MAJOR -@@ -3108,7 +3114,12 @@ AC_MSG_RESULT($SHLIBS) +@@ -3115,7 +3121,12 @@ AC_MSG_RESULT($SHLIBS) # checks for libraries AC_CHECK_LIB(sendfile, sendfile) @@ -49,7 +49,7 @@ index 6b21b79..12373f7 100644 AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX # checks for uuid.h location -@@ -5014,7 +5025,10 @@ then +@@ -5026,7 +5037,10 @@ then [define to 1 if your sem_getvalue is broken.]) fi @@ -62,5 +62,5 @@ index 6b21b79..12373f7 100644 # determine what size digit to use for Python's longs AC_MSG_CHECKING([digit size for Python's longs]) -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0107-Fix-install-location-of-the-import-library.patch b/mingw-w64-python/0107-Fix-install-location-of-the-import-library.patch index 2351466117..740acce830 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 212191d85f1af9b7fb395c07db30ff4a9e3cd8da Mon Sep 17 00:00:00 2001 +From acc12ead338af28f76fa1164d2aff52bba7f06cf 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 @@ -8,10 +8,10 @@ Subject: [PATCH 107/N] Fix install location of the import library 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 3aca037..2154bdf 100644 +index 99bed41..14bd6e3 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1690,7 +1690,7 @@ libainstall: @DEF_MAKE_RULE@ python-config +@@ -1689,7 +1689,7 @@ libainstall: @DEF_MAKE_RULE@ python-config @if test -d $(LIBRARY); then :; else \ if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \ if test "$(SHLIB_SUFFIX)" = .dll -o "$(SHLIB_SUFFIX)" = .pyd; then \ @@ -21,5 +21,5 @@ index 3aca037..2154bdf 100644 $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ fi; \ -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0108-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch b/mingw-w64-python/0108-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch index 59619b91c8..0dec35566b 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 be91fcc4aa3d4b31521a4eda1256470f5ea43760 Mon Sep 17 00:00:00 2001 +From ecf4b76f6cea01e049ae43f11482dc1688f669a3 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 @@ -10,10 +10,10 @@ Otherwise one has to set it when calling "make install". 1 file changed, 1 insertion(+) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 2154bdf..7b8317a 100644 +index 14bd6e3..35055fb 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1736,6 +1736,7 @@ endif +@@ -1735,6 +1735,7 @@ endif # Install the dynamically loadable modules # This goes into $(exec_prefix) sharedinstall: sharedmods @@ -22,5 +22,5 @@ index 2154bdf..7b8317a 100644 --prefix=$(prefix) \ --install-scripts=$(BINDIR) \ -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0109-build-Integrate-venvlauncher-build-installation-into.patch b/mingw-w64-python/0109-build-Integrate-venvlauncher-build-installation-into.patch index 01d92fcb21..03dd7cfb99 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 f86fcd93f6748af7964e2875a890e3957ce3a2c4 Mon Sep 17 00:00:00 2001 +From 4ff3883e35104746d0284523bdf80dc7f1bd36c3 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 @@ -12,10 +12,10 @@ but a copy of main binary seems to work as well for now. 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 7b8317a..6012869 100644 +index 35055fb..498186f 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -161,6 +161,7 @@ BINLIBDEST= @BINLIBDEST@ +@@ -160,6 +160,7 @@ BINLIBDEST= @BINLIBDEST@ LIBDEST= $(SCRIPTDIR)/python$(VERSION) INCLUDEPY= $(INCLUDEDIR)/python$(LDVERSION) CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(LDVERSION) @@ -23,7 +23,7 @@ index 7b8317a..6012869 100644 # Symbols used for using shared libraries SHLIB_SUFFIX= @SHLIB_SUFFIX@ -@@ -264,6 +265,8 @@ LIBOBJS= @LIBOBJS@ +@@ -263,6 +264,8 @@ LIBOBJS= @LIBOBJS@ PYTHON= python$(EXE) BUILDPYTHON= python$(BUILDEXE) BUILDPYTHONW= pythonw$(BUILDEXE) @@ -32,7 +32,7 @@ index 7b8317a..6012869 100644 PYTHON_FOR_REGEN?=@PYTHON_FOR_REGEN@ UPDATE_FILE=@PYTHON_FOR_REGEN@ $(srcdir)/Tools/scripts/update_file.py -@@ -487,7 +490,7 @@ DTRACE_DEPS = \ +@@ -486,7 +489,7 @@ DTRACE_DEPS = \ # Default target all: @DEF_MAKE_ALL_RULE@ @@ -41,7 +41,7 @@ index 7b8317a..6012869 100644 Programs/_testembed python-config # Check that the source is clean when building out of source. -@@ -617,6 +620,14 @@ $(BUILDPYTHONW): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) pythonw +@@ -616,6 +619,14 @@ $(BUILDPYTHONW): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) pythonw $(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) python_exe.o $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -municode -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) python_exe.o @@ -56,7 +56,7 @@ index 7b8317a..6012869 100644 platform: $(BUILDPYTHON) pybuilddir.txt $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print("%s-%d.%d" % (get_platform(), *sys.version_info[:2]))' >platform -@@ -1331,7 +1342,7 @@ $(DESTSHARED): +@@ -1330,7 +1341,7 @@ $(DESTSHARED): # Install the interpreter with $(VERSION) affixed # This goes into $(exec_prefix) altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@ @@ -65,7 +65,7 @@ index 7b8317a..6012869 100644 do \ if test ! -d $(DESTDIR)$$i; then \ echo "Creating directory $$i"; \ -@@ -1342,6 +1353,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@ +@@ -1341,6 +1352,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@ if test "$(PYTHONFRAMEWORKDIR)" = "no-framework" ; then \ $(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \ $(INSTALL_PROGRAM) $(BUILDPYTHONW) $(DESTDIR)$(BINDIR)/python3w$(EXE); \ @@ -75,5 +75,5 @@ index 7b8317a..6012869 100644 $(INSTALL_PROGRAM) $(STRIPFLAG) Mac/pythonw $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \ fi -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0110-configure.ac-set-_WIN32_WINNT-version.patch b/mingw-w64-python/0110-configure.ac-set-_WIN32_WINNT-version.patch index 45235b309d..b7e958aeee 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 3724005ffa45a6115f94f8361d0f08cb95af568b Mon Sep 17 00:00:00 2001 +From 15e69064ff0d465ee518919a3f83028e302ad4fb 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,10 +8,10 @@ Subject: [PATCH 110/N] configure.ac: set _WIN32_WINNT version 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac -index 12373f7..2455a05 100644 +index bfa18be..77982d0 100644 --- a/configure.ac +++ b/configure.ac -@@ -3477,6 +3477,11 @@ else +@@ -3489,6 +3489,11 @@ else fi]) AC_MSG_RESULT($with_dbmliborder) @@ -24,5 +24,5 @@ index 12373f7..2455a05 100644 AC_SUBST(USE_WIN32_MODULE) USE_WIN32_MODULE='#' -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0111-configure.ac-don-t-check-for-clock_-functions.patch b/mingw-w64-python/0111-configure.ac-don-t-check-for-clock_-functions.patch index 3d9f9c4fe3..9aa1de34c5 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 80640c7c44d34d8cebfa0768575750e7753bcb8e Mon Sep 17 00:00:00 2001 +From 6f3fc42d39c6d0009933bde5a2322a54de764846 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,10 +9,10 @@ They shouldn't be exposed on Windows and lead to winpthread being linked in 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac -index 2455a05..dd6969d 100644 +index 77982d0..f986188 100644 --- a/configure.ac +++ b/configure.ac -@@ -4369,6 +4369,9 @@ char *r = crypt_r("", "", &d); +@@ -4381,6 +4381,9 @@ char *r = crypt_r("", "", &d); []) ) @@ -22,7 +22,7 @@ index 2455a05..dd6969d 100644 AC_CHECK_FUNCS(clock_gettime, [], [ AC_CHECK_LIB(rt, clock_gettime, [ LIBS="$LIBS -lrt" -@@ -4389,6 +4392,8 @@ AC_CHECK_FUNCS(clock_settime, [], [ +@@ -4401,6 +4404,8 @@ AC_CHECK_FUNCS(clock_settime, [], [ AC_DEFINE(HAVE_CLOCK_SETTIME, 1) ]) ]) @@ -32,5 +32,5 @@ index 2455a05..dd6969d 100644 AC_MSG_CHECKING(for major, minor, and makedev) AC_LINK_IFELSE([AC_LANG_PROGRAM([[ -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0112-expanduser-normpath-paths-coming-from-env-vars.patch b/mingw-w64-python/0112-expanduser-normpath-paths-coming-from-env-vars.patch index 2eee6c3dd2..5458f0415c 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 2748eca808bc4a0d9f79a86803217147fa4c69ec Mon Sep 17 00:00:00 2001 +From 0762b765e0c3463fc531aa3458ac3645e27c003c 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.34.0 +2.34.1 diff --git a/mingw-w64-python/0113-Add-support-for-Windows-7-Python-3.9.patch b/mingw-w64-python/0113-Add-support-for-Windows-7-Python-3.9.patch index 16c0c492a9..f5283ac950 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,16 +1,16 @@ -From 0f459a423fa1754bae5817940d62348b5197fda5 Mon Sep 17 00:00:00 2001 +From fc6619697a171ecfe63a933e3f93b1841ce13cc2 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 --- - Modules/posixmodule.c | 22 +++++++++++------ - PC/getpathp.c | 57 +++++++++++++++++++++++++++++++++++++++---- + Modules/posixmodule.c | 22 ++++++++++------ + PC/getpathp.c | 58 +++++++++++++++++++++++++++++++++++++++---- configure.ac | 2 +- - 3 files changed, 68 insertions(+), 13 deletions(-) + 3 files changed, 69 insertions(+), 13 deletions(-) diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index bf19ac8..215c81f 100644 +index 590b459..1b627df 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -18,7 +18,7 @@ @@ -71,18 +71,19 @@ index bf19ac8..215c81f 100644 diff --git a/PC/getpathp.c b/PC/getpathp.c -index 53da3a6..40b0db3 100644 +index 7c0eeab..2d03b74 100644 --- a/PC/getpathp.c +++ b/PC/getpathp.c -@@ -90,7 +90,6 @@ +@@ -90,7 +90,7 @@ #endif #include -#include - #include ++#include #ifdef HAVE_SYS_TYPES_H -@@ -250,14 +249,43 @@ ismodule(wchar_t *filename, int update_filename) + #include +@@ -249,14 +249,43 @@ ismodule(wchar_t *filename, int update_filename) stuff as fits will be appended. */ @@ -128,7 +129,7 @@ index 53da3a6..40b0db3 100644 /* Call PathCchCanonicalizeEx(path): remove navigation elements such as "." and ".." to produce a direct, well-formed path. */ static PyStatus -@@ -267,8 +295,27 @@ canonicalize(wchar_t *buffer, const wchar_t *path) +@@ -266,8 +295,27 @@ canonicalize(wchar_t *buffer, const wchar_t *path) return _PyStatus_NO_MEMORY(); } @@ -159,10 +160,10 @@ index 53da3a6..40b0db3 100644 return _PyStatus_OK(); } diff --git a/configure.ac b/configure.ac -index dd6969d..23dd59b 100644 +index f986188..f5be44c 100644 --- a/configure.ac +++ b/configure.ac -@@ -5968,7 +5968,7 @@ AC_MSG_RESULT(done) +@@ -5980,7 +5980,7 @@ AC_MSG_RESULT(done) # For mingw build need additional library for linking case $host in *-*-mingw*) @@ -172,5 +173,5 @@ index dd6969d..23dd59b 100644 if test "$AWK" = "gawk"; then awk_extra_flag="--non-decimal-data" -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0114-Commit-regenerated-importlib.patch b/mingw-w64-python/0114-Commit-regenerated-importlib.patch index 00ef34aa4a..4e30f7e39a 100644 --- a/mingw-w64-python/0114-Commit-regenerated-importlib.patch +++ b/mingw-w64-python/0114-Commit-regenerated-importlib.patch @@ -1,4 +1,4 @@ -From 4ad86b7afa525e568e3c57b795df33b6a5369a3c Mon Sep 17 00:00:00 2001 +From ba0fc684a60cae28806d23a30fafac9c090db205 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 1 Aug 2021 16:09:12 +0200 Subject: [PATCH 114/N] Commit regenerated importlib @@ -2390,5 +2390,5 @@ index 6d40249..17f549b 100644 + 0,20,14,127,0,27,10,23,8,11,8,61, }; -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0115-CI-test-the-build-and-add-some-mingw-specific-tests.patch b/mingw-w64-python/0115-CI-test-the-build-and-add-some-mingw-specific-tests.patch index bf1bacc1a5..387b3ee690 100644 --- a/mingw-w64-python/0115-CI-test-the-build-and-add-some-mingw-specific-tests.patch +++ b/mingw-w64-python/0115-CI-test-the-build-and-add-some-mingw-specific-tests.patch @@ -1,4 +1,4 @@ -From dace5a0283f861847979063d2ceb14bbf3cbc0f2 Mon Sep 17 00:00:00 2001 +From 1f3d70f51035932de24c2df7084f9224fbd632ea Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Fri, 18 Jun 2021 17:51:59 +0530 Subject: [PATCH 115/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.34.0 +2.34.1 diff --git a/mingw-w64-python/0116-decimal-backport-build-fixes.patch b/mingw-w64-python/0116-decimal-backport-build-fixes.patch index 26d7337aee..b2b80683ef 100644 --- a/mingw-w64-python/0116-decimal-backport-build-fixes.patch +++ b/mingw-w64-python/0116-decimal-backport-build-fixes.patch @@ -1,4 +1,4 @@ -From f9d77130f2c14f49081ba243f346e0c458f45d5e Mon Sep 17 00:00:00 2001 +From 96d183dd8ee2b5ff4380f230e2a24a1125a9851b Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 23 Sep 2021 09:55:32 +0200 Subject: [PATCH 116/N] decimal: backport build fixes @@ -31,5 +31,5 @@ index d80d791..28fd209 100644 sep = dotsep_as_utf8(spec.sep); if (sep == NULL) { -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0117-smoketests-test-that-_decimal-exists.patch b/mingw-w64-python/0117-smoketests-test-that-_decimal-exists.patch index 6763624de9..c582e09bfa 100644 --- a/mingw-w64-python/0117-smoketests-test-that-_decimal-exists.patch +++ b/mingw-w64-python/0117-smoketests-test-that-_decimal-exists.patch @@ -1,4 +1,4 @@ -From b7d2e9e27140b56c131e1705bd20dcc7dac63eb2 Mon Sep 17 00:00:00 2001 +From d5a8017fac49caaf9ec52f0f46760ce62f2849cc Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 23 Sep 2021 09:57:56 +0200 Subject: [PATCH 117/N] smoketests: test that _decimal exists @@ -22,5 +22,5 @@ index 70acbd1..527aafb 100644 import socket self.assertTrue(hasattr(socket, "inet_ntop")) -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0118-Prefer-sysconfig.python_build.patch b/mingw-w64-python/0118-Prefer-sysconfig.python_build.patch index 666eac1c39..65446951da 100644 --- a/mingw-w64-python/0118-Prefer-sysconfig.python_build.patch +++ b/mingw-w64-python/0118-Prefer-sysconfig.python_build.patch @@ -1,4 +1,4 @@ -From ac9f30ac5c47c7f54306c1f8fc5d4d05b9d78386 Mon Sep 17 00:00:00 2001 +From 16683cb6295f388e9425517edecdd5368343a62c Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Fri, 1 Oct 2021 07:28:36 +0700 Subject: [PATCH 118/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.34.0 +2.34.1 diff --git a/mingw-w64-python/0119-distutils-remove-checks-for-ancient-gcc-binutils.patch b/mingw-w64-python/0119-distutils-remove-checks-for-ancient-gcc-binutils.patch index 15d3aea8a9..15f15baa60 100644 --- a/mingw-w64-python/0119-distutils-remove-checks-for-ancient-gcc-binutils.patch +++ b/mingw-w64-python/0119-distutils-remove-checks-for-ancient-gcc-binutils.patch @@ -1,4 +1,4 @@ -From 8ec77b61a8c33a8096882be9edfe0b23c4c62e2c Mon Sep 17 00:00:00 2001 +From 662d8c68e4559c6deebf5abb78767b81d9266fe9 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 7 Nov 2021 23:06:13 +0100 Subject: [PATCH 119/N] distutils: remove checks for ancient gcc/binutils @@ -256,5 +256,5 @@ index 9dc869d..f525ab4 100644 # none -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0120-distutils-split-CC-env-var-before-passing-to-subproc.patch b/mingw-w64-python/0120-distutils-split-CC-env-var-before-passing-to-subproc.patch index 01446f62c6..3f31dbe044 100644 --- a/mingw-w64-python/0120-distutils-split-CC-env-var-before-passing-to-subproc.patch +++ b/mingw-w64-python/0120-distutils-split-CC-env-var-before-passing-to-subproc.patch @@ -1,4 +1,4 @@ -From 8736112bab36bc8f0612f33237f64473640ff3b8 Mon Sep 17 00:00:00 2001 +From 382c91ed3b11b65cfaeebb3d02f8886b401f4ab0 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 7 Nov 2021 23:12:10 +0100 Subject: [PATCH 120/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.34.0 +2.34.1 diff --git a/mingw-w64-python/0121-_testconsole.c-Fix-casing-path-sep.patch b/mingw-w64-python/0121-_testconsole.c-Fix-casing-path-sep.patch index b7dfa28f09..80b9669158 100644 --- a/mingw-w64-python/0121-_testconsole.c-Fix-casing-path-sep.patch +++ b/mingw-w64-python/0121-_testconsole.c-Fix-casing-path-sep.patch @@ -1,4 +1,4 @@ -From 11779b2113f6d60fafff13d7e625fff72980e9bf Mon Sep 17 00:00:00 2001 +From 667b4b663c1382c6daa8bac219bdeb97419b4b73 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Sun, 14 Nov 2021 14:55:35 +0700 Subject: [PATCH 121/N] _testconsole.c: Fix casing & path sep @@ -30,5 +30,5 @@ index b62f21c..c8b9593 100644 PyMethodDef testconsole_methods[] = { _TESTCONSOLE_WRITE_INPUT_METHODDEF -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0122-Return-consistent-architecture-markers-for-python-on.patch b/mingw-w64-python/0122-Return-consistent-architecture-markers-for-python-on.patch index af24f0f7c1..77fbb0694d 100644 --- a/mingw-w64-python/0122-Return-consistent-architecture-markers-for-python-on.patch +++ b/mingw-w64-python/0122-Return-consistent-architecture-markers-for-python-on.patch @@ -1,4 +1,4 @@ -From 8bcd28b1e2e0394240fa839bb4516d68339cdeaf Mon Sep 17 00:00:00 2001 +From 4f4a764595a50871a5955a0e5b53fbb6590e1bb2 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 122/N] Return consistent architecture markers for python on @@ -51,10 +51,10 @@ index 2d935fe..fc8132c 100644 #define ARCH_SUFFIX " 32 bit" #endif diff --git a/configure.ac b/configure.ac -index 23dd59b..e688fb8 100644 +index f5be44c..81e94c3 100644 --- a/configure.ac +++ b/configure.ac -@@ -5197,6 +5197,9 @@ case $host_os in +@@ -5209,6 +5209,9 @@ case $host_os in aarch64-*-mingw*) PYD_PLATFORM_TAG+="mingw_aarch64" ;; @@ -65,5 +65,5 @@ index 23dd59b..e688fb8 100644 AC_MSG_RESULT($PYD_PLATFORM_TAG) esac -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0123-distutils-add-back-gcc_version.patch b/mingw-w64-python/0123-distutils-add-back-gcc_version.patch index 1c93ceab1e..a6ead317b5 100644 --- a/mingw-w64-python/0123-distutils-add-back-gcc_version.patch +++ b/mingw-w64-python/0123-distutils-add-back-gcc_version.patch @@ -1,4 +1,4 @@ -From 825cae18785111ece6ac216335c4b83fccd6034c Mon Sep 17 00:00:00 2001 +From cd85d3a248958e37c27fa2a75302c9bf74f74bf2 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 21 Nov 2021 14:00:06 +0100 Subject: [PATCH 123/N] distutils: add back gcc_version @@ -34,5 +34,5 @@ index 6e22555..d8c8428 100644 shared_option = "-shared" -- -2.34.0 +2.34.1 diff --git a/mingw-w64-python/0124-fix-mingw-cross-compiling-in-setup.py.patch b/mingw-w64-python/0124-fix-mingw-cross-compiling-in-setup.py.patch new file mode 100644 index 0000000000..bd820ddb5c --- /dev/null +++ b/mingw-w64-python/0124-fix-mingw-cross-compiling-in-setup.py.patch @@ -0,0 +1,47 @@ +From a0c70e5ea03a000ac5cc27ed5c64c21c6799667a Mon Sep 17 00:00:00 2001 +From: jeremyd2019 +Date: Mon, 22 Nov 2021 13:15:12 -0800 +Subject: [PATCH 124/N] fix mingw cross compiling in setup.py + +gcc outputs with `;` path delimiter on mingw, so use `os.pathsep` instead of `:` (assuming this is a host rather than target decision) + +clang does not output `LIBRARY_PATH` with `-E -v`, so add an extra call to `-print-search-dirs` to find its library path. +--- + setup.py | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index badb119..2d07ea3 100644 +--- a/setup.py ++++ b/setup.py +@@ -713,14 +713,25 @@ class PyBuildExt(build_ext): + elif line.startswith("End of search list"): + in_incdirs = False + elif (is_gcc or is_clang) and line.startswith("LIBRARY_PATH"): +- for d in line.strip().split("=")[1].split(":"): ++ for d in line.strip().split("=")[1].split(os.pathsep): + d = os.path.normpath(d) +- if '/gcc/' not in d: ++ if '/gcc/' not in d and '/clang/' not in d: + add_dir_to_list(self.compiler.library_dirs, + d) + elif (is_gcc or is_clang) and in_incdirs and '/gcc/' not in line and '/clang/' not in line: + add_dir_to_list(self.compiler.include_dirs, + line.strip()) ++ if is_clang: ++ ret = run_command('%s -print-search-dirs >%s' % (cc, tmpfile)) ++ if ret == 0: ++ with open(tmpfile) as fp: ++ for line in fp.readlines(): ++ if line.startswith("libraries:"): ++ for d in line.strip().split("=")[1].split(os.pathsep): ++ d = os.path.normpath(d) ++ if '/gcc/' not in d and '/clang/' not in d: ++ add_dir_to_list(self.compiler.library_dirs, ++ d) + finally: + os.unlink(tmpfile) + +-- +2.34.1 + diff --git a/mingw-w64-python/0125-Use-actions-setup-python-for-setting-up-correct-vers.patch b/mingw-w64-python/0125-Use-actions-setup-python-for-setting-up-correct-vers.patch new file mode 100644 index 0000000000..0b687910f5 --- /dev/null +++ b/mingw-w64-python/0125-Use-actions-setup-python-for-setting-up-correct-vers.patch @@ -0,0 +1,36 @@ +From 20616d4f465d8649a0e73c84d3e7587162da3d2d Mon Sep 17 00:00:00 2001 +From: Naveen M K +Date: Fri, 21 Jan 2022 19:25:44 +0530 +Subject: [PATCH 125/N] Use actions/setup-python for setting up correct + version in cross build + +Fixes https://github.com/msys2-contrib/cpython-mingw/issues/67 +--- + .github/workflows/mingw.yml | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml +index eb27adc..ffd6ecb 100644 +--- a/.github/workflows/mingw.yml ++++ b/.github/workflows/mingw.yml +@@ -162,7 +162,16 @@ jobs: + - name: Install deps + run: | + pacman --noconfirm -Suuy +- pacman --needed --noconfirm -S mingw-w64-gcc autoconf-archive autoconf automake python zip ++ pacman --needed --noconfirm -S mingw-w64-gcc autoconf-archive autoconf automake zip ++ ++ - uses: actions/setup-python@v2 ++ with: ++ python-version: '3.9' ++ ++ - name: Check Python Version ++ run: | ++ which python ++ python --version + + - name: Build + run: | +-- +2.34.1 + diff --git a/mingw-w64-python/0126-Fix-buffer-overflow-in-Py_GetSepW.patch b/mingw-w64-python/0126-Fix-buffer-overflow-in-Py_GetSepW.patch new file mode 100644 index 0000000000..b780e10db2 --- /dev/null +++ b/mingw-w64-python/0126-Fix-buffer-overflow-in-Py_GetSepW.patch @@ -0,0 +1,65 @@ +From 3210f304dbb65efb04a6525913a4dc1e0003fb46 Mon Sep 17 00:00:00 2001 +From: cat +Date: Sat, 11 Dec 2021 14:21:07 +0500 +Subject: [PATCH 126/N] Fix buffer overflow in Py_GetSepW(). + +--- + Python/pathconfig.c | 28 ++++++++++++++++++++++++++-- + 1 file changed, 26 insertions(+), 2 deletions(-) + +diff --git a/Python/pathconfig.c b/Python/pathconfig.c +index 222850b..7d75216 100644 +--- a/Python/pathconfig.c ++++ b/Python/pathconfig.c +@@ -20,6 +20,30 @@ extern "C" { + #include + #endif + ++static int ++Py_StartsWithA(const char * str, const char * prefix) ++{ ++ while(*prefix) ++ { ++ if(*prefix++ != *str++) ++ return 0; ++ } ++ ++ return 1; ++} ++ ++static int ++Py_StartsWithW(const wchar_t * str, const wchar_t * prefix) ++{ ++ while(*prefix) ++ { ++ if(*prefix++ != *str++) ++ return 0; ++ } ++ ++ return 1; ++} ++ + char + Py_GetSepA(const char *name) + { +@@ -30,7 +54,7 @@ Py_GetSepA(const char *name) + * The "\\?\" prefix .. indicate that the path should be passed to the system with minimal + * modification, which means that you cannot use forward slashes to represent path separators + */ +- if (name != NULL && memcmp(name, "\\\\?\\", sizeof("\\\\?\\") - sizeof(char)) == 0) ++ if (name != NULL && Py_StartsWithA(name, "\\\\?\\") != 0) + { + return '\\'; + } +@@ -82,7 +106,7 @@ Py_GetSepW(const wchar_t *name) + * The "\\?\" prefix .. indicate that the path should be passed to the system with minimal + * modification, which means that you cannot use forward slashes to represent path separators + */ +- if (name != NULL && memcmp(name, L"\\\\?\\", sizeof(L"\\\\?\\") - sizeof(wchar_t)) == 0) ++ if (name != NULL && Py_StartsWithW(name, L"\\\\?\\") != 0) + { + return L'\\'; + } +-- +2.34.1 + diff --git a/mingw-w64-python/0127-Remove-unnecessary-strlen-in-Py_NormalizeSepsW.patch b/mingw-w64-python/0127-Remove-unnecessary-strlen-in-Py_NormalizeSepsW.patch new file mode 100644 index 0000000000..0414138715 --- /dev/null +++ b/mingw-w64-python/0127-Remove-unnecessary-strlen-in-Py_NormalizeSepsW.patch @@ -0,0 +1,42 @@ +From 473806045dc48fa00d29c6000b03210ddd700bf6 Mon Sep 17 00:00:00 2001 +From: cat +Date: Sat, 11 Dec 2021 14:23:29 +0500 +Subject: [PATCH 127/N] Remove unnecessary strlen() in Py_NormalizeSepsW(). + +--- + Python/pathconfig.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/Python/pathconfig.c b/Python/pathconfig.c +index 7d75216..d47cb6f 100644 +--- a/Python/pathconfig.c ++++ b/Python/pathconfig.c +@@ -83,10 +83,11 @@ Py_GetAltSepA(const char *name) + void + Py_NormalizeSepsA(char *name) + { ++ assert(name != NULL); + char sep = Py_GetSepA(name); + char altsep = Py_GetAltSepA(name); + char* seps; +- if (strlen(name) > 1 && name[1] == ':') { ++ if (name[0] != '\0' && name[1] == ':') { + name[0] = toupper(name[0]); + } + seps = strchr(name, altsep); +@@ -135,10 +136,11 @@ Py_GetAltSepW(const wchar_t *name) + void + Py_NormalizeSepsW(wchar_t *name) + { ++ assert(name != NULL); + wchar_t sep = Py_GetSepW(name); + wchar_t altsep = Py_GetAltSepW(name); + wchar_t* seps; +- if (wcslen(name) > 1 && name[1] == L':') { ++ if (name[0] != L'\0' && name[1] == L':') { + name[0] = towupper(name[0]); + } + seps = wcschr(name, altsep); +-- +2.34.1 + diff --git a/mingw-w64-python/0128-handle-ncursesw-pkg-config-when-cross-compiling.patch b/mingw-w64-python/0128-handle-ncursesw-pkg-config-when-cross-compiling.patch new file mode 100644 index 0000000000..32b7e929e1 --- /dev/null +++ b/mingw-w64-python/0128-handle-ncursesw-pkg-config-when-cross-compiling.patch @@ -0,0 +1,63 @@ +From 12d1cb5b7c60901e36163b3e0599f11703c4946a Mon Sep 17 00:00:00 2001 +From: jeremyd2019 +Date: Mon, 22 Nov 2021 16:04:41 -0800 +Subject: [PATCH 128/N] handle ncursesw pkg-config when cross-compiling + +strip extra args from pkg-config --cflags-only-I, setup.py is only expecting a single path. + +Use pkg-config ncursesw include dir even if cross-compiling (PKG_CONFIG_PATH should be set in that case). +--- + configure.ac | 8 +++----- + setup.py | 3 +-- + 2 files changed, 4 insertions(+), 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 81e94c3..ca712f1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3403,7 +3403,7 @@ else + fi + + if test "$with_system_ffi" = "yes" && test -n "$PKG_CONFIG"; then +- LIBFFI_INCLUDEDIR="`"$PKG_CONFIG" libffi --cflags-only-I 2>/dev/null | sed -e 's/^-I//;s/ *$//'`" ++ LIBFFI_INCLUDEDIR="`"$PKG_CONFIG" libffi --cflags-only-I 2>/dev/null | sed -e 's/^-I//;s/ .*$//'`" + else + LIBFFI_INCLUDEDIR="" + fi +@@ -5597,7 +5597,7 @@ then + fi + + if test -n "$PKG_CONFIG"; then +- NCURSESW_INCLUDEDIR="`"$PKG_CONFIG" ncursesw --cflags-only-I 2>/dev/null | sed -e 's/^-I//;s/ *$//'`" ++ NCURSESW_INCLUDEDIR="`"$PKG_CONFIG" ncursesw --cflags-only-I 2>/dev/null | sed -e 's/^-I//;s/ .*$//'`" + else + NCURSESW_INCLUDEDIR="" + fi +@@ -5605,9 +5605,7 @@ AC_SUBST(NCURSESW_INCLUDEDIR) + + # first curses header check + ac_save_cppflags="$CPPFLAGS" +-if test "$cross_compiling" = no; then +- CPPFLAGS="$CPPFLAGS -I$NCURSESW_INCLUDEDIR" +-fi ++CPPFLAGS="$CPPFLAGS -I$NCURSESW_INCLUDEDIR" + + AC_CHECK_HEADERS(curses.h ncurses.h) + +diff --git a/setup.py b/setup.py +index 2d07ea3..7ef50e9 100644 +--- a/setup.py ++++ b/setup.py +@@ -1117,8 +1117,7 @@ class PyBuildExt(build_ext): + panel_library = 'panel' + if curses_library == 'ncursesw': + curses_defines.append(('HAVE_NCURSESW', '1')) +- if not CROSS_COMPILING: +- curses_includes.append(sysconfig.get_config_var("NCURSESW_INCLUDEDIR")) ++ curses_includes.append(sysconfig.get_config_var("NCURSESW_INCLUDEDIR")) + # Bug 1464056: If _curses.so links with ncursesw, + # _curses_panel.so must link with panelw. + panel_library = 'panelw' +-- +2.34.1 + diff --git a/mingw-w64-python/PKGBUILD b/mingw-w64-python/PKGBUILD index dea9387652..62bcfe3fa2 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}.7 -pkgrel=4 +pkgver=${_pybasever}.10 +pkgrel=2 pkgdesc="A high-level scripting language (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -170,7 +170,12 @@ source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz 0120-distutils-split-CC-env-var-before-passing-to-subproc.patch 0121-_testconsole.c-Fix-casing-path-sep.patch 0122-Return-consistent-architecture-markers-for-python-on.patch - 0123-distutils-add-back-gcc_version.patch) + 0123-distutils-add-back-gcc_version.patch + 0124-fix-mingw-cross-compiling-in-setup.py.patch + 0125-Use-actions-setup-python-for-setting-up-correct-vers.patch + 0126-Fix-buffer-overflow-in-Py_GetSepW.patch + 0127-Remove-unnecessary-strlen-in-Py_NormalizeSepsW.patch + 0128-handle-ncursesw-pkg-config-when-cross-compiling.patch) # Helper macros to help make tasks easier # apply_patch_with_msg() { @@ -306,7 +311,12 @@ prepare() { 0120-distutils-split-CC-env-var-before-passing-to-subproc.patch \ 0121-_testconsole.c-Fix-casing-path-sep.patch \ 0122-Return-consistent-architecture-markers-for-python-on.patch \ - 0123-distutils-add-back-gcc_version.patch + 0123-distutils-add-back-gcc_version.patch \ + 0124-fix-mingw-cross-compiling-in-setup.py.patch \ + 0125-Use-actions-setup-python-for-setting-up-correct-vers.patch \ + 0126-Fix-buffer-overflow-in-Py_GetSepW.patch \ + 0127-Remove-unnecessary-strlen-in-Py_NormalizeSepsW.patch \ + 0128-handle-ncursesw-pkg-config-when-cross-compiling.patch autoreconf -vfi } @@ -402,127 +412,132 @@ package() { fi } -sha256sums=('f8145616e68c00041d1a6399b76387390388f8359581abc24432bb969b5e3c57' - '62dee5891edefd2c05f7c5fb93becc4a83eeb5ff9ac6ed2ffb37cd93a5296c2f' - 'facf4dd94f93745a5ffa03b0d9b00b032d85a1629b91ba0113152f2fb20110df' - '31b5385e31ead9867047d9d343d4567b49f51d5cb6301076d243c1d8537789cb' - '40fd2bbc169f0db3fb3fe9ec1f960b1dfbe15dfd8c462c10f36e680150368693' - 'a4b0454b42e1ce408f6c6632cec94175b13c6d5ee2aa3cd33d3e4b4b6d48d1a7' - '44d18e581bdc6519ee746e63fff4ea81b913ec15d09fb575701f0a2412c02515' - '88c3bcdbe91e5221e7964e83b267ed63d4b46e0a304dd75b88c796485d4118e2' - '2aa4db9736094c76529d4e72a740aff140161f5ba52002b70e1d7110c069e1d8' - 'daec5d65d62d742f421b41bb93fb327acd1dde42c398c726b0293dca41d17586' - '7e7ad89cc3686beff133a6a15744ac523ebfceffc853a327055698ecb1df9c97' - 'd233182363189d80f7a9fdc21957e0cf0d24eec96420e93ba157817d18258902' - 'c137f268598e317f1ddb8d0e8c50ab34afb9f8af082b70f02fafa3187b986e77' - '034a0bba9a867056d21a8c553988ecbb1ec9a05c916770aa4f9fdefd47bf69f0' - '5edebfd151887950f63f57d1fb8b04fbd07d7a9a2448a7c6117f7ae44ae277a1' - 'fae9ac675f98bab4e069a08146529842a1de67b781c1a34d9cbb2c34473bd534' - '4fdfebd8cfdbf063d4b6f3ed8ec0cfcf3eb24cc357a8355d48635ee435424e1c' - '74319cb9003d5d8b0dd8cbd13ba1aadafd97b9c0e6745d4c968360c0db8efd85' - '7bfdd2dae64607834fa86ea628f2ab516306cc630ae9a25cd0e50f26afc38410' - '895d7db4d450ef65532b75afff0dee59f5c6201e49513804a5b5b605c443d35c' - 'e91c00307f4ef91f4ce0f2afe7242ed72a97b7a4cabe78cbe5b637780153782e' - '224032f9ccdd02bd6ead869b994fae615ebf64861719f07ed1d04ba7501b8bf3' - 'cce804c221beaadd88a0caefcb1fab7b4b5d12676e7480e080027712fed5f535' - 'bb61e25cdeda43600f021fda5ae12a3894e4edc4aa7ab88a82fdfbee5baef169' - 'f8cc1303c4d1ad8902c31eb28f2f50f84ebae8534d114f3a710842436f5d0156' - 'ab8e7b565b616cd38912fd985b2b179caebf94ca3a93989b628b10aa5497bcf5' - 'baac8ad6653f230b0cd246750f5224376d550e415e01abf538b317af79ff45f2' - '0bd5d9c6165a292e46b20db43848bf3fc01aed351bc0129e0e8394b337124e63' - 'cecc2f13e03f2a02cd3168cd59178e02b96898a79d26c25a6383cc90e85bc99a' - '3a58224757d0137c1829811773c6bc55b41ec9a71045a3aa8104c17cd2d1bc7b' - '2aac0253b2da3e0df0ecdb051f8ed8dee7cf512d347507173219b0d4479212e5' - '970ffa333e58eee1c4695bc25b3e9c65100b225d51e8da1ae8752d203b5dcf42' - 'b73d39ef2a1c1f2b32ae6ce534be7651cdf693487861e432bbfcad3c03f2fcd3' - 'eb8c6daa2a51f462a6b12fcf2eae08b86ebe5fe9fe8ce6ccb69b4c80876703ba' - 'ba8137f997bcae37963e430c59a0e8f306f8f2815dcba50e69da36a6326066c4' - '41523d21ae6e13c878d929dfcc86da3913752ea0c325e16060bcf115814681fa' - 'e7d181d5562b918837efa4c5a77884bde328ab81522e11d0989ddec8f4518995' - '33808d7711313245a9f4275579e0f1d976f35a068d7f90381ab8301765ceede4' - 'be4685b97eb1062f9cd3840f22bb796e89a8b56985185e324f5e880756d005aa' - '0f15005bf785df95402fb7cc974ee9625b70dca60de886e77153300d71444243' - '9fe5c25c9c3e3d0903d70b86eb3db089fcf87a534709cf648334d8d629ef561e' - 'b658719f2ee4139d39b8578d65b51f8bf49de037c289730a72bf4dfbd2da0486' - '868f5345735931a80f5e5feebab34f64b934870b2a1b51cc21649d92915f3195' - '56fe041fe46eff76e76339476181f46f9dd5b13d02c00d1fec6e7858861722d7' - '1563ceec0dabfe9f2ef4aee4d64c2f91ecaa676e8e0b50ce24555fd154270cb5' - 'c5848a029d2a99b1243bb29c4ca312289eed1e87e56ab116388d5f16657dd7f9' - 'cb7826bcd96a8d5e7e54d3b68d3c380239e256cfbe7a9158a6df5291d88b7a1c' - '2a19cb76fce616706a756824f8fc15593705a510d75e7470472354b0e7d9651f' - '36276acaef36d7f931466b354ad65518f8a281e0d710b2559816227c5f9e896b' - '3e09967925852f77d65bdbb8ef67d4f831b15dbf84f8ee4b302a124abe591dd7' - 'd810d09d7d9c51764fd2979c5d993788922f8c3973e634ff794120b4ef3ebd82' - '9c49ce0e358eeec2c601e40d6be1d77bf1cd768718e957b0b4fa05fe29c8afe7' - '3b4218fe344cfca87412e3a5c8a6ab4e27a15a51a2f6a7b5d9b5516092232edd' - 'bf1d6c7c015057c3a866f3162b5fa519aa5c922edcbd8f5a80cb5339b1a7d6f8' - 'c4b4519eacd0bc8d4539929794fd1dc64051a0c08c8ada84f497ed91e5d8a506' - 'e413edeed77f5d50cfc3820748bf1416098b9fdb9ac066c8386ed0bdea3c74f2' - 'eaaae33a228ef8e8756b64a484abec18c1b0ead89b791c0712637e8a7292c3eb' - '0454bf64b7cd457ce9bbffa0d485b50c0b67826ccc7aee5c489df83e20cc8a5f' - 'ce94a5bfda2bbd6c9d8d98f2677c31f4cec5102611e78bc6d38ba13dfa22bf0b' - '9a4161f8684bdb2b9e0581b2156419ccd0dfe8b0486af6787be2985928ee94a3' - '631d9ff17da9fd37d0e299ee8b216e8344e057f4a7440c07aa497985afd6664b' - 'ea9d50b27a8b29b469bbe4f2cb5e695691af698827e790e2ad1420b6ab04b233' - 'ef0a4f372c5903212e24918aac86069d0798cd361554538037b3588e9bf19523' - '2086dadea83905f42988ff5037d31be4dbe8253aa83d6b67a332d3a4cf165a61' - 'ef31fd0238162f2109e9ee80a1e41ce2a756ada8171cdec0a8f37ff3f76e8cd8' - 'd45a8392eee1d7d5a7d91ae61f96a885a4899104ac9533ed6a32ce16f35d1852' - '98c4ddbef16395313d296cf86553c0d9d061308137fde247dcbc633de5e2461d' - 'cf1128a6430a596301769281ec2c4f2dafd328b31bc9501700a185a21fd2fc23' - '2547abc66905ea80b599e4d32694b56c8ab4092915807d825988826b85dee643' - '5fcf08ed217adbfe3f2323a8cf0838ec8b11173247ee734b6984845efb555ed1' - 'f670325ad0dc35d8710bd9109a115eda65db44b0bd7dc6c44900c2558e58fc0c' - 'eb8b9f47583cb54e34e610e9025eb5f2049cdd701e4bd7f9de45759eaf364a92' - '359373beb1f2fcb911659f05904bbd483cf35827562c14c5877f6be5a2ce20a7' - '6e50a79feb4ccc655666c95c1d421a1617af9246f967e50862f41bf7025156fd' - '1b2a28b12c017d13358d35747ac34b1167509ad1df387359c0b40020a1273b8e' - '7240b47fb2d64c20d35183af9e8b1de88eb8725d98ecd9dd7a099d6ddebf6804' - 'de98c0fb9472e6fce69a9a99c208577708c4c9bd27e004319977b71eb6a51ce8' - 'ff30c56ffced45caa4129d2c33196237d803f36759b2bfe10aa6a918098fa1b1' - 'c9f7bf2853bbc00729adbd03e32d25a15525887d57d947b78d0d4ae4b0b81456' - 'a668afa04b36e90a37cb52b1b00696c4ba4637e1b55dee9db1e3b07475bcb909' - '5ef6761afa3cec5921383f9a0a015d139335cf58ddc04f70a38cf10b4302da61' - 'fcad9789af50cdf48b0c61b257ef110c173908e963ae865d20013e9ce00a10f2' - '30045769cf6f34e436152a87bfd676a9c95399c2c0f5b2fcba2b29e74dd1173f' - '9782367937a0848eb4672c60a73d94ba27dd3d3794b32f26641b1da4ad417f5b' - '0c3b64d9d3c876f8aeda7b90b988ddbf6f7f0cc41b79476560d52b0812d601af' - '2860fa9641d27f72cec51096f9bb793f7527316317b6558d3774e221c050d4dc' - 'ceadfe08d129b940f5fbbbd7676482e2de30fa3163f8faf5439717e9743905e9' - '45b8f9cea7cf42bd52969f9b8518b5d585aaf966770517d673c5276bb0232b77' - '8b3c21e13d1368907af5f6381af100af95860fc639d62b240d8cb4e7fcdd3620' - 'b757a321247d91061cec371eeba8d83dc570be5f2ef3114baadfe1e400242a55' - '3dfecad6652374ab78cfd6c2d2379f28d261e900c54e064758547a4d14624b52' - 'bc420000d9968dedf38bcfea72396afa577e867069986cf4b09d3ef4f18d2e08' - '03a8660757c9328431b26c6db71504b3d3b0b1e99da05b890b0617a01fd50cac' - 'd6c0230be39d4254ee9a977ef8846168da2165178e5d4451670685db0d6be54b' - 'f5c5a2c9c1f2caf48c860b53f78d2f50488e72ba8e7a63409545a37fd5f3458d' - 'a367e7df40d991755dde4a06f626ad00f3289f29da3b7b98dd14dc40b62c596c' - 'cebe9d80e1073ce9b2666bd8aba1cf9b5faee3e50075cb415cf9be4267962569' - '09cd036c0612adc45de07090ec79f35856189ca4975573d08e92fa11d3c55502' - '2e46feb5f6ec1eed759b2afd3089bb829d45baa7482cf8fe12b3c1f25b418d8b' - 'e0e2f45c23934879d35d1ce34b94b4cf56187076df985c3ed138977827fa1691' - '182b4c2c50325b4d7ef552caa453e6bbe02b4bd3fb702215d20449e8e233cf94' - 'a4a8c74a2c329bb503e8377c0ca55b57d8c0252f1c96f06ba96c4c54012854fd' - '96c3c78efdde9ee90f238c6b093ccd5d5ebfac45914a2da156dad9cf287633f4' - 'beff69d5a66e14a4bc56050800cef779c96049aef722ca30a49d0b52f25cb4a6' - '120aed1c70df0baae6e78b896aa016929617dfaf3e3afc721f0f9779384529d7' - 'a8f97320a115e5f1525b364a9427481eb6d1418128106e7a99279b86f95b87d3' - '6f1b6f865052c9081b8a9956775d621b2dbfc6d22b4dd0e35db47b74192b07c7' - 'caca983baa6cc004b3ef2ee913af5ec1982ad8f04390dd335503b0185cd2d7e5' - 'e3b5abae5a1b3bbe6108b732fe2dc9f4b14c8962161dc13ebd4df69bbd870b4c' - '0d6a07d8e3c2f5e29b00dc99f939fae79d903c464c38b6590999b8d10d41ef19' - 'c9b2552990c528d0f7be7ad82803851bb16d574e7665adfb3eae3a24aae83fc5' - 'ce21963119d3b568c787081814bbe9d46e352ea8134838b7e092be004e5663d2' - 'a299a06c07a2a5b207a2e0bf9ce9b79427efeb92b0a3e150f0a456c81cb451b4' - 'dbec7ed2680a489446bd6f767149ace3c7d624842d9503249ecad7c4c9714f59' - '63e512d17e64f1500ead8a479c73296c6e4ada26175e867d2c58079429c4e251' - '102d0812928bb817910eb5d965ca1ab3b25d4de048dd5fc8d90bdac30585f6f7' - '5beda69c068727d1c5c94daf61f945febb493da1ca9681071e9718d3d4b146a4' - '678b0f67b6a7b9615c1c31fdab54b892c26ad26ad2f61957d7ea00e7922a77d3' - '499c1338b65229c1fd18eb05e45ee594eef1f8aaf217fb5a1e4b8ac982432aa6' - '56ae4c1a398914f7dfa93f4429d2be6e9f81c07d876824e5520e31ecbc98fad9' - 'f72499c24b56e13817255fedb14299a741cd7e2ba27d7645b919ddfb95c78db9' - 'e3fcb48ac5bcf26f27d3eafc20339160cafabdad40c2f50b52b2511300058579' - '0d8c0df418f382c8a46544d7ddfce508e010c8f94d54160bb02593c19a006ea5' - '5dad739b639b0db6344be0faa1f68243567f6a625c4ce9a2d263d06e55f66367') +sha256sums=('0a8fbfb5287ebc3a13e9baf3d54e08fa06778ffeccf6311aef821bb3a6586cc8' + '60650cee2336a38745531e0c471399ecfc368700f4d28793797c302c3a50a566' + '168a439e7aff58ed3dc8f373516ec98eb30913fc1d2f221179c203089b0edcf5' + '38224674f5c5ffb0091823c383fe01a984df8a1ad04600d2ca8626bc56686b30' + '09840437dd5ef3a7f95c8b82f0b848bf3b6013a75935bd7e860514a0d4816776' + 'a08b996f85450f6d0034e051319f2f251378cbad731758fe41b95a8a63d8c114' + '936f53654f5bb61ba17b1865890c19f265985355396ac6cf44f868809156178e' + '86c7b3a2900c8c865caf3822cb6f386e364c621df762778087238cd1dfeae5f2' + 'b7fbbfe4ee8427a1557e03ef8a882063c9c4442ad2704a5b1405bc0887a63bc7' + 'f9d8304547f4e78293c96ed19038a7204520797a337a97ff8adc3e46deb1c772' + '5fc51578040d4d2b6ba30437a882b62a850bdfb6cab5a02e2ab073d47c5a2727' + '3451df1a841470d5441644acaec1e3fa2a68c505c93419251ddeb673141f8297' + 'fee31a78904b3728e548a64af7172100f97b4f61db26b02b31f7ae3f4ee0d17d' + '86867a92b3d230bb6167c04fbb0fcd479cd85823ecda49cc59490c6afae9c900' + '3cd374775817ff1c345bb04654df07d3e363a3e3513dce19969b4710343da048' + '5c3b83875f9bb96dfc46db2876fd11f52ff11b7ee419ab3117643527b2f7e752' + 'e1f4bf7ee19a132682088bd0afebf4e38fcfe6f61f7a068a2bd8384036f986ad' + 'e6a813338ff07bcdeab6a9a2cfd448a6abe85f9407e6f294ea938b53ece9f916' + '8fc1ca5cc349f0101bcb6411c6727b4510f432ac449fff35941f34d6f3b30846' + 'bbe154f44ffac46b365c9100d1fba385d9fe727ee9698ce47684c82cc2c2fc0a' + 'd07b44e0461147d4b1fac4cfe7d49f95ecfe19f7e872e93c02653620b378c1ae' + '111d535b6938515b2fe66bd0870e09f7e6110bfbd53b2b896f435de93672ba9b' + '49f98bd4b4cb2bf26d40fe53918ef4b8ea5f366e077e24cfce265004d9e5e813' + '727968284fa21a92dad810e444091350fac9b34aca29f772e67f6ac47e74284d' + 'a5bbaafc5eed72346f618e2d3642109f31f1e62d8025fa5ccd2a73853fb81f64' + '95883f9bdb8b1ba84ca02e803c1aac662bb63fe3c35c18f70a1ffee07db2e760' + '7fd66c363e37673a90189efc832647834bc2b4021169b0a4c2c3f553e2aee252' + '418cdcca9196bb396b2c2cbfaecc54ac4858c5aaf040d97f00cd2e8fbc2101bb' + 'b467817f1b44c14ee218156a1d39007d96bbf924e8d784a97ee6247c09ca7790' + '88c22e47524d5ee5669d0fe470863a9e602d6f033225575e07d0e40069b96021' + '95cc396fcb39ab9cd8b0ab0118a2aab680ffd780e4223738ae6096b45637c103' + 'c4e5ca79353e3138cfca40d8e837436e0391b8a899ef4fbb12b7f8cfae70685a' + 'bf9bb6ec92e57f7ac8b8036dce564937319efe9bec789e90c9e5f535cf199a2d' + '7642ef2113842a1d5b82d4e2975c3101d0e8a7cfcebb21618f42b99b7346710a' + '04837a3b9a35f5ab49ad5f96a292565aaa27d3b377e6c46c41764373156235c4' + 'c1918a148aeb2c55139cd08c27974ba6edd0ef0248474a739c27ddb0e7fdba27' + '493ebda56669d48c756cd499b6eda43b975a71a3a04aef50949e8afdb31ebb64' + '927cf53ad8053cf04c670925dbc7ba70c98de33a1d7830c4e3f6242bba627e72' + '7aa0e088de3f7d5ed56de08e854b0ccf7447587c031b291cb70385314ab23049' + '782d5705129ce4432df35377cd8143a83111e03c2244ed7cc4bdc44d6ff07856' + 'e2e46ce6a0ee1dc7b88875a01be16ac8d142c8b588c5e434bfe6663c90ddf2df' + 'e3be03dc47acd14dd2f2a730c6dc5518f814d5841d62abea6a0b48efa06a4228' + '8e5a3171da2c2b3c771b1855b7918b7326c872de7fa0d14bcb65608837cbeea2' + 'd7798e45c09f0fd38c123e7ca5224ea2554e758a6d870347c5fef6edc50b6c6d' + 'b35baeb182ce5193613029602c3975f8df62ff2914329baf2c09d3b615620b2a' + '4fcb2f83b721e0529ce89fea66728b416f703caa49e2c169f9e23c9a60e34592' + 'a9b1a3956f208db9fff439a98535c287385a7f5e2631a4181582b8ae72a9c589' + '92a9af8ff4295279cf647c01d84081696087d9f5af33f06079c5f5594a71b983' + '7f89f54f228e93e7214a4c63fef63fe6114afae7e0645e2b89c1ab4b18c36403' + '09793e3629c2e173a034e0bdd182d2d71e26675434951356839a241d0094f3cf' + '6192d280c42f769e9ed78dcedf853e3c8f0bc8d3cc55238f0650f3699dc5c71b' + '8811fc1885cab84ec168b75af75a1aa80a889831d750403a78701ba953171369' + 'a275aef09e2d1de2f3a86146dac64fc43c67a4316c2d357e373da9fed6da58a1' + 'ca05645a9a11218dd5af61dd29189d4987ac73835df2fd2fe2584c50b11e3a53' + 'e98878ba09845b99b1126b62fff9bff287a971a5af7a4a40d725652144e9a929' + '4b0a7a3af45c5c3de5dfc2d4f8e22753f74dccd683ad11aabaa9efa4f71124c0' + '5066a8e32ede96a77b012295169620bfe5e91b6976fd6688a8d014dc007c6f07' + '2ab1246d675e3befd23c666eff2d691986526f8a07ec8932876b762ce877a668' + '941cd99a3ce9b345af8bdcd2b260a49fa161575ee365e56e8d5074b399b33798' + '76e840d422804f01bac1b51e936b1626b87eb867f624245aa58864706186aa81' + '8723dbd000deff073a02c6823236dd207d524e7951fdeebe961e5c2f5e29ba21' + '7a80ff908bf9a5e82c5664550a2fd259b037ca21cdb56aa081ff73ac0b15edf2' + 'd6c23fe6707926d2e0184b3f680766fcb669e2397157a9366405e9350addd030' + 'aa562c7b20d64175fe191cd6c00eb4550aa5d48e00031d45be67f9bea69279c0' + 'b5631dd8f2f4fafdef0c3d0becb33d63021f334fd2451c9ff4b527e6780736df' + '36c7ca7815354e5765c0cf4b16d9a3a83b55261d0a731962c7fdde5f6912a14f' + '271aada30e4887a290c3532bdc4820d58b2424f7866ad8374840d26e338765c2' + '64eb809b66e4ee7bfd8aba878e6fa4ad037eeb79c8d1c1efc7a0c6a39c61d0a0' + '586cb55731714973d904e071be3a161d21d3e99a8a18f4f266068a511e739ef8' + 'b453a6e53f3c1f0d1fa1b30e1114303123ba6a2399eafd5e0d80da1eea859042' + '1948e440008606c888957a85511b53d88ea8f7a13860bf6bb8429f8362634730' + '8dd42da695f2e43be5c39a68ac9d2ef7af93604e23c9aaaf55514db546a57708' + 'acfdc04626e7abc18f0b1894a80dc0761c1a62d37652dcc848c6efe952126d50' + '0391bb4743bf857b0cfeeac44e3fd8aa4a776e5478ea7d770101857c2bc5c498' + 'ec9091d2e7bd09a6ca5697a5f443bbb1635d63b43711e08e1a9e3f76cd66df2d' + '96ec270e675c1b0bce7d34fe86b92cedbc55d646a83f09935753f9c9a7622f00' + '6231ae6c6b94609a03c8c1eed0ed447693f3fa97e9550cd5ac397ad4ced82c09' + '10a186d35345e5873de3f3d5e731f4947028fda015d074069873788d4bd8ecd1' + '64fa589875de2196724977007e3bff8f1c9d0511d1ec3f4b56b02c5deb5072ba' + '80d92890d9439b47e776025e6431f192d6f87957ff90e418317946d72ad35d6c' + 'be9c9a3f04d690547c9590263b946d2be1365beeb9d913b6c7c3394f996bbf1c' + '671d2bc567f0db768d9637df3500100274e82357469f955285ad0e0165142d92' + 'cb33fae278f56414e0f4596982fc587e3588c53c8ea63e9bfe31f0ede848f8f5' + 'f1c09484198dbea759f597308d7c546c3b282441f9e53e9bc69b15030c80694f' + 'fa3f0bbaeed5ad5a9a55cea1e18c68364588156f8181afe7eed4278adb87416a' + 'dc319c34eab5dcb0aaa226439fa9c9958c791aed2228d8711af71c9559654c95' + '40a306f53d80f2086652eb6f89675587fb91f807824a2a830f28dbd744081b68' + '5edf62f1a5058b116804d1d9a794d2773573c918d9f0bf5d8697554378c39979' + '273df9944f409f39d64401f4f69360a434d09e382bf4d86892861e2fa86b2fb6' + 'aa818920ce83da07cd1108815172984b883af39486e017be5fc3b7d08f5dd155' + '190056e7b1258e6ad8e04ebfcda863d6dc9e52449a874fa86629d0b3650d09c6' + 'ead7b75338b7ca9fbe76f00d861bfb6a7eed0269b6d514565564e82873cf29ef' + '40891b0fb8e73d197a5be3483009dae171f4014c6fff0b6d38260ec749868430' + '077e86394f2297498d0bb0e31ca182378eaaf6ec4699fe0825825714a169e486' + '16537dc7c2541e6630d3940fb1621a2fddac23c635432c100417b9cc017c1744' + '9ab5e7b9779c37d97d3fb8721d075ca7218e91d7f33614e2a6fc543cb2fccebe' + '8fffbcae11339fed8bc5db8461bf33d1a21731472307095d86ce89bb70efae39' + 'fb20135c52b2d31099413e4093aa0176eac5bb8f4aadae44da9953abf99f4808' + '60203aad4248ebca91082b2ab026255adfb91b3e97ae91517c987038463ab5b5' + '27667a57d9d92c9845d75336e7edb181b3259da5c35503ef4b318e6933662568' + '7c85cbde9d63d48f30411f8586f13e7193445fb7e23cd2a4e526a00f4036153d' + '6fcb445cfb69bf303cbf218540090cb5bfcb3912ed34c9da379e2c8ddd62d02a' + '67adb386399de2a6e1ba037b43bccc03525c34af0d2a108e062f33ee834d592b' + '4be9c3edd0c4ede5e987e7a0ecd9c0c5d9268f9e0a0218c48246c1c7b14bc92e' + '9bd54319dee4744f96dcd2af76293772a4c70c28fed217c704209f69d070647a' + 'c6bf66856da49ea29d8e3a6abb8a998a4281ecbf012e205f6d950dc50b417507' + '3db41a2f58ea08abfa56269c3385c4c88c28e7f5f3d8705cea1e23f2882ec84e' + 'd6146f24a1318b7a110d3670b425c44288cfb70ea9289eed991ca887afef8bd3' + '70ea4ad3da593ffe72365fdfeada65e93d1d4abb738513ecebd463a79ee5ddf7' + '83d522bd0cfd1b428f77d3ba9e3e96372c41c30ee6355630697cb97e17016cd5' + '026719b4a09d296a4fc6bfb46137674f10915cb331c38a2914344d549fdc9277' + '1e29a61bd6af94ede2f02aa9cd30f827b5323b13d47350d3d799b9af9acc49c5' + 'b5a9ed1d214ab2e60c7e8db29dedcf8a19a9aad3f333016478368fd8edd34f29' + '8006557662ded0093128676c00d79e77a91d383634a88d3fefeadaf9442001d2' + 'f0e2052e660c25997c096e4364d1c6f257d7f2dbd2631f18505d0a009535e92b' + '8ede2976cabf1f5bb0892b5682db4992c0551f44adc547261a4553b53169ed2c' + 'c1544e7891eade882aeeaa4086255b31a9026891d87868705f3713755c084eba' + 'ec48b3816cc73080859c2252f1ce6a6a9f15890b15e133d07a69191f7d68da33' + 'a300004ba6b22874997c93cbf6e1f9e8eb1b6b286c464bfac4d02f4974d1a5dd' + '7cd30e9a8877c03ddcbc306c444e3080b6f6fc1b4f8e037c0d9f61a322b77264' + '8a4b437f2d077a184743c2c628d92ac2d87cae3b16aaae73c0a5ca1aa5ecdaff' + 'c81ce6b1924df5cee69d02694abbf198e8050d803e5d009df16d557cb3607414' + '9bd3388aacac702ff3f73fb6d076ac91e5a4775e9317ac4d683100f38b9db62e' + '04318674b0493d8f844bd1792209615e661ad702f3aacb10f2210458c99e1cfd' + 'e77aab9e9bf6c070c9c51b85d20d2ab35e227fd9d214a928c70ea1bbc3a5c1d9' + 'b89e281b8ed5e036ed76b8fe1dc4cca27bc53181c1acb844a546fe33a862d782' + 'df7751b5e4d4973f6610dcf4b069395e0cc91c5f23842c54deb9ae31cf1220c9' + 'c190aad285352d3084052b1dee2dfc5637b4d3c2b9826cea0be59f92a23eda05' + 'ee691f942441376b359abe8ee42cf5c915a51c69b8b73a0a504dd978bdbb519e')