Merge branch 'master' of vparabola:abslibre

1 files changed, 19 insertions, 16 deletions

diff --git a/libre/gnu-ghostscript/PKGBUILD b/libre/gnu-ghostscript/PKGBUILD
index 46bbb845d..6d44a7646 100644
--- a/libre/gnu-ghostscript/PKGBUILD
+++ b/libre/gnu-ghostscript/PKGBUILD
@@ -2,15 +2,16 @@
 
 _pkgname=ghostscript
 pkgname=gnu-ghostscript
-_gspkgver=9.07 # ghostscript package version
+_gspkgver=9.09 # ghostscript package version
 _pkgver=9.06
 pkgver=9.06.0
-pkgrel=4
+pkgrel=5
 pkgdesc="An interpreter for the PostScript language maintained by a team of GNU programmers"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
-depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' 'libtiff>=4.0.0' 'lcms2')
-makedepends=('gtk2' 'gnutls')
+depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg'
+         'libtiff>=4.0.0' 'lcms2' 'dbus')
+makedepends=('gtk2' 'gnutls' 'openjpeg')
 optdepends=('texlive-core:      needed for dvipdf'
             'gtk2:              needed for gsx')
 conflicts=${_pkgname}
@@ -19,13 +20,13 @@ url="https://www.gnu.org/software/${_pkgname}/"
 source=(ftp://ftp.gnu.org/gnu/${_pkgname}/${pkgname}-${pkgver}.tar.xz
         ijs-automake.patch
         libtool.patch)
-options=('!libtool')
+options=('!libtool' '!makeflags')
 md5sums=('85a5e07a6b91937c157576293b381065'
          '83bcae456ad4c9fb790be483914dbeba'
          '5bd5d4966007b460deed866a30a0b3c8')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
 
   # fix build with recent automake
   patch -p1 -i "$srcdir/ijs-automake.patch"
@@ -34,7 +35,7 @@ build() {
   patch -Np1 -i ${srcdir}/libtool.patch
 
   # force it to use system-libs
-  rm -rf jpeg libpng zlib jasper expat tiff lcms freetype
+  rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype openjpeg cups/libs # jbig2dec is in community
 
   ./configure --prefix=/usr \
 	--enable-dynamic \
@@ -48,35 +49,37 @@ build() {
 	--enable-fontconfig \
 	--enable-freetype \
 	--without-luratech \
+	--without-omni \
 	--with-system-libtiff \
 	--disable-compile-inits #--help # needed for linking with system-zlib
   make
 
   # Build IJS
-  cd ${srcdir}/${pkgname}-${pkgver}/ijs
+  cd ijs
+  sed -i "s:AM_PROG_CC_STDC:AC_PROG_CC:g" configure.ac
   ./autogen.sh
   ./configure --prefix=/usr --enable-shared --disable-static
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make -j1 DESTDIR=${pkgdir} \
-	cups_serverroot=${pkgdir}/etc/cups \
-	cups_serverbin=${pkgdir}/usr/lib/cups install soinstall
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" \
+	cups_serverroot="${pkgdir}"/etc/cups \
+	cups_serverbin="${pkgdir}"/usr/lib/cups install soinstall
 
   # install missing doc files # http://bugs.archlinux.org/task/18023
-  install -m 644 ${srcdir}/${pkgname}-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} ${pkgdir}/usr/share/${_pkgname}/$_pkgver/doc/
+  install -m 644 "${srcdir}"/${pkgname}-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} "${pkgdir}"/usr/share/${_pkgname}/$_pkgver/doc/
   
   mkdir -p ${pkgdir}/usr/share/licenses/${_pkgname}
   install -m644 LICENSE ${pkgdir}/usr/share/licenses/${_pkgname}/
 
   # remove unwanted localized man-pages
-  rm -rf $pkgdir/usr/share/man/[^man1]*
+  rm -rf "$pkgdir"/usr/share/man/[^man1]*
 
   # install IJS
-  cd ${srcdir}/${pkgname}-${pkgver}/ijs
-  make -j1 DESTDIR=${pkgdir} install
+  cd ijs
+  make DESTDIR="${pkgdir}" install
   
   # remove filters that are now maintained in cups-filters as upstream home
   rm -rf "$pkgdir"/usr/lib/cups/filter/{gstopxl,gstoraster}