diff --git a/mingw-w64-python-pyzmq/001-mingw-python.patch b/mingw-w64-python-pyzmq/001-mingw-python.patch index 604e00d8b6..1ceba0c570 100644 --- a/mingw-w64-python-pyzmq/001-mingw-python.patch +++ b/mingw-w64-python-pyzmq/001-mingw-python.patch @@ -1,5 +1,5 @@ ---- src/py2zmq-15.2.0/setup.py 2016-07-19 16:31:03.100214900 +0100 -+++ src/pyzmq-15.2.0/setup.py 2016-07-19 16:38:12.475410600 +0100 +--- py2zmq-16.0.2/setup.py 2016-07-19 16:31:03.100214900 +0100 ++++ pyzmq-16.0.2/setup.py 2016-07-19 16:38:12.475410600 +0100 @@ -120,7 +120,7 @@ # is this necessary? if sys.platform.startswith('freebsd'): @@ -34,7 +34,7 @@ - if sys.platform.startswith('win'): + if sys.platform.startswith('win') and 'MSYSTEM' not in os.environ: # fetch libzmq.dll into local dir - local_dll = localpath('zmq','libzmq.dll') + local_dll = localpath('zmq', libzmq_name + '.dll') if not zmq_prefix and not os.path.exists(local_dll): fatal("ZMQ directory must be specified on Windows via setup.cfg or 'python setup.py configure --zmq=/path/to/zeromq2'") try: diff --git a/mingw-w64-python-pyzmq/PKGBUILD b/mingw-w64-python-pyzmq/PKGBUILD index fe3c32bfd1..590e9d05b8 100644 --- a/mingw-w64-python-pyzmq/PKGBUILD +++ b/mingw-w64-python-pyzmq/PKGBUILD @@ -1,9 +1,10 @@ # Maintainer: Patrick Stewart -pkgbase=mingw-w64-python-pyzmq -pkgname=("${MINGW_PACKAGE_PREFIX}-python2-pyzmq" "${MINGW_PACKAGE_PREFIX}-python3-pyzmq") -pkgver=15.2.0 -pkgrel=2 +_realname=pyzmq +pkgbase=mingw-w64-python-${_realname} +pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") +pkgver=16.0.2 +pkgrel=1 pkgdesc="Python bindings for zeromq, written in Cython (mingw-w64)" arch=('any') url="http://www.zeromq.org/bindings:python" @@ -11,15 +12,17 @@ license=('LGPL') makedepends=("${MINGW_PACKAGE_PREFIX}-python2-setuptools" "${MINGW_PACKAGE_PREFIX}-python3-setuptools" "${MINGW_PACKAGE_PREFIX}-zeromq") - -source=("https://pypi.python.org/packages/source/p/pyzmq/pyzmq-${pkgver}.tar.gz" +_dtoken="af/37/8e0bf3800823bc247c36715a52e924e8f8fd5d1432f04b44b8cd7a5d7e55" +source=("https://pypi.python.org/packages/${_dtoken}/${_realname}-${pkgver}.tar.gz" "001-mingw-python.patch") -sha256sums=('2dafa322670a94e20283aba2a44b92134d425bd326419b68ad4db8d0831a26ec' - 'b9b642fc7939d53b456cca51195632109c711ebf173ff8fb418c84a05c1e7eac') +sha256sums=('0322543fff5ab6f87d11a8a099c4c07dd8a1719040084b6ce9162bcdf5c45c9d' + '6f2f5f0a0e3e04052f9069e32f5a4459dccfafd5a1347cc90e7157784dabf109') prepare() { - cd "${srcdir}" + cd "${srcdir}/${_realname}-${pkgver}" patch -p1 -i ${srcdir}/001-mingw-python.patch - cp -a pyzmq-${pkgver} py2zmq-${pkgver} + + cd ${srcdir} + cp -a ${_realname}-${pkgver} py2zmq-${pkgver} } all_build() { @@ -29,8 +32,8 @@ all_build() { find "${pkgdir}/" -name "*.pyc" -delete find "${pkgdir}/" -type d -empty -delete - - rm -rf build + + rm -rf build } package_python3-pyzmq() { @@ -38,7 +41,7 @@ package_python3-pyzmq() { depends=("${MINGW_PACKAGE_PREFIX}-python3" "${MINGW_PACKAGE_PREFIX}-zeromq") - cd "${srcdir}/pyzmq-${pkgver}" + cd "${srcdir}/${_realname}-${pkgver}" sed -i 's|except socket.error, e:|except socket.error as e:|' zmq/eventloop/ioloop.py sed -i 's|except gevent.Timeout, t:|except gevent.Timeout as t:|' zmq/green/core.py