1 files changed, 14 insertions, 21 deletions
diff --git a/main/ghostscript/ghostscript-system-zlib.patch b/main/ghostscript/ghostscript-system-zlib.patch
index ef1e3ac17e..ea70c1100c 100644
--- a/main/ghostscript/ghostscript-system-zlib.patch
+++ b/main/ghostscript/ghostscript-system-zlib.patch
@@ -1,21 +1,14 @@
-diff -up ghostscript-9.16/devices/devs.mak.system-zlib ghostscript-9.16/devices/devs.mak
---- ghostscript-9.16/devices/devs.mak.system-zlib	2015-03-30 17:47:57.931725800 +0100
-+++ ghostscript-9.16/devices/devs.mak	2015-03-30 17:48:14.539673024 +0100
-@@ -1231,7 +1231,7 @@ $(libtiff_dev) $(MAKEDIRS)
- 
- $(DEVOBJ)gdevxps.$(OBJ) : $(DEVVECSRC)gdevxps.c $(gdevvec_h) \
- $(string__h) $(stdio__h) $(libtiff_dev) $(gx_h) $(gserrors_h) \
--$(gxpath_h) $(gzcpath_h) $(stream_h) $(zlib_h) \
-+$(gxpath_h) $(gzcpath_h) $(stream_h) \
- $(stdint__h) $(gdevtifs_h) $(gsicc_create_h) $(gsicc_cache_h) \
- $(gximdecode_h) $(MAKEDIRS)
- 	$(XPSDEVCC) $(I_)$(TI_)$(_I) $(GLO_)gdevxps.$(OBJ) $(C_) $(DEVVECSRC)gdevxps.c
-@@ -1683,7 +1683,7 @@ $(DD)pngalpha.dev : $(DEVS_MAK) $(libpng
- fpng_=$(DEVOBJ)gdevfpng.$(OBJ) $(DEVOBJ)gdevpccm.$(OBJ)
- 
- $(DEVOBJ)gdevfpng_0.$(OBJ) : $(DEVSRC)gdevfpng.c\
-- $(gdevprn_h) $(gdevpccm_h) $(gscdefs_h) $(zlib_h) $(MAKEDIRS)
-+ $(gdevprn_h) $(gdevpccm_h) $(gscdefs_h) $(MAKEDIRS)
- 	$(CC_) $(I_)$(DEVI_) $(II)$(PI_)$(_I) $(PCF_) $(GLF_) $(DEVO_)gdevfpng_0.$(OBJ) $(C_) $(DEVSRC)gdevfpng.c
- 
- $(DEVOBJ)gdevfpng_1.$(OBJ) : $(DEVSRC)gdevfpng.c\
+diff --git a/base/lib.mak b/base/lib.mak
+index de78333..b9e7dfa 100644
+--- a/base/lib.mak
++++ b/base/lib.mak
+@@ -582,7 +582,9 @@ srlx_h=$(GLSRC)srlx.h
+ sstring_h=$(GLSRC)sstring.h
+ strimpl_h=$(GLSRC)strimpl.h $(scommon_h) $(gstypes_h) $(gsstruct_h)
+ szlibx_h=$(GLSRC)szlibx.h
++ifneq ($(SHARE_ZLIB),1)
+ zlib_h=$(ZSRCDIR)$(D)zlib.h
++endif
+ # We have two of the following, for shared zlib (_1)
+ # and 'local' zlib (_0)
+ szlibxx_h_1=$(GLSRC)szlibxx.h $(szlibx_h)