From a391fdb04e8c78e1a8af8253e1bd97fdd3388fce Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 11 Oct 2014 14:46:25 +0100 Subject: [PATCH] python3: Rebase patches onto 3.4.2 --- ...0-make-_sysconfigdata.py-relocatable.patch | 5 +- .../0100-MINGW-BASE-use-NT-thread-model.patch | 34 +-- ...gcc-internal-defines-to-python-platf.patch | 6 +- ...igure-MACHDEP-and-platform-for-build.patch | 16 +- ...0140-MINGW-preset-configure-defaults.patch | 20 +- ...largefile-support-for-windows-builds.patch | 10 +- ...GW-add-wincrypt.h-in-Python-random.c.patch | 6 +- ...0170-MINGW-add-srcdir-PC-to-CPPFLAGS.patch | 8 +- .../0180-MINGW-init-system-calls.patch | 26 +-- ...190-MINGW-detect-REPARSE_DATA_BUFFER.patch | 20 +- ...INGW-build-in-windows-modules-winreg.patch | 24 +-- ...etermine-if-pwdmodule-should-be-used.patch | 20 +- ...s.path-calculations-for-windows-plat.patch | 26 +-- ...-AC_LIBOBJ-replacement-of-fileblocks.patch | 6 +- ...40-MINGW-use-main-to-start-execution.patch | 6 +- ...ler-customize-mingw-cygwin-compilers.patch | 10 +- ...0260-MINGW-compiler-enable-new-dtags.patch | 6 +- ...ssue13756-Python-make-fail-on-cygwin.patch | 14 +- ...urrent-dir-in-library-path-if-buildi.patch | 8 +- ...-Mingw-recognition-to-pyport.h-to-al.patch | 14 +- ...300-MINGW-configure-for-shared-build.patch | 14 +- .../0310-MINGW-dynamic-loading-support.patch | 26 +-- .../0320-MINGW-implement-exec-prefix.patch | 6 +- ...nore-main-program-for-frozen-scripts.patch | 16 +- ...0-MINGW-setup-exclude-termios-module.patch | 8 +- ...-MINGW-setup-_multiprocessing-module.patch | 10 +- .../0360-MINGW-setup-select-module.patch | 14 +- ...up-_ctypes-module-with-system-libffi.patch | 16 +- ...ct-winsock2-and-setup-_socket-module.patch | 36 ++-- ...0390-MINGW-exclude-unix-only-modules.patch | 12 +- ...NGW-setup-msvcrt-and-_winapi-modules.patch | 20 +- ...0410-MINGW-build-extensions-with-GCC.patch | 24 +-- ...2CCompiler-as-default-compiler-for-m.patch | 12 +- .../0430-MINGW-find-import-library.patch | 6 +- .../0440-MINGW-setup-_ssl-module.patch | 8 +- ...Node_SizeOf-as-PyAPI-for-parser-modu.patch | 6 +- ...ation-of-posix-build-in-sysconfig.py.patch | 12 +- ...W-support-stdcall-without-underscore.patch | 8 +- ...ead-rename-to-avoid-failure-on-windo.patch | 8 +- ...ular-dependency-from-time-module-dur.patch | 6 +- ...tion-of-posix-build-in-distutils-sys.patch | 14 +- .../0490-MINGW-customize-site.patch | 6 +- .../0500-add-python-config-sh.patch | 6 +- .../0510-cross-darwin-feature.patch | 24 +-- ...520-py3k-mingw-ntthreads-vs-pthreads.patch | 24 +-- .../0530-mingw-system-libffi.patch | 58 +++--- .../0540-mingw-semicolon-DELIM.patch | 36 ++-- .../0550-mingw-regen-use-stddef_h.patch | 14 +- .../0560-mingw-use-posix-getpath.patch | 32 +-- ...mingw-add-ModuleFileName-dir-to-PATH.patch | 6 +- ...dd-BUILDIN_WIN32_MODULEs-time-msvcrt.patch | 6 +- ...580-mingw32-test-REPARSE_DATA_BUFFER.patch | 8 +- ...mingw-INSTALL_SHARED-LDLIBRARY-LIBPL.patch | 8 +- ...sys-mingw-prefer-unix-sep-if-MSYSTEM.patch | 18 +- ...s-cygwin-semi-native-build-sysconfig.patch | 26 +-- .../0620-mingw-sysconfig-like-posix.patch | 16 +- ...builtin_for_Popen_in_cygwinccompiler.patch | 20 +- ...x86_64-size_t-format-specifier-pid_t.patch | 6 +- ...d-multiarch-paths-if-cross-compiling.patch | 8 +- ...ngw-use-backslashes-in-compileall-py.patch | 6 +- ...-msys-convert_path-fix-and-root-hack.patch | 26 +-- .../0690-allow-static-tcltk.patch | 14 +- ...OSS-avoid-ncursesw-include-path-hack.patch | 8 +- ...etect-WINDOW-_flags-for-different-nc.patch | 20 +- .../0720-mingw-pdcurses_ISPAD.patch | 6 +- .../0730-mingw-fix-ncurses-module.patch | 6 +- mingw-w64-python3/0740-grammar-fixes.patch | 12 +- mingw-w64-python3/0750-builddir-fixes.patch | 10 +- ...sys-monkeypatch-os-system-via-sh-exe.patch | 8 +- ...place-slashes-used-in-io-redirection.patch | 18 +- ...ingw-add-_exec_prefix-for-tcltk-dlls.patch | 6 +- .../0800-mingw-install-layout-as-posix.patch | 10 +- .../0810-remove_path_max.default.patch | 18 +- .../0820-dont-link-with-gettext.patch | 14 +- .../0830-ctypes-python-dll.patch | 6 +- .../0840-gdbm-module-includes.patch | 6 +- .../0850-use-gnu_printf-in-format.patch | 24 +-- .../0860-fix-_Py_CheckPython3-prototype.patch | 6 +- ...w-fix-ssl-dont-use-enum_certificates.patch | 6 +- .../0890-mingw-build-optimized-ext.patch | 7 +- ...mpiler-dont-strip-modules-if-pydebug.patch | 5 +- ...fix-using-dllhandle-and-winver-mingw.patch | 5 +- .../1000-fix-building-posixmodule.patch | 6 +- mingw-w64-python3/1010-install-msilib.patch | 8 +- mingw-w64-python3/PKGBUILD | 197 +++++++++--------- 85 files changed, 676 insertions(+), 671 deletions(-) diff --git a/mingw-w64-python3/0000-make-_sysconfigdata.py-relocatable.patch b/mingw-w64-python3/0000-make-_sysconfigdata.py-relocatable.patch index 06977b7124..9d38d5316d 100644 --- a/mingw-w64-python3/0000-make-_sysconfigdata.py-relocatable.patch +++ b/mingw-w64-python3/0000-make-_sysconfigdata.py-relocatable.patch @@ -1,5 +1,6 @@ ---- Python-3.4.1/Lib/sysconfig.py.orig 2014-07-11 17:44:46.227699804 +0100 -+++ Python-3.4.1/Lib/sysconfig.py 2014-07-11 19:09:01.000000000 +0100 +diff -urN a/Lib/sysconfig.py b/Lib/sysconfig.py +--- a/Lib/sysconfig.py 2014-10-08 09:18:12.000000000 +0100 ++++ b/Lib/sysconfig.py 2014-10-11 14:18:33.073762000 +0100 @@ -264,6 +264,7 @@ # if the expansion uses the name without a prefix. renamed_variables = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS') diff --git a/mingw-w64-python3/0100-MINGW-BASE-use-NT-thread-model.patch b/mingw-w64-python3/0100-MINGW-BASE-use-NT-thread-model.patch index 7dbdf6e6ac..20c01040d3 100644 --- a/mingw-w64-python3/0100-MINGW-BASE-use-NT-thread-model.patch +++ b/mingw-w64-python3/0100-MINGW-BASE-use-NT-thread-model.patch @@ -1,7 +1,7 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2014-05-19 09:19:40.000000000 +0400 -+++ b/configure.ac 2014-05-20 00:54:15.565600000 +0400 -@@ -1378,6 +1378,37 @@ +diff -urN a/configure.ac b/configure.ac +--- a/configure.ac 2014-10-11 14:18:34.945869100 +0100 ++++ b/configure.ac 2014-10-11 14:18:36.988985900 +0100 +@@ -1388,6 +1388,37 @@ BASECFLAGS="$BASECFLAGS $ac_arch_flags" fi @@ -39,7 +39,7 @@ diff -Naur a/configure.ac b/configure.ac # 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). -@@ -1405,6 +1436,7 @@ +@@ -1415,6 +1446,7 @@ ],[ac_cv_pthread_is_default=no],[ac_cv_pthread_is_default=no]) ]) AC_MSG_RESULT($ac_cv_pthread_is_default) @@ -47,7 +47,7 @@ diff -Naur a/configure.ac b/configure.ac if test $ac_cv_pthread_is_default = yes -@@ -1496,6 +1528,9 @@ +@@ -1506,6 +1538,9 @@ AC_MSG_RESULT($ac_cv_pthread) fi @@ -57,7 +57,7 @@ diff -Naur a/configure.ac b/configure.ac # If we have set a CC compiler flag for thread support then # check if it works for CXX, too. ac_cv_cxx_thread=no -@@ -1516,6 +1551,10 @@ +@@ -1526,6 +1561,10 @@ then CXX="$CXX -pthread" ac_cv_cxx_thread=yes @@ -68,7 +68,7 @@ diff -Naur a/configure.ac b/configure.ac fi if test $ac_cv_cxx_thread = yes -@@ -1545,6 +1584,11 @@ +@@ -1555,6 +1594,11 @@ dnl AC_MSG_RESULT($cpp_type) # checks for header files @@ -80,7 +80,7 @@ diff -Naur a/configure.ac b/configure.ac AC_HEADER_STDC AC_CHECK_HEADERS(asm/types.h conio.h direct.h dlfcn.h errno.h \ fcntl.h grp.h \ -@@ -1814,9 +1858,14 @@ +@@ -1824,9 +1868,14 @@ AC_MSG_CHECKING(for pthread_t) have_pthread_t=no @@ -95,7 +95,7 @@ diff -Naur a/configure.ac b/configure.ac AC_MSG_RESULT($have_pthread_t) if test "$have_pthread_t" = yes ; then AC_CHECK_SIZEOF(pthread_t, [], [ -@@ -2223,11 +2272,16 @@ +@@ -2240,11 +2289,16 @@ AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX # only check for sem_init if thread support is requested @@ -112,7 +112,7 @@ diff -Naur a/configure.ac b/configure.ac # check if we need libintl for locale functions AC_CHECK_LIB(intl, textdomain, -@@ -2496,6 +2550,13 @@ +@@ -2513,6 +2567,13 @@ AC_DEFINE(WITH_THREAD) posix_threads=yes THREADOBJ="Python/thread.o" @@ -126,7 +126,7 @@ diff -Naur a/configure.ac b/configure.ac else if test ! -z "$with_threads" -a -d "$with_threads" then LDFLAGS="$LDFLAGS -L$with_threads" -@@ -2915,6 +2976,15 @@ +@@ -2932,6 +2993,15 @@ fi # checks for library functions @@ -142,7 +142,7 @@ diff -Naur a/configure.ac b/configure.ac AC_CHECK_FUNCS(alarm accept4 setitimer getitimer bind_textdomain_codeset chown \ clock confstr ctermid dup3 execv faccessat fchmod fchmodat fchown fchownat \ fexecve fdopendir fork fpathconf fstatat ftime ftruncate futimesat \ -@@ -3903,6 +3973,10 @@ +@@ -3920,6 +3990,10 @@ # 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. @@ -153,7 +153,7 @@ diff -Naur a/configure.ac b/configure.ac AC_MSG_CHECKING(whether POSIX semaphores are enabled) AC_CACHE_VAL(ac_cv_posix_semaphores_enabled, AC_RUN_IFELSE([AC_LANG_SOURCE([[ -@@ -3936,6 +4010,14 @@ +@@ -3953,6 +4027,14 @@ # Multiprocessing check for broken sem_getvalue AC_MSG_CHECKING(for broken sem_getvalue) @@ -168,9 +168,9 @@ diff -Naur a/configure.ac b/configure.ac AC_CACHE_VAL(ac_cv_broken_sem_getvalue, AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include -diff -Naur a/pyconfig.h.in b/pyconfig.h.in ---- a/pyconfig.h.in 2014-05-19 09:19:40.000000000 +0400 -+++ b/pyconfig.h.in 2014-05-20 00:54:15.565600000 +0400 +diff -urN a/pyconfig.h.in b/pyconfig.h.in +--- a/pyconfig.h.in 2014-10-11 14:18:35.020873400 +0100 ++++ b/pyconfig.h.in 2014-10-11 14:18:36.991986100 +0100 @@ -1166,6 +1166,9 @@ /* Define if mvwdelch in curses.h is an expression. */ #undef MVWDELCH_IS_EXPRESSION diff --git a/mingw-w64-python3/0110-MINGW-translate-gcc-internal-defines-to-python-platf.patch b/mingw-w64-python3/0110-MINGW-translate-gcc-internal-defines-to-python-platf.patch index 972b017bcb..4dd5cb9210 100644 --- a/mingw-w64-python3/0110-MINGW-translate-gcc-internal-defines-to-python-platf.patch +++ b/mingw-w64-python3/0110-MINGW-translate-gcc-internal-defines-to-python-platf.patch @@ -1,6 +1,6 @@ -diff -Naur a/Include/pyport.h b/Include/pyport.h ---- a/Include/pyport.h 2014-05-19 09:19:37.000000000 +0400 -+++ b/Include/pyport.h 2014-05-20 00:54:18.888400000 +0400 +diff -urN a/Include/pyport.h b/Include/pyport.h +--- a/Include/pyport.h 2014-10-11 14:18:38.798089400 +0100 ++++ b/Include/pyport.h 2014-10-11 14:18:40.574191000 +0100 @@ -13,6 +13,21 @@ #include #endif diff --git a/mingw-w64-python3/0130-MINGW-configure-MACHDEP-and-platform-for-build.patch b/mingw-w64-python3/0130-MINGW-configure-MACHDEP-and-platform-for-build.patch index 01263d803b..fdfdcd64d6 100644 --- a/mingw-w64-python3/0130-MINGW-configure-MACHDEP-and-platform-for-build.patch +++ b/mingw-w64-python3/0130-MINGW-configure-MACHDEP-and-platform-for-build.patch @@ -1,7 +1,7 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2014-05-20 00:54:18.654400000 +0400 -+++ b/configure.ac 2014-05-20 00:54:21.790000000 +0400 -@@ -356,6 +356,17 @@ +diff -urN a/configure.ac b/configure.ac +--- a/configure.ac 2014-10-11 14:18:41.747258100 +0100 ++++ b/configure.ac 2014-10-11 14:18:44.328405700 +0100 +@@ -359,6 +359,17 @@ # Set name for machine-dependent library files AC_ARG_VAR([MACHDEP], [name for machine-dependent library files]) AC_MSG_CHECKING(MACHDEP) @@ -19,7 +19,7 @@ diff -Naur a/configure.ac b/configure.ac if test -z "$MACHDEP" then # avoid using uname for cross builds -@@ -415,12 +426,23 @@ +@@ -418,12 +429,23 @@ *-*-cygwin*) _host_cpu= ;; @@ -43,9 +43,9 @@ diff -Naur a/configure.ac b/configure.ac fi # Some systems cannot stand _XOPEN_SOURCE being defined at all; they -diff -Naur a/Python/getplatform.c b/Python/getplatform.c ---- a/Python/getplatform.c 2014-05-19 09:19:40.000000000 +0400 -+++ b/Python/getplatform.c 2014-05-20 00:54:21.836800000 +0400 +diff -urN a/Python/getplatform.c b/Python/getplatform.c +--- a/Python/getplatform.c 2014-10-11 14:18:41.761258900 +0100 ++++ b/Python/getplatform.c 2014-10-11 14:18:44.330405800 +0100 @@ -1,6 +1,12 @@ #include "Python.h" diff --git a/mingw-w64-python3/0140-MINGW-preset-configure-defaults.patch b/mingw-w64-python3/0140-MINGW-preset-configure-defaults.patch index fbff02e306..62d09d9dcf 100644 --- a/mingw-w64-python3/0140-MINGW-preset-configure-defaults.patch +++ b/mingw-w64-python3/0140-MINGW-preset-configure-defaults.patch @@ -1,7 +1,7 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2014-05-20 00:54:24.395200000 +0400 -+++ b/configure.ac 2014-05-20 00:54:24.582400000 +0400 -@@ -810,6 +810,27 @@ +diff -urN a/configure.ac b/configure.ac +--- a/configure.ac 2014-10-11 14:18:45.441469400 +0100 ++++ b/configure.ac 2014-10-11 14:18:48.045618300 +0100 +@@ -813,6 +813,27 @@ MULTIARCH=$($CC --print-multiarch 2>/dev/null) AC_SUBST(MULTIARCH) @@ -29,9 +29,9 @@ diff -Naur a/configure.ac b/configure.ac AC_SUBST(LIBRARY) AC_MSG_CHECKING(LIBRARY) -diff -Naur a/Misc/config_mingw b/Misc/config_mingw ---- a/Misc/config_mingw 1970-01-01 03:00:00.000000000 +0300 -+++ b/Misc/config_mingw 2014-05-20 00:54:24.582400000 +0400 +diff -urN a/Misc/config_mingw b/Misc/config_mingw +--- a/Misc/config_mingw 1970-01-01 01:00:00.000000000 +0100 ++++ b/Misc/config_mingw 2014-10-11 14:18:48.047618400 +0100 @@ -0,0 +1,12 @@ +# configure defaults for mingw* hosts + @@ -45,9 +45,9 @@ diff -Naur a/Misc/config_mingw b/Misc/config_mingw +# files to ignore +ac_cv_file__dev_ptmx=ignore #NOTE: under MSYS environment device exist +ac_cv_file__dev_ptc=no -diff -Naur a/Misc/cross_mingw32 b/Misc/cross_mingw32 ---- a/Misc/cross_mingw32 1970-01-01 03:00:00.000000000 +0300 -+++ b/Misc/cross_mingw32 2014-05-20 00:54:24.582400000 +0400 +diff -urN a/Misc/cross_mingw32 b/Misc/cross_mingw32 +--- a/Misc/cross_mingw32 1970-01-01 01:00:00.000000000 +0100 ++++ b/Misc/cross_mingw32 2014-10-11 14:18:48.048618500 +0100 @@ -0,0 +1,11 @@ +# configure defaults for mingw32 host if cross-build + diff --git a/mingw-w64-python3/0150-MINGW-configure-largefile-support-for-windows-builds.patch b/mingw-w64-python3/0150-MINGW-configure-largefile-support-for-windows-builds.patch index e57a78335c..1444d8f8c4 100644 --- a/mingw-w64-python3/0150-MINGW-configure-largefile-support-for-windows-builds.patch +++ b/mingw-w64-python3/0150-MINGW-configure-largefile-support-for-windows-builds.patch @@ -1,7 +1,7 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2014-05-20 00:54:26.750800000 +0400 -+++ b/configure.ac 2014-05-20 00:54:27.078400000 +0400 -@@ -1863,10 +1863,22 @@ +diff -urN a/configure.ac b/configure.ac +--- a/configure.ac 2014-10-11 14:18:49.139680900 +0100 ++++ b/configure.ac 2014-10-11 14:18:51.927840400 +0100 +@@ -1873,10 +1873,22 @@ ]) AC_MSG_CHECKING(whether to enable large file support) @@ -24,7 +24,7 @@ diff -Naur a/configure.ac b/configure.ac AC_DEFINE(HAVE_LARGEFILE_SUPPORT, 1, [Defined to enable large file support when an off_t is bigger than a long and long long is available and at least as big as an off_t. You may need -@@ -1876,9 +1888,6 @@ +@@ -1886,9 +1898,6 @@ else AC_MSG_RESULT(no) fi diff --git a/mingw-w64-python3/0160-MINGW-add-wincrypt.h-in-Python-random.c.patch b/mingw-w64-python3/0160-MINGW-add-wincrypt.h-in-Python-random.c.patch index 14f3fdb533..b6678a0081 100644 --- a/mingw-w64-python3/0160-MINGW-add-wincrypt.h-in-Python-random.c.patch +++ b/mingw-w64-python3/0160-MINGW-add-wincrypt.h-in-Python-random.c.patch @@ -1,6 +1,6 @@ -diff -Naur a/Python/random.c b/Python/random.c ---- a/Python/random.c 2014-05-19 09:19:40.000000000 +0400 -+++ b/Python/random.c 2014-05-20 00:54:29.652400000 +0400 +diff -urN a/Python/random.c b/Python/random.c +--- a/Python/random.c 2014-10-11 14:18:53.000901800 +0100 ++++ b/Python/random.c 2014-10-11 14:18:55.599050400 +0100 @@ -1,6 +1,12 @@ #include "Python.h" #ifdef MS_WINDOWS diff --git a/mingw-w64-python3/0170-MINGW-add-srcdir-PC-to-CPPFLAGS.patch b/mingw-w64-python3/0170-MINGW-add-srcdir-PC-to-CPPFLAGS.patch index 822488308b..2ae8cc4f9d 100644 --- a/mingw-w64-python3/0170-MINGW-add-srcdir-PC-to-CPPFLAGS.patch +++ b/mingw-w64-python3/0170-MINGW-add-srcdir-PC-to-CPPFLAGS.patch @@ -1,7 +1,7 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2014-05-20 00:54:29.402800000 +0400 -+++ b/configure.ac 2014-05-20 00:54:32.382400000 +0400 -@@ -4821,6 +4821,16 @@ +diff -urN a/configure.ac b/configure.ac +--- a/configure.ac 2014-10-11 14:18:56.621108800 +0100 ++++ b/configure.ac 2014-10-11 14:18:59.296261800 +0100 +@@ -4838,6 +4838,16 @@ THREADHEADERS="$THREADHEADERS \$(srcdir)/$h" done diff --git a/mingw-w64-python3/0180-MINGW-init-system-calls.patch b/mingw-w64-python3/0180-MINGW-init-system-calls.patch index 6e5f35f4b6..2b26d60cfd 100644 --- a/mingw-w64-python3/0180-MINGW-init-system-calls.patch +++ b/mingw-w64-python3/0180-MINGW-init-system-calls.patch @@ -1,7 +1,7 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2014-05-20 00:54:34.582000000 +0400 -+++ b/configure.ac 2014-05-20 00:54:34.769200000 +0400 -@@ -575,6 +575,14 @@ +diff -urN a/configure.ac b/configure.ac +--- a/configure.ac 2014-10-11 14:19:00.396324700 +0100 ++++ b/configure.ac 2014-10-11 14:19:03.057477000 +0100 +@@ -578,6 +578,14 @@ fi AC_MSG_RESULT($MACHDEP) @@ -16,9 +16,9 @@ diff -Naur a/configure.ac b/configure.ac # Record the configure-time value of MACOSX_DEPLOYMENT_TARGET, # it may influence the way we can build extensions, so distutils # needs to check it -diff -Naur a/Modules/posixmodule.c b/Modules/posixmodule.c ---- a/Modules/posixmodule.c 2014-05-19 09:19:39.000000000 +0400 -+++ b/Modules/posixmodule.c 2014-05-20 00:54:34.784800000 +0400 +diff -urN a/Modules/posixmodule.c b/Modules/posixmodule.c +--- a/Modules/posixmodule.c 2014-10-11 14:19:00.992358800 +0100 ++++ b/Modules/posixmodule.c 2014-10-11 14:19:03.062477200 +0100 @@ -158,6 +158,25 @@ #define HAVE_CWAIT 1 #define HAVE_FSYNC 1 @@ -81,9 +81,9 @@ diff -Naur a/Modules/posixmodule.c b/Modules/posixmodule.c #define INITFUNC PyInit_nt #define MODNAME "nt" -diff -Naur a/Modules/Setup.config.in b/Modules/Setup.config.in ---- a/Modules/Setup.config.in 2014-05-19 09:19:39.000000000 +0400 -+++ b/Modules/Setup.config.in 2014-05-20 00:54:34.784800000 +0400 +diff -urN a/Modules/Setup.config.in b/Modules/Setup.config.in +--- a/Modules/Setup.config.in 2014-10-11 14:19:00.985358400 +0100 ++++ b/Modules/Setup.config.in 2014-10-11 14:19:03.064477400 +0100 @@ -3,6 +3,9 @@ # The purpose of this file is to conditionally enable certain modules # based on configure-time options. @@ -94,9 +94,9 @@ diff -Naur a/Modules/Setup.config.in b/Modules/Setup.config.in # Threading @USE_THREAD_MODULE@_thread _threadmodule.c -diff -Naur a/Modules/Setup.dist b/Modules/Setup.dist ---- a/Modules/Setup.dist 2014-05-19 09:19:39.000000000 +0400 -+++ b/Modules/Setup.dist 2014-05-20 00:54:34.784800000 +0400 +diff -urN a/Modules/Setup.dist b/Modules/Setup.dist +--- a/Modules/Setup.dist 2014-10-11 14:19:01.130366700 +0100 ++++ b/Modules/Setup.dist 2014-10-11 14:19:03.065477400 +0100 @@ -105,7 +105,6 @@ # This only contains the minimal set of modules required to run the # setup.py script in the root of the Python source tree. diff --git a/mingw-w64-python3/0190-MINGW-detect-REPARSE_DATA_BUFFER.patch b/mingw-w64-python3/0190-MINGW-detect-REPARSE_DATA_BUFFER.patch index 49c12fe976..6cb5efc1b3 100644 --- a/mingw-w64-python3/0190-MINGW-detect-REPARSE_DATA_BUFFER.patch +++ b/mingw-w64-python3/0190-MINGW-detect-REPARSE_DATA_BUFFER.patch @@ -1,7 +1,7 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2014-05-20 00:54:37.156000000 +0400 -+++ b/configure.ac 2014-05-20 00:54:37.390000000 +0400 -@@ -3585,6 +3585,27 @@ +diff -urN a/configure.ac b/configure.ac +--- a/configure.ac 2014-10-11 14:19:04.201542400 +0100 ++++ b/configure.ac 2014-10-11 14:19:06.918697800 +0100 +@@ -3602,6 +3602,27 @@ AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, [struct sockaddr_storage (sys/socket.h)]) fi @@ -29,9 +29,9 @@ diff -Naur a/configure.ac b/configure.ac # checks for compiler characteristics AC_C_CHAR_UNSIGNED -diff -Naur a/Modules/posixmodule.c b/Modules/posixmodule.c ---- a/Modules/posixmodule.c 2014-05-20 00:54:37.156000000 +0400 -+++ b/Modules/posixmodule.c 2014-05-20 00:54:37.405600000 +0400 +diff -urN a/Modules/posixmodule.c b/Modules/posixmodule.c +--- a/Modules/posixmodule.c 2014-10-11 14:19:04.768574800 +0100 ++++ b/Modules/posixmodule.c 2014-10-11 14:19:06.923698100 +0100 @@ -1132,6 +1132,15 @@ http://msdn.microsoft.com/en-us/library/ms791514.aspx as the required include doesn't seem to be present in the Windows SDK (at least as included @@ -60,9 +60,9 @@ diff -Naur a/Modules/posixmodule.c b/Modules/posixmodule.c static int win32_get_reparse_tag(HANDLE reparse_point_handle, ULONG *reparse_tag) -diff -Naur a/pyconfig.h.in b/pyconfig.h.in ---- a/pyconfig.h.in 2014-05-20 00:54:18.670000000 +0400 -+++ b/pyconfig.h.in 2014-05-20 00:54:37.452400000 +0400 +diff -urN a/pyconfig.h.in b/pyconfig.h.in +--- a/pyconfig.h.in 2014-10-11 14:19:04.201542400 +0100 ++++ b/pyconfig.h.in 2014-10-11 14:19:06.925698200 +0100 @@ -687,6 +687,9 @@ /* Define to 1 if you have the `renameat' function. */ #undef HAVE_RENAMEAT diff --git a/mingw-w64-python3/0200-MINGW-build-in-windows-modules-winreg.patch b/mingw-w64-python3/0200-MINGW-build-in-windows-modules-winreg.patch index 9022ec2c8f..725f3a90e3 100644 --- a/mingw-w64-python3/0200-MINGW-build-in-windows-modules-winreg.patch +++ b/mingw-w64-python3/0200-MINGW-build-in-windows-modules-winreg.patch @@ -1,7 +1,7 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2014-05-20 00:54:39.886000000 +0400 -+++ b/configure.ac 2014-05-20 00:54:40.166800000 +0400 -@@ -2523,6 +2523,14 @@ +diff -urN a/configure.ac b/configure.ac +--- a/configure.ac 2014-10-11 14:19:07.957757200 +0100 ++++ b/configure.ac 2014-10-11 14:19:10.613909200 +0100 +@@ -2540,6 +2540,14 @@ fi]) AC_MSG_RESULT($with_dbmliborder) @@ -16,9 +16,9 @@ diff -Naur a/configure.ac b/configure.ac # Determine if signalmodule should be used. AC_SUBST(USE_SIGNAL_MODULE) AC_SUBST(SIGNAL_OBJS) -diff -Naur a/Modules/Setup.config.in b/Modules/Setup.config.in ---- a/Modules/Setup.config.in 2014-05-20 00:54:37.187200000 +0400 -+++ b/Modules/Setup.config.in 2014-05-20 00:54:40.166800000 +0400 +diff -urN a/Modules/Setup.config.in b/Modules/Setup.config.in +--- a/Modules/Setup.config.in 2014-10-11 14:19:08.700799700 +0100 ++++ b/Modules/Setup.config.in 2014-10-11 14:19:10.615909300 +0100 @@ -12,5 +12,8 @@ # The signal module @USE_SIGNAL_MODULE@signal signalmodule.c @@ -28,9 +28,9 @@ diff -Naur a/Modules/Setup.config.in b/Modules/Setup.config.in + # The rest of the modules previously listed in this file are built # by the setup.py script in Python 2.1 and later. -diff -Naur a/PC/winreg.c b/PC/winreg.c ---- a/PC/winreg.c 2014-05-19 09:19:39.000000000 +0400 -+++ b/PC/winreg.c 2014-05-20 00:54:40.182400000 +0400 +diff -urN a/PC/winreg.c b/PC/winreg.c +--- a/PC/winreg.c 2014-10-11 14:19:08.760803200 +0100 ++++ b/PC/winreg.c 2014-10-11 14:19:10.616909300 +0100 @@ -16,6 +16,25 @@ #include "structmember.h" #include "windows.h" @@ -57,7 +57,7 @@ diff -Naur a/PC/winreg.c b/PC/winreg.c static BOOL PyHKEY_AsHKEY(PyObject *ob, HKEY *pRes, BOOL bNoneOK); static PyObject *PyHKEY_FromHKEY(HKEY h); static BOOL PyHKEY_Close(PyObject *obHandle); -@@ -1081,6 +1100,10 @@ +@@ -1083,6 +1102,10 @@ static PyObject * PyDeleteKeyEx(PyObject *self, PyObject *args, PyObject *kwargs) { @@ -68,7 +68,7 @@ diff -Naur a/PC/winreg.c b/PC/winreg.c HKEY hKey; PyObject *key; HMODULE hMod; -@@ -1117,6 +1140,11 @@ +@@ -1119,6 +1142,11 @@ return PyErr_SetFromWindowsErrWithFunction(rc, "RegDeleteKeyEx"); Py_INCREF(Py_None); return Py_None; diff --git a/mingw-w64-python3/0210-MINGW-determine-if-pwdmodule-should-be-used.patch b/mingw-w64-python3/0210-MINGW-determine-if-pwdmodule-should-be-used.patch index b0537d27ae..4a04e1ad5d 100644 --- a/mingw-w64-python3/0210-MINGW-determine-if-pwdmodule-should-be-used.patch +++ b/mingw-w64-python3/0210-MINGW-determine-if-pwdmodule-should-be-used.patch @@ -1,7 +1,7 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2014-05-20 00:54:42.350800000 +0400 -+++ b/configure.ac 2014-05-20 00:54:42.600400000 +0400 -@@ -2531,6 +2531,13 @@ +diff -urN a/configure.ac b/configure.ac +--- a/configure.ac 2014-10-11 14:19:11.781976000 +0100 ++++ b/configure.ac 2014-10-11 14:19:14.475130000 +0100 +@@ -2548,6 +2548,13 @@ *-*-mingw*) USE_WIN32_MODULE=;; esac @@ -15,9 +15,9 @@ diff -Naur a/configure.ac b/configure.ac # Determine if signalmodule should be used. AC_SUBST(USE_SIGNAL_MODULE) AC_SUBST(SIGNAL_OBJS) -diff -Naur a/Modules/Setup.config.in b/Modules/Setup.config.in ---- a/Modules/Setup.config.in 2014-05-20 00:54:42.382000000 +0400 -+++ b/Modules/Setup.config.in 2014-05-20 00:54:42.600400000 +0400 +diff -urN a/Modules/Setup.config.in b/Modules/Setup.config.in +--- a/Modules/Setup.config.in 2014-10-11 14:19:12.780033100 +0100 ++++ b/Modules/Setup.config.in 2014-10-11 14:19:14.477130100 +0100 @@ -6,6 +6,9 @@ # init system calls(posix/nt/...) for INITFUNC (used by makesetup) @INITSYS@ posixmodule.c @@ -28,9 +28,9 @@ diff -Naur a/Modules/Setup.config.in b/Modules/Setup.config.in # Threading @USE_THREAD_MODULE@_thread _threadmodule.c -diff -Naur a/Modules/Setup.dist b/Modules/Setup.dist ---- a/Modules/Setup.dist 2014-05-20 00:54:37.187200000 +0400 -+++ b/Modules/Setup.dist 2014-05-20 00:54:42.616000000 +0400 +diff -urN a/Modules/Setup.dist b/Modules/Setup.dist +--- a/Modules/Setup.dist 2014-10-11 14:19:12.965043600 +0100 ++++ b/Modules/Setup.dist 2014-10-11 14:19:14.604137400 +0100 @@ -106,8 +106,6 @@ # setup.py script in the root of the Python source tree. diff --git a/mingw-w64-python3/0220-MINGW-default-sys.path-calculations-for-windows-plat.patch b/mingw-w64-python3/0220-MINGW-default-sys.path-calculations-for-windows-plat.patch index 6204eaacde..7cdc693464 100644 --- a/mingw-w64-python3/0220-MINGW-default-sys.path-calculations-for-windows-plat.patch +++ b/mingw-w64-python3/0220-MINGW-default-sys.path-calculations-for-windows-plat.patch @@ -1,7 +1,7 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2014-05-20 00:54:44.878000000 +0400 -+++ b/configure.ac 2014-05-20 00:54:45.158800000 +0400 -@@ -4875,8 +4875,21 @@ +diff -urN a/configure.ac b/configure.ac +--- a/configure.ac 2014-10-11 14:19:15.629196000 +0100 ++++ b/configure.ac 2014-10-11 14:19:18.332350600 +0100 +@@ -4892,8 +4892,21 @@ ;; esac @@ -23,10 +23,10 @@ diff -Naur a/configure.ac b/configure.ac AC_MSG_CHECKING(for build directories) for dir in $SRCDIRS; do if test ! -d $dir; then -diff -Naur a/Makefile.pre.in b/Makefile.pre.in ---- a/Makefile.pre.in 2014-05-19 09:19:39.000000000 +0400 -+++ b/Makefile.pre.in 2014-05-20 00:54:45.190000000 +0400 -@@ -237,7 +237,7 @@ +diff -urN a/Makefile.pre.in b/Makefile.pre.in +--- a/Makefile.pre.in 2014-10-11 14:19:15.647197000 +0100 ++++ b/Makefile.pre.in 2014-10-11 14:19:18.335350800 +0100 +@@ -242,7 +242,7 @@ # Modules MODULE_OBJS= \ Modules/config.o \ @@ -35,7 +35,7 @@ diff -Naur a/Makefile.pre.in b/Makefile.pre.in Modules/main.o \ Modules/gcmodule.o -@@ -689,6 +689,7 @@ +@@ -704,6 +704,7 @@ -DHGBRANCH="\"`LC_ALL=C $(HGBRANCH)`\"" \ -o $@ $(srcdir)/Modules/getbuildinfo.c @@ -43,7 +43,7 @@ diff -Naur a/Makefile.pre.in b/Makefile.pre.in Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile $(CC) -c $(PY_CORE_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \ -DPREFIX='"$(prefix)"' \ -@@ -697,6 +698,13 @@ +@@ -712,6 +713,13 @@ -DVPATH='"$(VPATH)"' \ -o $@ $(srcdir)/Modules/getpath.c @@ -57,9 +57,9 @@ diff -Naur a/Makefile.pre.in b/Makefile.pre.in Modules/python.o: $(srcdir)/Modules/python.c $(MAINCC) -c $(PY_CORE_CFLAGS) -o $@ $(srcdir)/Modules/python.c -diff -Naur a/PC/getpathp.c b/PC/getpathp.c ---- a/PC/getpathp.c 2014-05-19 09:19:39.000000000 +0400 -+++ b/PC/getpathp.c 2014-05-20 00:54:45.190000000 +0400 +diff -urN a/PC/getpathp.c b/PC/getpathp.c +--- a/PC/getpathp.c 2014-10-11 14:19:16.216229600 +0100 ++++ b/PC/getpathp.c 2014-10-11 14:19:18.337350900 +0100 @@ -87,10 +87,26 @@ * with a semicolon separated path prior to calling Py_Initialize. */ diff --git a/mingw-w64-python3/0230-MINGW-AC_LIBOBJ-replacement-of-fileblocks.patch b/mingw-w64-python3/0230-MINGW-AC_LIBOBJ-replacement-of-fileblocks.patch index 535969012e..82ca4d616f 100644 --- a/mingw-w64-python3/0230-MINGW-AC_LIBOBJ-replacement-of-fileblocks.patch +++ b/mingw-w64-python3/0230-MINGW-AC_LIBOBJ-replacement-of-fileblocks.patch @@ -1,6 +1,6 @@ -diff -Naur a/Python/fileblocks.c b/Python/fileblocks.c ---- a/Python/fileblocks.c 1970-01-01 03:00:00.000000000 +0300 -+++ b/Python/fileblocks.c 2014-05-20 00:54:47.920000000 +0400 +diff -urN a/Python/fileblocks.c b/Python/fileblocks.c +--- a/Python/fileblocks.c 1970-01-01 01:00:00.000000000 +0100 ++++ b/Python/fileblocks.c 2014-10-11 14:19:22.203572000 +0100 @@ -0,0 +1,17 @@ +/* +-- Macro: AC_STRUCT_ST_BLOCKS diff --git a/mingw-w64-python3/0240-MINGW-use-main-to-start-execution.patch b/mingw-w64-python3/0240-MINGW-use-main-to-start-execution.patch index 735d66c478..3c738b3e7f 100644 --- a/mingw-w64-python3/0240-MINGW-use-main-to-start-execution.patch +++ b/mingw-w64-python3/0240-MINGW-use-main-to-start-execution.patch @@ -1,6 +1,6 @@ -diff -Naur a/Modules/python.c b/Modules/python.c ---- a/Modules/python.c 2014-05-19 09:19:39.000000000 +0400 -+++ b/Modules/python.c 2014-05-20 00:54:50.291200000 +0400 +diff -urN a/Modules/python.c b/Modules/python.c +--- a/Modules/python.c 2014-10-11 14:19:24.163684200 +0100 ++++ b/Modules/python.c 2014-10-11 14:19:25.838780000 +0100 @@ -7,7 +7,7 @@ #include #endif diff --git a/mingw-w64-python3/0250-MINGW-compiler-customize-mingw-cygwin-compilers.patch b/mingw-w64-python3/0250-MINGW-compiler-customize-mingw-cygwin-compilers.patch index 6dfab58d4b..e886f23040 100644 --- a/mingw-w64-python3/0250-MINGW-compiler-customize-mingw-cygwin-compilers.patch +++ b/mingw-w64-python3/0250-MINGW-compiler-customize-mingw-cygwin-compilers.patch @@ -1,7 +1,7 @@ -diff -Naur a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py ---- a/Lib/distutils/sysconfig.py 2014-05-19 09:19:38.000000000 +0400 -+++ b/Lib/distutils/sysconfig.py 2014-05-20 00:54:52.756000000 +0400 -@@ -168,7 +168,23 @@ +diff -urN a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py +--- a/Lib/distutils/sysconfig.py 2014-10-11 14:19:27.487874300 +0100 ++++ b/Lib/distutils/sysconfig.py 2014-10-11 14:19:30.049020800 +0100 +@@ -165,7 +165,23 @@ Mainly needed on Unix, so we can plug in the information that varies across Unices and is stored in Python's Makefile. """ @@ -26,7 +26,7 @@ diff -Naur a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py if sys.platform == "darwin": # Perform first-time customization of compiler-related # config vars on OS X now that we know we need a compiler. -@@ -178,7 +194,6 @@ +@@ -175,7 +191,6 @@ # that Python itself was built on. Also the user OS # version and build tools may not support the same set # of CPU architectures for universal builds. diff --git a/mingw-w64-python3/0260-MINGW-compiler-enable-new-dtags.patch b/mingw-w64-python3/0260-MINGW-compiler-enable-new-dtags.patch index 0691c9c295..e5827d192a 100644 --- a/mingw-w64-python3/0260-MINGW-compiler-enable-new-dtags.patch +++ b/mingw-w64-python3/0260-MINGW-compiler-enable-new-dtags.patch @@ -1,6 +1,6 @@ -diff -Naur a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py ---- a/Lib/distutils/unixccompiler.py 2014-05-19 09:19:38.000000000 +0400 -+++ b/Lib/distutils/unixccompiler.py 2014-05-20 00:54:55.408000000 +0400 +diff -urN a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py +--- a/Lib/distutils/unixccompiler.py 2014-10-11 14:19:31.330094100 +0100 ++++ b/Lib/distutils/unixccompiler.py 2014-10-11 14:19:33.906241400 +0100 @@ -238,9 +238,13 @@ # -Wl whenever gcc was used in the past it is probably # safest to keep doing so. diff --git a/mingw-w64-python3/0270-CYGWIN-issue13756-Python-make-fail-on-cygwin.patch b/mingw-w64-python3/0270-CYGWIN-issue13756-Python-make-fail-on-cygwin.patch index 301ec266f4..1751e881c2 100644 --- a/mingw-w64-python3/0270-CYGWIN-issue13756-Python-make-fail-on-cygwin.patch +++ b/mingw-w64-python3/0270-CYGWIN-issue13756-Python-make-fail-on-cygwin.patch @@ -1,7 +1,7 @@ -diff -Naur a/Makefile.pre.in b/Makefile.pre.in ---- a/Makefile.pre.in 2014-05-20 00:54:47.717200000 +0400 -+++ b/Makefile.pre.in 2014-05-20 00:54:57.732400000 +0400 -@@ -620,9 +620,9 @@ +diff -urN a/Makefile.pre.in b/Makefile.pre.in +--- a/Makefile.pre.in 2014-10-11 14:19:35.004304200 +0100 ++++ b/Makefile.pre.in 2014-10-11 14:19:37.772462500 +0100 +@@ -635,9 +635,9 @@ $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK) $(LN) -fsn Versions/Current/Resources $(PYTHONFRAMEWORKDIR)/Resources @@ -13,9 +13,9 @@ diff -Naur a/Makefile.pre.in b/Makefile.pre.in if test -n "$(DLLLIBRARY)"; then \ $(LDSHARED) -Wl,--out-implib=$@ -o $(DLLLIBRARY) $^ \ $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST); \ -diff -Naur a/Modules/makesetup b/Modules/makesetup ---- a/Modules/makesetup 2014-05-19 09:19:39.000000000 +0400 -+++ b/Modules/makesetup 2014-05-20 00:54:57.732400000 +0400 +diff -urN a/Modules/makesetup b/Modules/makesetup +--- a/Modules/makesetup 2014-10-11 14:19:35.863353300 +0100 ++++ b/Modules/makesetup 2014-10-11 14:19:37.774462700 +0100 @@ -91,7 +91,7 @@ else ExtraLibDir='$(LIBPL)' diff --git a/mingw-w64-python3/0280-issue17219-add-current-dir-in-library-path-if-buildi.patch b/mingw-w64-python3/0280-issue17219-add-current-dir-in-library-path-if-buildi.patch index 4811940a01..7b290293b0 100644 --- a/mingw-w64-python3/0280-issue17219-add-current-dir-in-library-path-if-buildi.patch +++ b/mingw-w64-python3/0280-issue17219-add-current-dir-in-library-path-if-buildi.patch @@ -1,7 +1,7 @@ -diff -Naur a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py ---- a/Lib/distutils/command/build_ext.py 2014-05-19 09:19:37.000000000 +0400 -+++ b/Lib/distutils/command/build_ext.py 2014-05-20 00:55:00.275200000 +0400 -@@ -246,7 +246,7 @@ +diff -urN a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py +--- a/Lib/distutils/command/build_ext.py 2014-10-11 14:19:38.954530100 +0100 ++++ b/Lib/distutils/command/build_ext.py 2014-10-11 14:19:41.476674400 +0100 +@@ -237,7 +237,7 @@ # Python's library directory must be appended to library_dirs # See Issues: #1600860, #4366 if (sysconfig.get_config_var('Py_ENABLE_SHARED')): diff --git a/mingw-w64-python3/0290-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch b/mingw-w64-python3/0290-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch index e23436707e..210a21a2d7 100644 --- a/mingw-w64-python3/0290-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch +++ b/mingw-w64-python3/0290-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch @@ -1,6 +1,6 @@ -diff -Naur a/Include/pyport.h b/Include/pyport.h ---- a/Include/pyport.h 2014-05-20 00:54:21.462400000 +0400 -+++ b/Include/pyport.h 2014-05-20 00:55:02.911600000 +0400 +diff -urN a/Include/pyport.h b/Include/pyport.h +--- a/Include/pyport.h 2014-10-11 14:19:43.688800900 +0100 ++++ b/Include/pyport.h 2014-10-11 14:19:45.226888900 +0100 @@ -739,37 +739,39 @@ */ @@ -62,10 +62,10 @@ diff -Naur a/Include/pyport.h b/Include/pyport.h # endif /* HAVE_DECLSPEC */ #endif /* Py_ENABLE_SHARED */ -diff -Naur a/setup.py b/setup.py ---- a/setup.py 2014-05-19 09:19:40.000000000 +0400 -+++ b/setup.py 2014-05-20 00:55:02.911600000 +0400 -@@ -170,6 +170,9 @@ +diff -urN a/setup.py b/setup.py +--- a/setup.py 2014-10-11 14:19:43.453787500 +0100 ++++ b/setup.py 2014-10-11 14:19:45.228889000 +0100 +@@ -176,6 +176,9 @@ def build_extensions(self): diff --git a/mingw-w64-python3/0300-MINGW-configure-for-shared-build.patch b/mingw-w64-python3/0300-MINGW-configure-for-shared-build.patch index c3f1d26a55..788a2d6f08 100644 --- a/mingw-w64-python3/0300-MINGW-configure-for-shared-build.patch +++ b/mingw-w64-python3/0300-MINGW-configure-for-shared-build.patch @@ -1,7 +1,7 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2014-05-20 00:54:47.670400000 +0400 -+++ b/configure.ac 2014-05-20 00:55:05.516800000 +0400 -@@ -1042,6 +1042,13 @@ +diff -urN a/configure.ac b/configure.ac +--- a/configure.ac 2014-10-11 14:19:46.432957900 +0100 ++++ b/configure.ac 2014-10-11 14:19:49.273120300 +0100 +@@ -1045,6 +1045,13 @@ ;; esac @@ -15,7 +15,7 @@ diff -Naur a/configure.ac b/configure.ac else # shared is disabled PY_ENABLE_SHARED=0 case $ac_sys_system in -@@ -1050,6 +1057,10 @@ +@@ -1053,6 +1060,10 @@ LDLIBRARY='libpython$(LDVERSION).dll.a' ;; esac @@ -26,7 +26,7 @@ diff -Naur a/configure.ac b/configure.ac fi if test "$cross_compiling" = yes; then -@@ -2196,6 +2207,12 @@ +@@ -2213,6 +2224,12 @@ LDCXXSHARED="g++ -shared -Wl,--enable-auto-image-base";; *) LDSHARED="ld";; esac @@ -39,7 +39,7 @@ diff -Naur a/configure.ac b/configure.ac fi AC_MSG_RESULT($LDSHARED) LDCXXSHARED=${LDCXXSHARED-$LDSHARED} -@@ -4871,7 +4888,8 @@ +@@ -4888,7 +4905,8 @@ 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. diff --git a/mingw-w64-python3/0310-MINGW-dynamic-loading-support.patch b/mingw-w64-python3/0310-MINGW-dynamic-loading-support.patch index 29b37103a1..da021b5873 100644 --- a/mingw-w64-python3/0310-MINGW-dynamic-loading-support.patch +++ b/mingw-w64-python3/0310-MINGW-dynamic-loading-support.patch @@ -1,7 +1,7 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2014-05-20 00:55:07.732000000 +0400 -+++ b/configure.ac 2014-05-20 00:55:08.122000000 +0400 -@@ -2074,6 +2074,9 @@ +diff -urN a/configure.ac b/configure.ac +--- a/configure.ac 2014-10-11 14:19:50.412185500 +0100 ++++ b/configure.ac 2014-10-11 14:19:53.083338300 +0100 +@@ -2084,6 +2084,9 @@ CYGWIN*) SHLIB_SUFFIX=.dll;; *) SHLIB_SUFFIX=.so;; esac @@ -11,7 +11,7 @@ diff -Naur a/configure.ac b/configure.ac fi AC_MSG_RESULT($SHLIB_SUFFIX) -@@ -3043,6 +3046,12 @@ +@@ -3060,6 +3063,12 @@ fi ;; esac @@ -24,7 +24,7 @@ diff -Naur a/configure.ac b/configure.ac fi AC_MSG_RESULT($DYNLOADFILE) if test "$DYNLOADFILE" != "dynload_stub.o" -@@ -4276,6 +4285,12 @@ +@@ -4293,6 +4302,12 @@ *) EXT_SUFFIX=${SHLIB_SUFFIX};; esac @@ -37,10 +37,10 @@ diff -Naur a/configure.ac b/configure.ac AC_MSG_CHECKING(LDVERSION) LDVERSION='$(VERSION)$(ABIFLAGS)' -diff -Naur a/Makefile.pre.in b/Makefile.pre.in ---- a/Makefile.pre.in 2014-05-20 00:54:59.932000000 +0400 -+++ b/Makefile.pre.in 2014-05-20 00:55:08.262400000 +0400 -@@ -731,6 +731,12 @@ +diff -urN a/Makefile.pre.in b/Makefile.pre.in +--- a/Makefile.pre.in 2014-10-11 14:19:50.412185500 +0100 ++++ b/Makefile.pre.in 2014-10-11 14:19:53.085338400 +0100 +@@ -746,6 +746,12 @@ -DSHLIB_EXT='"$(EXT_SUFFIX)"' \ -o $@ $(srcdir)/Python/dynload_hpux.c @@ -53,9 +53,9 @@ diff -Naur a/Makefile.pre.in b/Makefile.pre.in Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile $(CC) -c $(PY_CORE_CFLAGS) \ -DABIFLAGS='"$(ABIFLAGS)"' \ -diff -Naur a/Python/dynload_win.c b/Python/dynload_win.c ---- a/Python/dynload_win.c 2014-05-19 09:19:39.000000000 +0400 -+++ b/Python/dynload_win.c 2014-05-20 00:55:08.262400000 +0400 +diff -urN a/Python/dynload_win.c b/Python/dynload_win.c +--- a/Python/dynload_win.c 2014-10-11 14:19:50.418185800 +0100 ++++ b/Python/dynload_win.c 2014-10-11 14:19:53.087338500 +0100 @@ -18,6 +18,12 @@ #endif diff --git a/mingw-w64-python3/0320-MINGW-implement-exec-prefix.patch b/mingw-w64-python3/0320-MINGW-implement-exec-prefix.patch index dc1da2e54e..9db1f704e4 100644 --- a/mingw-w64-python3/0320-MINGW-implement-exec-prefix.patch +++ b/mingw-w64-python3/0320-MINGW-implement-exec-prefix.patch @@ -1,6 +1,6 @@ -diff -Naur a/PC/getpathp.c b/PC/getpathp.c ---- a/PC/getpathp.c 2014-05-20 00:54:47.717200000 +0400 -+++ b/PC/getpathp.c 2014-05-20 00:55:10.820800000 +0400 +diff -urN a/PC/getpathp.c b/PC/getpathp.c +--- a/PC/getpathp.c 2014-10-11 14:19:54.742433200 +0100 ++++ b/PC/getpathp.c 2014-10-11 14:19:56.736547200 +0100 @@ -104,10 +104,17 @@ # define USE_POSIX_PREFIX diff --git a/mingw-w64-python3/0330-MINGW-ignore-main-program-for-frozen-scripts.patch b/mingw-w64-python3/0330-MINGW-ignore-main-program-for-frozen-scripts.patch index a548b9b81e..7e9128f89d 100644 --- a/mingw-w64-python3/0330-MINGW-ignore-main-program-for-frozen-scripts.patch +++ b/mingw-w64-python3/0330-MINGW-ignore-main-program-for-frozen-scripts.patch @@ -1,7 +1,7 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2014-05-20 00:55:10.555600000 +0400 -+++ b/configure.ac 2014-05-20 00:55:13.441600000 +0400 -@@ -4918,6 +4918,16 @@ +diff -urN a/configure.ac b/configure.ac +--- a/configure.ac 2014-10-11 14:19:57.869612000 +0100 ++++ b/configure.ac 2014-10-11 14:20:00.517763500 +0100 +@@ -4935,6 +4935,16 @@ ;; esac @@ -18,10 +18,10 @@ diff -Naur a/configure.ac b/configure.ac AC_SUBST(SRCDIRS) SRCDIRS="Parser Grammar Objects Python Modules Mac" case $host in -diff -Naur a/Makefile.pre.in b/Makefile.pre.in ---- a/Makefile.pre.in 2014-05-20 00:55:10.555600000 +0400 -+++ b/Makefile.pre.in 2014-05-20 00:55:13.457200000 +0400 -@@ -357,7 +357,7 @@ +diff -urN a/Makefile.pre.in b/Makefile.pre.in +--- a/Makefile.pre.in 2014-10-11 14:19:57.869612000 +0100 ++++ b/Makefile.pre.in 2014-10-11 14:20:00.519763600 +0100 +@@ -362,7 +362,7 @@ Python/codecs.o \ Python/dynamic_annotations.o \ Python/errors.o \ diff --git a/mingw-w64-python3/0340-MINGW-setup-exclude-termios-module.patch b/mingw-w64-python3/0340-MINGW-setup-exclude-termios-module.patch index abb23901e0..64f4322902 100644 --- a/mingw-w64-python3/0340-MINGW-setup-exclude-termios-module.patch +++ b/mingw-w64-python3/0340-MINGW-setup-exclude-termios-module.patch @@ -1,7 +1,7 @@ -diff -Naur a/setup.py b/setup.py ---- a/setup.py 2014-05-20 00:55:05.314000000 +0400 -+++ b/setup.py 2014-05-20 00:55:15.875200000 +0400 -@@ -1242,7 +1242,7 @@ +diff -urN a/setup.py b/setup.py +--- a/setup.py 2014-10-11 14:20:02.180858600 +0100 ++++ b/setup.py 2014-10-11 14:20:04.365983600 +0100 +@@ -1250,7 +1250,7 @@ missing.append('_gdbm') # Unix-only modules diff --git a/mingw-w64-python3/0350-MINGW-setup-_multiprocessing-module.patch b/mingw-w64-python3/0350-MINGW-setup-_multiprocessing-module.patch index 97349b1dae..d601420a93 100644 --- a/mingw-w64-python3/0350-MINGW-setup-_multiprocessing-module.patch +++ b/mingw-w64-python3/0350-MINGW-setup-_multiprocessing-module.patch @@ -1,7 +1,7 @@ -diff -Naur a/setup.py b/setup.py ---- a/setup.py 2014-05-20 00:55:18.121600000 +0400 -+++ b/setup.py 2014-05-20 00:55:18.340000000 +0400 -@@ -1504,7 +1504,7 @@ +diff -urN a/setup.py b/setup.py +--- a/setup.py 2014-10-11 14:20:05.461046200 +0100 ++++ b/setup.py 2014-10-11 14:20:08.299208600 +0100 +@@ -1512,7 +1512,7 @@ macros = dict() libraries = ['rt'] @@ -10,7 +10,7 @@ diff -Naur a/setup.py b/setup.py multiprocessing_srcs = [ '_multiprocessing/multiprocessing.c', '_multiprocessing/semaphore.c', ] -@@ -1517,8 +1517,12 @@ +@@ -1525,8 +1525,12 @@ multiprocessing_srcs.append('_multiprocessing/semaphore.c') if sysconfig.get_config_var('WITH_THREAD'): diff --git a/mingw-w64-python3/0360-MINGW-setup-select-module.patch b/mingw-w64-python3/0360-MINGW-setup-select-module.patch index f9c7d45821..26932e306d 100644 --- a/mingw-w64-python3/0360-MINGW-setup-select-module.patch +++ b/mingw-w64-python3/0360-MINGW-setup-select-module.patch @@ -1,6 +1,6 @@ -diff -Naur a/Modules/selectmodule.c b/Modules/selectmodule.c ---- a/Modules/selectmodule.c 2014-05-19 09:19:39.000000000 +0400 -+++ b/Modules/selectmodule.c 2014-05-20 00:55:20.820400000 +0400 +diff -urN a/Modules/selectmodule.c b/Modules/selectmodule.c +--- a/Modules/selectmodule.c 2014-10-11 14:20:10.158314900 +0100 ++++ b/Modules/selectmodule.c 2014-10-11 14:20:11.952417500 +0100 @@ -102,9 +102,9 @@ v = PyObject_AsFileDescriptor( o ); if (v == -1) goto finally; @@ -22,10 +22,10 @@ diff -Naur a/Modules/selectmodule.c b/Modules/selectmodule.c FD_SET(v, set); /* add object and its file descriptor to the list */ -diff -Naur a/setup.py b/setup.py ---- a/setup.py 2014-05-20 00:55:20.570800000 +0400 -+++ b/setup.py 2014-05-20 00:55:20.836000000 +0400 -@@ -628,7 +628,11 @@ +diff -urN a/setup.py b/setup.py +--- a/setup.py 2014-10-11 14:20:09.330267500 +0100 ++++ b/setup.py 2014-10-11 14:20:11.953417600 +0100 +@@ -634,7 +634,11 @@ missing.append('spwd') # select(2); not on ancient System V diff --git a/mingw-w64-python3/0370-MINGW-setup-_ctypes-module-with-system-libffi.patch b/mingw-w64-python3/0370-MINGW-setup-_ctypes-module-with-system-libffi.patch index db00f62541..1f3aba4af9 100644 --- a/mingw-w64-python3/0370-MINGW-setup-_ctypes-module-with-system-libffi.patch +++ b/mingw-w64-python3/0370-MINGW-setup-_ctypes-module-with-system-libffi.patch @@ -1,6 +1,6 @@ -diff -Naur a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c ---- a/Modules/_ctypes/callproc.c 2014-05-19 09:19:39.000000000 +0400 -+++ b/Modules/_ctypes/callproc.c 2014-05-20 00:55:23.456800000 +0400 +diff -urN a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c +--- a/Modules/_ctypes/callproc.c 2014-10-11 14:20:14.135542400 +0100 ++++ b/Modules/_ctypes/callproc.c 2014-10-11 14:20:15.816638500 +0100 @@ -727,6 +727,21 @@ } @@ -59,10 +59,10 @@ diff -Naur a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c #endif if ((flags & FUNCFLAG_PYTHONAPI) && PyErr_Occurred()) return -1; -diff -Naur a/setup.py b/setup.py ---- a/setup.py 2014-05-20 00:55:23.238400000 +0400 -+++ b/setup.py 2014-05-20 00:55:23.472400000 +0400 -@@ -1932,6 +1932,8 @@ +diff -urN a/setup.py b/setup.py +--- a/setup.py 2014-10-11 14:20:14.291551300 +0100 ++++ b/setup.py 2014-10-11 14:20:15.818638700 +0100 +@@ -1940,6 +1940,8 @@ depends=depends) ext_test = Extension('_ctypes_test', sources=['_ctypes/_ctypes_test.c']) @@ -71,7 +71,7 @@ diff -Naur a/setup.py b/setup.py self.extensions.extend([ext, ext_test]) if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"): -@@ -1965,6 +1967,8 @@ +@@ -1973,6 +1975,8 @@ if ffi_inc and ffi_lib: ext.include_dirs.extend(ffi_inc) ext.libraries.append(ffi_lib) diff --git a/mingw-w64-python3/0380-MINGW-defect-winsock2-and-setup-_socket-module.patch b/mingw-w64-python3/0380-MINGW-defect-winsock2-and-setup-_socket-module.patch index ba1fd2155f..474301edeb 100644 --- a/mingw-w64-python3/0380-MINGW-defect-winsock2-and-setup-_socket-module.patch +++ b/mingw-w64-python3/0380-MINGW-defect-winsock2-and-setup-_socket-module.patch @@ -1,7 +1,7 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2014-05-20 00:55:15.656800000 +0400 -+++ b/configure.ac 2014-05-20 00:55:25.874800000 +0400 -@@ -3604,21 +3604,36 @@ +diff -urN a/configure.ac b/configure.ac +--- a/configure.ac 2014-10-11 14:20:16.937702700 +0100 ++++ b/configure.ac 2014-10-11 14:20:19.747863400 +0100 +@@ -3621,21 +3621,36 @@ ],[]) AC_MSG_RESULT($was_it_defined) @@ -42,7 +42,7 @@ diff -Naur a/configure.ac b/configure.ac [ac_cv_struct_sockaddr_storage=yes], [ac_cv_struct_sockaddr_storage=no])) AC_MSG_RESULT($ac_cv_struct_sockaddr_storage) -@@ -4804,7 +4819,10 @@ +@@ -4821,7 +4836,10 @@ AC_CHECK_TYPE(socklen_t,, AC_DEFINE(socklen_t,int, @@ -54,9 +54,9 @@ diff -Naur a/configure.ac b/configure.ac #ifdef HAVE_SYS_TYPES_H #include #endif -diff -Naur a/Misc/config_mingw b/Misc/config_mingw ---- a/Misc/config_mingw 2014-05-20 00:54:26.750800000 +0400 -+++ b/Misc/config_mingw 2014-05-20 00:55:25.874800000 +0400 +diff -urN a/Misc/config_mingw b/Misc/config_mingw +--- a/Misc/config_mingw 2014-10-11 14:20:17.566738600 +0100 ++++ b/Misc/config_mingw 2014-10-11 14:20:19.748863500 +0100 @@ -10,3 +10,6 @@ # files to ignore ac_cv_file__dev_ptmx=ignore #NOTE: under MSYS environment device exist @@ -64,9 +64,9 @@ diff -Naur a/Misc/config_mingw b/Misc/config_mingw + +# force detection of winsock2 functionality - require wxp or newer +ac_cv_func_getpeername=yes -diff -Naur a/Modules/socketmodule.c b/Modules/socketmodule.c ---- a/Modules/socketmodule.c 2014-05-19 09:19:39.000000000 +0400 -+++ b/Modules/socketmodule.c 2014-05-20 00:55:25.890400000 +0400 +diff -urN a/Modules/socketmodule.c b/Modules/socketmodule.c +--- a/Modules/socketmodule.c 2014-10-11 14:20:17.822753300 +0100 ++++ b/Modules/socketmodule.c 2014-10-11 14:20:19.751863600 +0100 @@ -306,6 +306,12 @@ /* Do not include addrinfo.h for MSVC7 or greater. 'addrinfo' and * EAI_* constants are defined in (the already included) ws2tcpip.h. @@ -80,9 +80,9 @@ diff -Naur a/Modules/socketmodule.c b/Modules/socketmodule.c #else # include "addrinfo.h" #endif -diff -Naur a/pyconfig.h.in b/pyconfig.h.in ---- a/pyconfig.h.in 2014-05-20 00:54:39.932800000 +0400 -+++ b/pyconfig.h.in 2014-05-20 00:55:25.890400000 +0400 +diff -urN a/pyconfig.h.in b/pyconfig.h.in +--- a/pyconfig.h.in 2014-10-11 14:20:17.492734400 +0100 ++++ b/pyconfig.h.in 2014-10-11 14:20:19.752863700 +0100 @@ -43,7 +43,7 @@ /* Define to 1 if you have the `acosh' function. */ #undef HAVE_ACOSH @@ -111,10 +111,10 @@ diff -Naur a/pyconfig.h.in b/pyconfig.h.in #undef socklen_t /* Define to `int' if doesn't define. */ -diff -Naur a/setup.py b/setup.py ---- a/setup.py 2014-05-20 00:55:25.656400000 +0400 -+++ b/setup.py 2014-05-20 00:55:25.890400000 +0400 -@@ -754,7 +754,11 @@ +diff -urN a/setup.py b/setup.py +--- a/setup.py 2014-10-11 14:20:18.052766400 +0100 ++++ b/setup.py 2014-10-11 14:20:19.754863800 +0100 +@@ -762,7 +762,11 @@ exts.append( Extension('_posixsubprocess', ['_posixsubprocess.c']) ) # socket(2) diff --git a/mingw-w64-python3/0390-MINGW-exclude-unix-only-modules.patch b/mingw-w64-python3/0390-MINGW-exclude-unix-only-modules.patch index b87c5ab53c..9efddc031c 100644 --- a/mingw-w64-python3/0390-MINGW-exclude-unix-only-modules.patch +++ b/mingw-w64-python3/0390-MINGW-exclude-unix-only-modules.patch @@ -1,7 +1,7 @@ -diff -Naur a/setup.py b/setup.py ---- a/setup.py 2014-05-20 00:55:28.417600000 +0400 -+++ b/setup.py 2014-05-20 00:55:28.573600000 +0400 -@@ -615,11 +615,20 @@ +diff -urN a/setup.py b/setup.py +--- a/setup.py 2014-10-11 14:20:21.973990700 +0100 ++++ b/setup.py 2014-10-11 14:20:23.497077800 +0100 +@@ -621,11 +621,20 @@ if (config_h_vars.get('FLOCK_NEEDS_LIBBSD', False)): # May be necessary on AIX for flock function libs = ['bsd'] @@ -25,7 +25,7 @@ diff -Naur a/setup.py b/setup.py # spwd, shadow passwords if (config_h_vars.get('HAVE_GETSPNAM', False) or config_h_vars.get('HAVE_GETSPENT', False)): -@@ -642,7 +651,10 @@ +@@ -648,7 +657,10 @@ # Lance Ellinghaus's syslog module # syslog daemon interface @@ -37,7 +37,7 @@ diff -Naur a/setup.py b/setup.py # # Here ends the simple stuff. From here on, modules need certain -@@ -741,17 +753,23 @@ +@@ -749,17 +761,23 @@ # crypt module. diff --git a/mingw-w64-python3/0400-MINGW-setup-msvcrt-and-_winapi-modules.patch b/mingw-w64-python3/0400-MINGW-setup-msvcrt-and-_winapi-modules.patch index 9e2eac4e20..542ecf5b7b 100644 --- a/mingw-w64-python3/0400-MINGW-setup-msvcrt-and-_winapi-modules.patch +++ b/mingw-w64-python3/0400-MINGW-setup-msvcrt-and-_winapi-modules.patch @@ -1,6 +1,6 @@ -diff -Naur a/Modules/_winapi.c b/Modules/_winapi.c ---- a/Modules/_winapi.c 2014-05-19 09:19:39.000000000 +0400 -+++ b/Modules/_winapi.c 2014-05-20 00:55:31.319200000 +0400 +diff -urN a/Modules/_winapi.c b/Modules/_winapi.c +--- a/Modules/_winapi.c 2014-10-11 14:20:25.474190900 +0100 ++++ b/Modules/_winapi.c 2014-10-11 14:20:27.224291000 +0100 @@ -39,7 +39,9 @@ #define WINDOWS_LEAN_AND_MEAN @@ -11,9 +11,9 @@ diff -Naur a/Modules/_winapi.c b/Modules/_winapi.c #if defined(MS_WIN32) && !defined(MS_WIN64) #define HANDLE_TO_PYNUM(handle) \ -diff -Naur a/PC/msvcrtmodule.c b/PC/msvcrtmodule.c ---- a/PC/msvcrtmodule.c 2014-05-19 09:19:39.000000000 +0400 -+++ b/PC/msvcrtmodule.c 2014-05-20 00:55:31.319200000 +0400 +diff -urN a/PC/msvcrtmodule.c b/PC/msvcrtmodule.c +--- a/PC/msvcrtmodule.c 2014-10-11 14:20:25.201175300 +0100 ++++ b/PC/msvcrtmodule.c 2014-10-11 14:20:27.225291100 +0100 @@ -21,7 +21,9 @@ #include #include @@ -24,10 +24,10 @@ diff -Naur a/PC/msvcrtmodule.c b/PC/msvcrtmodule.c #include #ifdef _MSC_VER -diff -Naur a/setup.py b/setup.py ---- a/setup.py 2014-05-20 00:55:31.085200000 +0400 -+++ b/setup.py 2014-05-20 00:55:31.319200000 +0400 -@@ -879,6 +879,16 @@ +diff -urN a/setup.py b/setup.py +--- a/setup.py 2014-10-11 14:20:24.603141100 +0100 ++++ b/setup.py 2014-10-11 14:20:27.226291100 +0100 +@@ -887,6 +887,16 @@ min_db_ver = (3, 3) db_setup_debug = False # verbose debug prints from this script? diff --git a/mingw-w64-python3/0410-MINGW-build-extensions-with-GCC.patch b/mingw-w64-python3/0410-MINGW-build-extensions-with-GCC.patch index c4e6817085..11edc9abed 100644 --- a/mingw-w64-python3/0410-MINGW-build-extensions-with-GCC.patch +++ b/mingw-w64-python3/0410-MINGW-build-extensions-with-GCC.patch @@ -1,7 +1,7 @@ -diff -Naur a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py ---- a/Lib/distutils/command/build_ext.py 2014-05-20 00:55:02.677600000 +0400 -+++ b/Lib/distutils/command/build_ext.py 2014-05-20 00:55:33.487600000 +0400 -@@ -190,7 +190,7 @@ +diff -urN a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py +--- a/Lib/distutils/command/build_ext.py 2014-10-11 14:20:28.478362800 +0100 ++++ b/Lib/distutils/command/build_ext.py 2014-10-11 14:20:30.943503700 +0100 +@@ -181,7 +181,7 @@ # for extensions under windows use different directories # for Release and Debug builds. # also Python's library directory must be appended to library_dirs @@ -10,7 +10,7 @@ diff -Naur a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ex # the 'libs' directory is for binary installs - we assume that # must be the *native* platform. But we don't really support # cross-compiling via a binary install anyway, so we let it go. -@@ -691,6 +691,20 @@ +@@ -682,6 +682,20 @@ # pyconfig.h that MSVC groks. The other Windows compilers all seem # to need it mentioned explicitly, though, so that's what we do. # Append '_d' to the python import library on debug builds. @@ -31,9 +31,9 @@ diff -Naur a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ex if sys.platform == "win32": from distutils.msvccompiler import MSVCCompiler if not isinstance(self.compiler, MSVCCompiler): -diff -Naur a/Lib/distutils/util.py b/Lib/distutils/util.py ---- a/Lib/distutils/util.py 2014-05-19 09:19:38.000000000 +0400 -+++ b/Lib/distutils/util.py 2014-05-20 00:55:33.487600000 +0400 +diff -urN a/Lib/distutils/util.py b/Lib/distutils/util.py +--- a/Lib/distutils/util.py 2014-10-11 14:20:28.476362600 +0100 ++++ b/Lib/distutils/util.py 2014-10-11 14:20:30.945503900 +0100 @@ -40,6 +40,8 @@ For other non-POSIX platforms, currently just returns 'sys.platform'. """ @@ -43,10 +43,10 @@ diff -Naur a/Lib/distutils/util.py b/Lib/distutils/util.py # sniff sys.version for architecture. prefix = " bit (" i = sys.version.find(prefix) -diff -Naur a/Lib/sysconfig.py b/Lib/sysconfig.py ---- a/Lib/sysconfig.py 2014-05-19 09:19:38.000000000 +0400 -+++ b/Lib/sysconfig.py 2014-05-20 00:55:33.487600000 +0400 -@@ -615,6 +615,8 @@ +diff -urN a/Lib/sysconfig.py b/Lib/sysconfig.py +--- a/Lib/sysconfig.py 2014-10-11 14:20:28.531365800 +0100 ++++ b/Lib/sysconfig.py 2014-10-11 14:20:30.946503900 +0100 +@@ -629,6 +629,8 @@ For other non-POSIX platforms, currently just returns 'sys.platform'. """ if os.name == 'nt': diff --git a/mingw-w64-python3/0420-MINGW-use-Mingw32CCompiler-as-default-compiler-for-m.patch b/mingw-w64-python3/0420-MINGW-use-Mingw32CCompiler-as-default-compiler-for-m.patch index b5680857e4..b6c5a7bc71 100644 --- a/mingw-w64-python3/0420-MINGW-use-Mingw32CCompiler-as-default-compiler-for-m.patch +++ b/mingw-w64-python3/0420-MINGW-use-Mingw32CCompiler-as-default-compiler-for-m.patch @@ -1,6 +1,6 @@ -diff -Naur a/Lib/distutils/ccompiler.py b/Lib/distutils/ccompiler.py ---- a/Lib/distutils/ccompiler.py 2014-05-19 09:19:37.000000000 +0400 -+++ b/Lib/distutils/ccompiler.py 2014-05-20 00:55:35.359600000 +0400 +diff -urN a/Lib/distutils/ccompiler.py b/Lib/distutils/ccompiler.py +--- a/Lib/distutils/ccompiler.py 2014-10-11 14:20:32.188575000 +0100 ++++ b/Lib/distutils/ccompiler.py 2014-10-11 14:20:34.825725800 +0100 @@ -9,7 +9,7 @@ from distutils.file_util import move_file from distutils.dir_util import mkpath @@ -19,9 +19,9 @@ diff -Naur a/Lib/distutils/ccompiler.py b/Lib/distutils/ccompiler.py for pattern, compiler in _default_compilers: if re.match(pattern, platform) is not None or \ re.match(pattern, osname) is not None: -diff -Naur a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py ---- a/Lib/distutils/cygwinccompiler.py 2014-05-19 09:19:38.000000000 +0400 -+++ b/Lib/distutils/cygwinccompiler.py 2014-05-20 00:55:35.359600000 +0400 +diff -urN a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py +--- a/Lib/distutils/cygwinccompiler.py 2014-10-11 14:20:32.188575000 +0100 ++++ b/Lib/distutils/cygwinccompiler.py 2014-10-11 14:20:34.826725900 +0100 @@ -255,11 +255,16 @@ output_dir = '' obj_names = [] diff --git a/mingw-w64-python3/0430-MINGW-find-import-library.patch b/mingw-w64-python3/0430-MINGW-find-import-library.patch index eb0a1ff44d..bc450eaddb 100644 --- a/mingw-w64-python3/0430-MINGW-find-import-library.patch +++ b/mingw-w64-python3/0430-MINGW-find-import-library.patch @@ -1,6 +1,6 @@ -diff -Naur a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py ---- a/Lib/distutils/cygwinccompiler.py 2014-05-20 00:55:37.200400000 +0400 -+++ b/Lib/distutils/cygwinccompiler.py 2014-05-20 00:55:37.372000000 +0400 +diff -urN a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py +--- a/Lib/distutils/cygwinccompiler.py 2014-10-11 14:20:36.095798400 +0100 ++++ b/Lib/distutils/cygwinccompiler.py 2014-10-11 14:20:39.245978600 +0100 @@ -93,6 +93,7 @@ obj_extension = ".o" static_lib_extension = ".a" diff --git a/mingw-w64-python3/0440-MINGW-setup-_ssl-module.patch b/mingw-w64-python3/0440-MINGW-setup-_ssl-module.patch index 979fcab219..b496d4cca9 100644 --- a/mingw-w64-python3/0440-MINGW-setup-_ssl-module.patch +++ b/mingw-w64-python3/0440-MINGW-setup-_ssl-module.patch @@ -1,7 +1,7 @@ -diff -Naur a/setup.py b/setup.py ---- a/setup.py 2014-05-20 00:55:33.331600000 +0400 -+++ b/setup.py 2014-05-20 00:55:39.415600000 +0400 -@@ -798,10 +798,13 @@ +diff -urN a/setup.py b/setup.py +--- a/setup.py 2014-10-11 14:20:41.346098700 +0100 ++++ b/setup.py 2014-10-11 14:20:43.085198200 +0100 +@@ -806,10 +806,13 @@ if (ssl_incs is not None and ssl_libs is not None): diff --git a/mingw-w64-python3/0450-MINGW-export-_PyNode_SizeOf-as-PyAPI-for-parser-modu.patch b/mingw-w64-python3/0450-MINGW-export-_PyNode_SizeOf-as-PyAPI-for-parser-modu.patch index 5dbceaddc9..4d123c55c4 100644 --- a/mingw-w64-python3/0450-MINGW-export-_PyNode_SizeOf-as-PyAPI-for-parser-modu.patch +++ b/mingw-w64-python3/0450-MINGW-export-_PyNode_SizeOf-as-PyAPI-for-parser-modu.patch @@ -1,6 +1,6 @@ -diff -Naur a/Include/node.h b/Include/node.h ---- a/Include/node.h 2014-05-19 09:19:37.000000000 +0400 -+++ b/Include/node.h 2014-05-20 00:55:41.521600000 +0400 +diff -urN a/Include/node.h b/Include/node.h +--- a/Include/node.h 2014-10-11 14:20:45.233321100 +0100 ++++ b/Include/node.h 2014-10-11 14:20:46.940418700 +0100 @@ -21,7 +21,7 @@ char *str, int lineno, int col_offset); PyAPI_FUNC(void) PyNode_Free(node *n); diff --git a/mingw-w64-python3/0460-MINGW-generalization-of-posix-build-in-sysconfig.py.patch b/mingw-w64-python3/0460-MINGW-generalization-of-posix-build-in-sysconfig.py.patch index 887effc5cb..fe992557f3 100644 --- a/mingw-w64-python3/0460-MINGW-generalization-of-posix-build-in-sysconfig.py.patch +++ b/mingw-w64-python3/0460-MINGW-generalization-of-posix-build-in-sysconfig.py.patch @@ -1,6 +1,6 @@ -diff -Naur a/Lib/sysconfig.py b/Lib/sysconfig.py ---- a/Lib/sysconfig.py 2014-05-20 00:55:35.188000000 +0400 -+++ b/Lib/sysconfig.py 2014-05-20 00:55:43.424800000 +0400 +diff -urN a/Lib/sysconfig.py b/Lib/sysconfig.py +--- a/Lib/sysconfig.py 2014-10-11 14:20:48.129486700 +0100 ++++ b/Lib/sysconfig.py 2014-10-11 14:20:50.802639600 +0100 @@ -95,6 +95,9 @@ _CONFIG_VARS = None _USER_BASE = None @@ -29,7 +29,7 @@ diff -Naur a/Lib/sysconfig.py b/Lib/sysconfig.py base = os.environ.get("APPDATA") or "~" if env_base: return env_base -@@ -461,7 +464,7 @@ +@@ -475,7 +478,7 @@ def get_config_h_filename(): """Return the path of pyconfig.h.""" if _PYTHON_BUILD: @@ -38,7 +38,7 @@ diff -Naur a/Lib/sysconfig.py b/Lib/sysconfig.py inc_dir = os.path.join(_sys_home or _PROJECT_BASE, "PC") else: inc_dir = _sys_home or _PROJECT_BASE -@@ -532,9 +535,9 @@ +@@ -546,9 +549,9 @@ # sys.abiflags may not be defined on all platforms. _CONFIG_VARS['abiflags'] = '' @@ -50,7 +50,7 @@ diff -Naur a/Lib/sysconfig.py b/Lib/sysconfig.py _init_posix(_CONFIG_VARS) # For backward compatibility, see issue19555 SO = _CONFIG_VARS.get('EXT_SUFFIX') -@@ -547,7 +550,7 @@ +@@ -561,7 +564,7 @@ # Always convert srcdir to an absolute path srcdir = _CONFIG_VARS.get('srcdir', _PROJECT_BASE) diff --git a/mingw-w64-python3/0462-MINGW-support-stdcall-without-underscore.patch b/mingw-w64-python3/0462-MINGW-support-stdcall-without-underscore.patch index c8aff237e6..f3cc87be51 100644 --- a/mingw-w64-python3/0462-MINGW-support-stdcall-without-underscore.patch +++ b/mingw-w64-python3/0462-MINGW-support-stdcall-without-underscore.patch @@ -1,7 +1,7 @@ -diff -Naur a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c ---- a/Modules/_ctypes/_ctypes.c 2014-05-19 09:19:39.000000000 +0400 -+++ b/Modules/_ctypes/_ctypes.c 2014-05-20 00:55:45.296800000 +0400 -@@ -3096,11 +3096,28 @@ +diff -urN a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c +--- a/Modules/_ctypes/_ctypes.c 2014-10-11 14:20:52.616743400 +0100 ++++ b/Modules/_ctypes/_ctypes.c 2014-10-11 14:20:54.635858900 +0100 +@@ -3079,11 +3079,28 @@ mangled_name = alloca(strlen(name) + 1 + 1 + 1 + 3); /* \0 _ @ %d */ if (!mangled_name) return NULL; diff --git a/mingw-w64-python3/0464-use-replace-instead-rename-to-avoid-failure-on-windo.patch b/mingw-w64-python3/0464-use-replace-instead-rename-to-avoid-failure-on-windo.patch index b60714c154..c1d94208ec 100644 --- a/mingw-w64-python3/0464-use-replace-instead-rename-to-avoid-failure-on-windo.patch +++ b/mingw-w64-python3/0464-use-replace-instead-rename-to-avoid-failure-on-windo.patch @@ -1,7 +1,7 @@ -diff -Naur a/setup.py b/setup.py ---- a/setup.py 2014-05-20 00:55:41.381200000 +0400 -+++ b/setup.py 2014-05-20 00:55:47.387200000 +0400 -@@ -2203,7 +2203,7 @@ +diff -urN a/setup.py b/setup.py +--- a/setup.py 2014-10-11 14:20:55.673918200 +0100 ++++ b/setup.py 2014-10-11 14:20:58.333070300 +0100 +@@ -2211,7 +2211,7 @@ else: newfilename = filename + minoronly log.info('renaming {} to {}'.format(filename, newfilename)) diff --git a/mingw-w64-python3/0470-MINGW-avoid-circular-dependency-from-time-module-dur.patch b/mingw-w64-python3/0470-MINGW-avoid-circular-dependency-from-time-module-dur.patch index f7bed82f90..c5d3f56e8f 100644 --- a/mingw-w64-python3/0470-MINGW-avoid-circular-dependency-from-time-module-dur.patch +++ b/mingw-w64-python3/0470-MINGW-avoid-circular-dependency-from-time-module-dur.patch @@ -1,6 +1,6 @@ -diff -Naur a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py ---- a/Lib/distutils/cygwinccompiler.py 2014-05-20 00:55:39.197200000 +0400 -+++ b/Lib/distutils/cygwinccompiler.py 2014-05-20 00:55:49.555600000 +0400 +diff -urN a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py +--- a/Lib/distutils/cygwinccompiler.py 2014-10-11 14:20:59.701148600 +0100 ++++ b/Lib/distutils/cygwinccompiler.py 2014-10-11 14:21:02.113286600 +0100 @@ -48,7 +48,6 @@ import os import sys diff --git a/mingw-w64-python3/0480-MINGW-generalization-of-posix-build-in-distutils-sys.patch b/mingw-w64-python3/0480-MINGW-generalization-of-posix-build-in-distutils-sys.patch index 1bf7168f41..c4128ae0f8 100644 --- a/mingw-w64-python3/0480-MINGW-generalization-of-posix-build-in-distutils-sys.patch +++ b/mingw-w64-python3/0480-MINGW-generalization-of-posix-build-in-distutils-sys.patch @@ -1,6 +1,6 @@ -diff -Naur a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py ---- a/Lib/distutils/sysconfig.py 2014-05-20 00:54:55.205200000 +0400 -+++ b/Lib/distutils/sysconfig.py 2014-05-20 00:55:51.521200000 +0400 +diff -urN a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py +--- a/Lib/distutils/sysconfig.py 2014-10-11 14:21:03.396359900 +0100 ++++ b/Lib/distutils/sysconfig.py 2014-10-11 14:21:05.979507700 +0100 @@ -62,6 +62,17 @@ return _is_python_source_dir(project_base) python_build = _python_build() @@ -37,7 +37,7 @@ diff -Naur a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py libpython = os.path.join(prefix, "lib", "python" + get_python_version()) if standard_lib: -@@ -252,7 +263,7 @@ +@@ -250,7 +261,7 @@ def get_config_h_filename(): """Return full pathname of installed pyconfig.h file.""" if python_build: @@ -46,7 +46,7 @@ diff -Naur a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py inc_dir = os.path.join(_sys_home or project_base, "PC") else: inc_dir = _sys_home or project_base -@@ -491,6 +502,9 @@ +@@ -474,6 +485,9 @@ def _init_nt(): @@ -56,7 +56,7 @@ diff -Naur a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py """Initialize the module as appropriate for NT""" g = {} # set basic install directories -@@ -540,7 +554,7 @@ +@@ -523,7 +537,7 @@ # Always convert srcdir to an absolute path srcdir = _config_vars.get('srcdir', project_base) @@ -65,7 +65,7 @@ diff -Naur a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py if python_build: # If srcdir is a relative path (typically '.' or '..') # then it should be interpreted relative to the directory -@@ -559,7 +573,7 @@ +@@ -542,7 +556,7 @@ # Normally it is relative to the build directory. However, during # testing, for example, we might be running a non-installed python # from a different directory. diff --git a/mingw-w64-python3/0490-MINGW-customize-site.patch b/mingw-w64-python3/0490-MINGW-customize-site.patch index b4052d5e60..b2b9e4fd84 100644 --- a/mingw-w64-python3/0490-MINGW-customize-site.patch +++ b/mingw-w64-python3/0490-MINGW-customize-site.patch @@ -1,6 +1,6 @@ -diff -Naur a/Lib/site.py b/Lib/site.py ---- a/Lib/site.py 2014-05-19 09:19:38.000000000 +0400 -+++ b/Lib/site.py 2014-05-20 00:55:53.564800000 +0400 +diff -urN a/Lib/site.py b/Lib/site.py +--- a/Lib/site.py 2014-10-11 14:21:07.163575400 +0100 ++++ b/Lib/site.py 2014-10-11 14:21:10.032739500 +0100 @@ -267,6 +267,12 @@ USER_SITE = get_path('purelib', 'osx_framework_user') return USER_SITE diff --git a/mingw-w64-python3/0500-add-python-config-sh.patch b/mingw-w64-python3/0500-add-python-config-sh.patch index 050efe0dac..b39ccb2c8b 100644 --- a/mingw-w64-python3/0500-add-python-config-sh.patch +++ b/mingw-w64-python3/0500-add-python-config-sh.patch @@ -1,6 +1,6 @@ -diff -Naur a/Misc/python-config.sh.in b/Misc/python-config.sh.in ---- a/Misc/python-config.sh.in 2014-05-19 09:19:39.000000000 +0400 -+++ b/Misc/python-config.sh.in 2014-05-20 00:55:55.748800000 +0400 +diff -urN a/Misc/python-config.sh.in b/Misc/python-config.sh.in +--- a/Misc/python-config.sh.in 2014-10-11 14:21:11.611829800 +0100 ++++ b/Misc/python-config.sh.in 2014-10-11 14:21:13.685948500 +0100 @@ -1,25 +1,37 @@ #!/bin/sh diff --git a/mingw-w64-python3/0510-cross-darwin-feature.patch b/mingw-w64-python3/0510-cross-darwin-feature.patch index 92c3265c40..48644bc218 100644 --- a/mingw-w64-python3/0510-cross-darwin-feature.patch +++ b/mingw-w64-python3/0510-cross-darwin-feature.patch @@ -1,7 +1,7 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2014-05-20 00:55:28.355200000 +0400 -+++ b/configure.ac 2014-05-20 00:55:57.652000000 +0400 -@@ -371,6 +371,7 @@ +diff -urN a/configure.ac b/configure.ac +--- a/configure.ac 2014-10-11 14:21:14.772010600 +0100 ++++ b/configure.ac 2014-10-11 14:21:17.561170100 +0100 +@@ -374,6 +374,7 @@ then # avoid using uname for cross builds if test "$cross_compiling" = yes; then @@ -9,7 +9,7 @@ diff -Naur a/configure.ac b/configure.ac # ac_sys_system and ac_sys_release are used for setting # a lot of different things including 'define_xopen_source' # in the case statement below. -@@ -381,12 +382,32 @@ +@@ -384,12 +385,32 @@ *-*-cygwin*) ac_sys_system=Cygwin ;; @@ -43,7 +43,7 @@ diff -Naur a/configure.ac b/configure.ac else ac_sys_system=`uname -s` if test "$ac_sys_system" = "AIX" \ -@@ -429,6 +450,9 @@ +@@ -432,6 +453,9 @@ *-*-mingw*) _host_cpu= ;; @@ -53,9 +53,9 @@ diff -Naur a/configure.ac b/configure.ac *) # for now, limit cross builds to known configurations MACHDEP="unknown" -@@ -1201,6 +1225,26 @@ - +@@ -1205,6 +1229,26 @@ AC_SUBST(BASECFLAGS) + AC_SUBST(CFLAGS_NODIST) +if test "x$cross_compiling" = xyes; then + function cross_arch @@ -80,7 +80,7 @@ diff -Naur a/configure.ac b/configure.ac # The -arch flags for universal builds on OSX UNIVERSAL_ARCH_FLAGS= AC_SUBST(UNIVERSAL_ARCH_FLAGS) -@@ -1394,7 +1438,7 @@ +@@ -1404,7 +1448,7 @@ ;; esac else @@ -89,7 +89,7 @@ diff -Naur a/configure.ac b/configure.ac then # 10.4 was the first release to support Intel archs cur_target="10.4" -@@ -1965,7 +2009,7 @@ +@@ -1975,7 +2019,7 @@ if test "${enable_universalsdk}"; then : else @@ -98,7 +98,7 @@ diff -Naur a/configure.ac b/configure.ac fi LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';; -@@ -1990,7 +2034,7 @@ +@@ -2000,7 +2044,7 @@ ]])],[ac_osx_32bit=yes],[ac_osx_32bit=no],[ac_osx_32bit=yes]) if test "${ac_osx_32bit}" = "yes"; then @@ -107,7 +107,7 @@ diff -Naur a/configure.ac b/configure.ac i386) MACOSX_DEFAULT_ARCH="i386" ;; -@@ -2002,7 +2046,7 @@ +@@ -2012,7 +2056,7 @@ ;; esac else diff --git a/mingw-w64-python3/0520-py3k-mingw-ntthreads-vs-pthreads.patch b/mingw-w64-python3/0520-py3k-mingw-ntthreads-vs-pthreads.patch index 3262b04e70..e144e3d6e2 100644 --- a/mingw-w64-python3/0520-py3k-mingw-ntthreads-vs-pthreads.patch +++ b/mingw-w64-python3/0520-py3k-mingw-ntthreads-vs-pthreads.patch @@ -1,7 +1,7 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2014-05-20 00:55:59.773600000 +0400 -+++ b/configure.ac 2014-05-20 00:55:59.914000000 +0400 -@@ -1698,7 +1698,7 @@ +diff -urN a/configure.ac b/configure.ac +--- a/configure.ac 2014-10-11 14:21:18.680234100 +0100 ++++ b/configure.ac 2014-10-11 14:21:21.473393900 +0100 +@@ -1708,7 +1708,7 @@ AC_HEADER_STDC AC_CHECK_HEADERS(asm/types.h conio.h direct.h dlfcn.h errno.h \ fcntl.h grp.h \ @@ -10,7 +10,7 @@ diff -Naur a/configure.ac b/configure.ac sched.h shadow.h signal.h stdint.h stropts.h termios.h \ unistd.h utime.h \ poll.h sys/devpoll.h sys/epoll.h sys/poll.h \ -@@ -2401,9 +2401,11 @@ +@@ -2418,9 +2418,11 @@ : else if test "$with_threads" = "yes" -o -z "$with_threads"; then @@ -25,7 +25,7 @@ diff -Naur a/configure.ac b/configure.ac fi fi -@@ -4655,6 +4657,14 @@ +@@ -4672,6 +4674,14 @@ AC_CHECK_HEADERS(curses.h ncurses.h) @@ -40,9 +40,9 @@ diff -Naur a/configure.ac b/configure.ac # On Solaris, term.h requires curses.h AC_CHECK_HEADERS(term.h,,,[ #ifdef HAVE_CURSES_H -diff -Naur a/Python/condvar.h b/Python/condvar.h ---- a/Python/condvar.h 2014-05-19 09:19:39.000000000 +0400 -+++ b/Python/condvar.h 2014-05-20 00:55:59.914000000 +0400 +diff -urN a/Python/condvar.h b/Python/condvar.h +--- a/Python/condvar.h 2014-10-11 14:21:18.718236300 +0100 ++++ b/Python/condvar.h 2014-10-11 14:21:21.475394000 +0100 @@ -42,6 +42,12 @@ #include "Python.h" @@ -56,9 +56,9 @@ diff -Naur a/Python/condvar.h b/Python/condvar.h #ifndef _POSIX_THREADS /* This means pthreads are not implemented in libc headers, hence the macro not present in unistd.h. But they still can be implemented as an external -diff -Naur a/Python/thread.c b/Python/thread.c ---- a/Python/thread.c 2014-05-19 09:19:40.000000000 +0400 -+++ b/Python/thread.c 2014-05-20 00:55:59.929600000 +0400 +diff -urN a/Python/thread.c b/Python/thread.c +--- a/Python/thread.c 2014-10-11 14:21:18.719236400 +0100 ++++ b/Python/thread.c 2014-10-11 14:21:21.476394100 +0100 @@ -7,6 +7,12 @@ #include "Python.h" diff --git a/mingw-w64-python3/0530-mingw-system-libffi.patch b/mingw-w64-python3/0530-mingw-system-libffi.patch index 645defa238..61814599b1 100644 --- a/mingw-w64-python3/0530-mingw-system-libffi.patch +++ b/mingw-w64-python3/0530-mingw-system-libffi.patch @@ -1,7 +1,7 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2014-05-20 00:56:01.817200000 +0400 -+++ b/configure.ac 2014-05-20 00:56:01.973200000 +0400 -@@ -2516,14 +2516,32 @@ +diff -urN a/configure.ac b/configure.ac +--- a/configure.ac 2014-10-11 14:21:22.670462400 +0100 ++++ b/configure.ac 2014-10-11 14:21:25.420619700 +0100 +@@ -2533,14 +2533,32 @@ [], [with_system_ffi="no"]) @@ -37,18 +37,18 @@ diff -Naur a/configure.ac b/configure.ac # Check for use of the system libmpdec library AC_MSG_CHECKING(for --with-system-libmpdec) -diff -Naur a/Lib/ctypes/test/test_as_parameter.py b/Lib/ctypes/test/test_as_parameter.py ---- a/Lib/ctypes/test/test_as_parameter.py 2014-05-19 09:19:37.000000000 +0400 -+++ b/Lib/ctypes/test/test_as_parameter.py 2014-05-20 00:56:01.973200000 +0400 -@@ -1,6 +1,7 @@ - import unittest +diff -urN a/Lib/ctypes/test/test_as_parameter.py b/Lib/ctypes/test/test_as_parameter.py +--- a/Lib/ctypes/test/test_as_parameter.py 2014-10-11 14:21:22.822471100 +0100 ++++ b/Lib/ctypes/test/test_as_parameter.py 2014-10-11 14:21:25.422619800 +0100 +@@ -2,6 +2,7 @@ from ctypes import * + from ctypes.test import need_symbol import _ctypes_test +import sys dll = CDLL(_ctypes_test.__file__) -@@ -171,6 +172,10 @@ +@@ -169,6 +170,10 @@ s2h = dll.ret_2h_func(self.wrap(inp)) self.assertEqual((s2h.x, s2h.y), (99*2, 88*3)) @@ -59,12 +59,12 @@ diff -Naur a/Lib/ctypes/test/test_as_parameter.py b/Lib/ctypes/test/test_as_para def test_struct_return_8H(self): class S8I(Structure): _fields_ = [("a", c_int), -diff -Naur a/Lib/ctypes/test/test_functions.py b/Lib/ctypes/test/test_functions.py ---- a/Lib/ctypes/test/test_functions.py 2014-05-19 09:19:37.000000000 +0400 -+++ b/Lib/ctypes/test/test_functions.py 2014-05-20 00:56:01.973200000 +0400 -@@ -359,6 +359,10 @@ - s2h = windll.s_ret_2h_func(S2H(99, 88)) - self.assertEqual((s2h.x, s2h.y), (99*2, 88*3)) +diff -urN a/Lib/ctypes/test/test_functions.py b/Lib/ctypes/test/test_functions.py +--- a/Lib/ctypes/test/test_functions.py 2014-10-11 14:21:22.810470400 +0100 ++++ b/Lib/ctypes/test/test_functions.py 2014-10-11 14:21:25.424619900 +0100 +@@ -352,6 +352,10 @@ + s2h = windll.s_ret_2h_func(S2H(99, 88)) + self.assertEqual((s2h.x, s2h.y), (99*2, 88*3)) + # This is known cdecl incompatibility between GCC + # and MSVC. It is addressed in GCC issue #36834. @@ -73,10 +73,10 @@ diff -Naur a/Lib/ctypes/test/test_functions.py b/Lib/ctypes/test/test_functions. def test_struct_return_8H(self): class S8I(Structure): _fields_ = [("a", c_int), -diff -Naur a/Modules/_ctypes/libffi/fficonfig.py.in b/Modules/_ctypes/libffi/fficonfig.py.in ---- a/Modules/_ctypes/libffi/fficonfig.py.in 2014-05-19 09:19:39.000000000 +0400 -+++ b/Modules/_ctypes/libffi/fficonfig.py.in 2014-05-20 00:56:01.973200000 +0400 -@@ -22,6 +22,7 @@ +diff -urN a/Modules/_ctypes/libffi/fficonfig.py.in b/Modules/_ctypes/libffi/fficonfig.py.in +--- a/Modules/_ctypes/libffi/fficonfig.py.in 2014-10-11 14:21:23.544512400 +0100 ++++ b/Modules/_ctypes/libffi/fficonfig.py.in 2014-10-11 14:21:25.425619900 +0100 +@@ -23,6 +23,7 @@ 'FRV': ['src/frv/eabi.S', 'src/frv/ffi.c'], 'S390': ['src/s390/sysv.S', 'src/s390/ffi.c'], 'X86_64': ['src/x86/ffi64.c', 'src/x86/unix64.S', 'src/x86/ffi.c', 'src/x86/sysv.S'], @@ -84,7 +84,7 @@ diff -Naur a/Modules/_ctypes/libffi/fficonfig.py.in b/Modules/_ctypes/libffi/ffi 'SH': ['src/sh/sysv.S', 'src/sh/ffi.c'], 'SH64': ['src/sh64/sysv.S', 'src/sh64/ffi.c'], 'PA': ['src/pa/linux.S', 'src/pa/ffi.c'], -@@ -29,6 +30,9 @@ +@@ -30,6 +31,9 @@ 'PA_HPUX': ['src/pa/hpux32.S', 'src/pa/ffi.c'], } @@ -94,9 +94,9 @@ diff -Naur a/Modules/_ctypes/libffi/fficonfig.py.in b/Modules/_ctypes/libffi/ffi ffi_sources += ffi_platforms['@TARGET@'] ffi_cflags = '@CFLAGS@' -diff -Naur a/pyconfig.h.in b/pyconfig.h.in ---- a/pyconfig.h.in 2014-05-20 00:55:28.417600000 +0400 -+++ b/pyconfig.h.in 2014-05-20 00:56:01.988800000 +0400 +diff -urN a/pyconfig.h.in b/pyconfig.h.in +--- a/pyconfig.h.in 2014-10-11 14:21:23.287497700 +0100 ++++ b/pyconfig.h.in 2014-10-11 14:21:25.427620100 +0100 @@ -1352,6 +1352,9 @@ /* Define if you want to compile in Python-specific mallocs */ #undef WITH_PYMALLOC @@ -107,10 +107,10 @@ diff -Naur a/pyconfig.h.in b/pyconfig.h.in /* Define if you want to compile in rudimentary thread support */ #undef WITH_THREAD -diff -Naur a/setup.py b/setup.py ---- a/setup.py 2014-05-20 00:55:49.415200000 +0400 -+++ b/setup.py 2014-05-20 00:56:01.988800000 +0400 -@@ -1872,6 +1872,11 @@ +diff -urN a/setup.py b/setup.py +--- a/setup.py 2014-10-11 14:21:22.671462400 +0100 ++++ b/setup.py 2014-10-11 14:21:25.428620100 +0100 +@@ -1880,6 +1880,11 @@ return True def configure_ctypes(self, ext): @@ -122,7 +122,7 @@ diff -Naur a/setup.py b/setup.py if not self.use_system_libffi: if host_platform == 'darwin': return self.configure_ctypes_darwin(ext) -@@ -1896,6 +1901,10 @@ +@@ -1904,6 +1909,10 @@ if not self.verbose: config_args.append("-q") diff --git a/mingw-w64-python3/0540-mingw-semicolon-DELIM.patch b/mingw-w64-python3/0540-mingw-semicolon-DELIM.patch index 92dd797a74..98678800a5 100644 --- a/mingw-w64-python3/0540-mingw-semicolon-DELIM.patch +++ b/mingw-w64-python3/0540-mingw-semicolon-DELIM.patch @@ -1,7 +1,7 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2014-05-20 00:56:03.876400000 +0400 -+++ b/configure.ac 2014-05-20 00:56:04.110400000 +0400 -@@ -599,6 +599,16 @@ +diff -urN a/configure.ac b/configure.ac +--- a/configure.ac 2014-10-11 14:21:26.491680900 +0100 ++++ b/configure.ac 2014-10-11 14:21:29.254839000 +0100 +@@ -602,6 +602,16 @@ fi AC_MSG_RESULT($MACHDEP) @@ -18,9 +18,9 @@ diff -Naur a/configure.ac b/configure.ac AC_MSG_CHECKING([for init system calls]) AC_SUBST(INITSYS) case $host in -diff -Naur a/Include/osdefs.h b/Include/osdefs.h ---- a/Include/osdefs.h 2014-05-19 09:19:37.000000000 +0400 -+++ b/Include/osdefs.h 2014-05-20 00:56:04.110400000 +0400 +diff -urN a/Include/osdefs.h b/Include/osdefs.h +--- a/Include/osdefs.h 2014-10-11 14:21:27.447735600 +0100 ++++ b/Include/osdefs.h 2014-10-11 14:21:29.255839000 +0100 @@ -14,6 +14,7 @@ #define ALTSEP L'/' #define MAXPATHLEN 256 @@ -37,12 +37,12 @@ diff -Naur a/Include/osdefs.h b/Include/osdefs.h #endif #ifdef __cplusplus -diff -Naur a/Makefile.pre.in b/Makefile.pre.in ---- a/Makefile.pre.in 2014-05-20 00:55:15.688000000 +0400 -+++ b/Makefile.pre.in 2014-05-20 00:56:04.110400000 +0400 -@@ -93,7 +93,8 @@ +diff -urN a/Makefile.pre.in b/Makefile.pre.in +--- a/Makefile.pre.in 2014-10-11 14:21:27.062713600 +0100 ++++ b/Makefile.pre.in 2014-10-11 14:21:29.256839100 +0100 +@@ -98,7 +98,8 @@ # C flags used for building the interpreter object files - PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE + PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CFLAGS_NODIST) $(PY_CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE - +# ; on Windows otherwise : @@ -50,9 +50,9 @@ diff -Naur a/Makefile.pre.in b/Makefile.pre.in # Machine-dependent subdirectories MACHDEP= @MACHDEP@ -diff -Naur a/Modules/getpath.c b/Modules/getpath.c ---- a/Modules/getpath.c 2014-05-19 09:19:39.000000000 +0400 -+++ b/Modules/getpath.c 2014-05-20 00:56:04.126000000 +0400 +diff -urN a/Modules/getpath.c b/Modules/getpath.c +--- a/Modules/getpath.c 2014-10-11 14:21:27.212722200 +0100 ++++ b/Modules/getpath.c 2014-10-11 14:21:29.258839200 +0100 @@ -118,7 +118,7 @@ #endif @@ -62,9 +62,9 @@ diff -Naur a/Modules/getpath.c b/Modules/getpath.c EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" #endif -diff -Naur a/Modules/Setup.dist b/Modules/Setup.dist ---- a/Modules/Setup.dist 2014-05-20 00:54:44.878000000 +0400 -+++ b/Modules/Setup.dist 2014-05-20 00:56:04.126000000 +0400 +diff -urN a/Modules/Setup.dist b/Modules/Setup.dist +--- a/Modules/Setup.dist 2014-10-11 14:21:27.422734200 +0100 ++++ b/Modules/Setup.dist 2014-10-11 14:21:29.259839300 +0100 @@ -84,14 +84,14 @@ # Empty since this is now just the runtime prefix. DESTPATH= diff --git a/mingw-w64-python3/0550-mingw-regen-use-stddef_h.patch b/mingw-w64-python3/0550-mingw-regen-use-stddef_h.patch index 8b453173d9..5bfb75fa91 100644 --- a/mingw-w64-python3/0550-mingw-regen-use-stddef_h.patch +++ b/mingw-w64-python3/0550-mingw-regen-use-stddef_h.patch @@ -1,6 +1,6 @@ -diff -Naur a/Lib/plat-generic/regen b/Lib/plat-generic/regen ---- a/Lib/plat-generic/regen 2014-05-19 09:19:38.000000000 +0400 -+++ b/Lib/plat-generic/regen 2014-05-20 00:56:06.481600000 +0400 +diff -urN a/Lib/plat-generic/regen b/Lib/plat-generic/regen +--- a/Lib/plat-generic/regen 2014-10-11 14:21:30.502910400 +0100 ++++ b/Lib/plat-generic/regen 2014-10-11 14:21:33.107059300 +0100 @@ -1,3 +1,9 @@ #! /bin/sh set -v @@ -12,10 +12,10 @@ diff -Naur a/Lib/plat-generic/regen b/Lib/plat-generic/regen + REGENHEADER=/usr/include/netinet/in.h +fi +eval $PYTHON_FOR_BUILD ../../Tools/scripts/h2py.py -i "'(u_long)'" $REGENHEADER -diff -Naur a/Makefile.pre.in b/Makefile.pre.in ---- a/Makefile.pre.in 2014-05-20 00:56:06.325600000 +0400 -+++ b/Makefile.pre.in 2014-05-20 00:56:06.481600000 +0400 -@@ -1274,7 +1274,7 @@ +diff -urN a/Makefile.pre.in b/Makefile.pre.in +--- a/Makefile.pre.in 2014-10-11 14:21:31.602973300 +0100 ++++ b/Makefile.pre.in 2014-10-11 14:21:33.108059400 +0100 +@@ -1289,7 +1289,7 @@ else \ PYTHON_FOR_BUILD="$(PYTHON_FOR_BUILD)"; \ fi; \ diff --git a/mingw-w64-python3/0560-mingw-use-posix-getpath.patch b/mingw-w64-python3/0560-mingw-use-posix-getpath.patch index ac86ff072b..091fa4badd 100644 --- a/mingw-w64-python3/0560-mingw-use-posix-getpath.patch +++ b/mingw-w64-python3/0560-mingw-use-posix-getpath.patch @@ -1,7 +1,7 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2014-05-20 00:56:06.310000000 +0400 -+++ b/configure.ac 2014-05-20 00:56:08.369200000 +0400 -@@ -5014,7 +5014,7 @@ +diff -urN a/configure.ac b/configure.ac +--- a/configure.ac 2014-10-11 14:21:34.252124800 +0100 ++++ b/configure.ac 2014-10-11 14:21:37.003282200 +0100 +@@ -5031,7 +5031,7 @@ case $host in *-*-mingw*) dnl default sys.path calculations for windows platforms @@ -10,9 +10,9 @@ diff -Naur a/configure.ac b/configure.ac ;; esac -diff -Naur a/Include/fileutils.h b/Include/fileutils.h ---- a/Include/fileutils.h 2014-05-19 09:19:37.000000000 +0400 -+++ b/Include/fileutils.h 2014-05-20 00:56:08.369200000 +0400 +diff -urN a/Include/fileutils.h b/Include/fileutils.h +--- a/Include/fileutils.h 2014-10-11 14:21:35.290184200 +0100 ++++ b/Include/fileutils.h 2014-10-11 14:21:37.005282300 +0100 @@ -15,7 +15,7 @@ const wchar_t *text, size_t *error_pos); @@ -22,9 +22,9 @@ diff -Naur a/Include/fileutils.h b/Include/fileutils.h PyAPI_FUNC(int) _Py_wstat( const wchar_t* path, struct stat *buf); -diff -Naur a/Modules/getpath.c b/Modules/getpath.c ---- a/Modules/getpath.c 2014-05-20 00:56:06.325600000 +0400 -+++ b/Modules/getpath.c 2014-05-20 00:56:08.384800000 +0400 +diff -urN a/Modules/getpath.c b/Modules/getpath.c +--- a/Modules/getpath.c 2014-10-11 14:21:35.080172200 +0100 ++++ b/Modules/getpath.c 2014-10-11 14:21:37.006282300 +0100 @@ -10,6 +10,10 @@ #include #endif @@ -203,9 +203,9 @@ diff -Naur a/Modules/getpath.c b/Modules/getpath.c +#ifdef __cplusplus +} +#endif -diff -Naur a/Modules/posixmodule.c b/Modules/posixmodule.c ---- a/Modules/posixmodule.c 2014-05-20 00:54:39.901600000 +0400 -+++ b/Modules/posixmodule.c 2014-05-20 00:56:08.384800000 +0400 +diff -urN a/Modules/posixmodule.c b/Modules/posixmodule.c +--- a/Modules/posixmodule.c 2014-10-11 14:21:35.095173000 +0100 ++++ b/Modules/posixmodule.c 2014-10-11 14:21:37.010282600 +0100 @@ -1019,7 +1019,7 @@ } @@ -233,9 +233,9 @@ diff -Naur a/Modules/posixmodule.c b/Modules/posixmodule.c Py_DECREF(list); list = path_error(path); goto exit; -diff -Naur a/Python/fileutils.c b/Python/fileutils.c ---- a/Python/fileutils.c 2014-05-19 09:19:40.000000000 +0400 -+++ b/Python/fileutils.c 2014-05-20 00:56:08.431600000 +0400 +diff -urN a/Python/fileutils.c b/Python/fileutils.c +--- a/Python/fileutils.c 2014-10-11 14:21:34.292127100 +0100 ++++ b/Python/fileutils.c 2014-10-11 14:21:37.011282600 +0100 @@ -511,7 +511,7 @@ Not sure whether the MS_WINDOWS guards are necessary: perhaps for cygwin/mingw builds? diff --git a/mingw-w64-python3/0565-mingw-add-ModuleFileName-dir-to-PATH.patch b/mingw-w64-python3/0565-mingw-add-ModuleFileName-dir-to-PATH.patch index 94305db1fa..7e44981da9 100644 --- a/mingw-w64-python3/0565-mingw-add-ModuleFileName-dir-to-PATH.patch +++ b/mingw-w64-python3/0565-mingw-add-ModuleFileName-dir-to-PATH.patch @@ -1,6 +1,6 @@ -diff -Naur a/Modules/getpath.c b/Modules/getpath.c ---- a/Modules/getpath.c 2014-05-20 00:56:10.241200000 +0400 -+++ b/Modules/getpath.c 2014-05-20 00:56:10.428400000 +0400 +diff -urN a/Modules/getpath.c b/Modules/getpath.c +--- a/Modules/getpath.c 2014-10-11 14:21:38.969394600 +0100 ++++ b/Modules/getpath.c 2014-10-11 14:21:40.899505000 +0100 @@ -872,6 +872,32 @@ else wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN); diff --git a/mingw-w64-python3/0570-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch b/mingw-w64-python3/0570-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch index db1544f400..883fee1c0d 100644 --- a/mingw-w64-python3/0570-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch +++ b/mingw-w64-python3/0570-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch @@ -1,6 +1,6 @@ -diff -Naur a/Modules/Setup.config.in b/Modules/Setup.config.in ---- a/Modules/Setup.config.in 2014-05-20 00:54:44.878000000 +0400 -+++ b/Modules/Setup.config.in 2014-05-20 00:56:12.409600000 +0400 +diff -urN a/Modules/Setup.config.in b/Modules/Setup.config.in +--- a/Modules/Setup.config.in 2014-10-11 14:21:42.640604600 +0100 ++++ b/Modules/Setup.config.in 2014-10-11 14:21:44.587716000 +0100 @@ -17,6 +17,8 @@ # build-in modules for windows platform: diff --git a/mingw-w64-python3/0580-mingw32-test-REPARSE_DATA_BUFFER.patch b/mingw-w64-python3/0580-mingw32-test-REPARSE_DATA_BUFFER.patch index 3d74870d18..e04d38d6c4 100644 --- a/mingw-w64-python3/0580-mingw32-test-REPARSE_DATA_BUFFER.patch +++ b/mingw-w64-python3/0580-mingw32-test-REPARSE_DATA_BUFFER.patch @@ -1,7 +1,7 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2014-05-20 00:56:10.241200000 +0400 -+++ b/configure.ac 2014-05-20 00:56:14.468800000 +0400 -@@ -4346,6 +4346,28 @@ +diff -urN a/configure.ac b/configure.ac +--- a/configure.ac 2014-10-11 14:21:45.694779300 +0100 ++++ b/configure.ac 2014-10-11 14:21:48.382933000 +0100 +@@ -4363,6 +4363,28 @@ # check for endianness AC_C_BIGENDIAN diff --git a/mingw-w64-python3/0590-mingw-INSTALL_SHARED-LDLIBRARY-LIBPL.patch b/mingw-w64-python3/0590-mingw-INSTALL_SHARED-LDLIBRARY-LIBPL.patch index e0a239f2ca..c840d9c061 100644 --- a/mingw-w64-python3/0590-mingw-INSTALL_SHARED-LDLIBRARY-LIBPL.patch +++ b/mingw-w64-python3/0590-mingw-INSTALL_SHARED-LDLIBRARY-LIBPL.patch @@ -1,7 +1,7 @@ -diff -Naur a/Makefile.pre.in b/Makefile.pre.in ---- a/Makefile.pre.in 2014-05-20 00:56:08.228800000 +0400 -+++ b/Makefile.pre.in 2014-05-20 00:56:16.590400000 +0400 -@@ -1056,6 +1056,7 @@ +diff -urN a/Makefile.pre.in b/Makefile.pre.in +--- a/Makefile.pre.in 2014-10-11 14:21:49.602002800 +0100 ++++ b/Makefile.pre.in 2014-10-11 14:21:52.301157100 +0100 +@@ -1071,6 +1071,7 @@ if test -f $(LDLIBRARY) && test "$(PYTHONFRAMEWORKDIR)" = "no-framework" ; then \ if test -n "$(DLLLIBRARY)" ; then \ $(INSTALL_SHARED) $(DLLLIBRARY) $(DESTDIR)$(BINDIR); \ diff --git a/mingw-w64-python3/0600-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch b/mingw-w64-python3/0600-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch index 88360a4a62..57344775f7 100644 --- a/mingw-w64-python3/0600-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch +++ b/mingw-w64-python3/0600-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch @@ -1,6 +1,6 @@ -diff -Naur a/Include/osdefs.h b/Include/osdefs.h ---- a/Include/osdefs.h 2014-05-20 00:56:06.325600000 +0400 -+++ b/Include/osdefs.h 2014-05-20 00:56:18.509200000 +0400 +diff -urN a/Include/osdefs.h b/Include/osdefs.h +--- a/Include/osdefs.h 2014-10-11 14:21:54.729296000 +0100 ++++ b/Include/osdefs.h 2014-10-11 14:21:56.586402200 +0100 @@ -10,8 +10,13 @@ /* Mod by chrish: QNX has WATCOM, but isn't DOS */ #if !defined(__QNX__) @@ -15,9 +15,9 @@ diff -Naur a/Include/osdefs.h b/Include/osdefs.h #define MAXPATHLEN 256 #define DELIM L';' #define DELIMSTR ";" -diff -Naur a/Lib/ntpath.py b/Lib/ntpath.py ---- a/Lib/ntpath.py 2014-05-19 09:19:38.000000000 +0400 -+++ b/Lib/ntpath.py 2014-05-20 00:56:18.509200000 +0400 +diff -urN a/Lib/ntpath.py b/Lib/ntpath.py +--- a/Lib/ntpath.py 2014-10-11 14:21:53.975252900 +0100 ++++ b/Lib/ntpath.py 2014-10-11 14:21:56.588402400 +0100 @@ -24,9 +24,13 @@ curdir = '.' pardir = '..' @@ -62,9 +62,9 @@ diff -Naur a/Lib/ntpath.py b/Lib/ntpath.py def _get_dot(path): if isinstance(path, bytes): -diff -Naur a/Python/pythonrun.c b/Python/pythonrun.c ---- a/Python/pythonrun.c 2014-05-19 09:19:40.000000000 +0400 -+++ b/Python/pythonrun.c 2014-05-20 00:56:18.509200000 +0400 +diff -urN a/Python/pythonrun.c b/Python/pythonrun.c +--- a/Python/pythonrun.c 2014-10-11 14:21:53.853245900 +0100 ++++ b/Python/pythonrun.c 2014-10-11 14:21:56.591402500 +0100 @@ -871,17 +871,34 @@ PyInterpreterState_Delete(interp); } diff --git a/mingw-w64-python3/0610-msys-cygwin-semi-native-build-sysconfig.patch b/mingw-w64-python3/0610-msys-cygwin-semi-native-build-sysconfig.patch index 79a7b16745..1c906500b2 100644 --- a/mingw-w64-python3/0610-msys-cygwin-semi-native-build-sysconfig.patch +++ b/mingw-w64-python3/0610-msys-cygwin-semi-native-build-sysconfig.patch @@ -1,7 +1,7 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2014-05-20 00:56:16.450000000 +0400 -+++ b/configure.ac 2014-05-20 00:56:20.568400000 +0400 -@@ -609,6 +609,65 @@ +diff -urN a/configure.ac b/configure.ac +--- a/configure.ac 2014-10-11 14:21:57.625461700 +0100 ++++ b/configure.ac 2014-10-11 14:22:00.282613700 +0100 +@@ -612,6 +612,65 @@ AC_MSG_RESULT([$DELIM]) AC_SUBST(DELIM) @@ -67,10 +67,10 @@ diff -Naur a/configure.ac b/configure.ac AC_MSG_CHECKING([for init system calls]) AC_SUBST(INITSYS) case $host in -diff -Naur a/Lib/sysconfig.py b/Lib/sysconfig.py ---- a/Lib/sysconfig.py 2014-05-20 00:55:45.156400000 +0400 -+++ b/Lib/sysconfig.py 2014-05-20 00:56:20.599600000 +0400 -@@ -329,6 +329,14 @@ +diff -urN a/Lib/sysconfig.py b/Lib/sysconfig.py +--- a/Lib/sysconfig.py 2014-10-11 14:21:57.705466200 +0100 ++++ b/Lib/sysconfig.py 2014-10-11 14:22:00.284613800 +0100 +@@ -330,6 +330,14 @@ if isinstance(v, str): done[k] = v.strip() @@ -85,10 +85,10 @@ diff -Naur a/Lib/sysconfig.py b/Lib/sysconfig.py # save the results in the global dictionary vars.update(done) return vars -diff -Naur a/Makefile.pre.in b/Makefile.pre.in ---- a/Makefile.pre.in 2014-05-20 00:56:18.353200000 +0400 -+++ b/Makefile.pre.in 2014-05-20 00:56:20.615200000 +0400 -@@ -110,6 +110,13 @@ +diff -urN a/Makefile.pre.in b/Makefile.pre.in +--- a/Makefile.pre.in 2014-10-11 14:21:57.625461700 +0100 ++++ b/Makefile.pre.in 2014-10-11 14:22:00.286613900 +0100 +@@ -115,6 +115,13 @@ # Install prefix for data files datarootdir= @datarootdir@ @@ -102,7 +102,7 @@ diff -Naur a/Makefile.pre.in b/Makefile.pre.in # Expanded directories BINDIR= @bindir@ LIBDIR= @libdir@ -@@ -696,7 +703,7 @@ +@@ -711,7 +718,7 @@ -DPREFIX='"$(prefix)"' \ -DEXEC_PREFIX='"$(exec_prefix)"' \ -DVERSION='"$(VERSION)"' \ diff --git a/mingw-w64-python3/0620-mingw-sysconfig-like-posix.patch b/mingw-w64-python3/0620-mingw-sysconfig-like-posix.patch index 4dcbde7aa9..9e88a9feec 100644 --- a/mingw-w64-python3/0620-mingw-sysconfig-like-posix.patch +++ b/mingw-w64-python3/0620-mingw-sysconfig-like-posix.patch @@ -1,7 +1,7 @@ -diff -Naur a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py ---- a/Lib/distutils/command/build_ext.py 2014-05-20 00:55:35.188000000 +0400 -+++ b/Lib/distutils/command/build_ext.py 2014-05-20 00:56:22.690000000 +0400 -@@ -235,9 +235,10 @@ +diff -urN a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py +--- a/Lib/distutils/command/build_ext.py 2014-10-11 14:22:01.460681000 +0100 ++++ b/Lib/distutils/command/build_ext.py 2014-10-11 14:22:04.124833400 +0100 +@@ -226,9 +226,10 @@ if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos': if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")): # building third party extensions @@ -13,9 +13,9 @@ diff -Naur a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ex else: # building python standard extensions self.library_dirs.append('.') -diff -Naur a/Lib/sysconfig.py b/Lib/sysconfig.py ---- a/Lib/sysconfig.py 2014-05-20 00:56:22.487200000 +0400 -+++ b/Lib/sysconfig.py 2014-05-20 00:56:22.690000000 +0400 +diff -urN a/Lib/sysconfig.py b/Lib/sysconfig.py +--- a/Lib/sysconfig.py 2014-10-11 14:22:01.449680400 +0100 ++++ b/Lib/sysconfig.py 2014-10-11 14:22:04.125833500 +0100 @@ -42,22 +42,22 @@ 'data': '{base}', }, @@ -52,7 +52,7 @@ diff -Naur a/Lib/sysconfig.py b/Lib/sysconfig.py 'data': '{userbase}', }, 'posix_user': { -@@ -429,7 +429,7 @@ +@@ -443,7 +443,7 @@ vars['INCLUDEPY'] = get_path('include') vars['EXT_SUFFIX'] = '.pyd' vars['EXE'] = '.exe' diff --git a/mingw-w64-python3/0630-mingw-_winapi_as_builtin_for_Popen_in_cygwinccompiler.patch b/mingw-w64-python3/0630-mingw-_winapi_as_builtin_for_Popen_in_cygwinccompiler.patch index fbecbd487e..d3e2cf7d0c 100644 --- a/mingw-w64-python3/0630-mingw-_winapi_as_builtin_for_Popen_in_cygwinccompiler.patch +++ b/mingw-w64-python3/0630-mingw-_winapi_as_builtin_for_Popen_in_cygwinccompiler.patch @@ -1,6 +1,6 @@ -diff -Naur a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py ---- a/Lib/distutils/cygwinccompiler.py 2014-05-20 00:55:51.365200000 +0400 -+++ b/Lib/distutils/cygwinccompiler.py 2014-05-20 00:56:24.858400000 +0400 +diff -urN a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py +--- a/Lib/distutils/cygwinccompiler.py 2014-10-11 14:22:05.252897900 +0100 ++++ b/Lib/distutils/cygwinccompiler.py 2014-10-11 14:22:07.895049100 +0100 @@ -58,6 +58,7 @@ from distutils import log from distutils.version import LooseVersion @@ -36,9 +36,9 @@ diff -Naur a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py return tuple([_find_exe_version(cmd) for cmd in commands]) def is_cygwingcc(): -diff -Naur a/Modules/Setup.config.in b/Modules/Setup.config.in ---- a/Modules/Setup.config.in 2014-05-20 00:56:14.266000000 +0400 -+++ b/Modules/Setup.config.in 2014-05-20 00:56:24.858400000 +0400 +diff -urN a/Modules/Setup.config.in b/Modules/Setup.config.in +--- a/Modules/Setup.config.in 2014-10-11 14:22:06.098946300 +0100 ++++ b/Modules/Setup.config.in 2014-10-11 14:22:07.896049100 +0100 @@ -19,6 +19,7 @@ @USE_WIN32_MODULE@winreg ../PC/winreg.c @USE_WIN32_MODULE@time timemodule.c @@ -47,10 +47,10 @@ diff -Naur a/Modules/Setup.config.in b/Modules/Setup.config.in # The rest of the modules previously listed in this file are built # by the setup.py script in Python 2.1 and later. -diff -Naur a/setup.py b/setup.py ---- a/setup.py 2014-05-20 00:56:03.923200000 +0400 -+++ b/setup.py 2014-05-20 00:56:24.858400000 +0400 -@@ -890,7 +890,9 @@ +diff -urN a/setup.py b/setup.py +--- a/setup.py 2014-10-11 14:22:05.773927700 +0100 ++++ b/setup.py 2014-10-11 14:22:07.897049200 +0100 +@@ -898,7 +898,9 @@ exts.append( Extension('msvcrt', [os.path.join(pc_srcdir, p) for p in ['msvcrtmodule.c']]) ) diff --git a/mingw-w64-python3/0640-mingw-x86_64-size_t-format-specifier-pid_t.patch b/mingw-w64-python3/0640-mingw-x86_64-size_t-format-specifier-pid_t.patch index f3e9904723..425727110c 100644 --- a/mingw-w64-python3/0640-mingw-x86_64-size_t-format-specifier-pid_t.patch +++ b/mingw-w64-python3/0640-mingw-x86_64-size_t-format-specifier-pid_t.patch @@ -1,6 +1,6 @@ -diff -Naur a/Include/pyport.h b/Include/pyport.h ---- a/Include/pyport.h 2014-05-20 00:55:05.314000000 +0400 -+++ b/Include/pyport.h 2014-05-20 00:56:26.886400000 +0400 +diff -urN a/Include/pyport.h b/Include/pyport.h +--- a/Include/pyport.h 2014-10-11 14:22:09.813158800 +0100 ++++ b/Include/pyport.h 2014-10-11 14:22:11.598260900 +0100 @@ -257,6 +257,8 @@ # define PY_FORMAT_SIZE_T "l" # elif defined(MS_WINDOWS) diff --git a/mingw-w64-python3/0650-cross-dont-add-multiarch-paths-if-cross-compiling.patch b/mingw-w64-python3/0650-cross-dont-add-multiarch-paths-if-cross-compiling.patch index d84f5f8588..4a1ee12660 100644 --- a/mingw-w64-python3/0650-cross-dont-add-multiarch-paths-if-cross-compiling.patch +++ b/mingw-w64-python3/0650-cross-dont-add-multiarch-paths-if-cross-compiling.patch @@ -1,7 +1,7 @@ -diff -Naur a/setup.py b/setup.py ---- a/setup.py 2014-05-20 00:56:26.746000000 +0400 -+++ b/setup.py 2014-05-20 00:56:28.883200000 +0400 -@@ -450,10 +450,10 @@ +diff -urN a/setup.py b/setup.py +--- a/setup.py 2014-10-11 14:22:12.606318500 +0100 ++++ b/setup.py 2014-10-11 14:22:15.132463000 +0100 +@@ -456,10 +456,10 @@ 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') diff --git a/mingw-w64-python3/0660-mingw-use-backslashes-in-compileall-py.patch b/mingw-w64-python3/0660-mingw-use-backslashes-in-compileall-py.patch index e617843ab5..1ee8dffb19 100644 --- a/mingw-w64-python3/0660-mingw-use-backslashes-in-compileall-py.patch +++ b/mingw-w64-python3/0660-mingw-use-backslashes-in-compileall-py.patch @@ -1,6 +1,6 @@ -diff -Naur a/Lib/compileall.py b/Lib/compileall.py ---- a/Lib/compileall.py 2014-05-19 09:19:37.000000000 +0400 -+++ b/Lib/compileall.py 2014-05-20 00:56:31.082800000 +0400 +diff -urN a/Lib/compileall.py b/Lib/compileall.py +--- a/Lib/compileall.py 2014-10-11 14:22:16.521542500 +0100 ++++ b/Lib/compileall.py 2014-10-11 14:22:18.904678800 +0100 @@ -46,6 +46,8 @@ if name == '__pycache__': continue diff --git a/mingw-w64-python3/0670-msys-convert_path-fix-and-root-hack.patch b/mingw-w64-python3/0670-msys-convert_path-fix-and-root-hack.patch index 866f64649e..7eecfaafce 100644 --- a/mingw-w64-python3/0670-msys-convert_path-fix-and-root-hack.patch +++ b/mingw-w64-python3/0670-msys-convert_path-fix-and-root-hack.patch @@ -1,7 +1,7 @@ -diff -Naur a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py ---- a/Lib/distutils/command/install.py 2014-05-19 09:19:37.000000000 +0400 -+++ b/Lib/distutils/command/install.py 2014-05-20 00:56:33.079600000 +0400 -@@ -355,7 +355,8 @@ +diff -urN a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py +--- a/Lib/distutils/command/install.py 2014-10-11 14:22:19.987740700 +0100 ++++ b/Lib/distutils/command/install.py 2014-10-11 14:22:22.629891800 +0100 +@@ -340,7 +340,8 @@ # Convert directories from Unix /-separated syntax to the local # convention. @@ -11,9 +11,9 @@ diff -Naur a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py 'scripts', 'data', 'headers', 'userbase', 'usersite') -diff -Naur a/Lib/distutils/util.py b/Lib/distutils/util.py ---- a/Lib/distutils/util.py 2014-05-20 00:55:35.188000000 +0400 -+++ b/Lib/distutils/util.py 2014-05-20 00:56:33.095200000 +0400 +diff -urN a/Lib/distutils/util.py b/Lib/distutils/util.py +--- a/Lib/distutils/util.py 2014-10-11 14:22:20.001741500 +0100 ++++ b/Lib/distutils/util.py 2014-10-11 14:22:22.631892000 +0100 @@ -133,6 +133,13 @@ paths.remove('.') if not paths: @@ -62,10 +62,10 @@ diff -Naur a/Lib/distutils/util.py b/Lib/distutils/util.py else: raise DistutilsPlatformError("nothing known about platform '%s'" % os.name) -diff -Naur a/Makefile.pre.in b/Makefile.pre.in ---- a/Makefile.pre.in 2014-05-20 00:56:22.502800000 +0400 -+++ b/Makefile.pre.in 2014-05-20 00:56:33.095200000 +0400 -@@ -1372,6 +1372,12 @@ +diff -urN a/Makefile.pre.in b/Makefile.pre.in +--- a/Makefile.pre.in 2014-10-11 14:22:19.927737300 +0100 ++++ b/Makefile.pre.in 2014-10-11 14:22:22.632892000 +0100 +@@ -1387,6 +1387,12 @@ else true; \ fi @@ -78,7 +78,7 @@ diff -Naur a/Makefile.pre.in b/Makefile.pre.in # Install the dynamically loadable modules # This goes into $(exec_prefix) sharedinstall: sharedmods -@@ -1379,9 +1385,9 @@ +@@ -1394,9 +1400,9 @@ --prefix=$(prefix) \ --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ @@ -91,7 +91,7 @@ diff -Naur a/Makefile.pre.in b/Makefile.pre.in # Here are a couple of targets for MacOSX again, to install a full # framework-based Python. frameworkinstall installs everything, the -@@ -1462,7 +1468,7 @@ +@@ -1477,7 +1483,7 @@ $(PYTHON_FOR_BUILD) $(srcdir)/Tools/scripts/setup.py install \ --prefix=$(prefix) \ --install-scripts=$(BINDIR) \ diff --git a/mingw-w64-python3/0690-allow-static-tcltk.patch b/mingw-w64-python3/0690-allow-static-tcltk.patch index d7e340e2c1..e86ce2190a 100644 --- a/mingw-w64-python3/0690-allow-static-tcltk.patch +++ b/mingw-w64-python3/0690-allow-static-tcltk.patch @@ -1,7 +1,7 @@ -diff -Naur a/setup.py b/setup.py ---- a/setup.py 2014-05-20 00:56:30.848800000 +0400 -+++ b/setup.py 2014-05-20 00:56:35.372800000 +0400 -@@ -529,7 +529,7 @@ +diff -urN a/setup.py b/setup.py +--- a/setup.py 2014-10-11 14:22:23.717954100 +0100 ++++ b/setup.py 2014-10-11 14:22:26.325103200 +0100 +@@ -535,7 +535,7 @@ if host_platform == 'hp-ux11': lib_dirs += ['/usr/lib/hpux64', '/usr/lib/hpux32'] @@ -10,7 +10,7 @@ diff -Naur a/setup.py b/setup.py # 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. -@@ -539,6 +539,8 @@ +@@ -545,6 +545,8 @@ # directories with whitespace in the name to store libraries. cflags, ldflags = sysconfig.get_config_vars( 'CFLAGS', 'LDFLAGS') @@ -19,7 +19,7 @@ diff -Naur a/setup.py b/setup.py for item in cflags.split(): if item.startswith('-I'): inc_dirs.append(item[2:]) -@@ -1747,14 +1749,19 @@ +@@ -1755,14 +1757,19 @@ # 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 @@ -47,7 +47,7 @@ diff -Naur a/setup.py b/setup.py break # Now check for the header files -@@ -1822,13 +1829,21 @@ +@@ -1830,13 +1837,21 @@ # Add the Tcl/Tk libraries libs.append('tk'+ version) libs.append('tcl'+ version) diff --git a/mingw-w64-python3/0700-CROSS-avoid-ncursesw-include-path-hack.patch b/mingw-w64-python3/0700-CROSS-avoid-ncursesw-include-path-hack.patch index 82467c7e63..fb391872a7 100644 --- a/mingw-w64-python3/0700-CROSS-avoid-ncursesw-include-path-hack.patch +++ b/mingw-w64-python3/0700-CROSS-avoid-ncursesw-include-path-hack.patch @@ -1,7 +1,7 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2014-05-20 00:56:22.471600000 +0400 -+++ b/configure.ac 2014-05-20 00:56:37.338400000 +0400 -@@ -4762,7 +4762,9 @@ +diff -urN a/configure.ac b/configure.ac +--- a/configure.ac 2014-10-11 14:22:27.451167600 +0100 ++++ b/configure.ac 2014-10-11 14:22:30.021314600 +0100 +@@ -4779,7 +4779,9 @@ # first curses header check ac_save_cppflags="$CPPFLAGS" diff --git a/mingw-w64-python3/0710-CROSS-properly-detect-WINDOW-_flags-for-different-nc.patch b/mingw-w64-python3/0710-CROSS-properly-detect-WINDOW-_flags-for-different-nc.patch index ec303c1638..92346b5c28 100644 --- a/mingw-w64-python3/0710-CROSS-properly-detect-WINDOW-_flags-for-different-nc.patch +++ b/mingw-w64-python3/0710-CROSS-properly-detect-WINDOW-_flags-for-different-nc.patch @@ -1,7 +1,7 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2014-05-20 00:56:39.319600000 +0400 -+++ b/configure.ac 2014-05-20 00:56:39.475600000 +0400 -@@ -4801,15 +4801,51 @@ +diff -urN a/configure.ac b/configure.ac +--- a/configure.ac 2014-10-11 14:22:31.108376800 +0100 ++++ b/configure.ac 2014-10-11 14:22:33.774529300 +0100 +@@ -4818,15 +4818,51 @@ fi AC_MSG_CHECKING(whether WINDOW has _flags) @@ -55,9 +55,9 @@ diff -Naur a/configure.ac b/configure.ac if test "$ac_cv_window_has_flags" = yes then -diff -Naur a/Include/py_curses.h b/Include/py_curses.h ---- a/Include/py_curses.h 2014-05-19 09:19:37.000000000 +0400 -+++ b/Include/py_curses.h 2014-05-20 00:56:39.506800000 +0400 +diff -urN a/Include/py_curses.h b/Include/py_curses.h +--- a/Include/py_curses.h 2014-10-11 14:22:32.009428300 +0100 ++++ b/Include/py_curses.h 2014-10-11 14:22:33.776529400 +0100 @@ -14,7 +14,9 @@ /* the following define is necessary for OS X 10.6; without it, the Apple-supplied ncurses.h sets NCURSES_OPAQUE to 1, and then Python @@ -81,9 +81,9 @@ diff -Naur a/Include/py_curses.h b/Include/py_curses.h #ifndef MVWDELCH_IS_EXPRESSION #define MVWDELCH_IS_EXPRESSION 1 #endif -diff -Naur a/pyconfig.h.in b/pyconfig.h.in ---- a/pyconfig.h.in 2014-05-20 00:56:03.923200000 +0400 -+++ b/pyconfig.h.in 2014-05-20 00:56:39.522400000 +0400 +diff -urN a/pyconfig.h.in b/pyconfig.h.in +--- a/pyconfig.h.in 2014-10-11 14:22:31.109376800 +0100 ++++ b/pyconfig.h.in 2014-10-11 14:22:33.777529500 +0100 @@ -1175,6 +1175,12 @@ /* Define to 1 if you want to use native NT threads */ #undef NT_THREADS diff --git a/mingw-w64-python3/0720-mingw-pdcurses_ISPAD.patch b/mingw-w64-python3/0720-mingw-pdcurses_ISPAD.patch index da6cf131ce..9c71f1013a 100644 --- a/mingw-w64-python3/0720-mingw-pdcurses_ISPAD.patch +++ b/mingw-w64-python3/0720-mingw-pdcurses_ISPAD.patch @@ -1,6 +1,6 @@ -diff -Naur a/Include/py_curses.h b/Include/py_curses.h ---- a/Include/py_curses.h 2014-05-20 00:56:41.425600000 +0400 -+++ b/Include/py_curses.h 2014-05-20 00:56:41.581600000 +0400 +diff -urN a/Include/py_curses.h b/Include/py_curses.h +--- a/Include/py_curses.h 2014-10-11 14:22:35.753642500 +0100 ++++ b/Include/py_curses.h 2014-10-11 14:22:37.611748800 +0100 @@ -56,6 +56,10 @@ #endif #endif diff --git a/mingw-w64-python3/0730-mingw-fix-ncurses-module.patch b/mingw-w64-python3/0730-mingw-fix-ncurses-module.patch index dee8102714..7fad6cc74e 100644 --- a/mingw-w64-python3/0730-mingw-fix-ncurses-module.patch +++ b/mingw-w64-python3/0730-mingw-fix-ncurses-module.patch @@ -1,6 +1,6 @@ -diff -Naur a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c ---- a/Modules/_cursesmodule.c 2014-05-19 09:19:39.000000000 +0400 -+++ b/Modules/_cursesmodule.c 2014-05-20 00:56:43.547200000 +0400 +diff -urN a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c +--- a/Modules/_cursesmodule.c 2014-10-11 14:22:39.496856600 +0100 ++++ b/Modules/_cursesmodule.c 2014-10-11 14:22:41.210954600 +0100 @@ -125,6 +125,10 @@ #include #endif diff --git a/mingw-w64-python3/0740-grammar-fixes.patch b/mingw-w64-python3/0740-grammar-fixes.patch index a34b0ab794..6842f3b972 100644 --- a/mingw-w64-python3/0740-grammar-fixes.patch +++ b/mingw-w64-python3/0740-grammar-fixes.patch @@ -1,6 +1,6 @@ -diff -Naur a/Modules/parsermodule.c b/Modules/parsermodule.c ---- a/Modules/parsermodule.c 2014-05-19 09:19:39.000000000 +0400 -+++ b/Modules/parsermodule.c 2014-05-20 00:56:45.700000000 +0400 +diff -urN a/Modules/parsermodule.c b/Modules/parsermodule.c +--- a/Modules/parsermodule.c 2014-10-11 14:22:43.329075800 +0100 ++++ b/Modules/parsermodule.c 2014-10-11 14:22:44.993171000 +0100 @@ -37,7 +37,7 @@ #undef Yield #include "ast.h" @@ -10,9 +10,9 @@ diff -Naur a/Modules/parsermodule.c b/Modules/parsermodule.c #ifdef lint #include -diff -Naur a/Parser/metagrammar.c b/Parser/metagrammar.c ---- a/Parser/metagrammar.c 2014-05-19 09:19:39.000000000 +0400 -+++ b/Parser/metagrammar.c 2014-05-20 00:56:45.731200000 +0400 +diff -urN a/Parser/metagrammar.c b/Parser/metagrammar.c +--- a/Parser/metagrammar.c 2014-10-11 14:22:43.041059300 +0100 ++++ b/Parser/metagrammar.c 2014-10-11 14:22:44.994171000 +0100 @@ -139,7 +139,7 @@ {7, 0}, {8, 0}, diff --git a/mingw-w64-python3/0750-builddir-fixes.patch b/mingw-w64-python3/0750-builddir-fixes.patch index e5d56abeb7..6d0c44b534 100644 --- a/mingw-w64-python3/0750-builddir-fixes.patch +++ b/mingw-w64-python3/0750-builddir-fixes.patch @@ -1,7 +1,7 @@ -diff -Naur a/Makefile.pre.in b/Makefile.pre.in ---- a/Makefile.pre.in 2014-05-20 00:56:35.216800000 +0400 -+++ b/Makefile.pre.in 2014-05-20 00:56:47.712400000 +0400 -@@ -672,13 +672,13 @@ +diff -urN a/Makefile.pre.in b/Makefile.pre.in +--- a/Makefile.pre.in 2014-10-11 14:22:46.008229000 +0100 ++++ b/Makefile.pre.in 2014-10-11 14:22:48.653380300 +0100 +@@ -687,13 +687,13 @@ ############################################################################ # Importlib @@ -20,7 +20,7 @@ diff -Naur a/Makefile.pre.in b/Makefile.pre.in ############################################################################ -@@ -1545,7 +1545,7 @@ +@@ -1560,7 +1560,7 @@ find build -name '*.py[co]' -exec rm -f {} ';' || true -rm -f pybuilddir.txt -rm -f Lib/lib2to3/*Grammar*.pickle diff --git a/mingw-w64-python3/0760-msys-monkeypatch-os-system-via-sh-exe.patch b/mingw-w64-python3/0760-msys-monkeypatch-os-system-via-sh-exe.patch index 1eea1e61aa..673dc5d20f 100644 --- a/mingw-w64-python3/0760-msys-monkeypatch-os-system-via-sh-exe.patch +++ b/mingw-w64-python3/0760-msys-monkeypatch-os-system-via-sh-exe.patch @@ -1,7 +1,7 @@ -diff -Naur a/setup.py b/setup.py ---- a/setup.py 2014-05-20 00:56:37.151200000 +0400 -+++ b/setup.py 2014-05-20 00:56:49.678000000 +0400 -@@ -29,6 +29,17 @@ +diff -urN a/setup.py b/setup.py +--- a/setup.py 2014-10-11 14:22:49.750443100 +0100 ++++ b/setup.py 2014-10-11 14:22:52.319590000 +0100 +@@ -35,6 +35,17 @@ return sys.platform host_platform = get_platform() diff --git a/mingw-w64-python3/0770-msys-replace-slashes-used-in-io-redirection.patch b/mingw-w64-python3/0770-msys-replace-slashes-used-in-io-redirection.patch index 9ae531ddce..5d7d1c19aa 100644 --- a/mingw-w64-python3/0770-msys-replace-slashes-used-in-io-redirection.patch +++ b/mingw-w64-python3/0770-msys-replace-slashes-used-in-io-redirection.patch @@ -1,7 +1,7 @@ -diff -Naur a/setup.py b/setup.py ---- a/setup.py 2014-05-20 00:56:51.456400000 +0400 -+++ b/setup.py 2014-05-20 00:56:51.612400000 +0400 -@@ -380,7 +380,7 @@ +diff -urN a/setup.py b/setup.py +--- a/setup.py 2014-10-11 14:22:53.522658800 +0100 ++++ b/setup.py 2014-10-11 14:22:56.174810500 +0100 +@@ -386,7 +386,7 @@ # Debian/Ubuntu multiarch support. # https://wiki.ubuntu.com/MultiarchSpec cc = sysconfig.get_config_var('CC') @@ -10,7 +10,7 @@ diff -Naur a/setup.py b/setup.py if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) ret = os.system( -@@ -405,7 +405,7 @@ +@@ -411,7 +411,7 @@ opt = '' if cross_compiling: opt = '-t' + sysconfig.get_config_var('HOST_GNU_TYPE') @@ -19,7 +19,7 @@ diff -Naur a/setup.py b/setup.py if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) ret = os.system( -@@ -424,7 +424,7 @@ +@@ -430,7 +430,7 @@ def add_gcc_paths(self): gcc = sysconfig.get_config_var('CC') @@ -28,7 +28,7 @@ diff -Naur a/setup.py b/setup.py if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) ret = os.system('%s -E -v - %s 1>/dev/null' % (gcc, tmpfile)) -@@ -688,7 +688,7 @@ +@@ -694,7 +694,7 @@ readline_termcap_library = "" curses_library = "" # Cannot use os.popen here in py3k. @@ -37,7 +37,7 @@ diff -Naur a/setup.py b/setup.py if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) # Determine if readline is already linked against curses or tinfo. -@@ -831,7 +831,7 @@ +@@ -839,7 +839,7 @@ opensslv_h = find_file('openssl/opensslv.h', [], inc_dirs + search_for_ssl_incs_in) if opensslv_h: @@ -46,7 +46,7 @@ diff -Naur a/setup.py b/setup.py if host_platform == 'darwin' and is_macosx_sdk_path(name): name = os.path.join(macosx_sdk_root(), name[1:]) try: -@@ -1706,16 +1706,16 @@ +@@ -1714,16 +1714,16 @@ cflags = sysconfig.get_config_vars('CFLAGS')[0] archs = re.findall('-arch\s+(\w+)', cflags) diff --git a/mingw-w64-python3/0790-mingw-add-_exec_prefix-for-tcltk-dlls.patch b/mingw-w64-python3/0790-mingw-add-_exec_prefix-for-tcltk-dlls.patch index 0a9867a36b..7f42b1a1bc 100644 --- a/mingw-w64-python3/0790-mingw-add-_exec_prefix-for-tcltk-dlls.patch +++ b/mingw-w64-python3/0790-mingw-add-_exec_prefix-for-tcltk-dlls.patch @@ -1,6 +1,6 @@ -diff -Naur a/Modules/getpath.c b/Modules/getpath.c ---- a/Modules/getpath.c 2014-05-20 00:56:12.253600000 +0400 -+++ b/Modules/getpath.c 2014-05-20 00:56:53.578000000 +0400 +diff -urN a/Modules/getpath.c b/Modules/getpath.c +--- a/Modules/getpath.c 2014-10-11 14:22:58.332933900 +0100 ++++ b/Modules/getpath.c 2014-10-11 14:22:59.928025200 +0100 @@ -795,7 +795,10 @@ bufsz += wcslen(zip_path) + 1; diff --git a/mingw-w64-python3/0800-mingw-install-layout-as-posix.patch b/mingw-w64-python3/0800-mingw-install-layout-as-posix.patch index 56081e4a1b..3bc95cb37c 100644 --- a/mingw-w64-python3/0800-mingw-install-layout-as-posix.patch +++ b/mingw-w64-python3/0800-mingw-install-layout-as-posix.patch @@ -1,7 +1,7 @@ -diff -Naur a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py ---- a/Lib/distutils/command/install.py 2014-05-20 00:56:34.842400000 +0400 -+++ b/Lib/distutils/command/install.py 2014-05-20 00:56:55.871200000 +0400 -@@ -35,10 +35,10 @@ +diff -urN a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py +--- a/Lib/distutils/command/install.py 2014-10-11 14:23:01.084091300 +0100 ++++ b/Lib/distutils/command/install.py 2014-10-11 14:23:03.761244400 +0100 +@@ -20,10 +20,10 @@ HAS_USER_SITE = True WINDOWS_SCHEME = { @@ -16,7 +16,7 @@ diff -Naur a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py 'data' : '$base', } -@@ -65,8 +65,8 @@ +@@ -50,8 +50,8 @@ INSTALL_SCHEMES['nt_user'] = { 'purelib': '$usersite', 'platlib': '$usersite', diff --git a/mingw-w64-python3/0810-remove_path_max.default.patch b/mingw-w64-python3/0810-remove_path_max.default.patch index fa63452aaa..39e41d481c 100644 --- a/mingw-w64-python3/0810-remove_path_max.default.patch +++ b/mingw-w64-python3/0810-remove_path_max.default.patch @@ -1,6 +1,6 @@ -diff -Naur a/Include/osdefs.h b/Include/osdefs.h ---- a/Include/osdefs.h 2014-05-20 00:56:20.381200000 +0400 -+++ b/Include/osdefs.h 2014-05-20 00:56:57.790000000 +0400 +diff -urN a/Include/osdefs.h b/Include/osdefs.h +--- a/Include/osdefs.h 2014-10-11 14:23:05.655352800 +0100 ++++ b/Include/osdefs.h 2014-10-11 14:23:07.572462400 +0100 @@ -17,7 +17,6 @@ #define SEP L'\\' #define ALTSEP L'/' @@ -9,9 +9,9 @@ diff -Naur a/Include/osdefs.h b/Include/osdefs.h #define DELIM L';' #define DELIMSTR ";" #endif -diff -Naur a/Modules/main.c b/Modules/main.c ---- a/Modules/main.c 2014-05-19 09:19:39.000000000 +0400 -+++ b/Modules/main.c 2014-05-20 00:56:57.790000000 +0400 +diff -urN a/Modules/main.c b/Modules/main.c +--- a/Modules/main.c 2014-10-11 14:23:05.736357400 +0100 ++++ b/Modules/main.c 2014-10-11 14:23:07.573462500 +0100 @@ -9,7 +9,6 @@ #include #ifdef HAVE_FCNTL_H @@ -20,9 +20,9 @@ diff -Naur a/Modules/main.c b/Modules/main.c #endif #endif -diff -Naur a/Python/pythonrun.c b/Python/pythonrun.c ---- a/Python/pythonrun.c 2014-05-20 00:56:20.396800000 +0400 -+++ b/Python/pythonrun.c 2014-05-20 00:56:57.790000000 +0400 +diff -urN a/Python/pythonrun.c b/Python/pythonrun.c +--- a/Python/pythonrun.c 2014-10-11 14:23:04.818304900 +0100 ++++ b/Python/pythonrun.c 2014-10-11 14:23:07.574462500 +0100 @@ -32,7 +32,6 @@ #ifdef MS_WINDOWS #undef BYTE diff --git a/mingw-w64-python3/0820-dont-link-with-gettext.patch b/mingw-w64-python3/0820-dont-link-with-gettext.patch index 6dd87aa206..d0315bbe2a 100644 --- a/mingw-w64-python3/0820-dont-link-with-gettext.patch +++ b/mingw-w64-python3/0820-dont-link-with-gettext.patch @@ -1,7 +1,7 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2014-05-20 00:56:41.410000000 +0400 -+++ b/configure.ac 2014-05-20 00:57:00.036400000 +0400 -@@ -2479,10 +2479,19 @@ +diff -urN a/configure.ac b/configure.ac +--- a/configure.ac 2014-10-11 14:23:08.591520700 +0100 ++++ b/configure.ac 2014-10-11 14:23:11.191669400 +0100 +@@ -2496,10 +2496,19 @@ fi # check if we need libintl for locale functions @@ -21,9 +21,9 @@ diff -Naur a/configure.ac b/configure.ac # checks for system dependent C++ extensions support case "$ac_sys_system" in -diff -Naur a/Modules/_localemodule.c b/Modules/_localemodule.c ---- a/Modules/_localemodule.c 2014-05-19 09:19:39.000000000 +0400 -+++ b/Modules/_localemodule.c 2014-05-20 00:57:00.083200000 +0400 +diff -urN a/Modules/_localemodule.c b/Modules/_localemodule.c +--- a/Modules/_localemodule.c 2014-10-11 14:23:09.473571200 +0100 ++++ b/Modules/_localemodule.c 2014-10-11 14:23:11.193669500 +0100 @@ -11,6 +11,13 @@ #define PY_SSIZE_T_CLEAN diff --git a/mingw-w64-python3/0830-ctypes-python-dll.patch b/mingw-w64-python3/0830-ctypes-python-dll.patch index 31527707d6..4e9cbfcd10 100644 --- a/mingw-w64-python3/0830-ctypes-python-dll.patch +++ b/mingw-w64-python3/0830-ctypes-python-dll.patch @@ -1,6 +1,6 @@ -diff -Naur a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py ---- a/Lib/ctypes/__init__.py 2014-05-19 09:19:37.000000000 +0400 -+++ b/Lib/ctypes/__init__.py 2014-05-20 00:57:02.017600000 +0400 +diff -urN a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py +--- a/Lib/ctypes/__init__.py 2014-10-11 14:23:12.496744100 +0100 ++++ b/Lib/ctypes/__init__.py 2014-10-11 14:23:15.025888700 +0100 @@ -431,7 +431,9 @@ cdll = LibraryLoader(CDLL) pydll = LibraryLoader(PyDLL) diff --git a/mingw-w64-python3/0840-gdbm-module-includes.patch b/mingw-w64-python3/0840-gdbm-module-includes.patch index 455e8cfd7e..f5c1a9c1ed 100644 --- a/mingw-w64-python3/0840-gdbm-module-includes.patch +++ b/mingw-w64-python3/0840-gdbm-module-includes.patch @@ -1,6 +1,6 @@ -diff -Naur a/Modules/_gdbmmodule.c b/Modules/_gdbmmodule.c ---- a/Modules/_gdbmmodule.c 2014-05-19 09:19:39.000000000 +0400 -+++ b/Modules/_gdbmmodule.c 2014-05-20 00:57:04.342000000 +0400 +diff -urN a/Modules/_gdbmmodule.c b/Modules/_gdbmmodule.c +--- a/Modules/_gdbmmodule.c 2014-10-11 14:23:17.097007200 +0100 ++++ b/Modules/_gdbmmodule.c 2014-10-11 14:23:18.944112800 +0100 @@ -11,7 +11,7 @@ #include #include "gdbm.h" diff --git a/mingw-w64-python3/0850-use-gnu_printf-in-format.patch b/mingw-w64-python3/0850-use-gnu_printf-in-format.patch index 3d3fa40735..a73950738f 100644 --- a/mingw-w64-python3/0850-use-gnu_printf-in-format.patch +++ b/mingw-w64-python3/0850-use-gnu_printf-in-format.patch @@ -1,6 +1,6 @@ -diff -Naur a/Include/bytesobject.h b/Include/bytesobject.h ---- a/Include/bytesobject.h 2014-05-19 09:19:37.000000000 +0400 -+++ b/Include/bytesobject.h 2014-05-20 00:57:06.338800000 +0400 +diff -urN a/Include/bytesobject.h b/Include/bytesobject.h +--- a/Include/bytesobject.h 2014-10-11 14:23:20.866222800 +0100 ++++ b/Include/bytesobject.h 2014-10-11 14:23:22.622323200 +0100 @@ -52,9 +52,9 @@ PyAPI_FUNC(PyObject *) PyBytes_FromString(const char *); PyAPI_FUNC(PyObject *) PyBytes_FromObject(PyObject *); @@ -13,9 +13,9 @@ diff -Naur a/Include/bytesobject.h b/Include/bytesobject.h PyAPI_FUNC(Py_ssize_t) PyBytes_Size(PyObject *); PyAPI_FUNC(char *) PyBytes_AsString(PyObject *); PyAPI_FUNC(PyObject *) PyBytes_Repr(PyObject *, int); -diff -Naur a/Include/pgenheaders.h b/Include/pgenheaders.h ---- a/Include/pgenheaders.h 2014-05-19 09:19:37.000000000 +0400 -+++ b/Include/pgenheaders.h 2014-05-20 00:57:06.338800000 +0400 +diff -urN a/Include/pgenheaders.h b/Include/pgenheaders.h +--- a/Include/pgenheaders.h 2014-10-11 14:23:20.873223200 +0100 ++++ b/Include/pgenheaders.h 2014-10-11 14:23:22.624323300 +0100 @@ -10,9 +10,9 @@ #include "Python.h" @@ -28,9 +28,9 @@ diff -Naur a/Include/pgenheaders.h b/Include/pgenheaders.h #define addarc _Py_addarc #define addbit _Py_addbit -diff -Naur a/Include/pyerrors.h b/Include/pyerrors.h ---- a/Include/pyerrors.h 2014-05-19 09:19:37.000000000 +0400 -+++ b/Include/pyerrors.h 2014-05-20 00:57:06.338800000 +0400 +diff -urN a/Include/pyerrors.h b/Include/pyerrors.h +--- a/Include/pyerrors.h 2014-10-11 14:23:20.879223500 +0100 ++++ b/Include/pyerrors.h 2014-10-11 14:23:22.624323300 +0100 @@ -454,9 +454,9 @@ #include @@ -43,9 +43,9 @@ diff -Naur a/Include/pyerrors.h b/Include/pyerrors.h #ifdef __cplusplus } -diff -Naur a/Include/sysmodule.h b/Include/sysmodule.h ---- a/Include/sysmodule.h 2014-05-19 09:19:37.000000000 +0400 -+++ b/Include/sysmodule.h 2014-05-20 00:57:06.338800000 +0400 +diff -urN a/Include/sysmodule.h b/Include/sysmodule.h +--- a/Include/sysmodule.h 2014-10-11 14:23:20.861222500 +0100 ++++ b/Include/sysmodule.h 2014-10-11 14:23:22.625323400 +0100 @@ -19,9 +19,9 @@ PyAPI_FUNC(void) PySys_SetPath(const wchar_t *); diff --git a/mingw-w64-python3/0860-fix-_Py_CheckPython3-prototype.patch b/mingw-w64-python3/0860-fix-_Py_CheckPython3-prototype.patch index f16b831914..a86a32e9b2 100644 --- a/mingw-w64-python3/0860-fix-_Py_CheckPython3-prototype.patch +++ b/mingw-w64-python3/0860-fix-_Py_CheckPython3-prototype.patch @@ -1,6 +1,6 @@ -diff -Naur a/Include/pythonrun.h b/Include/pythonrun.h ---- a/Include/pythonrun.h 2014-05-19 09:19:37.000000000 +0400 -+++ b/Include/pythonrun.h 2014-05-20 00:57:08.242000000 +0400 +diff -urN a/Include/pythonrun.h b/Include/pythonrun.h +--- a/Include/pythonrun.h 2014-10-11 14:23:24.506431000 +0100 ++++ b/Include/pythonrun.h 2014-10-11 14:23:26.506545400 +0100 @@ -214,7 +214,7 @@ PyAPI_FUNC(wchar_t *) Py_GetPath(void); PyAPI_FUNC(void) Py_SetPath(const wchar_t *); diff --git a/mingw-w64-python3/0870-mingw-fix-ssl-dont-use-enum_certificates.patch b/mingw-w64-python3/0870-mingw-fix-ssl-dont-use-enum_certificates.patch index f1e211f676..10c8a7b968 100644 --- a/mingw-w64-python3/0870-mingw-fix-ssl-dont-use-enum_certificates.patch +++ b/mingw-w64-python3/0870-mingw-fix-ssl-dont-use-enum_certificates.patch @@ -1,6 +1,6 @@ -diff -urN Python-3.4.1.orig/Lib/ssl.py Python-3.4.1/Lib/ssl.py ---- Python-3.4.1.orig/Lib/ssl.py 2014-06-19 17:43:06.631281400 +0100 -+++ Python-3.4.1/Lib/ssl.py 2014-06-19 17:50:29.817281400 +0100 +diff -urN a/Lib/ssl.py b/Lib/ssl.py +--- a/Lib/ssl.py 2014-10-11 14:23:27.721614900 +0100 ++++ b/Lib/ssl.py 2014-10-11 14:23:30.169754900 +0100 @@ -144,7 +144,7 @@ _PROTOCOL_NAMES[PROTOCOL_TLSv1_1] = "TLSv1.1" _PROTOCOL_NAMES[PROTOCOL_TLSv1_2] = "TLSv1.2" diff --git a/mingw-w64-python3/0890-mingw-build-optimized-ext.patch b/mingw-w64-python3/0890-mingw-build-optimized-ext.patch index 6c2cbd2a6e..6761e6162f 100644 --- a/mingw-w64-python3/0890-mingw-build-optimized-ext.patch +++ b/mingw-w64-python3/0890-mingw-build-optimized-ext.patch @@ -1,6 +1,7 @@ ---- a/Lib/distutils/cygwinccompiler.py.orig 2014-05-19 10:19:38.000000000 +0500 -+++ b/Lib/distutils/cygwinccompiler.py 2014-09-23 11:09:54.211200000 +0500 -@@ -299,9 +299,9 @@ +diff -urN a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py +--- a/Lib/distutils/cygwinccompiler.py 2014-10-11 14:23:31.343822100 +0100 ++++ b/Lib/distutils/cygwinccompiler.py 2014-10-11 14:23:33.915969200 +0100 +@@ -305,9 +305,9 @@ raise CCompilerError( 'Cygwin gcc cannot be used with --compiler=mingw32') diff --git a/mingw-w64-python3/0900-cygwinccompiler-dont-strip-modules-if-pydebug.patch b/mingw-w64-python3/0900-cygwinccompiler-dont-strip-modules-if-pydebug.patch index ea64557b3d..a1aa400c38 100644 --- a/mingw-w64-python3/0900-cygwinccompiler-dont-strip-modules-if-pydebug.patch +++ b/mingw-w64-python3/0900-cygwinccompiler-dont-strip-modules-if-pydebug.patch @@ -1,5 +1,6 @@ ---- a/Lib/distutils/cygwinccompiler.py 2014-10-05 22:38:20.354004400 +0100 -+++ b/Lib/distutils/cygwinccompiler.py 2014-10-05 22:44:36.855314000 +0100 +diff -urN a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py +--- a/Lib/distutils/cygwinccompiler.py 2014-10-11 14:23:35.007031600 +0100 ++++ b/Lib/distutils/cygwinccompiler.py 2014-10-11 14:23:37.562177700 +0100 @@ -238,7 +238,7 @@ # (On my machine: 10KB < stripped_file < ??100KB # unstripped_file = stripped_file + XXX KB diff --git a/mingw-w64-python3/0910-fix-using-dllhandle-and-winver-mingw.patch b/mingw-w64-python3/0910-fix-using-dllhandle-and-winver-mingw.patch index 97682dbdba..2d5a5317fe 100644 --- a/mingw-w64-python3/0910-fix-using-dllhandle-and-winver-mingw.patch +++ b/mingw-w64-python3/0910-fix-using-dllhandle-and-winver-mingw.patch @@ -1,5 +1,6 @@ ---- Python-3.4.2/Python/sysmodule.c.orig 2014-10-10 07:30:53.163000000 +0400 -+++ Python-3.4.2/Python/sysmodule.c 2014-10-10 07:40:51.719400000 +0400 +diff -urN a/Python/sysmodule.c b/Python/sysmodule.c +--- a/Python/sysmodule.c 2014-10-11 14:23:38.797248400 +0100 ++++ b/Python/sysmodule.c 2014-10-11 14:23:41.349394300 +0100 @@ -26,7 +26,7 @@ #include #endif /* MS_WINDOWS */ diff --git a/mingw-w64-python3/1000-fix-building-posixmodule.patch b/mingw-w64-python3/1000-fix-building-posixmodule.patch index 10f629bad5..69b69c08c2 100644 --- a/mingw-w64-python3/1000-fix-building-posixmodule.patch +++ b/mingw-w64-python3/1000-fix-building-posixmodule.patch @@ -1,6 +1,6 @@ -diff -Naur a/Modules/posixmodule.c b/Modules/posixmodule.c ---- a/Modules/posixmodule.c 2014-05-20 00:56:10.256800000 +0400 -+++ b/Modules/posixmodule.c 2014-05-20 00:57:10.316800000 +0400 +diff -urN a/Modules/posixmodule.c b/Modules/posixmodule.c +--- a/Modules/posixmodule.c 2014-10-11 14:23:43.199500200 +0100 ++++ b/Modules/posixmodule.c 2014-10-11 14:23:45.146611500 +0100 @@ -1444,10 +1444,10 @@ if(!SetCurrentDirectoryW(path)) diff --git a/mingw-w64-python3/1010-install-msilib.patch b/mingw-w64-python3/1010-install-msilib.patch index 2ab06d062f..0139865c6c 100644 --- a/mingw-w64-python3/1010-install-msilib.patch +++ b/mingw-w64-python3/1010-install-msilib.patch @@ -1,7 +1,7 @@ -diff -r b57b4e3b83ff Makefile.pre.in ---- a/Makefile.pre.in Mon Jul 14 12:20:15 2014 +0300 -+++ b/Makefile.pre.in Tue Jul 15 13:04:25 2014 +0200 -@@ -1157,6 +1157,7 @@ +diff -urN a/Makefile.pre.in b/Makefile.pre.in +--- a/Makefile.pre.in 2014-10-11 14:23:46.236673900 +0100 ++++ b/Makefile.pre.in 2014-10-11 14:23:48.938828400 +0100 +@@ -1195,6 +1195,7 @@ test/test_importlib/extension test/test_importlib/frozen \ test/test_importlib/import_ test/test_importlib/source \ turtledemo \ diff --git a/mingw-w64-python3/PKGBUILD b/mingw-w64-python3/PKGBUILD index bd544ea519..e065f4cf5a 100644 --- a/mingw-w64-python3/PKGBUILD +++ b/mingw-w64-python3/PKGBUILD @@ -12,17 +12,17 @@ arch=('any') license=('PSF') url="http://www.python.org/" depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" - "${MINGW_PACKAGE_PREFIX}-expat" - "${MINGW_PACKAGE_PREFIX}-bzip2" - "${MINGW_PACKAGE_PREFIX}-gdbm" - "${MINGW_PACKAGE_PREFIX}-readline" - "${MINGW_PACKAGE_PREFIX}-openssl" - "${MINGW_PACKAGE_PREFIX}-libffi" - "${MINGW_PACKAGE_PREFIX}-zlib" - "${MINGW_PACKAGE_PREFIX}-xz" - "${MINGW_PACKAGE_PREFIX}-ncurses" - "${MINGW_PACKAGE_PREFIX}-tcl" - "${MINGW_PACKAGE_PREFIX}-tk") + "${MINGW_PACKAGE_PREFIX}-expat" + "${MINGW_PACKAGE_PREFIX}-bzip2" + "${MINGW_PACKAGE_PREFIX}-gdbm" + "${MINGW_PACKAGE_PREFIX}-readline" + "${MINGW_PACKAGE_PREFIX}-openssl" + "${MINGW_PACKAGE_PREFIX}-libffi" + "${MINGW_PACKAGE_PREFIX}-zlib" + "${MINGW_PACKAGE_PREFIX}-xz" + "${MINGW_PACKAGE_PREFIX}-ncurses" + "${MINGW_PACKAGE_PREFIX}-tcl" + "${MINGW_PACKAGE_PREFIX}-tk") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") options=('!makeflags' 'staticlibs' 'strip' '!debug') source=("http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz" @@ -319,9 +319,10 @@ package() { sed -i "s#${srcdir}/Python-${pkgver}:##" "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${VERABI}/Makefile for fscripts in 2to3-${_pybasever} idle3 idle${_pybasever} pydoc3 pydoc${_pybasever} pyvenv pyvenv-${_pybasever}; do + echo sed -e "s|${MINGW_PREFIX}/bin/python${_pybasever}.exe|/usr/bin/env python${_pybasever}.exe|g" -i "${pkgdir}${MINGW_PREFIX}"/bin/$fscripts sed -e "s|${MINGW_PREFIX}/bin/python${_pybasever}.exe|/usr/bin/env python${_pybasever}.exe|g" -i "${pkgdir}${MINGW_PREFIX}"/bin/$fscripts done - + sed -i "s|#!${pkgdir}${MINGW_PREFIX}/bin/python${VERABI}.exe|#!/usr/bin/env python${_pybasever}.exe|" "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${VERABI}/python-config.py # fix permissons @@ -342,8 +343,8 @@ package() { cp -f "${pkgdir}${MINGW_PREFIX}"/bin/python3.exe "${pkgdir}${MINGW_PREFIX}"/bin/python3w.exe ${MINGW_PREFIX}/bin/objcopy --subsystem windows "${pkgdir}${MINGW_PREFIX}"/bin/python3w.exe - # Use winpty-git script to invoke python. Please don't move this into a patch as - # hopefully one day we won't need this hack. + # Add a wrapper script to force -i when invoking python. Please don't move this into a patch as + # hopefully one day we won't need this hack (when we replace mintty with a real console). mv "${pkgdir}"${MINGW_PREFIX}/bin/python3.exe "${pkgdir}"${MINGW_PREFIX}/bin/python3_exe _exename="python3" echo "#!/usr/bin/env bash" > "${pkgdir}${MINGW_PREFIX}/bin/${_exename}" @@ -352,87 +353,87 @@ package() { } md5sums=('36fc7327c02c6f12fa24fc9ba78039e3' - '55a51d7a22df951a8286bafb0886a9bc' - '26ca443b9aea454364202e4faf369d2e' - 'c7bba3965c8ad41973a4a235859c3cec' - '1e1602a0a886ee3682b7ab1e842bd50e' - '5926f9aec47376d2f83b419fa3f01b88' - '6ec7f6590f07f70b5fe4b9ef8783f918' - 'e55af8bccfac6ad8f21b86a6fd7660df' - 'c54a067bf85b2fb76c4ad03ba659f31a' - '012dbe148202b0ea6d41208cf8f0e9bf' - 'b2ca06ebc4f30473ef8e6f0b692b932b' - 'fa1b0dc732e5f7ced816de7edb75da1c' - 'ad4775945185764f594e6afd1607ce16' - '68288803bef7ea50676db69b96703857' - '6ed4fa38d8f77a4b358c1ffa71be2f43' - 'a4a018d7f4975f28d501c157e17bfc68' - '1a5b96fc8c8ac34eaa89ff73d03a994b' - 'ba802c0e270e2f17878358958aa4d38e' - '395b85f2c9518d7b1a8744520bf16299' - 'edae53bafca467ff4a19604315564f01' - 'd5a11eb93d4b1aa0f781192e6b876fdd' - '5ec66b2a76fb337bc813b456c19182ba' - '6c3d8caff05b5ef85f1aca74ca253fbd' - '8a8cb185e9ba6203d0b56d20a5ac0fca' - '19ddc4d19d520c4418bebba98e638c6e' - 'b71668da82ce066bb155bd3cc7a0d54c' - '9ec30b1620f443ae747d2a6d5bbc130c' - '9364a7ac07092429fad450a0d0b5a7e6' - '6a3374060a2168abc81d2bad94746aba' - '375c85be7240762da325fcf6493381b8' - '93cae0e40cb7540c711309f9e0419f1a' - '21b6266f65e0ca9bf52e831cf4d62826' - 'f5969ab9f2f22fae58d67d5a9ac16446' - 'a6526e377a072dcb8f172262ba96aee8' - 'fffdc81b34bbca66401dd0d020bae3bd' - '36a4e20657e44f1baf0dc4b736b739ed' - '2d8401958a8a88bcf4073262f854c49a' - '62480d79173f8480da29be657497d8d5' - 'f38ef81df89a97412a06a62bbf3acfd8' - 'aeaab41673a0f4e785d04dd3a0386ce9' - '327b1fc64dee15840008ebf4406ec428' - 'f3410fd208d2d83e0fb31a5271be77d6' - '08591ca799a060388fb77b84ed63ba55' - '310f4e1e55799a44165f612dde732b61' - '01da23cc4c6cf10b35d16d6d8a4e8ad5' - '195846f5d0f13f918dd9531b5ddef142' - 'a1947b6077064ed6a1a8faf582165465' - 'e7049e58182fc09b0d1cc6244dd2f4b3' - '384351e6e3aae8c951cb4676bb6c8e2a' - '46d8f5489a052c3d62b5a3ae0f1fa143' - 'ad014c33958d719238fc4432a3ee6589' - 'd93d262bd528691ea9effbc519b11066' - '9af2b3ef746e6fb22815108bfbee7959' - 'e964a3aa6b153d525b4d2382f410035e' - '7f64aef3f6ccb5992c1ba15bd958a5f3' - '6bdcd9ccc54b00e83f21ec9a4a13bd25' - 'da344ce0e7413cde2cc306bfce3b2dd2' - 'c3123e0095ddb5dd83891240b1c81e27' - 'a50da626cc7508150823ad881161d6bc' - '6032537d4250209aab7cf087ef7996af' - 'f835128bbec0e0ba6c3732fe9490abae' - '5fa444025044a1441fc5402d52bb3314' - 'ea0ea56a476374db85eec2d886a3208e' - 'd0558be496b76f4db118932784298afb' - '46d1b6dfe7402a0a14c7a02c66db900b' - 'bfb2f356176528f2c987969171cee062' - '31efe3a49180f1521dc19d7a83178dae' - '54793cded9bf3634ec0b3bbe6e457c24' - 'f64a91df51a86e9971af3f385e78f5f0' - '68ab286be58634e661a77c1267e699a8' - 'f429d795ca468fad208f1f7bc9d0892e' - '94786ce4b406953597796c411f8dcb6c' - '596ca27a19a9637256c8ca262f3a9036' - '725f78d04909226790d01a5a64610e1c' - '34c8b6b24800b81a57048e84bf30e1e3' - '0f81569f68dc0cdc6430943cd963e62f' - '0b9999457d955010f3f2a8460a564fea' - 'c4a497ac25a8438ea0142000d75f1965' - 'abec47dfff50a6b1adf6b78e9466a529' - '501eaec84e4516a8201679ee45797a59' - '5d5b248fe1821f82d0e4a4a1385e7ccf' - '86b64116a831c3c35f32107fc0bdbc76' - '0cbae2936b4a63fe019afdedca236076' - '38b940ff6ef0652c004c461f4393771a' - '994736a02ffafe807207f0c88e40252b') + '52e49a9ebb9fdf9452c75a0f3cebbb5e' + '96a79279c66b531eb40ec6a6136c66c5' + 'a59bd5e2c861247f17d73ed6866ecbd4' + '7f9724f7de5f1d5ad7ea1d49c044d741' + 'e38dcee6406229c4656125358f141689' + '7645edc185446cca516a52996298a702' + 'd56f2da8cc8e27a9c7f93235658da17d' + '8e9003666f065d914b4756e803991bff' + '7bbae0ff4ec064a64962e5ce7931ea59' + '49aad4c2be8cd44f8abe8a6bfa51f5da' + '777aa51f9054ef0c24477d1d92eb292c' + '0990e9dc7d81da968f177851f5b053be' + '797577bcc07f983d866f5609f53ba507' + 'e2922ca9eb219c29a815226337774b8d' + '48cda55915b486a9118f04971fbddd00' + 'cb92acf6b2c4bad2aca7e671c46ea6cb' + 'beb2e688333516015d41f1d9a8310cfa' + '26b031ee21da30c7404a81242302e470' + '814e6f015e4cd59b15766a244286537a' + '7d7cff8c5ced10f1b40ca34da7e43521' + 'bbe913c1afdd28148ca84e60a47c9cfe' + '07a059c12ca8159465731976d14112a1' + 'e98fd8c0ad7d7f1b79c513b73bfb1b77' + '1c175d333751604795bce8649d4470d0' + 'e6f74c9da794d5e38ac05d633179fa70' + '593c543a067c36242297e02ce8c42c07' + '9d96d71ddffd380ef752306bf9f7b461' + 'ec400bbc93838fc5017c1fb30165ddc6' + '3c682a252de15457566dab89263e507c' + 'bed8959c0f2ec7ed616da4ca26f219d9' + '81738360daf74b3786464e4e36f14a68' + '81a4ab4121de0c9b0deb3396c7f2500e' + 'e88e896f3c1920a17bc66f5f132dff65' + '32db440db5b269c94b1772c57d1e1961' + '92cf4398ed0705b4cb569acfdb8831fb' + '809cb90a296ca07b5f3a1e19e769d5e9' + '699caf216e72c26bef7f6af9e7c9392f' + 'be55bbfed43a90b89001e9643e34ad59' + '826422fb42905fab6b7c2662c38700bf' + '0abdb6e5ff50c1652e31182f4cdc4511' + '3b29536a2f6ae7fd42ad5ad0beb9e0f0' + '0fce75fef75109e68d93eb3c25aec4fd' + '0cda56e3d0be39f6a9a0ee8e8282b582' + 'aed05b678f243fda1832f3b457612061' + 'd534533568067bff2ca133640d61595c' + 'b86157391856a489dc35968af764d665' + '26f1135495d1c26712c6255c8dc2b0bd' + '47cb61167b4361095e44e80104ec8b65' + '344a2743ae7b06c7fa22a6cc92d8c1b0' + '65df63497a99a3d1b12ee85221ec2b13' + '8fca6752cf86545e57cdf661f9576864' + '411771b2ce1d43dfa55494f39b98608b' + '9821da4c321ae746d6061e7f119c31fe' + '55e8f2ca82067fd3a174c9ed043a14b5' + 'f19ed444c4b0a54637a2350a9ba7370c' + 'd51bab380b316e4807d2588804fc6784' + '106c8192ea63e5eb4948c8604ed37879' + 'b4900d08fc6c658acd39d87a11213254' + '804c634b6d50eb40bd9fb99330532be0' + '5cee883fcc7d7e372aefba4ee55d1f84' + '60f3ec2aa6de4181349068fca19d3012' + 'fdcf4289d9a68b33a9827f006be4f44a' + '5d782fdc1c3e590ba13393faaedd41f0' + '5e324e3e20b3beefbc0ed915a7f7be6e' + '73d7c06ad33ef6f5bf081e7658a1b354' + 'c8ad8bdbbb799550f787cec254b4fef2' + 'db059aa92df73724da312f1a832e9ae3' + '0337970788988d9aaeda6356e70ac8bc' + '6f3cdefada40ac4180c144da5c1389fe' + '754301a8a031fc47d3a5c7fc8a3b2f2d' + '33dc45b2d23ce207e47e8241145804db' + 'e5c1d8838d133a2ed14968ce94d2e461' + '90afdc2ea47b4ed6d4728f6ccd1a2ab1' + '1c5c3cc1fe2e203e31c2209d30860a18' + '279bcaf7a089499115c970734aed9b6f' + 'a1852b230488aea0a0b7aebed87ef41c' + '9645674f465330cc4c63289c8feb3191' + '03366228159d29148bbc9fab09e01826' + '03728f73b87478cef9b57360cbca6f16' + '09c279e5cab5154f50a4b0afe897095d' + '3947c0757931347a86afa3ce0b540dc5' + '667b2a720f8c11fc96d16a16c2dcf22f' + 'f98686ecd238d785189f0c3c93549a67' + '5138fb77538f149727e74e4b620bcecb')