diff options
author | Justin Lecher <jlec@gentoo.org> | 2015-10-23 11:59:51 +0200 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2015-10-23 12:00:05 +0200 |
commit | 496566c75f483786d581f34196309bc4becb2481 (patch) | |
tree | e15bdbed0e869da8a3107b912e5666720b55d4f1 /app-text | |
parent | www-apache/passenger: add 5.0.21 (diff) | |
download | gentoo-496566c75f483786d581f34196309bc4becb2481.tar.gz gentoo-496566c75f483786d581f34196309bc4becb2481.tar.bz2 gentoo-496566c75f483786d581f34196309bc4becb2481.zip |
app-text/ghostscript-gpl: Backport fix for missing header
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=563540
Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec@gentoo.org>
Diffstat (limited to 'app-text')
-rw-r--r-- | app-text/ghostscript-gpl/files/ghostscript-gpl-9.18-gserrors.h-backport.patch | 43 | ||||
-rw-r--r-- | app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild | 2 |
2 files changed, 45 insertions, 0 deletions
diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.18-gserrors.h-backport.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.18-gserrors.h-backport.patch new file mode 100644 index 000000000000..c34e4866213e --- /dev/null +++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.18-gserrors.h-backport.patch @@ -0,0 +1,43 @@ +From feafe5e540a0545ec5d28f3f66bb542056bba495 Mon Sep 17 00:00:00 2001 +From: Chris Liddell <chris.liddell@artifex.com> +Date: Fri, 23 Oct 2015 10:16:11 +0100 +Subject: [PATCH] Bug 696301: add gserrors.h to the installed files + +for the so-install target. + +Also remove a spurious (copy'n'paste error) comment. + +No cluster differences +--- + base/gserrors.h | 2 +- + base/unix-dll.mak | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/base/gserrors.h b/base/gserrors.h +index 5f18081..cdebb38 100644 +--- a/base/gserrors.h ++++ b/base/gserrors.h +@@ -25,7 +25,7 @@ + /* We don't use a typedef internally to avoid a lot of casting. */ + + enum gs_error_type { +- gs_error_ok = 0, /* unknown error */ ++ gs_error_ok = 0, + gs_error_unknownerror = -1, /* unknown error */ + gs_error_dictfull = -2, + gs_error_dictstackoverflow = -3, +diff --git a/base/unix-dll.mak b/base/unix-dll.mak +index 7b67aa1..73b4fa9 100644 +--- a/base/unix-dll.mak ++++ b/base/unix-dll.mak +@@ -186,6 +186,7 @@ install-so-subtarget: so-subtarget + ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR) + $(INSTALL_DATA) $(PSSRC)iapi.h $(DESTDIR)$(gsincludedir)iapi.h + $(INSTALL_DATA) $(PSSRC)ierrors.h $(DESTDIR)$(gsincludedir)ierrors.h ++ $(INSTALL_DATA) $(GLSRC)gserrors.h $(DESTDIR)$(gsincludedir)gserrors.h + $(INSTALL_DATA) $(DEVSRC)gdevdsp.h $(DESTDIR)$(gsincludedir)gdevdsp.h + + soinstall: +-- +2.5.1 + diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild index 4cf5c854de5d..a9ba6bf30764 100644 --- a/app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild +++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild @@ -94,6 +94,8 @@ src_prepare() { ghostscript-gpl-9.12-icc-missing-check.patch" epatch + epatch "${FILESDIR}"/${P}-gserrors.h-backport.patch + if use djvu ; then unpack gsdjvu-${GSDJVU_PV}.tar.gz cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}" || die |