diff --git a/srcpkgs/python3-scikit-image/patches/meson-cross.patch b/srcpkgs/python3-scikit-image/patches/meson-cross.patch deleted file mode 100644 index 8807a612f66..00000000000 --- a/srcpkgs/python3-scikit-image/patches/meson-cross.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 8789a3365282a4f5604e090a10c960e710d240b9 Mon Sep 17 00:00:00 2001 -From: "Andrew J. Hesford" -Date: Tue, 6 Jun 2023 10:05:25 -0400 -Subject: [PATCH] meson: allow proper selection of NumPy, Pythran in cross - builds - ---- - skimage/meson.build | 62 +++++++++++++++++++++++++++------------------ - 1 file changed, 38 insertions(+), 24 deletions(-) - -diff --git a/skimage/meson.build b/skimage/meson.build -index 28c831312..c168389d7 100644 ---- a/skimage/meson.build -+++ b/skimage/meson.build -@@ -29,37 +29,51 @@ if is_windows - endif - endif - --# NumPy include directory - needed in all submodules --incdir_numpy = run_command(py3, -- [ -- '-c', -- 'import os; os.chdir(".."); import numpy; print(numpy.get_include())' -- ], -- check: true --).stdout().strip() -+# Both NumPy and Pythran require header files that may differ between the build -+# system and the host system in a cross-compilation environment. To accommodate -+# these cases, we can query user-defined properties that can be specified in -+# the 'properties' section of a Meson cross file: -+# -+# [properties] -+# numpy-include-dir = '/path/to/numpy/includes' -+# pythran-include-dir = '/path/to/pythran/includes' -+# -+# In the absence of explicitly configured paths, just run the build Python and -+# try to query the Python packages for their paths directly. -+ -+# NumPy include directory -+incdir_numpy = meson.get_external_property('numpy-include-dir', 'not-given') -+if incdir_numpy == 'not-given' -+ # If not specified, try to query NumPy from the build python -+ incdir_numpy = run_command(py3, -+ [ -+ '-c', -+ 'import os; os.chdir(".."); import numpy; print(numpy.get_include())' -+ ], -+ check: true -+ ).stdout().strip() -+endif - - inc_np = include_directories(incdir_numpy) - - cc = meson.get_compiler('c') - --# Pythran include directory and build flags --use_pythran = run_command(py3, -- [ -- '-c', -- 'import os; print(os.environ.get("SCIPY_USE_PYTHRAN", 1))' -- ], -- check: true --).stdout().strip() == '1' -- --incdir_pythran = run_command(py3, -- [ -- '-c', -- 'import os; os.chdir(".."); import pythran; print(os.path.dirname(pythran.__file__));' -- ], -- check: true --).stdout().strip() -+# Pythran include directory -+incdir_pythran = meson.get_external_property('pythran-include-dir', 'not-given') -+if incdir_pythran == 'not-given' -+ # If not specified, try to query Pythran from the build python -+ incdir_pythran = run_command(py3, -+ [ -+ '-c', -+ 'import os; os.chdir(".."); import pythran; print(os.path.dirname(pythran.__file__));' -+ ], -+ check: true -+ ).stdout().strip() -+endif -+ - inc_pythran = include_directories(incdir_pythran) - -+# Pythran build flags - cpp_args_pythran = [ - '-DENABLE_PYTHON_MODULE', - '-D__PYTHRAN__=3', --- -2.41.0 - diff --git a/srcpkgs/python3-scikit-image/patches/numpy-version.patch b/srcpkgs/python3-scikit-image/patches/numpy-version.patch deleted file mode 100644 index 9d3a96588ed..00000000000 --- a/srcpkgs/python3-scikit-image/patches/numpy-version.patch +++ /dev/null @@ -1,14 +0,0 @@ -There doesn't seem to be a valid reason for this restriction, and it doesn't -impede building anyway. - ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -145,7 +145,7 @@ - "numpy==1.21.1; python_version=='3.8' and platform_python_implementation != 'PyPy'", - "numpy==1.21.1; python_version=='3.9' and platform_python_implementation != 'PyPy'", - "numpy==1.21.6; python_version=='3.10' and platform_system != 'Windows' and platform_python_implementation != 'PyPy'", -- "numpy==1.23.3; python_version=='3.11' and platform_python_implementation != 'PyPy'", -+ "numpy>=1.23.3; python_version=='3.11' and platform_python_implementation != 'PyPy'", - "numpy; python_version>='3.12'", - "numpy; python_version>='3.8' and platform_python_implementation=='PyPy'", - ] diff --git a/srcpkgs/python3-scikit-image/template b/srcpkgs/python3-scikit-image/template index 964d55adfde..d9a1223aa57 100644 --- a/srcpkgs/python3-scikit-image/template +++ b/srcpkgs/python3-scikit-image/template @@ -1,7 +1,7 @@ # Template file for 'python3-scikit-image' pkgname=python3-scikit-image -version=0.21.0 -revision=2 +version=0.22.0 +revision=1 build_style=python3-pep517 build_helper="meson numpy" hostmakedepends="python3-build python3-installer python3-meson-python @@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford " license="BSD-3-Clause, MIT" homepage="https://scikit-image.org/" distfiles="https://github.com/scikit-image/scikit-image/archive/v${version}.tar.gz" -checksum=53a82a9dbd3ed608d2ad3876269a271a7e922b12e228388eac996b508aadd652 +checksum=2875c81ffb224f9f25a1274734b502fb993cc729a2c790009d38035e52e6a123 # Tests require data files and unpackaged dependencies make_check=no