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

Jan Steffens heftig at archlinux.org
Tue Dec 5 12:46:05 UTC 2017


    Date: Tuesday, December 5, 2017 @ 12:45:58
  Author: heftig
Revision: 311630

9.22-2: Overhaul

Modified:
  ghostscript/trunk/PKGBUILD
Deleted:
  ghostscript/trunk/ghostscript-sys-zlib.patch

----------------------------+
 PKGBUILD                   |  150 +++++++++++++++++++++++++++----------------
 ghostscript-sys-zlib.patch |   25 -------
 2 files changed, 97 insertions(+), 78 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-05 11:21:38 UTC (rev 311629)
+++ PKGBUILD	2017-12-05 12:45:58 UTC (rev 311630)
@@ -1,77 +1,121 @@
 # $Id$
 # Maintainer: AndyRTR <andyrtr at archlinux.org>
 
-pkgname=ghostscript
+pkgbase=ghostscript
+pkgname=(ghostscript ghostxps ghostpcl)
 pkgver=9.22
-pkgrel=1
+pkgrel=2
 pkgdesc="An interpreter for the PostScript language"
+url="https://www.ghostscript.com/"
 arch=('x86_64')
 license=('AGPL' 'custom')
-depends=('libxt' 'libcups' 'fontconfig' 'zlib' 'libpng' 'libjpeg'
-          'jbig2dec' 'libtiff' 'lcms2' 'dbus' 'libpaper' 'ijs')
-makedepends=('gtk3' 'gnutls')
-optdepends=('texlive-core:      needed for dvipdf'
-            'gtk3:              needed for gsx')
-url="http://www.ghostscript.com/"
-source=(https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${pkgver/./}/ghostscript-${pkgver}.tar.xz
-        ghostscript-sys-zlib.patch)
-options=('!makeflags')
+depends=('libxt' 'libcups' 'fontconfig' 'zlib' 'libpng' 'libjpeg' 'jbig2dec'
+         'libtiff' 'lcms2' 'dbus' 'libpaper' 'ijs' 'gsfonts' 'poppler-data'
+         'openjpeg2')
+makedepends=('gtk3' 'gnutls' 'glu' 'freeglut')
 # https://github.com/ArtifexSoftware/ghostpdl-downloads/releases
-sha256sums=('c1f862e6f40f997dbe3feba89355e8cb05d55818994e10f4932b0dd9b627d1bb'
-            'c08c7e1354aaa243e753517c61ff86a799a49e0177c7bf6fe0029abc693386f6')
+source=(https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${pkgver/./}/ghostpdl-${pkgver}.tar.xz)
+sha256sums=('f4e46bc1f8285a61ab036007705fc2b532cc40f4448fe6bc156bd130733f306b')
 
 prepare() {
-  cd ghostscript-${pkgver}
-  # fix build with system zlib
-  patch -Np1 -i ${srcdir}/ghostscript-sys-zlib.patch
+  cd ghostpdl-${pkgver}
+
+  # force it to use system-libs
+  rm -r cups/libs expat freetype ijs jbig2dec jpeg lcms2 libpng openjpeg tiff zlib
+
+  autoreconf -fvi
 }
 
 build() {
-  cd ghostscript-${pkgver}
-  
-  # force it to use system-libs
-  # keep heavily patched included openjpeg, leads to segfault with system openjpeg
-  # https://bugs.archlinux.org/task/38226
-  rm -rfv cups/libs freetype ijs jbig2dec jpeg lcms2 libpng tiff zlib
+  cd ghostpdl-${pkgver}
 
-  autoconf --force
+  local fontpath p
+  for p in \
+    /usr/share/fonts/gsfonts \
+    /usr/share/fonts \
+    /usr/share/poppler/cMap/*
+  do
+    fontpath="${fontpath}${fontpath:+:}${p}"
+  done
 
   ./configure --prefix=/usr \
-	--enable-dynamic \
-	--with-ijs \
-	--with-jbig2dec \
-	--without-omni \
-	--with-x \
-	--with-drivers=ALL\
-	--with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \
-	--enable-fontconfig \
-	--enable-freetype \
-	--enable-openjpeg \
-	--without-luratech \
-	--with-system-libtiff \
-	--with-libpaper \
-	--disable-compile-inits #--help # needed for linking with system-zlib
-  make so
-  make
+              --enable-dynamic \
+              --with-ijs \
+              --with-jbig2dec \
+              --with-x \
+              --with-drivers=ALL \
+              --with-fontpath="$fontpath" \
+              --enable-fontconfig \
+              --enable-freetype \
+              --enable-openjpeg \
+              --without-luratech \
+              --with-system-libtiff \
+              --with-libpaper \
+              --disable-compile-inits #--help # needed for linking with system-zlib
+
+  make so-only
 }
 
-package() {
-  cd ghostscript-${pkgver}
+package_ghostscript() {
+  optdepends=('texlive-core:      needed for dvipdf'
+              'gtk3:              needed for gsx')
+
+  cd ghostpdl-${pkgver}
+
   make DESTDIR="${pkgdir}" \
-	cups_serverroot="${pkgdir}"/etc/cups \
-	cups_serverbin="${pkgdir}"/usr/lib/cups install install-so
+       CUPSSERVERROOT="${pkgdir}$(cups-config --serverroot)" \
+       CUPSSERVERBIN="${pkgdir}$(cups-config --serverbin)" \
+       soinstall
+  ln -s gsc "${pkgdir}"/usr/bin/gs
 
-  # drop full libs linked gs, prefer gsc dynamically linked against libgs; FS#50422
-  ln -sf /usr/bin/gsc "${pkgdir}"/usr/bin/gs
-
   # install missing doc files # http://bugs.archlinux.org/task/18023
-  install -m 644 "${srcdir}"/ghostscript-${pkgver}/doc/{VectorDevices.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} "${pkgdir}"/usr/share/ghostscript/$pkgver/doc/
-  
-  install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  install -Dt "${pkgdir}"/usr/share/ghostscript/${pkgver}/doc \
+    -m644 doc/{VectorDevices.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt}
 
-  # remove unwanted localized man-pages
-  rm -rf "$pkgdir"/usr/share/man/[^man1]*
+  # remove unwanted localized manpages
+  rm -r "${pkgdir}"/usr/share/man/de
 
-  # remove filters that are now maintained in cups-filters as upstream home
-  rm -rf "$pkgdir"/usr/lib/cups/filter/{gstopxl,gstoraster}
+  # remove fonts we already ship in gsfonts
+  rm -r "${pkgdir}"/usr/share/ghostscript/${pkgver}/Resource/Font
+
+  # remove cmaps we already ship in poppler-data
+  local f
+  for f in "${pkgdir}"/usr/share/ghostscript/${pkgver}/Resource/CMap/*; do
+    [[ $f == */Identity* ]] && continue
+    rm $f
+  done
+
+  install -Dt "${pkgdir}"/usr/share/licenses/${pkgname} -m644 LICENSE
 }
