diff options
| -rw-r--r-- | libre/ghostscript/PKGBUILD | 8 | ||||
| -rw-r--r-- | libre/ghostscript/add_gserrors_h.diff | 43 |
2 files changed, 49 insertions, 2 deletions
diff --git a/libre/ghostscript/PKGBUILD b/libre/ghostscript/PKGBUILD index d653c09aa..b3139e576 100644 --- a/libre/ghostscript/PKGBUILD +++ b/libre/ghostscript/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 249384 2015-10-15 15:37:05Z andyrtr $ +# $Id: PKGBUILD 249913 2015-11-01 10:30:58Z andyrtr $ # Maintainer (Arch): AndyRTR <andyrtr@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> @@ -6,7 +6,7 @@ pkgname=ghostscript pkgver=9.18 -pkgrel=3.parabola1 +pkgrel=4.parabola1 pkgdesc="An interpreter for the PostScript language, without nonfree JPEG XR support" arch=('i686' 'x86_64') license=('AGPL' 'custom') @@ -22,6 +22,7 @@ mksource=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2) source=(https://repo.parabola.nu/other/ghostscript-libre/ghostscript-libre-${pkgver}.tar.bz2 ghostscript-sys-zlib.patch bug_696246.diff + add_gserrors_h.diff libre.patch) #options=('!makeflags') # http://downloads.ghostscript.com/public/SHA1SUMS @@ -29,6 +30,7 @@ mksha1sums=('388fea50a38e422a4c6ff27c184491bf5ecb96e1') sha1sums=('6899da0407e4bf4a9f65848e68df237ed83c04ee' 'e054caf753df4d67221b29a2eac66130653f7556' 'f259eaac3beb0ec346bb2d4d2455e4e3baddecd4' + 'ca686fed1af36d1f9fa866b47ff129c71d6a19ff' '51f821faec00749ed8b61d772879269f9809f694') mksource() { cd ghostscript-${pkgver} @@ -43,6 +45,8 @@ prepare() { patch -Np1 -i ${srcdir}/ghostscript-sys-zlib.patch # fix http://bugs.ghostscript.com/show_bug.cgi?id=696246 - FS#46637, FS#46734? patch -Np1 -i ${srcdir}/bug_696246.diff + # add a missing header; FS#46928 + patch -Np1 -i ${srcdir}/add_gserrors_h.diff # remove nonfree JPEG XR reference on the license file patch -Np1 -i ${srcdir}/libre.patch } diff --git a/libre/ghostscript/add_gserrors_h.diff b/libre/ghostscript/add_gserrors_h.diff new file mode 100644 index 000000000..c34e48662 --- /dev/null +++ b/libre/ghostscript/add_gserrors_h.diff @@ -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 + |