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

[Andreas Radke]

    Date: Thursday, March 27, 2014 @ 21:54:33
  Author: andyrtr
Revision: 208881

upgpkg: ghostscript 9.14-1

upstream update 9.14

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

----------------------------+
 PKGBUILD                   |   24 +++++++++++++++++-------
 ghostscript-sys-zlib.patch |   25 +++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-27 20:25:38 UTC (rev 208880)
+++ PKGBUILD	2014-03-27 20:54:33 UTC (rev 208881)
@@ -4,8 +4,8 @@
 ### !!! rebuild groff from core that picks up hardcoding the GS versioned font path !!! ###
 
 pkgname=ghostscript
-pkgver=9.10
-pkgrel=3
+pkgver=9.14
+pkgrel=1
 pkgdesc="An interpreter for the PostScript language"
 arch=('i686' 'x86_64')
 license=('AGPL' 'custom')
@@ -15,18 +15,28 @@
 optdepends=('texlive-core:      needed for dvipdf'
             'gtk3:              needed for gsx')
 url="http://www.ghostscript.com/"
-source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2)
-options=('!makeflags')
-md5sums=('7179bb1ed4f6f453147e6f7e1f210ce8')
+source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2
+        ghostscript-sys-zlib.patch)
+#options=('!makeflags')
+sha1sums=('eab1c9e9850d8aedf02d16f3f7f8198ad9384068'
+          'e054caf753df4d67221b29a2eac66130653f7556')
 
+prepare() {
+  cd ghostscript-${pkgver}
+  # fix build with system zlib
+  patch -Np1 -i ${srcdir}/ghostscript-sys-zlib.patch
+}
+
 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 -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype cups/libs # jbig2dec is in community
 
+  autoconf --force
+
   ./configure --prefix=/usr \
 	--enable-dynamic \
 	--with-ijs \
@@ -57,7 +67,7 @@
   cd ghostscript-${pkgver}
   make DESTDIR="${pkgdir}" \
 	cups_serverroot="${pkgdir}"/etc/cups \
-	cups_serverbin="${pkgdir}"/usr/lib/cups install soinstall
+	cups_serverbin="${pkgdir}"/usr/lib/cups install install-so
 
   # install missing doc files # http://bugs.archlinux.org/task/18023
   install -m 644 "${srcdir}"/ghostscript-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} "${pkgdir}"/usr/share/ghostscript/$pkgver/doc/

Added: ghostscript-sys-zlib.patch
===================================================================
--- ghostscript-sys-zlib.patch	                        (rev 0)
+++ ghostscript-sys-zlib.patch	2014-03-27 20:54:33 UTC (rev 208881)
@@ -0,0 +1,25 @@
+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
+