Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/cdemu-daemon/PKGBUILD
	community/chmsee/PKGBUILD
	community/fceux/PKGBUILD
	community/ginac/PKGBUILD
	community/gstreamermm/PKGBUILD
	community/gtksourceviewmm/PKGBUILD
	community/lgi/PKGBUILD
	community/libmirage/PKGBUILD
	core/gawk/PKGBUILD
	core/gettext/PKGBUILD
	extra/enca/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/hdf5/PKGBUILD
	extra/kdebase/PKGBUILD
	extra/libass/PKGBUILD
	extra/libdiscid/PKGBUILD
	extra/libxcomposite/PKGBUILD
	extra/libxdamage/PKGBUILD
	extra/maxima/PKGBUILD
	extra/nx/PKGBUILD
	extra/opencv/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/redland/PKGBUILD
	extra/sharutils/PKGBUILD
	extra/soundtouch/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/twisted/PKGBUILD
	libre/dpkg/PKGBUILD

3 files changed, 81 insertions, 13 deletions

diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD
index c3c095e50..31b8467c0 100644
--- a/libre/cups-filters-libre/PKGBUILD
+++ b/libre/cups-filters-libre/PKGBUILD
@@ -1,32 +1,40 @@
-# $Id: PKGBUILD 173950 2012-12-29 15:58:32Z andyrtr $
+# $Id: PKGBUILD 174970 2013-01-09 16:29:59Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=cups-filters-libre
 _pkgname=cups-filters
-pkgver=1.0.28
-pkgrel=1
+pkgver=1.0.29
+pkgrel=3
 pkgdesc="OpenPrinting CUPS Filters"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
 license=('GPL')
-depends=('lcms2' 'poppler>=0.20.5' 'qpdf')
+depends=('lcms2' 'poppler>=0.22.0' 'qpdf>=4.0.0')
 makedepends=('ghostscript' 'ttf-dejavu') # ttf-dejavu for make check
 optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'
 	    'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly'
 	    'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly')
 backup=(etc/fonts/conf.d/99pdftoopvp.conf)
 options=(!libtool)
-source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz cups-browsed.service)
-md5sums=('20e9aeb5080ef4c997edc5e5106184b8'
-         '2beb8d9cebf20ddcc6c7598aab4812a6')
+source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz
+        cups-browsed.service
+        poppler_buildfix.diff)
+md5sums=('0640a02a3fb88d3dbdb224e3becd400d'
+         '4c9f97eae201798000483c4e7109e690'
+         'bd97d1d9dbd4feec3a0330fd9fb7a03c')
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
 
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
+  
+  # fix build with poppler 0.22
+  patch -Np0 -i ${srcdir}/poppler_buildfix.diff
+  
   ./configure --prefix=/usr  \
     --sysconfdir=/etc \
+    --with-rcdir=no \
     --enable-avahi \
     --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf
   make
@@ -34,7 +42,7 @@ build() {
 
 check() {
   cd "$srcdir/$_pkgname-$pkgver"
-  make -k check
+  make -j1 -k check
 }
 
 package() {
@@ -44,6 +52,5 @@ package() {
   rm -f ${pkgdir}/usr/lib/*.a
   
   # add missing systemd support
-  rm -rf ${pkgdir}/etc/rc.d
   install -Dm644 ${srcdir}/cups-browsed.service ${pkgdir}/usr/lib/systemd/system/cups-browsed.service
 }
diff --git a/libre/cups-filters-libre/cups-browsed.service b/libre/cups-filters-libre/cups-browsed.service
index d434d82f0..144956c7f 100644
--- a/libre/cups-filters-libre/cups-browsed.service
+++ b/libre/cups-filters-libre/cups-browsed.service
@@ -1,10 +1,10 @@
 [Unit]
-Description=a daemon to browse the Bonjour broadcasts
+Description=Make remote CUPS printers available locally
+After=cups.service avahi-daemon.service
+Wants=cups.service avahi-daemon.service
 
 [Service]
 ExecStart=/usr/sbin/cups-browsed
-PrivateTmp=yes
 
 [Install]
-Also=cups.service avahi-daemon.service
-WantedBy=printer.target
+WantedBy=multi-user.target
diff --git a/libre/cups-filters-libre/poppler_buildfix.diff b/libre/cups-filters-libre/poppler_buildfix.diff
new file mode 100644
index 000000000..b646efd6b
--- /dev/null
+++ b/libre/cups-filters-libre/poppler_buildfix.diff
@@ -0,0 +1,61 @@
+=== modified file 'NEWS'
+--- NEWS	2013-01-02 18:23:25 +0000
++++ NEWS	2013-01-09 10:42:32 +0000
+@@ -1,6 +1,11 @@
+ NEWS - OpenPrinting CUPS Filters v1.0.29 - 2013-01-02
+ -----------------------------------------------------
+ 
++CHANGES IN V1.0.30
++
++	- pdftoopvp: Let it build with Poppler 0.22.x. Thanks to Koji Otani
++	  from BBR Inc. (Bug #1089).
++
+ CHANGES IN V1.0.29
+ 
+ 	- Fixed ./configure option "--with-rcdir=no". Thanks to Jiri
+
+=== modified file 'filter/pdftoopvp/OPVPOutputDev.cxx'
+--- filter/pdftoopvp/OPVPOutputDev.cxx	2012-07-20 08:32:55 +0000
++++ filter/pdftoopvp/OPVPOutputDev.cxx	2013-01-09 10:42:32 +0000
+@@ -1804,8 +1804,14 @@
+   maskSplash = new Splash(maskBitmap, gFalse);
+   maskColor[0] = 0;
+   maskSplash->clear(maskColor);
++#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2))
+   maskSplash->drawImage(&imageSrc, &imgMaskData,
+ 			splashModeMono8, gFalse, maskWidth, maskHeight, mat);
++#else
++  maskSplash->drawImage(&imageSrc, &imgMaskData,
++			splashModeMono8, gFalse, maskWidth, maskHeight,
++                        mat,gFalse);
++#endif
+   delete imgMaskData.imgStr;
+   maskStr->close();
+   gfree(imgMaskData.lookup);
+
+=== modified file 'filter/pdftoopvp/oprs/OPRS.cxx'
+--- filter/pdftoopvp/oprs/OPRS.cxx	2012-09-10 19:56:59 +0000
++++ filter/pdftoopvp/oprs/OPRS.cxx	2013-01-09 10:42:32 +0000
+@@ -5,6 +5,9 @@
+ //========================================================================
+ 
+ #include <config.h>
++#ifdef HAVE_CPP_POPPLER_VERSION_H
++#include "cpp/poppler-version.h"
++#endif
+ 
+ #ifdef USE_GCC_PRAGMAS
+ #pragma implementation
+@@ -235,7 +238,11 @@
+ 			      SplashColorMode srcMode, GBool srcAlpha,
+ 			      int w, int h, SplashCoord *mat) {
+     if (rasterMode) {
++#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2))
+ 	return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);
++#else
++	return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse);
++#endif
+     } else {
+ 	return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);
+     }
+