diff options
Diffstat (limited to 'extra/graphviz')
-rw-r--r-- | extra/graphviz/PKGBUILD | 38 | ||||
-rw-r--r-- | extra/graphviz/dotty.patch | 21 | ||||
-rw-r--r-- | extra/graphviz/yyerror0.patch | 53 | ||||
-rw-r--r-- | extra/graphviz/yyerror1.patch | 26 |
4 files changed, 15 insertions, 123 deletions
diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD index 884b8cec1..a2e97e5cf 100644 --- a/extra/graphviz/PKGBUILD +++ b/extra/graphviz/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 203404 2014-01-10 04:16:47Z bisson $ +# $Id: PKGBUILD 205075 2014-02-04 11:31:25Z heftig $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=graphviz -pkgver=2.34.0 -pkgrel=3 +pkgver=2.36.0 +pkgrel=2 pkgdesc='Graph visualization software' url='http://www.graphviz.org/' license=('CPL') arch=('i686' 'x86_64') depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts') -makedepends=('swig' 'mono' 'guile' 'lua51' 'ocaml' 'perl' 'php' 'python2' 'r' 'tk' 'qt4') +makedepends=('swig' 'mono' 'guile' 'lua51' 'ocaml' 'perl' 'php' 'python2' 'r' 'tk' 'qt4' 'gtk2') optdepends=('mono: sharp bindings' 'guile: guile bindings' 'lua51: lua bindings' @@ -21,30 +21,16 @@ optdepends=('mono: sharp bindings' 'python2: python bindings' 'r: r bindings' 'tcl: tcl bindings' - 'qt4: gvedit') -source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz" - 'yyerror0.patch' - 'yyerror1.patch' - 'dotty.patch') -sha1sums=('5a0c00bebe7f4c7a04523db21f40966dc9f0d441' - '7a6fe4f532974d9ca173b1aba9927bdeb5f80be9' - '6d76a230ee6c11bcd610ebe56f98e96ecef6217d' - '31bc9f505c8b6470289a0d6ec31c237765cba239') + 'qt4: gvedit' + 'gtk2: gtk output plugin') +source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz") +sha1sums=('a41e9f1cbcc9a24651e14dd15a4cda3d912d7d19') install=install -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../yyerror0.patch - patch -p1 -i ../yyerror1.patch - patch -p1 -i ../dotty.patch - sed \ - -e '/LIBPOSTFIX="64"/d' \ - -i configure -} - build() { cd "${srcdir}/${pkgname}-${pkgver}" + export LIBPOSTFIX=/ export PYTHON=python2 export LUA=lua5.1 @@ -55,4 +41,10 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + + # 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 "${pkgdir}/usr/lib/tcl8.6/graphviz" + ln -s ../graphviz/tcl "$pkgdir/usr/lib/tcl8.6/graphviz" } diff --git a/extra/graphviz/dotty.patch b/extra/graphviz/dotty.patch deleted file mode 100644 index 7c8ca1d7f..000000000 --- a/extra/graphviz/dotty.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur old/cmd/dotty/dotty_layout.lefty new/cmd/dotty/dotty_layout.lefty ---- old/cmd/dotty/dotty_layout.lefty 2013-09-06 15:07:52.000000000 -1000 -+++ new/cmd/dotty/dotty_layout.lefty 2013-10-22 15:23:50.153028328 -1000 -@@ -5,7 +5,7 @@ - local fd; - - if (~dotty.lservers[lserver] | tablesize (dotty.lservers[lserver]) == 0) { -- if (~((fd = openio ('pipe', lserver, 'r+', '%e -Txdot')) >= 0)) { -+ if (~((fd = openio ('pipe', lserver, 'r+', '%e -Txdot1.2')) >= 0)) { - dotty.message (0, concat ('cannot start ', lserver)); - return null; - } -@@ -438,6 +438,8 @@ - } - } else if (t[i] == 'I') { - i = i + 7; -+ } else if (t[i] == 't') { -+ i = i + 2; - } else { - dotty.message (0, concat ('draw language parser error: ', t[i])); - return null; diff --git a/extra/graphviz/yyerror0.patch b/extra/graphviz/yyerror0.patch deleted file mode 100644 index f8bb98373..000000000 --- a/extra/graphviz/yyerror0.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 7aaddf52cd98589fb0c3ab72a393f8411838438a Mon Sep 17 00:00:00 2001 -From: "Emden R. Gansner" <erg@alum.mit.edu> -Date: Fri, 4 Oct 2013 09:06:39 -0400 -Subject: [PATCH] Fix buffer overflow problem when reporting a syntax error - with a very long input line - ---- - lib/cgraph/scan.l | 21 +++++++++++++++------ - 1 file changed, 15 insertions(+), 6 deletions(-) - -diff --git a/lib/cgraph/scan.l b/lib/cgraph/scan.l -index 3cfde0f..2efd203 100644 ---- a/lib/cgraph/scan.l -+++ b/lib/cgraph/scan.l -@@ -16,6 +16,7 @@ - %{ - #include <grammar.h> - #include <cghdr.h> -+#include <agxbuf.h> - #include <ctype.h> - #define GRAPH_EOF_TOKEN '@' /* lex class must be defined below */ - /* this is a workaround for linux flex */ -@@ -191,13 +192,21 @@ ID ({NAME}|{NUMBER}) - %% - void yyerror(char *str) - { -+ unsigned char xbuf[BUFSIZ]; - char buf[BUFSIZ]; -- if (InputFile) -- sprintf(buf,"%s:%d: %s in line %d near '%s'\n",InputFile, line_num, -- str,line_num,yytext); -- else -- sprintf(buf," %s in line %d near '%s'\n", str,line_num,yytext); -- agerr(AGWARN,buf); -+ agxbuf xb; -+ -+ agxbinit(&xb, BUFSIZ, xbuf); -+ if (InputFile) { -+ agxbput (&xb, InputFile); -+ agxbput (&xb, ": "); -+ } -+ sprintf(buf," %s in line %d near '", str,line_num); -+ agxbput (&xb, buf); -+ agxbput (&xb, yytext); -+ agxbput (&xb,"'\n"); -+ agerr(AGWARN,agxbuse(&xb)); -+ agxbfree(&xb); - } - /* must be here to see flex's macro defns */ - void aglexeof() { unput(GRAPH_EOF_TOKEN); } --- -1.8.5.1 - diff --git a/extra/graphviz/yyerror1.patch b/extra/graphviz/yyerror1.patch deleted file mode 100644 index 4f1faf4df..000000000 --- a/extra/graphviz/yyerror1.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d266bb2b4154d11c27252b56d86963aef4434750 Mon Sep 17 00:00:00 2001 -From: "Emden R. Gansner" <erg@alum.mit.edu> -Date: Tue, 7 Jan 2014 10:45:36 -0500 -Subject: [PATCH] Prevent possible buffer overflow in yyerror() - ---- - lib/cgraph/scan.l | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/lib/cgraph/scan.l b/lib/cgraph/scan.l -index 3efe1d5..212967c 100644 ---- a/lib/cgraph/scan.l -+++ b/lib/cgraph/scan.l -@@ -201,7 +201,8 @@ void yyerror(char *str) - agxbput (&xb, InputFile); - agxbput (&xb, ": "); - } -- sprintf(buf," %s in line %d near '", str,line_num); -+ agxbput (&xb, str); -+ sprintf(buf," in line %d near '", line_num); - agxbput (&xb, buf); - agxbput (&xb, yytext); - agxbput (&xb,"'\n"); --- -1.8.5.1 - |