diff options
Diffstat (limited to 'user/graphviz')
| -rw-r--r-- | user/graphviz/0001-clone-nameclash.patch | 18 | ||||
| -rw-r--r-- | user/graphviz/APKBUILD | 56 |
2 files changed, 41 insertions, 33 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)) diff --git a/user/graphviz/APKBUILD b/user/graphviz/APKBUILD index 73aebef87..759243a27 100644 --- a/user/graphviz/APKBUILD +++ b/user/graphviz/APKBUILD @@ -1,9 +1,9 @@ -# Contributor: Sören Tempel <soeren/alpine@soeren-tempel.net> +# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: +# Maintainer: Zach van Rijn <me@zv.io> pkgname=graphviz -pkgver=2.40.1 -pkgrel=2 +pkgver=2.50.0 +pkgrel=0 pkgdesc="Graph visualization software" url="http://www.graphviz.org/" arch="all" @@ -13,27 +13,18 @@ depends="" depends_dev="zlib-dev libpng-dev libjpeg-turbo-dev expat-dev fontconfig-dev libsm-dev libxext-dev cairo-dev pango-dev librsvg-dev gmp-dev freetype-dev" -makedepends="$depends_dev flex swig guile-dev m4 libtool - bison gtk+2.0-dev libltdl tcl tcl-dev" +makedepends="$depends_dev flex swig m4 libtool guile-dev + bison gtk+2.0-dev libltdl perl-dev python3-dev tcl tcl-dev" install="$pkgname.pre-deinstall" triggers="$pkgname.trigger=/usr/lib/graphviz" -subpackages="$pkgname-dev $pkgname-doc - $pkgname-gtk $pkgname-graphs guile-$pkgname:guile" -source="$pkgname-$pkgver.tar.gz::https://graphviz.gitlab.io/pub/graphviz/stable/SOURCES/graphviz.tar.gz +subpackages="$pkgname-dev $pkgname-doc guile-$pkgname:guile + $pkgname-gtk $pkgname-graphs perl-gv:_pl py3-gv:_py3 tcl-$pkgname:_tcl" +source="https://gitlab.com/api/v4/projects/4207231/packages/generic/$pkgname-releases/$pkgver/$pkgname-$pkgver.tar.xz $pkgname.trigger 0001-clone-nameclash.patch " -prepare() { - default_prepare - - cd "$builddir" - ./autogen.sh NOCONFIG -} - build() { - cd "$builddir" - LIBPOSTFIX=/ \ ./configure \ --build=$CBUILD \ @@ -66,7 +57,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" \ pkgconfigdir=/usr/lib/pkgconfig \ install @@ -76,11 +66,17 @@ package() { "$pkgdir"/usr/share/doc/graphviz } -guile() { - pkgdesc="Guile bindings for graphviz" +_lang() { + pkgdesc="$2 bindings for graphviz" + depends="$3" mkdir -p "$subpkgdir"/usr/lib/graphviz - mv "$pkgdir"/usr/lib/graphviz/guile* \ + mv "$pkgdir"/usr/lib/graphviz/$1* \ "$subpkgdir"/usr/lib/graphviz/ + mv "$pkgdir"/usr/lib/$1* "$subpkgdir"/usr/lib/ || true +} + +guile() { + _lang guile Guile guile } gtk() { @@ -98,6 +94,18 @@ graphs() { "$subpkgdir"/usr/share/graphviz/ } -sha512sums="a3f358a7050523a39b91a259563a95925b37853ffec799e571211af5b686d3af42457c937882954482785745d90416b1abd945caf05f8abb52b3876e07aa70f5 graphviz-2.40.1.tar.gz +_pl() { + _lang perl Perl +} + +_py3() { + _lang python3 "Python 3" +} + +_tcl() { + _lang tcl "Tcl/Tk" +} + +sha512sums="2b035559da20bad35e046bfa1b2c8ce1b395ff9b812f33bcf612d7f7c65ff9a226c9b209553b4283825330683fb925516563943de7922c2f6434baaf3c3b5ee2 graphviz-2.50.0.tar.xz 50947e6a11929f724759266f7716d52d10923eba6d59704ab39e4bdf18f8471d548c2b11ab051dd4b67cb82742aaf54d6358890d049d5b5982f3383b65f7ae8c graphviz.trigger -aa4cbc341906a949a6bf78cadd96c437d6bcc90369941fe03519aa4447731ecbf6063a0dd0366d3e7aaadf22b69e4bcab3f8632a7da7a01f8e08a3be05c2bc5d 0001-clone-nameclash.patch" +6c749a15fb7e52107d74bd49dc49f11b7187bf088f0d73c57f08777032c2a55f49b6021aa40fdf89fd9dbd3c9d02ca45723b225d001117fd462b1e148cb3f44a 0001-clone-nameclash.patch" |