New commits:
commit fead0889417f33bf94fe9ff79348c10db5708ca3
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>
ghostscript: more compilation fixes
diff --git a/printer/ghostscript/HISTORY b/printer/ghostscript/HISTORY
index 243e666..407cc33 100644
--- a/printer/ghostscript/HISTORY
+++ b/printer/ghostscript/HISTORY
@@ -1,3 +1,7 @@
+2016-02-19 Remko van der Vossen <wich AT sourcemage.org>
+ * PRE_BUILD, error-header.patch: fix installed headers
+ * jbig2dec*.patch: fix patch incompatibility
+
2016-02-17 Remko van der Vossen <wich AT sourcemage.org>
* PRE_BUILD, jbig2dec*.patch: fix compilation issue
* PRE_BUILD, zlib.patch: use system zlib
diff --git a/printer/ghostscript/PRE_BUILD b/printer/ghostscript/PRE_BUILD
index 7879afa..9aaa5e1 100755
--- a/printer/ghostscript/PRE_BUILD
+++ b/printer/ghostscript/PRE_BUILD
@@ -1,8 +1,9 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
# remove most of the embedded libraries. use the system ones instead
-rm -rf freetype jpeg libpng tiff lcms2 cups ijs openjpeg zlib
+rm -rf freetype jpeg libpng tiff lcms2 cups ijs openjpeg zlib &&
# fix compiler error for case --without-jbig2dec
-patch -p1 < "$SPELL_DIRECTORY/jbig2dec_1.patch"
-patch -p1 < "$SPELL_DIRECTORY/jbig2dec_2.patch"
-patch -p1 < "$SPELL_DIRECTORY/zlib.patch"
+patch -p1 < "$SPELL_DIRECTORY/jbig2dec_1.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/jbig2dec_2.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/zlib.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/error-header.patch"
diff --git a/printer/ghostscript/error-header.patch
b/printer/ghostscript/error-header.patch
new file mode 100644
index 0000000..b2eb83d
--- /dev/null
+++ b/printer/ghostscript/error-header.patch
@@ -0,0 +1,39 @@
+From: Chris Liddell <chris.liddell AT artifex.com>
+Date: Fri, 23 Oct 2015 09:16:11 +0000 (+0100)
+Subject: Bug 696301: add gserrors.h to the installed files
+X-Git-Url: http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff_plain;h=feafe5e540a0545ec5d28f3f66bb542056bba495
+
+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
+---
+
+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
+@@ -184,6 +184,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:
diff --git a/printer/ghostscript/jbig2dec_1.patch
b/printer/ghostscript/jbig2dec_1.patch
index 5e71374..f3774fc 100644
--- a/printer/ghostscript/jbig2dec_1.patch
+++ b/printer/ghostscript/jbig2dec_1.patch
@@ -12,7 +12,7 @@ diff --git a/base/lib.mak b/base/lib.mak
index 1efc341..4d7db1f 100644
--- a/base/lib.mak
+++ b/base/lib.mak
-@@ -1735,6 +1735,10 @@ $(GLD)sjbig2_jbig2dec.dev : $(LIB_MAK) $(ECHOGS_XE) \
+@@ -1732,6 +1732,10 @@ $(GLD)sjbig2_jbig2dec.dev : $(LIB_MAK) $(ECHOGS_XE) \
$(SETMOD) $(GLD)sjbig2_jbig2dec $(sjbig2_jbig2dec)
$(ADDMOD) $(GLD)sjbig2_jbig2dec -include $(GLD)jbig2dec.dev
@@ -23,8 +23,8 @@ index 1efc341..4d7db1f 100644
# jbig2dec.dev is defined in jbig2.mak