diff --git a/mingw-w64-python-pyzmq/001-mingw-python.patch b/mingw-w64-python-pyzmq/001-mingw-python.patch index cf38cbdd69..5e5fcca124 100644 --- a/mingw-w64-python-pyzmq/001-mingw-python.patch +++ b/mingw-w64-python-pyzmq/001-mingw-python.patch @@ -1,25 +1,34 @@ diff --git a/setup.py b/setup.py -index e5ad7b9..007981e 100755 +index 049771d..619588c 100644 --- a/setup.py +++ b/setup.py -@@ -29,6 +29,7 @@ import time - import errno - import platform +@@ -30,6 +30,7 @@ from os.path import join as pjoin + from subprocess import PIPE, CalledProcessError, Popen, check_call + from sysconfig import get_config_var from traceback import print_exc +from sysconfig import _POSIX_BUILD - try: - import cffi -@@ -170,7 +171,7 @@ def bundled_settings(debug): + from packaging.version import Version as V + from setuptools import Command, setup +@@ -152,7 +153,7 @@ def bundled_settings(cmd): # is this necessary? if sys.platform.startswith('freebsd'): settings['libraries'].append('pthread') - elif sys.platform.startswith('win'): + elif sys.platform.startswith('win') and not _POSIX_BUILD: # link against libzmq in build dir: - plat = distutils.util.get_platform() - temp = 'temp.%s-%i.%i' % (plat, sys.version_info[0], sys.version_info[1]) -@@ -534,7 +535,7 @@ class Configure(build_ext): + if sys.version_info < (3, 9, 2): + # bpo-39825: EXT_SUFFIX is wrong from sysconfig prior to 3.9.2 / 3.8.7 +@@ -355,7 +356,7 @@ class Configure(build_ext): + merge(self.config, config_from_prefix(self.zmq)) + + # ensure vcredist is on PATH +- if sys.platform.startswith("win"): ++ if sys.platform.startswith("win") and 'MSC' in sys.version: + locate_vcredist_dir(self.plat_name) + # need a dummy extension for run to set up a compiler + self.extensions = [Extension("fake", ["unused.c"])] +@@ -514,7 +515,7 @@ class Configure(build_ext): ) line() @@ -28,7 +37,7 @@ index e5ad7b9..007981e 100755 # fetch libzmq.dll into local dir local_dll = localpath('zmq', libzmq_name + '.dll') if not zmq_prefix and not os.path.exists(local_dll): -@@ -626,7 +627,7 @@ class Configure(build_ext): +@@ -606,7 +607,7 @@ class Configure(build_ext): libzmq.define_macros.append(('ZMQ_IOTHREADS_USE_POLL', 1)) libzmq.define_macros.append(('ZMQ_POLL_BASED_ON_POLL', 1)) diff --git a/mingw-w64-python-pyzmq/PKGBUILD b/mingw-w64-python-pyzmq/PKGBUILD index ab02065971..a61558b2ad 100644 --- a/mingw-w64-python-pyzmq/PKGBUILD +++ b/mingw-w64-python-pyzmq/PKGBUILD @@ -6,13 +6,13 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=23.0.0b1 +pkgver=23.0.0 pkgrel=1 pkgdesc="Python bindings for zeromq, written in Cython (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') url="https://www.zeromq.org/languages/python" -license=('LGPL') +license=('spdx:LGPL-3.0-or-later' 'spdx:BSD-3-Clause') depends=("${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-zeromq") makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools" @@ -22,8 +22,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools" source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/zeromq/${_realname}/archive/v${pkgver}.tar.gz" "001-mingw-python.patch" "002-mingw-win-compat.patch") -sha256sums=('a618c85ac3ae472a5a904a70687b379be6be4956ac61240c15228bdc727a22a8' - '7f51c5a0ec8b05811cc045b1b566761a813e6205c374534d389fc057f436cb7f' +sha256sums=('5b1a413c1b9b51b553bee678fef82e704804e061d26d0a78601f53f7aa0186f3' + 'd99edc5fd04be65951d206d2a14a9d0707bf1332c0bc5686abb0da8724c3cf3d' '4588ffa5b24225bfcb16c2fc923627e23f3b7a98356a7855ec2ee07c7b5d5748') prepare() {