main/ghostscript: upgrade to 9.19

4 files changed, 20 insertions, 131 deletions

diff --git a/main/ghostscript/APKBUILD b/main/ghostscript/APKBUILD
index 05ad3ddfe9..426f7b876c 100644
--- a/main/ghostscript/APKBUILD
+++ b/main/ghostscript/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Cameron Banta <cbanta@gmail.com>
 # Maintainer: Cameron Banta <cbanta@gmail.com>
 pkgname=ghostscript
-pkgver=9.18
+pkgver=9.19
 pkgrel=0
 pkgdesc="An interpreter for the PostScript language and for PDF"
 url="http://ghostscript.com/"
@@ -11,12 +11,12 @@ makedepends="autoconf automake libjpeg-turbo-dev libpng-dev jasper-dev expat-dev
 	zlib-dev tiff-dev freetype-dev lcms2-dev gtk+3.0-dev
 	cups-dev libtool jbig2dec-dev openjpeg-dev"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-gtk"
-source="http://downloads.ghostscript.com/public/$pkgname-$pkgver.tar.gz
+source="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${pkgver/./}/ghostscript-$pkgver.tar.gz
 	ghostscript-system-zlib.patch
-	ghostscript-system-openjpeg2.patch
 	fix-sprintf.patch
 	"
 
