Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A960D84D08 for ; Wed, 27 Sep 2023 12:50:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id U989JBgn7K3Y for ; Wed, 27 Sep 2023 12:50:09 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id CEA0684E72 for ; Wed, 27 Sep 2023 12:50:08 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C070AFBDB; Wed, 27 Sep 2023 12:49:10 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1695818950271660" MIME-Version: 1.0 Date: Wed, 27 Sep 2023 12:49:10 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/devel/py-maturin To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20230927124910.C070AFBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1695818950271660 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Wed Sep 27 12:49:10 UTC 2023 Modified Files: pkgsrc/devel/py-maturin: Makefile distinfo pkgsrc/devel/py-maturin/patches: patch-src_build__context.rs Log Message: py-maturin: update to 1.2.3nb2. Fix wheel name on macOS>=11 using upstream patch. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/py-maturin/Makefile \ pkgsrc/devel/py-maturin/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/devel/py-maturin/patches/patch-src_build__context.rs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1695818950271660 Content-Disposition: inline Content-Length: 3523 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/py-maturin/Makefile diff -u pkgsrc/devel/py-maturin/Makefile:1.13 pkgsrc/devel/py-maturin/Makefile:1.14 --- pkgsrc/devel/py-maturin/Makefile:1.13 Sat Aug 26 18:20:32 2023 +++ pkgsrc/devel/py-maturin/Makefile Wed Sep 27 12:49:10 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2023/08/26 18:20:32 tnn Exp $ +# $NetBSD: Makefile,v 1.14 2023/09/27 12:49:10 wiz Exp $ DISTNAME= maturin-1.2.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=m/maturin/} Index: pkgsrc/devel/py-maturin/distinfo diff -u pkgsrc/devel/py-maturin/distinfo:1.13 pkgsrc/devel/py-maturin/distinfo:1.14 --- pkgsrc/devel/py-maturin/distinfo:1.13 Sat Aug 26 18:20:32 2023 +++ pkgsrc/devel/py-maturin/distinfo Wed Sep 27 12:49:10 2023 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2023/08/26 18:20:32 tnn Exp $ +$NetBSD: distinfo,v 1.14 2023/09/27 12:49:10 wiz Exp $ BLAKE2s (adler-1.0.2.crate) = f263779d752af886455fc0f42c997893fb1a09edcf1bd2980605251c2e3602aa SHA512 (adler-1.0.2.crate) = 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1 @@ -871,4 +871,4 @@ BLAKE2s (zip-0.6.6.crate) = 15924ef38e25 SHA512 (zip-0.6.6.crate) = affd46c17ceaa0545a155250dfd16756f8706dda43bae8a322ec0481dbfb41e4cf3166bf9662fc139ef9d0ab3b0f9f158535b21d2a61b21d38b8b2407813eeef Size (zip-0.6.6.crate) = 65789 bytes SHA1 (patch-maturin_____init____.py) = 6e6dc8976125b25e3bfefda0542139e87989ccf2 -SHA1 (patch-src_build__context.rs) = c85ba6c62a66064bdafa3e2234d903581749faf9 +SHA1 (patch-src_build__context.rs) = 8644aaa72f0f7ea3e98efc4c9a102c8b7e6e8af0 Index: pkgsrc/devel/py-maturin/patches/patch-src_build__context.rs diff -u pkgsrc/devel/py-maturin/patches/patch-src_build__context.rs:1.1 pkgsrc/devel/py-maturin/patches/patch-src_build__context.rs:1.2 --- pkgsrc/devel/py-maturin/patches/patch-src_build__context.rs:1.1 Sat Aug 26 18:20:32 2023 +++ pkgsrc/devel/py-maturin/patches/patch-src_build__context.rs Wed Sep 27 12:49:10 2023 @@ -1,7 +1,10 @@ -$NetBSD: patch-src_build__context.rs,v 1.1 2023/08/26 18:20:32 tnn Exp $ +$NetBSD: patch-src_build__context.rs,v 1.2 2023/09/27 12:49:10 wiz Exp $ Fix wrong python wheel tag on NetBSD/evbarm. +Fix wrong python wheel tag on macOS. +https://github.com/PyO3/maturin/pull/1778 + --- src/build_context.rs.orig 2023-08-17 05:08:34.000000000 +0000 +++ src/build_context.rs @@ -557,6 +557,17 @@ impl BuildContext { @@ -22,3 +25,35 @@ Fix wrong python wheel tag on NetBSD/evb // FreeBSD (Os::FreeBsd, _) // NetBSD +@@ -1150,7 +1161,21 @@ fn macosx_deployment_target( + arm64_ver = (major, minor); + } + } +- Ok((x86_64_ver, arm64_ver)) ++ Ok(( ++ python_macosx_target_version(x86_64_ver), ++ python_macosx_target_version(arm64_ver), ++ )) ++} ++ ++#[inline] ++fn python_macosx_target_version(version: (u16, u16)) -> (u16, u16) { ++ let (major, minor) = version; ++ if major >= 11 { ++ // pip only supports (major, 0) for macOS 11+ ++ (major, 0) ++ } else { ++ (major, minor) ++ } + } + + pub(crate) fn rustc_macosx_target_version(target: &str) -> (u16, u16) { +@@ -1277,7 +1302,7 @@ mod test { + ); + assert_eq!( + macosx_deployment_target(Some("11.1"), false).unwrap(), +- ((11, 1), (11, 1)) ++ ((11, 0), (11, 0)) + ); + } + } --_----------=_1695818950271660--