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

Andreas Radke andyrtr at archlinux.org
Tue Mar 30 21:16:39 UTC 2021


    Date: Tuesday, March 30, 2021 @ 21:16:39
  Author: andyrtr
Revision: 411293

upgpkg: ghostscript 9.54.0-1: upstream update 9.54.0; disable new OCR capabilities; use upstream Makefile targets

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

---------------+
 PKGBUILD      |   68 ++++++++++++++++++++++++++++----------------------------
 ps2epsi.patch |   31 -------------------------
 2 files changed, 35 insertions(+), 64 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-30 19:26:51 UTC (rev 411292)
+++ PKGBUILD	2021-03-30 21:16:39 UTC (rev 411293)
@@ -2,8 +2,8 @@
 
 pkgbase=ghostscript
 pkgname=(ghostscript ghostxps ghostpcl)
-pkgver=9.53.3
-pkgrel=3
+pkgver=9.54.0
+pkgrel=1
 pkgdesc="An interpreter for the PostScript language"
 url="https://www.ghostscript.com/"
 arch=('x86_64')
@@ -12,20 +12,36 @@
          '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
-        ps2epsi.patch)
-sha512sums=('1ed66f177377f099a012ee0bfdca10be8b6846e8de8e538119eb7de5c9da2edc341f8d45d8c819206908c1f98de3625acd0f647f13d82c5ec56865085cde280b'
-            'ea410c1323550403090a9266bb71c2bf6abf82b747b14b45bdb66e893d6e049c21da02114339796099b6ad0f3412d747c968120da5470d1761dfb8a0a3558931')
+source=(https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${pkgver//./}/ghostpdl-${pkgver}.tar.xz)
+sha512sums=('fed500f5f267f0eeecc4ab44c2785ddaa9ad6965b689e9792021e2348296ee19150f10decb264a4689464088449be44fe8e6c30566a26e6e4e978c8b2d4654ec')
 
 ### update jbig2dec first! ###
 
+### make sure to rebuild core/groff on version updates - https://bugs.archlinux.org/task/67751 ###
+
 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
+  # *** remove after final decision ***
+  # new in 9.54.0: 
+  # https://www.ghostscript.com/doc/9.54.0/News.htm
 
+  # 1) inclusion of the tesseract/leptonica sources for OCR capabilities
+  # at the moment we do not support linking with tesseract/leptonica shared libraries. 
+  # As is normal with such included libraries, deleting those directories and (re)running
+  # configure (on Unix like systems) will automatically build without the OCR functionality.
+  # increases package size ghostpcl 2.7->4.9MB | ghostscript 18->23MB | ghostxps 2,7->4.9MB
+  # https://www.ghostscript.com/doc/9.54.0/VectorDevices.htm#UseOCR - 
+  # this doesn't seem to be worth to keep enabled until linking with shared libs is supported
+  rm -r tesseract leptonica
+
+  # 2) new directory addition in the source tree: "extract/". 
+  # It contains the implementation for the writing of docx format files used by the
+  # new "docxwrite" device. This is *not* a "thirdparty library". 
+  # For distribution package maintainers, if you want your packaged Ghostscript to include
+  # the "docxwrite" device, do not delete this directory.
+  # ^ this one doesn't affect package size - so let's keep it
+
   # 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
@@ -53,8 +69,7 @@
               --with-system-libtiff \
               --with-libpaper \
               --disable-compile-inits #--help # needed for linking with system-zlib
-
-  make so-only
+  make
 }
 
 package_ghostscript() {
@@ -62,18 +77,13 @@
               'gtk3:              needed for gsx')
 
   cd ghostpdl-${pkgver}
-
-  make DESTDIR="${pkgdir}" \
-       CUPSSERVERROOT="${pkgdir}$(cups-config --serverroot)" \
-       CUPSSERVERBIN="${pkgdir}$(cups-config --serverbin)" \
-       soinstall
+  make DESTDIR="${pkgdir}"  install-gs install-so-gs
+  # replace statically linked gs binary with symlink to dynamically linked gsc
+  rm -v "${pkgdir}"/usr/bin/gs
   ln -s gsc "${pkgdir}"/usr/bin/gs
 
-  # remove useless broken doc/ symlink - FS#59507
-  rm -f "${pkgdir}"/usr/share/ghostscript/${pkgver}/doc
-
   # remove unwanted localized manpages
-  rm -r "${pkgdir}"/usr/share/man/de
+  rm -rv "${pkgdir}"/usr/share/man/de
 
   install -Dt "${pkgdir}"/usr/share/licenses/${pkgname} -m644 LICENSE
 }
@@ -83,13 +93,9 @@
   depends=("ghostscript=${pkgver}-${pkgrel}")
 
   cd ghostpdl-${pkgver}
-
-  install -Dt "${pkgdir}"/usr/bin sobin/gxpsc
-  ln -s gxpsc "${pkgdir}"/usr/bin/gxps
-
-  install -Dt "${pkgdir}"/usr/lib sobin/libgxps.so.${pkgver%.*}
-  ln -s libgxps.so.${pkgver%.*} "${pkgdir}"/usr/lib/libgxps.so.${pkgver%%.*}
-
+  make DESTDIR="${pkgdir}" install-gxps install-so-gxps
+  rm -r "${pkgdir}"/usr/include
+  
   install -Dt "${pkgdir}"/usr/share/licenses/${pkgname} -m644 LICENSE
 }
 
@@ -98,12 +104,8 @@
   depends=("ghostscript=${pkgver}-${pkgrel}")
 
   cd ghostpdl-${pkgver}
+  make DESTDIR="${pkgdir}" install-gpcl6 install-so-gpcl6
+  rm -r "${pkgdir}"/usr/include
 
-  install -Dt "${pkgdir}"/usr/bin sobin/gpcl6c
-  ln -sf gpcl6c "${pkgdir}"/usr/bin/gpcl6
-
-  install -Dt "${pkgdir}"/usr/lib sobin/libgpcl6.so.${pkgver%.*}
-  ln -s libgpcl6.so.${pkgver%.*} "${pkgdir}"/usr/lib/libgpcl6.so.${pkgver%%.*}
-
   install -Dt "${pkgdir}"/usr/share/licenses/${pkgname} -m644 LICENSE
 }

Deleted: ps2epsi.patch
===================================================================
--- ps2epsi.patch	2021-03-30 19:26:51 UTC (rev 411292)
+++ ps2epsi.patch	2021-03-30 21:16:39 UTC (rev 411293)
@@ -1,31 +0,0 @@
-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



More information about the arch-commits mailing list