Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

python: Update to 3.9.10

Browse Source
This commit is contained in:
Christoph Reiter
2022-01-25 08:17:05 +01:00
parent 464c4dcf5e
commit 602ce8fa2f
129 changed files with 896 additions and 628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mingw-w64-python/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch
View File

@@ -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 <mingw.android@gmail.com>
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

18
mingw-w64-python/0002-restore-setup-config.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

34
mingw-w64-python/0003-build-add-with-nt-threads-and-make-it-default-on-min.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
Date: Thu, 17 Jun 2021 18:51:12 +0530
@@ -78,10 +78,10 @@ index fe78135..344b76e 100644
# include <fcntl.h> /* 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.h>]], [[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 <math.h>]])
@@ -4625,6 +4710,10 @@ AC_CHECK_DECLS([isinf, isnan, isfinite], [], [], [[#include <math.h>]])
# 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 <unistd.h>
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

4
mingw-w64-python/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

6
mingw-w64-python/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
Date: Thu, 17 Jun 2021 18:51:14 +0530
@@ -13,7 +13,7 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
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

8
mingw-w64-python/0006-MINGW-preset-configure-defaults.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

8
mingw-w64-python/0007-MINGW-configure-largefile-support-for-windows-builds.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
Date: Thu, 17 Jun 2021 18:51:16 +0530
@@ -14,10 +14,10 @@ Co-authored-by: Christoph Reiter <reiter.christoph@gmail.com>
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

8
mingw-w64-python/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
Date: Thu, 17 Jun 2021 18:51:18 +0530
@@ -13,10 +13,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
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

8
mingw-w64-python/0009-MINGW-init-system-calls.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

8
mingw-w64-python/0010-MINGW-build-in-windows-modules-winreg.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

8
mingw-w64-python/0011-MINGW-determine-if-pwdmodule-should-be-used.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

12
mingw-w64-python/0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

14
mingw-w64-python/0013-MINGW-configure-for-shared-build.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
Date: Thu, 17 Jun 2021 18:51:24 +0530
@@ -13,10 +13,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
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

16
mingw-w64-python/0014-MINGW-dynamic-loading-support.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
Date: Thu, 17 Jun 2021 18:51:25 +0530
@@ -15,10 +15,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
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

12
mingw-w64-python/0015-MINGW-ignore-main-program-for-frozen-scripts.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
Date: Thu, 17 Jun 2021 18:51:26 +0530
@@ -14,10 +14,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
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

8
mingw-w64-python/0016-MINGW-setup-_multiprocessing-module.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
Date: Thu, 17 Jun 2021 18:51:26 +0530
@@ -13,10 +13,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
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

8
mingw-w64-python/0017-MINGW-setup-select-module.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

10
mingw-w64-python/0018-MINGW-setup-_ctypes-module-with-system-libffi.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
Date: Thu, 17 Jun 2021 18:51:30 +0530
@@ -14,10 +14,10 @@ Co-authored-by: Christoph Reiter <reiter.christoph@gmail.com>
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

28
mingw-w64-python/0019-MINGW-defect-winsock2-and-setup-_socket-module.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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 <versionhelpers.h>
@@ -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 <sys/types.h>
#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 <sys/types.h> does not define. */
#undef size_t
@@ -150,10 +150,10 @@ index 5f63cae..b69a7c7 100644
/* Define to `int' if <sys/types.h> 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

14
mingw-w64-python/0020-MINGW-exclude-unix-only-modules.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
Date: Thu, 17 Jun 2021 18:51:31 +0530
@@ -13,10 +13,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
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

8
mingw-w64-python/0021-MINGW-setup-msvcrt-and-_winapi-modules.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

4
mingw-w64-python/0022-sysconfig-MINGW-build-extensions-with-GCC.patch
View File

@@ -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 <reiter.christoph@gmail.com>
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

8
mingw-w64-python/0023-MINGW-setup-_ssl-module.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
Date: Thu, 17 Jun 2021 18:51:37 +0530
@@ -13,10 +13,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
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

4
mingw-w64-python/0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

4
mingw-w64-python/0025-MINGW-support-stdcall-without-underscore.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

8
mingw-w64-python/0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
Date: Thu, 17 Jun 2021 18:51:40 +0530
@@ -14,10 +14,10 @@ Co-authored-by: Christoph Reiter <reiter.christoph@gmail.com>
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

4
mingw-w64-python/0027-MINGW-customize-site.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

4
mingw-w64-python/0028-add-python-config-sh.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

16
mingw-w64-python/0029-cross-darwin-feature.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
Date: Thu, 17 Jun 2021 18:51:44 +0530
@@ -13,7 +13,7 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
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

8
mingw-w64-python/0030-mingw-system-libffi.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
Date: Thu, 17 Jun 2021 18:51:45 +0530
@@ -13,10 +13,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
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

12
mingw-w64-python/0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch
View File

@@ -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 <mingw.android@gmail.com>
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

12
mingw-w64-python/0032-mingw-use-posix-getpath.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

6
mingw-w64-python/0033-mingw-add-ModuleFileName-dir-to-PATH.patch
View File

@@ -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 <mingw.android@gmail.com>
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 <reiter.christoph@gmail.com>
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

4
mingw-w64-python/0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

10
mingw-w64-python/0035-msys-cygwin-semi-native-build-sysconfig.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

4
mingw-w64-python/0036-sysconfig-mingw-sysconfig-like-posix.patch
View File

@@ -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 <reiter.christoph@gmail.com>
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

8
mingw-w64-python/0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch
View File

@@ -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 <reiter.christoph@gmail.com>
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

8
mingw-w64-python/0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
Date: Thu, 17 Jun 2021 18:51:52 +0530
@@ -13,10 +13,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
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

6
mingw-w64-python/0039-mingw-use-backslashes-in-compileall-py.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
Date: Thu, 17 Jun 2021 18:51:53 +0530
@@ -13,7 +13,7 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
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

10
mingw-w64-python/0040-msys-convert_path-fix-and-root-hack.patch
View File

@@ -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 <reiter.christoph@gmail.com>
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

14
mingw-w64-python/0041-allow-static-tcltk.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
Date: Thu, 17 Jun 2021 18:51:54 +0530
@@ -13,10 +13,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
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

4
mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
Date: Thu, 17 Jun 2021 18:51:55 +0530
@@ -31,5 +31,5 @@ index b70252d..0d5cee2 100644
/* configure was checking <curses.h>, but we will
use <ncurses.h>, which has some or all these features. */
--
2.34.0
2.34.1

4
mingw-w64-python/0043-grammar-fixes.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

10
mingw-w64-python/0044-builddir-fixes.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
Date: Thu, 17 Jun 2021 18:51:57 +0530
@@ -15,10 +15,10 @@ Co-authored-by: Christoph Reiter <reiter.christoph@gmail.com>
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

6
mingw-w64-python/0045-msys-monkeypatch-os-system-via-sh-exe.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
Date: Thu, 17 Jun 2021 18:51:57 +0530
@@ -13,7 +13,7 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
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

22
mingw-w64-python/0046-msys-replace-slashes-used-in-io-redirection.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
Date: Thu, 17 Jun 2021 18:51:58 +0530
@@ -14,19 +14,19 @@ Co-authored-by: Christoph Reiter <reiter.christoph@gmail.com>
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 - </dev/null 2>%s 1>/dev/null' % (cc, tmpfile))
@@ -1004,7 +1004,7 @@ class PyBuildExt(build_ext):
ret = run_command('%s -E -v - </dev/null 2>%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

4
mingw-w64-python/0047-remove_path_max.default.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
Date: Thu, 17 Jun 2021 18:51:59 +0530
@@ -25,5 +25,5 @@ index 3243944..99d4977 100644
#endif
--
2.34.0
2.34.1

8
mingw-w64-python/0048-dont-link-with-gettext.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
Date: Thu, 17 Jun 2021 18:52:00 +0530
@@ -32,10 +32,10 @@ index 2e353bb..ea222af 100644
#include <stdio.h>
#include <locale.h>
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

4
mingw-w64-python/0049-ctypes-python-dll.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

6
mingw-w64-python/0050-gdbm-module-includes.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
Date: Thu, 17 Jun 2021 18:52:02 +0530
@@ -13,7 +13,7 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
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

4
mingw-w64-python/0051-use-gnu_printf-in-format.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

4
mingw-w64-python/0052-mingw-fix-ssl-dont-use-enum_certificates.patch
View File

@@ -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 <mingw.android@gmail.com>
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

8
mingw-w64-python/0053-fix-using-dllhandle-and-winver-mingw.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
Date: Thu, 17 Jun 2021 18:52:06 +0530
@@ -13,7 +13,7 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
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

4
mingw-w64-python/0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

8
mingw-w64-python/0055-MINGW-link-with-additional-library.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

8
mingw-w64-python/0056-install-msilib.patch
View File

@@ -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?= <s@saghul.net>
Date: Thu, 17 Jun 2021 18:52:09 +0530
Subject: [PATCH 056/N] install msilib
@@ -14,10 +14,10 @@ Co-authored-by: Ray Donnelly <mingw.android@gmail.com>
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

4
mingw-w64-python/0057-fix-signal-module-build.patch
View File

@@ -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 <reiter.christoph@gmail.com>
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

8
mingw-w64-python/0058-build-build-winconsoleio-and-_testconsole.patch
View File

@@ -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 <reiter.christoph@gmail.com>
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

4
mingw-w64-python/0059-expose-sem_unlink.patch
View File

@@ -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 <reiter.christoph@gmail.com>
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

26
mingw-w64-python/0060-cygpty-isatty.patch
View File

@@ -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 <reiter.christoph@gmail.com>
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 <stdio.h> /* 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 <locale.h>
@@ -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

8
mingw-w64-python/0061-disable-broken-gdbm-module.patch
View File

@@ -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 <reiter.christoph@gmail.com>
Date: Thu, 17 Jun 2021 18:52:15 +0530
Subject: [PATCH 061/N] disable broken gdbm module
@@ -12,10 +12,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
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

24
mingw-w64-python/0062-build-link-win-resource-files-and-build-pythonw.patch
View File

@@ -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 <reiter.christoph@gmail.com>
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: Алексей <alexey.pawlow@gmail.com>
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

8
mingw-w64-python/0063-3.7-mpdec-mingw.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

8
mingw-w64-python/0064-disable-readline.patch
View File

@@ -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 <reiter.christoph@gmail.com>
Date: Thu, 17 Jun 2021 18:52:17 +0530
Subject: [PATCH 064/N] disable readline
@@ -12,10 +12,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
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

4
mingw-w64-python/0065-fix-isselectable.patch
View File

@@ -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 <reiter.christoph@gmail.com>
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

6
mingw-w64-python/0066-use-_wcsnicmp-instead-wcsncasecmp.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

4
mingw-w64-python/0067-_xxsubinterpretersmodule.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

8
mingw-w64-python/0068-sqlite3-module-defines.patch
View File

@@ -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 <reiter.christoph@gmail.com>
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

8
mingw-w64-python/0069-configure.ac-fix-inet_pton-check.patch
View File

@@ -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 <reiter.christoph@gmail.com>
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: Алексей <alexey.pawlow@gmail.com>
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

4
mingw-w64-python/0070-set-venv-activate-path-unix.patch
View File

@@ -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 <dan@yeaw.me>
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

21
mingw-w64-python/0071-venv-creation-fixes.patch
View File

@@ -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 <reiter.christoph@gmail.com>
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

8
mingw-w64-python/0072-pass-gen-profile-ldflags.patch
View File

@@ -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 <reiter.christoph@gmail.com>
Date: Thu, 17 Jun 2021 18:52:27 +0530
Subject: [PATCH 072/N] pass gen profile ldflags
@@ -12,10 +12,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
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

8
mingw-w64-python/0073-pkg-config-windows-must-link-ext-with-python-lib.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

4
mingw-w64-python/0074-importlib-bootstrap-path-sep.patch
View File

@@ -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 <reiter.christoph@gmail.com>
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

4
mingw-w64-python/0075-pathlib-path-sep.patch
View File

@@ -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 <reiter.christoph@gmail.com>
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

22
mingw-w64-python/0076-warnings-fixes.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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 <winuser.h>
@@ -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 <winuser.h>
@@ -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

8
mingw-w64-python/0077-fix-build-testinternalcapi.patch
View File

@@ -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 <reiter.christoph@gmail.com>
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

6
mingw-w64-python/0078-extend-MS_WINDOWS-flag.patch
View File

@@ -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 <nguyen.long.908132@gmail.com>
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

4
mingw-w64-python/0079-clang-arm64.patch
View File

@@ -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

8
mingw-w64-python/0080-configure.ac-set-MINGW-stack-reserve.patch
View File

@@ -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

4
mingw-w64-python/0081-Don-t-use-os.pathsep-to-find-EOF.patch
View File

@@ -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 <naveen@syrusdark.website>
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

22
mingw-w64-python/0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch
View File

@@ -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 <naveen521kk@gmail.com>
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 <naveen521kk@gmail.com>
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.<SOABI>.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

4
mingw-w64-python/0083-Change-the-get_platform-method-in-sysconfig.patch
View File

@@ -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 <reiter.christoph@gmail.com>
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

4
mingw-w64-python/0084-distutils-compiler-customize-mingw-cygwin-compilers.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

8
mingw-w64-python/0085-distutils-compiler-enable-new-dtags.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
Date: Thu, 17 Jun 2021 18:51:22 +0530
@@ -13,10 +13,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
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

4
mingw-w64-python/0086-distutils-MINGW-build-extensions-with-GCC.patch
View File

@@ -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 <reiter.christoph@gmail.com>
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

6
mingw-w64-python/0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
Date: Thu, 17 Jun 2021 18:51:35 +0530
@@ -15,7 +15,7 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
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

4
mingw-w64-python/0088-distutils-find-import-library.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

4
mingw-w64-python/0089-distutils-avoid-circular-dependency-from-time-module.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

4
mingw-w64-python/0090-distutils-generalization-of-posix-build-in-distutils.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

4
mingw-w64-python/0091-distutils-mingw-sysconfig-like-posix.patch
View File

@@ -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 <reiter.christoph@gmail.com>
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

4
mingw-w64-python/0092-distutils-get_versions-fixes.patch
View File

@@ -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 <reiter.christoph@gmail.com>
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

4
mingw-w64-python/0093-distutils-install-layout-as-posix.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
Date: Thu, 17 Jun 2021 18:51:59 +0530
@@ -43,5 +43,5 @@ index aaa300e..c611252 100644
}
--
2.34.0
2.34.1

4
mingw-w64-python/0094-distutils-msys-convert_path-fix-and-root-hack.patch
View File

@@ -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 <reiter.christoph@gmail.com>
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

4
mingw-w64-python/0095-distutils-mingw-build-optimized-ext.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

4
mingw-w64-python/0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch
View File

@@ -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 <mingw.android@gmail.com>
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

4
mingw-w64-python/0097-distutils-get-compilers-from-env-vars.patch
View File

@@ -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 <nguyen.long.908132@gmail.com>
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

4
mingw-w64-python/0098-distutils-add-windmc-to-cygwinccompiler.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

6
mingw-w64-python/0099-distutils-fix-msvc9-import.patch
View File

@@ -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 <reiter.christoph@gmail.com>
Date: Thu, 17 Jun 2021 18:52:24 +0530
Subject: [PATCH 099/N] distutils: fix msvc9 import
@@ -12,7 +12,7 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
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

4
mingw-w64-python/0100-distutils-mingw-add-LIBPL-to-library-dirs.patch
View File

@@ -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?=
<alexey.pawlow@gmail.com>
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

Some files were not shown because too many files have changed in this diff Show More