cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

graphics/py-pygraphviz: fix build with clang 15

Browse Source 
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] 79fdee1787

PR:		268278
Approved by:	portmgr (tcberner)
MFH:		2022Q4
This commit is contained in:
Dimitry Andric 2022-12-09 18:41:55 +01:00
parent 6597d3e9cc
commit f2f3ab67ff
1 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
graphics/py-pygraphviz/files/patch-pygraphviz_graphviz__wrap.c Normal file
View File

@ -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;