<pre style='margin:0'>
Dan Ports (drkp) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bbb7d5d71d3fbf78ab292a093579102c3686bb24">https://github.com/macports/macports-ports/commit/bbb7d5d71d3fbf78ab292a093579102c3686bb24</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit bbb7d5d71d3fbf78ab292a093579102c3686bb24
</span>Author: Dan R. K. Ports <dports@macports.org>
AuthorDate: Sun Jul 5 00:05:22 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> ghostscript: update to v9.52
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60540
</span>---
print/ghostscript/Portfile | 16 +++--
print/ghostscript/files/patch-6756b355c238.diff | 88 +++++++++++++++++++++++++
2 files changed, 98 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/ghostscript/Portfile b/print/ghostscript/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 29573e345fa..2a3638c2ca7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/ghostscript/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/ghostscript/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,7 @@ PortSystem 1.0
</span> PortGroup muniversal 1.0
name ghostscript
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 9.50
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 9.52
</span> categories print
license AGPL-3 BSD
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,10 +33,15 @@ distfiles ${distname}.tar.gz:source \
</span> patchfiles patch-base_unix-dll.mak.diff \
patch-base_unixinst.mak.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums ${distname}.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 9498a55e842736fac6a4f3477b37e5a20da44271 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 dd94c5a06c03c58b47b929d03260f491d4807eaf5be83abd283278927b11c9ee \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 53564956 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# backport upstream fix to fix ghostpdl build; see:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/60540#comment:2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://bugs.ghostscript.com/show_bug.cgi?id=702474
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-6756b355c238.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums ghostpdl-9.52.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 1e719f907c8dc6dd0000bf2c547eee54fd583b9f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8f6e48325c106ae033bbae3e55e6c0b9ee5c6b57e54f7cd24fb80a716a93b06a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 58554799 \
</span> ghostscript-fonts-other-6.0.tar.gz \
rmd160 ab60dbf71e7d91283a106c3df381cadfe173082f \
sha256 4fa051e341167008d37fe34c19d241060cd17b13909932cd7ca7fe759243c2de \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/ghostscript/files/patch-6756b355c238.diff b/print/ghostscript/files/patch-6756b355c238.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..26e6f207378
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/ghostscript/files/patch-6756b355c238.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,88 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Chris Liddell <chris.liddell@artifex.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 25 Mar 2020 14:00:55 +0000 (+0000)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: Fix shared libtiff and libjpeg build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+X-Git-Tag: ghostpdl-9.52-test-base-3~34
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+X-Git-Url: http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff_plain;h=6756b355c238
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix shared libtiff and libjpeg build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+When building with shared libs, we should not try to include our custom libjpeg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+memory management context into the TIFF reader implementation context.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gpdl/gpdl.mak b/gpdl/gpdl.mak
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e29c53a7b..b5a47aa22 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gpdl/gpdl.mak
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gpdl/gpdl.mak
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -110,15 +110,17 @@ $(GPDL_PWG_TOP_OBJ): $(GPDLSRC)pwgtop.c $(AK)\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(spwgx_h) $(pltop_h) $(gsicc_manage_h) $(gspaint_h) $(plmain_h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(GPDLCC) $(GPDLSRC)pwgtop.c $(GPDLO_)$(GPDL_PWG_TOP_OBJ_FILE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# TIFF reading can only work with both libtiff and libjpeg using share libs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# *or* both using local - we can't mix.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(GPDLOBJ)tifftop_0.$(OBJ): $(GPDLSRC)tifftop.c $(AK)\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(gxdevice_h) $(gserrors_h) $(gsstate_h) $(strimpl_h) $(gscoord_h)\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(pltop_h) $(gsicc_manage_h) $(gspaint_h) $(plmain_h) $(jmemcust_h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(GPDLCC) $(D_)SHARE_LIBTIFF=0 $(II)$(TI_)$(_I) $(II)$(JI_)$(_I) $(GPDLSRC)tifftop.c $(GPDLO_)tifftop_0.$(OBJ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(GPDLCC) $(D_)SHARE_LIBTIFF=0$(_D) $(D_)SHARE_JPEG=0$(_D) $(II)$(TI_)$(_I) $(II)$(JI_)$(_I) $(GPDLSRC)tifftop.c $(GPDLO_)tifftop_0.$(OBJ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(GPDLOBJ)tifftop_1.$(OBJ): $(GPDLSRC)tifftop.c $(AK)\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(gxdevice_h) $(gserrors_h) $(gsstate_h) $(strimpl_h) $(gscoord_h)\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(pltop_h) $(gsicc_manage_h) $(gspaint_h) $(plmain_h) $(jmemcust_h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(GPDLCC) $(D_)SHARE_LIBTIFF=1 $(II)$(TI_)$(_I) $(II)$(JI_)$(_I) $(GPDLSRC)tifftop.c $(GPDLO_)tifftop_1.$(OBJ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(pltop_h) $(gsicc_manage_h) $(gspaint_h) $(plmain_h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(GPDLCC) $(D_)SHARE_LIBTIFF=1$(_D) $(D_)SHARE_JPEG=1$(_D) $(II)$(TI_)$(_I) $(II)$(JI_)$(_I) $(GPDLSRC)tifftop.c $(GPDLO_)tifftop_1.$(OBJ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(GPDL_TIFF_TOP_OBJ): $(GPDLOBJ)tifftop_$(SHARE_LIBTIFF).$(OBJ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CP_) $(GPDLOBJ)tifftop_$(SHARE_LIBTIFF).$(OBJ) $(GPDL_TIFF_TOP_OBJ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gpdl/tifftop.c b/gpdl/tifftop.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 16939dbb5..6abf42916 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gpdl/tifftop.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gpdl/tifftop.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,7 +26,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "gspaint.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "plmain.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "tiffio.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(SHARE_JPEG) && SHARE_JPEG==0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "jmemcust.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "gsmchunk.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Forward decls */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -90,7 +92,9 @@ typedef struct tiff_interp_instance_s {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ byte *samples;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ byte *proc_samples;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(SHARE_JPEG) && SHARE_JPEG==0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jpeg_cust_mem_data jmem;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } tiff_interp_instance_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -421,7 +425,7 @@ static toff_t tifsSizeProc(thandle_t tiff_)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return tiff->buffer_full;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(SHARE_LIBTIFF) && SHARE_LIBTIFF==0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(SHARE_JPEG) && SHARE_JPEG==0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void *gs_j_mem_alloc(j_common_ptr cinfo, size_t size)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gs_memory_t *mem = (gs_memory_t *)(GET_CUST_MEM_DATA(cinfo)->priv);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -472,7 +476,7 @@ tiff_jpeg_mem_callback(thandle_t tiff_)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return &tiff->jmem;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif /* SHARE_LIBTIFF == 0 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* SHARE_JPEG == 0 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ guess_pal_depth(int n, uint16_t *rmap, uint16_t *gmap, uint16_t *bmap)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -619,7 +623,7 @@ do_impl_process(pl_interp_implementation_t * impl, stream_cursor_read * pr, int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tiff->photometric == PHOTOMETRIC_LOGLUV) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TIFFSetField(tiff->handle, TIFFTAG_SGILOGDATAFMT, SGILOGDATAFMT_8BIT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(SHARE_LIBTIFF) && SHARE_LIBTIFF==0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(SHARE_JPEG) && SHARE_JPEG==0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TIFFSetJpegMemFunction(tiff->handle,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &tiff_jpeg_mem_callback);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span></pre><pre style='margin:0'>
</pre>