From nobody Sun Dec 18 17:43:47 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 4NZqvS0hKBz1Gm5p; Sun, 18 Dec 2022 17:43:48 +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 4NZqvR6yMGz4HrX; Sun, 18 Dec 2022 17:43:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671385428; 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=S0B704qm3o70b+ZeT2lbZTnmcqRtijeYJSkPiYBOg4s=; b=GvY+V9TxTT95VE1FhX7G95DJ+w6Z+0aMJy5mSGFIs+evCw+T1TGoht1bnHoxwjniuQ95yO G1G4hIzuW79ZtzKndJpWWODLkp3SAXy+FKQVKYTEzAtQ4kJ44n43cjEl/IwlU1HudFjd/l 3pNREA8NIdAaX06+H4QSPhjjzXwM8CKioNX99UHRy+Xrj2xT5rnZkRU3e4fndZRODNapar HL7FnoacMi2wtp7Z1qM4N8fmTjlRssX8vBSUiiIT619rZvLDNCm7qqdo49mxU1w3XckH3y 7X8cMaD5gUyQrYwnYW3sWqwmZoraHKoPDYB1Wc41u6uWeb/YTzELb904oeod2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671385428; 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=S0B704qm3o70b+ZeT2lbZTnmcqRtijeYJSkPiYBOg4s=; b=kHUA3huJFrGDEDnmWy8WbwJ4JGGjJQfGR+sfOeroBvvtGmOlOraJ+HheZBxNSTOVP/ylew 3vXtlrIicxEHnhwCYs78ruGFlrpTtn8RjvCOZcKVYjw0G3tHrttSnGWzyYLnDYw0Di09NH fJVUPor7l8dwzuBy1vdK5UN4X7i+q/8W4IHAUW2DCrvPwE9P5qgBnTWwi+t8dp3MBC8nfo PcgRZHafGrF1n0TG//KS6D1ZC0P/y9HujCrdOkeF3nQOR5sWXiBm+sjphCDIpIv4mIa1Vp X4KO+EvjIrlfyR3wc/HVKi9EKeZwaYJ3XjiVVqgvp/pPIy4JVkBVJQk6q/WuiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671385428; a=rsa-sha256; cv=none; b=Ty6HLeqLpYC8a8ZFuQnNSV1DsaauTd6HaMj8xJjg1EjPAh4PdjWBkk/qgdna12u4kxcPHI LA/GJ/njX4AMr2u7eqrzNNDRt7UoucICd0tn3ETRH62De3d8d1pQUeIs89j5lMSVGt4PPW ZQzdPax7xsuUjAQCw7s+ZKGUTVOlkWfwDim+LeZDT8LIHY//AU3HqHsfQ3GevB0ijW8rti 3E9RGQSoml42ZQGwESPL6E5Ueye6GFnvT7WctmxnpCpgYkb7UF4c9w6mHFlKoqjvwPsC7u uvYHcIzcqKtcfrKi1zLstVwhMBrtiYti3xQWGN+pjKElQjKnW9W1AGJruOPSMQ== 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 4NZqvR5n68zPwb; Sun, 18 Dec 2022 17:43:47 +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 2BIHhlvq006388; Sun, 18 Dec 2022 17:43:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BIHhlAu006387; Sun, 18 Dec 2022 17:43:47 GMT (envelope-from git) Date: Sun, 18 Dec 2022 17:43:47 GMT Message-Id: <202212181743.2BIHhlAu006387@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: f2f3ab67ff12 - main - graphics/py-pygraphviz: fix build with clang 15 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f2f3ab67ff127029f70393a05f2f8e560d70ccb4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=f2f3ab67ff127029f70393a05f2f8e560d70ccb4 commit f2f3ab67ff127029f70393a05f2f8e560d70ccb4 Author: Dimitry Andric AuthorDate: 2022-12-09 17:41:55 +0000 Commit: Dimitry Andric CommitDate: 2022-12-18 17:29:15 +0000 graphics/py-pygraphviz: fix build with clang 15 During an exp-run for llvm 15 (see bug 265425), it turned out that graphics/py-pygraphviz failed to build with clang 15: pygraphviz/graphviz_wrap.c:3047:12: error: incompatible pointer to integer conversion returning 'Agsym_t *' (aka 'struct Agsym_s *') from a function with result type 'int' [-Wint-conversion] return agattr(g, kind, name, val); ^~~~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. In graphviz.i and the swig-generated graphviz_wrap.c, the agattr_label() function is incorrectly labeled as returning 'int', while it should return 'Agsym_t *' instead. Upstream fixed this as part of a much bigger commit [1], and they also regenerated the swig wrapper. For our case, it is simpler to patch the wrapper instead, as otherwise you would have to add swig as a build-time dependency. [1] https://github.com/pygraphviz/pygraphviz/commit/79fdee178785620b90241c70a0efab9dd57e3c86 PR: 268278 Approved by: portmgr (tcberner) MFH: 2022Q4 --- .../files/patch-pygraphviz_graphviz__wrap.c | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/graphics/py-pygraphviz/files/patch-pygraphviz_graphviz__wrap.c b/graphics/py-pygraphviz/files/patch-pygraphviz_graphviz__wrap.c new file mode 100644 index 000000000000..e6d4a4e79ee0 --- /dev/null +++ b/graphics/py-pygraphviz/files/patch-pygraphviz_graphviz__wrap.c @@ -0,0 +1,36 @@ +--- pygraphviz/graphviz_wrap.c.orig 2020-08-05 09:03:40 UTC ++++ pygraphviz/graphviz_wrap.c +@@ -3030,7 +3030,7 @@ SWIG_FromCharPtr(const char *cptr) + } + + +- int agattr_label(Agraph_t *g, int kind, char *name, char *val) ++ Agsym_t *agattr_label(Agraph_t *g, int kind, char *name, char *val) + { + int len; + char *hs; +@@ -4364,7 +4364,7 @@ SWIGINTERN PyObject *_wrap_agattr_label(PyObject *SWIG + char *buf4 = 0 ; + int alloc4 = 0 ; + PyObject *swig_obj[4] ; +- int result; ++ Agsym_t *result = 0 ; + + if (!SWIG_Python_UnpackTuple(args, "agattr_label", 4, 4, swig_obj)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Agraph_t, 0 | 0 ); +@@ -4388,13 +4388,13 @@ SWIGINTERN PyObject *_wrap_agattr_label(PyObject *SWIG + } + arg4 = (char *)(buf4); + { +- result = (int)agattr_label(arg1,arg2,arg3,arg4); ++ result = (Agsym_t *)agattr_label(arg1,arg2,arg3,arg4); + if (!result) { + PyErr_SetString(PyExc_KeyError,"agattr_label: no key"); + return NULL; + } + } +- resultobj = SWIG_From_int((int)(result)); ++ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Agsym_t, 0 | 0 ); + if (alloc3 == SWIG_NEWOBJ) free((char*)buf3); + if (alloc4 == SWIG_NEWOBJ) free((char*)buf4); + return resultobj;