From 004d3decf7a75713d6f253bde2a88b62fb77785a Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sun, 8 Jul 2018 18:19:16 -0500 Subject: user/graphviz: fix deps and configure line --- user/graphviz/APKBUILD | 35 +++++++++-------------------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/user/graphviz/APKBUILD b/user/graphviz/APKBUILD index 7f5b34c1f..73aebef87 100644 --- a/user/graphviz/APKBUILD +++ b/user/graphviz/APKBUILD @@ -1,33 +1,30 @@ # Contributor: Sören Tempel # Contributor: Natanael Copa -# Maintainer: Natanael Copa +# Maintainer: pkgname=graphviz pkgver=2.40.1 -pkgrel=1 -pkgdesc="Graph Visualization Tools" +pkgrel=2 +pkgdesc="Graph visualization software" url="http://www.graphviz.org/" arch="all" -license="EPL" options="!check" # Requires unpackaged Criterion test framework +license="EPL" 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 lua5.2-dev libltdl tcl" + bison gtk+2.0-dev libltdl tcl tcl-dev" install="$pkgname.pre-deinstall" triggers="$pkgname.trigger=/usr/lib/graphviz" -subpackages="$pkgname-dev $pkgname-doc lua-$pkgname:_lua +subpackages="$pkgname-dev $pkgname-doc $pkgname-gtk $pkgname-graphs guile-$pkgname:guile" -source="http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-$pkgver.tar.bz2 +source="$pkgname-$pkgver.tar.gz::https://graphviz.gitlab.io/pub/graphviz/stable/SOURCES/graphviz.tar.gz $pkgname.trigger 0001-clone-nameclash.patch " prepare() { - # Rename unpacked directory with hash in the name to something sane... - mv "$srcdir"/$pkgname-stable_release_$pkgver-* "$builddir" - default_prepare cd "$builddir" @@ -38,9 +35,6 @@ build() { cd "$builddir" LIBPOSTFIX=/ \ - LUA=lua5.2 \ - LUA_CFLAGS="$(pkg-config --cflags lua5.2)" \ - LUA_LIBS="$(pkg-config --libs lua5.2)" \ ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -54,9 +48,7 @@ build() { --disable-static \ --disable-dependency-tracking \ --enable-java=no \ - --enable-lua=yes \ - --enable-python34=yes \ - --enable-tcl=no \ + --enable-tcl=yes \ --without-mylibgd \ --with-ipsepcola \ --with-pangocairo \ @@ -91,15 +83,6 @@ guile() { "$subpkgdir"/usr/lib/graphviz/ } -_lua() { - pkgdesc="Lua extension for graphviz" - mkdir -p "$subpkgdir"/usr/lib/graphviz \ - "$subpkgdir"/usr/lib/lua - mv "$pkgdir"/usr/lib/graphviz/lua \ - "$subpkgdir"/usr/lib/graphviz - mv "$pkgdir"/usr/lib/lua "$subpkgdir"/usr/lib/ -} - gtk() { pkgdesc="Gtk extension for graphviz" mkdir -p "$subpkgdir"/usr/lib/graphviz @@ -115,6 +98,6 @@ graphs() { "$subpkgdir"/usr/share/graphviz/ } -sha512sums="4e819b3906f3b8e31245a021acd6fae4a1bc55df0a4df6b57a3578a62017e9db0b474a38f3f54682b9e9136d332f2374feee308af489e2848f8bc303ffab58ac graphviz-2.40.1.tar.bz2 +sha512sums="a3f358a7050523a39b91a259563a95925b37853ffec799e571211af5b686d3af42457c937882954482785745d90416b1abd945caf05f8abb52b3876e07aa70f5 graphviz-2.40.1.tar.gz 50947e6a11929f724759266f7716d52d10923eba6d59704ab39e4bdf18f8471d548c2b11ab051dd4b67cb82742aaf54d6358890d049d5b5982f3383b65f7ae8c graphviz.trigger aa4cbc341906a949a6bf78cadd96c437d6bcc90369941fe03519aa4447731ecbf6063a0dd0366d3e7aaadf22b69e4bcab3f8632a7da7a01f8e08a3be05c2bc5d 0001-clone-nameclash.patch" -- cgit v1.2.3-60-g2f50