Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

4 files changed, 42 insertions, 38 deletions

diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD
index 3a7f50e3a..bd51a4838 100644
--- a/libre/cups-filters-libre/PKGBUILD
+++ b/libre/cups-filters-libre/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 192539 2013-08-13 18:20:20Z andyrtr $
+# $Id: PKGBUILD 193721 2013-08-29 11:50:04Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=cups-filters-libre
 _pkgname=cups-filters
-pkgver=1.0.36
+pkgver=1.0.37
 pkgrel=1
 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation"
 arch=('i686' 'x86_64')
@@ -17,10 +17,8 @@ optdepends=('ghostscript: for non-PostScript printers to print with CUPS to conv
 backup=(etc/fonts/conf.d/99pdftoopvp.conf
         etc/cups/cups-browsed.conf)
 options=(!libtool)
-source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz
-        cups-browsed.service)
-md5sums=('c48a991ac408583d33e1d1e84881c470'
-         '9ef68d7c2a84713fd421f4e87dec0a6e')
+source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz)
+md5sums=('42d2dd9745d4d5d626c7b871155cb430')
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
@@ -49,6 +47,7 @@ package() {
   # drop static lib
   rm -f ${pkgdir}/usr/lib/*.a
   
-  # add missing systemd support
-  install -Dm644 ${srcdir}/cups-browsed.service ${pkgdir}/usr/lib/systemd/system/cups-browsed.service
+  # add upstream systemd support file
+  install -Dm644 utils/cups-browsed.service ${pkgdir}/usr/lib/systemd/system/cups-browsed.service
+  sed -i "s|/usr/sbin/cups-browsed|/usr/bin/cups-browsed|" ${pkgdir}/usr/lib/systemd/system/cups-browsed.service
 }
diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD
index d9be53172..63958664e 100644
--- a/libre/ghostscript-libre/PKGBUILD
+++ b/libre/ghostscript-libre/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 192537 2013-08-13 17:54:45Z andyrtr $
+# $Id: PKGBUILD 193535 2013-08-22 17:59:22Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer (Parabola): Joshua Haase <hahj87@gmail.com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=ghostscript
 pkgname=ghostscript-libre
-pkgver=9.07
-pkgrel=3
+pkgver=9.09
+pkgrel=1
 pkgdesc="An interpreter for the PostScript language, without nonfree files"
 arch=('i686' 'x86_64' 'mips64el')
 license=('AGPL') #non free files removed
 depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg'
-         'libtiff>=4.0.0' 'lcms' 'dbus')
-makedepends=('gtk2' 'gnutls')
+         'libtiff>=4.0.0' 'lcms2' 'dbus')
+makedepends=('gtk2' 'gnutls' 'openjpeg')
 optdepends=('texlive-core:      needed for dvipdf'
             'gtk2:              needed for gsx')
 conflicts=('ghostscript')
@@ -20,18 +20,18 @@ replaces=('ghostscript')
 provides=("ghostscript=$pkgver")
 url="http://www.ghostscript.com/"
 source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2)
-options=('!libtool')
-md5sums=('eea27befc1e85bef6d4768202f6b03a5')
+options=('!libtool' '!makeflags')
+md5sums=('4f47c29daae8e567ebdef842b7e0f8ea')
 
 build() {
   cd ghostscript-${pkgver}
   
-  # delete non-free packages
+  # delete nonfree files
   grep -l "are not altered" Resource/CMap/* | xargs rm -fv
   grep -l "not be copied" Resource/CMap/* | xargs rm -fv
 
   # 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 \
@@ -60,7 +60,7 @@ build() {
 
 package() {
   cd ghostscript-${pkgver}
-  make -j1 DESTDIR="${pkgdir}" \
+  make DESTDIR="${pkgdir}" \
 	cups_serverroot="${pkgdir}"/etc/cups \
 	cups_serverbin="${pkgdir}"/usr/lib/cups install soinstall
 
@@ -74,7 +74,7 @@ package() {
 
   # install IJS
   cd ijs
-  make -j1 DESTDIR="${pkgdir}" install
+  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}
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}
diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD
index 6477c774c..0eef753de 100644
--- a/libre/gst-plugins-bad-libre/PKGBUILD
+++ b/libre/gst-plugins-bad-libre/PKGBUILD
@@ -1,9 +1,10 @@
+# $Id: PKGBUILD 193745 2013-08-30 07:49:47Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgname=gst-plugins-bad
 pkgname=$_pkgname-libre
-pkgver=1.0.9
+pkgver=1.0.10
 pkgrel=1
 pkgdesc='GStreamer Multimedia Framework Bad Plugins, without nonfree faac support'
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +17,7 @@ conflicts=$_pkgname
 replaces=$_pkgname
 options=(!libtool !emptydirs)
 source=(${url}/src/$_pkgname/$_pkgname-$pkgver.tar.xz)
-sha256sums=('69d236b1d8188270a3f51f6710146d0ca63c2f1a9f6cfbab3399ef01b9498f75')
+sha256sums=('91da60ba2ee5c681f11188a4a456894e7f989435c2102c15eff97bbd4fc4c726')
 
 build() {
   cd $_pkgname-$pkgver
@@ -34,7 +35,8 @@ build() {
 
 check() {
   cd $_pkgname-$pkgver
-  make check
+  # don't have a camera for the camerabin test
+  make -k check || :
 }
 
 package() {