From e82c03f2f9d611ec26589f40b503090f8f43d7a2 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Wed, 27 Jun 2018 10:05:24 +0300 Subject: [PATCH] python2: Update to 2.7.15 --- python2/0030-ssl-threads.patch | 14 -------------- python2/0091-2.7.13-ftm.patch | 14 ++++++++++++++ python2/0200-msys2.patch | 18 +++++++++--------- python2/PKGBUILD | 12 ++++++------ python3/016-3.6-ftm.patch | 14 ++++++++++++++ 5 files changed, 43 insertions(+), 29 deletions(-) delete mode 100644 python2/0030-ssl-threads.patch create mode 100644 python2/0091-2.7.13-ftm.patch create mode 100644 python3/016-3.6-ftm.patch diff --git a/python2/0030-ssl-threads.patch b/python2/0030-ssl-threads.patch deleted file mode 100644 index ddf402ce..00000000 --- a/python2/0030-ssl-threads.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur a/Modules/_ssl.c b/Modules/_ssl.c ---- a/Modules/_ssl.c 2014-05-31 22:58:40.000000000 +0400 -+++ b/Modules/_ssl.c 2014-06-04 10:16:38.737000000 +0400 -@@ -16,6 +16,10 @@ - - #include "Python.h" - -+#ifdef __CYGWIN__ -+#undef WITH_THREAD -+#endif -+ - #ifdef WITH_THREAD - #include "pythread.h" - diff --git a/python2/0091-2.7.13-ftm.patch b/python2/0091-2.7.13-ftm.patch new file mode 100644 index 00000000..c1b5eca6 --- /dev/null +++ b/python2/0091-2.7.13-ftm.patch @@ -0,0 +1,14 @@ +--- Python-2.7.13/configure.ac 2016-12-17 14:05:07.000000000 -0600 ++++ Python-2.7.13/configure.ac 2017-03-21 00:18:18.011011900 -0500 +@@ -92,11 +92,6 @@ AC_DEFINE(_GNU_SOURCE, 1, [Define on Lin + AC_DEFINE(_NETBSD_SOURCE, 1, [Define on NetBSD to activate all library features]) + + # The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables +-# certain features on FreeBSD, so we need __BSD_VISIBLE to re-enable +-# them. +-AC_DEFINE(__BSD_VISIBLE, 1, [Define on FreeBSD to activate all library features]) +- +-# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables + # u_int on Irix 5.3. Defining _BSD_TYPES brings it back. + AC_DEFINE(_BSD_TYPES, 1, [Define on Irix to enable u_int]) + diff --git a/python2/0200-msys2.patch b/python2/0200-msys2.patch index e0dc0a8c..7a9096b0 100644 --- a/python2/0200-msys2.patch +++ b/python2/0200-msys2.patch @@ -1292,15 +1292,6 @@ diff -Naur a/setup.py b/setup.py math_libs = [] # XXX Omitted modules: gl, pure, dl, SGI-specific modules -@@ -1332,7 +1332,7 @@ - missing.append('resource') - - # Sun yellow pages. Some systems have the functions in libc. -- if (host_platform not in ['cygwin', 'atheos', 'qnx6'] and -+ if (host_platform not in ['cygwin', 'msys', 'atheos', 'qnx6'] and - find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None): - if (self.compiler.find_library_file(lib_dirs, 'nsl')): - libs = ['nsl'] @@ -1554,7 +1554,7 @@ macros = dict() libraries = [] @@ -1310,3 +1301,12 @@ diff -Naur a/setup.py b/setup.py macros = dict() libraries = [] +@@ -2156,7 +2156,7 @@ + ext.libraries.append('dl') + + def _detect_nis(self, inc_dirs, lib_dirs): +- if host_platform in {'win32', 'cygwin', 'qnx6'}: ++ if host_platform in {'win32', 'cygwin', 'msys', 'qnx6'}: + return None + + libs = [] diff --git a/python2/PKGBUILD b/python2/PKGBUILD index f7ef48a3..e984c63d 100644 --- a/python2/PKGBUILD +++ b/python2/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Ray Donnelly pkgname=python2 -pkgver=2.7.13 +pkgver=2.7.15 pkgrel=1 _pybasever=2.7 pkgdesc="A high-level scripting language" @@ -17,30 +17,30 @@ options=('!makeflags') # '!strip' 'debug') source=(https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz 0010-ctypes-util-find_library.patch 0020-tkinter-x11.patch - 0030-ssl-threads.patch 0040-FD_SETSIZE.patch 0050-export-PySignal_SetWakeupFd.patch 0060-ncurses-abi6.patch 0070-dbm.patch 0080-dylib.patch 0090-getpath-exe-extension.patch + 0091-2.7.13-ftm.patch 0100-no-libm.patch 0200-msys2.patch 0210-reorder-bininstall-ln-symlink-creation.patch 0250-allow-win-drives-in-os-path-isabs.patch 0260-fix-sys-prefix-when-win-drive-in-argv0.patch) -sha256sums=('35d543986882f78261f97787fd3e06274bfa6df29fac9b4a94f73930ff98f731' +sha256sums=('22d9b1ac5b26135ad2b8c2901a9413537e08749a753356ee913c84dbd2df5574' 'e86e0b379e4bfe99b1315979535f4b5036a65caff9e70514e0bc00556580e8e5' '6ec74b99877088a108b762de4fadedcc16ab75edeb80caebd294ac2ea665cb58' - '1d79346eed3ea06335ec989f5557b8155192a93d083889bfa1d6b5b15e5c63d1' '7522f628554780f6fa6ce7fb111c2b588e34bb4a0789e310a60ca5d8adf6d3d5' '86f67a10a8543e5afbf2664858913f51d43bf66370aab794accb806401c7b1ac' 'a9aea9162ab3364e56be77d71e79952997bb2764a959f2b6a124114e12ef1cc1' 'bb40ed36f22969f7a7ac2caac8baaada2f244e23167e7b74544198b96aa9ca75' '69cdcb55b2d01c97819b1647c63263e5dcff9cba79ef8fae8e704d77c8ec4e4b' '11d3c071f35af9ab61a78b943b57ec62f447213c95005663c0a703be9cc65d63' + 'a8d825bbe7efa021aa0b6a8569a7b39f4f8fdcacdd1dca28091ae0691afd137f' 'd502dc1264960b97be268bfa94d3ce0f1736813dd4351035a396fdf92fe54a96' - 'fe2edaf223fbbac93b9887cc1cf0e5b5c4699c75c4f4dbe34039573adba889c6' + '41939c85350b4f677a3d819f9962714c8a8679e604b29354126fdc48944c232d' '6b3a10ad0e00148073b0a7213b3ad84e8da8461429347b2c2acb84444c003874' '555949be83449ff94d9f70a41d6b526f5861edcd97e2a8375394e44b75524776' '1bf60a68e8c424a4f60cd8c6e7e0d5adbe276fb1a0ce1a35466384aab7476f06') @@ -50,13 +50,13 @@ prepare() { patch -p1 -i ${srcdir}/0010-ctypes-util-find_library.patch patch -p1 -i ${srcdir}/0020-tkinter-x11.patch - patch -p1 -i ${srcdir}/0030-ssl-threads.patch patch -p1 -i ${srcdir}/0040-FD_SETSIZE.patch patch -p1 -i ${srcdir}/0050-export-PySignal_SetWakeupFd.patch patch -p1 -i ${srcdir}/0060-ncurses-abi6.patch patch -p1 -i ${srcdir}/0070-dbm.patch patch -p1 -i ${srcdir}/0080-dylib.patch patch -p1 -i ${srcdir}/0090-getpath-exe-extension.patch + patch -p1 -i ${srcdir}/0091-2.7.13-ftm.patch patch -p1 -i ${srcdir}/0100-no-libm.patch patch -p1 -i ${srcdir}/0200-msys2.patch patch -p1 -i ${srcdir}/0210-reorder-bininstall-ln-symlink-creation.patch diff --git a/python3/016-3.6-ftm.patch b/python3/016-3.6-ftm.patch new file mode 100644 index 00000000..69575fad --- /dev/null +++ b/python3/016-3.6-ftm.patch @@ -0,0 +1,14 @@ +--- origsrc/Python-3.6.1rc1/configure.ac 2017-03-12 14:28:34.395001700 -0500 ++++ src/Python-3.6.1rc1/configure.ac 2017-03-21 00:27:44.595584900 -0500 +@@ -138,11 +138,6 @@ AC_DEFINE(_GNU_SOURCE, 1, [Define on Lin + AC_DEFINE(_NETBSD_SOURCE, 1, [Define on NetBSD to activate all library features]) + + # The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables +-# certain features on FreeBSD, so we need __BSD_VISIBLE to re-enable +-# them. +-AC_DEFINE(__BSD_VISIBLE, 1, [Define on FreeBSD to activate all library features]) +- +-# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables + # u_int on Irix 5.3. Defining _BSD_TYPES brings it back. + AC_DEFINE(_BSD_TYPES, 1, [Define on Irix to enable u_int]) +