From 18dbeae777ce18bea7b028ed829aa09f5efb0ba7 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Thu, 21 Dec 2017 11:17:44 +0300 Subject: [PATCH] python3: Update to 3.6.4 --- ...0170-MINGW-add-srcdir-PC-to-CPPFLAGS.patch | 2 +- ...s.path-calculations-for-windows-plat.patch | 2 +- .../0500-add-python-config-sh.patch | 46 +++++++++---------- .../0720-mingw-pdcurses_ISPAD.patch | 10 ++-- mingw-w64-python3/0750-builddir-fixes.patch | 13 +++--- ...ingw-add-_exec_prefix-for-tcltk-dlls.patch | 2 +- mingw-w64-python3/PKGBUILD | 20 ++++---- 7 files changed, 47 insertions(+), 48 deletions(-) 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 344a8632ee..5a5739cc8e 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 @@ -16,5 +16,5 @@ diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac +esac + AC_SUBST(SRCDIRS) - SRCDIRS="Parser Grammar Objects Python Modules Mac Programs" + SRCDIRS="Parser Objects Python Modules Programs" AC_MSG_CHECKING(for build directories) 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 fb41b16547..a529fe8b1c 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 @@ -16,7 +16,7 @@ diff -Naur Python-3.5.2-orig/configure.ac Python-3.5.2/configure.ac +esac + AC_SUBST(SRCDIRS) - SRCDIRS="Parser Grammar Objects Python Modules Mac Programs" + SRCDIRS="Parser Objects Python Modules Programs" +case $host in + *-*-mingw*) SRCDIRS="$SRCDIRS PC";; +esac diff --git a/mingw-w64-python3/0500-add-python-config-sh.patch b/mingw-w64-python3/0500-add-python-config-sh.patch index 41cbca4922..c307d542cb 100644 --- a/mingw-w64-python3/0500-add-python-config-sh.patch +++ b/mingw-w64-python3/0500-add-python-config-sh.patch @@ -1,7 +1,7 @@ -diff -Naur Python-3.5.2-orig/Misc/python-config.sh.in Python-3.5.2/Misc/python-config.sh.in ---- Python-3.5.2-orig/Misc/python-config.sh.in 2016-06-26 00:38:37.000000000 +0300 -+++ Python-3.5.2/Misc/python-config.sh.in 2016-07-12 14:21:46.795800700 +0300 -@@ -1,25 +1,37 @@ +diff -Naur Python-3.6.4-orig/Misc/python-config.sh.in Python-3.6.4/Misc/python-config.sh.in +--- Python-3.6.4/Misc/python-config.sh.in.orig 2017-12-19 07:53:56.000000000 +0300 ++++ Python-3.6.4/Misc/python-config.sh.in 2017-12-21 09:54:11.491534800 +0300 +@@ -1,32 +1,44 @@ #!/bin/sh -# Keep this script in sync with python-config.in @@ -48,17 +48,15 @@ diff -Naur Python-3.5.2-orig/Misc/python-config.sh.in Python-3.5.2/Misc/python-c fi echo $RESULT } -@@ -27,8 +39,7 @@ - prefix_build="@prefix@" + prefix_real=$(installed_prefix "$0") -# Use sed to fix paths from their built-to locations to their installed-to --# locations. -+# Use sed to fix paths from their built to locations to their installed to locations. - prefix=$(echo "$prefix_build" | sed "s#$prefix_build#$prefix_real#") - exec_prefix_build="@exec_prefix@" - exec_prefix=$(echo "$exec_prefix_build" | sed "s#$exec_prefix_build#$prefix_real#") -@@ -40,13 +51,17 @@ ++# Use sed to fix paths from their built-to locations to their installed to + # locations. Keep prefix & exec_prefix using their original values in case + # they are referenced in other configure variables, to prevent double + # substitution, issue #22140. +@@ -41,13 +53,17 @@ LIBC="@LIBC@" SYSLIBS="$LIBM $LIBC" ABIFLAGS="@ABIFLAGS@" @@ -75,10 +73,10 @@ diff -Naur Python-3.5.2-orig/Misc/python-config.sh.in Python-3.5.2/Misc/python-c LDVERSION="@LDVERSION@" +LDLIBRARY="@LDLIBRARY@" +LINKFORSHARED="@LINKFORSHARED@" - LIBDEST=${prefix}/lib/python${VERSION} - LIBPL=$(echo "@LIBPL@" | sed "s#$prefix_build#$prefix_real#") + LIBDEST=${prefix_real}/lib/python${VERSION} + LIBPL=$(echo "@LIBPL@" | sed "s#$prefix#$prefix_real#") SO="@EXT_SUFFIX@" -@@ -59,33 +74,33 @@ +@@ -60,33 +76,33 @@ do case $ARG in --help) @@ -95,33 +93,33 @@ diff -Naur Python-3.5.2-orig/Misc/python-config.sh.in Python-3.5.2/Misc/python-c done -for ARG in "$@" -+for ARG in $* ++for ARG in "$*" do - case "$ARG" in + case $ARG in --prefix) -- echo "$prefix" -+ echo -ne "$prefix" +- echo "$prefix_real" ++ echo -ne "$prefix_real" ;; --exec-prefix) -- echo "$exec_prefix" -+ echo -ne "$exec_prefix " +- echo "$exec_prefix_real" ++ echo -ne "$exec_prefix_real " ;; --includes) - echo "$INCDIR $PLATINCDIR" -+ echo -ne "$INCDIR " ++ echo -ne "$INCDIR $PLATINCDIR" ;; --cflags) - echo "$INCDIR $PLATINCDIR $BASECFLAGS $CFLAGS $OPT" -+ echo -ne "$INCDIR $BASECFLAGS $CFLAGS $OPT " ++ echo -ne "$INCDIR $PLATINCDIR $BASECFLAGS $CFLAGS $OPT" ;; --libs) - echo "$LIBS" -+ echo -ne "$LIBS " ++ echo -ne "$LIBS" ;; --ldflags) LINKFORSHAREDUSED= -@@ -96,16 +111,16 @@ +@@ -97,16 +113,16 @@ if [ "$PY_ENABLE_SHARED" = "0" ] ; then LIBPLUSED="-L$LIBPL" fi diff --git a/mingw-w64-python3/0720-mingw-pdcurses_ISPAD.patch b/mingw-w64-python3/0720-mingw-pdcurses_ISPAD.patch index 4e185c3a3b..9f281d9721 100644 --- a/mingw-w64-python3/0720-mingw-pdcurses_ISPAD.patch +++ b/mingw-w64-python3/0720-mingw-pdcurses_ISPAD.patch @@ -1,8 +1,8 @@ -diff -Naur Python-3.5.2-orig/Include/py_curses.h Python-3.5.2/Include/py_curses.h ---- Python-3.5.2-orig/Include/py_curses.h 2016-07-12 14:22:25.991300700 +0300 -+++ Python-3.5.2/Include/py_curses.h 2016-07-12 14:22:26.239300700 +0300 +diff -Naur Python-3.6.4-orig/Include/py_curses.h Python-3.6.4/Include/py_curses.h +--- Python-3.6.4-orig/Include/py_curses.h 2016-07-12 14:22:25.991300700 +0300 ++++ Python-3.6.4/Include/py_curses.h 2016-07-12 14:22:26.239300700 +0300 @@ -56,6 +56,10 @@ - #endif + #include #endif +#if defined(__MINGW32__) && !defined(_ISPAD) @@ -11,4 +11,4 @@ diff -Naur Python-3.5.2-orig/Include/py_curses.h Python-3.5.2/Include/py_curses. + #ifdef HAVE_NCURSES_H /* configure was checking , but we will - use , which has all these features. */ + use , which has some or all these features. */ diff --git a/mingw-w64-python3/0750-builddir-fixes.patch b/mingw-w64-python3/0750-builddir-fixes.patch index 7286ef1e82..0d27b176ea 100644 --- a/mingw-w64-python3/0750-builddir-fixes.patch +++ b/mingw-w64-python3/0750-builddir-fixes.patch @@ -1,6 +1,6 @@ ---- Python-3.6.2rc1/Makefile.pre.in.orig 2017-06-18 14:44:47.870383000 +0200 -+++ Python-3.6.2rc1/Makefile.pre.in 2017-06-18 14:47:43.823492600 +0200 -@@ -695,19 +695,19 @@ +--- Python-3.6.4/Makefile.pre.in.orig 2017-06-18 14:44:47.870383000 +0200 ++++ Python-3.6.4/Makefile.pre.in 2017-06-18 14:47:43.823492600 +0200 +@@ -695,20 +695,20 @@ Programs/_freeze_importlib.o: Programs/_freeze_importlib.c Makefile @@ -16,14 +16,15 @@ - ./Programs/_freeze_importlib \ + ./Programs/_freeze_importlib$(EXE) \ $(srcdir)/Lib/importlib/_bootstrap_external.py \ - $(srcdir)/Python/importlib_external.h + $(srcdir)/Python/importlib_external.h.new + $(UPDATE_FILE) $(srcdir)/Python/importlib_external.h $(srcdir)/Python/importlib_external.h.new # Regenerate Python/importlib.h from Lib/importlib/_bootstrap.py # using _freeze_importlib - ./Programs/_freeze_importlib \ + ./Programs/_freeze_importlib$(EXE) \ $(srcdir)/Lib/importlib/_bootstrap.py \ - $(srcdir)/Python/importlib.h - + $(srcdir)/Python/importlib.h.new + $(UPDATE_FILE) $(srcdir)/Python/importlib.h $(srcdir)/Python/importlib.h.new @@ -1631,7 +1631,7 @@ find build -name '*.py[co]' -exec rm -f {} ';' || true -rm -f pybuilddir.txt 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 13cd5400a3..e92d14b7b6 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 @@ -10,7 +10,7 @@ diff -Naur Python-3.5.2-orig/Modules/getpath.c Python-3.5.2/Modules/getpath.c + if (_exec_prefix) + bufsz += wcslen(_exec_prefix) + 1; +#endif - buf = PyMem_New(wchar_t, bufsz); + buf = PyMem_RawMalloc(bufsz * sizeof(wchar_t)); if (buf == NULL) { Py_FatalError( @@ -847,6 +850,13 @@ diff --git a/mingw-w64-python3/PKGBUILD b/mingw-w64-python3/PKGBUILD index 7d816e601f..49fdf41c5e 100644 --- a/mingw-w64-python3/PKGBUILD +++ b/mingw-w64-python3/PKGBUILD @@ -17,8 +17,8 @@ _realname=python3 pkgbase="mingw-w64-${_realname}" pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" _pybasever=3.6 -pkgver=${_pybasever}.3 -pkgrel=2 +pkgver=${_pybasever}.4 +pkgrel=1 pkgdesc="A high-level scripting language (mingw-w64)" arch=('any') license=('PSF') @@ -209,7 +209,7 @@ prepare() { patch -Np1 -i "${srcdir}"/0660-mingw-use-backslashes-in-compileall-py.patch patch -Np1 -i "${srcdir}"/0670-msys-convert_path-fix-and-root-hack.patch patch -Np1 -i "${srcdir}"/0690-allow-static-tcltk.patch - patch -Np1 -i "${srcdir}"/0710-CROSS-properly-detect-WINDOW-_flags-for-different-nc.patch + #patch -Np1 -i "${srcdir}"/0710-CROSS-properly-detect-WINDOW-_flags-for-different-nc.patch patch -Np1 -i "${srcdir}"/0720-mingw-pdcurses_ISPAD.patch patch -Np1 -i "${srcdir}"/0730-mingw-fix-ncurses-module.patch patch -Np1 -i "${srcdir}"/0740-grammar-fixes.patch @@ -408,7 +408,7 @@ package() { ${MINGW_PREFIX}/bin/objcopy --subsystem windows "${pkgdir}${MINGW_PREFIX}"/bin/python3w.exe } -sha256sums=('cda7d967c9a4bfa52337cdf551bcc5cff026b6ac50a8834e568ce4a794ca81da' +sha256sums=('159b932bf56aeaa76fd66e7420522d8c8853d486b8567c459b84fe2ed13bcaba' '4cc654f8caef73b385a57278d4a57578941ec48a5a69bcf7f100f85a5c9e5ac0' '166e45a247f440df92c97d3e4392daf67c79d086b3de8ff4f4698d113bad4172' '9e23bd69d37db124a9765afab1c9b1809af9841f4771a352ac2412031f84975c' @@ -416,11 +416,11 @@ sha256sums=('cda7d967c9a4bfa52337cdf551bcc5cff026b6ac50a8834e568ce4a794ca81da' 'f63b7213ef0c360969ce84bb4e91f95f98a360451688f1193b30cd8a2073dbd1' '96524a4465b526fa8e9e04af9332eb472ec0d13e0768556aff5ba2e949594ab4' '24a6835240033427d25e88ed475fde30e2aacd07dc98458c29f17c6b0a4b4c52' - '889bb9291457f6fcab8e27793cf4abd6ceae59898594580174e26287a0118237' + '9764c44dee757008558a5bd935a5917fe85d7a68f2602fb45d10c277b71dc38a' '3394c37ea4182786095216092c49bfd3d4418fb5c1598686c93d8515624b5cbd' '4930cc4e97912cb155f70fe690603d8209a05c6946da43cd55383f4a83e866c7' 'de963ede383f43dc34bbf985d5eb1bdf6418610dfb9d4490e4ec967a9bb73eb8' - 'e4b39a2429449ce4ae3f49301259047368524b8c7f9792cb90375808e781ebde' + '29a38a0f48cf0604ac9e9ddb07b56e433cfbfa273567b61778a62c648060ada1' 'fc4ee143dc90bb7f93893417ea8f11616f0714054e0b69fda0f0775a8283f105' '83bf053e9bbea0f5cc116ebc478e92948df4019a4ab7241ff2aa6c880770af72' '6250565f6f1a1e907a1778f1fdc033f78cca0770d4ff0451aa5de10e32f9297d' @@ -448,7 +448,7 @@ sha256sums=('cda7d967c9a4bfa52337cdf551bcc5cff026b6ac50a8834e568ce4a794ca81da' '78dc2ac8eaaccf19fc42551e784f01f2f147785814bfc68d891957ba35b5d866' '5c181aaa52d1cbe42d7538af85f08362bca969678c2c83cd1855fdaf1bb401fd' 'dea5bfbf623002d3a28067bded2a3b7e1630aef97b12bbc4990186ab68a51b26' - 'fd5a7ae2860b98086875d3a61ced283333b47b1d64765624fb75167718ad5b33' + '7aea532763f471f9a665feeac8f4323c04391fa901153a590ca31e5de4974df5' '1bcc89ed500f114be330721ad0dbb9a213a2f959ab942375ddecb08f142a196c' '2201e336997af02cd42dd7f052d0fd05009a1a307066e15a7d38615c8d9c0ad7' 'ab6d2450495212d7c402bd5a9a4fc64527ee54a9509825ba62312f13e1252a8a' @@ -466,13 +466,13 @@ sha256sums=('cda7d967c9a4bfa52337cdf551bcc5cff026b6ac50a8834e568ce4a794ca81da' '521b56d10b2d744d86e54cb7b56a1bb7676c8df45964a7c8d0ca3b3a545bebb2' 'a4053159e3b64517c1006ec0ecc43588e8d28111e8251b9b7348cf696dbc1afa' 'f643831842e9c2c15f1ecb3ec96022f6f32af2a88e0e4501e56b20d86905995d' - 'faf18878d93b71c9b3034b2e0be7e75d0a105734726872f1353e2afa8664e7aa' + '0bac67a4917a1bcc14c4733ed2bb9a2d5e64b7648c1934171a2081dcda92b533' '8e1a66af0edb1207a27af05c8e4250bc3b02a6dc39bae2c36a313b48fae3c4e6' '81a88720512c311515107607447d2c8faa8a7158ebc28232a8d19fe27b905836' - '2218e6c146cc2370e78a7576094f9eb843292e3ad867c37be5cb1fa0e91261f5' + '9a076a5e7a466f3871eeadc052688636ce6a93371923a88a4f4150aa36bc4292' 'ceea443a47860778d096a4b1c644467f61f3afb135b20c9a8019242d1fc6c175' 'ad73f017cd61183ce8a06699940233ea66cd2d58444ebe9f0f147a16a57ed1f1' - '389872855584a1a912f3833c99a318bd924bee25ed806f5769c0b1c7feda1cf9' + '58c7c710ebfae415f3ad7410be0f155ef49aa58289d35f15c371992e09cea9f9' '10ec6c64fa8ce81f61990de03ed1dcdae8d2ddd116a394fc8ff87f6dca2e0173' '043568001a1717cb4e16e318001e2f707a6814b4ca223ce4bfeaccea4a565f73' 'a56d05880a32025f9a1fc93e2b56086ff0faf7555a98d1ff80c3b641c0d65d22'