ghostscript-libre-9.01-1

1 files changed, 54 insertions, 29 deletions

diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD
index ada545c8e..254358ed4 100644
--- a/libre/ghostscript-libre/PKGBUILD
+++ b/libre/ghostscript-libre/PKGBUILD
@@ -3,60 +3,81 @@
 # Maintainer (Parabola): xihh
 
 pkgname=ghostscript-libre
-pkgver=9.00
-pkgrel=3
+pkgver=9.01
+pkgrel=1
 pkgdesc="An interpreter for the PostScript language without non-free files"
 arch=('i686' 'x86_64')
 license=('GPL3') #non free files removed
-depends=('libxext' 'libxt' 'libcups>=1.4.2-3' 'fontconfig>=2.8.0' 'gnutls>=2.8.5' 'cairo>=1.8.8-2'
-          'jasper>=1.900.1-4' 'zlib' 'libpng>=1.4.0' 'libjpeg>=8')
-makedepends=('automake' 'autoconf' 'gtk2>=2.18.6')
-optdepends=('texlive-core:	dvipdf'
-            'gtk2:		gsx')
+depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng' 'libjpeg' 'libtiff')
+makedepends=('gtk2' 'gnutls')
+optdepends=('texlive-core:      needed for dvipdf'
+            'gtk2:              needed for gsx')
 conflicts=('ghostscript')
 replaces=('ghostscript-lrpng' 'ghostscript')
-provides=('ghostscript-lprng' "ghostscript=${pkgver}")
+provides=('ghostscript-lprng' "ghostscript")
 url="http://www.ghostscript.com/"
-source=(http://ghostscript.com/releases/ghostscript-${pkgver}.tar.xz
+source=(http://ghostscript.com/releases/ghostscript-${pkgver}.tar.bz2
 	ghostscript-fPIC.patch
-	ghostscript-system-jasper.patch)
+	ghostscript-system-jasper.patch
+	svn_rev11948.diff
+	ghostscript-gdevcups-691733.patch
+	gs_bug691759and691760.diff)
 options=('!libtool' '!makeflags')
-md5sums=('1ca5f245677f78f573e6490bdb40702f'
+md5sums=('9824d6a21ad8b4a831f67601959f1181'
          '766d44c47c693f96941b658e360c1277'
-         '03e27cd02471ab3b642c344fa06b623e')
+         '03e27cd02471ab3b642c344fa06b623e'
+         '78f2b9c2d6a5a60891b2d8b593a15b00'
+         'e459d4cf897bdb54fefbba9d57bd2fa2'
+         '21841b0ea5bd67cf4b68ba64c5d5755b')
 
 build() {
   cd ${srcdir}/ghostscript-${pkgver}
   # force it to use system-libs
-  rm -rf jpeg libpng zlib jasper expat
+  rm -rf jpeg libpng zlib jasper expat tiff
   # delete non-free packages
-  grep -l "are not altered" Resource/CMap/* | xargs rm -f
+  grep -l "are not altered" Resource/CMap/* | xargs rm -fv
+
   # fix build with systems jasper
-  patch -Np1 -i ${srcdir}/ghostscript-system-jasper.patch || return 1
+#  patch -Np1 -i ${srcdir}/ghostscript-system-jasper.patch
 
-  if [ "$CARCH" = "x86_64" ]; then
-    patch -Np1 -i ${srcdir}/ghostscript-fPIC.patch || return 1
-  fi
+#  if [ "$CARCH" = "x86_64" ]; then
+#    patch -Np1 -i ${srcdir}/ghostscript-fPIC.patch
+#  fi
 
+  # part of https://bugs.archlinux.org/task/22006 - http://bugs.ghostscript.com/show_bug.cgi?id=691831
+#  patch -Np2 -i ${srcdir}/svn_rev11948.diff
+  # upstream fix for http://bugs.ghostscript.com/show_bug.cgi?id=691733 / part of https://bugs.archlinux.org/task/21388
+  # patch taken from Fedora RawHide master
+#  patch -Np1 -i ${srcdir}/ghostscript-gdevcups-691733.patch
+  # patch for http://bugs.ghostscript.com/show_bug.cgi?id=691760 and http://bugs.ghostscript.com/show_bug.cgi?id=691759 / part of https://bugs.archlinux.org/task/21388
+#  patch -Np2 -i ${srcdir}/gs_bug691759and691760.diff
+  
+#  ./autogen.sh
+  ./configure --prefix=/usr \
+	--enable-dynamic \
+	--with-ijs \
+	--with-jbig2dec \
+	--with-omni \
+	--with-x \
+	--with-drivers=ALL\
+	--with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \
+	--disable-compile-inits # needed for linking with system-zlib
+  make
+  
   # Build IJS
   cd ${srcdir}/ghostscript-${pkgver}/ijs
   ./autogen.sh
   ./configure --prefix=/usr --enable-shared --disable-static
-  make || return 1
-  make -j1 DESTDIR=${pkgdir} install || return 1
+  make
+}
 
-  cd ..
-  ./autogen.sh
-  ./configure --prefix=/usr --enable-dynamic --with-ijs \
-              --with-jbig2dec --with-omni --with-x --with-drivers=ALL\
-	      --with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \
-	      --disable-compile-inits # needed for linking with system-zlib
-  make || return 1
-  make -j1 DESTDIR=${pkgdir} \
+package() {
+  cd ${srcdir}/ghostscript-${pkgver}
+  make DESTDIR=${pkgdir} \
 	cups_serverroot=${pkgdir}/etc/cups \
 	cups_serverbin=${pkgdir}/usr/lib/cups install soinstall
 
-  # install a missing doc files # http://bugs.archlinux.org/task/18023
+  # 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/
   
   mkdir -p ${pkgdir}/usr/share/licenses/${pkgname}
@@ -64,4 +85,8 @@ build() {
 
   # remove unwanted localized man-pages
   rm -rf $pkgdir/usr/share/man/[^man1]*
+
+  # install IJS
+  cd ${srcdir}/ghostscript-${pkgver}/ijs
+  make DESTDIR=${pkgdir} install
 }