From nobody Sun Mar 13 15:54:25 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 55CCD1A019D0; Sun, 13 Mar 2022 15:54:25 +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 4KGkkT20fsz3hMg; Sun, 13 Mar 2022 15:54:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647186865; 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=27Q8qHdkLMAwZmq00QVkeloDdHwFjtfS5mf39S2nsvE=; b=GK1aNBiPp6O952KSQQUQQM1UkE7ABNv6aaAHBz+g63MxTRQVaAyQ4A0y8WFjFk3KIyJ1wM B85BMi89kbESAJqlcABGdSnpSpcmaVYmlet2nZO7cVSg1wwR/Ja1WQG1Db+TuZXZklP8T1 VTnm3TPxksDoFwGmyWFbpsm9EBmSF6p5uZolR7jyJ6+6YdfdHs5XAv3WGedAJaMcmQqDSC 7Aq399TMZvWL5v4cDonrAfu3o4Bv/TNtfGvrIIWUen068ZntG+EDHInfbMCTABdeCodvWa 0ZulEWAHX+57AWIkYhcBPHUVokks2s9U4HPmqnaxt8RmxKYk7qPUdCkO82lsoA== 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 259011C0BE; Sun, 13 Mar 2022 15:54:25 +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 22DFsP2j009506; Sun, 13 Mar 2022 15:54:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22DFsPkH009505; Sun, 13 Mar 2022 15:54:25 GMT (envelope-from git) Date: Sun, 13 Mar 2022 15:54:25 GMT Message-Id: <202203131554.22DFsPkH009505@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: 2c5f553246da - main - devel/py-qt5-sip: Fix build with py311 (+) 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: 2c5f553246da9e7143ac05f3411c9f61ac1e0440 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647186865; 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=27Q8qHdkLMAwZmq00QVkeloDdHwFjtfS5mf39S2nsvE=; b=oqVHmFAxTwc6qbmj1sDjlOBahkbgPiS+sE4yVIOrl3rfmYGQPby680DROBEm3pRmcO1PT1 OT/8ccJXkLdFyw28ZwIBWue6omoU5aiTL5Mp1UcNk0wmdHonf0K+S7123ZjeowMY4+mBgD Fg0tkHVc41ifp//DZLTxrUK+blc1fHYRvdYUvwAOg/tQadjkeHbtyYdzswYnyepNFreWth +jeVtuRE7277ZisGM9X8HkSxqEHAg6uvxmTV1/ohuGVLI25MC30izftQQRTRYKv2K5aI7b 2uUdWJ0ZBrYd6IUdLnq9diBucModZ5yhp50RB9we1qs6j2hipXH1djYGjVR6fA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647186865; a=rsa-sha256; cv=none; b=PJcRs4/t74TNAo0BXXHhQntGNm181VvEHMISw35SxgiNCpnP8V3VRIwHFMt6i8rZj/6WjU /k2uSZlQ5AsGWi/lIIgBsmQs+3iQ1EYSBeDh57UP6SczxmjgV9OLUJNaTfVjNafgojjoF2 pOHASo7rq8DDYEgPPaNsIeeF2L32EU+zCM9U0PvNXonjJJ569+L1/K6CIFUfD3wxMJeAqL iYYkzO8mMqxiil+LGiopnPm6U70KMWPIUj8tAFLfhB2o1mDmiWNVMMWxvvgEBNO9hGoSF3 LljBsMBIhhqx2iTbTMcSTAZa5HWAMslf6J/l3zXhLMz7tgwEvebtTbFrxuKW3Q== 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=2c5f553246da9e7143ac05f3411c9f61ac1e0440 commit 2c5f553246da9e7143ac05f3411c9f61ac1e0440 Author: Dima Panov AuthorDate: 2022-03-13 15:51:46 +0000 Commit: Dima Panov CommitDate: 2022-03-13 15:51:46 +0000 devel/py-qt5-sip: Fix build with py311 (+) The `_frame` struct was moved to an internal header, however the public API is primarily read-only, and py-sip needs to build PyFrameObjects so still import the internal headers. Also sets the Py_BUILD_CORE define for py311a6, trying to restrict it to the frame header. Inspired by: cython repo With hat: kde Sponsored by: Netzkommune GmbH --- devel/py-qt5-sip/files/patch-siplib.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/devel/py-qt5-sip/files/patch-siplib.c b/devel/py-qt5-sip/files/patch-siplib.c new file mode 100644 index 000000000000..ba4f09878a2d --- /dev/null +++ b/devel/py-qt5-sip/files/patch-siplib.c @@ -0,0 +1,15 @@ +--- siplib.c.orig 2022-02-01 13:29:23 UTC ++++ siplib.c +@@ -20,6 +20,12 @@ + #include + #include + #include ++#if PY_VERSION_HEX >= 0x030b00a6 ++ #ifndef Py_BUILD_CORE ++ #define Py_BUILD_CORE 1 ++ #endif ++ #include "internal/pycore_frame.h" ++#endif + + #include + #include