Date: Tuesday, November 10, 2015 @ 23:18:07
Author: foutrelis
Revision: 250597
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
graphviz/repos/staging-i686/
graphviz/repos/staging-i686/PKGBUILD
(from rev 250596, graphviz/trunk/PKGBUILD)
graphviz/repos/staging-i686/format-string.patch
(from rev 250596, graphviz/trunk/format-string.patch)
graphviz/repos/staging-i686/ghostscript918.patch
(from rev 250596, graphviz/trunk/ghostscript918.patch)
graphviz/repos/staging-i686/install
(from rev 250596, graphviz/trunk/install)
graphviz/repos/staging-x86_64/
graphviz/repos/staging-x86_64/PKGBUILD
(from rev 250596, graphviz/trunk/PKGBUILD)
graphviz/repos/staging-x86_64/format-string.patch
(from rev 250596, graphviz/trunk/format-string.patch)
graphviz/repos/staging-x86_64/ghostscript918.patch
(from rev 250596, graphviz/trunk/ghostscript918.patch)
graphviz/repos/staging-x86_64/install
(from rev 250596, graphviz/trunk/install)
-------------------------------------+
staging-i686/PKGBUILD | 60 ++++++++++++++++++++++++++++++++++
staging-i686/format-string.patch | 21 +++++++++++
staging-i686/ghostscript918.patch | 18 ++++++++++
staging-i686/install | 12 ++++++
staging-x86_64/PKGBUILD | 60 ++++++++++++++++++++++++++++++++++
staging-x86_64/format-string.patch | 21 +++++++++++
staging-x86_64/ghostscript918.patch | 18 ++++++++++
staging-x86_64/install | 12 ++++++
8 files changed, 222 insertions(+)
Copied: graphviz/repos/staging-i686/PKGBUILD (from rev 250596,
graphviz/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2015-11-10 22:18:07 UTC (rev 250597)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Gaetan Bisson <[email protected]>
+# Contributor: kevin <[email protected]>
+# Contributor: John Proctor <[email protected]>
+
+pkgname=graphviz
+pkgver=2.38.0
+pkgrel=6
+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' 'gtk2')
+optdepends=('mono: sharp bindings'
+ 'guile: guile bindings'
+ 'lua51: lua bindings'
+ 'ocaml: ocaml bindings'
+ 'perl: perl bindings'
+ 'php: php bindings'
+ 'python2: python bindings'
+ 'r: r bindings'
+ 'tcl: tcl bindings'
+ 'qt4: gvedit'
+ 'gtk2: gtk output plugin')
+source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz"
+ 'format-string.patch'
+ 'ghostscript918.patch')
+sha1sums=('053c771278909160916ca5464a0a98ebf034c6ef'
+ '271d116bc022596a64b6ee061f3d2e50fa2e6025'
+ 'bcce75a535c277556e196638e59ea019b0a63fa1')
+
+install=install
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../format-string.patch # FS#42983
+ patch -p1 -i ../ghostscript918.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ export LIBPOSTFIX=/
+ export PYTHON=python2
+ export LUA=lua5.1
+
+ ./configure --prefix=/usr
+ make
+}
+
+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"
+}
Copied: graphviz/repos/staging-i686/format-string.patch (from rev 250596,
graphviz/trunk/format-string.patch)
===================================================================
--- staging-i686/format-string.patch (rev 0)
+++ staging-i686/format-string.patch 2015-11-10 22:18:07 UTC (rev 250597)
@@ -0,0 +1,21 @@
+diff -Naur old/lib/cgraph/scan.l new/lib/cgraph/scan.l
+--- old/lib/cgraph/scan.l 2014-04-13 10:40:25.000000000 -1000
++++ new/lib/cgraph/scan.l 2014-12-02 08:54:21.285050735 -1000
+@@ -149,7 +149,7 @@
+ agxbput(&xb,buf);
+ agxbput(&xb,fname);
+ agxbput(&xb, " splits into two tokens\n");
+- agerr(AGWARN,agxbuse(&xb));
++ agerr(AGWARN, "%s", agxbuse(&xb));
+
+ agxbfree(&xb);
+ return 1;
+@@ -225,7 +225,7 @@
+ agxbput (&xb, buf);
+ agxbput (&xb, yytext);
+ agxbput (&xb,"'\n");
+- agerr(AGERR,agxbuse(&xb));
++ agerr(AGERR, "%s", agxbuse(&xb));
+ agxbfree(&xb);
+ }
+ /* must be here to see flex's macro defns */
Copied: graphviz/repos/staging-i686/ghostscript918.patch (from rev 250596,
graphviz/trunk/ghostscript918.patch)
===================================================================
--- staging-i686/ghostscript918.patch (rev 0)
+++ staging-i686/ghostscript918.patch 2015-11-10 22:18:07 UTC (rev 250597)
@@ -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";
Copied: graphviz/repos/staging-i686/install (from rev 250596,
graphviz/trunk/install)
===================================================================
--- staging-i686/install (rev 0)
+++ staging-i686/install 2015-11-10 22:18:07 UTC (rev 250597)
@@ -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}
+}
Copied: graphviz/repos/staging-x86_64/PKGBUILD (from rev 250596,
graphviz/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2015-11-10 22:18:07 UTC (rev 250597)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Gaetan Bisson <[email protected]>
+# Contributor: kevin <[email protected]>
+# Contributor: John Proctor <[email protected]>
+
+pkgname=graphviz
+pkgver=2.38.0
+pkgrel=6
+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' 'gtk2')
+optdepends=('mono: sharp bindings'
+ 'guile: guile bindings'
+ 'lua51: lua bindings'
+ 'ocaml: ocaml bindings'
+ 'perl: perl bindings'
+ 'php: php bindings'
+ 'python2: python bindings'
+ 'r: r bindings'
+ 'tcl: tcl bindings'
+ 'qt4: gvedit'
+ 'gtk2: gtk output plugin')
+source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz"
+ 'format-string.patch'
+ 'ghostscript918.patch')
+sha1sums=('053c771278909160916ca5464a0a98ebf034c6ef'
+ '271d116bc022596a64b6ee061f3d2e50fa2e6025'
+ 'bcce75a535c277556e196638e59ea019b0a63fa1')
+
+install=install
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../format-string.patch # FS#42983
+ patch -p1 -i ../ghostscript918.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ export LIBPOSTFIX=/
+ export PYTHON=python2
+ export LUA=lua5.1
+
+ ./configure --prefix=/usr
+ make
+}
+
+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"
+}
Copied: graphviz/repos/staging-x86_64/format-string.patch (from rev 250596,
graphviz/trunk/format-string.patch)
===================================================================
--- staging-x86_64/format-string.patch (rev 0)
+++ staging-x86_64/format-string.patch 2015-11-10 22:18:07 UTC (rev 250597)
@@ -0,0 +1,21 @@
+diff -Naur old/lib/cgraph/scan.l new/lib/cgraph/scan.l
+--- old/lib/cgraph/scan.l 2014-04-13 10:40:25.000000000 -1000
++++ new/lib/cgraph/scan.l 2014-12-02 08:54:21.285050735 -1000
+@@ -149,7 +149,7 @@
+ agxbput(&xb,buf);
+ agxbput(&xb,fname);
+ agxbput(&xb, " splits into two tokens\n");
+- agerr(AGWARN,agxbuse(&xb));
++ agerr(AGWARN, "%s", agxbuse(&xb));
+
+ agxbfree(&xb);
+ return 1;
+@@ -225,7 +225,7 @@
+ agxbput (&xb, buf);
+ agxbput (&xb, yytext);
+ agxbput (&xb,"'\n");
+- agerr(AGERR,agxbuse(&xb));
++ agerr(AGERR, "%s", agxbuse(&xb));
+ agxbfree(&xb);
+ }
+ /* must be here to see flex's macro defns */
Copied: graphviz/repos/staging-x86_64/ghostscript918.patch (from rev 250596,
graphviz/trunk/ghostscript918.patch)
===================================================================
--- staging-x86_64/ghostscript918.patch (rev 0)
+++ staging-x86_64/ghostscript918.patch 2015-11-10 22:18:07 UTC (rev 250597)
@@ -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";
Copied: graphviz/repos/staging-x86_64/install (from rev 250596,
graphviz/trunk/install)
===================================================================
--- staging-x86_64/install (rev 0)
+++ staging-x86_64/install 2015-11-10 22:18:07 UTC (rev 250597)
@@ -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}
+}
