diff options
| author | Rasmus Thomsen <oss@cogitri.dev> | 2019-10-17 11:44:07 +0200 |
|---|---|---|
| committer | Kevin Daudt <kdaudt@alpinelinux.org> | 2019-10-24 18:56:33 +0000 |
| commit | 8bb27bf2d2a8272aad32fbbad83366ae6276f734 (patch) | |
| tree | b5f8657ccd03a0bdb9c45507f95d1d25e52480a1 /main | |
| parent | 6932a4c2360d5124de002eb70d0a2963c5e711e0 (diff) | |
| download | aports-8bb27bf2d2a8272aad32fbbad83366ae6276f734.tar.bz2 aports-8bb27bf2d2a8272aad32fbbad83366ae6276f734.tar.xz | |
main/graphviz: upgrade to 2.42.2
Disable rvsg because librsvg is in community now. The gtk subpackage
depends on librsvg, so it has to be removed as well.
Closes !509
Diffstat (limited to 'main')
| -rw-r--r-- | main/graphviz/APKBUILD | 59 |
1 files changed, 27 insertions, 32 deletions
diff --git a/main/graphviz/APKBUILD b/main/graphviz/APKBUILD index 5145105084..ee2469ee05 100644 --- a/main/graphviz/APKBUILD +++ b/main/graphviz/APKBUILD @@ -1,9 +1,10 @@ + # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=graphviz -pkgver=2.40.1 -pkgrel=1 +pkgver=2.42.2 +pkgrel=0 pkgdesc="Graph Visualization Tools" url="http://www.graphviz.org/" arch="all" @@ -11,21 +12,19 @@ license="EPL-1.0" _luaver=5.3 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 python2-dev m4 libtool - bison gtk+2.0-dev lua$_luaver-dev libltdl tcl autoconf automake bash" + gmp-dev freetype-dev python3-dev" +makedepends="$depends_dev flex swig m4 libtool python2-dev libxaw-dev + bison lua$_luaver-dev libltdl tcl autoconf automake bash" install="$pkgname.pre-deinstall" triggers="$pkgname.trigger=/usr/lib/graphviz" -subpackages="$pkgname-dev $pkgname-doc py2-gv:py lua$_luaver-$pkgname:_lua - $pkgname-gtk $pkgname-graphs::noarch" -source="$pkgname-$pkgver.tar.bz2::https://gitlab.com/graphviz/$pkgname/repository/stable_release_$pkgver/archive.tar.bz2 - $pkgname.trigger +subpackages="$pkgname-dev $pkgname-doc py3-gv:_py3 py2-gv:_py2 lua$_luaver-$pkgname:_lua + $pkgname-graphs::noarch" +source="$pkgname-$pkgver.tar.bz2::https://gitlab.com/graphviz/graphviz/repository/stable_release_$pkgver/archive.tar.bz2 0001-clone-nameclash.patch - ungit-autogen.patch " -builddir="$srcdir/$pkgname-$pkgver" prepare() { + cd "$srcdir" # Rename unpacked directory with hash in the name to something sane... mv "$srcdir"/$pkgname-stable_release_$pkgver-* "$builddir" @@ -36,8 +35,6 @@ prepare() { } build() { - cd "$builddir" - CONFIG_SHELL=/bin/bash \ LIBPOSTFIX=/ \ LUA=lua$_luaver \ @@ -47,7 +44,6 @@ build() { --host=$CHOST \ --prefix=/usr \ --sysconfdir=/etc \ - \ --disable-silent-rules \ --disable-static \ --disable-dependency-tracking \ @@ -65,7 +61,6 @@ build() { --enable-r=no \ --enable-ruby=no \ --enable-tcl=no \ - \ --without-included-ltdl \ --with-x \ --with-rsvg=yes \ @@ -83,9 +78,8 @@ build() { } package() { - cd "$builddir" - - make DESTDIR="$pkgdir" \ + # Install has race conditions... + make -j1 DESTDIR="$pkgdir" \ pkgconfigdir=/usr/lib/pkgconfig \ install @@ -94,7 +88,19 @@ package() { "$pkgdir"/usr/share/doc/graphviz } -py() { + +_py3() { + pkgdesc="Python3 extension for graphviz" + depends="python3" + + mkdir -p "$subpkgdir"/usr/lib/graphviz \ + "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/graphviz/python3* \ + "$subpkgdir"/usr/lib/graphviz + mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/ +} + +_py2() { pkgdesc="Python2 extension for graphviz" depends="python2" provides="py-$pkgname=$pkgver-r$pkgrel" # for backward compatibility @@ -119,15 +125,6 @@ _lua() { mv "$pkgdir"/usr/lib/lua "$subpkgdir"/usr/lib/lua/$_luaver } -gtk() { - pkgdesc="Gtk extension for graphviz" - - mkdir -p "$subpkgdir"/usr/lib/graphviz - mv "$pkgdir"/usr/lib/graphviz/libgvplugin_g?k* \ - "$pkgdir"/usr/lib/graphviz/libgvplugin_rsvg* \ - "$subpkgdir"/usr/lib/graphviz -} - graphs() { pkgdesc="Demo graphs for graphviz" @@ -136,7 +133,5 @@ graphs() { "$subpkgdir"/usr/share/graphviz/ } -sha512sums="4e819b3906f3b8e31245a021acd6fae4a1bc55df0a4df6b57a3578a62017e9db0b474a38f3f54682b9e9136d332f2374feee308af489e2848f8bc303ffab58ac graphviz-2.40.1.tar.bz2 -50947e6a11929f724759266f7716d52d10923eba6d59704ab39e4bdf18f8471d548c2b11ab051dd4b67cb82742aaf54d6358890d049d5b5982f3383b65f7ae8c graphviz.trigger -aa4cbc341906a949a6bf78cadd96c437d6bcc90369941fe03519aa4447731ecbf6063a0dd0366d3e7aaadf22b69e4bcab3f8632a7da7a01f8e08a3be05c2bc5d 0001-clone-nameclash.patch -fef7cd142c7a50b91d57b717142d3c0655450a68e00f4932fca944c684007b2e34f1ce4ddc454559cbbdba7415321b37ff4eeab8dc3c9923f469b0e7bfa3b120 ungit-autogen.patch" +sha512sums="b7f5fd17c09d6dc36db9a0c8bac4afb618b81421edf6129f5715fc5e2cb7a0e1a430fa56c5ad2a99ba06edbf4c4f2a55a1071fdb8897162cc999d0867e7223ab graphviz-2.42.2.tar.bz2 +aa4cbc341906a949a6bf78cadd96c437d6bcc90369941fe03519aa4447731ecbf6063a0dd0366d3e7aaadf22b69e4bcab3f8632a7da7a01f8e08a3be05c2bc5d 0001-clone-nameclash.patch" |