Commit 1134bfd5 authored by abveritas's avatar abveritas

cups-filters & hplip updates

parent 242f0776
# Platform Packages for Chakra, part of chakra-project.org
#
# maintainer abveritas@chakraproject.org
# Maintainer: abveritas@chakraproject.org
pkgname=cups-filters
pkgver=1.0.29
pkgrel=3
pkgver=1.0.30
pkgrel=1
pkgdesc="OpenPrinting CUPS Filters"
arch=('x86_64')
url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
license=('GPL')
depends=('lcms2' 'poppler>=0.20.2' 'qpdf>=4.0.0')
depends=('lcms2' 'poppler' 'qpdf>=4.0.0')
makedepends=('ghostscript' 'ttf-dejavu')
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'
......@@ -18,21 +16,19 @@ optdepends=('ghostscript: for non-PostScript printers to print with CUPS to conv
backup=(etc/fonts/conf.d/99pdftoopvp.conf)
options=(!libtool)
source=("http://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.gz"
'cups-browsed.service'
'poppler_buildfix.diff')
md5sums=('0640a02a3fb88d3dbdb224e3becd400d'
'c1101c052abfd93759d4963f6f6c36f0'
'8029f71aa240f5ed814bcdc900ec1b27')
'cups-browsed.service')
md5sums=('0d338e63f445e98d29c963620e5b1420'
'c1101c052abfd93759d4963f6f6c36f0')
build() {
cd "$srcdir/$pkgname-$pkgver"
patch -p0 -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
--with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf \
--with-browseremoteprotocols=DNSSD,CUPS
make
}
......
=== 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);
}
......@@ -3,17 +3,17 @@
# maintainer abveritas@chakra-project.org
pkgname=hplip
pkgver=3.13.2
pkgver=3.13.3
# incase a or b is used in hplip rls:
_pkgver=3.13.2
_pkgver=3.13.3
pkgrel=1
pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet."
arch=('i686' 'x86_64')
url="http://hplipopensource.com"
license=('GPL')
makedepends=('pyqt' 'python2-gobject' 'pkgconfig' 'sane' 'rpcbind' 'dbus-python' 'cups')
depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
'libcups' 'net-snmp>=5.5' 'libusb-compat')
makedepends=('pyqt' 'python2-gobject' 'pkgconfig' 'sane' 'rpcbind' 'dbus-python' 'cups')
optdepends=('cups: for printing support'
'dbus-python: for dbus support'
'sane: for scanner support'
......@@ -24,8 +24,8 @@ options=('!libtool')
install=${pkgname}.install
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.gz"
"cups-1.6-buildfix.diff")
sha256sums=('7dee21c30a15729b2107713a1b779ea07982064a38e2d4935e58e6f56d6d3592'
'9813f754670f9b4a01e6094c673f63ac62421817c7eb463999abf828358e67df')
sha1sums=('e571cfac1a30c947b3526de691cbe3cf31590bfb'
'7a3b476eb8bcecb4988eadc26924b053a3ed4fbb')
build() {
cd "${srcdir}/${pkgname}-${_pkgver}"
......@@ -84,4 +84,6 @@ package() {
# remove rc
rm -rf "$pkgdir"/etc/init.d
sed -i "s:\$attrs:\$attr:g" $pkgdir/usr/lib/udev/rules.d/56-hpmud_support.rules
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment