Source Mage code commit list

[Remko van der Vossen <scm AT sourcemage.org>]

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

 printer/ghostscript/HISTORY            |    4 +++
 printer/ghostscript/PRE_BUILD          |    9 ++++---
 printer/ghostscript/error-header.patch |   39 
+++++++++++++++++++++++++++++++++
 printer/ghostscript/jbig2dec_1.patch   |   19 ++++++++--------
 printer/ghostscript/jbig2dec_2.patch   |    8 +++---
 5 files changed, 62 insertions(+), 17 deletions(-)

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
  
  $(GLOBJ)sjbig2.$(OBJ) : $(GLSRC)sjbig2.c $(AK) \
-@@ -1742,6 +1746,11 @@ $(GLOBJ)sjbig2.$(OBJ) : $(GLSRC)sjbig2.c $(AK) \
-  $(sjbig2_h) $(strimpl_h) $(LIB_MAK) $(MAKEDIRS)
+@@ -1739,6 +1743,11 @@ $(GLOBJ)sjbig2.$(OBJ) : $(GLSRC)sjbig2.c $(AK) \
+  $(sjbig2_h) $(strimpl_h) $(MAKEDIRS)
        $(GLJBIG2CC) $(GLO_)sjbig2.$(OBJ) $(C_) $(GLSRC)sjbig2.c
  
 +$(GLOBJ)snojbig2.$(OBJ) : $(GLSRC)snojbig2.c $(AK) \
@@ -39,11 +39,15 @@ diff --git a/psi/int.mak b/psi/int.mak
 index 05b5fec..2c6d6d0 100644
 --- a/psi/int.mak
 +++ b/psi/int.mak
-@@ -1255,11 +1255,25 @@ $(PSOBJ)zfaes.$(OBJ) : $(PSSRC)zfaes.c $(OP) 
$(memory__h)\
+@@ -1254,11 +1254,25 @@ $(PSOBJ)zfaes.$(OBJ) : $(PSSRC)zfaes.c $(OP) 
$(memory__h)\
  # this can be turned on and off with a FEATURE_DEV
  
  fjbig2_=$(PSOBJ)zfjbig2_$(JBIG2_LIB).$(OBJ)
--$(PSD)jbig2.dev : $(ECHOGS_XE) $(fjbig2_) $(GLD)sjbig2.dev\
+-$(PSD)jbig2.dev : $(INT_MAK) $(ECHOGS_XE) $(fjbig2_) $(GLD)sjbig2.dev\
+- $(MAKEDIRS)
+-      $(SETMOD) $(PSD)jbig2 $(fjbig2_)
+-      $(ADDMOD) $(PSD)jbig2 -include $(GLD)sjbig2
+-      $(ADDMOD) $(PSD)jbig2 -oper zfjbig2
 +
 +$(PSD)jbig2_jbig2dec.dev : $(ECHOGS_XE) $(fjbig2_) $(GLD)sjbig2.dev\
 + $(INT_MAK) $(MAKEDIRS)
@@ -52,10 +56,7 @@ index 05b5fec..2c6d6d0 100644
 +      $(ADDMOD) $(PSD)jbig2_jbig2dec -oper zfjbig2
 +
 +$(PSD)jbig2_luratech.dev : $(ECHOGS_XE) $(fjbig2_) $(GLD)sjbig2.dev\
-  $(INT_MAK) $(MAKEDIRS)
--      $(SETMOD) $(PSD)jbig2 $(fjbig2_)
--      $(ADDMOD) $(PSD)jbig2 -include $(GLD)sjbig2
--      $(ADDMOD) $(PSD)jbig2 -oper zfjbig2
++ $(INT_MAK) $(MAKEDIRS)
 +      $(SETMOD) $(PSD)jbig2_luratech $(fjbig2_)
 +      $(ADDMOD) $(PSD)jbig2_luratech -include $(GLD)sjbig2
 +      $(ADDMOD) $(PSD)jbig2_luratech -oper zfjbig2
diff --git a/printer/ghostscript/jbig2dec_2.patch 
b/printer/ghostscript/jbig2dec_2.patch
index 35c970c..fd0ee76 100644
--- a/printer/ghostscript/jbig2dec_2.patch
+++ b/printer/ghostscript/jbig2dec_2.patch
@@ -13,8 +13,8 @@ diff --git a/base/lib.mak b/base/lib.mak
 index 4d7db1f..a0a97cd 100644
 --- a/base/lib.mak
 +++ b/base/lib.mak
-@@ -1777,6 +1777,9 @@ $(GLOBJ)sjpx.$(OBJ) : $(GLSRC)sjpx.c $(AK) \
-  $(gdebug_h) $(strimpl_h) $(sjpx_h) $(LIB_MAK) $(MAKEDIRS)
+@@ -1774,6 +1774,9 @@ $(GLOBJ)sjpx.$(OBJ) : $(GLSRC)sjpx.c $(AK) \
+  $(gdebug_h) $(strimpl_h) $(sjpx_h) $(MAKEDIRS)
        $(GLJASCC) $(GLO_)sjpx.$(OBJ) $(C_) $(GLSRC)sjpx.c
  
 +$(GLD)sjpx_.dev : $(LIB_MAK) $(ECHOGS_XE) $(LIB_MAK) $(MAKEDIRS)
@@ -27,8 +27,8 @@ diff --git a/psi/int.mak b/psi/int.mak
 index 2c6d6d0..8b224ea 100644
 --- a/psi/int.mak
 +++ b/psi/int.mak
-@@ -1292,6 +1292,9 @@ $(PSD)jpx.dev : $(ECHOGS_XE) $(PSD)jpx_$(JPX_LIB).dev\
-  $(INT_MAK) $(MAKEDIRS)
+@@ -1291,6 +1291,9 @@ $(PSD)jpx.dev : $(ECHOGS_XE) $(PSD)jpx_$(JPX_LIB).dev\
+  $(MAKEDIRS)
        $(CP_) $(PSD)jpx_$(JPX_LIB).dev $(PSD)jpx.dev
  
 +$(PSD)jpx_.dev : $(ECHOGS_XE) $(INT_MAK) $(MAKEDIRS)