[arch-commits] Commit in ghostscript/trunk (PKGBUILD ps2epsi.patch)

[Andreas Radke]

    Date: Sunday, February 7, 2021 @ 20:45:06
  Author: andyrtr
Revision: 407612

upgpkg: ghostscript 9.53.3-3: fix path for PostScript helper file in ps2epsi - FS#69554

Added:
  ghostscript/trunk/ps2epsi.patch
Modified:
  ghostscript/trunk/PKGBUILD

---------------+
 PKGBUILD      |   13 +++++++++----
 ps2epsi.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-02-07 20:29:53 UTC (rev 407611)
+++ PKGBUILD	2021-02-07 20:45:06 UTC (rev 407612)
@@ -3,7 +3,7 @@
 pkgbase=ghostscript
 pkgname=(ghostscript ghostxps ghostpcl)
 pkgver=9.53.3
-pkgrel=2
+pkgrel=3
 pkgdesc="An interpreter for the PostScript language"
 url="https://www.ghostscript.com/"
 arch=('x86_64')
@@ -12,15 +12,20 @@
          'libtiff' 'lcms2' 'dbus' 'libpaper' 'ijs' 'openjpeg2' 'libidn')
 makedepends=('gtk3' 'gnutls' 'glu' 'freeglut')
 # https://github.com/ArtifexSoftware/ghostpdl-downloads/releases
-source=(https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${pkgver//./}/ghostpdl-${pkgver}.tar.gz)
-sha512sums=('1ed66f177377f099a012ee0bfdca10be8b6846e8de8e538119eb7de5c9da2edc341f8d45d8c819206908c1f98de3625acd0f647f13d82c5ec56865085cde280b')
+source=(https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${pkgver//./}/ghostpdl-${pkgver}.tar.gz
+        ps2epsi.patch)
+sha512sums=('1ed66f177377f099a012ee0bfdca10be8b6846e8de8e538119eb7de5c9da2edc341f8d45d8c819206908c1f98de3625acd0f647f13d82c5ec56865085cde280b'
+            'ea410c1323550403090a9266bb71c2bf6abf82b747b14b45bdb66e893d6e049c21da02114339796099b6ad0f3412d747c968120da5470d1761dfb8a0a3558931')
 
-
 ### update jbig2dec first! ###
 
 prepare() {
   cd ghostpdl-${pkgver}
 
+  # FS#69554 - fix path for PostScript helper file in ps2epsi
+  # http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=c6166768c6e963b0fe28ccdb266629443e521381
+  patch -Np1 -i ../ps2epsi.patch
+
   # force it to use system-libs
   rm -r cups/libs expat ijs jbig2dec jpeg lcms2mt libpng openjpeg tiff zlib
   # using tree freetype because of https://bugs.archlinux.org/task/56849

Added: ps2epsi.patch
===================================================================
--- ps2epsi.patch	                        (rev 0)
+++ ps2epsi.patch	2021-02-07 20:45:06 UTC (rev 407612)
@@ -0,0 +1,31 @@
+From: Ray Johnston <ray.johnston at artifex.com>
+Date: Mon, 14 Dec 2020 16:39:50 +0000 (-0800)
+Subject: Fix bug 703270: Wrong path for PostScript helper file in ps2epsi
+X-Git-Tag: ghostpdl-9.54.0-test-base-0~13
+X-Git-Url: http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff_plain;h=c6166768c6e963b0fe28ccdb266629443e521381
+
+Fix bug 703270: Wrong path for PostScript helper file in ps2epsi
+
+In the change mentioned in the bug, rather than rely on the LIBPATH
+search method, the ps2epsi script assumed that pd2epsi.ps would be
+in the same directory as the 'gs' executable, which is not correct.
+
+Change to use bare 'ps2epsi.ps' so that it will be found on the
+LIBPATH as instialled by: make install
+---
+
+diff --git a/lib/ps2epsi b/lib/ps2epsi
+index 7590cb5a7..dbfc9fb3d 100755
+--- a/lib/ps2epsi
++++ b/lib/ps2epsi
+@@ -40,8 +40,8 @@ else
+ 	outfile=$2
+ fi
+ 
+-# Note, we expect 'ps2epsi.ps' to be in the same directory as 'ps2epsi'
++# Note, we expect 'ps2epsi.ps' to be on one of the search paths which can be seen by: gs -h
+ "$GS_EXECUTABLE" -q -dNOOUTERSAVE -dNODISPLAY -dLastPage=1 -sOutputFile="${outfile}" \
+-		--permit-file-all="${infile}" -- "$LIBDIR/ps2epsi.ps"  "${infile}" 1>&2
++		--permit-file-all="${infile}" -- ps2epsi.ps  "${infile}" 1>&2
+ 
+ exit 0