From nobody Wed Jun 5 09:08:11 2024 X-Original-To: dev-commits-ports-all@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 4VvM7c10y1z5MF8R; Wed, 05 Jun 2024 09:08:12 +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 4VvM7c0917z4Plg; Wed, 5 Jun 2024 09:08:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717578492; 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=ll1FlRcGJ3sNJDrsCLz7+V8Cy3913INtOkndMY4zTPQ=; b=gf8s7rpFrenXewofMBB4cIzU3pA6sAvdXnoOrhhd0ZC8MYjLJxIUruCtWPcm1riS7WJNSd 9JlFjXYS3SvIqlIxdRfjTJo1wX7SyFnzb9qALbM/sXkHcNlX7znMtp6CK8/75HWfrKFqXA qCZUpcJPvs4es03BRM0HM9odPFYNE6IPy1f/+p1wj0G2lk5gP3NRGp3xnwntcHDxeQw8Vq 7Cgmip1L1wYFzpeVbCihxKv6cWD0V17SKCFVpdgNFCyqMk4ZYXVi7Q16KG8RYxUpxwCQVe 8TujOGktL+fjNQpXMsmN4BpTAsELsrTiRdNQtbGZLZ67vZVVwqJ5RERb5JyvUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717578492; a=rsa-sha256; cv=none; b=YAPYIrYjBSVkOP5Q2WT1pOZM9Hcie/mSTf0EwbE3LLQlv94xRjAbedvK/I5mUNaEFgjbbR nOu8PpaGzlh9448UwrcN0JvTlJPiRMTPbjzEwMNHxz6s9oa3oNUAA0pXNgtNTAIiwtEpkP JWOVFjDgoqAweNaP8Jlb/tTW6lNgkHDMEhV7EgaM6AxI5e2PmeeYeFoo45MtzhngpI+Lak cuWabwJjD/+reG9a54fPWgbe0r6dsZPguD47RYNX6+mbMyyq4g904gweYaVxK2D43clIbt 9L4odw+PnjF+rnwPZJNLrUN9me+vy/WOZ17pgnWwQNeUyCf0Wf+elim17CaPVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717578492; 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=ll1FlRcGJ3sNJDrsCLz7+V8Cy3913INtOkndMY4zTPQ=; b=ZOYSj7Akute0YVffXIKS/7edUWxpjx2T1okOdkAMCTob8O5SVkk96cFeVvw0PKc7O2pnzg BlrR4CumGcrx6UZ8ZY2UeeLg7d6z9NOr0XzaZokBu9iQFq9psc9wTV0oSuN8af6FKwBHzJ 0to96u+dS9N7slL6QqmcfVWqwRBcsshqPzZ3SGpBnlgtnvyfhy5RJm4iNq7HIEiaLZg8MQ SMNQwE1V3CNagwkamceC//idvlprvgB/1RhCbcpSyiaW6tfzZhGWMQoN0q9SxhdlTnWEx0 UxOZ8nYeqEcsEsLai9EiYIXRVXzHgueoTQOflymdCfuBOQF4Aj6iOJ6d9voO4w== 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 4VvM7b6t3NzwlS; Wed, 5 Jun 2024 09:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45598BiJ094301; Wed, 5 Jun 2024 09:08:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45598B3x094298; Wed, 5 Jun 2024 09:08:11 GMT (envelope-from git) Date: Wed, 5 Jun 2024 09:08:11 GMT Message-Id: <202406050908.45598B3x094298@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Michael Gmelin Subject: git: 81a7884cfda6 - main - devel/py-ice: Unbreak build List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: grembo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81a7884cfda61d0c85e697b9dd5cfb37cebdf44f Auto-Submitted: auto-generated The branch main has been updated by grembo: URL: https://cgit.FreeBSD.org/ports/commit/?id=81a7884cfda61d0c85e697b9dd5cfb37cebdf44f commit 81a7884cfda61d0c85e697b9dd5cfb37cebdf44f Author: Michael Gmelin AuthorDate: 2024-06-05 09:06:09 +0000 Commit: Michael Gmelin CommitDate: 2024-06-05 09:06:09 +0000 devel/py-ice: Unbreak build --- devel/ice/files/patch-python_modules_IcePy_Slice.cpp | 15 +++++++++++++++ devel/ice/files/patch-python_modules_IcePy_Util.cpp | 14 ++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/devel/ice/files/patch-python_modules_IcePy_Slice.cpp b/devel/ice/files/patch-python_modules_IcePy_Slice.cpp new file mode 100644 index 000000000000..d82f370c2ef0 --- /dev/null +++ b/devel/ice/files/patch-python_modules_IcePy_Slice.cpp @@ -0,0 +1,15 @@ +--- python/modules/IcePy/Slice.cpp.orig 2024-06-05 08:43:42 UTC ++++ python/modules/IcePy/Slice.cpp +@@ -20,8 +20,12 @@ + // + // Python headers needed for PyEval_EvalCode. + // ++#if PY_VERSION_HEX >= 0x02050000 && PY_VERSION_HEX < 0x030B0000 + #include + #include ++#else ++#include ++#endif + + using namespace std; + using namespace IcePy; diff --git a/devel/ice/files/patch-python_modules_IcePy_Util.cpp b/devel/ice/files/patch-python_modules_IcePy_Util.cpp new file mode 100644 index 000000000000..9a97a1d06742 --- /dev/null +++ b/devel/ice/files/patch-python_modules_IcePy_Util.cpp @@ -0,0 +1,14 @@ +--- python/modules/IcePy/Util.cpp.orig 2024-06-05 08:44:17 UTC ++++ python/modules/IcePy/Util.cpp +@@ -214,7 +214,11 @@ IcePy::getFunction() + // + // Get name of current function. + // ++#if PY_VERSION_HEX >= 0x02050000 && PY_VERSION_HEX < 0x030B0000 + PyFrameObject *f = PyThreadState_GET()->frame; ++#else ++ PyFrameObject *f = PyThreadState_GetFrame(PyThreadState_GET()); ++#endif + PyObjectHandle code = PyObject_GetAttrString(reinterpret_cast(f), STRCAST("f_code")); + assert(code.get()); + PyObjectHandle func = PyObject_GetAttrString(code.get(), STRCAST("co_name"));