[packages/ghostpdl] - up to 9.22

[baggins]

commit d030a5c7787d78b08b436ea2075e117957677d08
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Nov 24 09:12:36 2017 +0100

    - up to 9.22

 ghostpdl-fonts_locations.patch |  2 +-
 ghostpdl-system-libs.patch     | 38 +-------------------------------------
 ghostpdl.spec                  |  8 ++++----
 3 files changed, 6 insertions(+), 42 deletions(-)
---
diff --git a/ghostpdl.spec b/ghostpdl.spec
index cb23fc0..ad2493a 100644
--- a/ghostpdl.spec
+++ b/ghostpdl.spec
@@ -8,13 +8,13 @@
 Summary:	PostScript, PDF and XPS interpreter and renderer
 Summary(pl.UTF-8):	Interpreter i renderer PostScriptu, PDF oraz XPS
 Name:		ghostpdl
-Version:	9.20
-Release:	2
+Version:	9.22
+Release:	0.1
 License:	AGPL v3+
 Group:		Applications/Graphics
 #Source0Download: https://github.com/ArtifexSoftware/ghostpdl-downloads/releases
-Source0:	https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs920/%{name}-%{version}.tar.xz
-# Source0-md5:	eb2e79f777c8953e932159d1c7ea2d1a
+Source0:	https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs922/%{name}-%{version}.tar.xz
+# Source0-md5:	4b6fd53f0b7ffca24cdf98456fecc22e
 Patch0:		%{name}-fonts_locations.patch
 Patch1:		%{name}-make.patch
 Patch2:		%{name}-system-libs.patch
diff --git a/ghostpdl-fonts_locations.patch b/ghostpdl-fonts_locations.patch
index 29a3ed8..18a91d2 100644
--- a/ghostpdl-fonts_locations.patch
+++ b/ghostpdl-fonts_locations.patch
@@ -4,7 +4,7 @@
     source table. */
  static pjl_fontsource_t pjl_fontsource_table[] = {
      {"I",
--     "%rom%ttfonts/;fonts/;urwfonts/;/windows/fonts/;/win95/fonts/;/winnt/fonts/", ""},
+-     "%rom%ttfonts/;urwfonts/;pcl/urwfonts/;ghostpdl/pcl/urwfonts/;/windows/fonts/;", ""},
 +     "/usr/share/fonts/Type1/;/usr/share/fonts/TTF/" },
      {"C", "CART0/", ""},
      {"C1", "CART1/", ""},
diff --git a/ghostpdl-system-libs.patch b/ghostpdl-system-libs.patch
index 513a1c5..9293ad6 100644
--- a/ghostpdl-system-libs.patch
+++ b/ghostpdl-system-libs.patch
@@ -4,44 +4,8 @@
  $(XPSOBJ)xpsjpeg.$(OBJ): $(XPSSRC)xpsjpeg.c $(XPSINCLUDES) $(XPS_MAK) $(MAKEDIRS)
  	$(XPSCCC) $(XPSSRC)xpsjpeg.c $(XPSO_)xpsjpeg.$(OBJ)
  
--$(XPSOBJ)xpspng.$(OBJ): $(XPSSRC)xpspng.c $(XPSINCLUDES) $(PNGSRCDIR)$(D)png.h \
+-$(XPSOBJ)xpspng.$(OBJ): $(XPSSRC)xpspng.c $(XPSINCLUDES) $(png__h) \
 +$(XPSOBJ)xpspng.$(OBJ): $(XPSSRC)xpspng.c $(XPSINCLUDES) \
                          $(PNGGENDIR)$(D)libpng.dev $(XPS_MAK) $(MAKEDIRS)
  	$(XPSCCC) $(I_)$(PNGSRCDIR)$(_I) $(XPSSRC)xpspng.c $(XPSO_)xpspng.$(OBJ)
  
---- ghostpdl-9.20/Makefile.in.orig	2016-09-26 12:36:27.000000000 +0200
-+++ ghostpdl-9.20/Makefile.in	2017-02-06 21:59:33.532453094 +0100
-@@ -321,7 +321,7 @@
- EXPATGENDIR=$(GLGENDIR)
- EXPATOBJDIR=$(GLOBJDIR)
- EXPATINCDIR = $(EXPATSRCDIR)$(D)lib
--SHARE_EXPAT=0
-+SHARE_EXPAT=1
- 
- JPEGXR_SRCDIR=@SRCDIR@/jpegxr
- SHARE_JPEGXR=0
-@@ -450,7 +450,7 @@
- # Solaris may need -lnsl -lsocket -lposix4.
- # (Libraries required by individual drivers are handled automatically.)
- 
--EXTRALIBS=$(XTRALIBS) @LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@ @FT_LIBS@ @JPX_AUTOCONF_LIBS@
-+EXTRALIBS=$(XTRALIBS) @LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@ @FT_LIBS@ @JPX_AUTOCONF_LIBS@ @EXPAT_LIB@
- AUXEXTRALIBS=$(XTRALIBS) @LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@ @FT_LIBS@ @JPX_AUTOCONF_LIBS@ @AUX_SHARED_ZLIB@
- 
- # Define the standard libraries to search at the end of linking.
---- ghostpdl-9.20/configure.ac.orig	2017-02-06 21:58:23.352453896 +0100
-+++ ghostpdl-9.20/configure.ac	2017-02-06 21:58:26.675787193 +0100
-@@ -1543,6 +1543,13 @@
- AC_SUBST(SHARE_JPX)
- AC_SUBST(JPXDEVS)
- 
-+EXPAT_LIB=
-+if test ! -d expat && $PKGCONFIG --exists expat ; then
-+	CFLAGS="$CFLAGS `$PKGCONFIG --cflags expat`"
-+	EXPAT_LIB="`$PKGCONFIG --libs expat`"
-+fi
-+AC_SUBST([EXPAT_LIB])
-+
- dnl check if we can/should build the gtk loader
- AC_ARG_ENABLE([gtk], AC_HELP_STRING([--disable-gtk],
-     [Do not build the gtk loader]))
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ghostpdl.git/commitdiff/d030a5c7787d78b08b436ea2075e117957677d08