From e79bd5d9b8de7653d0788379e04b367ff89fddb6 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Mon, 21 Sep 2015 15:47:39 +0300 Subject: [PATCH] python3: WIP updating to 3.5.0 --- ...0-make-_sysconfigdata.py-relocatable.patch | 10 +- .../0100-MINGW-BASE-use-NT-thread-model.patch | 38 +-- ...gcc-internal-defines-to-python-platf.patch | 6 +- ...igure-MACHDEP-and-platform-for-build.patch | 14 +- ...0140-MINGW-preset-configure-defaults.patch | 28 +- ...largefile-support-for-windows-builds.patch | 10 +- ...GW-add-wincrypt.h-in-Python-random.c.patch | 12 +- ...0170-MINGW-add-srcdir-PC-to-CPPFLAGS.patch | 10 +- .../0180-MINGW-init-system-calls.patch | 48 +--- ...190-MINGW-detect-REPARSE_DATA_BUFFER.patch | 36 +-- ...INGW-build-in-windows-modules-winreg.patch | 53 ++-- ...etermine-if-pwdmodule-should-be-used.patch | 20 +- ...s.path-calculations-for-windows-plat.patch | 58 ++-- ...-AC_LIBOBJ-replacement-of-fileblocks.patch | 6 +- ...40-MINGW-use-main-to-start-execution.patch | 8 +- ...ler-customize-mingw-cygwin-compilers.patch | 10 +- ...0260-MINGW-compiler-enable-new-dtags.patch | 6 +- ...ssue13756-Python-make-fail-on-cygwin.patch | 14 +- ...-Mingw-recognition-to-pyport.h-to-al.patch | 18 +- ...300-MINGW-configure-for-shared-build.patch | 14 +- .../0310-MINGW-dynamic-loading-support.patch | 38 ++- .../0320-MINGW-implement-exec-prefix.patch | 28 +- ...nore-main-program-for-frozen-scripts.patch | 18 +- ...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 | 42 +-- ...0390-MINGW-exclude-unix-only-modules.patch | 12 +- ...NGW-setup-msvcrt-and-_winapi-modules.patch | 22 +- ...0410-MINGW-build-extensions-with-GCC.patch | 26 +- ...2CCompiler-as-default-compiler-for-m.patch | 12 +- .../0430-MINGW-find-import-library.patch | 6 +- .../0440-MINGW-setup-_ssl-module.patch | 8 +- ...ation-of-posix-build-in-sysconfig.py.patch | 16 +- ...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 | 20 +- .../0490-MINGW-customize-site.patch | 8 +- .../0500-add-python-config-sh.patch | 6 +- .../0510-cross-darwin-feature.patch | 16 +- ...520-py3k-mingw-ntthreads-vs-pthreads.patch | 24 +- .../0530-mingw-system-libffi.patch | 38 +-- .../0540-mingw-semicolon-DELIM.patch | 40 +-- .../0550-mingw-regen-use-stddef_h.patch | 14 +- ...sys-mingw-prefer-unix-sep-if-MSYSTEM.patch | 264 ++++++++++++------ .../0560-mingw-use-posix-getpath.patch | 76 ++--- ...mingw-add-ModuleFileName-dir-to-PATH.patch | 10 +- ...dd-BUILDIN_WIN32_MODULEs-time-msvcrt.patch | 9 +- ...mingw-INSTALL_SHARED-LDLIBRARY-LIBPL.patch | 8 +- ...s-cygwin-semi-native-build-sysconfig.patch | 29 +- .../0620-mingw-sysconfig-like-posix.patch | 22 +- ...builtin_for_Popen_in_cygwinccompiler.patch | 28 +- ...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 | 8 +- ...-msys-convert_path-fix-and-root-hack.patch | 24 +- .../0690-allow-static-tcltk.patch | 14 +- ...OSS-avoid-ncursesw-include-path-hack.patch | 8 +- ...etect-WINDOW-_flags-for-different-nc.patch | 22 +- .../0720-mingw-pdcurses_ISPAD.patch | 6 +- .../0730-mingw-fix-ncurses-module.patch | 20 +- mingw-w64-python3/0740-grammar-fixes.patch | 14 +- mingw-w64-python3/0750-builddir-fixes.patch | 56 ++-- ...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 | 12 +- .../0800-mingw-install-layout-as-posix.patch | 8 +- .../0810-remove_path_max.default.patch | 32 +-- .../0820-dont-link-with-gettext.patch | 14 +- .../0830-ctypes-python-dll.patch | 8 +- .../0840-gdbm-module-includes.patch | 6 +- .../0850-use-gnu_printf-in-format.patch | 26 +- .../0860-fix-_Py_CheckPython3-prototype.patch | 8 +- ...w-fix-ssl-dont-use-enum_certificates.patch | 16 +- .../0890-mingw-build-optimized-ext.patch | 6 +- ...mpiler-dont-strip-modules-if-pydebug.patch | 6 +- ...fix-using-dllhandle-and-winver-mingw.patch | 8 +- ...0920-mingw-add-LIBPL-to-library-dirs.patch | 10 +- ...30-mingw-w64-build-overlapped-module.patch | 7 +- .../1000-fix-building-posixmodule.patch | 8 +- mingw-w64-python3/1010-install-msilib.patch | 8 +- ...t-look-in-DLLs-folder-for-python-dll.patch | 11 +- mingw-w64-python3/PKGBUILD | 174 ++++++------ 85 files changed, 955 insertions(+), 954 deletions(-) diff --git a/mingw-w64-python3/0000-make-_sysconfigdata.py-relocatable.patch b/mingw-w64-python3/0000-make-_sysconfigdata.py-relocatable.patch index 9d38d5316d..a12b13f094 100644 --- a/mingw-w64-python3/0000-make-_sysconfigdata.py-relocatable.patch +++ b/mingw-w64-python3/0000-make-_sysconfigdata.py-relocatable.patch @@ -1,7 +1,7 @@ -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 @@ +diff -Naur Python-3.5.0-orig/Lib/sysconfig.py Python-3.5.0/Lib/sysconfig.py +--- Python-3.5.0-orig/Lib/sysconfig.py 2015-09-13 14:41:21.000000000 +0300 ++++ Python-3.5.0/Lib/sysconfig.py 2015-09-21 13:41:02.028646700 +0300 +@@ -257,6 +257,7 @@ # if the expansion uses the name without a prefix. renamed_variables = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS') @@ -9,7 +9,7 @@ diff -urN a/Lib/sysconfig.py b/Lib/sysconfig.py while len(variables) > 0: for name in tuple(variables): value = notdone[name] -@@ -400,6 +401,19 @@ +@@ -393,6 +394,19 @@ f.write('build_time_vars = ') pprint.pprint(vars, stream=f) 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 20c01040d3..cccb099327 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 -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 @@ +diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac +--- Python-3.5.0-orig/configure.ac 2015-09-13 14:41:26.000000000 +0300 ++++ Python-3.5.0/configure.ac 2015-09-21 13:41:04.204429100 +0300 +@@ -1576,6 +1576,37 @@ BASECFLAGS="$BASECFLAGS $ac_arch_flags" fi @@ -39,7 +39,7 @@ diff -urN 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). -@@ -1415,6 +1446,7 @@ +@@ -1603,6 +1634,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 -urN a/configure.ac b/configure.ac if test $ac_cv_pthread_is_default = yes -@@ -1506,6 +1538,9 @@ +@@ -1694,6 +1726,9 @@ AC_MSG_RESULT($ac_cv_pthread) fi @@ -57,7 +57,7 @@ diff -urN 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 -@@ -1526,6 +1561,10 @@ +@@ -1714,6 +1749,10 @@ then CXX="$CXX -pthread" ac_cv_cxx_thread=yes @@ -68,7 +68,7 @@ diff -urN a/configure.ac b/configure.ac fi if test $ac_cv_cxx_thread = yes -@@ -1555,6 +1594,11 @@ +@@ -1743,6 +1782,11 @@ dnl AC_MSG_RESULT($cpp_type) # checks for header files @@ -80,7 +80,7 @@ diff -urN 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 \ -@@ -1824,9 +1868,14 @@ +@@ -2012,9 +2056,14 @@ AC_MSG_CHECKING(for pthread_t) have_pthread_t=no @@ -95,8 +95,8 @@ diff -urN a/configure.ac b/configure.ac AC_MSG_RESULT($have_pthread_t) if test "$have_pthread_t" = yes ; then AC_CHECK_SIZEOF(pthread_t, [], [ -@@ -2240,11 +2289,16 @@ - AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX +@@ -2431,11 +2480,16 @@ + [Define if the libcrypto has RAND_egd])) # only check for sem_init if thread support is requested +if test $ac_cv_ntthread = yes ; then @@ -112,7 +112,7 @@ diff -urN a/configure.ac b/configure.ac # check if we need libintl for locale functions AC_CHECK_LIB(intl, textdomain, -@@ -2513,6 +2567,13 @@ +@@ -2715,6 +2769,13 @@ AC_DEFINE(WITH_THREAD) posix_threads=yes THREADOBJ="Python/thread.o" @@ -126,7 +126,7 @@ diff -urN a/configure.ac b/configure.ac else if test ! -z "$with_threads" -a -d "$with_threads" then LDFLAGS="$LDFLAGS -L$with_threads" -@@ -2932,6 +2993,15 @@ +@@ -3144,6 +3205,15 @@ fi # checks for library functions @@ -142,7 +142,7 @@ diff -urN 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 \ -@@ -3920,6 +3990,10 @@ +@@ -4146,6 +4216,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 -urN 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([[ -@@ -3953,6 +4027,14 @@ +@@ -4179,6 +4253,14 @@ # Multiprocessing check for broken sem_getvalue AC_MSG_CHECKING(for broken sem_getvalue) @@ -168,10 +168,10 @@ diff -urN a/configure.ac b/configure.ac AC_CACHE_VAL(ac_cv_broken_sem_getvalue, AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include -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 @@ +diff -Naur Python-3.5.0-orig/pyconfig.h.in Python-3.5.0/pyconfig.h.in +--- Python-3.5.0-orig/pyconfig.h.in 2015-09-13 14:41:26.000000000 +0300 ++++ Python-3.5.0/pyconfig.h.in 2015-09-21 13:41:04.221427400 +0300 +@@ -1193,6 +1193,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 4dd5cb9210..5bf0360b2b 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 -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 +diff -Naur Python-3.5.0-orig/Include/pyport.h Python-3.5.0/Include/pyport.h +--- Python-3.5.0-orig/Include/pyport.h 2015-09-13 14:41:20.000000000 +0300 ++++ Python-3.5.0/Include/pyport.h 2015-09-21 13:41:05.553294200 +0300 @@ -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 fdfdcd64d6..5d77f79568 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,6 +1,6 @@ -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 +diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac +--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:05.423307200 +0300 ++++ Python-3.5.0/configure.ac 2015-09-21 13:41:06.783171200 +0300 @@ -359,6 +359,17 @@ # Set name for machine-dependent library files AC_ARG_VAR([MACHDEP], [name for machine-dependent library files]) @@ -41,11 +41,11 @@ diff -urN a/configure.ac b/configure.ac + ;; + esac fi - + # Some systems cannot stand _XOPEN_SOURCE being defined at all; they -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 +diff -Naur Python-3.5.0-orig/Python/getplatform.c Python-3.5.0/Python/getplatform.c +--- Python-3.5.0-orig/Python/getplatform.c 2015-09-13 14:41:26.000000000 +0300 ++++ Python-3.5.0/Python/getplatform.c 2015-09-21 13:41:06.789170600 +0300 @@ -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 62d09d9dcf..2207cb60d3 100644 --- a/mingw-w64-python3/0140-MINGW-preset-configure-defaults.patch +++ b/mingw-w64-python3/0140-MINGW-preset-configure-defaults.patch @@ -1,9 +1,9 @@ -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) +diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac +--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:07.953054200 +0300 ++++ Python-3.5.0/configure.ac 2015-09-21 13:41:08.078041700 +0300 +@@ -880,6 +880,27 @@ + AC_SUBST(PLATDIR) + AC_SUBST(PLATFORM_TRIPLET) +# initialize default configuration +py_config= @@ -27,11 +27,11 @@ diff -urN a/configure.ac b/configure.ac + fi +fi - AC_SUBST(LIBRARY) - AC_MSG_CHECKING(LIBRARY) -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 + AC_MSG_CHECKING([for -Wl,--no-as-needed]) + save_LDFLAGS="$LDFLAGS" +diff -Naur Python-3.5.0-orig/Misc/config_mingw Python-3.5.0/Misc/config_mingw +--- Python-3.5.0-orig/Misc/config_mingw 1970-01-01 03:00:00.000000000 +0300 ++++ Python-3.5.0/Misc/config_mingw 2015-09-21 13:41:08.092040300 +0300 @@ -0,0 +1,12 @@ +# configure defaults for mingw* hosts + @@ -45,9 +45,9 @@ diff -urN 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 -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 +diff -Naur Python-3.5.0-orig/Misc/cross_mingw32 Python-3.5.0/Misc/cross_mingw32 +--- Python-3.5.0-orig/Misc/cross_mingw32 1970-01-01 03:00:00.000000000 +0300 ++++ Python-3.5.0/Misc/cross_mingw32 2015-09-21 13:41:08.098039700 +0300 @@ -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 1444d8f8c4..c2b9d80b1b 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 -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 @@ +diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac +--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:09.253924100 +0300 ++++ Python-3.5.0/configure.ac 2015-09-21 13:41:09.399909500 +0300 +@@ -2061,10 +2061,22 @@ ]) AC_MSG_CHECKING(whether to enable large file support) @@ -24,7 +24,7 @@ diff -urN 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 -@@ -1886,9 +1898,6 @@ +@@ -2074,9 +2086,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 b6678a0081..8a803603c6 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,10 +1,10 @@ -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 +diff -Naur Python-3.5.0-orig/Python/random.c Python-3.5.0/Python/random.c +--- Python-3.5.0-orig/Python/random.c 2015-09-13 14:41:26.000000000 +0300 ++++ Python-3.5.0/Python/random.c 2015-09-21 13:41:10.674782000 +0300 @@ -1,6 +1,12 @@ #include "Python.h" #ifdef MS_WINDOWS - #include + # include +#ifdef __MINGW32__ +/* NOTE: All sample MSDN wincrypt programs include header below as it + * is required to ensure that application could be build properly in @@ -12,5 +12,5 @@ diff -urN a/Python/random.c b/Python/random.c +# include +#endif #else - #include - #ifdef HAVE_SYS_STAT_H + # include + # ifdef HAVE_SYS_STAT_H 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 2ae8cc4f9d..fa7c4395f0 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 -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 @@ +diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac +--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:10.567792700 +0300 ++++ Python-3.5.0/configure.ac 2015-09-21 13:41:11.868662600 +0300 +@@ -5068,6 +5068,16 @@ THREADHEADERS="$THREADHEADERS \$(srcdir)/$h" done @@ -16,5 +16,5 @@ diff -urN a/configure.ac b/configure.ac +esac + AC_SUBST(SRCDIRS) - SRCDIRS="Parser Grammar Objects Python Modules Mac" + SRCDIRS="Parser Grammar Objects Python Modules Mac Programs" AC_MSG_CHECKING(for build directories) diff --git a/mingw-w64-python3/0180-MINGW-init-system-calls.patch b/mingw-w64-python3/0180-MINGW-init-system-calls.patch index 2b26d60cfd..954080b2bc 100644 --- a/mingw-w64-python3/0180-MINGW-init-system-calls.patch +++ b/mingw-w64-python3/0180-MINGW-init-system-calls.patch @@ -1,6 +1,6 @@ -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 +diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac +--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:12.983551100 +0300 ++++ Python-3.5.0/configure.ac 2015-09-21 13:41:13.084541000 +0300 @@ -578,6 +578,14 @@ fi AC_MSG_RESULT($MACHDEP) @@ -16,10 +16,10 @@ diff -urN 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 -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 @@ +diff -Naur Python-3.5.0-orig/Modules/posixmodule.c Python-3.5.0/Modules/posixmodule.c +--- Python-3.5.0-orig/Modules/posixmodule.c 2015-09-13 14:41:25.000000000 +0300 ++++ Python-3.5.0/Modules/posixmodule.c 2015-09-21 13:41:13.100539400 +0300 +@@ -154,6 +154,25 @@ #define HAVE_CWAIT 1 #define HAVE_FSYNC 1 #define fsync _commit @@ -45,7 +45,7 @@ diff -urN a/Modules/posixmodule.c b/Modules/posixmodule.c #else /* Unix functions that the configure script doesn't check for */ #define HAVE_EXECV 1 -@@ -282,7 +301,7 @@ +@@ -274,7 +293,7 @@ #endif #endif @@ -54,7 +54,7 @@ diff -urN a/Modules/posixmodule.c b/Modules/posixmodule.c #ifdef HAVE_DIRECT_H #include #endif -@@ -1177,7 +1196,7 @@ +@@ -1126,7 +1145,7 @@ */ #include static char **environ; @@ -63,27 +63,9 @@ diff -urN a/Modules/posixmodule.c b/Modules/posixmodule.c extern char **environ; #endif /* !_MSC_VER */ -@@ -3931,8 +3950,6 @@ - return PyBytes_FromString(outbuf); - } /* end of posix__getfullpathname */ - -- -- - /* A helper function for samepath on windows */ - static PyObject * - posix__getfinalpathname(PyObject *self, PyObject *args) -@@ -12052,7 +12069,7 @@ - } - - --#if (defined(_MSC_VER) || defined(__WATCOMC__) || defined(__BORLANDC__)) && !defined(__QNX__) -+#if defined(MS_WINDOWS) && !defined(__QNX__) - #define INITFUNC PyInit_nt - #define MODNAME "nt" - -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 +diff -Naur Python-3.5.0-orig/Modules/Setup.config.in Python-3.5.0/Modules/Setup.config.in +--- Python-3.5.0-orig/Modules/Setup.config.in 2015-09-13 14:41:24.000000000 +0300 ++++ Python-3.5.0/Modules/Setup.config.in 2015-09-21 13:41:13.141535300 +0300 @@ -3,6 +3,9 @@ # The purpose of this file is to conditionally enable certain modules # based on configure-time options. @@ -94,9 +76,9 @@ diff -urN a/Modules/Setup.config.in b/Modules/Setup.config.in # Threading @USE_THREAD_MODULE@_thread _threadmodule.c -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 +diff -Naur Python-3.5.0-orig/Modules/Setup.dist Python-3.5.0/Modules/Setup.dist +--- Python-3.5.0-orig/Modules/Setup.dist 2015-09-13 14:41:24.000000000 +0300 ++++ Python-3.5.0/Modules/Setup.dist 2015-09-21 13:41:13.150534400 +0300 @@ -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 6cb5efc1b3..386958a5d4 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 -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 @@ +diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac +--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:14.283421100 +0300 ++++ Python-3.5.0/configure.ac 2015-09-21 13:41:14.407408700 +0300 +@@ -3815,6 +3815,27 @@ AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, [struct sockaddr_storage (sys/socket.h)]) fi @@ -29,11 +29,11 @@ diff -urN a/configure.ac b/configure.ac # checks for compiler characteristics AC_C_CHAR_UNSIGNED -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 +diff -Naur Python-3.5.0-orig/Modules/winreparse.h Python-3.5.0/Modules/winreparse.h +--- Python-3.5.0-orig/Modules/winreparse.h 2015-09-13 14:41:25.000000000 +0300 ++++ Python-3.5.0/Modules/winreparse.h 2015-09-21 13:41:14.427406700 +0300 +@@ -12,6 +12,15 @@ + http://msdn.microsoft.com/en-us/library/ff552012.aspx as the required include doesn't seem to be present in the Windows SDK (at least as included with Visual Studio Express). */ +#ifndef HAVE_REPARSE_DATA_BUFFER @@ -48,7 +48,7 @@ diff -urN a/Modules/posixmodule.c b/Modules/posixmodule.c typedef struct _REPARSE_DATA_BUFFER { ULONG ReparseTag; USHORT ReparseDataLength; -@@ -1162,7 +1171,11 @@ +@@ -42,7 +51,11 @@ #define REPARSE_DATA_BUFFER_HEADER_SIZE FIELD_OFFSET(REPARSE_DATA_BUFFER,\ GenericReparseBuffer) @@ -58,14 +58,14 @@ diff -urN a/Modules/posixmodule.c b/Modules/posixmodule.c + +#endif /*ndef HAVE_REPARSE_DATA_BUFFER*/ - static int - win32_get_reparse_tag(HANDLE reparse_point_handle, ULONG *reparse_tag) -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 + #ifdef __cplusplus + } +diff -Naur Python-3.5.0-orig/pyconfig.h.in Python-3.5.0/pyconfig.h.in +--- Python-3.5.0-orig/pyconfig.h.in 2015-09-21 13:41:05.444305100 +0300 ++++ Python-3.5.0/pyconfig.h.in 2015-09-21 13:41:14.440405400 +0300 +@@ -711,6 +711,9 @@ + /* Define if readline supports append_history */ + #undef HAVE_RL_APPEND_HISTORY +/* Define to 1 if you have the 'REPARSE_DATA_BUFFER' structure. */ +#undef HAVE_REPARSE_DATA_BUFFER 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 725f3a90e3..0aafc3f504 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 -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 @@ +diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac +--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:15.569292500 +0300 ++++ Python-3.5.0/configure.ac 2015-09-21 13:41:15.713278100 +0300 +@@ -2742,6 +2742,14 @@ fi]) AC_MSG_RESULT($with_dbmliborder) @@ -16,21 +16,25 @@ diff -urN a/configure.ac b/configure.ac # Determine if signalmodule should be used. AC_SUBST(USE_SIGNAL_MODULE) AC_SUBST(SIGNAL_OBJS) -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 @@ +diff -Naur Python-3.5.0-orig/Modules/Setup.config.in Python-3.5.0/Modules/Setup.config.in +--- Python-3.5.0-orig/Modules/Setup.config.in 2015-09-21 13:41:14.300419400 +0300 ++++ Python-3.5.0/Modules/Setup.config.in 2015-09-21 13:41:15.757273700 +0300 +@@ -12,8 +12,11 @@ + # Threading + @USE_THREAD_MODULE@_thread _threadmodule.c + # The signal module - @USE_SIGNAL_MODULE@signal signalmodule.c +-@USE_SIGNAL_MODULE@_signal signalmodule.c ++@USE_SIGNAL_MODULE@_signal signalmodule.c -lws2_32 +# build-in modules for windows platform: +@USE_WIN32_MODULE@winreg ../PC/winreg.c + # The rest of the modules previously listed in this file are built # by the setup.py script in Python 2.1 and later. -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 +diff -Naur Python-3.5.0-orig/PC/winreg.c Python-3.5.0/PC/winreg.c +--- Python-3.5.0-orig/PC/winreg.c 2015-09-13 14:41:25.000000000 +0300 ++++ Python-3.5.0/PC/winreg.c 2015-09-21 13:41:15.767272700 +0300 @@ -16,6 +16,25 @@ #include "structmember.h" #include "windows.h" @@ -55,28 +59,5 @@ diff -urN a/PC/winreg.c b/PC/winreg.c +#endif + static BOOL PyHKEY_AsHKEY(PyObject *ob, HKEY *pRes, BOOL bNoneOK); + static BOOL clinic_HKEY_converter(PyObject *ob, void *p); static PyObject *PyHKEY_FromHKEY(HKEY h); - static BOOL PyHKEY_Close(PyObject *obHandle); -@@ -1083,6 +1102,10 @@ - static PyObject * - PyDeleteKeyEx(PyObject *self, PyObject *args, PyObject *kwargs) - { -+#ifdef KEY_WOW64_64KEY -+/* KEY_WOW64_64KEY is defined for _WIN32_WINNT >= 0x0502, -+ * i.e. Windows Server 2003 with SP1, Windows XP with SP2 -+ * and not supported on w2k. */ - HKEY hKey; - PyObject *key; - HMODULE hMod; -@@ -1119,6 +1142,11 @@ - return PyErr_SetFromWindowsErrWithFunction(rc, "RegDeleteKeyEx"); - Py_INCREF(Py_None); - return Py_None; -+#else /*def KEY_WOW64_64KEY*/ -+ PyErr_SetString(PyExc_NotImplementedError, -+ "not implemented on this platform"); -+ return NULL; -+#endif - } - - static PyObject * 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 4a04e1ad5d..dfdda3d0e7 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 -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 @@ +diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac +--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:16.957153700 +0300 ++++ Python-3.5.0/configure.ac 2015-09-21 13:41:17.094140000 +0300 +@@ -2750,6 +2750,13 @@ *-*-mingw*) USE_WIN32_MODULE=;; esac @@ -15,9 +15,9 @@ diff -urN a/configure.ac b/configure.ac # Determine if signalmodule should be used. AC_SUBST(USE_SIGNAL_MODULE) AC_SUBST(SIGNAL_OBJS) -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 +diff -Naur Python-3.5.0-orig/Modules/Setup.config.in Python-3.5.0/Modules/Setup.config.in +--- Python-3.5.0-orig/Modules/Setup.config.in 2015-09-21 13:41:16.975151900 +0300 ++++ Python-3.5.0/Modules/Setup.config.in 2015-09-21 13:41:17.109138500 +0300 @@ -6,6 +6,9 @@ # init system calls(posix/nt/...) for INITFUNC (used by makesetup) @INITSYS@ posixmodule.c @@ -28,9 +28,9 @@ diff -urN a/Modules/Setup.config.in b/Modules/Setup.config.in # Threading @USE_THREAD_MODULE@_thread _threadmodule.c -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 +diff -Naur Python-3.5.0-orig/Modules/Setup.dist Python-3.5.0/Modules/Setup.dist +--- Python-3.5.0-orig/Modules/Setup.dist 2015-09-21 13:41:14.307418700 +0300 ++++ Python-3.5.0/Modules/Setup.dist 2015-09-21 13:41:17.134136000 +0300 @@ -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 7cdc693464..ed8132466e 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 -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 @@ +diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac +--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:18.284021000 +0300 ++++ Python-3.5.0/configure.ac 2015-09-21 13:41:18.437005700 +0300 +@@ -5122,8 +5122,21 @@ ;; esac @@ -16,16 +16,16 @@ diff -urN a/configure.ac b/configure.ac +esac + AC_SUBST(SRCDIRS) - SRCDIRS="Parser Grammar Objects Python Modules Mac" + SRCDIRS="Parser Grammar Objects Python Modules Mac Programs" +case $host in + *-*-mingw*) SRCDIRS="$SRCDIRS PC";; +esac AC_MSG_CHECKING(for build directories) for dir in $SRCDIRS; do if test ! -d $dir; then -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 +diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in +--- Python-3.5.0-orig/Makefile.pre.in 2015-09-13 14:41:23.000000000 +0300 ++++ Python-3.5.0/Makefile.pre.in 2015-09-21 13:41:18.444005000 +0300 @@ -242,7 +242,7 @@ # Modules MODULE_OBJS= \ @@ -35,7 +35,7 @@ diff -urN a/Makefile.pre.in b/Makefile.pre.in Modules/main.o \ Modules/gcmodule.o -@@ -704,6 +704,7 @@ +@@ -721,6 +721,7 @@ -DHGBRANCH="\"`LC_ALL=C $(HGBRANCH)`\"" \ -o $@ $(srcdir)/Modules/getbuildinfo.c @@ -43,7 +43,7 @@ diff -urN 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)"' \ -@@ -712,6 +713,13 @@ +@@ -729,6 +730,13 @@ -DVPATH='"$(VPATH)"' \ -o $@ $(srcdir)/Modules/getpath.c @@ -54,12 +54,12 @@ diff -urN a/Makefile.pre.in b/Makefile.pre.in + -DSRCDIR='"$(srcdir)"' \ + -o $@ $(srcdir)/PC/getpathp.c + - Modules/python.o: $(srcdir)/Modules/python.c - $(MAINCC) -c $(PY_CORE_CFLAGS) -o $@ $(srcdir)/Modules/python.c + Programs/python.o: $(srcdir)/Programs/python.c + $(MAINCC) -c $(PY_CORE_CFLAGS) -o $@ $(srcdir)/Programs/python.c -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 +diff -Naur Python-3.5.0-orig/PC/getpathp.c Python-3.5.0/PC/getpathp.c +--- Python-3.5.0-orig/PC/getpathp.c 2015-09-13 14:41:25.000000000 +0300 ++++ Python-3.5.0/PC/getpathp.c 2015-09-21 13:41:18.457003700 +0300 @@ -87,10 +87,26 @@ * with a semicolon separated path prior to calling Py_Initialize. */ @@ -87,8 +87,8 @@ diff -urN a/PC/getpathp.c b/PC/getpathp.c static wchar_t prefix[MAXPATHLEN+1]; static wchar_t progpath[MAXPATHLEN+1]; static wchar_t dllpath[MAXPATHLEN+1]; -@@ -173,6 +189,69 @@ - buffer[n+k] = '\0'; +@@ -183,6 +199,69 @@ + Py_FatalError("buffer overflow in getpathp.c's join()"); } +#ifdef USE_POSIX_PREFIX @@ -121,7 +121,7 @@ diff -urN a/PC/getpathp.c b/PC/getpathp.c + if (exists(prefix)) { + wchar_t *vpath; + /* Check source directory if argv0_path is in the build directory. */ -+ vpath = _Py_char2wchar(SRCDIR, NULL); ++ vpath = Py_DecodeLocale(SRCDIR, NULL); + if (vpath != NULL) { + wcscpy(prefix, argv0_path); + join(prefix, vpath); @@ -157,7 +157,7 @@ diff -urN a/PC/getpathp.c b/PC/getpathp.c /* gotlandmark only called by search_for_prefix, which ensures 'prefix' is null terminated in bounds. join() ensures 'landmark' can not overflow prefix if too long. -@@ -477,6 +556,9 @@ +@@ -488,6 +567,9 @@ size_t bufsz; wchar_t *pythonhome = Py_GetPythonHome(); wchar_t *envpath = NULL; @@ -167,7 +167,7 @@ diff -urN a/PC/getpathp.c b/PC/getpathp.c #ifdef MS_WINDOWS int skiphome, skipdefault; -@@ -537,6 +619,16 @@ +@@ -560,6 +642,16 @@ } } @@ -184,10 +184,10 @@ diff -urN a/PC/getpathp.c b/PC/getpathp.c if (pythonhome == NULL || *pythonhome == '\0') { if (search_for_prefix(argv0_path, LANDMARK)) pythonhome = prefix; -@@ -545,11 +637,11 @@ +@@ -568,11 +660,11 @@ } else - wcsncpy(prefix, pythonhome, MAXPATHLEN); + wcscpy_s(prefix, MAXPATHLEN+1, pythonhome); +#endif if (envpath && *envpath == '\0') @@ -195,9 +195,9 @@ diff -urN a/PC/getpathp.c b/PC/getpathp.c - #ifdef MS_WINDOWS - /* Calculate zip archive path */ - if (dllpath[0]) /* use name of python DLL */ -@@ -603,6 +695,9 @@ + /* Calculate zip archive path from DLL or exe path */ + if (wcscpy_s(zip_path, MAXPATHLEN+1, dllpath[0] ? dllpath : progpath)) +@@ -624,6 +716,9 @@ } else bufsz = 0; @@ -207,7 +207,7 @@ diff -urN a/PC/getpathp.c b/PC/getpathp.c bufsz += wcslen(PYTHONPATH) + 1; bufsz += wcslen(argv0_path) + 1; #ifdef MS_WINDOWS -@@ -645,6 +740,11 @@ +@@ -668,6 +763,11 @@ buf = wcschr(buf, L'\0'); *buf++ = DELIM; } @@ -217,9 +217,9 @@ diff -urN a/PC/getpathp.c b/PC/getpathp.c + *buf++ = DELIM; +#endif if (userpath) { - wcscpy(buf, userpath); - buf = wcschr(buf, L'\0'); -@@ -707,6 +807,12 @@ + if (wcscpy_s(buf, bufsz - (buf - module_search_path), userpath)) + Py_FatalError("buffer overflow in getpathp.c's calculate_path()"); +@@ -736,6 +836,12 @@ on the path, and that our 'prefix' directory is the parent of that. */ 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 82ca4d616f..1d904aff55 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 -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 +diff -Naur Python-3.5.0-orig/Python/fileblocks.c Python-3.5.0/Python/fileblocks.c +--- Python-3.5.0-orig/Python/fileblocks.c 1970-01-01 03:00:00.000000000 +0300 ++++ Python-3.5.0/Python/fileblocks.c 2015-09-21 13:41:19.806868700 +0300 @@ -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 3c738b3e7f..86f7595a00 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,12 +1,12 @@ -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 +diff -Naur Python-3.5.0-orig/Programs/python.c Python-3.5.0/Programs/python.c +--- Python-3.5.0-orig/Programs/python.c 2015-09-13 14:41:26.000000000 +0300 ++++ Python-3.5.0/Programs/python.c 2015-09-21 13:41:21.061743200 +0300 @@ -7,7 +7,7 @@ #include #endif -#ifdef MS_WINDOWS -+#if defined(MS_WINDOWS) && !defined(__MINGW32__) ++#if defined(_MSC_VER) int wmain(int argc, wchar_t **argv) { 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 e886f23040..4d4c308581 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 -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 @@ +diff -Naur Python-3.5.0-orig/Lib/distutils/sysconfig.py Python-3.5.0/Lib/distutils/sysconfig.py +--- Python-3.5.0-orig/Lib/distutils/sysconfig.py 2015-09-13 14:41:21.000000000 +0300 ++++ Python-3.5.0/Lib/distutils/sysconfig.py 2015-09-21 13:41:22.329616400 +0300 +@@ -156,7 +156,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 -urN 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. -@@ -175,7 +191,6 @@ +@@ -166,7 +182,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 e5827d192a..26f9cf1159 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 -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 +diff -Naur Python-3.5.0-orig/Lib/distutils/unixccompiler.py Python-3.5.0/Lib/distutils/unixccompiler.py +--- Python-3.5.0-orig/Lib/distutils/unixccompiler.py 2015-09-13 14:41:21.000000000 +0300 ++++ Python-3.5.0/Lib/distutils/unixccompiler.py 2015-09-21 13:41:23.620487300 +0300 @@ -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 1751e881c2..659130a77d 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 -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 @@ +diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in +--- Python-3.5.0-orig/Makefile.pre.in 2015-09-21 13:41:19.691880200 +0300 ++++ Python-3.5.0/Makefile.pre.in 2015-09-21 13:41:24.859363400 +0300 +@@ -647,9 +647,9 @@ $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK) $(LN) -fsn Versions/Current/Resources $(PYTHONFRAMEWORKDIR)/Resources @@ -13,9 +13,9 @@ diff -urN a/Makefile.pre.in b/Makefile.pre.in if test -n "$(DLLLIBRARY)"; then \ $(LDSHARED) -Wl,--out-implib=$@ -o $(DLLLIBRARY) $^ \ $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST); \ -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 +diff -Naur Python-3.5.0-orig/Modules/makesetup Python-3.5.0/Modules/makesetup +--- Python-3.5.0-orig/Modules/makesetup 2015-09-13 14:41:25.000000000 +0300 ++++ Python-3.5.0/Modules/makesetup 2015-09-21 13:41:24.864362900 +0300 @@ -91,7 +91,7 @@ else ExtraLibDir='$(LIBPL)' 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 210a21a2d7..a527c2ca75 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,7 +1,7 @@ -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 @@ +diff -Naur Python-3.5.0-orig/Include/pyport.h Python-3.5.0/Include/pyport.h +--- Python-3.5.0-orig/Include/pyport.h 2015-09-21 13:41:06.668182700 +0300 ++++ Python-3.5.0/Include/pyport.h 2015-09-21 13:41:26.146234700 +0300 +@@ -736,37 +736,39 @@ */ /* @@ -53,7 +53,7 @@ diff -urN a/Include/pyport.h b/Include/pyport.h # define PyAPI_DATA(RTYPE) extern __declspec(dllimport) RTYPE /* module init functions outside the core must be exported */ # if defined(__cplusplus) -@@ -777,7 +779,7 @@ +@@ -774,7 +776,7 @@ # else /* __cplusplus */ # define PyMODINIT_FUNC __declspec(dllexport) PyObject* # endif /* __cplusplus */ @@ -62,10 +62,10 @@ diff -urN a/Include/pyport.h b/Include/pyport.h # endif /* HAVE_DECLSPEC */ #endif /* Py_ENABLE_SHARED */ -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 @@ +diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py +--- Python-3.5.0-orig/setup.py 2015-09-13 14:41:26.000000000 +0300 ++++ Python-3.5.0/setup.py 2015-09-21 13:41:26.161233200 +0300 +@@ -184,6 +184,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 788a2d6f08..175cb26c69 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 -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 @@ +diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac +--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:19.666882700 +0300 ++++ Python-3.5.0/configure.ac 2015-09-21 13:41:27.465102800 +0300 +@@ -1174,6 +1174,13 @@ ;; esac @@ -15,7 +15,7 @@ diff -urN a/configure.ac b/configure.ac else # shared is disabled PY_ENABLE_SHARED=0 case $ac_sys_system in -@@ -1053,6 +1060,10 @@ +@@ -1182,6 +1189,10 @@ LDLIBRARY='libpython$(LDVERSION).dll.a' ;; esac @@ -26,7 +26,7 @@ diff -urN a/configure.ac b/configure.ac fi if test "$cross_compiling" = yes; then -@@ -2213,6 +2224,12 @@ +@@ -2401,6 +2412,12 @@ LDCXXSHARED="g++ -shared -Wl,--enable-auto-image-base";; *) LDSHARED="ld";; esac @@ -39,7 +39,7 @@ diff -urN a/configure.ac b/configure.ac fi AC_MSG_RESULT($LDSHARED) LDCXXSHARED=${LDCXXSHARED-$LDSHARED} -@@ -4888,7 +4905,8 @@ +@@ -5118,7 +5135,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 da021b5873..f688b99a97 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 -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 @@ +diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac +--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:28.609988300 +0300 ++++ Python-3.5.0/configure.ac 2015-09-21 13:41:28.722977000 +0300 +@@ -2272,6 +2272,9 @@ CYGWIN*) SHLIB_SUFFIX=.dll;; *) SHLIB_SUFFIX=.so;; esac @@ -11,7 +11,7 @@ diff -urN a/configure.ac b/configure.ac fi AC_MSG_RESULT($SHLIB_SUFFIX) -@@ -3060,6 +3063,12 @@ +@@ -3272,6 +3275,12 @@ fi ;; esac @@ -24,7 +24,7 @@ diff -urN a/configure.ac b/configure.ac fi AC_MSG_RESULT($DYNLOADFILE) if test "$DYNLOADFILE" != "dynload_stub.o" -@@ -4293,6 +4302,12 @@ +@@ -4519,6 +4528,12 @@ *) EXT_SUFFIX=${SHLIB_SUFFIX};; esac @@ -37,10 +37,10 @@ diff -urN a/configure.ac b/configure.ac AC_MSG_CHECKING(LDVERSION) LDVERSION='$(VERSION)$(ABIFLAGS)' -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 @@ +diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in +--- Python-3.5.0-orig/Makefile.pre.in 2015-09-21 13:41:26.014247900 +0300 ++++ Python-3.5.0/Makefile.pre.in 2015-09-21 13:41:28.746974600 +0300 +@@ -763,6 +763,12 @@ -DSHLIB_EXT='"$(EXT_SUFFIX)"' \ -o $@ $(srcdir)/Python/dynload_hpux.c @@ -53,11 +53,11 @@ diff -urN a/Makefile.pre.in b/Makefile.pre.in Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile $(CC) -c $(PY_CORE_CFLAGS) \ -DABIFLAGS='"$(ABIFLAGS)"' \ -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 -Naur Python-3.5.0-orig/Python/dynload_win.c Python-3.5.0/Python/dynload_win.c +--- Python-3.5.0-orig/Python/dynload_win.c 2015-09-13 14:41:26.000000000 +0300 ++++ Python-3.5.0/Python/dynload_win.c 2015-09-21 13:41:28.760973200 +0300 +@@ -35,11 +35,21 @@ + #define PYD_UNTAGGED_SUFFIX PYD_DEBUG_SUFFIX ".pyd" const char *_PyImport_DynLoadFiletab[] = { +#ifdef EXT_SUFFIX @@ -66,13 +66,11 @@ diff -urN a/Python/dynload_win.c b/Python/dynload_win.c +#ifdef SHLIB_SUFFIX + "-abi" PYTHON_ABI_STRING SHLIB_SUFFIX, +#endif - #ifdef _DEBUG - "_d.pyd", - #else -@@ -27,6 +33,10 @@ + PYD_TAGGED_SUFFIX, + PYD_UNTAGGED_SUFFIX, + NULL }; - +#if defined(__MINGW32__) +/* avoid compile error: conflicting types for 'strcasecmp' */ +# define strcasecmp fake_strcasecmp diff --git a/mingw-w64-python3/0320-MINGW-implement-exec-prefix.patch b/mingw-w64-python3/0320-MINGW-implement-exec-prefix.patch index 9db1f704e4..9fa4fa7452 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 -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 +diff -Naur Python-3.5.0-orig/PC/getpathp.c Python-3.5.0/PC/getpathp.c +--- Python-3.5.0-orig/PC/getpathp.c 2015-09-21 13:41:19.698879500 +0300 ++++ Python-3.5.0/PC/getpathp.c 2015-09-21 13:41:30.111838100 +0300 @@ -104,10 +104,17 @@ # define USE_POSIX_PREFIX @@ -19,7 +19,7 @@ diff -urN a/PC/getpathp.c b/PC/getpathp.c static wchar_t progpath[MAXPATHLEN+1]; static wchar_t dllpath[MAXPATHLEN+1]; static wchar_t *module_search_path = NULL; -@@ -290,6 +297,82 @@ +@@ -299,6 +306,82 @@ /* a string loaded from the DLL at startup.*/ extern const char *PyWin_DLLVersionString; @@ -102,7 +102,7 @@ diff -urN a/PC/getpathp.c b/PC/getpathp.c /* Load a PYTHONPATH value from the registry. Load from either HKEY_LOCAL_MACHINE or HKEY_CURRENT_USER. -@@ -559,6 +642,9 @@ +@@ -570,6 +653,9 @@ #ifdef USE_POSIX_PREFIX int pfound; #endif @@ -112,7 +112,7 @@ diff -urN a/PC/getpathp.c b/PC/getpathp.c #ifdef MS_WINDOWS int skiphome, skipdefault; -@@ -642,6 +728,16 @@ +@@ -665,6 +751,16 @@ if (envpath && *envpath == '\0') envpath = NULL; @@ -127,9 +127,9 @@ diff -urN a/PC/getpathp.c b/PC/getpathp.c +#endif + #ifdef MS_WINDOWS - /* Calculate zip archive path */ - if (dllpath[0]) /* use name of python DLL */ -@@ -698,6 +794,9 @@ + /* Calculate zip archive path from DLL or exe path */ + if (wcscpy_s(zip_path, MAXPATHLEN+1, dllpath[0] ? dllpath : progpath)) +@@ -719,6 +815,9 @@ #ifdef USE_POSIX_PREFIX bufsz += wcslen(prefix) + 1; #endif @@ -139,7 +139,7 @@ diff -urN a/PC/getpathp.c b/PC/getpathp.c bufsz += wcslen(PYTHONPATH) + 1; bufsz += wcslen(argv0_path) + 1; #ifdef MS_WINDOWS -@@ -745,6 +844,11 @@ +@@ -768,6 +867,11 @@ buf = wcschr(buf, L'\0'); *buf++ = DELIM; #endif @@ -149,9 +149,9 @@ diff -urN a/PC/getpathp.c b/PC/getpathp.c + *buf++ = DELIM; +#endif if (userpath) { - wcscpy(buf, userpath); - buf = wcschr(buf, L'\0'); -@@ -812,6 +916,17 @@ + if (wcscpy_s(buf, bufsz - (buf - module_search_path), userpath)) + Py_FatalError("buffer overflow in getpathp.c's calculate_path()"); +@@ -841,6 +945,17 @@ reduce(prefix); reduce(prefix); } @@ -169,7 +169,7 @@ diff -urN a/PC/getpathp.c b/PC/getpathp.c #endif if (*prefix==L'\0') { wchar_t lookBuf[MAXPATHLEN+1]; -@@ -881,7 +996,13 @@ +@@ -910,7 +1025,13 @@ wchar_t * Py_GetExecPrefix(void) { 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 7e9128f89d..65c8f32a94 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 -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 @@ +diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac +--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:29.960853200 +0300 ++++ Python-3.5.0/configure.ac 2015-09-21 13:41:31.365712700 +0300 +@@ -5165,6 +5165,16 @@ ;; esac @@ -16,12 +16,12 @@ diff -urN a/configure.ac b/configure.ac +esac + AC_SUBST(SRCDIRS) - SRCDIRS="Parser Grammar Objects Python Modules Mac" + SRCDIRS="Parser Grammar Objects Python Modules Mac Programs" case $host in -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 @@ +diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in +--- Python-3.5.0-orig/Makefile.pre.in 2015-09-21 13:41:29.981851100 +0300 ++++ Python-3.5.0/Makefile.pre.in 2015-09-21 13:41:31.372712000 +0300 +@@ -370,7 +370,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 64f4322902..ebe96a0f26 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 -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 @@ +diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py +--- Python-3.5.0-orig/setup.py 2015-09-21 13:41:27.356113700 +0300 ++++ Python-3.5.0/setup.py 2015-09-21 13:41:32.656583600 +0300 +@@ -1270,7 +1270,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 d601420a93..007f6e2b58 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 -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 @@ +diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py +--- Python-3.5.0-orig/setup.py 2015-09-21 13:41:33.783470900 +0300 ++++ Python-3.5.0/setup.py 2015-09-21 13:41:33.895459700 +0300 +@@ -1532,7 +1532,7 @@ macros = dict() libraries = ['rt'] @@ -10,7 +10,7 @@ diff -urN a/setup.py b/setup.py multiprocessing_srcs = [ '_multiprocessing/multiprocessing.c', '_multiprocessing/semaphore.c', ] -@@ -1525,8 +1525,12 @@ +@@ -1545,8 +1545,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 26932e306d..3eebe42742 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 -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 +diff -Naur Python-3.5.0-orig/Modules/selectmodule.c Python-3.5.0/Modules/selectmodule.c +--- Python-3.5.0-orig/Modules/selectmodule.c 2015-09-13 14:41:25.000000000 +0300 ++++ Python-3.5.0/Modules/selectmodule.c 2015-09-21 13:41:35.081341100 +0300 @@ -102,9 +102,9 @@ v = PyObject_AsFileDescriptor( o ); if (v == -1) goto finally; @@ -22,10 +22,10 @@ diff -urN a/Modules/selectmodule.c b/Modules/selectmodule.c FD_SET(v, set); /* add object and its file descriptor to the list */ -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 @@ +diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py +--- Python-3.5.0-orig/setup.py 2015-09-21 13:41:34.983350900 +0300 ++++ Python-3.5.0/setup.py 2015-09-21 13:41:35.087340500 +0300 +@@ -654,7 +654,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 1f3aba4af9..7da2e93657 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 -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 +diff -Naur Python-3.5.0-orig/Modules/_ctypes/callproc.c Python-3.5.0/Modules/_ctypes/callproc.c +--- Python-3.5.0-orig/Modules/_ctypes/callproc.c 2015-09-13 14:41:24.000000000 +0300 ++++ Python-3.5.0/Modules/_ctypes/callproc.c 2015-09-21 13:41:36.375211700 +0300 @@ -727,6 +727,21 @@ } @@ -59,10 +59,10 @@ diff -urN a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c #endif if ((flags & FUNCFLAG_PYTHONAPI) && PyErr_Occurred()) return -1; -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 @@ +diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py +--- Python-3.5.0-orig/setup.py 2015-09-21 13:41:36.271222100 +0300 ++++ Python-3.5.0/setup.py 2015-09-21 13:41:36.381211100 +0300 +@@ -1960,6 +1960,8 @@ depends=depends) ext_test = Extension('_ctypes_test', sources=['_ctypes/_ctypes_test.c']) @@ -71,7 +71,7 @@ diff -urN a/setup.py b/setup.py self.extensions.extend([ext, ext_test]) if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"): -@@ -1973,6 +1975,8 @@ +@@ -1993,6 +1995,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 474301edeb..dacd344dec 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 -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 @@ +diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac +--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:32.537595500 +0300 ++++ Python-3.5.0/configure.ac 2015-09-21 13:41:37.654083800 +0300 +@@ -3834,21 +3834,36 @@ ],[]) AC_MSG_RESULT($was_it_defined) @@ -42,7 +42,7 @@ diff -urN 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) -@@ -4821,7 +4836,10 @@ +@@ -5051,7 +5066,10 @@ AC_CHECK_TYPE(socklen_t,, AC_DEFINE(socklen_t,int, @@ -54,9 +54,9 @@ diff -urN a/configure.ac b/configure.ac #ifdef HAVE_SYS_TYPES_H #include #endif -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 +diff -Naur Python-3.5.0-orig/Misc/config_mingw Python-3.5.0/Misc/config_mingw +--- Python-3.5.0-orig/Misc/config_mingw 2015-09-21 13:41:09.276921800 +0300 ++++ Python-3.5.0/Misc/config_mingw 2015-09-21 13:41:37.660083200 +0300 @@ -10,3 +10,6 @@ # files to ignore ac_cv_file__dev_ptmx=ignore #NOTE: under MSYS environment device exist @@ -64,10 +64,10 @@ diff -urN a/Misc/config_mingw b/Misc/config_mingw + +# force detection of winsock2 functionality - require wxp or newer +ac_cv_func_getpeername=yes -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 @@ +diff -Naur Python-3.5.0-orig/Modules/socketmodule.c Python-3.5.0/Modules/socketmodule.c +--- Python-3.5.0-orig/Modules/socketmodule.c 2015-09-13 14:41:25.000000000 +0300 ++++ Python-3.5.0/Modules/socketmodule.c 2015-09-21 13:41:37.675081700 +0300 +@@ -307,6 +307,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 -urN a/Modules/socketmodule.c b/Modules/socketmodule.c #else # include "addrinfo.h" #endif -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 +diff -Naur Python-3.5.0-orig/pyconfig.h.in Python-3.5.0/pyconfig.h.in +--- Python-3.5.0-orig/pyconfig.h.in 2015-09-21 13:41:15.600289400 +0300 ++++ Python-3.5.0/pyconfig.h.in 2015-09-21 13:41:37.697079500 +0300 @@ -43,7 +43,7 @@ /* Define to 1 if you have the `acosh' function. */ #undef HAVE_ACOSH @@ -92,7 +92,7 @@ diff -urN a/pyconfig.h.in b/pyconfig.h.in #undef HAVE_ADDRINFO /* Define to 1 if you have the `alarm' function. */ -@@ -1149,6 +1149,9 @@ +@@ -1176,6 +1176,9 @@ /* Define to 1 if you have the `writev' function. */ #undef HAVE_WRITEV @@ -102,7 +102,7 @@ diff -urN a/pyconfig.h.in b/pyconfig.h.in /* Define if the zlib library has inflateCopy */ #undef HAVE_ZLIB_COPY -@@ -1481,7 +1484,7 @@ +@@ -1508,7 +1511,7 @@ /* Define to `unsigned int' if does not define. */ #undef size_t @@ -111,10 +111,10 @@ diff -urN a/pyconfig.h.in b/pyconfig.h.in #undef socklen_t /* Define to `int' if doesn't define. */ -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 @@ +diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py +--- Python-3.5.0-orig/setup.py 2015-09-21 13:41:37.554093800 +0300 ++++ Python-3.5.0/setup.py 2015-09-21 13:41:37.705078700 +0300 +@@ -782,7 +782,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 9efddc031c..6c6eb16076 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 -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 @@ +diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py +--- Python-3.5.0-orig/setup.py 2015-09-21 13:41:38.945954600 +0300 ++++ Python-3.5.0/setup.py 2015-09-21 13:41:39.052943900 +0300 +@@ -641,11 +641,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 -urN 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)): -@@ -648,7 +657,10 @@ +@@ -668,7 +677,10 @@ # Lance Ellinghaus's syslog module # syslog daemon interface @@ -37,7 +37,7 @@ diff -urN a/setup.py b/setup.py # # Here ends the simple stuff. From here on, modules need certain -@@ -749,17 +761,23 @@ +@@ -769,17 +781,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 2681a2040b..fd9002412a 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 -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 +diff -Naur Python-3.5.0-orig/Modules/_winapi.c Python-3.5.0/Modules/_winapi.c +--- Python-3.5.0-orig/Modules/_winapi.c 2015-09-13 14:41:24.000000000 +0300 ++++ Python-3.5.0/Modules/_winapi.c 2015-09-21 13:41:40.316817500 +0300 @@ -39,7 +39,9 @@ #define WINDOWS_LEAN_AND_MEAN @@ -8,12 +8,12 @@ diff -urN a/Modules/_winapi.c b/Modules/_winapi.c +#if defined(Py_DEBUG) #include +#endif + #include "winreparse.h" #if defined(MS_WIN32) && !defined(MS_WIN64) - #define HANDLE_TO_PYNUM(handle) \ -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 +diff -Naur Python-3.5.0-orig/PC/msvcrtmodule.c Python-3.5.0/PC/msvcrtmodule.c +--- Python-3.5.0-orig/PC/msvcrtmodule.c 2015-09-13 14:41:25.000000000 +0300 ++++ Python-3.5.0/PC/msvcrtmodule.c 2015-09-21 13:41:40.329816200 +0300 @@ -21,7 +21,9 @@ #include #include @@ -24,10 +24,10 @@ diff -urN a/PC/msvcrtmodule.c b/PC/msvcrtmodule.c #include #ifdef _MSC_VER -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,24 @@ +diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py +--- Python-3.5.0-orig/setup.py 2015-09-21 13:41:40.205828600 +0300 ++++ Python-3.5.0/setup.py 2015-09-21 13:41:40.342814900 +0300 +@@ -907,6 +907,24 @@ 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 11edc9abed..e27ad5427c 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 -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 @@ +diff -Naur Python-3.5.0-orig/Lib/distutils/command/build_ext.py Python-3.5.0/Lib/distutils/command/build_ext.py +--- Python-3.5.0-orig/Lib/distutils/command/build_ext.py 2015-09-13 14:41:20.000000000 +0300 ++++ Python-3.5.0/Lib/distutils/command/build_ext.py 2015-09-21 13:41:41.616687500 +0300 +@@ -184,7 +184,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 -urN a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext # 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. -@@ -682,6 +682,20 @@ +@@ -701,6 +701,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. @@ -29,11 +29,11 @@ diff -urN a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext + return ext.libraries + extra + if sys.platform == "win32": - from distutils.msvccompiler import MSVCCompiler + from distutils._msvccompiler import MSVCCompiler if not isinstance(self.compiler, MSVCCompiler): -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 +diff -Naur Python-3.5.0-orig/Lib/distutils/util.py Python-3.5.0/Lib/distutils/util.py +--- Python-3.5.0-orig/Lib/distutils/util.py 2015-09-13 14:41:21.000000000 +0300 ++++ Python-3.5.0/Lib/distutils/util.py 2015-09-21 13:41:41.633685800 +0300 @@ -40,6 +40,8 @@ For other non-POSIX platforms, currently just returns 'sys.platform'. """ @@ -43,10 +43,10 @@ diff -urN a/Lib/distutils/util.py b/Lib/distutils/util.py # sniff sys.version for architecture. prefix = " bit (" i = sys.version.find(prefix) -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 @@ +diff -Naur Python-3.5.0-orig/Lib/sysconfig.py Python-3.5.0/Lib/sysconfig.py +--- Python-3.5.0-orig/Lib/sysconfig.py 2015-09-21 13:41:04.093440200 +0300 ++++ Python-3.5.0/Lib/sysconfig.py 2015-09-21 13:41:41.638685300 +0300 +@@ -622,6 +622,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 b6c5a7bc71..a472d41577 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 -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 +diff -Naur Python-3.5.0-orig/Lib/distutils/ccompiler.py Python-3.5.0/Lib/distutils/ccompiler.py +--- Python-3.5.0-orig/Lib/distutils/ccompiler.py 2015-09-13 14:41:20.000000000 +0300 ++++ Python-3.5.0/Lib/distutils/ccompiler.py 2015-09-21 13:41:42.896559500 +0300 @@ -9,7 +9,7 @@ from distutils.file_util import move_file from distutils.dir_util import mkpath @@ -19,9 +19,9 @@ diff -urN 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 -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 +diff -Naur Python-3.5.0-orig/Lib/distutils/cygwinccompiler.py Python-3.5.0/Lib/distutils/cygwinccompiler.py +--- Python-3.5.0-orig/Lib/distutils/cygwinccompiler.py 2015-09-13 14:41:21.000000000 +0300 ++++ Python-3.5.0/Lib/distutils/cygwinccompiler.py 2015-09-21 13:41:42.902558900 +0300 @@ -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 bc450eaddb..905d61398a 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 -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 +diff -Naur Python-3.5.0-orig/Lib/distutils/cygwinccompiler.py Python-3.5.0/Lib/distutils/cygwinccompiler.py +--- Python-3.5.0-orig/Lib/distutils/cygwinccompiler.py 2015-09-21 13:41:44.031446000 +0300 ++++ Python-3.5.0/Lib/distutils/cygwinccompiler.py 2015-09-21 13:41:44.133435800 +0300 @@ -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 b496d4cca9..95b2ce77de 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 -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 @@ +diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py +--- Python-3.5.0-orig/setup.py 2015-09-21 13:41:41.508698300 +0300 ++++ Python-3.5.0/setup.py 2015-09-21 13:41:45.377311400 +0300 +@@ -826,10 +826,13 @@ if (ssl_incs is not None and ssl_libs is not None): 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 fe992557f3..2d4a0b4389 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 -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 +diff -Naur Python-3.5.0-orig/Lib/sysconfig.py Python-3.5.0/Lib/sysconfig.py +--- Python-3.5.0-orig/Lib/sysconfig.py 2015-09-21 13:41:42.792569900 +0300 ++++ Python-3.5.0/Lib/sysconfig.py 2015-09-21 13:41:46.638185300 +0300 @@ -95,6 +95,9 @@ _CONFIG_VARS = None _USER_BASE = None @@ -11,7 +11,7 @@ diff -urN a/Lib/sysconfig.py b/Lib/sysconfig.py def _safe_realpath(path): try: -@@ -178,7 +181,7 @@ +@@ -171,7 +174,7 @@ def _get_default_scheme(): @@ -20,7 +20,7 @@ diff -urN a/Lib/sysconfig.py b/Lib/sysconfig.py # the default scheme for posix is posix_prefix return 'posix_prefix' return os.name -@@ -190,7 +193,7 @@ +@@ -183,7 +186,7 @@ def joinuser(*args): return os.path.expanduser(os.path.join(*args)) @@ -29,7 +29,7 @@ diff -urN a/Lib/sysconfig.py b/Lib/sysconfig.py base = os.environ.get("APPDATA") or "~" if env_base: return env_base -@@ -475,7 +478,7 @@ +@@ -468,7 +471,7 @@ def get_config_h_filename(): """Return the path of pyconfig.h.""" if _PYTHON_BUILD: @@ -38,7 +38,7 @@ diff -urN 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 -@@ -546,9 +549,9 @@ +@@ -539,9 +542,9 @@ # sys.abiflags may not be defined on all platforms. _CONFIG_VARS['abiflags'] = '' @@ -50,7 +50,7 @@ diff -urN a/Lib/sysconfig.py b/Lib/sysconfig.py _init_posix(_CONFIG_VARS) # For backward compatibility, see issue19555 SO = _CONFIG_VARS.get('EXT_SUFFIX') -@@ -561,7 +564,7 @@ +@@ -554,7 +557,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 f3cc87be51..0ee4c453c4 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 -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 @@ +diff -Naur Python-3.5.0-orig/Modules/_ctypes/_ctypes.c Python-3.5.0/Modules/_ctypes/_ctypes.c +--- Python-3.5.0-orig/Modules/_ctypes/_ctypes.c 2015-09-13 14:41:24.000000000 +0300 ++++ Python-3.5.0/Modules/_ctypes/_ctypes.c 2015-09-21 13:41:47.943054800 +0300 +@@ -3085,11 +3085,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 c1d94208ec..19290133ae 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 -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 @@ +diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py +--- Python-3.5.0-orig/setup.py 2015-09-21 13:41:46.528196300 +0300 ++++ Python-3.5.0/setup.py 2015-09-21 13:41:49.175931500 +0300 +@@ -2239,7 +2239,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 c5d3f56e8f..d77abc46ff 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 -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 +diff -Naur Python-3.5.0-orig/Lib/distutils/cygwinccompiler.py Python-3.5.0/Lib/distutils/cygwinccompiler.py +--- Python-3.5.0-orig/Lib/distutils/cygwinccompiler.py 2015-09-21 13:41:45.246324500 +0300 ++++ Python-3.5.0/Lib/distutils/cygwinccompiler.py 2015-09-21 13:41:50.481800900 +0300 @@ -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 c4128ae0f8..615286e78c 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,7 +1,7 @@ -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 @@ +diff -Naur Python-3.5.0-orig/Lib/distutils/sysconfig.py Python-3.5.0/Lib/distutils/sysconfig.py +--- Python-3.5.0-orig/Lib/distutils/sysconfig.py 2015-09-21 13:41:23.499499400 +0300 ++++ Python-3.5.0/Lib/distutils/sysconfig.py 2015-09-21 13:41:51.721676900 +0300 +@@ -53,6 +53,17 @@ return _is_python_source_dir(project_base) python_build = _python_build() @@ -19,7 +19,7 @@ diff -urN a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py # Calculate the build qualifier flags if they are defined. Adding the flags # to the include and lib directories only makes sense for an installation, not # an in-source build. -@@ -95,7 +106,7 @@ +@@ -86,7 +97,7 @@ """ if prefix is None: prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX @@ -28,7 +28,7 @@ diff -urN a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py if python_build: # Assume the executable is in the build directory. The # pyconfig.h file should be in the same directory. Since -@@ -140,7 +151,7 @@ +@@ -131,7 +142,7 @@ else: prefix = plat_specific and EXEC_PREFIX or PREFIX @@ -37,7 +37,7 @@ diff -urN a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py libpython = os.path.join(prefix, "lib", "python" + get_python_version()) if standard_lib: -@@ -250,7 +261,7 @@ +@@ -241,7 +252,7 @@ def get_config_h_filename(): """Return full pathname of installed pyconfig.h file.""" if python_build: @@ -46,7 +46,7 @@ diff -urN 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 -@@ -474,6 +485,9 @@ +@@ -465,6 +476,9 @@ def _init_nt(): @@ -56,7 +56,7 @@ diff -urN a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py """Initialize the module as appropriate for NT""" g = {} # set basic install directories -@@ -523,7 +537,7 @@ +@@ -514,7 +528,7 @@ # Always convert srcdir to an absolute path srcdir = _config_vars.get('srcdir', project_base) @@ -65,7 +65,7 @@ diff -urN 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 -@@ -542,7 +556,7 @@ +@@ -533,7 +547,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 b2b9e4fd84..26c033ae13 100644 --- a/mingw-w64-python3/0490-MINGW-customize-site.patch +++ b/mingw-w64-python3/0490-MINGW-customize-site.patch @@ -1,6 +1,6 @@ -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 +diff -Naur Python-3.5.0-orig/Lib/site.py Python-3.5.0/Lib/site.py +--- Python-3.5.0-orig/Lib/site.py 2015-09-13 14:41:21.000000000 +0300 ++++ Python-3.5.0/Lib/site.py 2015-09-21 13:41:52.913557700 +0300 @@ -267,6 +267,12 @@ USER_SITE = get_path('purelib', 'osx_framework_user') return USER_SITE @@ -14,7 +14,7 @@ diff -urN a/Lib/site.py b/Lib/site.py USER_SITE = get_path('purelib', '%s_user' % os.name) return USER_SITE -@@ -298,12 +304,13 @@ +@@ -297,12 +303,13 @@ if prefixes is None: prefixes = PREFIXES diff --git a/mingw-w64-python3/0500-add-python-config-sh.patch b/mingw-w64-python3/0500-add-python-config-sh.patch index d062410397..6aaa698a2f 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 -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 +diff -Naur Python-3.5.0-orig/Misc/python-config.sh.in Python-3.5.0/Misc/python-config.sh.in +--- Python-3.5.0-orig/Misc/python-config.sh.in 2015-09-13 14:41:24.000000000 +0300 ++++ Python-3.5.0/Misc/python-config.sh.in 2015-09-21 13:41:54.198429200 +0300 @@ -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 48644bc218..14344dedca 100644 --- a/mingw-w64-python3/0510-cross-darwin-feature.patch +++ b/mingw-w64-python3/0510-cross-darwin-feature.patch @@ -1,6 +1,6 @@ -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 +diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac +--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:38.885960600 +0300 ++++ Python-3.5.0/configure.ac 2015-09-21 13:41:55.469158400 +0300 @@ -374,6 +374,7 @@ then # avoid using uname for cross builds @@ -53,7 +53,7 @@ diff -urN a/configure.ac b/configure.ac *) # for now, limit cross builds to known configurations MACHDEP="unknown" -@@ -1205,6 +1229,26 @@ +@@ -1347,6 +1371,26 @@ AC_SUBST(BASECFLAGS) AC_SUBST(CFLAGS_NODIST) @@ -80,7 +80,7 @@ diff -urN a/configure.ac b/configure.ac # The -arch flags for universal builds on OSX UNIVERSAL_ARCH_FLAGS= AC_SUBST(UNIVERSAL_ARCH_FLAGS) -@@ -1404,7 +1448,7 @@ +@@ -1592,7 +1636,7 @@ ;; esac else @@ -89,7 +89,7 @@ diff -urN a/configure.ac b/configure.ac then # 10.4 was the first release to support Intel archs cur_target="10.4" -@@ -1975,7 +2019,7 @@ +@@ -2163,7 +2207,7 @@ if test "${enable_universalsdk}"; then : else @@ -98,7 +98,7 @@ diff -urN 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)';; -@@ -2000,7 +2044,7 @@ +@@ -2188,7 +2232,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 -urN a/configure.ac b/configure.ac i386) MACOSX_DEFAULT_ARCH="i386" ;; -@@ -2012,7 +2056,7 @@ +@@ -2200,7 +2244,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 e144e3d6e2..d24f7b8fbf 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 -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 @@ +diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac +--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:56.872256800 +0300 ++++ Python-3.5.0/configure.ac 2015-09-21 13:41:56.988523200 +0300 +@@ -1896,7 +1896,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 -urN 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 \ -@@ -2418,9 +2418,11 @@ +@@ -2609,9 +2609,11 @@ : else if test "$with_threads" = "yes" -o -z "$with_threads"; then @@ -25,7 +25,7 @@ diff -urN a/configure.ac b/configure.ac fi fi -@@ -4672,6 +4674,14 @@ +@@ -4902,6 +4904,14 @@ AC_CHECK_HEADERS(curses.h ncurses.h) @@ -40,9 +40,9 @@ diff -urN a/configure.ac b/configure.ac # On Solaris, term.h requires curses.h AC_CHECK_HEADERS(term.h,,,[ #ifdef HAVE_CURSES_H -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 +diff -Naur Python-3.5.0-orig/Python/condvar.h Python-3.5.0/Python/condvar.h +--- Python-3.5.0-orig/Python/condvar.h 2015-09-13 14:41:26.000000000 +0300 ++++ Python-3.5.0/Python/condvar.h 2015-09-21 13:41:56.995296000 +0300 @@ -42,6 +42,12 @@ #include "Python.h" @@ -56,9 +56,9 @@ diff -urN 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 -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 +diff -Naur Python-3.5.0-orig/Python/thread.c Python-3.5.0/Python/thread.c +--- Python-3.5.0-orig/Python/thread.c 2015-09-13 14:41:26.000000000 +0300 ++++ Python-3.5.0/Python/thread.c 2015-09-21 13:41:57.011099200 +0300 @@ -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 4d5b8a628a..58730e87e1 100644 --- a/mingw-w64-python3/0530-mingw-system-libffi.patch +++ b/mingw-w64-python3/0530-mingw-system-libffi.patch @@ -1,21 +1,7 @@ -From 461aa7426a9f93bdfb3fb8f6e309ae2c379bbff4 Mon Sep 17 00:00:00 2001 -From: Ray Donnelly -Date: Fri, 20 Feb 2015 17:01:56 +0000 -Subject: [PATCH] mingw-w64: ctypes/ffi build fixes - -1. Prevent export of DllGetClassObject and DllCanUnloadNow in _ctypes import lib -2. Don't compile src/dlmalloc.c for Windows -3. Use forward slashes for ffi_{build,src}dir ---- - Modules/_ctypes/libffi/fficonfig.py.in | 4 ++++ - setup.py | 8 ++++++++ - 2 files changed, 12 insertions(+) - -diff --git a/Modules/_ctypes/libffi/fficonfig.py.in b/Modules/_ctypes/libffi/fficonfig.py.in -index d102498..0277c64 100644 ---- a/Modules/_ctypes/libffi/fficonfig.py.in -+++ b/Modules/_ctypes/libffi/fficonfig.py.in -@@ -23,6 +23,7 @@ ffi_platforms = { +diff -Naur Python-3.5.0-orig/Modules/_ctypes/libffi/fficonfig.py.in Python-3.5.0/Modules/_ctypes/libffi/fficonfig.py.in +--- Python-3.5.0-orig/Modules/_ctypes/libffi/fficonfig.py.in 2015-09-13 14:41:24.000000000 +0300 ++++ Python-3.5.0/Modules/_ctypes/libffi/fficonfig.py.in 2015-09-21 13:41:58.520304800 +0300 +@@ -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'], @@ -23,7 +9,7 @@ index d102498..0277c64 100644 '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'], -@@ -30,6 +31,9 @@ ffi_platforms = { +@@ -30,6 +31,9 @@ 'PA_HPUX': ['src/pa/hpux32.S', 'src/pa/ffi.c'], } @@ -33,11 +19,10 @@ index d102498..0277c64 100644 ffi_sources += ffi_platforms['@TARGET@'] ffi_cflags = '@CFLAGS@' -diff --git a/setup.py b/setup.py -index 4622d11..5491b8b 100644 ---- a/setup.py -+++ b/setup.py -@@ -1880,6 +1880,10 @@ class PyBuildExt(build_ext): +diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py +--- Python-3.5.0-orig/setup.py 2015-09-21 13:41:50.381810900 +0300 ++++ Python-3.5.0/setup.py 2015-09-21 13:41:58.521433600 +0300 +@@ -1908,6 +1908,10 @@ return True def configure_ctypes(self, ext): @@ -48,7 +33,7 @@ index 4622d11..5491b8b 100644 if not self.use_system_libffi: if host_platform == 'darwin': return self.configure_ctypes_darwin(ext) -@@ -1904,6 +1908,10 @@ class PyBuildExt(build_ext): +@@ -1932,6 +1936,10 @@ if not self.verbose: config_args.append("-q") @@ -59,6 +44,3 @@ index 4622d11..5491b8b 100644 # Pass empty CFLAGS because we'll just append the resulting # CFLAGS to Python's; -g or -O2 is to be avoided. cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \ --- -2.3.0 - diff --git a/mingw-w64-python3/0540-mingw-semicolon-DELIM.patch b/mingw-w64-python3/0540-mingw-semicolon-DELIM.patch index 98678800a5..0c1073e2e5 100644 --- a/mingw-w64-python3/0540-mingw-semicolon-DELIM.patch +++ b/mingw-w64-python3/0540-mingw-semicolon-DELIM.patch @@ -1,6 +1,6 @@ -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 +diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac +--- Python-3.5.0-orig/configure.ac 2015-09-21 13:41:58.367916800 +0300 ++++ Python-3.5.0/configure.ac 2015-09-21 13:42:00.039669600 +0300 @@ -602,6 +602,16 @@ fi AC_MSG_RESULT($MACHDEP) @@ -18,18 +18,18 @@ diff -urN a/configure.ac b/configure.ac AC_MSG_CHECKING([for init system calls]) AC_SUBST(INITSYS) case $host in -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 @@ +diff -Naur Python-3.5.0-orig/Include/osdefs.h Python-3.5.0/Include/osdefs.h +--- Python-3.5.0-orig/Include/osdefs.h 2015-09-13 14:41:20.000000000 +0300 ++++ Python-3.5.0/Include/osdefs.h 2015-09-21 13:42:00.047571200 +0300 +@@ -12,6 +12,7 @@ #define ALTSEP L'/' #define MAXPATHLEN 256 #define DELIM L';' +#define DELIMSTR ";" #endif - #endif -@@ -42,6 +43,7 @@ + /* Filename separator */ +@@ -39,6 +40,7 @@ /* Search path entry delimiter */ #ifndef DELIM #define DELIM L':' @@ -37,9 +37,9 @@ diff -urN a/Include/osdefs.h b/Include/osdefs.h #endif #ifdef __cplusplus -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 +diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in +--- Python-3.5.0-orig/Makefile.pre.in 2015-09-21 13:41:32.555593700 +0300 ++++ Python-3.5.0/Makefile.pre.in 2015-09-21 13:42:00.074662400 +0300 @@ -98,7 +98,8 @@ # C flags used for building the interpreter object files PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CFLAGS_NODIST) $(PY_CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE @@ -50,9 +50,9 @@ diff -urN a/Makefile.pre.in b/Makefile.pre.in # Machine-dependent subdirectories MACHDEP= @MACHDEP@ -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 +diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c +--- Python-3.5.0-orig/Modules/getpath.c 2015-09-13 14:41:24.000000000 +0300 ++++ Python-3.5.0/Modules/getpath.c 2015-09-21 13:42:00.084821600 +0300 @@ -118,7 +118,7 @@ #endif @@ -62,9 +62,9 @@ diff -urN a/Modules/getpath.c b/Modules/getpath.c EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" #endif -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 +diff -Naur Python-3.5.0-orig/Modules/Setup.dist Python-3.5.0/Modules/Setup.dist +--- Python-3.5.0-orig/Modules/Setup.dist 2015-09-21 13:41:18.333016100 +0300 ++++ Python-3.5.0/Modules/Setup.dist 2015-09-21 13:42:00.091594400 +0300 @@ -84,14 +84,14 @@ # Empty since this is now just the runtime prefix. DESTPATH= @@ -77,8 +77,8 @@ diff -urN a/Modules/Setup.dist b/Modules/Setup.dist TESTPATH= # Path components for machine- or system-dependent modules and shared libraries --MACHDEPPATH=:plat-$(MACHDEP) -+MACHDEPPATH=$(DELIM)plat-$(MACHDEP) +-MACHDEPPATH=:$(PLATDIR) ++MACHDEPPATH=$(DELIM)$(PLATDIR) EXTRAMACHDEPPATH= COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(EXTRAMACHDEPPATH) 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 5bfb75fa91..55b9627fa1 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 -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 +diff -Naur Python-3.5.0-orig/Lib/plat-generic/regen Python-3.5.0/Lib/plat-generic/regen +--- Python-3.5.0-orig/Lib/plat-generic/regen 2015-09-13 14:41:21.000000000 +0300 ++++ Python-3.5.0/Lib/plat-generic/regen 2015-09-21 13:42:01.557905600 +0300 @@ -1,3 +1,9 @@ #! /bin/sh set -v @@ -12,10 +12,10 @@ diff -urN 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 -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 @@ +diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in +--- Python-3.5.0-orig/Makefile.pre.in 2015-09-21 13:42:01.413419200 +0300 ++++ Python-3.5.0/Makefile.pre.in 2015-09-21 13:42:01.563549600 +0300 +@@ -1322,7 +1322,7 @@ else \ PYTHON_FOR_BUILD="$(PYTHON_FOR_BUILD)"; \ fi; \ diff --git a/mingw-w64-python3/0555-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch b/mingw-w64-python3/0555-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch index 1feab25cbe..9470fa0acd 100644 --- a/mingw-w64-python3/0555-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch +++ b/mingw-w64-python3/0555-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch @@ -1,8 +1,8 @@ -diff -urN Python-3.4.3.orig/Include/pythonrun.h Python-3.4.3/Include/pythonrun.h ---- Python-3.4.3.orig/Include/pythonrun.h 2015-03-17 14:11:48.550537200 +0000 -+++ Python-3.4.3/Include/pythonrun.h 2015-03-17 14:11:49.728537200 +0000 -@@ -22,6 +22,12 @@ - } PyCompilerFlags; +diff -Naur Python-3.5.0-orig/Include/pylifecycle.h Python-3.5.0/Include/pylifecycle.h +--- Python-3.5.0-orig/Include/pylifecycle.h 2015-09-13 14:41:20.000000000 +0300 ++++ Python-3.5.0/Include/pylifecycle.h 2015-09-21 13:42:03.010671200 +0300 +@@ -7,6 +7,12 @@ + extern "C" { #endif +PyAPI_FUNC(wchar_t) Py_GetSepW(wchar_t *); @@ -14,9 +14,9 @@ diff -urN Python-3.4.3.orig/Include/pythonrun.h Python-3.4.3/Include/pythonrun.h PyAPI_FUNC(void) Py_SetProgramName(wchar_t *); PyAPI_FUNC(wchar_t *) Py_GetProgramName(void); -diff -urN Python-3.4.3.orig/Lib/ntpath.py Python-3.4.3/Lib/ntpath.py ---- Python-3.4.3.orig/Lib/ntpath.py 2015-03-17 14:11:42.000537200 +0000 -+++ Python-3.4.3/Lib/ntpath.py 2015-03-17 14:11:49.731537200 +0000 +diff -Naur Python-3.5.0-orig/Lib/ntpath.py Python-3.5.0/Lib/ntpath.py +--- Python-3.5.0-orig/Lib/ntpath.py 2015-09-13 14:41:21.000000000 +0300 ++++ Python-3.5.0/Lib/ntpath.py 2015-09-21 13:42:03.025345600 +0300 @@ -24,9 +24,13 @@ curdir = '.' pardir = '..' @@ -33,23 +33,7 @@ diff -urN Python-3.4.3.orig/Lib/ntpath.py Python-3.4.3/Lib/ntpath.py defpath = '.;C:\\bin' if 'ce' in sys.builtin_module_names: defpath = '\\Windows' -@@ -40,21 +44,21 @@ - - def _get_sep(path): - if isinstance(path, bytes): -- return b'\\' -+ return str.encode(sep) - else: -- return '\\' -+ return sep - - def _get_altsep(path): - if isinstance(path, bytes): -- return b'/' -+ return str.encode(altsep) - else: -- return '/' -+ return altsep +@@ -34,9 +38,27 @@ def _get_bothseps(path): if isinstance(path, bytes): @@ -58,13 +42,138 @@ diff -urN Python-3.4.3.orig/Lib/ntpath.py Python-3.4.3/Lib/ntpath.py else: - return '\\/' + return sep+altsep ++ ++def _get_sep(path): ++ if isinstance(path, bytes): ++ return b'\\' ++ else: ++ return '\\' ++ ++def _get_altsep(path): ++ if isinstance(path, bytes): ++ return b'/' ++ else: ++ return '/' ++ ++def _get_colon(path): ++ if isinstance(path, bytes): ++ return b':' ++ else: ++ return ':' - def _get_dot(path): + # Normalize the case of a pathname and map slashes to backslashes. + # Other normalizations (such as optimizing '../' away) are not done +@@ -48,9 +52,9 @@ + Makes all characters lowercase and all slashes into backslashes.""" + try: + if isinstance(s, bytes): +- return s.replace(b'/', b'\\').lower() ++ return s.replace(str.encode(altsep), str.encode(sep)).lower() + else: +- return s.replace('/', '\\').lower() ++ return s.replace(altsep, sep).lower() + except (TypeError, AttributeError): + if not isinstance(s, (bytes, str)): + raise TypeError("normcase() argument must be str or bytes, " +@@ -73,13 +77,8 @@ + + # Join two (or more) paths. + def join(path, *paths): +- if isinstance(path, bytes): +- sep = b'\\' +- seps = b'\\/' +- colon = b':' +- else: +- sep = '\\' +- seps = '\\/' +- colon = ':' ++ sep = _get_sep(path) ++ seps = _get_bothseps(path) ++ colon = _get_colon(path) + try: + if not paths: +@@ -138,14 +142,9 @@ + + """ + if len(p) >= 2: +- if isinstance(p, bytes): +- sep = b'\\' +- altsep = b'/' +- colon = b':' +- else: +- sep = '\\' +- altsep = '/' +- colon = ':' ++ sep = _get_sep(p) ++ altsep = _get_altsep(p) ++ colon = _get_colon(p) + normp = p.replace(altsep, sep) + if (normp[0:2] == sep*2) and (normp[2:3] != sep): + # is a UNC path: +@@ -219,9 +223,9 @@ + + def splitext(p): + if isinstance(p, bytes): +- return genericpath._splitext(p, b'\\', b'/', b'.') ++ return genericpath._splitext(p, str.encode(sep), str.encode(altsep), b'.') + else: +- return genericpath._splitext(p, '\\', '/', '.') ++ return genericpath._splitext(p, sep, altsep, '.') + splitext.__doc__ = genericpath._splitext.__doc__ + + +@@ -465,15 +469,13 @@ + + def normpath(path): + """Normalize path, eliminating double slashes, etc.""" ++ sep = _get_sep(path) ++ altsep = _get_altsep(path) if isinstance(path, bytes): -diff -urN Python-3.4.3.orig/Modules/getpath.c Python-3.4.3/Modules/getpath.c ---- Python-3.4.3.orig/Modules/getpath.c 2015-03-17 14:11:48.335537200 +0000 -+++ Python-3.4.3/Modules/getpath.c 2015-03-17 15:08:01.585542500 +0000 -@@ -135,7 +135,7 @@ +- sep = b'\\' +- altsep = b'/' + curdir = b'.' + pardir = b'..' + special_prefixes = (b'\\\\.\\', b'\\\\?\\') + else: +- sep = '\\' +- altsep = '/' + curdir = '.' + pardir = '..' + special_prefixes = ('\\\\.\\', '\\\\?\\') +@@ -550,12 +554,11 @@ + + def relpath(path, start=None): + """Return a relative version of a path""" ++ sep = _get_sep(path) + if isinstance(path, bytes): +- sep = b'\\' + curdir = b'.' + pardir = b'..' + else: +- sep = '\\' + curdir = '.' + pardir = '..' + +@@ -608,13 +612,11 @@ + if not paths: + raise ValueError('commonpath() arg is an empty sequence') + ++ sep = _get_sep(path) ++ altsep = _get_altsep(path) + if isinstance(paths[0], bytes): +- sep = b'\\' +- altsep = b'/' + curdir = b'.' + else: +- sep = '\\' +- altsep = '/' + curdir = '.' + + try: +diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c +--- Python-3.5.0-orig/Modules/getpath.c 2015-09-21 13:42:01.429222400 +0300 ++++ Python-3.5.0/Modules/getpath.c 2015-09-21 13:42:03.044535200 +0300 +@@ -152,7 +152,7 @@ reduce(wchar_t *dir) { size_t i = wcslen(dir); @@ -73,7 +182,7 @@ diff -urN Python-3.4.3.orig/Modules/getpath.c Python-3.4.3/Modules/getpath.c --i; dir[i] = '\0'; } -@@ -207,12 +207,12 @@ +@@ -224,12 +224,12 @@ joinpath(wchar_t *buffer, wchar_t *stuff) { size_t n, k; @@ -89,7 +198,7 @@ diff -urN Python-3.4.3.orig/Modules/getpath.c Python-3.4.3/Modules/getpath.c } if (n > MAXPATHLEN) Py_FatalError("buffer overflow in getpath.c's joinpath()"); -@@ -228,7 +228,7 @@ +@@ -245,7 +245,7 @@ static void copy_absolute(wchar_t *path, wchar_t *p, size_t pathlen) { @@ -98,7 +207,7 @@ diff -urN Python-3.4.3.orig/Modules/getpath.c Python-3.4.3/Modules/getpath.c wcscpy(path, p); else { if (!_Py_wgetcwd(path, pathlen)) { -@@ -236,7 +236,7 @@ +@@ -253,7 +253,7 @@ wcscpy(path, p); return; } @@ -107,7 +216,7 @@ diff -urN Python-3.4.3.orig/Modules/getpath.c Python-3.4.3/Modules/getpath.c p += 2; joinpath(path, p); } -@@ -248,7 +248,7 @@ +@@ -265,7 +265,7 @@ { wchar_t buffer[MAXPATHLEN+1]; @@ -116,7 +225,7 @@ diff -urN Python-3.4.3.orig/Modules/getpath.c Python-3.4.3/Modules/getpath.c return; copy_absolute(buffer, path, MAXPATHLEN+1); wcscpy(path, buffer); -@@ -461,7 +461,7 @@ +@@ -478,7 +478,7 @@ extern wchar_t *Py_GetProgramName(void); static wchar_t delimiter[2] = {DELIM, '\0'}; @@ -125,21 +234,21 @@ diff -urN Python-3.4.3.orig/Modules/getpath.c Python-3.4.3/Modules/getpath.c char *_rtpypath = Py_GETENV("PYTHONPATH"); /* XXX use wide version on Windows */ wchar_t *rtpypath = NULL; wchar_t *home = Py_GetPythonHome(); -@@ -490,11 +490,12 @@ +@@ -507,11 +507,12 @@ #endif wchar_t *_pythonpath, *_prefix, *_exec_prefix; wchar_t *lib_python; + const char * lib_python_VERSION = (Py_GetSepA(NULL) == '/') ? "lib/python" VERSION : "lib\\python" VERSION; - _pythonpath = _Py_char2wchar(PYTHONPATH, NULL); - _prefix = _Py_char2wchar(PREFIX, NULL); - _exec_prefix = _Py_char2wchar(EXEC_PREFIX, NULL); -- lib_python = _Py_char2wchar("lib/python" VERSION, NULL); -+ lib_python = _Py_char2wchar(lib_python_VERSION, NULL); + _pythonpath = Py_DecodeLocale(PYTHONPATH, NULL); + _prefix = Py_DecodeLocale(PREFIX, NULL); + _exec_prefix = Py_DecodeLocale(EXEC_PREFIX, NULL); +- lib_python = Py_DecodeLocale("lib/python" VERSION, NULL); ++ lib_python = Py_DecodeLocale(lib_python_VERSION, NULL); if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) { Py_FatalError( -@@ -512,7 +513,7 @@ +@@ -529,7 +530,7 @@ * other way to find a directory to start the search from. If * $PATH isn't exported, you lose. */ @@ -148,7 +257,7 @@ diff -urN Python-3.4.3.orig/Modules/getpath.c Python-3.4.3/Modules/getpath.c wcsncpy(progpath, prog, MAXPATHLEN); #ifdef __APPLE__ /* On Mac OS X, if a script uses an interpreter of the form -@@ -561,7 +562,7 @@ +@@ -578,7 +579,7 @@ else progpath[0] = '\0'; PyMem_RawFree(path_buffer); @@ -157,7 +266,7 @@ diff -urN Python-3.4.3.orig/Modules/getpath.c Python-3.4.3/Modules/getpath.c absolutize(progpath); wcsncpy(argv0_path, progpath, MAXPATHLEN); argv0_path[MAXPATHLEN] = '\0'; -@@ -719,7 +720,7 @@ +@@ -736,7 +737,7 @@ while (1) { wchar_t *delim = wcschr(defpath, DELIM); @@ -166,7 +275,7 @@ diff -urN Python-3.4.3.orig/Modules/getpath.c Python-3.4.3/Modules/getpath.c /* Paths are relative to prefix */ bufsz += prefixsz; -@@ -760,7 +761,7 @@ +@@ -777,7 +778,7 @@ while (1) { wchar_t *delim = wcschr(defpath, DELIM); @@ -175,10 +284,10 @@ diff -urN Python-3.4.3.orig/Modules/getpath.c Python-3.4.3/Modules/getpath.c wcscat(buf, prefix); wcscat(buf, separator); } -diff -urN Python-3.4.3.orig/Modules/posixmodule.c Python-3.4.3/Modules/posixmodule.c ---- Python-3.4.3.orig/Modules/posixmodule.c 2015-03-17 14:11:48.299537200 +0000 -+++ Python-3.4.3/Modules/posixmodule.c 2015-03-17 14:11:49.742537200 +0000 -@@ -3474,6 +3474,7 @@ +diff -Naur Python-3.5.0-orig/Modules/posixmodule.c Python-3.5.0/Modules/posixmodule.c +--- Python-3.5.0-orig/Modules/posixmodule.c 2015-09-21 13:41:14.291420300 +0300 ++++ Python-3.5.0/Modules/posixmodule.c 2015-09-21 13:42:03.062596000 +0300 +@@ -3318,6 +3318,7 @@ PyMem_RawFree(wbuf2); return PyErr_SetFromWindowsErr(0); } @@ -186,8 +295,8 @@ diff -urN Python-3.4.3.orig/Modules/posixmodule.c Python-3.4.3/Modules/posixmodu resobj = PyUnicode_FromWideChar(wbuf2, len); if (wbuf2 != wbuf) PyMem_RawFree(wbuf2); -@@ -3955,7 +3956,10 @@ - result = GetFullPathNameW(wpath, result, woutbufp, &wtemp); +@@ -3796,7 +3797,10 @@ + result = GetFullPathNameW(path->wide, result, woutbufp, &wtemp); } if (result) + { @@ -195,41 +304,40 @@ diff -urN Python-3.4.3.orig/Modules/posixmodule.c Python-3.4.3/Modules/posixmodu v = PyUnicode_FromWideChar(woutbufp, wcslen(woutbufp)); + } else - v = win32_error_object("GetFullPathNameW", po); + v = win32_error_object("GetFullPathNameW", path->object); if (woutbufp != woutbuf) -@@ -3976,6 +3980,7 @@ - win32_error("GetFullPathName", path); - return NULL; +@@ -3812,6 +3816,7 @@ + win32_error_object("GetFullPathName", path->object); + return NULL; + } ++ Py_NormalizeSepsA(outbuf); + return PyBytes_FromString(outbuf); } -+ Py_NormalizeSepsA(outbuf); - if (PyUnicode_Check(PyTuple_GetItem(args, 0))) { - return PyUnicode_Decode(outbuf, strlen(outbuf), - Py_FileSystemDefaultEncoding, NULL); -@@ -4039,6 +4044,7 @@ + } +@@ -3873,6 +3878,7 @@ if(!CloseHandle(hFile)) - return win32_error_object("CloseHandle", po); + return win32_error_object("CloseHandle", path); + Py_NormalizeSepsW(target_path); target_path[result_length] = 0; result = PyUnicode_FromWideChar(target_path, result_length); PyMem_Free(target_path); -diff -urN Python-3.4.3.orig/Python/pythonrun.c Python-3.4.3/Python/pythonrun.c ---- Python-3.4.3.orig/Python/pythonrun.c 2015-03-17 14:11:49.077537200 +0000 -+++ Python-3.4.3/Python/pythonrun.c 2015-03-17 14:11:49.746537200 +0000 -@@ -871,17 +871,124 @@ +diff -Naur Python-3.5.0-orig/Python/pylifecycle.c Python-3.5.0/Python/pylifecycle.c +--- Python-3.5.0-orig/Python/pylifecycle.c 2015-09-13 14:41:26.000000000 +0300 ++++ Python-3.5.0/Python/pylifecycle.c 2015-09-21 13:42:03.089687200 +0300 +@@ -831,17 +831,123 @@ PyInterpreterState_Delete(interp); } -#ifdef MS_WINDOWS -static wchar_t *progname = L"python"; -+ -+#if defined(MS_WINDOWS) && !defined(__MINGW32__) ++#if defined(_MSC_VER) +static wchar_t progname[PATH_MAX+1] = L"python"; #else -static wchar_t *progname = L"python3"; +static wchar_t progname[PATH_MAX+1] = L"python3"; -+#endif -+ + #endif + +wchar_t +Py_GetSepW(wchar_t *name) +{ @@ -285,7 +393,7 @@ diff -urN Python-3.4.3.orig/Python/pythonrun.c Python-3.4.3/Python/pythonrun.c + return sep; +#if defined(__MINGW32__) + msystem = Py_GETENV("MSYSTEM"); - #endif ++#endif + if (msystem != NULL) + sep = '/'; + else @@ -333,7 +441,7 @@ diff -urN Python-3.4.3.orig/Python/pythonrun.c Python-3.4.3/Python/pythonrun.c + seps = strchr(seps, altsep); + } +} - ++ void Py_SetProgramName(wchar_t *pn) { @@ -345,10 +453,10 @@ diff -urN Python-3.4.3.orig/Python/pythonrun.c Python-3.4.3/Python/pythonrun.c } wchar_t * -diff -urN Python-3.4.3.orig/Python/sysmodule.c Python-3.4.3/Python/sysmodule.c ---- Python-3.4.3.orig/Python/sysmodule.c 2015-03-17 14:11:49.071537200 +0000 -+++ Python-3.4.3/Python/sysmodule.c 2015-03-17 14:11:49.750537200 +0000 -@@ -1983,7 +1983,7 @@ +diff -Naur Python-3.5.0-orig/Python/sysmodule.c Python-3.5.0/Python/sysmodule.c +--- Python-3.5.0-orig/Python/sysmodule.c 2015-09-13 14:41:26.000000000 +0300 ++++ Python-3.5.0/Python/sysmodule.c 2015-09-21 13:42:03.098717600 +0300 +@@ -2048,7 +2048,7 @@ argv0 = fullpath; } #endif @@ -357,9 +465,9 @@ diff -urN Python-3.4.3.orig/Python/sysmodule.c Python-3.4.3/Python/sysmodule.c } if (p != NULL) { n = p + 1 - argv0; -diff -urN Python-3.4.3.orig/Python/traceback.c Python-3.4.3/Python/traceback.c ---- Python-3.4.3.orig/Python/traceback.c 2015-03-17 14:11:49.085537200 +0000 -+++ Python-3.4.3/Python/traceback.c 2015-03-17 14:11:49.753537200 +0000 +diff -Naur Python-3.5.0-orig/Python/traceback.c Python-3.5.0/Python/traceback.c +--- Python-3.5.0-orig/Python/traceback.c 2015-09-13 14:41:26.000000000 +0300 ++++ Python-3.5.0/Python/traceback.c 2015-09-21 13:42:03.115649600 +0300 @@ -199,7 +199,7 @@ filepath = PyBytes_AS_STRING(filebytes); diff --git a/mingw-w64-python3/0560-mingw-use-posix-getpath.patch b/mingw-w64-python3/0560-mingw-use-posix-getpath.patch index 298053d7ad..d9968af475 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 -urN Python-3.4.3.orig/configure.ac Python-3.4.3/configure.ac ---- Python-3.4.3.orig/configure.ac 2015-03-10 19:54:16.269472000 +0000 -+++ Python-3.4.3/configure.ac 2015-03-10 19:54:18.129848200 +0000 -@@ -5016,7 +5016,7 @@ +diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac +--- Python-3.5.0-orig/configure.ac 2015-09-21 13:42:01.382941600 +0300 ++++ Python-3.5.0/configure.ac 2015-09-21 13:42:04.711772800 +0300 +@@ -5243,7 +5243,7 @@ case $host in *-*-mingw*) dnl default sys.path calculations for windows platforms @@ -10,21 +10,9 @@ diff -urN Python-3.4.3.orig/configure.ac Python-3.4.3/configure.ac ;; esac -diff -urN Python-3.4.3.orig/Include/fileutils.h Python-3.4.3/Include/fileutils.h ---- Python-3.4.3.orig/Include/fileutils.h 2015-03-10 19:54:16.551268400 +0000 -+++ Python-3.4.3/Include/fileutils.h 2015-03-10 19:54:18.129848200 +0000 -@@ -15,7 +15,7 @@ - const wchar_t *text, - size_t *error_pos); - --#if defined(HAVE_STAT) && !defined(MS_WINDOWS) -+#if defined(HAVE_STAT) && (!defined(MS_WINDOWS) || defined(__MINGW32__)) - PyAPI_FUNC(int) _Py_wstat( - const wchar_t* path, - struct stat *buf); -diff -urN Python-3.4.3.orig/Modules/getpath.c Python-3.4.3/Modules/getpath.c ---- Python-3.4.3.orig/Modules/getpath.c 2015-03-10 19:54:17.192860200 +0000 -+++ Python-3.4.3/Modules/getpath.c 2015-03-10 20:00:49.860494500 +0000 +diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c +--- Python-3.5.0-orig/Modules/getpath.c 2015-09-21 13:42:04.532293600 +0300 ++++ Python-3.5.0/Modules/getpath.c 2015-09-21 13:42:04.737735200 +0300 @@ -10,6 +10,10 @@ #include #endif @@ -53,17 +41,17 @@ diff -urN Python-3.4.3.orig/Modules/getpath.c Python-3.4.3/Modules/getpath.c +#endif static wchar_t *module_search_path = NULL; - static void -@@ -137,7 +149,7 @@ + /* Get file status. Encode the path to the locale encoding. */ +@@ -154,7 +166,7 @@ size_t i = wcslen(dir); - while (i > 0 && dir[i] != SEP) + while (i > 0 && dir[i] != Py_GetSepW(dir)) --i; - dir[i] = '\0'; + dir[i] = 0; } static int -@@ -455,6 +479,26 @@ +@@ -472,6 +484,26 @@ return 0; } @@ -90,7 +78,7 @@ diff -urN Python-3.4.3.orig/Modules/getpath.c Python-3.4.3/Modules/getpath.c static void calculate_path(void) { -@@ -533,6 +577,10 @@ +@@ -551,6 +583,10 @@ } } #endif /* __APPLE__ */ @@ -101,11 +89,10 @@ diff -urN Python-3.4.3.orig/Modules/getpath.c Python-3.4.3/Modules/getpath.c else if (path) { while (1) { wchar_t *delim = wcschr(path, DELIM); -@@ -871,7 +923,45 @@ +@@ -889,6 +925,45 @@ } --#ifdef __cplusplus +#ifdef MS_WINDOWS +/* Load python3.dll before loading any extension module that might refer + to it. That way, we can be sure that always the python3.dll corresponding @@ -142,25 +129,16 @@ diff -urN Python-3.4.3.orig/Modules/getpath.c Python-3.4.3/Modules/getpath.c + wcscat(py3path, L"\\DLLs\\python3.dll"); + hPython3 = LoadLibraryExW(py3path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); + return hPython3 != NULL; - } - #endif - -+#ifdef __cplusplus +} +#endif -diff -urN Python-3.4.3.orig/Modules/posixmodule.c Python-3.4.3/Modules/posixmodule.c ---- Python-3.4.3.orig/Modules/posixmodule.c 2015-03-10 19:54:17.083661600 +0000 -+++ Python-3.4.3/Modules/posixmodule.c 2015-03-10 19:54:18.145448000 +0000 -@@ -1042,7 +1042,7 @@ ++ + #ifdef __cplusplus } - - /* A helper used by a number of POSIX-only functions */ --#ifndef MS_WINDOWS -+#if !defined(MS_WINDOWS) || defined(__MINGW32__) - static int - _parse_off_t(PyObject* arg, void* addr) - { -@@ -3710,7 +3710,7 @@ + #endif +diff -Naur Python-3.5.0-orig/Modules/posixmodule.c Python-3.5.0/Modules/posixmodule.c +--- Python-3.5.0-orig/Modules/posixmodule.c 2015-09-21 13:42:04.541324000 +0300 ++++ Python-3.5.0/Modules/posixmodule.c 2015-09-21 13:42:04.747894400 +0300 +@@ -3548,7 +3548,7 @@ Py_END_ALLOW_THREADS /* FindNextFile sets error to ERROR_NO_MORE_FILES if it got to the end of the directory. */ @@ -169,7 +147,7 @@ diff -urN Python-3.4.3.orig/Modules/posixmodule.c Python-3.4.3/Modules/posixmodu Py_DECREF(list); list = path_error(path); goto exit; -@@ -3765,7 +3765,7 @@ +@@ -3603,7 +3603,7 @@ Py_END_ALLOW_THREADS /* FindNextFile sets error to ERROR_NO_MORE_FILES if it got to the end of the directory. */ @@ -178,15 +156,3 @@ diff -urN Python-3.4.3.orig/Modules/posixmodule.c Python-3.4.3/Modules/posixmodu Py_DECREF(list); list = path_error(path); goto exit; -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? - */ --#if defined(HAVE_STAT) && !defined(MS_WINDOWS) -+#if defined(HAVE_STAT) && (!defined(MS_WINDOWS) || defined(__MINGW32__)) - - /* Get file status. Encode the path to the locale encoding. */ - 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 508747a3b8..eb427ad35d 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,7 +1,7 @@ -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 @@ +diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c +--- Python-3.5.0-orig/Modules/getpath.c 2015-09-21 13:42:06.130674400 +0300 ++++ Python-3.5.0/Modules/getpath.c 2015-09-21 13:42:06.274032000 +0300 +@@ -865,6 +865,32 @@ else wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN); @@ -10,7 +10,7 @@ diff -urN a/Modules/getpath.c b/Modules/getpath.c + wchar_t *module_path, *new_path; + /* Add path of executable/dll to system path. This + * is so that the correct tcl??.dll and tk??.dll get used. */ -+ path_buffer = _Py_char2wchar(_path, NULL); ++ path_buffer = Py_DecodeLocale(_path, NULL); + module_path = dllpath[0] ? dllpath : progpath; + new_path = (wchar_t *)alloca(sizeof(wchar_t)*(wcslen(L"PATH=")+wcslen(module_path)+1+wcslen(path_buffer)+1)); + if (new_path) { 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 883fee1c0d..1bee045dfe 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,11 +1,10 @@ -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 @@ +diff -Naur Python-3.5.0-orig/Modules/Setup.config.in Python-3.5.0/Modules/Setup.config.in +--- Python-3.5.0-orig/Modules/Setup.config.in 2015-09-21 13:41:18.307018700 +0300 ++++ Python-3.5.0/Modules/Setup.config.in 2015-09-21 13:42:07.709865600 +0300 +@@ -17,6 +17,7 @@ # build-in modules for windows platform: @USE_WIN32_MODULE@winreg ../PC/winreg.c -+@USE_WIN32_MODULE@time timemodule.c +@USE_WIN32_MODULE@msvcrt ../PC/msvcrtmodule.c # The rest of the modules previously listed in this file are built 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 c840d9c061..387a8df32e 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 -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 @@ +diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in +--- Python-3.5.0-orig/Makefile.pre.in 2015-09-21 13:42:02.883116800 +0300 ++++ Python-3.5.0/Makefile.pre.in 2015-09-21 13:42:09.127638400 +0300 +@@ -1091,6 +1091,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/0610-msys-cygwin-semi-native-build-sysconfig.patch b/mingw-w64-python3/0610-msys-cygwin-semi-native-build-sysconfig.patch index bfaa884301..efbbe07e1c 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,6 +1,6 @@ -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 +diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac +--- Python-3.5.0-orig/configure.ac 2015-09-21 13:42:06.113742400 +0300 ++++ Python-3.5.0/configure.ac 2015-09-21 13:42:10.548797600 +0300 @@ -612,6 +612,65 @@ AC_MSG_RESULT([$DELIM]) AC_SUBST(DELIM) @@ -67,10 +67,10 @@ diff -urN a/configure.ac b/configure.ac AC_MSG_CHECKING([for init system calls]) AC_SUBST(INITSYS) case $host in -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 @@ +diff -Naur Python-3.5.0-orig/Lib/sysconfig.py Python-3.5.0/Lib/sysconfig.py +--- Python-3.5.0-orig/Lib/sysconfig.py 2015-09-21 13:41:47.820067100 +0300 ++++ Python-3.5.0/Lib/sysconfig.py 2015-09-21 13:42:10.564600800 +0300 +@@ -323,6 +323,14 @@ if isinstance(v, str): done[k] = v.strip() @@ -85,9 +85,9 @@ diff -urN a/Lib/sysconfig.py b/Lib/sysconfig.py # save the results in the global dictionary vars.update(done) return vars -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 +diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in +--- Python-3.5.0-orig/Makefile.pre.in 2015-09-21 13:42:10.415599200 +0300 ++++ Python-3.5.0/Makefile.pre.in 2015-09-21 13:42:10.572502400 +0300 @@ -115,6 +115,13 @@ # Install prefix for data files datarootdir= @datarootdir@ @@ -102,12 +102,3 @@ diff -urN a/Makefile.pre.in b/Makefile.pre.in # Expanded directories BINDIR= @bindir@ LIBDIR= @libdir@ -@@ -711,7 +718,7 @@ - -DPREFIX='"$(prefix)"' \ - -DEXEC_PREFIX='"$(exec_prefix)"' \ - -DVERSION='"$(VERSION)"' \ -- -DVPATH='"$(VPATH)"' \ -+ -DVPATH='"$(VPATH)"' \ - -o $@ $(srcdir)/Modules/getpath.c - - # default sys.path calculations for windows platforms diff --git a/mingw-w64-python3/0620-mingw-sysconfig-like-posix.patch b/mingw-w64-python3/0620-mingw-sysconfig-like-posix.patch index 9e88a9feec..6d906d0ccf 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 -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 @@ +diff -Naur Python-3.5.0-orig/Lib/distutils/command/build_ext.py Python-3.5.0/Lib/distutils/command/build_ext.py +--- Python-3.5.0-orig/Lib/distutils/command/build_ext.py 2015-09-21 13:41:42.771572000 +0300 ++++ Python-3.5.0/Lib/distutils/command/build_ext.py 2015-09-21 13:42:12.037684800 +0300 +@@ -219,9 +219,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 -urN a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext else: # building python standard extensions self.library_dirs.append('.') -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 +diff -Naur Python-3.5.0-orig/Lib/sysconfig.py Python-3.5.0/Lib/sysconfig.py +--- Python-3.5.0-orig/Lib/sysconfig.py 2015-09-21 13:42:11.910130400 +0300 ++++ Python-3.5.0/Lib/sysconfig.py 2015-09-21 13:42:12.044457600 +0300 @@ -42,22 +42,22 @@ 'data': '{base}', }, @@ -42,17 +42,17 @@ diff -urN a/Lib/sysconfig.py b/Lib/sysconfig.py - 'purelib': '{userbase}/Python{py_version_nodot}/site-packages', - 'platlib': '{userbase}/Python{py_version_nodot}/site-packages', - 'include': '{userbase}/Python{py_version_nodot}/Include', -- 'scripts': '{userbase}/Scripts', +- 'scripts': '{userbase}/Python{py_version_nodot}/Scripts', + 'stdlib': '{userbase}/lib/python{py_version_short}', + 'platstdlib': '{userbase}/lib/python{py_version_short}', -+ 'purelib': '{userbase}/lib/python{py_version_short}', -+ 'platlib': '{userbase}/lib/python{py_version_short}', ++ 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', ++ 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', + 'include': '{userbase}/include/python{py_version_short}', + 'scripts': '{userbase}/bin', 'data': '{userbase}', }, 'posix_user': { -@@ -443,7 +443,7 @@ +@@ -436,7 +436,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 d3e2cf7d0c..f4cc1bfa06 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 -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 +diff -Naur Python-3.5.0-orig/Lib/distutils/cygwinccompiler.py Python-3.5.0/Lib/distutils/cygwinccompiler.py +--- Python-3.5.0-orig/Lib/distutils/cygwinccompiler.py 2015-09-21 13:41:51.606688400 +0300 ++++ Python-3.5.0/Lib/distutils/cygwinccompiler.py 2015-09-21 13:42:14.136124000 +0300 @@ -58,6 +58,7 @@ from distutils import log from distutils.version import LooseVersion @@ -36,21 +36,21 @@ diff -urN a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py return tuple([_find_exe_version(cmd) for cmd in commands]) def is_cygwingcc(): -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 @@ +diff -Naur Python-3.5.0-orig/Modules/Setup.config.in Python-3.5.0/Modules/Setup.config.in +--- Python-3.5.0-orig/Modules/Setup.config.in 2015-09-21 13:42:08.977508000 +0300 ++++ Python-3.5.0/Modules/Setup.config.in 2015-09-21 13:42:14.150798400 +0300 +@@ -18,6 +18,7 @@ + # build-in modules for windows platform: @USE_WIN32_MODULE@winreg ../PC/winreg.c - @USE_WIN32_MODULE@time timemodule.c @USE_WIN32_MODULE@msvcrt ../PC/msvcrtmodule.c +@USE_WIN32_MODULE@_winapi _winapi.c # The rest of the modules previously listed in this file are built # by the setup.py script in Python 2.1 and later. -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 @@ +diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py +--- Python-3.5.0-orig/setup.py 2015-09-21 13:41:59.908728800 +0300 ++++ Python-3.5.0/setup.py 2015-09-21 13:42:14.157571200 +0300 +@@ -918,7 +918,9 @@ exts.append( Extension('msvcrt', [os.path.join(pc_srcdir, p) for p in ['msvcrtmodule.c']]) ) @@ -59,5 +59,5 @@ diff -urN a/setup.py b/setup.py + # use subprocess (which uses Popen) in cygwinccompiler.py + # exts.append( Extension('_winapi', ['_winapi.c']) ) - def allow_db_ver(db_ver): - """Returns a boolean if the given BerkeleyDB version is acceptable. + exts.append( Extension('_msi', [os.path.join(pc_srcdir, p) + for p in ['_msi.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 425727110c..6bde7c9118 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 -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 +diff -Naur Python-3.5.0-orig/Include/pyport.h Python-3.5.0/Include/pyport.h +--- Python-3.5.0-orig/Include/pyport.h 2015-09-21 13:41:27.338115500 +0300 ++++ Python-3.5.0/Include/pyport.h 2015-09-21 13:42:15.719830400 +0300 @@ -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 4a1ee12660..d0cda0af13 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 -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 @@ +diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py +--- Python-3.5.0-orig/setup.py 2015-09-21 13:42:15.605821600 +0300 ++++ Python-3.5.0/setup.py 2015-09-21 13:42:17.110512000 +0300 +@@ -474,10 +474,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 1ee8dffb19..e3c73a8ee8 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,7 +1,7 @@ -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 @@ +diff -Naur Python-3.5.0-orig/Lib/compileall.py Python-3.5.0/Lib/compileall.py +--- Python-3.5.0-orig/Lib/compileall.py 2015-09-13 14:41:20.000000000 +0300 ++++ Python-3.5.0/Lib/compileall.py 2015-09-21 13:42:18.631005600 +0300 +@@ -38,6 +38,8 @@ if name == '__pycache__': continue fullname = os.path.join(dir, name) 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 7eecfaafce..873f0469fd 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,6 +1,6 @@ -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 +diff -Naur Python-3.5.0-orig/Lib/distutils/command/install.py Python-3.5.0/Lib/distutils/command/install.py +--- Python-3.5.0-orig/Lib/distutils/command/install.py 2015-09-13 14:41:20.000000000 +0300 ++++ Python-3.5.0/Lib/distutils/command/install.py 2015-09-21 13:42:20.106347200 +0300 @@ -340,7 +340,8 @@ # Convert directories from Unix /-separated syntax to the local @@ -11,9 +11,9 @@ diff -urN a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py 'scripts', 'data', 'headers', 'userbase', 'usersite') -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 +diff -Naur Python-3.5.0-orig/Lib/distutils/util.py Python-3.5.0/Lib/distutils/util.py +--- Python-3.5.0-orig/Lib/distutils/util.py 2015-09-21 13:41:42.786570500 +0300 ++++ Python-3.5.0/Lib/distutils/util.py 2015-09-21 13:42:20.121021600 +0300 @@ -133,6 +133,13 @@ paths.remove('.') if not paths: @@ -62,10 +62,10 @@ diff -urN a/Lib/distutils/util.py b/Lib/distutils/util.py else: raise DistutilsPlatformError("nothing known about platform '%s'" % os.name) -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 @@ +diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in +--- Python-3.5.0-orig/Makefile.pre.in 2015-09-21 13:42:11.916903200 +0300 ++++ Python-3.5.0/Makefile.pre.in 2015-09-21 13:42:20.127794400 +0300 +@@ -1420,6 +1420,12 @@ else true; \ fi @@ -78,7 +78,7 @@ diff -urN a/Makefile.pre.in b/Makefile.pre.in # Install the dynamically loadable modules # This goes into $(exec_prefix) sharedinstall: sharedmods -@@ -1394,9 +1400,9 @@ +@@ -1427,9 +1433,9 @@ --prefix=$(prefix) \ --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ @@ -91,7 +91,7 @@ diff -urN 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 -@@ -1477,7 +1483,7 @@ +@@ -1510,7 +1516,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 e86ce2190a..52be70400c 100644 --- a/mingw-w64-python3/0690-allow-static-tcltk.patch +++ b/mingw-w64-python3/0690-allow-static-tcltk.patch @@ -1,7 +1,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 @@ +diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py +--- Python-3.5.0-orig/setup.py 2015-09-21 13:42:18.491034400 +0300 ++++ Python-3.5.0/setup.py 2015-09-21 13:42:21.553468800 +0300 +@@ -553,7 +553,7 @@ if host_platform == 'hp-ux11': lib_dirs += ['/usr/lib/hpux64', '/usr/lib/hpux32'] @@ -10,7 +10,7 @@ diff -urN 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. -@@ -545,6 +545,8 @@ +@@ -563,6 +563,8 @@ # directories with whitespace in the name to store libraries. cflags, ldflags = sysconfig.get_config_vars( 'CFLAGS', 'LDFLAGS') @@ -19,7 +19,7 @@ diff -urN a/setup.py b/setup.py for item in cflags.split(): if item.startswith('-I'): inc_dirs.append(item[2:]) -@@ -1755,14 +1757,19 @@ +@@ -1783,14 +1785,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 -urN a/setup.py b/setup.py break # Now check for the header files -@@ -1830,13 +1837,21 @@ +@@ -1858,13 +1865,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 fb391872a7..089d86d561 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 -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 @@ +diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac +--- Python-3.5.0-orig/configure.ac 2015-09-21 13:42:11.881910400 +0300 ++++ Python-3.5.0/configure.ac 2015-09-21 13:42:23.013007200 +0300 +@@ -4969,7 +4969,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 92346b5c28..c66ce4c693 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 -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 @@ +diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac +--- Python-3.5.0-orig/configure.ac 2015-09-21 13:42:24.324672800 +0300 ++++ Python-3.5.0/configure.ac 2015-09-21 13:42:24.444325600 +0300 +@@ -5008,15 +5008,51 @@ fi AC_MSG_CHECKING(whether WINDOW has _flags) @@ -55,9 +55,9 @@ diff -urN a/configure.ac b/configure.ac if test "$ac_cv_window_has_flags" = yes then -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 +diff -Naur Python-3.5.0-orig/Include/py_curses.h Python-3.5.0/Include/py_curses.h +--- Python-3.5.0-orig/Include/py_curses.h 2015-09-13 14:41:20.000000000 +0300 ++++ Python-3.5.0/Include/py_curses.h 2015-09-21 13:42:24.460128800 +0300 @@ -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,10 +81,10 @@ diff -urN a/Include/py_curses.h b/Include/py_curses.h #ifndef MVWDELCH_IS_EXPRESSION #define MVWDELCH_IS_EXPRESSION 1 #endif -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 @@ +diff -Naur Python-3.5.0-orig/pyconfig.h.in Python-3.5.0/pyconfig.h.in +--- Python-3.5.0-orig/pyconfig.h.in 2015-09-21 13:41:38.930956100 +0300 ++++ Python-3.5.0/pyconfig.h.in 2015-09-21 13:42:24.475932000 +0300 +@@ -1202,6 +1202,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 9c71f1013a..ca5f407ada 100644 --- a/mingw-w64-python3/0720-mingw-pdcurses_ISPAD.patch +++ b/mingw-w64-python3/0720-mingw-pdcurses_ISPAD.patch @@ -1,6 +1,6 @@ -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 +diff -Naur Python-3.5.0-orig/Include/py_curses.h Python-3.5.0/Include/py_curses.h +--- Python-3.5.0-orig/Include/py_curses.h 2015-09-21 13:42:25.872257600 +0300 ++++ Python-3.5.0/Include/py_curses.h 2015-09-21 13:42:26.009971200 +0300 @@ -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 7fad6cc74e..ad02b76618 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 -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 +diff -Naur Python-3.5.0-orig/Modules/_cursesmodule.c Python-3.5.0/Modules/_cursesmodule.c +--- Python-3.5.0-orig/Modules/_cursesmodule.c 2015-09-13 14:41:24.000000000 +0300 ++++ Python-3.5.0/Modules/_cursesmodule.c 2015-09-21 13:42:27.468380800 +0300 @@ -125,6 +125,10 @@ #include #endif @@ -12,7 +12,7 @@ diff -urN a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c #if !defined(HAVE_NCURSES_H) && (defined(sgi) || defined(__sun) || defined(SCO5)) #define STRICT_SYSV_CURSES /* Don't use ncurses extensions */ typedef chtype attr_t; /* No attr_t type is available */ -@@ -1772,10 +1776,14 @@ +@@ -1709,10 +1713,14 @@ /* We have to simulate this by writing to a temporary FILE*, then reading back, then writing to the argument stream. */ char fn[100]; @@ -27,7 +27,7 @@ diff -urN a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c strcpy(fn, "/tmp/py.curses.putwin.XXXXXX"); fd = mkstemp(fn); if (fd < 0) -@@ -1783,6 +1791,14 @@ +@@ -1720,6 +1728,14 @@ if (_Py_set_inheritable(fd, 0, NULL) < 0) goto exit; fp = fdopen(fd, "wb+"); @@ -42,7 +42,7 @@ diff -urN a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c if (fp == NULL) { PyErr_SetFromErrnoWithFilename(PyExc_IOError, fn); goto exit; -@@ -1807,8 +1823,10 @@ +@@ -1744,8 +1760,10 @@ exit: if (fp != NULL) fclose(fp); @@ -53,7 +53,7 @@ diff -urN a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c remove(fn); return res; } -@@ -2331,7 +2349,9 @@ +@@ -2268,7 +2286,9 @@ PyCurses_GetWin(PyCursesWindowObject *self, PyObject *stream) { char fn[100]; @@ -63,7 +63,7 @@ diff -urN a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c FILE *fp = NULL; PyObject *data; size_t datalen; -@@ -2341,6 +2361,8 @@ +@@ -2278,6 +2298,8 @@ PyCursesInitialised; @@ -72,7 +72,7 @@ diff -urN a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c strcpy(fn, "/tmp/py.curses.getwin.XXXXXX"); fd = mkstemp(fn); if (fd < 0) -@@ -2348,6 +2370,13 @@ +@@ -2285,6 +2307,13 @@ if (_Py_set_inheritable(fd, 0, NULL) < 0) goto error; fp = fdopen(fd, "wb+"); @@ -86,7 +86,7 @@ diff -urN a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c if (fp == NULL) { PyErr_SetFromErrnoWithFilename(PyExc_IOError, fn); goto error; -@@ -2382,8 +2411,10 @@ +@@ -2319,8 +2348,10 @@ error: if (fp != NULL) fclose(fp); diff --git a/mingw-w64-python3/0740-grammar-fixes.patch b/mingw-w64-python3/0740-grammar-fixes.patch index 6842f3b972..fcefddca5d 100644 --- a/mingw-w64-python3/0740-grammar-fixes.patch +++ b/mingw-w64-python3/0740-grammar-fixes.patch @@ -1,7 +1,7 @@ -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 @@ +diff -Naur Python-3.5.0-orig/Modules/parsermodule.c Python-3.5.0/Modules/parsermodule.c +--- Python-3.5.0-orig/Modules/parsermodule.c 2015-09-13 14:41:25.000000000 +0300 ++++ Python-3.5.0/Modules/parsermodule.c 2015-09-21 13:42:28.943722400 +0300 +@@ -42,7 +42,7 @@ #undef Yield #include "ast.h" @@ -10,9 +10,9 @@ diff -urN a/Modules/parsermodule.c b/Modules/parsermodule.c #ifdef lint #include -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 +diff -Naur Python-3.5.0-orig/Parser/metagrammar.c Python-3.5.0/Parser/metagrammar.c +--- Python-3.5.0-orig/Parser/metagrammar.c 2015-09-13 14:41:26.000000000 +0300 ++++ Python-3.5.0/Parser/metagrammar.c 2015-09-21 13:42:28.955010400 +0300 @@ -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 6d0c44b534..54051e79a5 100644 --- a/mingw-w64-python3/0750-builddir-fixes.patch +++ b/mingw-w64-python3/0750-builddir-fixes.patch @@ -1,31 +1,45 @@ -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 +diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in +--- Python-3.5.0-orig/Makefile.pre.in 2015-09-21 13:42:21.427043200 +0300 ++++ Python-3.5.0/Makefile.pre.in 2015-09-21 13:42:30.499208800 +0300 +@@ -701,15 +701,15 @@ --Modules/_freeze_importlib: Modules/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) -+_freeze_importlib$(EXE): Modules/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) - $(LINKCC) $(PY_LDFLAGS) -o $@ Modules/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) + Programs/_freeze_importlib.o: Programs/_freeze_importlib.c Makefile --Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Modules/_freeze_importlib.c -- $(MAKE) Modules/_freeze_importlib -- ./Modules/_freeze_importlib \ -- $(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h -+$(srcdir)/Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py $(srcdir)/Modules/_freeze_importlib.c -+ $(MAKE) _freeze_importlib$(EXE) -+ ./_freeze_importlib$(EXE) \ -+ $(srcdir)/Lib/importlib/_bootstrap.py $(srcdir)/Python/importlib.h +-Programs/_freeze_importlib: Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) ++Programs/_freeze_importlib$(EXE): Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) + $(LINKCC) $(PY_LDFLAGS) -o $@ Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) + +-Python/importlib_external.h: $(srcdir)/Lib/importlib/_bootstrap_external.py Programs/_freeze_importlib +- ./Programs/_freeze_importlib \ ++Python/importlib_external.h: $(srcdir)/Lib/importlib/_bootstrap_external.py Programs/_freeze_importlib$(EXE) ++ ./Programs/_freeze_importlib$(EXE) \ + $(srcdir)/Lib/importlib/_bootstrap_external.py Python/importlib_external.h + +-Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib +- ./Programs/_freeze_importlib \ ++Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib$(EXE) ++ ./Programs/_freeze_importlib$(EXE) \ + $(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h - ############################################################################ -@@ -1560,7 +1560,7 @@ +@@ -1596,7 +1596,7 @@ find build -name '*.py[co]' -exec rm -f {} ';' || true -rm -f pybuilddir.txt -rm -f Lib/lib2to3/*Grammar*.pickle -- -rm -f Modules/_testembed Modules/_freeze_importlib -+ -rm -f Modules/_testembed _freeze_importlib$(EXE) +- -rm -f Programs/_testembed Programs/_freeze_importlib ++ -rm -f Programs/_testembed Programs/_freeze_importlib$(EXE) profile-removal: find . -name '*.gc??' -exec rm -f {} ';' +diff -Naur Python-3.5.0-orig/Programs/_freeze_importlib.c Python-3.5.0/Programs/_freeze_importlib.c +--- Python-3.5.0-orig/Programs/_freeze_importlib.c 2015-09-21 13:42:21.427043200 +0300 ++++ Python-3.5.0/Programs/_freeze_importlib.c 2015-09-21 13:42:30.499208800 +0300 +@@ -20,7 +20,7 @@ + {0, 0, 0} /* sentinel */ + }; + +-#ifndef MS_WINDOWS ++#ifndef _MSC_VER + /* On Windows, this links with the regular pythonXY.dll, so this variable comes + from frozen.obj. In the Makefile, frozen.o is not linked into this executable, + so we define the variable here. */ 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 673dc5d20f..521082c06b 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 -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 @@ +diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py +--- Python-3.5.0-orig/setup.py 2015-09-21 13:42:22.874164800 +0300 ++++ Python-3.5.0/setup.py 2015-09-21 13:42:32.027604000 +0300 +@@ -40,6 +40,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 5d7d1c19aa..cc00d25b19 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 -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 @@ +diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py +--- Python-3.5.0-orig/setup.py 2015-09-21 13:42:33.399096000 +0300 ++++ Python-3.5.0/setup.py 2015-09-21 13:42:33.531165600 +0300 +@@ -404,7 +404,7 @@ # Debian/Ubuntu multiarch support. # https://wiki.ubuntu.com/MultiarchSpec cc = sysconfig.get_config_var('CC') @@ -10,7 +10,7 @@ diff -urN a/setup.py b/setup.py if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) ret = os.system( -@@ -411,7 +411,7 @@ +@@ -429,7 +429,7 @@ opt = '' if cross_compiling: opt = '-t' + sysconfig.get_config_var('HOST_GNU_TYPE') @@ -19,7 +19,7 @@ diff -urN a/setup.py b/setup.py if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) ret = os.system( -@@ -430,7 +430,7 @@ +@@ -448,7 +448,7 @@ def add_gcc_paths(self): gcc = sysconfig.get_config_var('CC') @@ -28,7 +28,7 @@ diff -urN 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)) -@@ -694,7 +694,7 @@ +@@ -714,7 +714,7 @@ readline_termcap_library = "" curses_library = "" # Cannot use os.popen here in py3k. @@ -37,7 +37,7 @@ diff -urN 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. -@@ -839,7 +839,7 @@ +@@ -859,7 +859,7 @@ opensslv_h = find_file('openssl/opensslv.h', [], inc_dirs + search_for_ssl_incs_in) if opensslv_h: @@ -46,7 +46,7 @@ diff -urN 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: -@@ -1714,16 +1714,16 @@ +@@ -1742,16 +1742,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 7f42b1a1bc..783d39ace9 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,7 +1,7 @@ -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 @@ +diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c +--- Python-3.5.0-orig/Modules/getpath.c 2015-09-21 13:42:07.576667200 +0300 ++++ Python-3.5.0/Modules/getpath.c 2015-09-21 13:42:35.020052800 +0300 +@@ -788,7 +788,10 @@ bufsz += wcslen(zip_path) + 1; bufsz += wcslen(exec_prefix) + 1; @@ -10,10 +10,10 @@ diff -urN a/Modules/getpath.c b/Modules/getpath.c + if (_exec_prefix) + bufsz += wcslen(_exec_prefix) + 1; +#endif - buf = (wchar_t *)PyMem_Malloc(bufsz * sizeof(wchar_t)); + buf = PyMem_New(wchar_t, bufsz); if (buf == NULL) { Py_FatalError( -@@ -871,6 +874,13 @@ +@@ -864,6 +867,13 @@ } else wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN); 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 3bc95cb37c..21150568ae 100644 --- a/mingw-w64-python3/0800-mingw-install-layout-as-posix.patch +++ b/mingw-w64-python3/0800-mingw-install-layout-as-posix.patch @@ -1,6 +1,6 @@ -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 +diff -Naur Python-3.5.0-orig/Lib/distutils/command/install.py Python-3.5.0/Lib/distutils/command/install.py +--- Python-3.5.0-orig/Lib/distutils/command/install.py 2015-09-21 13:42:21.403338400 +0300 ++++ Python-3.5.0/Lib/distutils/command/install.py 2015-09-21 13:42:36.497652000 +0300 @@ -20,10 +20,10 @@ HAS_USER_SITE = True @@ -21,7 +21,7 @@ diff -urN a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py 'purelib': '$usersite', 'platlib': '$usersite', - 'headers': '$userbase/Python$py_version_nodot/Include/$dist_name', -- 'scripts': '$userbase/Scripts', +- 'scripts': '$userbase/Python$py_version_nodot/Scripts', + 'headers': '$userbase/include/python$py_version_short$abiflags/$dist_name', + 'scripts': '$userbase/bin', 'data' : '$userbase', diff --git a/mingw-w64-python3/0810-remove_path_max.default.patch b/mingw-w64-python3/0810-remove_path_max.default.patch index 27b47c73a1..321c5ccf7b 100644 --- a/mingw-w64-python3/0810-remove_path_max.default.patch +++ b/mingw-w64-python3/0810-remove_path_max.default.patch @@ -1,33 +1,11 @@ -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 @@ - #if defined(MS_WINDOWS) || defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__DJGPP__) +diff -Naur Python-3.5.0-orig/Include/osdefs.h Python-3.5.0/Include/osdefs.h +--- Python-3.5.0-orig/Include/osdefs.h 2015-09-21 13:42:01.397616000 +0300 ++++ Python-3.5.0/Include/osdefs.h 2015-09-21 13:42:37.914296000 +0300 +@@ -10,7 +10,6 @@ + #ifdef MS_WINDOWS #define SEP L'\\' #define ALTSEP L'/' -#define MAXPATHLEN 256 #define DELIM L';' #define DELIMSTR ";" #endif -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 - #include --#define PATH_MAX MAXPATHLEN - #endif - #endif - -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 - #include "windows.h" --#define PATH_MAX MAXPATHLEN - #endif - - #ifdef __gnu_hurd__ diff --git a/mingw-w64-python3/0820-dont-link-with-gettext.patch b/mingw-w64-python3/0820-dont-link-with-gettext.patch index d0315bbe2a..cbc4576ccc 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 -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 @@ +diff -Naur Python-3.5.0-orig/configure.ac Python-3.5.0/configure.ac +--- Python-3.5.0-orig/configure.ac 2015-09-21 13:42:25.866613600 +0300 ++++ Python-3.5.0/configure.ac 2015-09-21 13:42:39.390766400 +0300 +@@ -2687,10 +2687,19 @@ fi # check if we need libintl for locale functions @@ -21,9 +21,9 @@ diff -urN a/configure.ac b/configure.ac # checks for system dependent C++ extensions support case "$ac_sys_system" in -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 +diff -Naur Python-3.5.0-orig/Modules/_localemodule.c Python-3.5.0/Modules/_localemodule.c +--- Python-3.5.0-orig/Modules/_localemodule.c 2015-09-13 14:41:24.000000000 +0300 ++++ Python-3.5.0/Modules/_localemodule.c 2015-09-21 13:42:39.406569600 +0300 @@ -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 4e9cbfcd10..b63a7f6606 100644 --- a/mingw-w64-python3/0830-ctypes-python-dll.patch +++ b/mingw-w64-python3/0830-ctypes-python-dll.patch @@ -1,7 +1,7 @@ -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 @@ +diff -Naur Python-3.5.0-orig/Lib/ctypes/__init__.py Python-3.5.0/Lib/ctypes/__init__.py +--- Python-3.5.0-orig/Lib/ctypes/__init__.py 2015-09-13 14:41:20.000000000 +0300 ++++ Python-3.5.0/Lib/ctypes/__init__.py 2015-09-21 13:42:40.967700000 +0300 +@@ -427,7 +427,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 f5c1a9c1ed..79f51b97d7 100644 --- a/mingw-w64-python3/0840-gdbm-module-includes.patch +++ b/mingw-w64-python3/0840-gdbm-module-includes.patch @@ -1,6 +1,6 @@ -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 +diff -Naur Python-3.5.0-orig/Modules/_gdbmmodule.c Python-3.5.0/Modules/_gdbmmodule.c +--- Python-3.5.0-orig/Modules/_gdbmmodule.c 2015-09-13 14:41:24.000000000 +0300 ++++ Python-3.5.0/Modules/_gdbmmodule.c 2015-09-21 13:42:42.500610400 +0300 @@ -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 a73950738f..44c7ef96de 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 -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 +diff -Naur Python-3.5.0-orig/Include/bytesobject.h Python-3.5.0/Include/bytesobject.h +--- Python-3.5.0-orig/Include/bytesobject.h 2015-09-13 14:41:20.000000000 +0300 ++++ Python-3.5.0/Include/bytesobject.h 2015-09-21 13:42:43.916125600 +0300 @@ -52,9 +52,9 @@ PyAPI_FUNC(PyObject *) PyBytes_FromString(const char *); PyAPI_FUNC(PyObject *) PyBytes_FromObject(PyObject *); @@ -13,9 +13,9 @@ diff -urN 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 -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 +diff -Naur Python-3.5.0-orig/Include/pgenheaders.h Python-3.5.0/Include/pgenheaders.h +--- Python-3.5.0-orig/Include/pgenheaders.h 2015-09-13 14:41:20.000000000 +0300 ++++ Python-3.5.0/Include/pgenheaders.h 2015-09-21 13:42:43.930800000 +0300 @@ -10,9 +10,9 @@ #include "Python.h" @@ -28,10 +28,10 @@ diff -urN a/Include/pgenheaders.h b/Include/pgenheaders.h #define addarc _Py_addarc #define addbit _Py_addbit -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 @@ +diff -Naur Python-3.5.0-orig/Include/pyerrors.h Python-3.5.0/Include/pyerrors.h +--- Python-3.5.0-orig/Include/pyerrors.h 2015-09-13 14:41:20.000000000 +0300 ++++ Python-3.5.0/Include/pyerrors.h 2015-09-21 13:42:43.945474400 +0300 +@@ -465,9 +465,9 @@ #include PyAPI_FUNC(int) PyOS_snprintf(char *str, size_t size, const char *format, ...) @@ -43,9 +43,9 @@ diff -urN a/Include/pyerrors.h b/Include/pyerrors.h #ifdef __cplusplus } -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 +diff -Naur Python-3.5.0-orig/Include/sysmodule.h Python-3.5.0/Include/sysmodule.h +--- Python-3.5.0-orig/Include/sysmodule.h 2015-09-13 14:41:20.000000000 +0300 ++++ Python-3.5.0/Include/sysmodule.h 2015-09-21 13:42:43.963535200 +0300 @@ -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 a86a32e9b2..4810f9fe52 100644 --- a/mingw-w64-python3/0860-fix-_Py_CheckPython3-prototype.patch +++ b/mingw-w64-python3/0860-fix-_Py_CheckPython3-prototype.patch @@ -1,7 +1,7 @@ -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 @@ +diff -Naur Python-3.5.0-orig/Include/pylifecycle.h Python-3.5.0/Include/pylifecycle.h +--- Python-3.5.0-orig/Include/pylifecycle.h 2015-09-21 13:42:04.489399200 +0300 ++++ Python-3.5.0/Include/pylifecycle.h 2015-09-21 13:42:45.489672800 +0300 +@@ -65,7 +65,7 @@ PyAPI_FUNC(wchar_t *) Py_GetPath(void); PyAPI_FUNC(void) Py_SetPath(const wchar_t *); #ifdef MS_WINDOWS 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 10c8a7b968..47708fca2f 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,16 +1,16 @@ -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 -Naur Python-3.5.0-orig/Lib/ssl.py Python-3.5.0/Lib/ssl.py +--- Python-3.5.0-orig/Lib/ssl.py 2015-09-13 14:41:21.000000000 +0300 ++++ Python-3.5.0/Lib/ssl.py 2015-09-21 13:42:46.889384800 +0300 +@@ -138,7 +138,7 @@ + except NameError: + _SSLv2_IF_EXISTS = None -if sys.platform == "win32": +if sys.platform == "win32" and sys.version.find("GCC") == -1: from _ssl import enum_certificates, enum_crls from socket import socket, AF_INET, SOCK_STREAM, create_connection -@@ -387,7 +387,7 @@ +@@ -416,7 +416,7 @@ def load_default_certs(self, purpose=Purpose.SERVER_AUTH): if not isinstance(purpose, _ASN1Object): raise TypeError(purpose) @@ -18,4 +18,4 @@ diff -urN a/Lib/ssl.py b/Lib/ssl.py + if sys.platform == "win32" and sys.version.find("GCC") == -1: for storename in self._windows_cert_stores: self._load_windows_store_certs(storename, purpose) - else: + self.set_default_verify_paths() diff --git a/mingw-w64-python3/0890-mingw-build-optimized-ext.patch b/mingw-w64-python3/0890-mingw-build-optimized-ext.patch index 6761e6162f..a8dfdcf878 100644 --- a/mingw-w64-python3/0890-mingw-build-optimized-ext.patch +++ b/mingw-w64-python3/0890-mingw-build-optimized-ext.patch @@ -1,6 +1,6 @@ -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 +diff -Naur Python-3.5.0-orig/Lib/distutils/cygwinccompiler.py Python-3.5.0/Lib/distutils/cygwinccompiler.py +--- Python-3.5.0-orig/Lib/distutils/cygwinccompiler.py 2015-09-21 13:42:15.483911200 +0300 ++++ Python-3.5.0/Lib/distutils/cygwinccompiler.py 2015-09-21 13:42:48.326347200 +0300 @@ -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 a1aa400c38..b9f6599b10 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,6 +1,6 @@ -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 +diff -Naur Python-3.5.0-orig/Lib/distutils/cygwinccompiler.py Python-3.5.0/Lib/distutils/cygwinccompiler.py +--- Python-3.5.0-orig/Lib/distutils/cygwinccompiler.py 2015-09-21 13:42:49.604148800 +0300 ++++ Python-3.5.0/Lib/distutils/cygwinccompiler.py 2015-09-21 13:42:49.741862400 +0300 @@ -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 2d5a5317fe..bff4af4ed0 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,6 +1,6 @@ -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 +diff -Naur Python-3.5.0-orig/Python/sysmodule.c Python-3.5.0/Python/sysmodule.c +--- Python-3.5.0-orig/Python/sysmodule.c 2015-09-21 13:42:04.576316800 +0300 ++++ Python-3.5.0/Python/sysmodule.c 2015-09-21 13:42:51.105452800 +0300 @@ -26,7 +26,7 @@ #include #endif /* MS_WINDOWS */ @@ -10,7 +10,7 @@ diff -urN a/Python/sysmodule.c b/Python/sysmodule.c extern void *PyWin_DLLhModule; /* A string loaded from the DLL at startup: */ extern const char *PyWin_DLLVersionString; -@@ -1733,7 +1733,7 @@ +@@ -1803,7 +1803,7 @@ PyUnicode_FromString("little")); #endif diff --git a/mingw-w64-python3/0920-mingw-add-LIBPL-to-library-dirs.patch b/mingw-w64-python3/0920-mingw-add-LIBPL-to-library-dirs.patch index 75f2962d7e..c71d7a38be 100644 --- a/mingw-w64-python3/0920-mingw-add-LIBPL-to-library-dirs.patch +++ b/mingw-w64-python3/0920-mingw-add-LIBPL-to-library-dirs.patch @@ -1,7 +1,7 @@ -diff -Naur Python-3.4.2-orig/Lib/distutils/command/build_ext.py Python-3.4.2/Lib/distutils/command/build_ext.py ---- Python-3.4.2-orig/Lib/distutils/command/build_ext.py 2014-12-11 13:50:52.587800000 +0300 -+++ Python-3.4.2/Lib/distutils/command/build_ext.py 2014-12-11 13:58:32.038800000 +0300 -@@ -221,7 +221,7 @@ +diff -Naur Python-3.5.0-orig/Lib/distutils/command/build_ext.py Python-3.5.0/Lib/distutils/command/build_ext.py +--- Python-3.5.0-orig/Lib/distutils/command/build_ext.py 2015-09-21 13:42:13.376441600 +0300 ++++ Python-3.5.0/Lib/distutils/command/build_ext.py 2015-09-21 13:42:52.531127200 +0300 +@@ -216,7 +216,7 @@ # for extensions under Cygwin and AtheOS Python's library directory must be # appended to library_dirs @@ -9,4 +9,4 @@ diff -Naur Python-3.4.2-orig/Lib/distutils/command/build_ext.py Python-3.4.2/Lib + if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos' or self.plat_name.startswith(('mingw')): if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")): # building third party extensions - self.library_dirs.append(os.path.join(sys.prefix, "lib", + config_dir_name = os.path.basename(sysconfig.get_config_var('LIBPL')) diff --git a/mingw-w64-python3/0930-mingw-w64-build-overlapped-module.patch b/mingw-w64-python3/0930-mingw-w64-build-overlapped-module.patch index 32ab1b8d57..17965aac58 100644 --- a/mingw-w64-python3/0930-mingw-w64-build-overlapped-module.patch +++ b/mingw-w64-python3/0930-mingw-w64-build-overlapped-module.patch @@ -1,6 +1,7 @@ ---- Python-3.4.3/setup.py.orig 2015-06-06 18:25:01.420100800 +0100 -+++ Python-3.4.3/setup.py 2015-06-07 09:09:55.336907600 +0100 -@@ -1612,6 +1612,10 @@ +diff -Naur Python-3.5.0-orig/setup.py Python-3.5.0/setup.py +--- Python-3.5.0-orig/setup.py 2015-09-21 13:42:34.882339200 +0300 ++++ Python-3.5.0/setup.py 2015-09-21 13:42:53.935354400 +0300 +@@ -1632,6 +1632,10 @@ '-framework', 'CoreFoundation', ])) diff --git a/mingw-w64-python3/1000-fix-building-posixmodule.patch b/mingw-w64-python3/1000-fix-building-posixmodule.patch index 69b69c08c2..29f9efeda8 100644 --- a/mingw-w64-python3/1000-fix-building-posixmodule.patch +++ b/mingw-w64-python3/1000-fix-building-posixmodule.patch @@ -1,7 +1,7 @@ -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 @@ +diff -Naur Python-3.5.0-orig/Modules/posixmodule.c Python-3.5.0/Modules/posixmodule.c +--- Python-3.5.0-orig/Modules/posixmodule.c 2015-09-21 13:42:06.149864000 +0300 ++++ Python-3.5.0/Modules/posixmodule.c 2015-09-21 13:42:55.398279200 +0300 +@@ -1370,10 +1370,10 @@ if(!SetCurrentDirectoryW(path)) return FALSE; diff --git a/mingw-w64-python3/1010-install-msilib.patch b/mingw-w64-python3/1010-install-msilib.patch index 0139865c6c..ce6cc91f9a 100644 --- a/mingw-w64-python3/1010-install-msilib.patch +++ b/mingw-w64-python3/1010-install-msilib.patch @@ -1,7 +1,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 @@ +diff -Naur Python-3.5.0-orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in +--- Python-3.5.0-orig/Makefile.pre.in 2015-09-21 13:42:31.879731200 +0300 ++++ Python-3.5.0/Makefile.pre.in 2015-09-21 13:42:56.820567200 +0300 +@@ -1219,6 +1219,7 @@ test/test_importlib/extension test/test_importlib/frozen \ test/test_importlib/import_ test/test_importlib/source \ turtledemo \ diff --git a/mingw-w64-python3/1500-mingw-w64-dont-look-in-DLLs-folder-for-python-dll.patch b/mingw-w64-python3/1500-mingw-w64-dont-look-in-DLLs-folder-for-python-dll.patch index 2f24e3d378..eef3d9a7f0 100644 --- a/mingw-w64-python3/1500-mingw-w64-dont-look-in-DLLs-folder-for-python-dll.patch +++ b/mingw-w64-python3/1500-mingw-w64-dont-look-in-DLLs-folder-for-python-dll.patch @@ -1,7 +1,7 @@ -diff -urN a/Modules/getpath.c b/Modules/getpath.c ---- a/Modules/getpath.c 2014-12-16 09:26:33.796969000 +0100 -+++ b/Modules/getpath.c 2014-12-16 10:15:36.798797800 +0100 -@@ -980,6 +980,17 @@ +diff -Naur Python-3.5.0-orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c +--- Python-3.5.0-orig/Modules/getpath.c 2015-09-21 13:42:36.358809600 +0300 ++++ Python-3.5.0/Modules/getpath.c 2015-09-21 13:42:58.274461600 +0300 +@@ -973,6 +973,17 @@ int _Py_CheckPython3() { @@ -19,10 +19,11 @@ diff -urN a/Modules/getpath.c b/Modules/getpath.c wchar_t py3path[MAXPATHLEN+1]; wchar_t *s; if (python3_checked) -@@ -1002,6 +1013,7 @@ +@@ -997,6 +1008,7 @@ wcscat(py3path, L"\\DLLs\\python3.dll"); hPython3 = LoadLibraryExW(py3path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); return hPython3 != NULL; +#endif } #endif + diff --git a/mingw-w64-python3/PKGBUILD b/mingw-w64-python3/PKGBUILD index e296d373f4..dacb993cac 100644 --- a/mingw-w64-python3/PKGBUILD +++ b/mingw-w64-python3/PKGBUILD @@ -15,9 +15,9 @@ _realname=python3 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -_pybasever=3.4 -pkgver=${_pybasever}.3 -pkgrel=7 +_pybasever=3.5 +pkgver=${_pybasever}.0 +pkgrel=1 pkgdesc="A high-level scripting language (mingw-w64)" arch=('any') license=('PSF') @@ -376,87 +376,87 @@ package() { mv "${pkgdir}"${MINGW_PREFIX}/bin/${_exename}_exe "${pkgdir}"${MINGW_PREFIX}/bin/${_exename}.exe } -sha1sums=('7ca5cd664598bea96eec105aa6453223bb6b4456' - '9467bf6fd0e3cfdeedc1c5830b7eadb94369e26d' - '4f37060c4caf594e8c176cf79972e6322ca4b553' - 'a8d85175d1ae5d617b7314d7d7eb6322951afe69' - '76158d7878fb685b571fb290a7ffbb95b1bae16c' - '8cc3ae693400d9740f4aa795cec63ea1d93bfc70' - 'd950ca34d413224e78ee6420dd673d8593c648bb' - 'ab3b14880e09cf6cc1a876e38dece1116cce4d35' - '1c81e994bd77e0f9dadb127b08ae863f4a9e193f' - '267ca1d4f4a9dabcb6a76fd3bc8a4981df3e4582' - 'fc8a2a4de68ea5c50ca0742361517a4f5e0a6140' - 'a59d77f68299a52e4dcab4110b4476b2099a007a' - '69c2316fac07f0b2c883b2d7a659cc4657b4d0e6' - '60b6d32b8a4f70620f16019c48191f600e25d73b' - '3f463b4ec93765e634f5a0bc86bbc4ee8ac2effe' - 'fe47bc2e6b4a43a84996ade90fd6f762c3f7648a' - 'd3e68ba2091f6b61f2440e2ef491373c68bf1d0d' - 'de936d717feaa45a44c9b2c83c196af9eb6d83d4' - '2e5a03d97d30299bfe23328a01e6811f84da4614' - '269f053e3a6e8e063503fded4c7e41ec2f612ecf' - 'dd35eda65c8f24c8834ed305befb7fcab17556f1' - '1a2f211bd92c435b33169ab6e029663aaa06a87a' - 'be04e8183e78c8e5c3d3e09da067412e107e649e' - '34854ca7fa4b845a645cb782b1148dd6420755f0' - '6d16906fd4458bfe5bd261b8f98376c2db01f395' - '4d19b3d105261644d21c2155f278e5bb7ed31129' - '8138b09e7543c68be71456ae717cb4ee82dc2667' - '3a4a784e811c838e954c18d864f8df786819748f' - '856f3f1008a75dbe623f161511165b76f11ca0df' - '15bf5f45bc76da0e6e38b97d3a741ac3e1f1ff49' - '68a0e1d727d04b992419cdc9903c5fe024d3b2ab' - '6337ba0e5838f81bc949b42ecfd120f6a671152f' - '3c0f9cb5a05278dc94029bad6f55b91ce54cb31d' - 'f86f285e9aa88843e0ae9969ba04013024a07c5c' - 'ca990a81e1189537d05442bf8d1a6f4ef2d5096b' - '0836a567aa66e50b3a4e8772babf1e7fbc1246ed' - '4954cc04a907e9ff630a0d4b0ae60dc6e4aa57f7' - '2d505ed36cf50a1bdebffbb367f720a1a6cb0760' - 'f55a13ddd950125bb613bd243ef72ac8dd753daa' - '679a866c5c257abbc59410bccf6054e7f4f5d8ee' - '6fc6a61db76d0689263f3fc6ccfa3fba4829dca7' - '22f2248ab553417c1bc4b1a70c9ef10cbea97ee8' - '3cc4985c4b73f60c29a45dded5e2a36ecf18364b' - 'e514bb32094e62e811bf187ab451e719a522f2fe' - 'cdb77d00db2061c5e44a31876c5efb8db7c65a76' - '02652e5775dfa3966a09349169bc8c86d5e9a980' - '2b81ea5b3f8f06c0ab0df9306ec57dab8410778c' - 'f92f4b827502a91dc22873346fd9415f53ae3c97' - '0f096226937aae88bf38369bd5f8ff3134a82bb0' - 'b32e068d8626f7303a2f515207cf12bdd33c4cfc' - '2f72a9036599de2ca02e5de1316d7b1771cada08' - '6dd3c550e5550fc21cb3df1ef5a4231bceb819f0' - '3d48fcf13644952c0bb2a68b834339f5174a9b4c' - '70390a1be147a4a1b3d40a6935fdd4396e586c06' - '48ab620460a7de37871b74ba3bab59a7bc791802' - '93f2b29f42fd644f68cc88b987425605748ceb0d' - '22da496ef61fc8f5e0e0b7e8562cd843cb21d08a' - '166ef8e127b3d5ae697d4f2577e7e961a01a2bd6' - '8fcc2644b8bfdc584c38f12cde5a57a37bf9506e' - 'b8e60039ceae9f37ba7cef0e75a2f0402c7d27d9' - '4472a28463b46aa332a7ce2764c9124dadbe1f0b' - '3219370e4a3e2d79bc5e601433106f8a25100474' - 'df16f14afbe0d74aa8f7587d2a9d2635538bfbf5' - '1c455c5301a7018f3531dd2cdf55a48a8933e4bf' - '2d1b98a498bace9b05e7b13de1ee387368148c7a' - 'd18f88db082d3397b61c6fc72e6d1867a1acfb09' - '2df995b6f7e74c7fe9c3254a387956c5a3fd511e' - 'bdfb78cf48559cc4ce949b75a9a18510e54e6435' - 'c7687e0c9513778cacc4f02868b056321c1fad15' - '2f24fe286920c29c29b479ee33176416e74d20c1' - 'caf84500bd312dce117af4243729dde8b0377f9f' - '15a30a6841889fc4df268eb6000158486075814b' - '44d7e77532dcdd4bafadf23c728e115130be9bd5' - '048a9b1afa4b8e83a17c7a95c097c40b277759c8' - '017aba96fb0fe8cba033837be6239472faa41505' - '80ce4192f81f70762c9654f9c8dcb34dd9e4046f' - '2dce462131f16248faeafb908fc03b6d2fb82504' - '5c4101eed415f28b0277904e7686a352fc69d1d9' - '3e80013b0742254cf68743e2bb257cc59213e007' - '9a56a98c0efac9930f57966b035b89e94cf44d3b' - '06474589ede319cf53178c6f742ba533110bb438' - '25dfd3da896a1dafe8740e1036d41a10e179d080' - 'ac74429997b79278834772579f81d46892571e87' - 'ba914a51ccb83336e29a823e7ccc35764662f77e') +sha1sums=('871a06df9ab70984b7398ac53047fe125c757a70' + '87bbcdc0f0ca1e1d23dd9822566efe91d6bd8a85' + 'e6358136f1f340de833365ef3cc2cebee5ea300b' + 'db10f4f2b451217996fb0c461d893e6f8d8ce005' + '840e903fd99ccac2a66d177906f103a461ae841b' + '80702b0f748c5023099650075963fa5b49caec84' + '7c095e930ee187aad769e00644721c9d597cdbb3' + 'e425c6fc68193b5a35127db97759b4bded24fe2c' + '48d14c7ed72ae35e70471f60b8cf96cc69678241' + '9721a17a49af205d94e285aa0571dfa16a4069e1' + 'aeaf1085ffdf4d43ab02de8c6c82b980310499f7' + 'eb49982d4dfef2e2b75988a325ad749546aa16fb' + 'b092c28958cbd27cad1a547c13813a5022442d79' + '0daa67a75a6a37ef71d714902e06c40351fe372a' + 'ab88afa741affff37506a8a38a04c9032b0f1c5c' + '87c0b42b78b8c06e76d686ab6939a6d94a67089f' + 'fb98afaa40198c29321bd72da0e1940d302eba42' + 'e08d5b6f784fa65ca17ef35d018a5cfe5ac6e800' + '8fd56716f982882981df55f24dceb9c021ec4a5a' + '0452a3027b6ee2b5fce3cc0772443171ee66f054' + '06ddd243cd5cd20f5696e1b8fdd22675fc428f9e' + '560b2b8716505d36f5eb91101ee7a3a5f8f3f58b' + 'f8a346563631d7f1018fc36ef19a9e1d202979a6' + '4bd1edde47c5c39aa1fcddffef9d5d9ac2784a00' + '5bf0b1bd38f4ec204319f44d79badb3579629587' + 'fb4f30aa7573e912f581f6ea5e0ce33c4eb06e47' + '1f9d2c750a0730dbbb00d7e7e7a2e7649deb2623' + '7df193fe3f146b31ef806119810f05fd19359e07' + '63a86ff26cb3d3284f16cf66355fce6a5d109b83' + '1f1a19ca3e6dc471a9377c9a5f47db264ce7134d' + '4338c430a2c27d9324162825f92b08e537a973f2' + '45463f0c985c27b56ae09b42c1ff76a9aeb67ba0' + '9d434d98bab345460551e7fb9018a3a31c3efbf6' + '6d2e73d360beb96edd8a36f5bf9e0c60dd3d8863' + '38f6674a94a4897a48407c2eeefacfe9513ca238' + 'a79cb17268a0886a9cace1a57ce40a7b3d74ebe1' + '1bbc1b7255d05a8ed57afe5de3f691bbd7ff9dba' + 'b28c05b959d05892d2dccd7e50b0ca88d23017ec' + '24533ad159d29fbfc4d4f6097cdda4e30bd5b073' + '4f923318ba610ba905d6f82a27cbff50b483a7f1' + '3de27372dec4ac6951386f2d11124766a39c83dd' + 'b7ce5655b9d3ced4977aa995cfc376dc7425ab79' + '3065cd3bdf4ca133395d33c0d874e2854ac31cb7' + 'db5b78b615c8019c066943628fb6156fffe60cf7' + '7f9516ae8b862fa589129298be76cdd76d4667ae' + '55f4167c6c5627ce0f8ffbb97490432f2d1bf5f0' + '7cd0a741434b7f28923adae71023e512dc01efc5' + 'e42bd23ce7f259bb3083c30a2822937b7d421e39' + '2fade3fd50c3213a7e0f47bd0f6051e7c46ffa1f' + '8ee814ffcb3b896b170ddd0bfe35dc2a1722c2f9' + 'cb3923149a09fccfe3e39a746970fb43256f08e4' + 'ae7be985658d4dfb65c043ce0d4faa1e448b0f2f' + '276cafd5a781eaccf765ecd5929cadf50fd9e22e' + 'bff0af7eab856678bffb43e5403b61a27c17a789' + '621c2dddf28f8fb6c040a9d60dcfd80d64ed7bcd' + '899b79863ab07b3db95b935ce67d516af10e92e6' + '683ef4a0b0fab3e12e7b91b95a1945ff30799c4c' + '23c4e3a18631f8296fc6a2d03f4cbc68e6b3f4e0' + 'fb9350d96ef312428c80cca6140167ee028561b6' + '4e1be186591538c8c28bcb2a24d7cb74bf822f44' + 'ec8180cc0692265438379a02b8b9f7bd012a6a2e' + 'cefd88068f5962a40958d1060b6a71eebb1b3c93' + '28f294128f2466589317281e66e780b093230051' + '9ebbf001a88f8fd8166bd05e9016f5de64c7ca8b' + 'b4c30aaf102eb37f2f78c406d606d111b0bc1250' + 'bd3f13eb5ff9ad7591b36abd8fde573a870e3484' + 'a39ebfe3ba5cf61a1e4ec7f6e6eb34f5409b7b75' + 'f5f002068dcb8ed8f28ea3b3c1892ec1b8445315' + 'c3ee5c3846e5ffc0910f946eb82b5e4c76a70822' + 'f585406d547e8c84e617f81b23e20e83fb0df6fb' + 'b1ce6725f469543e1e33761d1615607864e6e4dc' + '35b07478075843d129828d03e9e0790cb7e582a5' + '127eb025e419ca7065aeb46d09e610e556b565b6' + '1d185c84f86cdcdc7f868ea471f5c0eabdb3bcdd' + 'abe6a60f60a604fcaf13745b232e1623b13cb011' + 'd1d92db68fae16bd8ebbb971221df1c4680eb415' + '4a185ad168e84fdf33399ebe10f74f153afcfb51' + '5bc1da6a24cc326b8094f1f0625d7f8df8956c77' + 'e1a155cca50fe1fe4f450ff631ecbdbcc845aa83' + 'ce026983639b7e5e503b32345bbcf81972447868' + '8ca0fdb71ee8198997b30466c367ac0c84f14237' + 'a97dbe5299385b9fde442779d00f9a161ef3f950' + 'd5c9e4e47db62db241f4488d9bc974b083b7b0e3' + 'c7eb543aee59f4c246018fa7943a1eaa12e6809c')