From 0225fd8a522a10155e9ca98cb4e41fccc2c54eec Mon Sep 17 00:00:00 2001 From: Alexpux Date: Thu, 26 Feb 2015 07:57:26 +0300 Subject: [PATCH] python3: Update to 3.4.3 --- ...current-dir-in-library-path-if-buildi.patch | 12 ------------ ...yNode_SizeOf-as-PyAPI-for-parser-modu.patch | 12 ------------ .../0500-add-python-config-sh.patch | 2 +- mingw-w64-python3/PKGBUILD | 18 ++++++------------ 4 files changed, 7 insertions(+), 37 deletions(-) delete mode 100644 mingw-w64-python3/0280-issue17219-add-current-dir-in-library-path-if-buildi.patch delete mode 100644 mingw-w64-python3/0450-MINGW-export-_PyNode_SizeOf-as-PyAPI-for-parser-modu.patch diff --git a/mingw-w64-python3/0280-issue17219-add-current-dir-in-library-path-if-buildi.patch b/mingw-w64-python3/0280-issue17219-add-current-dir-in-library-path-if-buildi.patch deleted file mode 100644 index 7b290293b0..0000000000 --- a/mingw-w64-python3/0280-issue17219-add-current-dir-in-library-path-if-buildi.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py ---- a/Lib/distutils/command/build_ext.py 2014-10-11 14:19:38.954530100 +0100 -+++ b/Lib/distutils/command/build_ext.py 2014-10-11 14:19:41.476674400 +0100 -@@ -237,7 +237,7 @@ - # Python's library directory must be appended to library_dirs - # See Issues: #1600860, #4366 - if (sysconfig.get_config_var('Py_ENABLE_SHARED')): -- if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")): -+ if not sysconfig.python_build: - # building third party extensions - self.library_dirs.append(sysconfig.get_config_var('LIBDIR')) - else: diff --git a/mingw-w64-python3/0450-MINGW-export-_PyNode_SizeOf-as-PyAPI-for-parser-modu.patch b/mingw-w64-python3/0450-MINGW-export-_PyNode_SizeOf-as-PyAPI-for-parser-modu.patch deleted file mode 100644 index 4d123c55c4..0000000000 --- a/mingw-w64-python3/0450-MINGW-export-_PyNode_SizeOf-as-PyAPI-for-parser-modu.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN a/Include/node.h b/Include/node.h ---- a/Include/node.h 2014-10-11 14:20:45.233321100 +0100 -+++ b/Include/node.h 2014-10-11 14:20:46.940418700 +0100 -@@ -21,7 +21,7 @@ - char *str, int lineno, int col_offset); - PyAPI_FUNC(void) PyNode_Free(node *n); - #ifndef Py_LIMITED_API --Py_ssize_t _PyNode_SizeOf(node *n); -+PyAPI_FUNC(Py_ssize_t) _PyNode_SizeOf(node *n); - #endif - - /* Node access functions */ diff --git a/mingw-w64-python3/0500-add-python-config-sh.patch b/mingw-w64-python3/0500-add-python-config-sh.patch index b39ccb2c8b..182faf7f8a 100644 --- a/mingw-w64-python3/0500-add-python-config-sh.patch +++ b/mingw-w64-python3/0500-add-python-config-sh.patch @@ -66,7 +66,7 @@ diff -urN a/Misc/python-config.sh.in b/Misc/python-config.sh.in +if [ "$ABIFLAGS" = "@""ABIFLAGS""@" ] ; then + ABIFLAGS= +fi - LIBS="@LIBS@ $SYSLIBS -lpython${VERSION}${ABIFLAGS}" + LIBS="-lpython${VERSION}${ABIFLAGS} @LIBS@ $SYSLIBS" BASECFLAGS="@BASECFLAGS@" -LDLIBRARY="@LDLIBRARY@" -LINKFORSHARED="@LINKFORSHARED@" diff --git a/mingw-w64-python3/PKGBUILD b/mingw-w64-python3/PKGBUILD index bbbd712daa..c0a3dd1353 100644 --- a/mingw-w64-python3/PKGBUILD +++ b/mingw-w64-python3/PKGBUILD @@ -16,8 +16,8 @@ _realname=python3 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" _pybasever=3.4 -pkgver=${_pybasever}.2 -pkgrel=8 +pkgver=${_pybasever}.3 +pkgrel=1 pkgdesc="A high-level scripting language (mingw-w64)" arch=('any') license=('PSF') @@ -55,7 +55,6 @@ source=("http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz" 0250-MINGW-compiler-customize-mingw-cygwin-compilers.patch 0260-MINGW-compiler-enable-new-dtags.patch 0270-CYGWIN-issue13756-Python-make-fail-on-cygwin.patch - 0280-issue17219-add-current-dir-in-library-path-if-buildi.patch 0290-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch 0300-MINGW-configure-for-shared-build.patch 0310-MINGW-dynamic-loading-support.patch @@ -72,7 +71,6 @@ source=("http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz" 0420-MINGW-use-Mingw32CCompiler-as-default-compiler-for-m.patch 0430-MINGW-find-import-library.patch 0440-MINGW-setup-_ssl-module.patch - 0450-MINGW-export-_PyNode_SizeOf-as-PyAPI-for-parser-modu.patch 0460-MINGW-generalization-of-posix-build-in-sysconfig.py.patch 0462-MINGW-support-stdcall-without-underscore.patch 0464-use-replace-instead-rename-to-avoid-failure-on-windo.patch @@ -152,9 +150,8 @@ prepare() { patch -Np1 -i "${srcdir}"/0250-MINGW-compiler-customize-mingw-cygwin-compilers.patch patch -Np1 -i "${srcdir}"/0260-MINGW-compiler-enable-new-dtags.patch - plain "Apply Roumen Petrov's extensions patches (25)" + plain "Apply Roumen Petrov's extensions patches (23)" patch -Np1 -i "${srcdir}"/0270-CYGWIN-issue13756-Python-make-fail-on-cygwin.patch - patch -Np1 -i "${srcdir}"/0280-issue17219-add-current-dir-in-library-path-if-buildi.patch patch -Np1 -i "${srcdir}"/0290-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch patch -Np1 -i "${srcdir}"/0300-MINGW-configure-for-shared-build.patch patch -Np1 -i "${srcdir}"/0310-MINGW-dynamic-loading-support.patch @@ -171,7 +168,6 @@ prepare() { patch -Np1 -i "${srcdir}"/0420-MINGW-use-Mingw32CCompiler-as-default-compiler-for-m.patch patch -Np1 -i "${srcdir}"/0430-MINGW-find-import-library.patch patch -Np1 -i "${srcdir}"/0440-MINGW-setup-_ssl-module.patch - patch -Np1 -i "${srcdir}"/0450-MINGW-export-_PyNode_SizeOf-as-PyAPI-for-parser-modu.patch patch -Np1 -i "${srcdir}"/0460-MINGW-generalization-of-posix-build-in-sysconfig.py.patch patch -Np1 -i "${srcdir}"/0462-MINGW-support-stdcall-without-underscore.patch patch -Np1 -i "${srcdir}"/0464-use-replace-instead-rename-to-avoid-failure-on-windo.patch @@ -179,7 +175,7 @@ prepare() { patch -Np1 -i "${srcdir}"/0480-MINGW-generalization-of-posix-build-in-distutils-sys.patch patch -Np1 -i "${srcdir}"/0490-MINGW-customize-site.patch - plain "Apply Ray Donnelly's general/cross patches (29)" + plain "Apply Ray Donnelly's general/cross patches (42)" patch -Np1 -i "${srcdir}"/0500-add-python-config-sh.patch patch -Np1 -i "${srcdir}"/0510-cross-darwin-feature.patch patch -Np1 -i "${srcdir}"/0520-py3k-mingw-ntthreads-vs-pthreads.patch @@ -365,7 +361,7 @@ package() { mv "${pkgdir}"${MINGW_PREFIX}/bin/${_exename}_exe "${pkgdir}"${MINGW_PREFIX}/bin/${_exename}.exe } -sha1sums=('0727d8a8498733baabe6f51632b9bab0cbaa9ada' +sha1sums=('7ca5cd664598bea96eec105aa6453223bb6b4456' '9467bf6fd0e3cfdeedc1c5830b7eadb94369e26d' '4f37060c4caf594e8c176cf79972e6322ca4b553' 'a8d85175d1ae5d617b7314d7d7eb6322951afe69' @@ -384,7 +380,6 @@ sha1sums=('0727d8a8498733baabe6f51632b9bab0cbaa9ada' 'd3e68ba2091f6b61f2440e2ef491373c68bf1d0d' 'de936d717feaa45a44c9b2c83c196af9eb6d83d4' '2e5a03d97d30299bfe23328a01e6811f84da4614' - '3cd7264e2e731664862c2841500bc8b2962f961e' '269f053e3a6e8e063503fded4c7e41ec2f612ecf' 'dd35eda65c8f24c8834ed305befb7fcab17556f1' '1a2f211bd92c435b33169ab6e029663aaa06a87a' @@ -401,14 +396,13 @@ sha1sums=('0727d8a8498733baabe6f51632b9bab0cbaa9ada' '3c0f9cb5a05278dc94029bad6f55b91ce54cb31d' 'f86f285e9aa88843e0ae9969ba04013024a07c5c' 'ca990a81e1189537d05442bf8d1a6f4ef2d5096b' - '15654dedc9fe1f5b11a6d41326a1c21ddd399ac3' '0836a567aa66e50b3a4e8772babf1e7fbc1246ed' '4954cc04a907e9ff630a0d4b0ae60dc6e4aa57f7' '2d505ed36cf50a1bdebffbb367f720a1a6cb0760' 'f55a13ddd950125bb613bd243ef72ac8dd753daa' '679a866c5c257abbc59410bccf6054e7f4f5d8ee' '6fc6a61db76d0689263f3fc6ccfa3fba4829dca7' - '8d52a719d7bcb9b03dac6a28cd899a6d83f770bc' + '1f096c7c4537b7bbf9a7f747093d3ab104534ea2' '3cc4985c4b73f60c29a45dded5e2a36ecf18364b' 'e514bb32094e62e811bf187ab451e719a522f2fe' 'cdb77d00db2061c5e44a31876c5efb8db7c65a76'