[arch-commits] Commit in ghostscript/trunk (PKGBUILD add_gserrors_h.diff)

[Andreas Radke]

    Date: Sunday, November 1, 2015 @ 11:30:58
  Author: andyrtr
Revision: 249913

upgpkg: ghostscript 9.18-4

add a missing header, FS#46928

Added:
  ghostscript/trunk/add_gserrors_h.diff
Modified:
  ghostscript/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   10 +++++++---
 add_gserrors_h.diff |   43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-11-01 10:23:41 UTC (rev 249912)
+++ PKGBUILD	2015-11-01 10:30:58 UTC (rev 249913)
@@ -5,7 +5,7 @@
 
 pkgname=ghostscript
 pkgver=9.18
-pkgrel=3
+pkgrel=4
 pkgdesc="An interpreter for the PostScript language"
 arch=('i686' 'x86_64')
 license=('AGPL' 'custom')
@@ -17,12 +17,14 @@
 url="http://www.ghostscript.com/"
 source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2
         ghostscript-sys-zlib.patch
-        bug_696246.diff)
+        bug_696246.diff
+        add_gserrors_h.diff)
 #options=('!makeflags')
 # http://downloads.ghostscript.com/public/SHA1SUMS
 sha1sums=('388fea50a38e422a4c6ff27c184491bf5ecb96e1'
           'e054caf753df4d67221b29a2eac66130653f7556'
-          'f259eaac3beb0ec346bb2d4d2455e4e3baddecd4')
+          'f259eaac3beb0ec346bb2d4d2455e4e3baddecd4'
+          'ca686fed1af36d1f9fa866b47ff129c71d6a19ff')
 
 prepare() {
   cd ghostscript-${pkgver}
@@ -30,6 +32,8 @@
   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
 }
 
 build() {

Added: add_gserrors_h.diff
===================================================================
--- add_gserrors_h.diff	                        (rev 0)
+++ add_gserrors_h.diff	2015-11-01 10:30:58 UTC (rev 249913)
@@ -0,0 +1,43 @@
+From feafe5e540a0545ec5d28f3f66bb542056bba495 Mon Sep 17 00:00:00 2001
+From: Chris Liddell <chris.liddell at 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
+