| 1 |
commit: eece1257212526702c8ba11fa31bffcb9c979911 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 26 21:14:45 2016 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 26 21:15:04 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eece1257 |
| 7 |
|
| 8 |
media-gfx/graphviz: Add conditional macro definition |
| 9 |
|
| 10 |
Gentoo-bug: 574484 |
| 11 |
* Merged the 3 following upstream commits into one patch: |
| 12 |
- https://github.com/ellson/graphviz/commit/8da53964edec8a665c3996d483df243eb150c2c4 |
| 13 |
- https://github.com/ellson/graphviz/commit/f97c86e975aa472272d0a5b5a042b96eb77ebbc0 |
| 14 |
- https://github.com/ellson/graphviz/commit/c3e9169655c1fca8006d3d455381848730531bd4 |
| 15 |
|
| 16 |
Package-Manager: portage-2.3.0 |
| 17 |
|
| 18 |
.../files/graphviz-2.38.0-ghostscript-9.18.patch | 32 ++++++++++++++++++++++ |
| 19 |
media-gfx/graphviz/graphviz-2.38.0-r1.ebuild | 7 +++-- |
| 20 |
2 files changed, 36 insertions(+), 3 deletions(-) |
| 21 |
|
| 22 |
diff --git a/media-gfx/graphviz/files/graphviz-2.38.0-ghostscript-9.18.patch b/media-gfx/graphviz/files/graphviz-2.38.0-ghostscript-9.18.patch |
| 23 |
new file mode 100644 |
| 24 |
index 00000000..9d0d78a |
| 25 |
--- /dev/null |
| 26 |
+++ b/media-gfx/graphviz/files/graphviz-2.38.0-ghostscript-9.18.patch |
| 27 |
@@ -0,0 +1,32 @@ |
| 28 |
+From 8da53964edec8a665c3996d483df243eb150c2c4 Mon Sep 17 00:00:00 2001 |
| 29 |
+From: Jakob Nixdorf <flocke@×××××××××.org> |
| 30 |
+Date: Fri, 22 Jan 2016 20:10:42 +0100 |
| 31 |
+Subject: [PATCH] Fix build with ghostscript-9.18. |
| 32 |
+ |
| 33 |
+--- a/plugin/gs/gvloadimage_gs.c |
| 34 |
++++ b/plugin/gs/gvloadimage_gs.c |
| 35 |
+@@ -32,6 +32,24 @@ |
| 36 |
+ #include <ghostscript/ierrors.h> |
| 37 |
+ #include <cairo/cairo.h> |
| 38 |
+ |
| 39 |
++ |
| 40 |
++/** |
| 41 |
++ * Ensure compatibility with Ghostscipt versions newer than 9.18 |
| 42 |
++ * while maintaining compatibility with the older versions. |
| 43 |
++ **/ |
| 44 |
++ |
| 45 |
++#ifndef e_VMerror |
| 46 |
++#define e_VMerror gs_error_VMerror |
| 47 |
++#endif |
| 48 |
++ |
| 49 |
++#ifndef e_unregistered |
| 50 |
++#define e_unregistered gs_error_unregistered |
| 51 |
++#endif |
| 52 |
++ |
| 53 |
++#ifndef e_invalidid |
| 54 |
++#define e_invalidid gs_error_invalidid |
| 55 |
++#endif |
| 56 |
++ |
| 57 |
+ #ifdef WIN32 |
| 58 |
+ #define NUL_FILE "nul" |
| 59 |
+ #else |
| 60 |
|
| 61 |
diff --git a/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild b/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild |
| 62 |
index a8c0d44..bea6c12 100644 |
| 63 |
--- a/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild |
| 64 |
+++ b/media-gfx/graphviz/graphviz-2.38.0-r1.ebuild |
| 65 |
@@ -1,4 +1,4 @@ |
| 66 |
-# Copyright 1999-2015 Gentoo Foundation |
| 67 |
+# Copyright 1999-2016 Gentoo Foundation |
| 68 |
# Distributed under the terms of the GNU General Public License v2 |
| 69 |
# $Id$ |
| 70 |
|
| 71 |
@@ -140,7 +140,8 @@ pkg_setup() { |
| 72 |
src_prepare() { |
| 73 |
epatch \ |
| 74 |
"${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch \ |
| 75 |
- "${FILESDIR}"/${PN}-2.34.0-dot-pangocairo-link.patch |
| 76 |
+ "${FILESDIR}"/${PN}-2.34.0-dot-pangocairo-link.patch \ |
| 77 |
+ "${FILESDIR}"/${PN}-2.38.0-ghostscript-9.18.patch |
| 78 |
|
| 79 |
# ToDo: Do the same thing for examples and/or |
| 80 |
# write a patch for a configuration-option |
| 81 |
@@ -155,7 +156,7 @@ src_prepare() { |
| 82 |
# This is an old version of libtool |
| 83 |
# use the ./configure option to exclude its use, and |
| 84 |
# delete the dir since we don't need to eautoreconf it |
| 85 |
- rm -rf libltdl |
| 86 |
+ rm -rf libltdl || die |
| 87 |
|
| 88 |
# no nls, no gettext, no iconv macro, so disable it |
| 89 |
use nls || { sed -i -e '/^AM_ICONV/d' configure.ac || die; } |
Archives