git: f2f3ab67ff12 - main - graphics/py-pygraphviz: fix build with clang 15

The branch main has been updated by dim (src committer):

URL: https://cgit.FreeBSD.org/ports/commit/?id=f2f3ab67ff127029f70393a05f2f8e560d70ccb4

commit f2f3ab67ff127029f70393a05f2f8e560d70ccb4
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2022-12-09 17:41:55 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
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;