main/graphviz: upgrade to 2.49.1

main/graphviz/0001-clone-nameclash.patch

@@ -14,7 +14,7 @@ diff --git a/lib/gvpr/actions.c b/lib/gvpr/actions.c
 index 05bfcd1..b3b4a60 100644
 --- a/lib/gvpr/actions.c
 +++ b/lib/gvpr/actions.c
-@@ -380,7 +380,7 @@ Agraph_t *cloneG(Agraph_t * g, char* name)
+@@ -367,7 +367,7 @@ Agraph_t *cloneG(Agraph_t * g, char* name)
   * graph. Otherwise, create a clone subgraph of g.
   * Assume obj != NULL.
   */
@@ -23,7 +23,7 @@ index 05bfcd1..b3b4a60 100644
  {
      Agobj_t *nobj = 0;
      Agedge_t *e;
-@@ -415,8 +415,8 @@ Agobj_t *clone(Agraph_t * g, Agobj_t * obj)
+@@ -402,8 +402,8 @@ Agobj_t *clone(Agraph_t * g, Agobj_t * obj)
      case AGINEDGE:
      case AGOUTEDGE:
  	e = (Agedge_t *) obj;
@@ -38,8 +38,8 @@ diff --git a/lib/gvpr/actions.h b/lib/gvpr/actions.h
 index 5c62a3b..4223c52 100644
 --- a/lib/gvpr/actions.h
 +++ b/lib/gvpr/actions.h
-@@ -22,7 +22,7 @@ extern "C" {
- #include "expr.h"
+@@ -19,7 +19,7 @@
+ #include <expr/expr.h>
  
      extern void nodeInduce(Agraph_t * selected);
 -    extern Agobj_t *clone(Agraph_t * g, Agobj_t * obj);
@@ -51,20 +51,20 @@ diff --git a/lib/gvpr/compile.c b/lib/gvpr/compile.c
 index c157572..0914210 100644
 --- a/lib/gvpr/compile.c
 +++ b/lib/gvpr/compile.c
-@@ -1087,7 +1087,7 @@ getval(Expr_t * pgm, Exnode_t * node, Exid_t * sym, Exref_t * ref,
+@@ -1152,7 +1152,7 @@
  		error(ERROR_WARNING, "NULL object passed to clone()");
  		v.integer = 0;
  	    } else
--		v.integer = PTR2INT(clone(gp, objp));
-+		v.integer = PTR2INT(cloneO(gp, objp));
+-		v.integer = ptr2int(clone(gp, objp));
++		v.integer = ptr2int(cloneO(gp, objp));
  	    break;
  	case F_cloneG:
- 	    gp = INT2PTR(Agraph_t *, args[0].integer);
+ 	    gp = int2ptr(args[0].integer);
 diff --git a/lib/gvpr/gvpr.c b/lib/gvpr/gvpr.c
 index 0d47d70..9a1bfd1 100644
 --- a/lib/gvpr/gvpr.c
 +++ b/lib/gvpr/gvpr.c
-@@ -803,7 +803,7 @@ addOutputGraph (Gpr_t* state, gvpropts* uopts)
+@@ -837,7 +837,7 @@ addOutputGraph (Gpr_t* state, gvpropts* uopts)
      Agraph_t* g = state->outgraph;
  
      if ((agroot(g) == state->curgraph) && !uopts->ingraphs)
@@ -73,7 +73,7 @@ index 0d47d70..9a1bfd1 100644
  
      uopts->n_outgraphs++;
      uopts->outgraphs = oldof(uopts->outgraphs,Agraph_t*,uopts->n_outgraphs,0);
-@@ -988,7 +988,7 @@ int gvpr (int argc, char *argv[], gvpropts * uopts)
+@@ -1031,7 +1031,7 @@ int gvpr (int argc, char *argv[], gvpropts * uopts)
  
  		/* begin graph */
  		if (incoreGraphs && (opts->compflags & CLONE))

main/graphviz/APKBUILD

@@ -2,7 +2,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=graphviz
-pkgver=2.49.0
+pkgver=2.49.1
 pkgrel=0
 pkgdesc="Graph Visualization Tools"
 url="https://www.graphviz.org/"
@@ -117,6 +117,6 @@ graphs() {
 }
 
 sha512sums="
-ab7372c4bf66ca078333252545911867108f5d9368988176fb4a8c449ba1ff094fae4c80af18567fa12303d46e2c205ab8f8043c2c21dcd2af58b55455c00faf  graphviz-2.49.0.tar.gz
-aa4cbc341906a949a6bf78cadd96c437d6bcc90369941fe03519aa4447731ecbf6063a0dd0366d3e7aaadf22b69e4bcab3f8632a7da7a01f8e08a3be05c2bc5d  0001-clone-nameclash.patch
+ac14303f67d0840b260c5f2f99c53049a1e444a963d31387ae7a44ffc24757bd44f1c40ddd3fdb6a8d0e0bb1dde0e15d320f613729fb631efd4f078fcb3a4f62  graphviz-2.49.1.tar.gz
+5a6feef04c79be1d019d3abc297d0084de2e3aed88d03ca3adc547b712e3f70ea4d6d945431bdbed1e1c72663b052e75f2b4e76453f9d9d24dfcfa26d06e2794  0001-clone-nameclash.patch
 "