+#	ghostscript-system-openjpeg2.patch
 _builddir="$srcdir/ghostscript-$pkgver"
 prepare() {
 	cd "$_builddir"
@@ -28,7 +28,7 @@ prepare() {
 
 	# force it to use system-libs
 	rm -r jpeg libpng zlib tiff lcms2 cups/libs jbig2dec \
-		freetype openjpeg || return 1
+		freetype || return 1
 
 	# fix parallel builds
 	sed -i -e 's/ECHO_XE/ECHOGS_XE/g' \
@@ -108,15 +108,12 @@ gtk() {
 	mv "$pkgdir"/usr/bin/gsx "$subpkgdir"/usr/bin/
 }
 
-md5sums="33a47567d7a591c00a253caddd12a88a  ghostscript-9.18.tar.gz
-bdad7bbdc1d8a0cba5817ad722003fcc  ghostscript-system-zlib.patch
-7bc12888cccf6d2827d0ff012813220f  ghostscript-system-openjpeg2.patch
-ed14fa288463e08e1e6074a5d1ebbcbb  fix-sprintf.patch"
-sha256sums="5fc93079749a250be5404c465943850e3ed5ffbc0d5c07e10c7c5ee8afbbdb1b  ghostscript-9.18.tar.gz
-ef2a7546592561c27a6f0a61c28cc76ec5aa1f569f5c2c344c6228de059b60cd  ghostscript-system-zlib.patch
-0d029c98b2149715b63d2eae9634eca0d427bf77e713dd355854412fc92b35ac  ghostscript-system-openjpeg2.patch
-3051dff937ab9ced9f88b36384400b10bc9cdb39b2abd3ece8f4c41a0246874e  fix-sprintf.patch"
-sha512sums="e204648f7c21f4c48854c5fe9fc1b5a2914b8234a20a9b8b7670c7d9688360f5122f439b1396abcdb357562ad2a95384b90ffff2c5570fdaa811dfe2f6acc1a8  ghostscript-9.18.tar.gz
-25af145eff059a5c854e5e290541b53ffaf4dea67f3f3ea4a608c14c2bbb151983d2a986265fae2e75651a5df212d0754d05ca64ac245fcaf6e3645a063a5aac  ghostscript-system-zlib.patch
-f874540fc53f85a3587253aaf8a29fc7792590938daf7f44e573cbbdac258b39db8baccce9569737c5c1a0a3816c6a8ff55b97f60dbefbba0c1729fd202d0ddd  ghostscript-system-openjpeg2.patch
-300712709ec75f728c703f6a2a5abd992b7c2137df81cc1dd4f6e96c690077e0d5a4afd0e06ce55660061911ddfbf1e68d7020ec3e5f2124602133a10451ec42  fix-sprintf.patch"
+md5sums="cd0cb042a020df2e9f30fcce177e9cec  ghostscript-9.19.tar.gz
+ae582371ec56fd8f73349773f23dcc94  ghostscript-system-zlib.patch
+ee7da55d7a714db1de0fa78253cdacf3  fix-sprintf.patch"
+sha256sums="fc07d5eb1b325f59d4bb3994975e9ab769e7c7353403c6420f42c54161c552ca  ghostscript-9.19.tar.gz
+56662fae7956e741059ef9c2b5a7e883ab04d78acf5dae4fddf4a661f47f8b67  ghostscript-system-zlib.patch
+6e01bd26ade307414f86a5d8f00c97719830d8afd49ffe84224ae47498de7a54  fix-sprintf.patch"
+sha512sums="1f922cb8c27450f7c7c3ae0f9603574cbe25cb0c495d3707ab0c37b0c42061f2c68c7c80ebdac63c3165eb953f201440e4a0e3f73bb7c3331422cae3907738fb  ghostscript-9.19.tar.gz
+70721e3a335afa5e21d4e6cf919119010bd4544a03ab8f53f5325c173902221ad9b88c118b4bfeee80b3e1956bcdbaf4c53f64ae7fb81f5ba57dbc956750c482  ghostscript-system-zlib.patch
+beefcf395f7f828e1b81c088022c08a506e218f27535b9de01e0f0edf7979b435316c318fa676771630f6ad16ff1ab059cd68aa128ed97e5a9f2f3fa840200c4  fix-sprintf.patch"
diff --git a/main/ghostscript/fix-sprintf.patch b/main/ghostscript/fix-sprintf.patch
index a37303ef6c..5a06af5620 100644
--- a/main/ghostscript/fix-sprintf.patch
+++ b/main/ghostscript/fix-sprintf.patch
@@ -1,56 +1,8 @@
---- ./cups/gdevcups.c.orig
-+++ ./cups/gdevcups.c
-@@ -1042,7 +1042,7 @@
- 
-   for (i = 0; i < 16; i ++)
-   {
--    sprintf(name, "cupsInteger%d", i);
-+    snprintf(name, sizeof(name), "cupsInteger%d", i);
-     if ((code = param_write_int(plist, strdup(name),
-                         	(int *)(cups->header.cupsInteger + i))) < 0)
-       return (code);
-@@ -1050,7 +1050,7 @@
- 
-   for (i = 0; i < 16; i ++)
-   {
--    sprintf(name, "cupsReal%d", i);
-+    snprintf(name, sizeof(name), "cupsReal%d", i);
-     if ((code = param_write_float(plist, strdup(name),
-                         	  cups->header.cupsReal + i)) < 0)
-       return (code);
-@@ -1058,7 +1058,7 @@
- 
-   for (i = 0; i < 16; i ++)
-   {
--    sprintf(name, "cupsString%d", i);
-+    snprintf(name, sizeof(name), "cupsString%d", i);
-     param_string_from_transient_string(s, cups->header.cupsString[i]);
-     if ((code = param_write_string(plist, strdup(name), &s)) < 0)
-       return (code);
-@@ -3184,19 +3184,19 @@
- 
-   for (i = 0; i < 16; i ++)
-   {
--    sprintf(name, "cupsInteger%d", i);
-+    snprintf(name, sizeof(name), "cupsInteger%d", i);
-     intoption(cupsInteger[i],strdup(name), unsigned)
-   }
- 
-   for (i = 0; i < 16; i ++)
-   {
--    sprintf(name, "cupsReal%d", i);
-+    snprintf(name, sizeof(name), "cupsReal%d", i);
-     floatoption(cupsReal[i], strdup(name))
-   }
- 
-   for (i = 0; i < 16; i ++)
-   {
--    sprintf(name, "cupsString%d", i);
-+    snprintf(name, sizeof(name), "cupsString%d", i);
-     stringoption(cupsString[i], strdup(name))
-   }
- 
-@@ -4271,10 +4271,10 @@
+diff --git a/cups/gdevcups.c b/cups/gdevcups.c
+index c00e758..35b4035 100644
+--- a/cups/gdevcups.c
++++ b/cups/gdevcups.c
+@@ -4353,10 +4353,10 @@ cups_set_color_info(gx_device *pdev)	/* I - Device info */
      */
  
      if (pdev->HWResolution[0] != pdev->HWResolution[1])
diff --git a/main/ghostscript/ghostscript-system-openjpeg2.patch b/main/ghostscript/ghostscript-system-openjpeg2.patch
deleted file mode 100644
index 51185224f0..0000000000
--- a/main/ghostscript/ghostscript-system-openjpeg2.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -up ghostscript-9.16/base/openjpeg.mak.system-openjpeg2 ghostscript-9.16/base/openjpeg.mak
---- ghostscript-9.16/base/openjpeg.mak.system-openjpeg2	2015-03-30 09:21:24.000000000 +0100
-+++ ghostscript-9.16/base/openjpeg.mak	2015-03-30 17:05:55.160034798 +0100
-@@ -16,6 +16,7 @@
- # makefile for Luratech lwf_jp2 library code.
- # Users of this makefile must define the following:
- #       SHARE_JPX - whether to compile in or link to the library
-+#       SHARE_JPX_LIB - name of external library to link to
- #       JPXSRCDIR - the library source directory
- #
- # gs.mak and friends define the following:
-@@ -105,7 +106,7 @@ $(OPEN_JPEG_GEN)openjpeg.dev : $(TOP_MAK
- # external link .dev
- $(OPEN_JPEG_GEN)openjpeg_1.dev : $(TOP_MAKEFILES) $(OPEN_JPEG_MAK) $(ECHOGS_XE) \
-  $(MAKEDIRS)
--	$(SETMOD) $(OPEN_JPEG_GEN)openjpeg_1 -lib lib_openjpeg
-+	$(SETMOD) $(OPEN_JPEG_GEN)openjpeg_1 -lib $(SHARE_JPX_LIB)
- 
- # compile our own .dev
- $(OPEN_JPEG_GEN)openjpeg_0.dev : $(TOP_MAKEFILES) $(OPEN_JPEG_MAK) $(ECHOGS_XE) $(open_jpeg_OBJS) \
-diff -up ghostscript-9.16/configure.ac.system-openjpeg2 ghostscript-9.16/configure.ac
---- ghostscript-9.16/configure.ac.system-openjpeg2	2015-03-30 09:21:24.000000000 +0100
-+++ ghostscript-9.16/configure.ac	2015-03-30 17:05:08.563193858 +0100
-@@ -1531,6 +1531,17 @@ if test "x$JPX_DECODER" = "x"; then
-       JPXDEVS='$(PSD)jpx.dev'
-     else
-       AC_MSG_RESULT([no])
-+      AC_MSG_CHECKING([for system OpenJPEG library])
-+      if $PKGCONFIG --exists libopenjp2; then
-+        AC_MSG_RESULT(yes)
-+        JPX_DECODER=openjpeg
-+        SHARE_JPX=1
-+        SHARE_JPX_LIB="`$PKGCONFIG libopenjp2 --libs | sed -e 's,^-l,,'`"
-+        JPX_AUTOCONF_CFLAGS="-DUSE_OPENJPEG_JP2 `$PKGCONFIG libopenjp2 --cflags`"
-+        JPXDEVS='$(PSD)jpx.dev'
-+      else
-+        AC_MSG_RESULT(no)
-+      fi
-     fi
-   fi
- fi
-@@ -1539,6 +1550,7 @@ AC_SUBST(JPX_DECODER)
- AC_SUBST(JPX_AUTOCONF_CFLAGS)
- AC_SUBST(JPXDIR)
- AC_SUBST(SHARE_JPX)
-+AC_SUBST(SHARE_JPX_LIB)
- AC_SUBST(JPXDEVS)
- 
- dnl check if we can/should build the gtk loader
-diff -up ghostscript-9.16/Makefile.in.system-openjpeg2 ghostscript-9.16/Makefile.in
---- ghostscript-9.16/Makefile.in.system-openjpeg2	2015-03-30 17:02:51.000000000 +0100
-+++ ghostscript-9.16/Makefile.in	2015-03-30 17:05:08.563193858 +0100
-@@ -248,6 +248,7 @@ JBIG2_CFLAGS=@JBIG2_AUTOCONF_CFLAGS@
- # and source location and configuration flags for compiling in
- JPX_LIB=@JPX_DECODER@
- SHARE_JPX=@SHARE_JPX@
-+SHARE_JPX_LIB=@SHARE_JPX_LIB@
- JPXSRCDIR=@JPXDIR@
- JPX_CFLAGS=@JPX_AUTOCONF_CFLAGS@
- 
diff --git a/main/ghostscript/ghostscript-system-zlib.patch b/main/ghostscript/ghostscript-system-zlib.patch
index ea70c1100c..ed6e42da32 100644
--- a/main/ghostscript/ghostscript-system-zlib.patch
+++ b/main/ghostscript/ghostscript-system-zlib.patch
@@ -1,8 +1,8 @@
 diff --git a/base/lib.mak b/base/lib.mak
-index de78333..b9e7dfa 100644
+index e8ee4e7..4abaa05 100644
 --- a/base/lib.mak
 +++ b/base/lib.mak
-@@ -582,7 +582,9 @@ srlx_h=$(GLSRC)srlx.h
+@@ -589,7 +589,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