+
+package_ghostxps() {
+  pkgdesc="${pkgdesc/PostScript/XPS document}"
+  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%.*}
+  ln -s libgxps.so.${pkgver} "${pkgdir}"/usr/lib/libgxps.so
+
+  install -Dt "${pkgdir}"/usr/share/licenses/${pkgname} -m644 LICENSE
+}
+
+package_ghostpcl() {
+  pkgdesc="${pkgdesc/PostScript/PCL 6}"
+  depends=("ghostscript=${pkgver}-${pkgrel}")
+
+  cd ghostpdl-${pkgver}
+
+  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%.*}
+  ln -s libgpcl6.so.${pkgver} "${pkgdir}"/usr/lib/libgpcl6.so
+
+  install -Dt "${pkgdir}"/usr/share/licenses/${pkgname} -m644 LICENSE
+}

Deleted: ghostscript-sys-zlib.patch
===================================================================
--- ghostscript-sys-zlib.patch	2017-12-05 11:21:38 UTC (rev 311629)
+++ ghostscript-sys-zlib.patch	2017-12-05 12:45:58 UTC (rev 311630)
@@ -1,25 +0,0 @@
-diff -up ghostscript-9.12/configure.ac.sys-zlib ghostscript-9.12/configure.ac
---- ghostscript-9.12/configure.ac.sys-zlib	2014-03-26 11:48:54.983972222 +0000
-+++ ghostscript-9.12/configure.ac	2014-03-26 11:49:36.807230531 +0000
-@@ -854,7 +854,7 @@ AC_MSG_CHECKING([for local zlib source])
- dnl zlib is needed for language level 3, and libpng
- # we must define ZLIBDIR regardless because png.mak does a -I$(ZLIBDIR)
- # this seems a harmless default
--ZLIBDIR=src
-+ZLIBDIR=$includedir
- AUX_SHARED_ZLIB=
- 
- if test -d $srcdir/zlib; then
-diff -up ghostscript-9.12/configure.sys-zlib ghostscript-9.12/configure
---- ghostscript-9.12/configure.sys-zlib	2014-03-26 11:49:45.547284521 +0000
-+++ ghostscript-9.12/configure	2014-03-26 11:49:56.171350127 +0000
-@@ -6254,7 +6254,7 @@ fi
- $as_echo_n "checking for local zlib source... " >&6; }
- # we must define ZLIBDIR regardless because png.mak does a -I$(ZLIBDIR)
- # this seems a harmless default
--ZLIBDIR=src
-+ZLIBDIR=$includedir
- AUX_SHARED_ZLIB=
- 
- if test -d $srcdir/zlib; then
-



More information about the arch-commits mailing list