From ea45e57abcf4e71f5d85cecad74b41c5a673bef7 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Tue, 16 Apr 2019 08:44:55 +0300 Subject: [PATCH] python3: Update to 3.7.3 --- mingw-w64-python3/0845-3.7-_abs-mingw.patch | 12 ------------ mingw-w64-python3/2000-warnings-fixes.patch | 11 +++++------ .../2020-use-_wcsnicmp-instead-wcsncasecmp.patch | 11 +++++++++++ mingw-w64-python3/PKGBUILD | 16 ++++++++-------- 4 files changed, 24 insertions(+), 26 deletions(-) delete mode 100644 mingw-w64-python3/0845-3.7-_abs-mingw.patch create mode 100644 mingw-w64-python3/2020-use-_wcsnicmp-instead-wcsncasecmp.patch diff --git a/mingw-w64-python3/0845-3.7-_abs-mingw.patch b/mingw-w64-python3/0845-3.7-_abs-mingw.patch deleted file mode 100644 index 32a33b2531..0000000000 --- a/mingw-w64-python3/0845-3.7-_abs-mingw.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur Python-3.7.0-orig/Modules/_abc.c Python-3.7.0/Modules/_abc.c ---- Python-3.7.0-orig/Modules/_abc.c 2018-06-27 06:07:35.000000000 +0300 -+++ Python-3.7.0/Modules/_abc.c 2018-07-12 10:22:24.099663800 +0300 -@@ -66,7 +66,7 @@ - "Internal state held by ABC machinery."); - - static PyTypeObject _abc_data_type = { -- PyVarObject_HEAD_INIT(&PyType_Type, 0) -+ PyVarObject_HEAD_INIT(NULL, 0) - "_abc_data", /*tp_name*/ - sizeof(_abc_data), /*tp_size*/ - .tp_dealloc = (destructor)abc_data_dealloc, diff --git a/mingw-w64-python3/2000-warnings-fixes.patch b/mingw-w64-python3/2000-warnings-fixes.patch index b2884ad524..f439f42c1d 100644 --- a/mingw-w64-python3/2000-warnings-fixes.patch +++ b/mingw-w64-python3/2000-warnings-fixes.patch @@ -63,15 +63,14 @@ diff -Naur Python-3.7.0-orig/PC/pythonw_exe.rc Python-3.7.0/PC/pythonw_exe.rc diff -Naur Python-3.7.0-orig/PC/winreg.c Python-3.7.0/PC/winreg.c --- Python-3.7.0-orig/PC/winreg.c 2018-07-12 10:20:57.098311000 +0300 +++ Python-3.7.0/PC/winreg.c 2018-07-12 10:23:03.302532700 +0300 -@@ -784,7 +784,7 @@ - - break; - } -- case REG_BINARY: -+ case REG_BINARY: // -fallthrough +@@ -791,6 +791,7 @@ + case REG_BINARY: /* ALSO handle ALL unknown data types here. Even if we can't support it natively, we should handle the bits. */ ++ /* fallthrough */ default: + if (retDataSize == 0) { + Py_INCREF(Py_None); diff -Naur Python-3.7.0-orig/Python/thread_nt.h Python-3.7.0/Python/thread_nt.h --- Python-3.7.0-orig/Python/thread_nt.h 2018-06-27 06:07:35.000000000 +0300 +++ Python-3.7.0/Python/thread_nt.h 2018-07-12 10:23:03.302532700 +0300 diff --git a/mingw-w64-python3/2020-use-_wcsnicmp-instead-wcsncasecmp.patch b/mingw-w64-python3/2020-use-_wcsnicmp-instead-wcsncasecmp.patch new file mode 100644 index 0000000000..56608e6807 --- /dev/null +++ b/mingw-w64-python3/2020-use-_wcsnicmp-instead-wcsncasecmp.patch @@ -0,0 +1,11 @@ +--- Python-3.7.3/Modules/getpath.c.orig 2019-04-16 08:23:18.111566000 +0300 ++++ Python-3.7.3/Modules/getpath.c 2019-04-16 08:23:20.781569700 +0300 +@@ -341,7 +341,7 @@ + /* Check for already have an executable suffix */ + size_t n = wcslen(progpath); + size_t s = wcslen(EXE_SUFFIX); +- if (wcsncasecmp(EXE_SUFFIX, progpath+n-s, s) != 0) { ++ if (_wcsnicmp(EXE_SUFFIX, progpath+n-s, s) != 0) { + if (n + s > MAXPATHLEN) { + Py_FatalError("progpath overflow in getpath.c's add_exe_suffix()"); + } diff --git a/mingw-w64-python3/PKGBUILD b/mingw-w64-python3/PKGBUILD index b79f142110..242a10d1eb 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.7 -pkgver=${_pybasever}.2 -pkgrel=3 +pkgver=${_pybasever}.3 +pkgrel=1 pkgdesc="A high-level scripting language (mingw-w64)" arch=('any') license=('PSF') @@ -101,7 +101,6 @@ source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz 0820-dont-link-with-gettext.patch 0830-ctypes-python-dll.patch 0840-gdbm-module-includes.patch - 0845-3.7-_abs-mingw.patch 0850-use-gnu_printf-in-format.patch 0870-mingw-fix-ssl-dont-use-enum_certificates.patch 0890-mingw-build-optimized-ext.patch @@ -126,6 +125,7 @@ source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz 2000-warnings-fixes.patch 1900-ctypes-dont-depend-on-internal-libffi.patch 2010-configure-have-inet-pton.patch + 2020-use-_wcsnicmp-instead-wcsncasecmp.patch smoketests.py) # Helper macros to help make tasks easier # @@ -237,7 +237,6 @@ prepare() { 0820-dont-link-with-gettext.patch \ 0830-ctypes-python-dll.patch \ 0840-gdbm-module-includes.patch \ - 0845-3.7-_abs-mingw.patch \ 0850-use-gnu_printf-in-format.patch \ 0870-mingw-fix-ssl-dont-use-enum_certificates.patch \ 0890-mingw-build-optimized-ext.patch \ @@ -277,7 +276,8 @@ prepare() { 1810-3.7-mpdec-mingw.patch \ 1830-mingw-implement-setenv-for-PY_COERCE_C_LOCALE.patch \ 1850-disable-readline.patch \ - 1860-fix-isselectable.patch + 1860-fix-isselectable.patch \ + 2020-use-_wcsnicmp-instead-wcsncasecmp.patch apply_patch_with_msg 2000-warnings-fixes.patch @@ -428,7 +428,7 @@ package() { } -sha256sums=('d83fe8ce51b1bb48bbcf0550fd265b9a75cdfdfa93f916f9e700aef8444bf1bb' +sha256sums=('da60b54064d4cfcd9c26576f6df2690e62085123826cff2e667e72a91952d318' 'a2e92cf57985b93bb6203b26c84140610378bd1eb57e8ab8f00e0c0f9afb7b75' '8b2c7d6b3d0efec48f44c1e46be25fcfb4ba6711ca49b93cf9fa40fb4f0966b6' 'b2111d31e812b33e5cec85f6505bd730975dd242f8eb138307f71ffe0d7fdf6b' @@ -491,7 +491,6 @@ sha256sums=('d83fe8ce51b1bb48bbcf0550fd265b9a75cdfdfa93f916f9e700aef8444bf1bb' 'e176cd882818e857d6647a4fc08b00f353f11883f8cded1326239c3b2138b6ba' '4eace191297b47ebab2bf7dd68f6edaa1cb46d3f44dc86c9ebc88f96d6a46dff' '508ebdc995055ace5673d4734f015da4d989953f57a7ac076d04c97a79d5e1a7' - 'c9510eea8d927f3ea1478b7e4f9f4dc652995a768fdfe85bc3f4083fa93fdc4f' 'd37f6c6683784a5554e2065a52dc05ad55cf28ea18333acf42af421b7d4d5803' 'e076f36172f8b4fa76d06d41fef66e73b4e64a88e91e6ecbd9fd6822a0d14b32' '28684b03d3bab789983163449afa9da4d910fcfe944c9ff9853feb4c672e82fc' @@ -513,7 +512,8 @@ sha256sums=('d83fe8ce51b1bb48bbcf0550fd265b9a75cdfdfa93f916f9e700aef8444bf1bb' 'cdbdbfe4b8c02d58fd36db15d94425ae0b48124e709645fb717167280ff1bf15' '3262ce24714dc6cfea5b18d528d7f1a333128eadf5aa9c3a026131c34f082e1f' 'bd9b934e8c1f92573115efaef6b6b04966e3222ba769511e006366d1217d34d6' - 'e91f897e43063e0c4e52d971f5de4b5e193d9eb6a35fc3acfca1dc057a2fcd65' + '3231d1eb8e7a73528f03d4ef3fda645cb74a3cf78ed80de1d290484a77a89d27' 'e3b0171303b3e28a7347a81b1110dfe42df92a87d160caf624510304d5390728' '150dc7a5c59ef82b0bf258a2cd4233f2975fb89818849de39c185ce368a124ab' + '2d6605515648ef3ffe53e417719d4d51a7a2a79566e26e920733422dfd3751cb' '821402ddaef92140c70041b007bcf15e1cd5fe0fdb9f4f612da868382cc24585')