[arch-commits] Commit in graphviz/repos/staging-x86_64 (6 files)

Felix Yan felixonmars at archlinux.org
Wed Jul 1 16:51:48 UTC 2020


    Date: Wednesday, July 1, 2020 @ 16:51:48
  Author: felixonmars
Revision: 390707

archrelease: copy trunk to staging-x86_64

Added:
  graphviz/repos/staging-x86_64/PKGBUILD
    (from rev 390706, graphviz/trunk/PKGBUILD)
  graphviz/repos/staging-x86_64/ghostscript918.patch
    (from rev 390706, graphviz/trunk/ghostscript918.patch)
  graphviz/repos/staging-x86_64/install
    (from rev 390706, graphviz/trunk/install)
Deleted:
  graphviz/repos/staging-x86_64/PKGBUILD
  graphviz/repos/staging-x86_64/ghostscript918.patch
  graphviz/repos/staging-x86_64/install

----------------------+
 PKGBUILD             |  120 ++++++++++++++++++++++++-------------------------
 ghostscript918.patch |   36 +++++++-------
 install              |   24 ++++-----
 3 files changed, 90 insertions(+), 90 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-01 16:51:20 UTC (rev 390706)
+++ PKGBUILD	2020-07-01 16:51:48 UTC (rev 390707)
@@ -1,60 +0,0 @@
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: kevin <kevin at archlinux.org>
-# Contributor: John Proctor <jproctor at prium.net>
-
-pkgname=graphviz
-pkgver=2.44.0
-pkgrel=6
-pkgdesc='Graph visualization software'
-url='https://www.graphviz.org/'
-license=('EPL')
-arch=('x86_64')
-depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts' 'gsfonts' 'libnsl' 'libpng')
-makedepends=('swig' 'mono' 'guile' 'lua' 'ocaml' 'perl' 'python' 'r' 'tk' 'qt5-base' 'gtk2' 'git')
-optdepends=('mono: sharp bindings'
-            'guile: guile bindings'
-            'lua: lua bindings'
-            'ocaml: ocaml bindings'
-            'perl: perl bindings'
-            'python: python bindings'
-            'r: r bindings'
-            'tcl: tcl bindings'
-            'qt5-base: gvedit'
-            'gtk2: gtk output plugin'
-            'xterm: vimdot')
-source=("https://www2.graphviz.org/Packages/stable/portable_source/graphviz-${pkgver}.tar.gz"
-        'ghostscript918.patch')
-sha256sums=('9aabd13a8018b708ab3c822de2326c19d0a52ed59f50a6b0f9318c07e2a6d93b'
-            '0083d126e27f2223ec4226fc1d71c9c84106968a0fdf65de838aee1e4882bfdb')
-
-install=install
-
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../ghostscript918.patch
-	./autogen.sh NOCONFIG
-}
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	export LIBPOSTFIX=/
-	export CXXFLAGS+=' -fPIC -fpermissive'
-
-	./configure --prefix=/usr \
-           --enable-python3=yes --disable-python
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-
-	# fix symlink to symlink that doesn't get picked up by makepkg's zipman
-	ln -s 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 390706, graphviz/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-07-01 16:51:48 UTC (rev 390707)
@@ -0,0 +1,60 @@
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: kevin <kevin at archlinux.org>
+# Contributor: John Proctor <jproctor at prium.net>
+
+pkgname=graphviz
+pkgver=2.44.1
+pkgrel=1
+pkgdesc='Graph visualization software'
+url='https://www.graphviz.org/'
+license=('EPL')
+arch=('x86_64')
+depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts' 'gsfonts' 'libnsl' 'libpng')
+makedepends=('swig' 'mono' 'guile' 'lua' 'ocaml' 'perl' 'python' 'r' 'tk' 'qt5-base' 'gtk2' 'git')
+optdepends=('mono: sharp bindings'
+            'guile: guile bindings'
+            'lua: lua bindings'
+            'ocaml: ocaml bindings'
+            'perl: perl bindings'
+            'python: python bindings'
+            'r: r bindings'
+            'tcl: tcl bindings'
+            'qt5-base: gvedit'
+            'gtk2: gtk output plugin'
+            'xterm: vimdot')
+source=("https://www2.graphviz.org/Packages/stable/portable_source/graphviz-${pkgver}.tar.gz"
+        'ghostscript918.patch')
+sha512sums=('42e6137c7cce18daf6f17e6fcbbdfe8e0a531de1bdd3ac7b8751445214aa0d85713b65ba896a234a02670827b0d608bd64b758ef60a4d0384ffa3355ee0dbc42'
+            '314b444da2fed31535d164e47abcaf866f57b8fea3514a6642a8f4539611a93d7f74462049d769004bfd734abee33e5b86ffe3ac49e0b7f50ea177624d68d510')
+
+install=install
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../ghostscript918.patch
+	./autogen.sh NOCONFIG
+}
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	export LIBPOSTFIX=/
+	export CXXFLAGS+=' -fPIC -fpermissive'
+
+	./configure --prefix=/usr \
+           --enable-python3=yes --disable-python
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+
+	# fix symlink to symlink that doesn't get picked up by makepkg's zipman
+	ln -s 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	2020-07-01 16:51:20 UTC (rev 390706)
+++ ghostscript918.patch	2020-07-01 16:51:48 UTC (rev 390707)
@@ -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 390706, graphviz/trunk/ghostscript918.patch)
===================================================================
--- ghostscript918.patch	                        (rev 0)
+++ ghostscript918.patch	2020-07-01 16:51:48 UTC (rev 390707)
@@ -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	2020-07-01 16:51:20 UTC (rev 390706)
+++ install	2020-07-01 16:51:48 UTC (rev 390707)
@@ -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 390706, graphviz/trunk/install)
===================================================================
--- install	                        (rev 0)
+++ install	2020-07-01 16:51:48 UTC (rev 390707)
@@ -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}
+}


More information about the arch-commits mailing list