revert dropping 32-bit envs from some python packages

Adsun701 · Mar 8, 2024 · 215ce60 · 215ce60
1 parent 6391d65
commit 215ce60
Show file tree

Hide file tree

Showing 95 changed files with 500 additions and 426 deletions.
diff --git a/mingw-w64-capstone/PKGBUILD b/mingw-w64-capstone/PKGBUILD
@@ -7,9 +7,9 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-capstone"
 pkgver=5.0.1
 pkgrel=1
 pkgdesc='Lightweight multi-platform, multi-architecture disassembly framework (mingw-w64)'
-arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://www.capstone-engine.org/index.html'
+arch=('any')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 license=('spdx:BSD-3-Clause')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
@@ -19,7 +19,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-python-installer"
              "${MINGW_PACKAGE_PREFIX}-python-setuptools"
              "${MINGW_PACKAGE_PREFIX}-python-wheel")
-source=("https://github.com/capstone-engine/capstone/archive/${pkgver}/${_realname}-${pkgver}.tar.gz"
+source=("${_realname}-${pkgver}.tar.gz::https://github.com/capstone-engine/capstone/archive/refs/tags/${pkgver}.tar.gz"
         "mingw_python.patch")
 sha256sums=('2b9c66915923fdc42e0e32e2a9d7d83d3534a45bb235e163a70047951890c01a'
             '1b3fad23218c15ea232c0698b45095325d17401c9902268395b452ba3733ae0d')

diff --git a/mingw-w64-keystone/PKGBUILD b/mingw-w64-keystone/PKGBUILD
@@ -8,15 +8,15 @@ pkgver=0.9.2
 pkgrel=4
 pkgdesc="Lightweight multi-platform, multi-architecture assembler framework (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
-url="https://www.keystone-engine.org/"
-license=('spdx:GPL-2.0-only' 'custom')
-makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
-             "${MINGW_PACKAGE_PREFIX}-cmake"
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
+             "${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-python"
              "${MINGW_PACKAGE_PREFIX}-python-setuptools")
-source=("https://github.com/keystone-engine/keystone/archive/${pkgver}/${_realname}-${pkgver}.tar.gz"
+license=('spdx:GPL-2.0-only' 'custom')
+url="https://www.keystone-engine.org/"
+source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/keystone-engine/keystone/archive/${pkgver}.tar.gz"
         "0001-cmake-install-dir.patch"
         "0002-kstool-win-msys2.patch"
         "0003-python-load-dll-from-prefix.patch")
