Date: Friday, October 25, 2019 @ 15:11:37
Author: felixonmars
Revision: 365597
archrelease: copy trunk to staging-x86_64
Added:
graphviz/repos/staging-x86_64/PKGBUILD
(from rev 365596, graphviz/trunk/PKGBUILD)
graphviz/repos/staging-x86_64/ghostscript918.patch
(from rev 365596, graphviz/trunk/ghostscript918.patch)
graphviz/repos/staging-x86_64/install
(from rev 365596, graphviz/trunk/install)
Deleted:
graphviz/repos/staging-x86_64/PKGBUILD
graphviz/repos/staging-x86_64/ghostscript918.patch
graphviz/repos/staging-x86_64/install
----------------------+
PKGBUILD | 124 ++++++++++++++++++++++++-------------------------
ghostscript918.patch | 36 +++++++-------
install | 24 ++++-----
3 files changed, 92 insertions(+), 92 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-10-25 15:11:15 UTC (rev 365596)
+++ PKGBUILD 2019-10-25 15:11:37 UTC (rev 365597)
@@ -1,62 +0,0 @@
-# Maintainer: Gaetan Bisson <bis...@archlinux.org>
-# Contributor: kevin <ke...@archlinux.org>
-# Contributor: John Proctor <jproc...@prium.net>
-
-pkgname=graphviz
-pkgver=2.42.2
-_commit=da4c2ec6f24ca1b6d1752c6b5bc4389e55682147
-pkgrel=4
-pkgdesc='Graph visualization software'
-url='https://www.graphviz.org/'
-license=('EPL')
-arch=('x86_64')
-depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts'
'gsfonts' 'libnsl')
-makedepends=('swig' 'mono' 'guile' 'lua' 'ocaml' 'perl' 'python2' 'r' 'tk'
'qt5-base' 'gtk2' 'git')
-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'
- 'qt5-base: gvedit'
- 'gtk2: gtk output plugin'
- 'xterm: vimdot')
-source=("git+https://gitlab.com/graphviz/graphviz.git#commit=$_commit";
- 'ghostscript918.patch')
-sha256sums=('SKIP'
- '0083d126e27f2223ec4226fc1d71c9c84106968a0fdf65de838aee1e4882bfdb')
-
-install=install
-
-prepare() {
- cd "${srcdir}/${pkgname}"
- patch -p1 -i ../ghostscript918.patch
- ./autogen.sh
-}
-
-build() {
- cd "${srcdir}/${pkgname}"
- export PYTHON=python2
- export LIBPOSTFIX=/
- # -fpermissive required for OCaml 4.09 rebuild
- export CXXFLAGS+=' -fPIC -fpermissive'
-
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}"
- make DESTDIR="${pkgdir}" install
-
- # fix symlink to symlink that doesn't get picked up by makepkg's zipman
- ln -sf gv2gxl.1.gz "${pkgdir}"/usr/share/man/man1/dot2gxl.1.gz
- rm "${pkgdir}"/usr/share/man/man1/dot2gxl.1
-
- # Deduplicates TCL libraries
- cd "${pkgdir}/usr/lib/tcl8.6"
- rm -fr graphviz
- ln -s ../graphviz/tcl graphviz
-}
Copied: graphviz/repos/staging-x86_64/PKGBUILD (from rev 365596,
graphviz/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-10-25 15:11:37 UTC (rev 365597)
@@ -0,0 +1,62 @@
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+# Contributor: kevin <ke...@archlinux.org>
+# Contributor: John Proctor <jproc...@prium.net>
+
+pkgname=graphviz
+pkgver=2.42.2
+_commit=da4c2ec6f24ca1b6d1752c6b5bc4389e55682147
+pkgrel=5
+pkgdesc='Graph visualization software'
+url='https://www.graphviz.org/'
+license=('EPL')
+arch=('x86_64')
+depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts'
'gsfonts' 'libnsl')
+makedepends=('swig' 'mono' 'guile' 'lua' 'ocaml' 'perl' 'python2' 'r' 'tk'
'qt5-base' 'gtk2' 'git')
+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'
+ 'qt5-base: gvedit'
+ 'gtk2: gtk output plugin'
+ 'xterm: vimdot')
+source=("git+https://gitlab.com/graphviz/graphviz.git#commit=$_commit";
+ 'ghostscript918.patch')
+sha256sums=('SKIP'
+ '0083d126e27f2223ec4226fc1d71c9c84106968a0fdf65de838aee1e4882bfdb')
+
+install=install
+
+prepare() {
+ cd "${srcdir}/${pkgname}"
+ patch -p1 -i ../ghostscript918.patch
+ ./autogen.sh
+}
+
+build() {
+ cd "${srcdir}/${pkgname}"
+ export PYTHON=python2
+ export LIBPOSTFIX=/
+ # -fpermissive required for OCaml 4.09 rebuild
+ export CXXFLAGS+=' -fPIC -fpermissive'
+
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}"
+ make DESTDIR="${pkgdir}" install
+
+ # fix symlink to symlink that doesn't get picked up by makepkg's zipman
+ ln -sf gv2gxl.1.gz "${pkgdir}"/usr/share/man/man1/dot2gxl.1.gz
+ rm "${pkgdir}"/usr/share/man/man1/dot2gxl.1
+
+ # Deduplicates TCL libraries
+ cd "${pkgdir}/usr/lib/tcl8.6"
+ rm -fr graphviz
+ ln -s ../graphviz/tcl graphviz
+}
Deleted: ghostscript918.patch
===================================================================
--- ghostscript918.patch 2019-10-25 15:11:15 UTC (rev 365596)
+++ ghostscript918.patch 2019-10-25 15:11:37 UTC (rev 365597)
@@ -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/staging-x86_64/ghostscript918.patch (from rev 365596,
graphviz/trunk/ghostscript918.patch)
===================================================================
--- ghostscript918.patch (rev 0)
+++ ghostscript918.patch 2019-10-25 15:11:37 UTC (rev 365597)
@@ -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 2019-10-25 15:11:15 UTC (rev 365596)
+++ install 2019-10-25 15:11:37 UTC (rev 365597)
@@ -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/staging-x86_64/install (from rev 365596,
graphviz/trunk/install)
===================================================================
--- install (rev 0)
+++ install 2019-10-25 15:11:37 UTC (rev 365597)
@@ -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}
+}
