From nobody Thu Mar 03 20:51:10 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 DB7E619F123C; Thu, 3 Mar 2022 20:51:10 +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 4K8jnV5K9Mz3PRV; Thu, 3 Mar 2022 20:51:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646340670; 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=qfXTLP3e4wuePu1tWL45WwrWVe4loyjywKXbOXZbc2E=; b=C10UbG7dAnrbRjZnsVvGzr9Fkf7x1MhDE2c7DCG+uvqgehn4TRP0jD86v4mb4WfAtxXzyY McQSNMN2MXiAwDVvH+ueasQFPAdO2kaekxsDuAjSw/mXJTqDKOT9J00EaOdbRdrhuNOA3c uZ0pyTRhBWYs/Z1wyV/Cx6SGN3ATBzV102ooGSi2lpPkNmwwZ+0C5kRE7r9afUKsHgey+3 7RqRTTecoEOMXRIG9nrACbMVAKscoSwkCRSbzi4z3jgESghBqqCLA9sJYbhrcR4vfmlK1z L4g60HyNGdgx3pfSdLhk5wwwFaDsaC30KT5kT8T19F19We+5WGkK09n6D6oYrw== 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 96ABC1EB52; Thu, 3 Mar 2022 20:51:10 +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 223KpACe026351; Thu, 3 Mar 2022 20:51:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 223KpAOJ026350; Thu, 3 Mar 2022 20:51:10 GMT (envelope-from git) Date: Thu, 3 Mar 2022 20:51:10 GMT Message-Id: <202203032051.223KpAOJ026350@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 03f7dd327e77 - main - math/py-levmar: fix build with Python > 3.8 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: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 03f7dd327e77ece810122edab088f1d778dbb2ef Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646340670; 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=qfXTLP3e4wuePu1tWL45WwrWVe4loyjywKXbOXZbc2E=; b=NVWR91PYwnKqK33N8Hy5M4JfKOZLxLOa9yqeQqFBqpB4EyCKQXptg/EbH6sYldUji+MdKT 7uKCF1ASqqT/bJ2o+U2IczTpszm0/LKzAEJTFCZ39QQvfql2Qvq1EpSXbD0MtVAnjA+MIl U1GcNdjmiE6xVxVVSSm6iu/EW+MocKDCArHzO2t0r8lboJrYxWc+HHPydqsAXpG4YPMnuZ HNvzUqODYG5CieTZ2alMegdSxXYRKQZZurRZ1fg7sGuDdl1N6zfT8pJCqEj2hg09ifR7Nm 39FgFCQrYixI11G/HgGLwdWuvbvZ1ATFaG39mJf0U5ybSmH7paLASV0eeMX9LA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646340670; a=rsa-sha256; cv=none; b=nY7bVi+P97NFY4fMpPTNY/s4H4Vg8w5VjRBTPI96BdvtCPj878u7CyxWgwyv3ECiUYQfuv cPADOdvxYV7zLGDQO9Z+XwxrpqaDzh0qp1qiQiiZtt/EYDVSMYmtiExV3Nt/0au59LDdL6 hGwQTvcuJaZnu/ErM4qvQgNpxg9ySpAkY4h9Q4ANTUeUWprEX2oJP8lDOb9wQhKu9X6ZyE GG4QXzaBjuU91OzRS8YdH2mkanbftESfeFG8K3tPSifLpCbXt3TO+/uJTeJJLHN/rHmwxo 19SkHfiiLu8p26q+GY1YaGdyLo2B+MAJ9IUe4ZWw6+0VjHEltYjqirqmaIEHqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=03f7dd327e77ece810122edab088f1d778dbb2ef commit 03f7dd327e77ece810122edab088f1d778dbb2ef Author: Thierry Thomas AuthorDate: 2022-03-03 19:11:30 +0000 Commit: Thierry Thomas CommitDate: 2022-03-03 20:51:02 +0000 math/py-levmar: fix build with Python > 3.8 tp_print is deprecated in Python-3.8, and it causes an error in 3.9. PR: 262325 Approved by: yuri (maintainer) --- math/py-levmar/files/patch-levmar___levmar.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/math/py-levmar/files/patch-levmar___levmar.c b/math/py-levmar/files/patch-levmar___levmar.c new file mode 100644 index 000000000000..d895157ceb43 --- /dev/null +++ b/math/py-levmar/files/patch-levmar___levmar.c @@ -0,0 +1,22 @@ +--- levmar/_levmar.c.orig 2019-10-23 16:15:35 UTC ++++ levmar/_levmar.c +@@ -15970,7 +15970,9 @@ static PyTypeObject __pyx_type_6levmar_7_levmar__LMFun + sizeof(struct __pyx_obj_6levmar_7_levmar__LMFunc), /*tp_basicsize*/ + 0, /*tp_itemsize*/ + __pyx_tp_dealloc_6levmar_7_levmar__LMFunc, /*tp_dealloc*/ ++#if PY_VERSION_HEX < 0x03090000 + 0, /*tp_print*/ ++#endif + 0, /*tp_getattr*/ + 0, /*tp_setattr*/ + #if PY_MAJOR_VERSION < 3 +@@ -17179,7 +17181,9 @@ static int __pyx_pymod_exec__levmar(PyObject *__pyx_py + __pyx_vtable_6levmar_7_levmar__LMFunc.eval_func = (void (*)(struct __pyx_obj_6levmar_7_levmar__LMFunc *, double *, double *, int, int))__pyx_f_6levmar_7_levmar_7_LMFunc_eval_func; + __pyx_vtable_6levmar_7_levmar__LMFunc.eval_jacf = (void (*)(struct __pyx_obj_6levmar_7_levmar__LMFunc *, double *, double *, int, int))__pyx_f_6levmar_7_levmar_7_LMFunc_eval_jacf; + if (PyType_Ready(&__pyx_type_6levmar_7_levmar__LMFunc) < 0) __PYX_ERR(0, 49, __pyx_L1_error) ++#if PY_VERSION_HEX < 0x03090000 + __pyx_type_6levmar_7_levmar__LMFunc.tp_print = 0; ++#endif + if (__Pyx_SetVtable(__pyx_type_6levmar_7_levmar__LMFunc.tp_dict, __pyx_vtabptr_6levmar_7_levmar__LMFunc) < 0) __PYX_ERR(0, 49, __pyx_L1_error) + if (PyObject_SetAttrString(__pyx_m, "_LMFunc", (PyObject *)&__pyx_type_6levmar_7_levmar__LMFunc) < 0) __PYX_ERR(0, 49, __pyx_L1_error) + if (__Pyx_setup_reduce((PyObject*)&__pyx_type_6levmar_7_levmar__LMFunc) < 0) __PYX_ERR(0, 49, __pyx_L1_error)