Fix build with poppler-0.34.

3 files changed, 45 insertions, 1 deletions

diff --git a/print/cups-filters/distinfo b/print/cups-filters/distinfo
index 7a1a30bc586..952bdaa185d 100644
--- a/print/cups-filters/distinfo
+++ b/print/cups-filters/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.19 2015/07/03 12:25:13 wiz Exp $
+$NetBSD: distinfo,v 1.20 2015/07/15 12:49:37 wiz Exp $
 
 SHA1 (cups-filters-1.0.71.tar.xz) = c08258c086d4a6edf5869fc29676280ad0c22b27
 RMD160 (cups-filters-1.0.71.tar.xz) = c5da92ce803f156b60e8b08bf1251fa1d06c315b
 Size (cups-filters-1.0.71.tar.xz) = 1339116 bytes
+SHA1 (patch-filter_pdftoopvp_OPVPOutputDev.cxx) = a1f9214bcbc77438cd74310e9483bfb644bbf1da
+SHA1 (patch-filter_pdftoopvp_oprs_OPRS.cxx) = 1e5e641f209748105201fac382dd9802615d946e
diff --git a/print/cups-filters/patches/patch-filter_pdftoopvp_OPVPOutputDev.cxx b/print/cups-filters/patches/patch-filter_pdftoopvp_OPVPOutputDev.cxx
new file mode 100644
index 00000000000..16ad7c7b127
--- /dev/null
+++ b/print/cups-filters/patches/patch-filter_pdftoopvp_OPVPOutputDev.cxx
@@ -0,0 +1,23 @@
+$NetBSD: patch-filter_pdftoopvp_OPVPOutputDev.cxx,v 1.1 2015/07/15 12:49:37 wiz Exp $
+
+pdftoopvp: Adaptations to API changes on Poppler 0.34.0.
+http://bzr.linuxfoundation.org/loggerhead/openprinting/cups-filters/revision/7371
+
+--- filter/pdftoopvp/OPVPOutputDev.cxx.orig	2015-06-26 15:45:26.000000000 +0000
++++ filter/pdftoopvp/OPVPOutputDev.cxx
+@@ -1811,10 +1811,14 @@ void OPVPOutputDev::drawSoftMaskedImage(
+ #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();
diff --git a/print/cups-filters/patches/patch-filter_pdftoopvp_oprs_OPRS.cxx b/print/cups-filters/patches/patch-filter_pdftoopvp_oprs_OPRS.cxx
new file mode 100644
index 00000000000..a5649b51abd
--- /dev/null
+++ b/print/cups-filters/patches/patch-filter_pdftoopvp_oprs_OPRS.cxx
@@ -0,0 +1,19 @@
+$NetBSD: patch-filter_pdftoopvp_oprs_OPRS.cxx,v 1.1 2015/07/15 12:49:37 wiz Exp $
+
+pdftoopvp: Adaptations to API changes on Poppler 0.34.0.
+http://bzr.linuxfoundation.org/loggerhead/openprinting/cups-filters/revision/7371
+
+--- filter/pdftoopvp/oprs/OPRS.cxx.orig	2015-06-26 15:45:26.000000000 +0000
++++ filter/pdftoopvp/oprs/OPRS.cxx
+@@ -240,8 +240,10 @@ SplashError OPRS::drawImage(SplashImageS
+     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);