From nobody Sat Jun 25 20:19:34 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A802086F4EE; Sat, 25 Jun 2022 20:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LVlhQ4LWbz3mcC; Sat, 25 Jun 2022 20:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656188374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PyIt0O47qPx98kVBEVBtKJHeyVEKYiYPIzE8mdJtYEA=; b=um5/Lxj/Df9QAjOfApEo7SR7Jm0sO/7ZC65iEbfxJ19wICpii2prKy3wVvon+hVrr2aEXG E3I2kPPrKB78yf6zLC/U6DARWaHlz59RAKclvDDN/yUr4gqg5y87EFKakzqigBjiOKecP6 EZHDWKIaOOcsOB+SzTnqOhYlqWZd6iLk3OXKidsY3wJ5j613Q1Kegw8I6wu79YKk9dwWOr VCT7Wfta/Qc6TD3zsesMNM9E76GeR3fICSHimXuCKlcodIkuejUVwfBQI9ibP6cat+9pY2 8VmKgjVKnE2QYYrs3G0hXknaikhzeWTvqG4h/G0kISdkNDz8UJ75ZBb7AGn6Kw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7507133AB; Sat, 25 Jun 2022 20:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25PKJYAo099267; Sat, 25 Jun 2022 20:19:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25PKJYGl099266; Sat, 25 Jun 2022 20:19:34 GMT (envelope-from git) Date: Sat, 25 Jun 2022 20:19:34 GMT Message-Id: <202206252019.25PKJYGl099266@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 56f689af8ef6 - main - devel/py-backports.zoneinfo: unbreak build with py310+ (+) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56f689af8ef6afc1b39c764256031d7f12263366 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656188374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PyIt0O47qPx98kVBEVBtKJHeyVEKYiYPIzE8mdJtYEA=; b=dOgs4LN99I49KIa6Sa9Z25fNw6gFwSSZxu+HpaDPrSScXeiUMPB/RK/joAmFUV3Is8Ueml hcWYdGGQbL0vsUWlmX4MALOpT68tYG1/eXGWgpCZbIYNKuXaY+G6zARrzIU1WOsk0wKidL /r35aq3h3nXPMCcEtmoKjfp7kYicP0+SXVxXah4cS1ac6BBo1vMvewIiVXwwMvaCH8nkXh qKro6erthLCSkVF2mRZzfyBQoL4qM8CzdkEeAO3zL78UxeS89CnpQ0nsWENDyLNvqmKvIE QZCcFP4UGFMAMpyTt5koxo/HN1E4S3BVZtR3x17C6YBzQ8HtL3OWNsLPMcHCsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656188374; a=rsa-sha256; cv=none; b=ALziE9rbCTL7+atwr/D5dNOxhEailm47oQ19ymNfQGAbp/tZrb+yyEhhyv8h240d7KwrBZ UhXNRz0+q0KQbJ7YTLr8LHP2ryBw3D3Tugq1OiMQpMQmqT7w0JBnQq5pyH1dgi4/KMO2Hl VaXCX6ic70WRzq4pRiRKqKvXLehxfNPIHJMXnr3go/G1QY/qPOTBrA0rrc6hNhWS4odDUe jxDaxRrNSnuI+I7gVD/eg5lkbrpXKSAQ4sS5fOfEGZFs/ETYJVIAVZ4lpswyPaZolubTbp C57mEQGFWqu96WnR4ck8Gxn63UaksXuf7IMw9VJ6n37AQXmkGZWVGZZVNnfrxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=56f689af8ef6afc1b39c764256031d7f12263366 commit 56f689af8ef6afc1b39c764256031d7f12263366 Author: Dima Panov AuthorDate: 2022-06-25 20:15:34 +0000 Commit: Dima Panov CommitDate: 2022-06-25 20:15:34 +0000 devel/py-backports.zoneinfo: unbreak build with py310+ (+) We already have Python 3.7 as minimal supported release, so force #ifdef's for 3.7+ API as always positive to prevent use deprecated types While here, port upstream patch for MR#97 (https://github.com/pganssle/zoneinfo/pull/97) "Decrement the refcount of _PyLong_One in the correct branch" --- devel/py-backports.zoneinfo/Makefile | 5 ++++- .../py-backports.zoneinfo/files/patch-lib_zoneinfo__module.c | 11 +++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/devel/py-backports.zoneinfo/Makefile b/devel/py-backports.zoneinfo/Makefile index dc2706066f88..ce0138c1569b 100644 --- a/devel/py-backports.zoneinfo/Makefile +++ b/devel/py-backports.zoneinfo/Makefile @@ -1,5 +1,6 @@ PORTNAME= backports.zoneinfo DISTVERSION= 0.2.1 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -10,7 +11,9 @@ COMMENT= Backport of the standard library module zoneinfo LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= python:3.7-3.9 +USES= python:3.7+ USE_PYTHON= autoplist concurrent distutils +# We already have Python 3.7 as minimal supported release, force positive checks +CFLAGS+= -DATLEAST_37 .include diff --git a/devel/py-backports.zoneinfo/files/patch-lib_zoneinfo__module.c b/devel/py-backports.zoneinfo/files/patch-lib_zoneinfo__module.c new file mode 100644 index 000000000000..876f36c8a3ab --- /dev/null +++ b/devel/py-backports.zoneinfo/files/patch-lib_zoneinfo__module.c @@ -0,0 +1,11 @@ +--- lib/zoneinfo_module.c.orig 2020-06-23 13:47:53 UTC ++++ lib/zoneinfo_module.c +@@ -617,7 +617,7 @@ zoneinfo_fromutc(PyObject *obj_self, PyObject *dt) + Py_DECREF(args); + Py_DECREF(kwargs); + Py_DECREF(replace); +-#ifndef ATLEAST_37 ++#ifdef ATLEAST_37 + Py_DECREF(one); + #endif +