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

cups-filters: fix build with poppler 0.34

Browse Source
This commit is contained in:
Juergen Daubert 2015-07-24 11:49:43 +02:00
parent 2093147806
commit 9283fb301e
3 changed files with 44 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,2 +1,3 @@
7540a6989be0042429f41770b1cdf215 cups-browsed
f1e11dfe5fa52eb65aa0bdd3a7ee0117 cups-filters-1.0.71.tar.xz
3b5258c23d3ebeb8ea733e5114a947c6 poppler-034.patch

7
cups-filters/Pkgfile
View File

@ -5,13 +5,16 @@
name=cups-filters
version=1.0.71
release=1
release=2
source=(http://www.openprinting.org/download/$name/$name-$version.tar.xz
cups-browsed)
cups-browsed
poppler-034.patch)
build () {
cd $name-$version
patch -p0 -i $SRC/poppler-034.patch
./configure --prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/man \

38
cups-filters/poppler-034.patch Normal file
View File

@ -0,0 +1,38 @@
# http://bzr.linuxfoundation.org/loggerhead/openprinting/cups-filters/revision/7371
=== modified file 'filter/pdftoopvp/OPVPOutputDev.cxx'
--- filter/pdftoopvp/OPVPOutputDev.cxx 2015-02-18 03:17:28 +0000
+++ filter/pdftoopvp/OPVPOutputDev.cxx 2015-07-14 19:22:49 +0000
@@ -1811,10 +1811,14 @@
#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
+#elif POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33
maskSplash->drawImage(&imageSrc, &imgMaskData,
splashModeMono8, gFalse, maskWidth, maskHeight,
mat,gFalse);
+#else
+ maskSplash->drawImage(&imageSrc, 0, &imgMaskData,
+ splashModeMono8, gFalse, maskWidth, maskHeight,
+ mat,gFalse);
#endif
delete imgMaskData.imgStr;
maskStr->close();
=== modified file 'filter/pdftoopvp/oprs/OPRS.cxx'
--- filter/pdftoopvp/oprs/OPRS.cxx 2013-01-09 10:42:32 +0000
+++ filter/pdftoopvp/oprs/OPRS.cxx 2015-07-14 19:22:49 +0000
@@ -240,8 +240,10 @@
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
+#elif POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33
return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse);
+#else
+ return splash->drawImage(src,0,srcData,srcMode,srcAlpha,w,h,mat,gFalse);
#endif
} else {
return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);