From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1442417-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 1DC15158095
for <garchives@archives.gentoo.org>; Sun, 2 Oct 2022 19:57:28 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 32880E08A0;
Sun, 2 Oct 2022 19:57:27 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 1B738E08A0
for <gentoo-commits@lists.gentoo.org>; Sun, 2 Oct 2022 19:57:27 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 10BB5340E9B
for <gentoo-commits@lists.gentoo.org>; Sun, 2 Oct 2022 19:57:26 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 95986525
for <gentoo-commits@lists.gentoo.org>; Sun, 2 Oct 2022 19:57:24 +0000 (UTC)
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" <soap@gentoo.org>
Message-ID: <1664740610.b356ded56500ad7b9b69ef5a26ba4a2d675aeec0.soap@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphviz/, media-gfx/graphviz/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-gfx/graphviz/files/graphviz-6.0.1-private-ghostscript-symbols.patch media-gfx/graphviz/graphviz-6.0.1-r1.ebuild media-gfx/graphviz/graphviz-6.0.1.ebuild
X-VCS-Directories: media-gfx/graphviz/files/ media-gfx/graphviz/
X-VCS-Committer: soap
X-VCS-Committer-Name: David Seifert
X-VCS-Revision: b356ded56500ad7b9b69ef5a26ba4a2d675aeec0
X-VCS-Branch: master
Date: Sun, 2 Oct 2022 19:57:24 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: c95fed3d-3e28-4de0-aaa9-d76471f90346
X-Archives-Hash: 364ba0ff0a2dd539ab1f991b73447cfd
commit: b356ded56500ad7b9b69ef5a26ba4a2d675aeec0
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 2 19:56:50 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Oct 2 19:56:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b356ded5
media-gfx/graphviz: add patch for hidden gs symbols
Signed-off-by: David Seifert <soap <AT> gentoo.org>
...raphviz-6.0.1-private-ghostscript-symbols.patch | 31 ++++++++++++++++++++++
...phviz-6.0.1.ebuild => graphviz-6.0.1-r1.ebuild} | 5 ++++
2 files changed, 36 insertions(+)
diff --git a/media-gfx/graphviz/files/graphviz-6.0.1-private-ghostscript-symbols.patch b/media-gfx/graphviz/files/graphviz-6.0.1-private-ghostscript-symbols.patch
new file mode 100644
index 000000000000..8e409a9b5776
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-6.0.1-private-ghostscript-symbols.patch
@@ -0,0 +1,31 @@
+From 1288e430c6f6be992de09fc1f50ce7fef42b3f0a Mon Sep 17 00:00:00 2001
+From: Mark Hansen <markhansen@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
diff --git a/media-gfx/graphviz/graphviz-6.0.1.ebuild b/media-gfx/graphviz/graphviz-6.0.1-r1.ebuild
similarity index 98%
rename from media-gfx/graphviz/graphviz-6.0.1.ebuild
rename to media-gfx/graphviz/graphviz-6.0.1-r1.ebuild
index e88942bff58b..9c60b9f2702c 100644
--- a/media-gfx/graphviz/graphviz-6.0.1.ebuild
+++ b/media-gfx/graphviz/graphviz-6.0.1-r1.ebuild
@@ -138,6 +138,11 @@ BDEPEND="
# sci-libs/gts, x11-libs/gtk. Also needs 'gtk','glade','glut','gts' and 'png'
# with flags enabled at configure time
+PATCHES=(
+ # backport
+ "${FILESDIR}"/${P}-private-ghostscript-symbols.patch
+)
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}