Date: Monday, September 26, 2022 @ 11:40:11
Author: andyrtr
Revision: 456811
upgpkg: graphviz 5.0.1-3: apply upstream fix to stop using now-hidden
gs_error_names symbol - FS#75991
Added:
graphviz/trunk/0001_stop_using_now-hidden_gs_error_names_symbol.patch
Modified:
graphviz/trunk/PKGBUILD
--------------------------------------------------------+
0001_stop_using_now-hidden_gs_error_names_symbol.patch | 32 +++++++++++++++
PKGBUILD | 12 +++--
2 files changed, 40 insertions(+), 4 deletions(-)
Added: 0001_stop_using_now-hidden_gs_error_names_symbol.patch
===================================================================
--- 0001_stop_using_now-hidden_gs_error_names_symbol.patch
(rev 0)
+++ 0001_stop_using_now-hidden_gs_error_names_symbol.patch 2022-09-26
11:40:11 UTC (rev 456811)
@@ -0,0 +1,32 @@
+From 00e64ef3b5cd5a06414070c530c957f03b9cbf9d Mon Sep 17 00:00:00 2001
+From: Mark Hansen <[email protected]>
+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
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-09-26 10:39:51 UTC (rev 456810)
+++ PKGBUILD 2022-09-26 11:40:11 UTC (rev 456811)
@@ -4,7 +4,7 @@
pkgname=graphviz
pkgver=5.0.1
-pkgrel=2
+pkgrel=3
pkgdesc='Graph visualization software'
url='https://www.graphviz.org/'
license=('EPL')
@@ -23,15 +23,19 @@
'gtk2: gtk output plugin'
'xterm: vimdot')
source=("https://gitlab.com/graphviz/graphviz/-/archive/$pkgver/$pkgname-$pkgver.tar.gz";
- 'ghostscript918.patch')
+ 'ghostscript918.patch'
+ 0001_stop_using_now-hidden_gs_error_names_symbol.patch)
sha256sums=('6c704a3ffeaf2f7ae63f7d0da453cd624d93a9306a2e5dbda07e5ec38343d2b8'
- '0083d126e27f2223ec4226fc1d71c9c84106968a0fdf65de838aee1e4882bfdb')
-
+ '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
}
