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 495cc02afb..bb37c2e355 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 @@ -78,19 +78,6 @@ diff -Naur Python-3.7.0-orig/Modules/socketmodule.c Python-3.7.0/Modules/socketm #else # include "addrinfo.h" #endif -@@ -559,8 +563,12 @@ - # define SET_SOCK_ERROR(err) WSASetLastError(err) - # define SOCK_TIMEOUT_ERR WSAEWOULDBLOCK - # define SOCK_INPROGRESS_ERR WSAEWOULDBLOCK -+#ifdef _MSC_VER - # define SUPPRESS_DEPRECATED_CALL __pragma(warning(suppress: 4996)) - #else -+# define SUPPRESS_DEPRECATED_CALL -+#endif -+#else - # define GET_SOCK_ERROR errno - # define SET_SOCK_ERROR(err) do { errno = err; } while (0) - # define SOCK_TIMEOUT_ERR EWOULDBLOCK diff -Naur Python-3.7.0-orig/pyconfig.h.in Python-3.7.0/pyconfig.h.in --- Python-3.7.0-orig/pyconfig.h.in 2018-07-12 10:20:45.226690100 +0300 +++ Python-3.7.0/pyconfig.h.in 2018-07-12 10:21:17.971147600 +0300 diff --git a/mingw-w64-python3/2000-warnings-fixes.patch b/mingw-w64-python3/2000-warnings-fixes.patch index ec23cf538f..b2884ad524 100644 --- a/mingw-w64-python3/2000-warnings-fixes.patch +++ b/mingw-w64-python3/2000-warnings-fixes.patch @@ -28,7 +28,7 @@ diff -Naur Python-3.7.0-orig/Modules/socketmodule.h Python-3.7.0/Modules/socketm @@ -29,8 +29,10 @@ */ # ifdef SIO_GET_MULTICAST_FILTER - # include /* for SIO_RCVALL */ + # include /* for SIO_RCVALL */ +#ifndef __MINGW32__ /* resolve by configure */ # define HAVE_ADDRINFO # define HAVE_SOCKADDR_STORAGE diff --git a/mingw-w64-python3/PKGBUILD b/mingw-w64-python3/PKGBUILD index 25273d6d6c..2161b69808 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}.0 -pkgrel=15 +pkgver=${_pybasever}.1 +pkgrel=1 pkgdesc="A high-level scripting language (mingw-w64)" arch=('any') license=('PSF') @@ -438,7 +438,7 @@ package() { -i "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/lib-dynload/_sysconfigdata*.py } -sha256sums=('0382996d1ee6aafe59763426cf0139ffebe36984474d0ec4126dd1c40a8b3549' +sha256sums=('fa7e2b8e8c9402f192ad56dc4f814089d1c4466c97d780f5e5acc02c04243d6d' 'fa58527f17b1c3defeb9345ef0606d937b2c6ea2746033bfe980879eefe2c50e' '8b2c7d6b3d0efec48f44c1e46be25fcfb4ba6711ca49b93cf9fa40fb4f0966b6' 'b2111d31e812b33e5cec85f6505bd730975dd242f8eb138307f71ffe0d7fdf6b' @@ -462,7 +462,7 @@ sha256sums=('0382996d1ee6aafe59763426cf0139ffebe36984474d0ec4126dd1c40a8b3549' 'b86c646b8eca162f73a107e453498d06ed7c79b14d5823a48f7108822230bdfd' '22e002727f64cac5f5ba38d1da516fb10e04f41f3366e15796ed36a05f1f1685' 'c629be9a191948eff146f07dcb09c760ab55acfd08639dfc94dc1bc43160012f' - 'a813da554315f410ec86e7af28d5c3de7ea369e8925c357ceec2be18a38e9403' + '92d106d0dbc273cb08cb52759ba8467e16e6d61019eeb3464397822b991ed861' '8e2ae92f24ca52b16215612a57fe5076d5b0ea1cc0923d5ab9bd7395b6330816' 'b21b63eb077c4ed9380034957034d9fc726992e34abd9185d9f57080e088b4e8' '4f28511452f8c56aadc79e6e1079531aad94392778f9a62090e9c423487baf4c' @@ -524,5 +524,5 @@ sha256sums=('0382996d1ee6aafe59763426cf0139ffebe36984474d0ec4126dd1c40a8b3549' '612736b2f9b3b9a2276440d1a5cbd968f51635e8fab6b9d89c2b34947fb67216' '3262ce24714dc6cfea5b18d528d7f1a333128eadf5aa9c3a026131c34f082e1f' 'bd9b934e8c1f92573115efaef6b6b04966e3222ba769511e006366d1217d34d6' - '30d507205b3d99e877bf7418b9ad7a181d747758bcc8e96fd296da72e8cd8758' + 'e91f897e43063e0c4e52d971f5de4b5e193d9eb6a35fc3acfca1dc057a2fcd65' '846ceef71ae4001df68a1040e865d54e3688d7cc657927febc2344dcee8e1852')