Date: Tuesday, August 15, 2017 @ 07:46:08 Author: bisson Revision: 302189
upgrade bindings to lua-5.3, cleanup old workarounds Modified: graphviz/trunk/PKGBUILD ----------+ PKGBUILD | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-08-15 05:54:02 UTC (rev 302188) +++ PKGBUILD 2017-08-15 07:46:08 UTC (rev 302189) @@ -5,16 +5,16 @@ pkgname=graphviz pkgver=2.40.1 -pkgrel=6 +pkgrel=7 pkgdesc='Graph visualization software' url='http://www.graphviz.org/' license=('CPL') arch=('i686' 'x86_64') depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts' 'gsfonts') -makedepends=('swig' 'mono' 'guile' 'lua51' 'ocaml' 'perl' 'python2' 'r' 'tk' 'qt4' 'gtk2') +makedepends=('swig' 'mono' 'guile' 'lua' 'ocaml' 'perl' 'python2' 'r' 'tk' 'qt4' 'gtk2') optdepends=('mono: sharp bindings' 'guile: guile bindings' - 'lua51: lua bindings' + 'lua: lua bindings' 'ocaml: ocaml bindings' 'perl: perl bindings' 'python2: python bindings' @@ -39,10 +39,8 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" - export CXXFLAGS+=' -Dint64=int64_t' # for ocaml + export PYTHON=python2 export LIBPOSTFIX=/ - export PYTHON=python2 - export LUA=lua5.1 ./configure --prefix=/usr make @@ -52,13 +50,8 @@ cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - cd "${pkgdir}/usr/lib" - install -d lua/5.1 - mv lua/gv.so lua/5.1 - - # Workaround symlink upgrade bug (fixed in pacman trunk) - # Also deduplicates the tcl libraries (upstream bug?) - # Might have been this commit: https://github.com/ellson/graphviz/commit/f11aead - rm -r tcl8.6/graphviz - ln -s ../graphviz/tcl tcl8.6/graphviz + # Deduplicates TCL libraries + cd "${pkgdir}/usr/lib/tcl8.6" + rm -fr graphviz + ln -s ../graphviz/tcl graphviz }
