diff options
| author | Zach van Rijn <me@zv.io> | 2022-01-11 00:35:01 +0000 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2022-10-21 18:33:57 -0500 |
| commit | a480e1bb1b01bed050022430925c0db219807505 (patch) | |
| tree | 3feb5ead687639392df2e1baac6fbd8a5486f70a /user/graphviz/0001-clone-nameclash.patch | |
| parent | 76fe4e4995a747334fb62ddba30f52e369b24f3c (diff) | |
| download | packages-a480e1bb1b01bed050022430925c0db219807505.tar.gz packages-a480e1bb1b01bed050022430925c0db219807505.tar.bz2 packages-a480e1bb1b01bed050022430925c0db219807505.tar.xz packages-a480e1bb1b01bed050022430925c0db219807505.zip | |
user/graphviz: bump { 2.44.0 --> 2.50.0 }. fix download URL. become maintainer.
Diffstat (limited to 'user/graphviz/0001-clone-nameclash.patch')
| -rw-r--r-- | user/graphviz/0001-clone-nameclash.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/user/graphviz/0001-clone-nameclash.patch b/user/graphviz/0001-clone-nameclash.patch index 6222238d8..f65785181 100644 --- a/user/graphviz/0001-clone-nameclash.patch +++ b/user/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,7 +38,7 @@ 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" { +@@ -18,7 +18,7 @@ extern "C" { #include "expr.h" extern void nodeInduce(Agraph_t * selected); @@ -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, +@@ -1145,7 +1145,7 @@ getval(Expr_t * pgm, Exnode_t * node, Exid_t * sym, Exref_t * ref, 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)) |