@@ -33,10 +33,11 @@ prepare() {
 }
 
 build() {
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
-  ${MINGW_PREFIX}/bin/cmake \
+  cmake \
     -G Ninja \
     -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
     -DCMAKE_BUILD_TYPE=Release \
@@ -45,17 +46,17 @@ build() {
     -DBUILD_LIBS_ONLY=OFF \
     "../${_realname}-${pkgver}"
 
-  ${MINGW_PREFIX}/bin/cmake --build .
+  cmake --build .
 
   cd "${srcdir}/${_realname}-${pkgver}/bindings/python"
   "${MINGW_PREFIX}"/bin/python setup.py build
 }
 
 package_keystone() {
-  depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
+depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 
   cd "${srcdir}/build-${MSYSTEM}"
-  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install .
+  DESTDIR="${pkgdir}" cmake --install .
   install -Dm0644 \
     "${srcdir}/${_realname}-${pkgver}/COPYING" \
     "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
@@ -65,9 +66,9 @@ package_keystone() {
 }
 
 package_python-keystone() {
-  license=('spdx:BSD-3-Clause')
-  depends=("${MINGW_PACKAGE_PREFIX}-keystone"
-           "${MINGW_PACKAGE_PREFIX}-python")
+license=('spdx:BSD-3-Clause')
+depends=("${MINGW_PACKAGE_PREFIX}-keystone"
+         "${MINGW_PACKAGE_PREFIX}-python")
 
   cd "${srcdir}/${_realname}-${pkgver}/bindings/python"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \

diff --git a/mingw-w64-miniupnpc/PKGBUILD b/mingw-w64-miniupnpc/PKGBUILD
@@ -8,10 +8,11 @@ pkgver=2.2.6
 pkgrel=1
 pkgdesc="A small UPnP client library/tool to access Internet Gateway Devices (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
 url="http://miniupnp.free.fr"
 msys2_repository_url="https://github.com/miniupnp/miniupnp"
 license=('spdx:BSD-3-Clause')
+depends=()
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"

diff --git a/mingw-w64-python-aiosignal/PKGBUILD b/mingw-w64-python-aiosignal/PKGBUILD
@@ -7,11 +7,11 @@ pkgver=1.3.1
 pkgrel=2
 pkgdesc="A list of registered asynchronous callbacks (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
-url='https://github.com/aio-libs/aiosignal'
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 msys2_references=(
   'pypi: aiosignal'
 )
+url='https://github.com/aio-libs/aiosignal'
 license=('spdx:Apache-2.0')
 depends=("${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-python-frozenlist")

diff --git a/mingw-w64-python-aiosmtpd/PKGBUILD b/mingw-w64-python-aiosmtpd/PKGBUILD
@@ -7,11 +7,11 @@ pkgver=1.4.4.post2
 pkgrel=2
 pkgdesc="aiosmtpd - asyncio based SMTP server (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
-url='https://github.com/aio-libs/aiosmtpd'
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 msys2_references=(
   'pypi: aiosmtpd'
 )
+url='https://github.com/aio-libs/aiosmtpd'
 license=('spdx:Apache-2.0')
 depends=("${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-python-atpublic"
@@ -32,12 +32,14 @@ build() {
 }
 
 check() {
+  msg "Python test for ${MSYSTEM}"
   cd "${srcdir}/python-build-${MSYSTEM}"
 
   ${MINGW_PREFIX}/bin/python -m pytest
 }
 
 package() {
+  msg "Python install for ${MSYSTEM}"
   cd "${srcdir}/python-build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \

diff --git a/mingw-w64-python-apipkg/PKGBUILD b/mingw-w64-python-apipkg/PKGBUILD
@@ -10,17 +10,18 @@ pkgver=3.0.2
 pkgrel=1
 pkgdesc="Namespace control and lazy-import mechanism (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
-url="https://github.com/pytest-dev/apipkg"
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 msys2_references=(
   'pypi: apipkg'
 )
+url="https://github.com/pytest-dev/apipkg"
 license=('spdx:MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-python")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-build"
              "${MINGW_PACKAGE_PREFIX}-python-installer"
              "${MINGW_PACKAGE_PREFIX}-python-hatchling"
              "${MINGW_PACKAGE_PREFIX}-python-hatch-vcs")
+options=('staticlibs' 'strip' '!debug')
 source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('c7aa61a4f82697fdaa667e70af1505acf1f7428b1c27b891d204ba7a8a3c5e0d')
 

diff --git a/mingw-w64-python-argon2-cffi-bindings/PKGBUILD b/mingw-w64-python-argon2-cffi-bindings/PKGBUILD
@@ -7,12 +7,12 @@ pkgver=21.2.0
 pkgrel=2
 pkgdesc="Low-level CFFI bindings for Argon2 (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
-url='https://github.com/hynek/argon2-cffi-bindings'
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 msys2_references=(
   'pypi: argon2-cffi-bindings'
 )
-license=('spdx:MIT')
+url='https://github.com/hynek/argon2-cffi-bindings'
+license=('MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-python-cffi"
          "${MINGW_PACKAGE_PREFIX}-argon2")

diff --git a/mingw-w64-python-argon2_cffi/PKGBUILD b/mingw-w64-python-argon2_cffi/PKGBUILD
@@ -10,7 +10,7 @@ pkgver=23.1.0
 pkgrel=1
 pkgdesc="CFFI-based Argon2 Bindings for Python (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url='https://github.com/hynek/argon2_cffi'
 license=('spdx:MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-python"

diff --git a/mingw-w64-python-arrow/PKGBUILD b/mingw-w64-python-arrow/PKGBUILD
@@ -8,11 +8,11 @@ pkgver=1.3.0
 pkgrel=1
 pkgdesc='Better dates & times for Python (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
-url="https://arrow.readthedocs.io/"
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 msys2_references=(
   'pypi: arrow'
 )
+url="https://arrow.readthedocs.io/"
 license=('spdx:Apache-2.0')
 depends=(
   "${MINGW_PACKAGE_PREFIX}-python"
@@ -21,22 +21,24 @@ depends=(
 makedepends=(
   "${MINGW_PACKAGE_PREFIX}-python-setuptools"
 )
-source=("https://pypi.org/packages/source/${_pyname::1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
+source=("${_pyname}-${pkgver}.tar.gz::https://pypi.org/packages/source/${_pyname::1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
 sha256sums=('d4540617648cb5f895730f1ad8c82a65f2dad0166f57b75f3ca54759c4d67a85')
 
 prepare() {  
   cd "$srcdir"
-  rm -rf python-build-${MSYSTEM} | true
-  cp -r "${_pyname//_/-}-$pkgver" "python-build-${MSYSTEM}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_pyname//_/-}-$pkgver" "python-build-${CARCH}"
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  cd "${srcdir}/python-build-${MSYSTEM}"
+  msg "Python build for ${CARCH}"  
+  cd "${srcdir}/python-build-${CARCH}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${MSYSTEM}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build

diff --git a/mingw-w64-python-asgiref/PKGBUILD b/mingw-w64-python-asgiref/PKGBUILD
@@ -7,11 +7,11 @@ pkgver=3.7.2
 pkgrel=2
 pkgdesc="Reference ASGI adapters and channel layers (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
-url='https://github.com/django/asgiref'
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 msys2_references=(
   'pypi: asgiref'
 )
+url='https://github.com/django/asgiref'
 license=('spdx:BSD-3-Clause')
 depends=("${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-python-typing_extensions")

diff --git a/mingw-w64-python-asn1crypto/PKGBUILD b/mingw-w64-python-asn1crypto/PKGBUILD
@@ -10,26 +10,27 @@ pkgver=1.5.1
 pkgrel=3
 pkgdesc="Python ASN.1 library with a focus on performance and a pythonic API (mingw-w64)"
 url='https://github.com/wbond/asn1crypto'
-license=('spdx:MIT')
+license=('MIT')
 arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 depends=("${MINGW_PACKAGE_PREFIX}-python-pycparser")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
-source=(".https://github.com/wbond/asn1crypto/archive/${pkgver}/${_realname}-${pkgver}.tar.gz")
+source=("${_realname}-${pkgver}.tar.gz::https://github.com/wbond/asn1crypto/archive/${pkgver}.tar.gz")
 sha256sums=('c06e6827971891a7c42299eff3f0881d6fbf1ada53f11c5797240a9c0cec6a1c')
 
 prepare() {
   cd ${srcdir}
-  cp -r ${_realname}-${pkgver} python-build-${MSYSTEM}
+  cp -r ${_realname}-${pkgver} python-build-${CARCH}
 }
 
 build() {
-  cd "${srcdir}/python-build-${MSYSTEM}"
+  msg "Python build for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd ${srcdir}/python-build-${MSYSTEM}
+  cd ${srcdir}/python-build-${CARCH}
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" --skip-build
 

diff --git a/mingw-w64-python-astor/PKGBUILD b/mingw-w64-python-astor/PKGBUILD
@@ -7,34 +7,34 @@ pkgver=0.8.1
 pkgrel=4
 pkgdesc='Read/rewrite/write Python ASTs (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
 url="https://astor.rtfd.org/"
-msys2_repository_url="https://github.com/berkerpeksag/astor"
-license=('spdx:BSD-3-Clause')
+license=('BSD')
 depends=("${MINGW_PACKAGE_PREFIX}-python")
 checkdepends=("${MINGW_PACKAGE_PREFIX}-python-nose")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
-source=("https://github.com/berkerpeksag/astor/archive/$pkgver/${_realname}-$pkgver.tar.gz")
+source=("${_realname}-$pkgver.tar.gz::https://github.com/berkerpeksag/astor/archive/$pkgver.tar.gz")
 sha512sums=('8917898e284fb5e5855a05f8e3f1c8925c4128d2a87f67f0334914d4d3c54b53c4f0cadd04d632a7bcaf3438db7edf2d989b07a9576637c0dce6c16e85c60f83')
 
-prepare() {
+prepare() {  
   cd "$srcdir"
-  rm -rf python-build-${MSYSTEM} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 }
 
 build() {
-  cd "${srcdir}/python-build-${MSYSTEM}"
+  msg "Python build for ${CARCH}"  
+  cd "${srcdir}/python-build-${CARCH}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  cd "${srcdir}/python-build-${MSYSTEM}"
+  cd "${srcdir}/python-build-${CARCH}"
   nosetests || warning "https://github.com/berkerpeksag/astor/issues/146"
 }
 
 package() {
-  cd "${srcdir}/python-build-${MSYSTEM}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build

diff --git a/mingw-w64-python-asttokens/PKGBUILD b/mingw-w64-python-asttokens/PKGBUILD
@@ -7,12 +7,12 @@ pkgver=2.4.1
 pkgrel=1
 pkgdesc="Annotate AST trees with source code positions (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
-url='https://github.com/gristlabs/asttokens'
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 msys2_references=(
   'archlinux: python-asttokens'
   'pypi: asttokens'
 )
+url='https://github.com/gristlabs/asttokens'
 license=('spdx:Apache-2.0')
 depends=("${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-python-six")

diff --git a/mingw-w64-python-astunparse/PKGBUILD b/mingw-w64-python-astunparse/PKGBUILD
@@ -7,28 +7,28 @@ pkgver=1.6.3
 pkgrel=4
 pkgdesc='An AST unparser for Python (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
 url="https://github.com/simonpercivall/astunparse"
-license=('spdx:PSF-2.0')
+license=('python')
 depends=("${MINGW_PACKAGE_PREFIX}-python-six")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python-wheel")
-source=("https://github.com/simonpercivall/astunparse/archive/v$pkgver/${_realname}-$pkgver.tar.gz")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools" "${MINGW_PACKAGE_PREFIX}-python-wheel")
+source=("${_realname}-$pkgver.tar.gz::https://github.com/simonpercivall/astunparse/archive/v$pkgver.tar.gz")
 sha512sums=('8f85d848c65d1728df767b1c2aee44aa4ce79a6810c348a5b3669b56f4bc5ce7f09414557be38d0a5103a77872d75083762bd2829d02ac8414df17221d30492b')
 
-prepare() {
+prepare() {  
   cd "$srcdir"
-  rm -rf python-build-${MSYSTEM} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 }
 
 build() {
-  cd "${srcdir}/python-build-${MSYSTEM}"
+  msg "Python build for ${CARCH}"  
+  cd "${srcdir}/python-build-${CARCH}"
   ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${MSYSTEM}"
+  cd "${srcdir}/python-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build

diff --git a/mingw-w64-python-async-lru/PKGBUILD b/mingw-w64-python-async-lru/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=2.0.4
 pkgrel=1
 pkgdesc='Simple LRU cache for asyncio (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url='https://github.com/aio-libs/async-lru'
 license=('spdx:MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-python"