[packages/maturin] Up to 1.8.6

[arekm]

commit a6e508093d0edadf201eb79e64332343a7317125
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun May 18 23:59:01 2025 +0200

    Up to 1.8.6

 maturin.spec | 21 ++++++++++++---------
 x32.patch    | 10 +++++-----
 2 files changed, 17 insertions(+), 14 deletions(-)
---
diff --git a/maturin.spec b/maturin.spec
index dda1b43..2dc8e7d 100644
--- a/maturin.spec
+++ b/maturin.spec
@@ -1,27 +1,29 @@
 %bcond_without	python3
 
 %define		module		maturin
-%define		crates_ver	1.8.2
+%define		crates_ver	1.8.6
 
 Summary:	Build and publish rust crates as python packages
 Name:		maturin
-Version:	1.8.2
+Version:	1.8.6
 Release:	1
 License:	MIT or Apache v2.0
 Group:		Applications
 Source0:	https://github.com/PyO3/maturin/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	762eaadba0e0a250a30892c8d17c32a2
+# Source0-md5:	6580b7095788035ac526550c5e179d50
 # ./create-crates.sh
 Source1:	%{name}-crates-%{crates_ver}.tar.xz
-# Source1-md5:	c15d367a752fc0c9997eb4c6a95f7df5
+# Source1-md5:	760b984b0a30a1cd7b47c189255f639c
 Patch0:		x32.patch
 URL:		https://github.com/PyO3/maturin
 BuildRequires:	cargo
 BuildRequires:	rpmbuild(macros) >= 2.004
 BuildRequires:	rust
 %if %{with python3}
+BuildRequires:	python3-build
+BuildRequires:	python3-installer
 BuildRequires:	python3-modules >= 1:3.2
-BuildRequires:	python3-setuptools_rust >= 1.0
+BuildRequires:	python3-setuptools_rust >= 1.11.0
 %endif
 ExclusiveArch:	%{rust_arches}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -46,7 +48,7 @@ Maturin bindings for Python.
 sed -i -e 's/@@VERSION@@/%{version}/' Cargo.lock
 
 old_sum=$(sha256sum vendor/ring/src/cpu/intel.rs|cut -f1 -d' ')
-%patch -P0 -p0
+%patch -P0 -p1
 new_sum=$(sha256sum vendor/ring/src/cpu/intel.rs|cut -f1 -d' ')
 test "$old_sum" != "$new_sum"
 %{__sed} -i -e "s/$old_sum/$new_sum/" vendor/ring/.cargo-checksum.json
@@ -72,7 +74,7 @@ export CARGO_HOME="$(pwd)/.cargo"
 %if %{with python3}
 export RUSTFLAGS="%{rpmrustflags}"
 export MATURIN_SETUP_ARGS="%__cargo_common_opts --target %rust_target --target-dir %cargo_targetdir"
-%py3_build
+%py3_build_pyproject
 %endif
 
 %install
@@ -84,7 +86,8 @@ export CARGO_HOME="$(pwd)/.cargo"
 %if %{with python3}
 export RUSTFLAGS="%{rpmrustflags}"
 export MATURIN_SETUP_ARGS="%__cargo_common_opts --target %rust_target --target-dir %cargo_targetdir"
-%py3_install
+rm $RPM_BUILD_ROOT%{_bindir}/maturin
+%py3_install_pyproject
 %endif
 
 %clean
@@ -99,5 +102,5 @@ rm -rf $RPM_BUILD_ROOT
 %files -n python3-%{module}
 %defattr(644,root,root,755)
 %{py3_sitedir}/%{module}
-%{py3_sitedir}/%{module}-%{version}-py*.egg-info
+%{py3_sitedir}/%{module}-%{version}.dist-info
 %endif
diff --git a/x32.patch b/x32.patch
index e519084..a90f645 100644
--- a/x32.patch
+++ b/x32.patch
@@ -1,6 +1,6 @@
---- vendor/ring/src/cpu/intel.rs.orig	2025-03-03 10:19:43.000000000 +0100
-+++ vendor/ring/src/cpu/intel.rs	2025-03-16 01:30:12.911412520 +0100
-@@ -27,9 +27,9 @@
+--- maturin-1.8.6/vendor/ring/src/cpu/intel.rs~	2025-05-18 23:33:31.000000000 +0200
++++ maturin-1.8.6/vendor/ring/src/cpu/intel.rs	2025-05-18 23:35:17.330970855 +0200
+@@ -25,9 +25,9 @@ mod abi_assumptions {
      const _ASSUMES_SSE2: () =
          assert!(cfg!(target_feature = "sse") && cfg!(target_feature = "sse2"));
  
@@ -10,5 +10,5 @@
 -    #[cfg(target_arch = "x86")]
 +    #[cfg(any(target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "32")))]
      const _ASSUMED_POINTER_SIZE: usize = 4;
-     const _ASSUMED_USIZE_SIZE: () = assert!(core::mem::size_of::<usize>() == _ASSUMED_POINTER_SIZE);
-     const _ASSUMED_REF_SIZE: () =
+     const _ASSUMED_USIZE_SIZE: () = assert!(size_of::<usize>() == _ASSUMED_POINTER_SIZE);
+     const _ASSUMED_REF_SIZE: () = assert!(size_of::<&'static u8>() == _ASSUMED_POINTER_SIZE);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/maturin.git/commitdiff/a6e508093d0edadf201eb79e64332343a7317125