ports/opt
4
3
Fork 1
Code Issues 1 Pull Requests Activity

cups-filters: fix build with poppler 0.22

Browse Source
This commit is contained in:
Juergen Daubert 2013-02-13 18:38:14 +01:00
parent 2d9e80a45d
commit e8eb82a81f
3 changed files with 69 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cups-filters/.md5sum
View File

@ -1 +1,2 @@
01e2d9abc4ea69521334a0ee2f70d98a cups-filters-1.0.29.tar.xz
4a47a0046567309dcd94bd3a93fa4842 cups-filters-poppler_0.22_buildfix.patch

7
cups-filters/Pkgfile
View File

@ -5,12 +5,15 @@
name=cups-filters
version=1.0.29
release=1
source=(http://www.openprinting.org/download/$name/$name-$version.tar.xz)
release=2
source=(http://www.openprinting.org/download/$name/$name-$version.tar.xz
$name-poppler_0.22_buildfix.patch)
build () {
cd $name-$version
patch -p0 -i $SRC/$name-poppler_0.22_buildfix.patch
./configure --prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/man \

63
cups-filters/cups-filters-poppler_0.22_buildfix.patch Normal file
View File

@ -0,0 +1,63 @@
# http://bzr.linuxfoundation.org/loggerhead/openprinting/cups-filters/revision/7035
=== 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);
}