From dd46c79c5ee574e8d8141fa66b514bfe520abc10 Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Tue, 11 Oct 2016 09:21:47 +0300
Subject: [PATCH] ghostscript: Update to 9.20

---
 mingw-w64-ghostscript/PKGBUILD          | 14 ++++-----
 mingw-w64-ghostscript/mingw-build.patch | 39 +++++++++++++++----------
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/mingw-w64-ghostscript/PKGBUILD b/mingw-w64-ghostscript/PKGBUILD
index d632b4612a..f1ae260abc 100644
--- a/mingw-w64-ghostscript/PKGBUILD
+++ b/mingw-w64-ghostscript/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=ghostscript
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=9.19
-pkgrel=3
+pkgver=9.20
+pkgrel=1
 arch=('any')
 license=('AGPL' 'custom')
 pkgdesc="An interpreter for the PostScript language (mingw-w64)"
@@ -24,20 +24,20 @@ depends=("${MINGW_PACKAGE_PREFIX}-dbus"
 makedepends=("${MINGW_PACKAGE_PREFIX}-gtk3" "${MINGW_PACKAGE_PREFIX}-gnutls")
 optdepends=("${MINGW_PACKAGE_PREFIX}-gtk3: needed for gsx")
 url="http://www.ghostscript.com/"
-source=(https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${pkgver//./}/ghostscript-${pkgver}.tar.bz2
+source=(https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${pkgver//./}/ghostscript-${pkgver}.tar.xz
         mingw-build.patch
         ghostscript-sys-zlib.patch
         libspectre.patch)
 options=('staticlibs' 'strip')
-sha256sums=('f67acdcfcde1f86757ff3553cd719f12eac2d7681a0e96d8bdd1f40a0f47b45b'
-            '9da2b4342aad18927d7f766a05e16b354b73b4c68e991fe3088280d98714d780'
+sha256sums=('3c0f3dc5df6f784850fa4ce7dcc3d6c56ef543af1fbaedd1d9f8d9f8b66de0ab'
+            '0f7f8fb6b9a4fb57afa87c510711f35f85daddf2a82d9a82a73698a89563014f'
             '9cf9805e6b8329e83656c16475c9fc7b7b8c3e459a782b4755abdabbb8f22df4'
             '5b0ef04d59658885f183a6c820a5dbbb89e57e4c43774bc6c90ae4fb742b2be7')
-noextract=(ghostscript-${pkgver}.tar.bz2)
+noextract=(ghostscript-${pkgver}.tar.xz)
 
 prepare() {
   [[ -d ${srcdir}/${_realname}-${pkgver} ]] && rm -rf ${srcdir}/${_realname}-${pkgver}
-  tar -xjf ${srcdir}/${_realname}-${pkgver}.tar.bz2 -C $srcdir || true
+  tar -xJf ${srcdir}/${_realname}-${pkgver}.tar.xz -C $srcdir || true
 
   cd "${srcdir}/${_realname}-${pkgver}"
   patch -p1 -i ${srcdir}/mingw-build.patch
diff --git a/mingw-w64-ghostscript/mingw-build.patch b/mingw-w64-ghostscript/mingw-build.patch
index ae5ca88064..db88c72f82 100644
--- a/mingw-w64-ghostscript/mingw-build.patch
+++ b/mingw-w64-ghostscript/mingw-build.patch
@@ -241,7 +241,7 @@
  	$(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) $(AUXEXTRALIBS)
 --- a/base/unix-dll.mak
 +++ b/base/unix-dll.mak
-@@ -35,17 +35,38 @@
+@@ -35,7 +35,12 @@
  # Shared object names
  
  # simple loader (no support for display device)
@@ -255,6 +255,9 @@
  GSSOC_XE=$(BINDIR)/$(GSSOC_XENAME)
  GSSOC=$(BINDIR)/$(GSSOC_XENAME)
  
+@@ -52,12 +52,28 @@
+ GPDLSOC=$(BINDIR)/$(GPDLSOC_XENAME)
+ 
  # loader suporting display device using Gtk+
 -GSSOX_XENAME=$(GS_SO_BASE)x$(XE)
 +ifeq ($(MINGW_WITH_WINLIB_NAMES), 1)
@@ -281,10 +284,10 @@
 +    GS_SONAME_BASE=lib$(GS_SO_BASE)
 +    GS_SONAME_LINK=$(GS_SO_BASE)
 +endif
- 
- # GNU/Linux
- GS_SOEXT=$(SO_LIB_EXT)
-@@ -82,30 +103,30 @@
+ PCL_SONAME_BASE=lib$(PCL_SO_BASE)
+ XPS_SONAME_BASE=lib$(XPS_SO_BASE)
+ GPDL_SONAME_BASE=lib$(GPDL_SO_BASE)
+@@ -140,13 +140,13 @@
  
  # Create symbolic links to the Ghostscript interpreter library
  
@@ -301,30 +304,34 @@
 +	$(RM_) $(GS_SO_MAJOR_MINOR)
 +	ln -s $(GS_SONAME_MAJOR) $(GS_SO_MAJOR_MINOR)
  
- so-links-subtarget:	$(GS_SO) $(UNIX_DLL_MAK) $(MAKEDIRS)
- 	$(NO_OP)
+ $(PCL_SO): $(PCL_SO_MAJOR) $(UNIX_DLL_MAK) $(MAKEDIRS)
+ 	$(RM_) $(PCL_SO)
+@@ -212,12 +212,12 @@
  
  # Build the small Ghostscript loaders, with Gtk+ and without
- $(GSSOC_XE): so-links-subtarget $(PSSRC)$(SOC_LOADER) $(UNIX_DLL_MAK) $(MAKEDIRS)
+ $(GSSOC_XE): gs-so-links-subtarget $(PSSRC)$(SOC_LOADER) $(UNIX_DLL_MAK) $(MAKEDIRS)
 -	$(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c \
 -	-L$(BINDIR) -l$(GS_SO_BASE)
 +	$(GLCC) -g -o $(GSSOC_XE) $(PSSRC)$(SOC_LOADER_PLAIN) \
 +	-L$(BINDIR) -l$(GS_SONAME_LINK)
  
- $(GSSOX_XE): so-links-subtarget $(PSSRC)$(SOC_LOADER) $(UNIX_DLL_MAK) $(MAKEDIRS)
+ $(GSSOX_XE): gs-so-links-subtarget $(PSSRC)$(SOC_LOADER) $(UNIX_DLL_MAK) $(MAKEDIRS)
  	$(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(PSSRC)$(SOC_LOADER) \
 -	-L$(BINDIR) -l$(GS_SO_BASE) $(SOC_LIBS)
 +	-L$(BINDIR) -l$(GS_SONAME_LINK) $(SOC_LIBS)
  
- # ------------------------- Recursive make targets ------------------------- #
- 
+ $(PCLSOC_XE): gpcl6-so-links-subtarget $(PLSRC)$(REALMAIN_SRC).c $(UNIX_DLL_MAK) $(MAKEDIRS)
+ 	$(GLCC) -g -o $(PCLSOC_XE) $(PLSRC)$(REALMAIN_SRC).c -L$(BINDIR) -l$(PCL_SO_BASE)
+@@ -222,7 +222,7 @@
  SODEFS=\
-- GS_XE=$(BINDIR)/$(GS_SONAME_MAJOR_MINOR)\
+  GS_DOT_O= \
+  REALMAIN_OBJ= \
+- GS_XE=$(BINDIR)/$(GS_SONAME_MAJOR_MINOR) \
 + GS_XE=$(BINDIR)/$(GS_SONAME_MAJOR)\
-  DISPLAY_DEV=$(DD)display.dev\
-  STDIO_IMPLEMENTATION=c\
-  BUILDDIRPREFIX=$(BUILDDIRPREFIX)
-@@ -179,11 +200,17 @@
+  GPCL_XE=$(BINDIR)/$(PCL_SONAME_MAJOR_MINOR) \
+  GXPS_XE=$(BINDIR)/$(XPS_SONAME_MAJOR_MINOR) \
+  GPDL_XE=$(BINDIR)/$(GPDL_SONAME_MAJOR_MINOR) \
+@@ -313,11 +313,17 @@
  	-mkdir -p $(DESTDIR)$(gsincludedir)
  	$(INSTALL_PROGRAM) $(GSSOC) $(DESTDIR)$(bindir)/$(GSSOC_XENAME)
  	$(INSTALL_PROGRAM) $(GSSOX) $(DESTDIR)$(bindir)/$(GSSOX_XENAME)