From fd809aec6cc516fa7f4d56ba0a29f1d658034753 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Thu, 1 Aug 2024 11:14:53 +0100 Subject: [PATCH] rebuild packages against numpy-2.0.0 --- mingw-w64-adios2/PKGBUILD | 2 +- mingw-w64-audaspace/PKGBUILD | 2 +- mingw-w64-blender/0014-fix-find-numpy-2.patch | 11 +++ mingw-w64-blender/PKGBUILD | 5 +- mingw-w64-boost/0011-support-numpy-2.patch | 17 ++++ mingw-w64-boost/PKGBUILD | 26 +++--- mingw-w64-eccodes/PKGBUILD | 2 +- mingw-w64-flatbuffers/PKGBUILD | 2 +- mingw-w64-freecad/PKGBUILD | 3 +- mingw-w64-gau2grid/PKGBUILD | 2 +- mingw-w64-gdal/PKGBUILD | 2 +- mingw-w64-gnuradio/PKGBUILD | 83 ++++++++++--------- mingw-w64-imath/PKGBUILD | 2 +- mingw-w64-libuhd/PKGBUILD | 22 +++-- mingw-w64-manim/PKGBUILD | 6 +- mingw-w64-mapbox-earcut/PKGBUILD | 31 ++++--- mingw-w64-mypaint/PKGBUILD | 2 +- mingw-w64-nlopt/PKGBUILD | 2 +- mingw-w64-opencv/PKGBUILD | 2 +- mingw-w64-openimageio/PKGBUILD | 2 +- mingw-w64-paraview/PKGBUILD | 2 +- mingw-w64-plplot/PKGBUILD | 13 +-- mingw-w64-precice/PKGBUILD | 2 +- mingw-w64-pyside6/PKGBUILD | 5 +- mingw-w64-python-astroid/PKGBUILD | 6 +- mingw-w64-python-biopython/PKGBUILD | 2 +- mingw-w64-python-colorspacious/PKGBUILD | 22 ++--- .../001-accept-numpy-2.patch | 11 +++ mingw-w64-python-colour-science/PKGBUILD | 18 ++-- mingw-w64-python-contourpy/PKGBUILD | 2 +- mingw-w64-python-geneticalgorithm/PKGBUILD | 2 +- mingw-w64-python-gym/PKGBUILD | 28 +++---- mingw-w64-python-h5py/PKGBUILD | 2 +- mingw-w64-python-h5pyd/PKGBUILD | 2 +- mingw-w64-python-imagecodecs/PKGBUILD | 2 +- mingw-w64-python-imageio/PKGBUILD | 12 +-- mingw-w64-python-imbalanced-learn/PKGBUILD | 2 +- mingw-w64-python-imgviz/PKGBUILD | 2 +- mingw-w64-python-isosurfaces/PKGBUILD | 2 +- mingw-w64-python-keras/PKGBUILD | 21 +++-- mingw-w64-python-keras_applications/PKGBUILD | 31 ++++--- mingw-w64-python-keras_preprocessing/PKGBUILD | 22 +++-- mingw-w64-python-labelme/PKGBUILD | 5 +- mingw-w64-python-lws/PKGBUILD | 24 +++--- mingw-w64-python-matplotlib/PKGBUILD | 2 +- mingw-w64-python-meshio/PKGBUILD | 11 +-- .../001-accept-numpy-2.patch | 11 +++ mingw-w64-python-moderngl-window/PKGBUILD | 17 +++- mingw-w64-python-numba/PKGBUILD | 2 +- mingw-w64-python-numexpr/PKGBUILD | 2 +- .../001-accept-numpy-2.patch | 11 +++ mingw-w64-python-openmdao/PKGBUILD | 15 +++- mingw-w64-python-optking/PKGBUILD | 2 +- mingw-w64-python-pandas/PKGBUILD | 2 +- mingw-w64-python-patsy/PKGBUILD | 2 +- mingw-w64-python-pesq/PKGBUILD | 35 ++++---- mingw-w64-python-pyamg/PKGBUILD | 2 +- mingw-w64-python-pyarrow/PKGBUILD | 2 +- mingw-w64-python-pydoe2/PKGBUILD | 26 +++--- mingw-w64-python-pygad/PKGBUILD | 2 +- mingw-w64-python-pynndescent/PKGBUILD | 2 +- mingw-w64-python-pyqtgraph/PKGBUILD | 2 +- mingw-w64-python-pyrr/PKGBUILD | 26 +++--- mingw-w64-python-pyswarm/PKGBUILD | 2 +- mingw-w64-python-pythran/PKGBUILD | 2 +- mingw-w64-python-pywavelets/PKGBUILD | 2 +- mingw-w64-python-qcelemental/PKGBUILD | 2 +- mingw-w64-python-rawpy/PKGBUILD | 2 +- mingw-w64-python-resampy/PKGBUILD | 2 +- mingw-w64-python-scikit-image/PKGBUILD | 6 +- mingw-w64-python-scikit-learn/PKGBUILD | 2 +- mingw-w64-python-scipy/PKGBUILD | 2 +- mingw-w64-python-seaborn/PKGBUILD | 2 +- mingw-w64-python-shapely/PKGBUILD | 4 +- mingw-w64-python-similarity_measures/PKGBUILD | 2 +- mingw-w64-python-soundfile/PKGBUILD | 2 +- mingw-w64-python-statsmodels/PKGBUILD | 2 +- mingw-w64-python-theano/PKGBUILD | 34 ++++---- mingw-w64-python-tifffile/PKGBUILD | 4 +- mingw-w64-python-trimesh/PKGBUILD | 2 +- mingw-w64-python-umap-learn/PKGBUILD | 3 +- mingw-w64-python-wordcloud/PKGBUILD | 2 +- mingw-w64-spglib/PKGBUILD | 2 +- mingw-w64-trilinos/PKGBUILD | 7 +- mingw-w64-vigra/PKGBUILD | 8 +- mingw-w64-wxPython/PKGBUILD | 4 +- 86 files changed, 418 insertions(+), 322 deletions(-) create mode 100644 mingw-w64-blender/0014-fix-find-numpy-2.patch create mode 100644 mingw-w64-boost/0011-support-numpy-2.patch create mode 100644 mingw-w64-python-colour-science/001-accept-numpy-2.patch create mode 100644 mingw-w64-python-moderngl-window/001-accept-numpy-2.patch create mode 100644 mingw-w64-python-openmdao/001-accept-numpy-2.patch diff --git a/mingw-w64-adios2/PKGBUILD b/mingw-w64-adios2/PKGBUILD index 9033c04ae8..7d694701ff 100644 --- a/mingw-w64-adios2/PKGBUILD +++ b/mingw-w64-adios2/PKGBUILD @@ -4,7 +4,7 @@ _realname=ADIOS2 pkgbase=mingw-w64-${_realname,,} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname,,}") pkgver=2.10.1 -pkgrel=4 +pkgrel=5 pkgdesc="The Adaptable Input/Output System version 2 (mingw-w64)" arch=(any) mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-audaspace/PKGBUILD b/mingw-w64-audaspace/PKGBUILD index 8c0d049dd5..6c882fb4b2 100644 --- a/mingw-w64-audaspace/PKGBUILD +++ b/mingw-w64-audaspace/PKGBUILD @@ -4,7 +4,7 @@ _realname=audaspace pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="A high level audio library written in C++ with language bindings for Python (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-blender/0014-fix-find-numpy-2.patch b/mingw-w64-blender/0014-fix-find-numpy-2.patch new file mode 100644 index 0000000000..c8f0e06afc --- /dev/null +++ b/mingw-w64-blender/0014-fix-find-numpy-2.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2000,7 +2000,7 @@ + # Always use numpy bundled in precompiled libs. + elseif((WITH_PYTHON_INSTALL AND WITH_PYTHON_INSTALL_NUMPY) OR WITH_PYTHON_NUMPY) + if(("${PYTHON_NUMPY_PATH}" STREQUAL "") OR (${PYTHON_NUMPY_PATH} MATCHES NOTFOUND)) +- find_python_package(numpy "core/include") ++ find_python_package(numpy "_core/include") + endif() + endif() + diff --git a/mingw-w64-blender/PKGBUILD b/mingw-w64-blender/PKGBUILD index 925a64dc43..3d1376b52d 100644 --- a/mingw-w64-blender/PKGBUILD +++ b/mingw-w64-blender/PKGBUILD @@ -12,7 +12,7 @@ _realname=blender pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=4.0.2 -pkgrel=4 +pkgrel=5 pkgdesc="A fully integrated 3D graphics creation suite (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -94,6 +94,7 @@ source=(https://download.blender.org/source/${_realname}-${pkgver}.tar.xz 0011-no-TIME_UTC-on-msvcrt.patch 0012-fix-build-with-OSL-1.13.patch::https://projects.blender.org/blender/blender/commit/798a0b30.patch 0013-force-draco.patch + 0014-fix-find-numpy-2.patch 0015-mingw-python-like-msvc.patch 0016-mingw-windres.patch 0019-fix-casts.patch @@ -125,6 +126,7 @@ sha256sums=('aaa0e729da7591cfbf45772af76345977daaa7b11a0af35d98f9313e246077a3' 'e018b7ee07f7b8b4964fd30feb0495101d0a6b51f218652d12ae2b6369d495eb' '44879c20e31e60ebe3232f0be9d808b343cf986f7a0fc6df53a90ac270ab42be' '6b08689f6c050780feebee330ad7c40cc528556ef80cb817e1551b11123edd13' + '06444eeb84d61437527d402c376024a862e60766963273868d76c604185829d1' '54f2569620eca6a6ad9e628a523a44bcddf96d863b749354f8bc5dd324dabeac' '98e61ea711a8356927d105b3e8ce0d65fb8fa62b8cfbcbc91d8d9b13f285d74b' 'a1a2e9aa9950e4438576291518c649074b6a0c473429bc16494995a981de614b' @@ -172,6 +174,7 @@ prepare() { 0011-no-TIME_UTC-on-msvcrt.patch \ 0012-fix-build-with-OSL-1.13.patch \ 0013-force-draco.patch \ + 0014-fix-find-numpy-2.patch \ 0015-mingw-python-like-msvc.patch \ 0016-mingw-windres.patch \ 0019-fix-casts.patch \ diff --git a/mingw-w64-boost/0011-support-numpy-2.patch b/mingw-w64-boost/0011-support-numpy-2.patch new file mode 100644 index 0000000000..f430637347 --- /dev/null +++ b/mingw-w64-boost/0011-support-numpy-2.patch @@ -0,0 +1,17 @@ +--- a/libs/python/src/numpy/dtype.cpp ++++ b/libs/python/src/numpy/dtype.cpp +@@ -98,7 +98,13 @@ + return python::detail::new_reference(reinterpret_cast(obj)); + } + +-int dtype::get_itemsize() const { return reinterpret_cast(ptr())->elsize;} ++int dtype::get_itemsize() const { ++#if NPY_ABI_VERSION < 0x02000000 ++ return reinterpret_cast(ptr())->elsize; ++#else ++ return PyDataType_ELSIZE(reinterpret_cast(ptr())); ++#endif ++} + + bool equivalent(dtype const & a, dtype const & b) { + // On Windows x64, the behaviour described on diff --git a/mingw-w64-boost/PKGBUILD b/mingw-w64-boost/PKGBUILD index 086e4a33c2..42cffe41ce 100644 --- a/mingw-w64-boost/PKGBUILD +++ b/mingw-w64-boost/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.85.0 _boostver=${pkgver//./_} -pkgrel=3 +pkgrel=4 pkgdesc="Free peer-reviewed portable C++ source libraries (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -42,9 +42,10 @@ source=(https://boostorg.jfrog.io/artifactory/main/release/${pkgver}/source/boos boost-1.70.0-fix-python-install.patch using-mingw-w64-python.patch msys2-mingw-folders-bootstrap.patch + boost-1.85.0-container-aliasing.patch 0010-cmake-prefer-shared-libs-over-static-on-MINGW.patch - 0012-allow-longer-path-on-mingw-w64.patch - boost-1.85.0-container-aliasing.patch) + 0011-support-numpy-2.patch + 0012-allow-longer-path-on-mingw-w64.patch) sha256sums=('7009fe1faa1697476bdc7027703a2badb84e849b7b0baad5086b087b971f8617' 'a23f9afeb620a0e82b6c158d592a555516dd985f82a9e24021f02a29651cb49b' 'cf46e9b791b45937d5af26b0f35dcdfa416cd9b62ef6c29e3064464835634628' @@ -54,9 +55,10 @@ sha256sums=('7009fe1faa1697476bdc7027703a2badb84e849b7b0baad5086b087b971f8617' '5e5fc9e04482903e1a0e7c6c4e81b57448b8dc86c707d1436d69ddc5010219ff' '5c38e08ba63695afa79a29d5d3ea22ef1ecf79f91d48ae922e1a489e83782742' '5117629ee577de0da800b6923675683ba69422cdbe958e70c9081fdc6886402e' + '968844daf8cfb841e12fa24404ae189549ba3bc6e6037651293e4c247b630e90' '87e3a33aa402b2f3ea23dc75c6522111ea81b86019aff2ca3779999b82e1acbe' - 'fdc78579f8f057defc59368f22b1304b138b155df13b953b5f10b57c633ed639' - '968844daf8cfb841e12fa24404ae189549ba3bc6e6037651293e4c247b630e90') + '61b1ad6c2ca16e9f99a4705a2526d2e9594f51e6e7df6f11d5f358b70e26dc01' + 'fdc78579f8f057defc59368f22b1304b138b155df13b953b5f10b57c633ed639') # Helper macros to help make tasks easier # apply_patch_with_msg() { @@ -95,10 +97,19 @@ prepare() { apply_patch_with_msg \ msys2-mingw-folders-bootstrap.patch + # https://github.com/boostorg/container/commit/20ad12f20e661978e90dc7f36d8ab8ac05e5a5a9 + # https://github.com/msys2/MINGW-packages/issues/17977 + apply_patch_with_msg \ + boost-1.85.0-container-aliasing.patch + # https://github.com/msys2/MINGW-packages/pull/14790#issuecomment-1519141235 apply_patch_with_msg \ 0010-cmake-prefer-shared-libs-over-static-on-MINGW.patch + # https://github.com/boostorg/python/commit/0474de0f6cc9 + apply_patch_with_msg \ + 0011-support-numpy-2.patch + # Building boost 1.83.0 fails because It uses response file to build url library # That response file uses backslashes for shared and import library which makes # the compilers both GCC and Clang to consider them as escape characters @@ -106,11 +117,6 @@ prepare() { # This patch increase that limit to 32000 (Cygwin `getconf ARG_MAX`) apply_patch_with_msg \ 0012-allow-longer-path-on-mingw-w64.patch - - # https://github.com/boostorg/container/commit/20ad12f20e661978e90dc7f36d8ab8ac05e5a5a9 - # https://github.com/msys2/MINGW-packages/issues/17977 - apply_patch_with_msg \ - boost-1.85.0-container-aliasing.patch } setb2args() { diff --git a/mingw-w64-eccodes/PKGBUILD b/mingw-w64-eccodes/PKGBUILD index 3997793f9c..79e50b1a7f 100644 --- a/mingw-w64-eccodes/PKGBUILD +++ b/mingw-w64-eccodes/PKGBUILD @@ -4,7 +4,7 @@ _realname=eccodes pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.35.0 -pkgrel=1 +pkgrel=2 pkgdesc="ECMWF's GRIB and BUFR encoding/decoding library (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64') diff --git a/mingw-w64-flatbuffers/PKGBUILD b/mingw-w64-flatbuffers/PKGBUILD index a548f13d20..f5e3799096 100644 --- a/mingw-w64-flatbuffers/PKGBUILD +++ b/mingw-w64-flatbuffers/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=24.3.25 -pkgrel=1 +pkgrel=2 pkgdesc='Memory Efficient Serialization Library (mingw-w64)' arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-freecad/PKGBUILD b/mingw-w64-freecad/PKGBUILD index fb761b3f82..77b25765ae 100644 --- a/mingw-w64-freecad/PKGBUILD +++ b/mingw-w64-freecad/PKGBUILD @@ -4,7 +4,7 @@ _realname=freecad pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=0.21.2 -pkgrel=6 +pkgrel=7 pkgdesc="Free and Opensource multiplatform 3D parametric modeler (mingw-w64)" arch=('any') mingw_arch=('ucrt64' 'clang64' 'clangarm64') @@ -121,6 +121,7 @@ build() { -DBUILD_TEST=OFF \ -DBUILD_WEB=OFF \ -DENABLE_DEVELOPER_TESTS=OFF \ + -DPython_EXECUTABLE=${MINGW_PREFIX}/bin/python \ -DPython3_EXECUTABLE=${MINGW_PREFIX}/bin/python \ -DPYTHON_EXECUTABLE=${MINGW_PREFIX}/bin/python \ "${_extra_config[@]}" \ diff --git a/mingw-w64-gau2grid/PKGBUILD b/mingw-w64-gau2grid/PKGBUILD index 3bb955231e..ca56f78005 100644 --- a/mingw-w64-gau2grid/PKGBUILD +++ b/mingw-w64-gau2grid/PKGBUILD @@ -4,7 +4,7 @@ _realname=gau2grid pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=2.0.7 -pkgrel=1 +pkgrel=2 pkgdesc="Fast computation of a gaussian and its derivative on a grid. (mingw-w64)" arch=('any') mingw_arch=('ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-gdal/PKGBUILD b/mingw-w64-gdal/PKGBUILD index ea3c2b1a6a..6daf3bbb4d 100644 --- a/mingw-w64-gdal/PKGBUILD +++ b/mingw-w64-gdal/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=mingw-w64-${_realname,,} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=3.9.0 -pkgrel=4 +pkgrel=5 pkgdesc="A translator library for raster geospatial data formats (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-gnuradio/PKGBUILD b/mingw-w64-gnuradio/PKGBUILD index a8a7a6b808..444600066e 100644 --- a/mingw-w64-gnuradio/PKGBUILD +++ b/mingw-w64-gnuradio/PKGBUILD @@ -4,45 +4,49 @@ _realname=gnuradio pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=3.10.11.0 -pkgrel=1 +pkgrel=2 pkgdesc="General purpose DSP and SDR toolkit (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64') url='https://gnuradio.org/' -license=(GPL3) +msys2_repository_url="https://github.com/gnuradio/gnuradio" +msys2_references=( + 'archlinux: gnuradio' +) +license=(spdx:GPL-3.0-or-later) depends=("${MINGW_PACKAGE_PREFIX}-codec2" - "${MINGW_PACKAGE_PREFIX}-gcc-libs" - "${MINGW_PACKAGE_PREFIX}-gmp" - "${MINGW_PACKAGE_PREFIX}-gsl" - "${MINGW_PACKAGE_PREFIX}-gsm" - "${MINGW_PACKAGE_PREFIX}-libad9361-iio" - "${MINGW_PACKAGE_PREFIX}-libuhd" - "${MINGW_PACKAGE_PREFIX}-libunwind" - "${MINGW_PACKAGE_PREFIX}-fftw" - "${MINGW_PACKAGE_PREFIX}-mathjax2" - "${MINGW_PACKAGE_PREFIX}-volk" - "${MINGW_PACKAGE_PREFIX}-python-click" - "${MINGW_PACKAGE_PREFIX}-python-click-plugins" - "${MINGW_PACKAGE_PREFIX}-python-jsonschema" - "${MINGW_PACKAGE_PREFIX}-python-mako" - "${MINGW_PACKAGE_PREFIX}-python-matplotlib" - "${MINGW_PACKAGE_PREFIX}-python-numpy" - "${MINGW_PACKAGE_PREFIX}-python-pygccxml" - "${MINGW_PACKAGE_PREFIX}-python-pyaml" - "${MINGW_PACKAGE_PREFIX}-python-pyzmq" - "${MINGW_PACKAGE_PREFIX}-python-scipy" - "${MINGW_PACKAGE_PREFIX}-python-qtpy" - "${MINGW_PACKAGE_PREFIX}-qt5-base" - "${MINGW_PACKAGE_PREFIX}-angleproject" - "${MINGW_PACKAGE_PREFIX}-qwt-qt5" - "${MINGW_PACKAGE_PREFIX}-SDL" - "${MINGW_PACKAGE_PREFIX}-soapysdr" - "${MINGW_PACKAGE_PREFIX}-portaudio" - "${MINGW_PACKAGE_PREFIX}-libsndfile" - "${MINGW_PACKAGE_PREFIX}-spdlog") -makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" + "${MINGW_PACKAGE_PREFIX}-gcc-libs" + "${MINGW_PACKAGE_PREFIX}-gmp" + "${MINGW_PACKAGE_PREFIX}-gsl" + "${MINGW_PACKAGE_PREFIX}-gsm" + "${MINGW_PACKAGE_PREFIX}-libad9361-iio" + "${MINGW_PACKAGE_PREFIX}-libuhd" + "${MINGW_PACKAGE_PREFIX}-libunwind" + "${MINGW_PACKAGE_PREFIX}-fftw" + "${MINGW_PACKAGE_PREFIX}-mathjax2" + "${MINGW_PACKAGE_PREFIX}-volk" + "${MINGW_PACKAGE_PREFIX}-python-click" + "${MINGW_PACKAGE_PREFIX}-python-click-plugins" + "${MINGW_PACKAGE_PREFIX}-python-jsonschema" + "${MINGW_PACKAGE_PREFIX}-python-mako" + "${MINGW_PACKAGE_PREFIX}-python-matplotlib" + "${MINGW_PACKAGE_PREFIX}-python-numpy" + "${MINGW_PACKAGE_PREFIX}-python-pygccxml" + "${MINGW_PACKAGE_PREFIX}-python-pyaml" + "${MINGW_PACKAGE_PREFIX}-python-pyzmq" + "${MINGW_PACKAGE_PREFIX}-python-scipy" + "${MINGW_PACKAGE_PREFIX}-python-qtpy" + "${MINGW_PACKAGE_PREFIX}-qt5-base" + "${MINGW_PACKAGE_PREFIX}-angleproject" + "${MINGW_PACKAGE_PREFIX}-qwt-qt5" + "${MINGW_PACKAGE_PREFIX}-SDL" + "${MINGW_PACKAGE_PREFIX}-soapysdr" + "${MINGW_PACKAGE_PREFIX}-portaudio" + "${MINGW_PACKAGE_PREFIX}-libsndfile" + "${MINGW_PACKAGE_PREFIX}-spdlog") +makedepends=("${MINGW_PACKAGE_PREFIX}-cc" + "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" - "${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-boost" "${MINGW_PACKAGE_PREFIX}-cppzmq" "${MINGW_PACKAGE_PREFIX}-doxygen" @@ -60,13 +64,12 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" checkdepends=("${MINGW_PACKAGE_PREFIX}-python-jsonschema" "${MINGW_PACKAGE_PREFIX}-python-setuptools") options=('!strip') -source=("${_realname}-${pkgver}.tar.gz::https://github.com/${_realname}/${_realname}/archive/v${pkgver}/${_realname}-v${pkgver}.tar.gz" +source=("https://github.com/${_realname}/${_realname}/archive/v${pkgver}/${_realname}-v${pkgver}.tar.gz" "https://github.com/gnuradio/gnuradio/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.gz.asc" 0001-cmake-Install-python-wrapper-exe-for-scripts-on-Wind.patch gnuradio-blocks-and-examples-path.hook.in gnuradio-blocks-and-examples-path.script.in LICENSE.txt) - validpgpkeys=( 'B90DDFAC56989BF62262EB812987C77CBB8ED9B2' # GNU Radio Project (Admin) 'D74F9F146E7F755783583158B343B2BA293E5174' # Marcus Müller (GNU Radio Maintainer) @@ -88,7 +91,13 @@ prepare() { } build() { - + declare -a _extra_config + if check_option "debug" "n"; then + _extra_config+=("-DCMAKE_BUILD_TYPE=Release") + else + _extra_config+=("-DCMAKE_BUILD_TYPE=Debug") + fi + # FIXME remove -DENABLE_CTRLPORT_THRIFT=OFF when issue 7390 is fixed # https://github.com/gnuradio/gnuradio/issues/7390 @@ -96,7 +105,7 @@ build() { "${MINGW_PREFIX}"/bin/cmake.exe \ -GNinja \ -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \ - -DCMAKE_BUILD_TYPE=Release \ + "${_extra_config[@]}" \ -DBoost_ATOMIC_LIBRARY_RELEASE="${MINGW_PREFIX}/bin/libboost_atomic-mt.dll" \ -DBoost_CHRONO_LIBRARY_RELEASE="${MINGW_PREFIX}/bin/libboost_chrono-mt.dll" \ -DBoost_DATE_TIME_LIBRARY_RELEASE="${MINGW_PREFIX}/bin/libboost_date_time-mt.dll" \ diff --git a/mingw-w64-imath/PKGBUILD b/mingw-w64-imath/PKGBUILD index 8a013d1527..6a3950bccf 100644 --- a/mingw-w64-imath/PKGBUILD +++ b/mingw-w64-imath/PKGBUILD @@ -4,7 +4,7 @@ _realname=imath pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=3.1.11 -pkgrel=2 +pkgrel=3 pkgdesc='A C++ and python library of 2D and 3D vector, matrix, and math operations for computer graphics (mingw-w64)' arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') diff --git a/mingw-w64-libuhd/PKGBUILD b/mingw-w64-libuhd/PKGBUILD index a850ee0369..6adf623067 100644 --- a/mingw-w64-libuhd/PKGBUILD +++ b/mingw-w64-libuhd/PKGBUILD @@ -4,24 +4,28 @@ _realname=libuhd pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=4.7.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Universal Software Radio Peripheral (USRP) userspace driver (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') url='https://files.ettus.com/manual/' -license=('GPL') +msys2_repository_url="https://github.com/EttusResearch/uhd" +msys2_references=( + 'archlinux: libuhd' +) +license=('spdx:GPL-3.0-or-later') depends=("${MINGW_PACKAGE_PREFIX}-boost" - "${MINGW_PACKAGE_PREFIX}-orc" - "${MINGW_PACKAGE_PREFIX}-libusb" - "${MINGW_PACKAGE_PREFIX}-python") -makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" + "${MINGW_PACKAGE_PREFIX}-orc" + "${MINGW_PACKAGE_PREFIX}-libusb" + "${MINGW_PACKAGE_PREFIX}-python") +makedepends=("${MINGW_PACKAGE_PREFIX}-cc" + "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" - "${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-python-setuptools" "${MINGW_PACKAGE_PREFIX}-python-mako" "${MINGW_PACKAGE_PREFIX}-python-numpy") -source=("libuhd-$pkgver.tar.gz::https://github.com/EttusResearch/uhd/archive/v$pkgver.tar.gz" - 0001-libraries_headers_and_no_pthread_setname_np.patch) +source=("https://github.com/EttusResearch/uhd/archive/v${pkgver}/libuhd-${pkgver}.tar.gz" + 0001-libraries_headers_and_no_pthread_setname_np.patch) sha256sums=('afe56842587ce72d6a57535a2b15c061905f0a039abcc9d79f0106f072a00d10' 'e97e1c6a3f1d29d658eb554fe4f206cec0ccddb4459585f221b151118e5f5cfa') diff --git a/mingw-w64-manim/PKGBUILD b/mingw-w64-manim/PKGBUILD index eba01d3062..e122ab0b47 100644 --- a/mingw-w64-manim/PKGBUILD +++ b/mingw-w64-manim/PKGBUILD @@ -4,15 +4,15 @@ _realname=manim pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=0.18.1 -pkgrel=2 +pkgrel=3 pkgdesc="Animation engine for explanatory math videos (community edition) (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64') +url='https://www.manim.community' +msys2_repository_url='https://github.com/ManimCommunity/manim' msys2_references=( 'pypi: manim' ) -url='https://www.manim.community' -msys2_repository_url='https://github.com/ManimCommunity/manim' license=('spdx:MIT') depends=( "${MINGW_PACKAGE_PREFIX}-python" diff --git a/mingw-w64-mapbox-earcut/PKGBUILD b/mingw-w64-mapbox-earcut/PKGBUILD index 82066d350f..bafe3637a6 100644 --- a/mingw-w64-mapbox-earcut/PKGBUILD +++ b/mingw-w64-mapbox-earcut/PKGBUILD @@ -5,7 +5,7 @@ _realname=mapbox-earcut pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=1.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="Python bindings for the mapbox earcut C++ polygon triangulation library. (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -16,35 +16,32 @@ msys2_references=( ) license=('spdx:ISC') depends=( - "${MINGW_PACKAGE_PREFIX}-pybind11" "${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-python-numpy" ) -makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools" +makedepends=("${MINGW_PACKAGE_PREFIX}-python-build" + "${MINGW_PACKAGE_PREFIX}-python-installer" + "${MINGW_PACKAGE_PREFIX}-python-setuptools" "${MINGW_PACKAGE_PREFIX}-python-setuptools-scm" + "${MINGW_PACKAGE_PREFIX}-python-wheel" "${MINGW_PACKAGE_PREFIX}-pybind11" "${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-cmake") -source=( - "${_pyname}-${pkgver}.tar.gz::https://pypi.org/packages/source/${_pyname::1}/${_pyname}/${_pyname}-${pkgver}.tar.gz" -) +source=("https://pypi.org/packages/source/${_pyname::1}/${_pyname}/${_pyname}-${pkgver}.tar.gz") sha256sums=('9f155e429a22e27387cfd7a6372c3a3865aafa609ad725e2c4465257f154a438') -prepare() { - rm -rf python-build-${MSYSTEM} | true - cp -r "${_pyname}-${pkgver}" "python-build-${MSYSTEM}" -} - build() { - msg "Python build for ${MSYSTEM}" - cd "${srcdir}/python-build-${MSYSTEM}" - ${MINGW_PREFIX}/bin/python setup.py build + cp -r "${_pyname}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}" + + ${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation } package() { cd "${srcdir}/python-build-${MSYSTEM}" - 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 + + MSYS2_ARG_CONV_EXCL="--prefix=" \ + ${MINGW_PREFIX}/bin/python -m installer --prefix=${MINGW_PREFIX} \ + --destdir="${pkgdir}" dist/*.whl + install -Dm644 LICENSE.md "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE" } diff --git a/mingw-w64-mypaint/PKGBUILD b/mingw-w64-mypaint/PKGBUILD index 38102bb270..5790f86a92 100644 --- a/mingw-w64-mypaint/PKGBUILD +++ b/mingw-w64-mypaint/PKGBUILD @@ -4,7 +4,7 @@ _realname=mypaint pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.0.1 -pkgrel=5 +pkgrel=6 pkgdesc="Simple drawing & painting program that works well with Wacom-style graphics tablets (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-nlopt/PKGBUILD b/mingw-w64-nlopt/PKGBUILD index 2844b77f89..39b7a91d3d 100644 --- a/mingw-w64-nlopt/PKGBUILD +++ b/mingw-w64-nlopt/PKGBUILD @@ -4,7 +4,7 @@ _realname=nlopt pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=2.7.1 -pkgrel=4 +pkgrel=5 pkgdesc="A library for nonlinear optimization (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-opencv/PKGBUILD b/mingw-w64-opencv/PKGBUILD index b429979ff3..7f06f6cf9f 100644 --- a/mingw-w64-opencv/PKGBUILD +++ b/mingw-w64-opencv/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=4.10.0 -pkgrel=2 +pkgrel=3 pkgdesc="Open Source Computer Vision Library (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-openimageio/PKGBUILD b/mingw-w64-openimageio/PKGBUILD index ed824b19e5..1e597f216a 100644 --- a/mingw-w64-openimageio/PKGBUILD +++ b/mingw-w64-openimageio/PKGBUILD @@ -4,7 +4,7 @@ _realname=openimageio pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.5.13.1 -pkgrel=1 +pkgrel=2 pkgdesc="A library for reading and writing images, including classes, utilities, and applications (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-paraview/PKGBUILD b/mingw-w64-paraview/PKGBUILD index 1158e91300..48b905644f 100644 --- a/mingw-w64-paraview/PKGBUILD +++ b/mingw-w64-paraview/PKGBUILD @@ -4,7 +4,7 @@ _realname=paraview pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=5.12.1 -pkgrel=4 +pkgrel=5 pkgdesc="Parallel Data Analysis and Visualization Application based on VTK. (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-plplot/PKGBUILD b/mingw-w64-plplot/PKGBUILD index 8363382245..9f061d80dc 100644 --- a/mingw-w64-plplot/PKGBUILD +++ b/mingw-w64-plplot/PKGBUILD @@ -7,12 +7,13 @@ # Set "ENABLE_qt=OFF" and "DEFAULT_NO_CAIRO_DEVICES=ON" to reduce warnings. # Had to define PLD_png and etc to ON to get libGD to be searched. -_realname=plplot _wx_basever=3.2 + +_realname=plplot pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=5.15.0 -pkgrel=23 +pkgrel=24 pkgdesc="Scientific plotting software (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -26,8 +27,8 @@ depends=("${MINGW_PACKAGE_PREFIX}-cairo" "${MINGW_PACKAGE_PREFIX}-libharu" "${MINGW_PACKAGE_PREFIX}-lua" "${MINGW_PACKAGE_PREFIX}-pango" - "${MINGW_PACKAGE_PREFIX}-python" - "${MINGW_PACKAGE_PREFIX}-python-numpy" + #"${MINGW_PACKAGE_PREFIX}-python" + #"${MINGW_PACKAGE_PREFIX}-python-numpy" "${MINGW_PACKAGE_PREFIX}-qt5-svg" "${MINGW_PACKAGE_PREFIX}-shapelib" "${MINGW_PACKAGE_PREFIX}-tk" @@ -96,6 +97,8 @@ build() { _enable_fortran="OFF" fi + CFLAGS+=" -Wno-incompatible-pointer-types -Wno-implicit-function-declaration -Wno-int-conversion" \ + CXXFLAGS+=" -Wno-deprecated-declarations -Wno-ignored-attributes" \ MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ -G"Ninja" \ @@ -117,7 +120,7 @@ build() { -DENABLE_cxx=ON \ -DENABLE_fortran=${_enable_fortran} \ -DENABLE_lua=ON \ - -DENABLE_python=ON \ + -DENABLE_python=OFF \ -DENABLE_tcl=ON \ -DENABLE_tk=ON \ -DENABLE_DYNDRIVERS=OFF \ diff --git a/mingw-w64-precice/PKGBUILD b/mingw-w64-precice/PKGBUILD index 50cd1f8e3f..d471ae7d30 100644 --- a/mingw-w64-precice/PKGBUILD +++ b/mingw-w64-precice/PKGBUILD @@ -5,7 +5,7 @@ _realname=precice pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=2.5.0 -pkgrel=6 +pkgrel=7 pkgdesc='A Coupling Library for Partitioned Multi-Physics Simulations on Massively Parallel Systems (mingw-w64)' arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64') diff --git a/mingw-w64-pyside6/PKGBUILD b/mingw-w64-pyside6/PKGBUILD index 1ee7a31150..01029e43fe 100644 --- a/mingw-w64-pyside6/PKGBUILD +++ b/mingw-w64-pyside6/PKGBUILD @@ -6,7 +6,7 @@ pkgname=(${MINGW_PACKAGE_PREFIX}-shiboken6 ${MINGW_PACKAGE_PREFIX}-${_realname} ${MINGW_PACKAGE_PREFIX}-${_realname}-tools) pkgver=6.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="Enables the use of Qt6 APIs in Python applications (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -79,6 +79,8 @@ build() { extra_config+=("-DCMAKE_BUILD_TYPE=Debug") fi + _pyver=$(${MINGW_PREFIX}/bin/python -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))") + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake.exe \ -GNinja \ @@ -88,6 +90,7 @@ build() { -DFORCE_LIMITED_API=OFF \ -DNO_QT_TOOLS="yes" \ -DPython_EXECUTABLE=${MINGW_PREFIX}/bin/python \ + -DNUMPY_INCLUDE_DIR=${MINGW_PREFIX}/include/python${_pyver}/numpy/_core/include \ -DSKIP_MODULES=DBus \ ../${_pkgfn} diff --git a/mingw-w64-python-astroid/PKGBUILD b/mingw-w64-python-astroid/PKGBUILD index 25cef4ad84..f81d0bed4d 100644 --- a/mingw-w64-python-astroid/PKGBUILD +++ b/mingw-w64-python-astroid/PKGBUILD @@ -4,16 +4,16 @@ _realname=astroid pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=3.2.4 -pkgrel=1 +pkgrel=2 pkgdesc="A common base representation of python source code for pylint and other projects (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') +url='https://github.com/pylint-dev/astroid' +msys2_documentation_url='https://pylint.readthedocs.io/projects/astroid/en/latest/' msys2_references=( 'archlinux: python-astroid' 'pypi: astroid' ) -msys2_documentation_url='https://pylint.readthedocs.io/projects/astroid/en/latest/' -url='https://github.com/pylint-dev/astroid' license=('spdx:LGPL-2.1-or-later') depends=("${MINGW_PACKAGE_PREFIX}-python") makedepends=("${MINGW_PACKAGE_PREFIX}-python-build" diff --git a/mingw-w64-python-biopython/PKGBUILD b/mingw-w64-python-biopython/PKGBUILD index 1ae35ce074..2724fb6a1e 100644 --- a/mingw-w64-python-biopython/PKGBUILD +++ b/mingw-w64-python-biopython/PKGBUILD @@ -7,7 +7,7 @@ provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=1.84 -pkgrel=1 +pkgrel=2 pkgdesc="Freely available tools for computational molecular biology. (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-python-colorspacious/PKGBUILD b/mingw-w64-python-colorspacious/PKGBUILD index fc04e6eb74..f12bee7eae 100644 --- a/mingw-w64-python-colorspacious/PKGBUILD +++ b/mingw-w64-python-colorspacious/PKGBUILD @@ -7,7 +7,7 @@ provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=1.1.2 -pkgrel=4 +pkgrel=5 pkgdesc="Python library for doing colorspace conversions (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -18,25 +18,25 @@ msys2_references=( license=('spdx:MIT') depends=("${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-python-numpy") -makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools") +makedepends=("${MINGW_PACKAGE_PREFIX}-python-build" + "${MINGW_PACKAGE_PREFIX}-python-installer" + "${MINGW_PACKAGE_PREFIX}-python-setuptools" + "${MINGW_PACKAGE_PREFIX}-python-wheel") source=("https://github.com/njsmith/colorspacious/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz") sha256sums=('d72658fe4ccedc3ab276c831e51887ee8fc8e5824eee11aeed398ec77d77d640') -prepare() { - cd "${srcdir}" - cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" -} - build() { - cd "${srcdir}/python-build-${MSYSTEM}" - ${MINGW_PREFIX}/bin/python setup.py build + cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}" + + ${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation } package() { cd "${srcdir}/python-build-${MSYSTEM}" - MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ - ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1 --skip-build + MSYS2_ARG_CONV_EXCL="--prefix=" \ + ${MINGW_PREFIX}/bin/python -m installer --prefix=${MINGW_PREFIX} \ + --destdir="${pkgdir}" dist/*.whl install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/COPYING" } diff --git a/mingw-w64-python-colour-science/001-accept-numpy-2.patch b/mingw-w64-python-colour-science/001-accept-numpy-2.patch new file mode 100644 index 0000000000..32f909356b --- /dev/null +++ b/mingw-w64-python-colour-science/001-accept-numpy-2.patch @@ -0,0 +1,11 @@ +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -46,7 +46,7 @@ + [tool.poetry.dependencies] + python = ">= 3.9, < 3.13" + imageio = ">= 2, < 3" +-numpy = ">= 1.22, < 2" ++numpy = ">= 1.22" + scipy = ">= 1.8, < 2" + typing-extensions = ">= 4, < 5" + diff --git a/mingw-w64-python-colour-science/PKGBUILD b/mingw-w64-python-colour-science/PKGBUILD index 6d9b6d49f9..5d0bf45f66 100644 --- a/mingw-w64-python-colour-science/PKGBUILD +++ b/mingw-w64-python-colour-science/PKGBUILD @@ -5,16 +5,16 @@ _realname=colour-science pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=0.4.4 -pkgrel=1 +pkgrel=2 pkgdesc="Python library for a multitude of colour science applications (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64') +url='https://www.colour-science.org' +msys2_repository_url='https://github.com/colour-science/colour' msys2_references=( 'aur: python-colour-science' 'pypi: colour-science' ) -msys2_repository_url='https://github.com/colour-science/colour' -url='https://www.colour-science.org' license=('spdx:BSD-3-Clause') depends=("${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-python-imageio" @@ -31,11 +31,17 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-python-matplotlib" "${MINGW_PACKAGE_PREFIX}-python-trimesh") conflicts=("${MINGW_PACKAGE_PREFIX}-python-${_realname//-science/}") options=('!strip') -source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname/-/_}-${pkgver}.tar.gz") -sha256sums=('a3cb3b8e8a51db82b62524173d65ae70396bfa943636e111e50fb7cc125857ad') +source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname/-/_}-${pkgver}.tar.gz" + "001-accept-numpy-2.patch") +sha256sums=('a3cb3b8e8a51db82b62524173d65ae70396bfa943636e111e50fb7cc125857ad' + '999dd2fdf4ec803ff1d44e0a87bb8ce815b5053141bf7dc422e92dc7442232e3') + +prepare() { + cd ${_realname/-/_}-${pkgver} + patch -p1 -i "${srcdir}"/001-accept-numpy-2.patch +} build() { - cd "${srcdir}" cp -r "${_realname/-/_}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}" ${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation diff --git a/mingw-w64-python-contourpy/PKGBUILD b/mingw-w64-python-contourpy/PKGBUILD index a550872f67..28a9127c95 100644 --- a/mingw-w64-python-contourpy/PKGBUILD +++ b/mingw-w64-python-contourpy/PKGBUILD @@ -4,7 +4,7 @@ _realname=contourpy pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=1.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="Python library for calculating contours of 2D quadrilateral grids (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-python-geneticalgorithm/PKGBUILD b/mingw-w64-python-geneticalgorithm/PKGBUILD index c4efab77bf..3107dccf67 100644 --- a/mingw-w64-python-geneticalgorithm/PKGBUILD +++ b/mingw-w64-python-geneticalgorithm/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=1.0.1 _pkgver2=${pkgver//./} -pkgrel=2 +pkgrel=3 pkgdesc="Genetic Algorithm Package for Python (mingw64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-python-gym/PKGBUILD b/mingw-w64-python-gym/PKGBUILD index e86c5ce408..8dccf9d039 100644 --- a/mingw-w64-python-gym/PKGBUILD +++ b/mingw-w64-python-gym/PKGBUILD @@ -4,7 +4,7 @@ _realname=gym pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=0.26.2 -pkgrel=2 +pkgrel=3 pkgdesc='A toolkit for developing and comparing reinforcement learning algorithms. (mingw-w64)' arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -16,28 +16,28 @@ license=('spdx:MIT') depends=("${MINGW_PACKAGE_PREFIX}-python-cloudpickle" "${MINGW_PACKAGE_PREFIX}-python-gym-notices" "${MINGW_PACKAGE_PREFIX}-python-numpy") -makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools") -optdepends=("${MINGW_PACKAGE_PREFIX}-python-pillow" "${MINGW_PACKAGE_PREFIX}-python-pyopengl") +makedepends=("${MINGW_PACKAGE_PREFIX}-python-build" + "${MINGW_PACKAGE_PREFIX}-python-installer" + "${MINGW_PACKAGE_PREFIX}-python-setuptools" + "${MINGW_PACKAGE_PREFIX}-python-wheel") +optdepends=("${MINGW_PACKAGE_PREFIX}-python-pillow" + "${MINGW_PACKAGE_PREFIX}-python-pyopengl") options=('!emptydirs') source=("https://files.pythonhosted.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz") sha256sums=('e0d882f4b54f0c65f203104c24ab8a38b039f1289986803c7d02cdbe214fbcc4') -prepare() { - rm -rf python-build-${MSYSTEM} | true - cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" -} - build() { - msg "Python build for ${MSYSTEM}" - cd "${srcdir}/python-build-${MSYSTEM}" - ${MINGW_PREFIX}/bin/python setup.py build + cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}" + + ${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation } package() { cd "${srcdir}/python-build-${MSYSTEM}" - 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 + + MSYS2_ARG_CONV_EXCL="--prefix=" \ + ${MINGW_PREFIX}/bin/python -m installer --prefix=${MINGW_PREFIX} \ + --destdir="${pkgdir}" dist/*.whl install -Dm644 LICENSE.md "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE.md" } diff --git a/mingw-w64-python-h5py/PKGBUILD b/mingw-w64-python-h5py/PKGBUILD index 39dfc05886..5f53281af7 100644 --- a/mingw-w64-python-h5py/PKGBUILD +++ b/mingw-w64-python-h5py/PKGBUILD @@ -7,7 +7,7 @@ provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=3.11.0 -pkgrel=2 +pkgrel=3 pkgdesc="General-purpose Python bindings for the HDF5 library (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-python-h5pyd/PKGBUILD b/mingw-w64-python-h5pyd/PKGBUILD index 8b7e7c7681..94f11f4c30 100644 --- a/mingw-w64-python-h5pyd/PKGBUILD +++ b/mingw-w64-python-h5pyd/PKGBUILD @@ -4,7 +4,7 @@ _realname=h5pyd pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=0.18.0 -pkgrel=2 +pkgrel=3 pkgdesc="h5py distributed - Python client library for HDF Rest API (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-python-imagecodecs/PKGBUILD b/mingw-w64-python-imagecodecs/PKGBUILD index f08bd83055..457122b1d2 100644 --- a/mingw-w64-python-imagecodecs/PKGBUILD +++ b/mingw-w64-python-imagecodecs/PKGBUILD @@ -4,7 +4,7 @@ _realname=imagecodecs pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=2024.6.1 -pkgrel=3 +pkgrel=4 pkgdesc="Image transformation, compression, and decompression codecs (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-python-imageio/PKGBUILD b/mingw-w64-python-imageio/PKGBUILD index 41a38a0054..f935c91aba 100644 --- a/mingw-w64-python-imageio/PKGBUILD +++ b/mingw-w64-python-imageio/PKGBUILD @@ -5,7 +5,7 @@ _realname=imageio pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=2.34.2 -pkgrel=1 +pkgrel=2 pkgdesc="Python library for reading and writing a wide range of image, video, scientific, and volumetric data formats (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -16,21 +16,17 @@ msys2_references=( ) url='https://github.com/imageio/imageio' license=('spdx:BSD-2-Clause') -depends=("${MINGW_PACKAGE_PREFIX}-python-numpy" +depends=("${MINGW_PACKAGE_PREFIX}-python" + "${MINGW_PACKAGE_PREFIX}-python-numpy" "${MINGW_PACKAGE_PREFIX}-python-pillow") optdepends=("${MINGW_PACKAGE_PREFIX}-freeimage: for FreeImage backend" "${MINGW_PACKAGE_PREFIX}-opencv: for OpenCV backend" "${MINGW_PACKAGE_PREFIX}-python-tifffile: for working with TIFF files") makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools") -source=("${_realname}-${pkgver}.tar.gz"::"${url}/archive/v${pkgver}.tar.gz") +source=("${url}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz") sha256sums=('6531b48b60b296085d21bde0508d247eb6cd3d685353570a74e3636020dfbdae') -prepare() { - cd "${srcdir}/${_realname}-${pkgver}" -} - build() { - cd "${srcdir}" cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}" "${MINGW_PREFIX}"/bin/python setup.py build diff --git a/mingw-w64-python-imbalanced-learn/PKGBUILD b/mingw-w64-python-imbalanced-learn/PKGBUILD index 0a5606819e..a282ef4e71 100644 --- a/mingw-w64-python-imbalanced-learn/PKGBUILD +++ b/mingw-w64-python-imbalanced-learn/PKGBUILD @@ -7,7 +7,7 @@ provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.12.3 -pkgrel=1 +pkgrel=2 pkgdesc="A Python Package to Tackle the Curse of Imbalanced Datasets in Machine Learning (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64') diff --git a/mingw-w64-python-imgviz/PKGBUILD b/mingw-w64-python-imgviz/PKGBUILD index 9088ed0ccc..2adda9b149 100644 --- a/mingw-w64-python-imgviz/PKGBUILD +++ b/mingw-w64-python-imgviz/PKGBUILD @@ -4,7 +4,7 @@ _realname=imgviz pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=1.7.5 -pkgrel=1 +pkgrel=2 pkgdesc='Image Visualization Tools (object detection, semantic and instance segmentation) (mingw-w64)' arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-python-isosurfaces/PKGBUILD b/mingw-w64-python-isosurfaces/PKGBUILD index 22fc4aba43..f057ae35da 100644 --- a/mingw-w64-python-isosurfaces/PKGBUILD +++ b/mingw-w64-python-isosurfaces/PKGBUILD @@ -4,7 +4,7 @@ _realname=isosurfaces pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=0.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="Construct isolines/isosurfaces over a 2D/3D scalar field defined by a function (not a uniform grid) (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-python-keras/PKGBUILD b/mingw-w64-python-keras/PKGBUILD index fb1cb5360a..2c125d273a 100644 --- a/mingw-w64-python-keras/PKGBUILD +++ b/mingw-w64-python-keras/PKGBUILD @@ -8,7 +8,7 @@ provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=2.3.1 -pkgrel=4 +pkgrel=5 pkgdesc="Keras is a high-level neural networks API, written in Python and capable of running on top of TensorFlow, CNTK, or Theano (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64') @@ -26,13 +26,15 @@ depends=("${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-python-keras_applications" "${MINGW_PACKAGE_PREFIX}-python-keras_preprocessing" "${MINGW_PACKAGE_PREFIX}-python-theano") -makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools") +makedepends=("${MINGW_PACKAGE_PREFIX}-python-build" + "${MINGW_PACKAGE_PREFIX}-python-installer" + "${MINGW_PACKAGE_PREFIX}-python-setuptools" + "${MINGW_PACKAGE_PREFIX}-python-wheel") source=(https://pypi.org/packages/source/${_realname::1}/${_realname}/${_pyname}-${pkgver}.tar.gz 0001-change-backend-to-theano.patch) sha256sums=('321d43772006a25a1d58eea17401ef2a34d388b588c9f7646c34796151ebc8cc' '2e53d3c474d0d797ef7c6faf3ecdc77dfe123fa43bd19a151caaf894baadb47e') - # Helper macros to help make tasks easier # apply_patch_with_msg() { for _patch in "$@" @@ -47,22 +49,19 @@ prepare() { apply_patch_with_msg \ 0001-change-backend-to-theano.patch - - cd "${srcdir}" - rm -rf "python-build-${MSYSTEM}" | true - cp -r "${_pyname}-${pkgver}" "python-build-${MSYSTEM}" } build() { - cd "${srcdir}/python-build-${MSYSTEM}" - ${MINGW_PREFIX}/bin/python setup.py --quiet build + cp -r "${_pyname}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}" + ${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation } package() { cd "${srcdir}/python-build-${MSYSTEM}" - MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ - ${MINGW_PREFIX}/bin/python setup.py --quiet install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1 --skip-build + MSYS2_ARG_CONV_EXCL="--prefix=" \ + ${MINGW_PREFIX}/bin/python -m installer --prefix=${MINGW_PREFIX} \ + --destdir="${pkgdir}" dist/*.whl install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE" } diff --git a/mingw-w64-python-keras_applications/PKGBUILD b/mingw-w64-python-keras_applications/PKGBUILD index 91632ce476..fe5c34b8ec 100644 --- a/mingw-w64-python-keras_applications/PKGBUILD +++ b/mingw-w64-python-keras_applications/PKGBUILD @@ -7,40 +7,37 @@ provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=1.0.8 -pkgrel=4 +pkgrel=5 pkgdesc="Reference implementations of popular deep learning models. (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') +url="https://github.com/keras-team/keras-applications" msys2_references=( 'archlinux: python-keras-applications' 'pypi: keras-applications' ) -url="https://github.com/keras-team/keras-applications" -license=('MIT') +license=('spdx:MIT') depends=("${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-python-numpy" "${MINGW_PACKAGE_PREFIX}-python-h5py") -makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools") -_archive=${_realname/_/-}-${pkgver} -source=(${_archive}.tar.gz::https://github.com/keras-team/keras-applications/archive/${pkgver}.tar.gz) +makedepends=("${MINGW_PACKAGE_PREFIX}-python-build" + "${MINGW_PACKAGE_PREFIX}-python-installer" + "${MINGW_PACKAGE_PREFIX}-python-setuptools" + "${MINGW_PACKAGE_PREFIX}-python-wheel") +source=(https://github.com/keras-team/keras-applications/archive/${pkgver}/${_realname}-${pkgver}.tar.gz) sha256sums=('7c37f9e9ef93efac9b4956301cb21ce46c474ce9da41fac9a46753bab6823dfc') -prepare() { - cd "${srcdir}" - rm -rf "python-build-${CARCH}" | true - cp -r "${_archive}" "python-build-${CARCH}" -} - build() { - cd "${srcdir}/python-build-${CARCH}" - ${MINGW_PREFIX}/bin/python setup.py --quiet build + cp -r "${_realname/_/-}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}" + ${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation } package() { - cd "${srcdir}/python-build-${CARCH}" + cd "${srcdir}/python-build-${MSYSTEM}" - MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ - ${MINGW_PREFIX}/bin/python setup.py --quiet install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1 + MSYS2_ARG_CONV_EXCL="--prefix=" \ + ${MINGW_PREFIX}/bin/python -m installer --prefix=${MINGW_PREFIX} \ + --destdir="${pkgdir}" dist/*.whl install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE" } diff --git a/mingw-w64-python-keras_preprocessing/PKGBUILD b/mingw-w64-python-keras_preprocessing/PKGBUILD index 75ed8e4934..650b19d620 100644 --- a/mingw-w64-python-keras_preprocessing/PKGBUILD +++ b/mingw-w64-python-keras_preprocessing/PKGBUILD @@ -7,7 +7,7 @@ provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=1.1.2 -pkgrel=4 +pkgrel=5 pkgdesc="Utilities for working with image data, text data, and sequence data. (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -20,26 +20,24 @@ license=('spdx:MIT') depends=("${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-python-numpy" "${MINGW_PACKAGE_PREFIX}-python-six") -makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools") +makedepends=("${MINGW_PACKAGE_PREFIX}-python-build" + "${MINGW_PACKAGE_PREFIX}-python-installer" + "${MINGW_PACKAGE_PREFIX}-python-setuptools" + "${MINGW_PACKAGE_PREFIX}-python-wheel") source=(https://github.com/keras-team/keras-preprocessing/archive/${pkgver}/${_realname}-${pkgver}.tar.gz) sha256sums=('8808fa9f0f539f096f9be426799f586540215784df1c25898618d73ed674fc37') -prepare() { - cd "${srcdir}" - rm -rf "python-build-${MSYSTEM}" | true - cp -r "${_realname/_/-}-${pkgver}" "python-build-${MSYSTEM}" -} - build() { - cd "${srcdir}/python-build-${MSYSTEM}" - ${MINGW_PREFIX}/bin/python setup.py --quiet build + cp -r "${_realname/_/-}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}" + ${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation } package() { cd "${srcdir}/python-build-${MSYSTEM}" - MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ - ${MINGW_PREFIX}/bin/python setup.py --quiet install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1 + MSYS2_ARG_CONV_EXCL="--prefix=" \ + ${MINGW_PREFIX}/bin/python -m installer --prefix=${MINGW_PREFIX} \ + --destdir="${pkgdir}" dist/*.whl install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE" } diff --git a/mingw-w64-python-labelme/PKGBUILD b/mingw-w64-python-labelme/PKGBUILD index 4f91496573..7dc6e963ce 100644 --- a/mingw-w64-python-labelme/PKGBUILD +++ b/mingw-w64-python-labelme/PKGBUILD @@ -4,7 +4,7 @@ _realname=labelme pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=5.2.1 -pkgrel=3 +pkgrel=4 pkgdesc='Image Polygonal Annotation with Python (polygon, rectangle, circle, line, point and image-level flag annotation). (mingw-w64)' arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -14,7 +14,8 @@ msys2_references=( ) url="https://github.com/wkentaro/labelme" license=('spdx:GPL-3.0-or-later') -depends=("${MINGW_PACKAGE_PREFIX}-python-colorama" +depends=("${MINGW_PACKAGE_PREFIX}-python" + "${MINGW_PACKAGE_PREFIX}-python-colorama" "${MINGW_PACKAGE_PREFIX}-python-imgviz" "${MINGW_PACKAGE_PREFIX}-python-matplotlib" "${MINGW_PACKAGE_PREFIX}-python-natsort" diff --git a/mingw-w64-python-lws/PKGBUILD b/mingw-w64-python-lws/PKGBUILD index 84d825f6b4..514ecfbcc3 100644 --- a/mingw-w64-python-lws/PKGBUILD +++ b/mingw-w64-python-lws/PKGBUILD @@ -4,7 +4,7 @@ _realname=lws pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=1.2.8 -pkgrel=1 +pkgrel=2 pkgdesc='Fast spectrogram phase recovery using Local Weighted Sums (mingw-w64)' arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -15,28 +15,26 @@ msys2_references=( license=('spdx:Apache-2.0') depends=("${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-python-numpy") -makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools" +makedepends=("${MINGW_PACKAGE_PREFIX}-python-build" + "${MINGW_PACKAGE_PREFIX}-python-installer" + "${MINGW_PACKAGE_PREFIX}-python-setuptools" + "${MINGW_PACKAGE_PREFIX}-python-wheel" "${MINGW_PACKAGE_PREFIX}-cython" "${MINGW_PACKAGE_PREFIX}-cc") options=('!emptydirs') source=("https://pypi.org/packages/source/${_realname:0:1}/${_realname}/${_realname//-/_}-${pkgver}.tar.gz") sha256sums=('aaaf86c4f040bc33f81981333fb37c280cd82ec338b8a421a5f74ba3c6f64d06') -prepare() { - cd "$srcdir" - rm -rf python-build-${MSYSTEM} | true - cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" -} - build() { - cd "${srcdir}/python-build-${MSYSTEM}" + cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}" LWS_USE_CYTHON=1 \ - ${MINGW_PREFIX}/bin/python setup.py build_ext + ${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation } package() { cd "${srcdir}/python-build-${MSYSTEM}" - 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 + + MSYS2_ARG_CONV_EXCL="--prefix=" \ + ${MINGW_PREFIX}/bin/python -m installer --prefix=${MINGW_PREFIX} \ + --destdir="${pkgdir}" dist/*.whl } diff --git a/mingw-w64-python-matplotlib/PKGBUILD b/mingw-w64-python-matplotlib/PKGBUILD index 5feb2efdec..0a30fcc06d 100644 --- a/mingw-w64-python-matplotlib/PKGBUILD +++ b/mingw-w64-python-matplotlib/PKGBUILD @@ -8,7 +8,7 @@ provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=3.9.0 -pkgrel=1 +pkgrel=2 pkgdesc="A python plotting library, making publication quality plots (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-python-meshio/PKGBUILD b/mingw-w64-python-meshio/PKGBUILD index 0242171792..e3874efa42 100644 --- a/mingw-w64-python-meshio/PKGBUILD +++ b/mingw-w64-python-meshio/PKGBUILD @@ -4,7 +4,7 @@ _realname=meshio pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=5.3.5 -pkgrel=2 +pkgrel=3 pkgdesc='Input/output for many mesh formats (mingw-w64)' arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64') @@ -13,17 +13,18 @@ msys2_references=( 'pypi: meshio' ) license=('spdx:MIT') -depends=("${MINGW_PACKAGE_PREFIX}-python-numpy" +depends=("${MINGW_PACKAGE_PREFIX}-python" + "${MINGW_PACKAGE_PREFIX}-python-numpy" "${MINGW_PACKAGE_PREFIX}-python-rich") makedepends=("${MINGW_PACKAGE_PREFIX}-python-build" "${MINGW_PACKAGE_PREFIX}-python-installer" "${MINGW_PACKAGE_PREFIX}-python-setuptools" "${MINGW_PACKAGE_PREFIX}-python-wheel") optdepends=("${MINGW_PACKAGE_PREFIX}-python-netcdf4" - "${MINGW_PACKAGE_PREFIX}-python-h5py") + "${MINGW_PACKAGE_PREFIX}-python-h5py") options=('!strip') -source=("$url/archive/v$pkgver.tar.gz") -sha256sums=('9E05D217857138D8F731803366C67ACEA2CFD67B0DD5AEBE0281F1FB13BA57E5') +source=("https://pypi.io/packages/source/${_realname:0:1}/${_realname}/${_realname}-${pkgver}.tar.gz") +sha256sums=('f21f01abd9f29ba06ea119304b3d39e610421cfe93b9dd23362834919f87586d') build() { cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}" diff --git a/mingw-w64-python-moderngl-window/001-accept-numpy-2.patch b/mingw-w64-python-moderngl-window/001-accept-numpy-2.patch new file mode 100644 index 0000000000..6e98987d4f --- /dev/null +++ b/mingw-w64-python-moderngl-window/001-accept-numpy-2.patch @@ -0,0 +1,11 @@ +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -26,7 +26,7 @@ + dependencies = [ + "moderngl<6", + "pyglet>=2.0.0", +- "numpy>=1.16,<2", ++ "numpy>=1.16", + "pyrr>=0.10.3,<1", + "Pillow>=10.0.1", + ] diff --git a/mingw-w64-python-moderngl-window/PKGBUILD b/mingw-w64-python-moderngl-window/PKGBUILD index 3b5bb345d3..76dc185ca5 100644 --- a/mingw-w64-python-moderngl-window/PKGBUILD +++ b/mingw-w64-python-moderngl-window/PKGBUILD @@ -5,7 +5,7 @@ _realname=moderngl-window pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=2.4.6 -pkgrel=1 +pkgrel=2 pkgdesc='A cross platform helper library for ModernGL making window creation and resource loading simple (mingw-w64)' arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -28,8 +28,15 @@ makedepends=( "${MINGW_PACKAGE_PREFIX}-python-wheel" "${MINGW_PACKAGE_PREFIX}-python-setuptools" ) -source=("${_realname}-${pkgver}.tar.gz::https://github.com/moderngl/moderngl-window/archive/refs/tags/${pkgver}.tar.gz") -sha256sums=('7a19ff674b1433adac8e81d3519fea4f216b3a135c44bed7f6b821f201b92996') +source=("https://pypi.io/packages/source/${_realname:0:1}/${_realname}/${_realname}-${pkgver}.tar.gz" + "001-accept-numpy-2.patch") +sha256sums=('db9b4c27f35faa6f243b6d8cde6ada6da6e79541d62b8e536c0b20da29720c32' + '9abc2673cffa72c323959f9684d359429b2b07781b67111f5a5c337242a6d3c6') + +prepare() { + cd ${_realname}-${pkgver} + patch -p1 -i "${srcdir}"/001-accept-numpy-2.patch +} build() { cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}" @@ -38,8 +45,10 @@ build() { package() { cd "${srcdir}/python-build-${MSYSTEM}" + MSYS2_ARG_CONV_EXCL="--prefix=" \ ${MINGW_PREFIX}/bin/python -m installer --prefix=${MINGW_PREFIX} \ --destdir="${pkgdir}" dist/*.whl - install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE" + + install -Dm644 LICENSE "${pkgdir}"${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE } diff --git a/mingw-w64-python-numba/PKGBUILD b/mingw-w64-python-numba/PKGBUILD index fa24ecfe26..98c6a543bc 100644 --- a/mingw-w64-python-numba/PKGBUILD +++ b/mingw-w64-python-numba/PKGBUILD @@ -4,7 +4,7 @@ _realname=numba pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=0.60.0 -pkgrel=1 +pkgrel=2 pkgdesc='NumPy aware dynamic Python compiler using LLVM (mingw-w64)' arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-python-numexpr/PKGBUILD b/mingw-w64-python-numexpr/PKGBUILD index 2f478eccbb..4b4cd58e7a 100644 --- a/mingw-w64-python-numexpr/PKGBUILD +++ b/mingw-w64-python-numexpr/PKGBUILD @@ -7,7 +7,7 @@ provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=2.10.1 -pkgrel=1 +pkgrel=2 pkgdesc="Fast numerical array expression evaluator for Python, NumPy, PyTables, pandas (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-python-openmdao/001-accept-numpy-2.patch b/mingw-w64-python-openmdao/001-accept-numpy-2.patch new file mode 100644 index 0000000000..32cf729eba --- /dev/null +++ b/mingw-w64-python-openmdao/001-accept-numpy-2.patch @@ -0,0 +1,11 @@ +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -33,7 +33,7 @@ + ] + dependencies = [ + "networkx>=2.0", +- "numpy<2", ++ "numpy", + "packaging", + "requests", + "scipy", diff --git a/mingw-w64-python-openmdao/PKGBUILD b/mingw-w64-python-openmdao/PKGBUILD index a7fa47e014..7f14838db8 100644 --- a/mingw-w64-python-openmdao/PKGBUILD +++ b/mingw-w64-python-openmdao/PKGBUILD @@ -4,16 +4,16 @@ _realname=openmdao pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=3.34.2 -pkgrel=1 +pkgrel=2 pkgdesc="An open-source MDAO framework written in Python (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64') -license=('spdx:Apache-2.0') url="https://openmdao.org/" msys2_repository_url='https://github.com/OpenMDAO/OpenMDAO' msys2_references=( 'pypi: openmdao' ) +license=('spdx:Apache-2.0') depends=("${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-python-numpy" "${MINGW_PACKAGE_PREFIX}-python-scipy" @@ -25,8 +25,15 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python-build" "${MINGW_PACKAGE_PREFIX}-python-hatchling" "${MINGW_PACKAGE_PREFIX}-python-wheel") options=('!strip') -source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz") -sha256sums=('3f772f74c99fc2305a872a4761589d4130396ea98a2210d9d1367fcf7fca36ab') +source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz" + "001-accept-numpy-2.patch") +sha256sums=('3f772f74c99fc2305a872a4761589d4130396ea98a2210d9d1367fcf7fca36ab' + '33effa660300b3221e31eb83147f9f65954746d3b6e4e1f4517769e8992103fe') + +prepare() { + cd ${_realname/-/_}-${pkgver} + patch -p1 -i "${srcdir}"/001-accept-numpy-2.patch +} build() { cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}" diff --git a/mingw-w64-python-optking/PKGBUILD b/mingw-w64-python-optking/PKGBUILD index 7ab3dbb035..fea6f117bb 100644 --- a/mingw-w64-python-optking/PKGBUILD +++ b/mingw-w64-python-optking/PKGBUILD @@ -4,7 +4,7 @@ _realname=optking pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=0.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="A Python version of the PSI4 geometry optimization program by R.A. King (mingw-w64)" arch=('any') mingw_arch=('ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-python-pandas/PKGBUILD b/mingw-w64-python-pandas/PKGBUILD index 0cae034572..98554c5895 100644 --- a/mingw-w64-python-pandas/PKGBUILD +++ b/mingw-w64-python-pandas/PKGBUILD @@ -7,7 +7,7 @@ provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=2.2.2 -pkgrel=2 +pkgrel=3 pkgdesc="Powerful data structures for data analysis, time series, and statistics (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-python-patsy/PKGBUILD b/mingw-w64-python-patsy/PKGBUILD index c94edd49b0..25cb1427b8 100644 --- a/mingw-w64-python-patsy/PKGBUILD +++ b/mingw-w64-python-patsy/PKGBUILD @@ -7,7 +7,7 @@ provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.5.6 -pkgrel=1 +pkgrel=2 pkgdesc="A Python package for describing statistical models and for building design matrices (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-python-pesq/PKGBUILD b/mingw-w64-python-pesq/PKGBUILD index 2b5b77ac0f..b4cca3ed07 100644 --- a/mingw-w64-python-pesq/PKGBUILD +++ b/mingw-w64-python-pesq/PKGBUILD @@ -4,38 +4,39 @@ _realname=pesq pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=0.0.4 -pkgrel=2 +pkgrel=3 pkgdesc='PESQ (Perceptual Evaluation of Speech Quality) Wrapper for Python Users (narrow band and wide band) (mingw-w64)' arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') -url="https://github.com/ludlows/python-pesq" +url="https://github.com/ludlows/PESQ" msys2_references=( 'pypi: pesq' ) license=('spdx:MIT') -depends=("${MINGW_PACKAGE_PREFIX}-python-numpy") -makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools" - "${MINGW_PACKAGE_PREFIX}-python-pytest-runner" +depends=("${MINGW_PACKAGE_PREFIX}-python" + "${MINGW_PACKAGE_PREFIX}-python-numpy") +makedepends=("${MINGW_PACKAGE_PREFIX}-python-build" + "${MINGW_PACKAGE_PREFIX}-python-installer" + "${MINGW_PACKAGE_PREFIX}-python-setuptools" + "${MINGW_PACKAGE_PREFIX}-python-wheel" "${MINGW_PACKAGE_PREFIX}-cc" - "${MINGW_PACKAGE_PREFIX}-cython0") + "${MINGW_PACKAGE_PREFIX}-cython") +checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest-runner") options=('!emptydirs') source=("https://pypi.org/packages/source/${_realname:0:1}/${_realname}/${_realname//-/_}-${pkgver}.tar.gz") sha256sums=('b724b28f73fb638522982bd68e8c3c0957e2f45210639a460233b17aa7fc890b') -prepare() { - cd "$srcdir" - rm -rf python-build-${MSYSTEM} | true - cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" -} - build() { - cd "${srcdir}/python-build-${MSYSTEM}" - ${MINGW_PREFIX}/bin/python setup.py build + rm -rf python-build-${MSYSTEM} | true + cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}" + + ${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation } package() { cd "${srcdir}/python-build-${MSYSTEM}" - 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 + + MSYS2_ARG_CONV_EXCL="--prefix=" \ + ${MINGW_PREFIX}/bin/python -m installer --prefix=${MINGW_PREFIX} \ + --destdir="${pkgdir}" dist/*.whl } diff --git a/mingw-w64-python-pyamg/PKGBUILD b/mingw-w64-python-pyamg/PKGBUILD index b439bb9286..5854dff338 100644 --- a/mingw-w64-python-pyamg/PKGBUILD +++ b/mingw-w64-python-pyamg/PKGBUILD @@ -7,7 +7,7 @@ provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=5.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="PyAMG: Algebraic Multigrid Solvers in Python (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64') diff --git a/mingw-w64-python-pyarrow/PKGBUILD b/mingw-w64-python-pyarrow/PKGBUILD index 9430bceb26..941d12a935 100644 --- a/mingw-w64-python-pyarrow/PKGBUILD +++ b/mingw-w64-python-pyarrow/PKGBUILD @@ -4,7 +4,7 @@ _realname=pyarrow pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=17.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Columnar in-memory analytics layer for big data — Python module (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-python-pydoe2/PKGBUILD b/mingw-w64-python-pydoe2/PKGBUILD index 2e9a3be2e8..43a6882bab 100644 --- a/mingw-w64-python-pydoe2/PKGBUILD +++ b/mingw-w64-python-pydoe2/PKGBUILD @@ -5,7 +5,7 @@ _realname=pydoe2 pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=1.3.0 -pkgrel=3 +pkgrel=4 pkgdesc='An experimental design package for python. (mingw-w64)' arch=('any') mingw_arch=('mingw64' 'ucrt64') @@ -17,25 +17,23 @@ license=('spdx:BSD-3-Clause') depends=("${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-python-numpy" "${MINGW_PACKAGE_PREFIX}-python-scipy") -makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools") +makedepends=("${MINGW_PACKAGE_PREFIX}-python-build" + "${MINGW_PACKAGE_PREFIX}-python-installer" + "${MINGW_PACKAGE_PREFIX}-python-setuptools" + "${MINGW_PACKAGE_PREFIX}-python-wheel") options=('!emptydirs') source=("https://pypi.org/packages/source/${_pyname::1}/${_pyname}/${_pyname}-${pkgver}.tar.gz") sha256sums=('5492b0f984af52da3af20b1cd61deb21b067c858e65243ec3ba573375f0d6720') -prepare() { - cd "$srcdir" - rm -rf python-build-${MSYSTEM} | true - cp -r "${_pyname}-${pkgver}" "python-build-${MSYSTEM}" -} - build() { - cd "${srcdir}/python-build-${MSYSTEM}" - ${MINGW_PREFIX}/bin/python setup.py build + cp -r "${_pyname}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}" + ${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation } package() { - cd "${srcdir}/python-build-${MSYSTEM}" - 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 + cd "${srcdir}"/python-build-${MSYSTEM} + + MSYS2_ARG_CONV_EXCL="--prefix=" \ + ${MINGW_PREFIX}/bin/python -m installer --prefix=${MINGW_PREFIX} \ + --destdir="${pkgdir}" dist/*.whl } diff --git a/mingw-w64-python-pygad/PKGBUILD b/mingw-w64-python-pygad/PKGBUILD index 76dd022f68..d6140e6c8a 100644 --- a/mingw-w64-python-pygad/PKGBUILD +++ b/mingw-w64-python-pygad/PKGBUILD @@ -4,7 +4,7 @@ _realname=pygad pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=3.3.1 -pkgrel=1 +pkgrel=2 pkgdesc='A Python 3 Library for Building the Genetic Algorithm and Training Machine Learning Algoithms (mingw-w64)' arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64') diff --git a/mingw-w64-python-pynndescent/PKGBUILD b/mingw-w64-python-pynndescent/PKGBUILD index eec7adb8b6..e392c54331 100644 --- a/mingw-w64-python-pynndescent/PKGBUILD +++ b/mingw-w64-python-pynndescent/PKGBUILD @@ -4,7 +4,7 @@ _realname=pynndescent pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=0.5.13 -pkgrel=1 +pkgrel=2 pkgdesc='Nearest Neighbor Descent (mingw-w64)' arch=('any') mingw_arch=('mingw64' 'ucrt64') diff --git a/mingw-w64-python-pyqtgraph/PKGBUILD b/mingw-w64-python-pyqtgraph/PKGBUILD index 77cfd0f2fc..04ac2b7b45 100644 --- a/mingw-w64-python-pyqtgraph/PKGBUILD +++ b/mingw-w64-python-pyqtgraph/PKGBUILD @@ -4,7 +4,7 @@ _realname=pyqtgraph pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=0.13.7 -pkgrel=1 +pkgrel=2 pkgdesc='Scientific Graphics and GUI Library for Python.' arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-python-pyrr/PKGBUILD b/mingw-w64-python-pyrr/PKGBUILD index e4e405a869..284c0e3941 100644 --- a/mingw-w64-python-pyrr/PKGBUILD +++ b/mingw-w64-python-pyrr/PKGBUILD @@ -5,7 +5,7 @@ _realname=pyrr pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=0.10.3 -pkgrel=4 +pkgrel=5 pkgdesc='3D mathematical functions using NumPy (mingw-w64)' arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -20,7 +20,10 @@ depends=( "${MINGW_PACKAGE_PREFIX}-python-numpy" ) makedepends=( + "${MINGW_PACKAGE_PREFIX}-python-build" + "${MINGW_PACKAGE_PREFIX}-python-installer" "${MINGW_PACKAGE_PREFIX}-python-setuptools" + "${MINGW_PACKAGE_PREFIX}-python-wheel" ) checkdepends=( "${MINGW_PACKAGE_PREFIX}-python-pytest" @@ -28,27 +31,22 @@ checkdepends=( source=("https://pypi.org/packages/source/${_pyname::1}/${_pyname}/${_pyname}-${pkgver}.tar.gz") sha256sums=('3c0f7b20326e71f706a610d58f2190fff73af01eef60c19cb188b186f0ec7e1d') -prepare() { - cd "$srcdir" - rm -rf python-build-${MSYSTEM} | true - cp -r "${_pyname//_/-}-$pkgver" "python-build-${MSYSTEM}" - export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver} -} - build() { - cd "${srcdir}/python-build-${MSYSTEM}" - ${MINGW_PREFIX}/bin/python setup.py build + cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}" + ${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation } check() { cd "${srcdir}/python-build-${MSYSTEM}" - pytest + ${MINGW_PREFIX}/bin/python -m pytest } package() { cd "${srcdir}/python-build-${MSYSTEM}" - 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 + + MSYS2_ARG_CONV_EXCL="--prefix=" \ + ${MINGW_PREFIX}/bin/python -m installer --prefix=${MINGW_PREFIX} \ + --destdir="${pkgdir}" dist/*.whl + install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE" } diff --git a/mingw-w64-python-pyswarm/PKGBUILD b/mingw-w64-python-pyswarm/PKGBUILD index f44f6b9d99..4aaccd92e9 100644 --- a/mingw-w64-python-pyswarm/PKGBUILD +++ b/mingw-w64-python-pyswarm/PKGBUILD @@ -4,7 +4,7 @@ _realname=pyswarm pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=0.6 -pkgrel=2 +pkgrel=3 pkgdesc="Particle swarm optimization (PSO) with constraint support (mingw64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-python-pythran/PKGBUILD b/mingw-w64-python-pythran/PKGBUILD index 6d7f44e11f..2e53b81f0b 100644 --- a/mingw-w64-python-pythran/PKGBUILD +++ b/mingw-w64-python-pythran/PKGBUILD @@ -4,7 +4,7 @@ _realname=pythran pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=0.16.1 -pkgrel=2 +pkgrel=3 pkgdesc="Ahead of Time compiler for numeric kernels (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-python-pywavelets/PKGBUILD b/mingw-w64-python-pywavelets/PKGBUILD index f241f37a5d..01f37d464e 100644 --- a/mingw-w64-python-pywavelets/PKGBUILD +++ b/mingw-w64-python-pywavelets/PKGBUILD @@ -8,7 +8,7 @@ provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=1.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="Discrete Wavelet Transforms in Python (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-python-qcelemental/PKGBUILD b/mingw-w64-python-qcelemental/PKGBUILD index f0c7646b31..0a64abb68d 100644 --- a/mingw-w64-python-qcelemental/PKGBUILD +++ b/mingw-w64-python-qcelemental/PKGBUILD @@ -4,7 +4,7 @@ _realname=qcelemental pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=0.28.0 -pkgrel=1 +pkgrel=2 pkgdesc="Core data structures for Quantum Chemistry. (mingw-w64)" arch=('any') mingw_arch=('ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-python-rawpy/PKGBUILD b/mingw-w64-python-rawpy/PKGBUILD index 0caec79fbc..168c951442 100644 --- a/mingw-w64-python-rawpy/PKGBUILD +++ b/mingw-w64-python-rawpy/PKGBUILD @@ -4,7 +4,7 @@ _realname=rawpy pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=0.21.0 -pkgrel=1 +pkgrel=2 pkgdesc='RAW image processing for Python, a wrapper for libraw (mingw-w64)' arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-python-resampy/PKGBUILD b/mingw-w64-python-resampy/PKGBUILD index 78abfc6622..97f1d97b96 100644 --- a/mingw-w64-python-resampy/PKGBUILD +++ b/mingw-w64-python-resampy/PKGBUILD @@ -4,7 +4,7 @@ _realname=resampy pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=0.4.3 -pkgrel=1 +pkgrel=2 pkgdesc='Efficient sample rate conversion in python (mingw-w64)' arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-python-scikit-image/PKGBUILD b/mingw-w64-python-scikit-image/PKGBUILD index eb7a19444e..d0c5b195b1 100644 --- a/mingw-w64-python-scikit-image/PKGBUILD +++ b/mingw-w64-python-scikit-image/PKGBUILD @@ -6,7 +6,7 @@ _realname=scikit-image pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=0.22.0 -pkgrel=3 +pkgrel=4 pkgdesc='Image processing routines for SciPy (mingw-w64)' arch=('any') mingw_arch=('mingw64' 'ucrt64') @@ -26,10 +26,10 @@ depends=("${MINGW_PACKAGE_PREFIX}-python-matplotlib>=3.5" "${MINGW_PACKAGE_PREFIX}-python-pillow>=9.0.1" "${MINGW_PACKAGE_PREFIX}-python-lazy-loader>=0.3") makedepends=( - "${MINGW_PACKAGE_PREFIX}-python-setuptools" - "${MINGW_PACKAGE_PREFIX}-python-wheel" "${MINGW_PACKAGE_PREFIX}-python-build" "${MINGW_PACKAGE_PREFIX}-python-installer" + "${MINGW_PACKAGE_PREFIX}-python-setuptools" + "${MINGW_PACKAGE_PREFIX}-python-wheel" "${MINGW_PACKAGE_PREFIX}-python-pythran" "${MINGW_PACKAGE_PREFIX}-cython" "${MINGW_PACKAGE_PREFIX}-meson-python" diff --git a/mingw-w64-python-scikit-learn/PKGBUILD b/mingw-w64-python-scikit-learn/PKGBUILD index 7591557ec5..56e32fd186 100644 --- a/mingw-w64-python-scikit-learn/PKGBUILD +++ b/mingw-w64-python-scikit-learn/PKGBUILD @@ -4,7 +4,7 @@ _realname=scikit-learn pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=1.5.1 -pkgrel=1 +pkgrel=2 pkgdesc="A set of python modules for machine learning and data mining (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64') diff --git a/mingw-w64-python-scipy/PKGBUILD b/mingw-w64-python-scipy/PKGBUILD index 4127a5cdad..d78f35e832 100644 --- a/mingw-w64-python-scipy/PKGBUILD +++ b/mingw-w64-python-scipy/PKGBUILD @@ -8,7 +8,7 @@ provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=1.14.0 -pkgrel=1 +pkgrel=2 pkgdesc="SciPy is open-source software for mathematics, science, and engineering (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64') diff --git a/mingw-w64-python-seaborn/PKGBUILD b/mingw-w64-python-seaborn/PKGBUILD index b5576087a9..59e005b05f 100644 --- a/mingw-w64-python-seaborn/PKGBUILD +++ b/mingw-w64-python-seaborn/PKGBUILD @@ -7,7 +7,7 @@ provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.13.2 -pkgrel=1 +pkgrel=2 pkgdesc="Statistical data visualization using matplotlib (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64') diff --git a/mingw-w64-python-shapely/PKGBUILD b/mingw-w64-python-shapely/PKGBUILD index cb80f3cc35..31ab297997 100644 --- a/mingw-w64-python-shapely/PKGBUILD +++ b/mingw-w64-python-shapely/PKGBUILD @@ -4,7 +4,7 @@ _realname=shapely pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=2.0.5 -pkgrel=1 +pkgrel=2 pkgdesc='Manipulation and analysis of geometric objects in the Cartesian plane (mingw-w64)' arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -13,7 +13,7 @@ msys2_repository_url='https://github.com/shapely/shapely' msys2_references=( 'pypi: shapely' ) -license=('BSD') +license=('spdx:BSD-3-Clause') depends=("${MINGW_PACKAGE_PREFIX}-geos" "${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-python-numpy") diff --git a/mingw-w64-python-similarity_measures/PKGBUILD b/mingw-w64-python-similarity_measures/PKGBUILD index 0aed5e48a4..b448ee65df 100644 --- a/mingw-w64-python-similarity_measures/PKGBUILD +++ b/mingw-w64-python-similarity_measures/PKGBUILD @@ -4,7 +4,7 @@ _realname=similarity_measures pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=1.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Quantify the difference between two arbitrary curves (mingw64)" arch=('any') mingw_arch=('mingw64' 'ucrt64') diff --git a/mingw-w64-python-soundfile/PKGBUILD b/mingw-w64-python-soundfile/PKGBUILD index bd99c41ae8..a85ec8d963 100644 --- a/mingw-w64-python-soundfile/PKGBUILD +++ b/mingw-w64-python-soundfile/PKGBUILD @@ -4,7 +4,7 @@ _realname=soundfile pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=0.12.1 -pkgrel=2 +pkgrel=3 pkgdesc='An audio library based on libsndfile, CFFI and NumPy (mingw-w64)' arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-python-statsmodels/PKGBUILD b/mingw-w64-python-statsmodels/PKGBUILD index 80a8fb95d9..6fc9d2310c 100644 --- a/mingw-w64-python-statsmodels/PKGBUILD +++ b/mingw-w64-python-statsmodels/PKGBUILD @@ -7,7 +7,7 @@ provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.14.2 -pkgrel=1 +pkgrel=2 pkgdesc="Statistical computations and models for use with SciPy (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64') diff --git a/mingw-w64-python-theano/PKGBUILD b/mingw-w64-python-theano/PKGBUILD index 8471a1be43..052ead6c27 100644 --- a/mingw-w64-python-theano/PKGBUILD +++ b/mingw-w64-python-theano/PKGBUILD @@ -8,7 +8,7 @@ provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=1.0.5 -pkgrel=5 +pkgrel=6 pkgdesc="Python library that allows you to define, optimize, and evaluate mathematical expressions involving multi-dimensional arrays efficiently (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64') @@ -21,8 +21,12 @@ depends=("${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-python-numpy" "${MINGW_PACKAGE_PREFIX}-python-scipy" "${MINGW_PACKAGE_PREFIX}-python-six") -makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools") +makedepends=("${MINGW_PACKAGE_PREFIX}-python-build" + "${MINGW_PACKAGE_PREFIX}-python-installer" + "${MINGW_PACKAGE_PREFIX}-python-setuptools" + "${MINGW_PACKAGE_PREFIX}-python-wheel") optdepends=("${MINGW_PACKAGE_PREFIX}-cc: Support to execute optimized C-implementations (for both CPU and GPU)") +options=(!strip) source=(https://pypi.org/packages/source/${_pyname::1}/${_pyname}/${_pyname}-${pkgver}.tar.gz 0001-cmodule-obtain-mingw-w64-python-library.patch 0002-not-use-np.distutils.__config__.blas_opt_info.patch) @@ -40,31 +44,25 @@ apply_patch_with_msg() { } prepare() { - cd "${srcdir}/${_pyname}-${pkgver}" + cd "${srcdir}"/${_pyname}-${pkgver} apply_patch_with_msg \ 0001-cmodule-obtain-mingw-w64-python-library.patch \ 0002-not-use-np.distutils.__config__.blas_opt_info.patch - - cd "${srcdir}" - rm -rf "python-build-${MSYSTEM}" | true - cp -r "${_pyname}-${pkgver}" "python-build-${MSYSTEM}" } build() { - cd "${srcdir}/python-build-${MSYSTEM}" - ${MINGW_PREFIX}/bin/python setup.py --quiet build + cp -r "${_pyname}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}" + + ${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation } + package() { - local _mingw_prefix=$(cygpath -am ${MINGW_PREFIX}) + cd "${srcdir}"/python-build-${MSYSTEM} - cd "${srcdir}/python-build-${MSYSTEM}" - MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ - ${MINGW_PREFIX}/bin/python setup.py --quiet install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1 --skip-build + MSYS2_ARG_CONV_EXCL="--prefix=" \ + ${MINGW_PREFIX}/bin/python -m installer --prefix=${MINGW_PREFIX} \ + --destdir="${pkgdir}" dist/*.whl - for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*-script.py; do - sed -e '1 { s/^#!.*$// }' -i ${_f} - done - - install -Dm644 doc/LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE" + install -Dm644 doc/LICENSE.txt "${pkgdir}"${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE } diff --git a/mingw-w64-python-tifffile/PKGBUILD b/mingw-w64-python-tifffile/PKGBUILD index 98e145a08a..880d312952 100644 --- a/mingw-w64-python-tifffile/PKGBUILD +++ b/mingw-w64-python-tifffile/PKGBUILD @@ -5,7 +5,7 @@ _realname=tifffile pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=2024.7.24 -pkgrel=1 +pkgrel=2 pkgdesc="Read and write image data from and to TIFF files (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -22,10 +22,10 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python-build" "${MINGW_PACKAGE_PREFIX}-python-setuptools" "${MINGW_PACKAGE_PREFIX}-python-wheel") checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest") -options=('!strip') optdepends=("${MINGW_PACKAGE_PREFIX}-python-imagecodecs: required only for encoding or decoding LZW, JPEG, etc." "${MINGW_PACKAGE_PREFIX}-python-matplotlib: required only for plotting" "${MINGW_PACKAGE_PREFIX}-python-lxml: required only for validating and printing XML") +options=('!strip') source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz") sha256sums=('723456ebf2b4918878ae05a7b50fa366ff3b3a686293317eb7a0f294c3eea050') diff --git a/mingw-w64-python-trimesh/PKGBUILD b/mingw-w64-python-trimesh/PKGBUILD index dd8ff3cb32..cbf1263f4e 100644 --- a/mingw-w64-python-trimesh/PKGBUILD +++ b/mingw-w64-python-trimesh/PKGBUILD @@ -4,7 +4,7 @@ _realname=trimesh pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=4.4.3 -pkgrel=1 +pkgrel=2 pkgdesc='Import, export, process, analyze and view triangular meshes. (mingw-w64)' arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-python-umap-learn/PKGBUILD b/mingw-w64-python-umap-learn/PKGBUILD index 074ce167a1..c7e28c7ef5 100644 --- a/mingw-w64-python-umap-learn/PKGBUILD +++ b/mingw-w64-python-umap-learn/PKGBUILD @@ -4,7 +4,7 @@ _realname=umap-learn pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=0.5.6 -pkgrel=1 +pkgrel=2 pkgdesc='Uniform Manifold Approximation and Projection (mingw-w64)' arch=('any') mingw_arch=('mingw64' 'ucrt64') @@ -14,6 +14,7 @@ msys2_references=( url="https://github.com/lmcinnes/umap" license=('spdx:BSD-3-Clause') depends=( + "${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-python-numpy" "${MINGW_PACKAGE_PREFIX}-python-scipy" "${MINGW_PACKAGE_PREFIX}-python-scikit-learn" diff --git a/mingw-w64-python-wordcloud/PKGBUILD b/mingw-w64-python-wordcloud/PKGBUILD index 8ee4a8be42..21c8160a08 100644 --- a/mingw-w64-python-wordcloud/PKGBUILD +++ b/mingw-w64-python-wordcloud/PKGBUILD @@ -4,7 +4,7 @@ _realname=wordcloud pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=1.9.3 -pkgrel=2 +pkgrel=3 pkgdesc='A little word cloud generator in Python (mingw-w64)' arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-spglib/PKGBUILD b/mingw-w64-spglib/PKGBUILD index 6f3b1b6b6a..4fb21055ab 100644 --- a/mingw-w64-spglib/PKGBUILD +++ b/mingw-w64-spglib/PKGBUILD @@ -4,7 +4,7 @@ _realname=spglib pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=2.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="C library for finding and handling crystal symmetries (mingw-w64)" arch=('any') mingw_arch=('ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-trilinos/PKGBUILD b/mingw-w64-trilinos/PKGBUILD index ac9b60296f..a6c2175ebe 100644 --- a/mingw-w64-trilinos/PKGBUILD +++ b/mingw-w64-trilinos/PKGBUILD @@ -10,7 +10,7 @@ pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=16.0.0 _pkgver=${pkgver//./-} -pkgrel=1 +pkgrel=2 pkgdesc='Algorithms for the solution of large-scale scientific problems" (mingw-w64)' arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64') @@ -24,10 +24,11 @@ depends=("${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-matio" "${MINGW_PACKAGE_PREFIX}-hdf5" "${MINGW_PACKAGE_PREFIX}-msmpi") -makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" +makedepends=("${MINGW_PACKAGE_PREFIX}-cc" + "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" - "${MINGW_PACKAGE_PREFIX}-perl" "${MINGW_PACKAGE_PREFIX}-fc" + "${MINGW_PACKAGE_PREFIX}-perl" "${MINGW_PACKAGE_PREFIX}-bc" "${MINGW_PACKAGE_PREFIX}-python-numpy" "unzip") diff --git a/mingw-w64-vigra/PKGBUILD b/mingw-w64-vigra/PKGBUILD index a48d93af8e..42882b97ee 100644 --- a/mingw-w64-vigra/PKGBUILD +++ b/mingw-w64-vigra/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.11.1 _pkgver=${pkgver//./-} -pkgrel=13 +pkgrel=14 pkgdesc="vigra - Generic Programming for Computer Vision (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64') @@ -26,7 +26,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-doxygen" "${MINGW_PACKAGE_PREFIX}-python-nose" "${MINGW_PACKAGE_PREFIX}-python-sphinx") -source=(${_realname}-${pkgver}.tar.gz::https://github.com/ukoethe/vigra/releases/download/Version-${_pkgver}/${_realname}-${pkgver}-src.tar.gz +source=(https://github.com/ukoethe/vigra/releases/download/Version-${_pkgver}/${_realname}-${pkgver}-src.tar.gz 0001-vigra-numpy-detection.patch 0002-doc-destination.patch 0003-vigra-cmath-std-namespace.patch @@ -74,7 +74,6 @@ prepare() { } build() { - [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}" mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM} declare -a extra_config @@ -113,5 +112,6 @@ package() { sed -e "s|${MINGW_PREFIX}|\$\{_IMPORT_PREFIX\}|g" -i ${_f} done - install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE.txt" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE.txt" + install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE.txt" \ + "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE.txt" } diff --git a/mingw-w64-wxPython/PKGBUILD b/mingw-w64-wxPython/PKGBUILD index fe872c8282..d822d9092e 100644 --- a/mingw-w64-wxPython/PKGBUILD +++ b/mingw-w64-wxPython/PKGBUILD @@ -7,7 +7,7 @@ _realname=wxPython pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=4.2.1 -pkgrel=3 +pkgrel=4 pkgdesc="A wxWidgets GUI toolkit for Python (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -130,5 +130,5 @@ package() { sed -e '1 { s/^#!.*$// }' -i ${_f} done - install -vDm 644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/$_realname/LICENSE.txt" + install -vDm 644 LICENSE.txt "${pkgdir}"${MINGW_PREFIX}/share/licenses/$_realname/LICENSE.txt }