diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/cups-filters-libre/PKGBUILD | 24 | ||||
| -rw-r--r-- | libre/cups-filters-libre/poppler_buildfix.diff | 61 |
2 files changed, 10 insertions, 75 deletions
diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index 597b2f855..939410301 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 174970 2013-01-09 16:29:59Z andyrtr $ +# $Id: PKGBUILD 179657 2013-03-09 09:03:03Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=cups-filters-libre _pkgname=cups-filters -pkgver=1.0.29 -pkgrel=3 -pkgdesc="OpenPrinting CUPS Filters" +pkgver=1.0.30 +pkgrel=1 +pkgdesc="OpenPrinting CUPS Filters (without foomatic-db-nonfree recommendation)" arch=('i686' 'x86_64') url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" license=('GPL') @@ -14,28 +14,24 @@ 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) +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 - poppler_buildfix.diff) -md5sums=('0640a02a3fb88d3dbdb224e3becd400d' - '4c9f97eae201798000483c4e7109e690' - 'bd97d1d9dbd4feec3a0330fd9fb7a03c') + cups-browsed.service) +md5sums=('0d338e63f445e98d29c963620e5b1420' + '4c9f97eae201798000483c4e7109e690') 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-browseremoteprotocols=DNSSD,CUPS \ --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf make } diff --git a/libre/cups-filters-libre/poppler_buildfix.diff b/libre/cups-filters-libre/poppler_buildfix.diff deleted file mode 100644 index b646efd6b..000000000 --- a/libre/cups-filters-libre/poppler_buildfix.diff +++ /dev/null @@ -1,61 +0,0 @@ -=== 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); - } - |