Date: Sunday, October 16, 2022 @ 17:18:03
Author: arojas
Revision: 458257
archrelease: copy trunk to extra-x86_64
Added:
graphviz/repos/extra-x86_64/PKGBUILD
(from rev 458256, graphviz/trunk/PKGBUILD)
graphviz/repos/extra-x86_64/ghostscript918.patch
(from rev 458256, graphviz/trunk/ghostscript918.patch)
graphviz/repos/extra-x86_64/install
(from rev 458256, graphviz/trunk/install)
Deleted:
graphviz/repos/extra-x86_64/0001_stop_using_now-hidden_gs_error_names_symbol.patch
graphviz/repos/extra-x86_64/PKGBUILD
graphviz/repos/extra-x86_64/ghostscript918.patch
graphviz/repos/extra-x86_64/install
--------------------------------------------------------+
0001_stop_using_now-hidden_gs_error_names_symbol.patch | 32 ---
PKGBUILD | 125 +++++++--------
ghostscript918.patch | 36 ++--
install | 24 +-
4 files changed, 90 insertions(+), 127 deletions(-)
Deleted: 0001_stop_using_now-hidden_gs_error_names_symbol.patch
===================================================================
--- 0001_stop_using_now-hidden_gs_error_names_symbol.patch 2022-10-16
17:17:51 UTC (rev 458256)
+++ 0001_stop_using_now-hidden_gs_error_names_symbol.patch 2022-10-16
17:18:03 UTC (rev 458257)
@@ -1,32 +0,0 @@
-From 00e64ef3b5cd5a06414070c530c957f03b9cbf9d Mon Sep 17 00:00:00 2001
-From: Mark Hansen <markhan...@google.com>
-Date: Mon, 26 Sep 2022 20:43:39 +1000
-Subject: [PATCH] Stop using now-hidden gs_error_names symbol
-
-GhostScript hid their gs_error_names symbol as part of a global by-default
hiding of non-API symbols.
-
-It will probably take a while for GhostScript to get a public API for these
symbols back into a release, so let's stop using the symbol for now, until then.
-
-Fixes #2280
----
- plugin/gs/gvloadimage_gs.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/plugin/gs/gvloadimage_gs.c b/plugin/gs/gvloadimage_gs.c
-index e909c6f32..d852663af 100644
---- a/plugin/gs/gvloadimage_gs.c
-+++ b/plugin/gs/gvloadimage_gs.c
-@@ -86,8 +86,8 @@ static void gs_error(GVJ_t * job, const char *name, const
char *funstr, int err)
- else
- errsrc = "Ghostscript internal error";
-
-- job->common->errorfn("%s: %s() returned: %d \"%s\" (%s)\n",
-- name, funstr, err, gs_error_names[-err - 1], errsrc);
-+ job->common->errorfn("%s: %s() returned: %d (%s)\n",
-+ name, funstr, err, errsrc);
- }
-
- static int gvloadimage_process_file(GVJ_t *job, usershape_t *us, void
*instance)
---
-GitLab
-
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-10-16 17:17:51 UTC (rev 458256)
+++ PKGBUILD 2022-10-16 17:18:03 UTC (rev 458257)
@@ -1,65 +0,0 @@
-# Maintainer: Gaetan Bisson <bis...@archlinux.org>
-# Contributor: kevin <ke...@archlinux.org>
-# Contributor: John Proctor <jproc...@prium.net>
-
-pkgname=graphviz
-pkgver=6.0.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>=4.14.0' 'perl' 'python' 'r'
'tk' 'qt5-base' 'gtk2')
-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://gitlab.com/graphviz/graphviz/-/archive/$pkgver/$pkgname-$pkgver.tar.gz";
- 'ghostscript918.patch'
- 0001_stop_using_now-hidden_gs_error_names_symbol.patch)
-sha256sums=('92a5cabb71c2610ffb713f0da7ee595fa143f3fae5eaff172927dd27355d9775'
- '0083d126e27f2223ec4226fc1d71c9c84106968a0fdf65de838aee1e4882bfdb'
- '6b54b43d86856626f67c824058aca966494ac5d64d901d66340a0e3838d69ae9')
-install=install
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i ../ghostscript918.patch
- # FS#75991 / https://gitlab.com/graphviz/graphviz/-/issues/2280
- # https://gitlab.com/graphviz/graphviz/-/issues/2280
- patch -p1 -i ../0001_stop_using_now-hidden_gs_error_names_symbol.patch
- ./autogen.sh NOCONFIG
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- export LIBPOSTFIX=/
- export CXXFLAGS+=' -fPIC -fpermissive'
-
- ./configure --prefix=/usr \
- --enable-python3=yes --disable-python --enable-lefty
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool # Fix
overlinking
- 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/extra-x86_64/PKGBUILD (from rev 458256,
graphviz/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-10-16 17:18:03 UTC (rev 458257)
@@ -0,0 +1,60 @@
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+# Contributor: kevin <ke...@archlinux.org>
+# Contributor: John Proctor <jproc...@prium.net>
+
+pkgname=graphviz
+pkgver=6.0.2
+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>=4.14.0' 'perl' 'python' 'r'
'tk' 'qt5-base' 'gtk2')
+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://gitlab.com/graphviz/graphviz/-/archive/$pkgver/$pkgname-$pkgver.tar.gz";
+ 'ghostscript918.patch')
+sha256sums=('a9b823af1f1648f1c325050c45b401c38bde86519e8c1ade16284a8f68bed3ff'
+ '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 --enable-lefty
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool # Fix
overlinking
+ 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 2022-10-16 17:17:51 UTC (rev 458256)
+++ ghostscript918.patch 2022-10-16 17:18:03 UTC (rev 458257)
@@ -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 458256,
graphviz/trunk/ghostscript918.patch)
===================================================================
--- ghostscript918.patch (rev 0)
+++ ghostscript918.patch 2022-10-16 17:18:03 UTC (rev 458257)
@@ -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 2022-10-16 17:17:51 UTC (rev 458256)
+++ install 2022-10-16 17:18:03 UTC (rev 458257)
@@ -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 458256,
graphviz/trunk/install)
===================================================================
--- install (rev 0)
+++ install 2022-10-16 17:18:03 UTC (rev 458257)
@@ -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}
+}
