Commit 167f4c77 authored by abveritas's avatar abveritas

cups-filters broken by poppler 22 update, patched, libbonobo pidof ref removed

parent 2ee37936
......@@ -4,7 +4,7 @@
pkgname=cups-filters
pkgver=1.0.29
pkgrel=2
pkgrel=3
pkgdesc="OpenPrinting CUPS Filters"
arch=('x86_64')
url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
......@@ -18,12 +18,16 @@ 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')
'cups-browsed.service'
'poppler_buildfix.diff')
md5sums=('0640a02a3fb88d3dbdb224e3becd400d'
'c1101c052abfd93759d4963f6f6c36f0')
'c1101c052abfd93759d4963f6f6c36f0'
'8029f71aa240f5ed814bcdc900ec1b27')
build() {
cd "$srcdir/$pkgname-$pkgver"
patch -p0 -i "${srcdir}"/poppler_buildfix.diff
./configure --prefix=/usr \
--sysconfdir=/etc \
--with-rcdir=no \
......
=== 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);
}
......@@ -4,7 +4,7 @@
pkgname=libbonobo
_pkgver=2.32
pkgver="${_pkgver}.1"
pkgrel=2
pkgrel=3
pkgdesc="A set of language and system independant CORBA interfaces for creating reusable components"
arch=('x86_64')
license=('GPL' 'LGPL')
......
......@@ -4,10 +4,6 @@ post_install() {
post_upgrade() {
ldconfig -r .
PID=`pidof bonobo-activation-server`
if [ ! -z "${PID}" ]; then
killall -HUP bonobo-activation-server 2>&1
fi
}
pre_remove() {
......
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