Date: Wednesday, December 20, 2017 @ 20:26:43 Author: bisson Revision: 313424
archrelease: copy trunk to extra-x86_64 Added: graphviz/repos/extra-x86_64/PKGBUILD (from rev 313423, graphviz/trunk/PKGBUILD) graphviz/repos/extra-x86_64/ghostscript918.patch (from rev 313423, graphviz/trunk/ghostscript918.patch) graphviz/repos/extra-x86_64/install (from rev 313423, graphviz/trunk/install) Deleted: graphviz/repos/extra-x86_64/PKGBUILD graphviz/repos/extra-x86_64/ghostscript918.patch graphviz/repos/extra-x86_64/install ----------------------+ PKGBUILD | 114 ++++++++++++++++++++++++------------------------- ghostscript918.patch | 36 +++++++-------- install | 24 +++++----- 3 files changed, 87 insertions(+), 87 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2017-12-20 20:26:07 UTC (rev 313423) +++ PKGBUILD 2017-12-20 20:26:43 UTC (rev 313424) @@ -1,57 +0,0 @@ -# $Id$ -# Maintainer: Gaetan Bisson <bis...@archlinux.org> -# Contributor: kevin <ke...@archlinux.org> -# Contributor: John Proctor <jproc...@prium.net> - -pkgname=graphviz -pkgver=2.40.1 -pkgrel=9 -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' 'lua' 'ocaml' 'perl' 'python2' 'r' 'tk' 'qt4' 'gtk2') -optdepends=('mono: sharp bindings' - 'guile: guile bindings' - 'lua: lua bindings' - 'ocaml: ocaml bindings' - 'perl: perl bindings' - 'python2: python bindings' - 'r: r bindings' - 'tcl: tcl bindings' - 'qt4: gvedit' - 'gtk2: gtk output plugin' - 'xterm: vimdot') - -# http://www.graphviz.org/Download_source.php -source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz" - 'ghostscript918.patch') -sha256sums=('ca5218fade0204d59947126c38439f432853543b0818d9d728c589dfe7f3a421' - '0083d126e27f2223ec4226fc1d71c9c84106968a0fdf65de838aee1e4882bfdb') - -install=install - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../ghostscript918.patch -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - export PYTHON=python2 - export LIBPOSTFIX=/ - - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # Deduplicates TCL libraries - cd "${pkgdir}/usr/lib/tcl8.6" - rm -fr graphviz - ln -s ../graphviz/tcl graphviz -} Copied: graphviz/repos/extra-x86_64/PKGBUILD (from rev 313423, graphviz/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2017-12-20 20:26:43 UTC (rev 313424) @@ -0,0 +1,57 @@ +# $Id$ +# Maintainer: Gaetan Bisson <bis...@archlinux.org> +# Contributor: kevin <ke...@archlinux.org> +# Contributor: John Proctor <jproc...@prium.net> + +pkgname=graphviz +pkgver=2.40.1 +pkgrel=10 +pkgdesc='Graph visualization software' +url='http://www.graphviz.org/' +license=('CPL') +arch=('x86_64') +depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts' 'gsfonts') +makedepends=('swig' 'mono' 'guile' 'lua' 'ocaml' 'perl' 'python2' 'r' 'tk' 'qt4' 'gtk2') +optdepends=('mono: sharp bindings' + 'guile: guile bindings' + 'lua: lua bindings' + 'ocaml: ocaml bindings' + 'perl: perl bindings' + 'python2: python bindings' + 'r: r bindings' + 'tcl: tcl bindings' + 'qt4: gvedit' + 'gtk2: gtk output plugin' + 'xterm: vimdot') + +# http://www.graphviz.org/Download_source.php +source=("https://graphviz.gitlab.io/pub/graphviz/stable/SOURCES/graphviz.tar.gz" + 'ghostscript918.patch') +sha256sums=('ca5218fade0204d59947126c38439f432853543b0818d9d728c589dfe7f3a421' + '0083d126e27f2223ec4226fc1d71c9c84106968a0fdf65de838aee1e4882bfdb') + +install=install + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../ghostscript918.patch +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + export PYTHON=python2 + export LIBPOSTFIX=/ + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + # Deduplicates TCL libraries + cd "${pkgdir}/usr/lib/tcl8.6" + rm -fr graphviz + ln -s ../graphviz/tcl graphviz +} Deleted: ghostscript918.patch =================================================================== --- ghostscript918.patch 2017-12-20 20:26:07 UTC (rev 313423) +++ ghostscript918.patch 2017-12-20 20:26:43 UTC (rev 313424) @@ -1,18 +0,0 @@ -diff -uprb graphviz-2.38.0.orig/plugin/gs/gvloadimage_gs.c graphviz-2.38.0/plugin/gs/gvloadimage_gs.c ---- graphviz-2.38.0.orig/plugin/gs/gvloadimage_gs.c 2014-04-13 23:40:25.000000000 +0300 -+++ graphviz-2.38.0/plugin/gs/gvloadimage_gs.c 2015-11-11 00:08:32.916123704 +0200 -@@ -72,11 +72,11 @@ static void gs_error(GVJ_t * job, const - - assert (err < 0); - -- if (err >= e_VMerror) -+ if (err >= gs_error_VMerror) - errsrc = "PostScript Level 1"; -- else if (err >= e_unregistered) -+ else if (err >= gs_error_unregistered) - errsrc = "PostScript Level 2"; -- else if (err >= e_invalidid) -+ else if (err >= gs_error_invalidid) - errsrc = "DPS error"; - else - errsrc = "Ghostscript internal error"; Copied: graphviz/repos/extra-x86_64/ghostscript918.patch (from rev 313423, graphviz/trunk/ghostscript918.patch) =================================================================== --- ghostscript918.patch (rev 0) +++ ghostscript918.patch 2017-12-20 20:26:43 UTC (rev 313424) @@ -0,0 +1,18 @@ +diff -uprb graphviz-2.38.0.orig/plugin/gs/gvloadimage_gs.c graphviz-2.38.0/plugin/gs/gvloadimage_gs.c +--- graphviz-2.38.0.orig/plugin/gs/gvloadimage_gs.c 2014-04-13 23:40:25.000000000 +0300 ++++ graphviz-2.38.0/plugin/gs/gvloadimage_gs.c 2015-11-11 00:08:32.916123704 +0200 +@@ -72,11 +72,11 @@ static void gs_error(GVJ_t * job, const + + assert (err < 0); + +- if (err >= e_VMerror) ++ if (err >= gs_error_VMerror) + errsrc = "PostScript Level 1"; +- else if (err >= e_unregistered) ++ else if (err >= gs_error_unregistered) + errsrc = "PostScript Level 2"; +- else if (err >= e_invalidid) ++ else if (err >= gs_error_invalidid) + errsrc = "DPS error"; + else + errsrc = "Ghostscript internal error"; Deleted: install =================================================================== --- install 2017-12-20 20:26:07 UTC (rev 313423) +++ install 2017-12-20 20:26:43 UTC (rev 313424) @@ -1,12 +0,0 @@ -post_install() { - rm -f usr/lib/graphviz/config{,6} - usr/bin/dot -c -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f usr/lib/graphviz/config{,6} -} Copied: graphviz/repos/extra-x86_64/install (from rev 313423, graphviz/trunk/install) =================================================================== --- install (rev 0) +++ install 2017-12-20 20:26:43 UTC (rev 313424) @@ -0,0 +1,12 @@ +post_install() { + rm -f usr/lib/graphviz/config{,6} + usr/bin/dot -c +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f usr/lib/graphviz/config{,6} +}