Attachment #160391 for bug #202686




# $FreeBSD$

PORTNAME=	cups-filters
PORTVERSION=	1.0.73
PORTREVISION=	2
CATEGORIES=	print
MASTER_SITES=	http://www.openprinting.org/download/cups-filters/


		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
		libpoppler.so:${PORTSDIR}/graphics/poppler

USES=		compiler:c++11-lib cpe ghostscript gmake:lite jpeg libtool pathfix \
USES=		compiler:c++11-lib cpe ghostscript jpeg libtool pathfix \
		pkgconfig shebangfix tar:xz
CPE_VENDOR=	linuxfoundation
SHEBANG_FILES=	filter/textonly

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (cups-filters-1.0.71.tar.xz) = 3180aa209c383402822e568ccef8e1ca43f51e30b3af2039c34ebae919a69c1f	1	SHA256 (cups-filters-1.0.73.tar.xz) = 84521dc5079e683144e95e22ffcdbc3d51c44f9d4079c5bcc7f7ff421e94ec75
2	SIZE (cups-filters-1.0.71.tar.xz) = 1339116	2	SIZE (cups-filters-1.0.73.tar.xz) = 1351652

Lines 1-6 Link Here

(-)files/patch-filter_pdftops.c (-3 / +3 lines)
1	--- filter/pdftops.c.orig 2014-08-21 10:11:24.448404905 -0400	1	--- filter/pdftops.c.orig 2015-07-04 11:21:47 UTC
2	+++ filter/pdftops.c 2014-08-21 10:12:00.298402116 -0400	2	+++ filter/pdftops.c
3	@@ -535,7 +535,7 @@	3	@@ -535,7 +535,7 @@ main(int argc, /* I - Number of comm
4		4
5	if (renderer == PDFTOPS)	5	if (renderer == PDFTOPS)
6	{	6	{




# http://bzr.linuxfoundation.org/loggerhead/openprinting/cups-filters/revision/7371
 
 CHANGES IN V1.0.72
 
+	- pdftoopvp: Adaptations to API changes on Poppler 0.34.0, note that
+	  this patch disables color management in this filter. Thanks to
+	  Vincent le Garrec and Andreas K. Huettel for the patch (Bug #1301,
+	  Gentoo bug #554782).
 	- libcupsfilters, bannertopdf, foomatic-rip, gstoraster, pdftoijs,
 	  sys5ippprinter, pdftoopvp, pdftops, pdftoraster, rastertoescpx,
 	  urftopdf, texttopdf: Miscellaneous fixes for build compatibility with

=== 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);


Lines 21-26 Link Here

(-)pkg-plist (+1 lines)
21	lib/libfontembed.so.1.0.0	21	lib/libfontembed.so.1.0.0
22	libdata/pkgconfig/libcupsfilters.pc	22	libdata/pkgconfig/libcupsfilters.pc
23	libdata/pkgconfig/libfontembed.pc	23	libdata/pkgconfig/libfontembed.pc
		24	libexec/cups/backend/implicitclass
24	libexec/cups/backend/parallel	25	libexec/cups/backend/parallel
25	libexec/cups/backend/serial	26	libexec/cups/backend/serial
26	libexec/cups/filter/bannertopdf	27	libexec/cups/filter/bannertopdf

Return to bug 202686

Lines 1-8 Link Here

(-)Makefile (-4 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= cups-filters	3	PORTNAME= cups-filters
4	PORTVERSION= 1.0.71	4	PORTVERSION= 1.0.73
5	PORTREVISION= 2
6	CATEGORIES= print	5	CATEGORIES= print
7	MASTER_SITES= http://www.openprinting.org/download/cups-filters/	6	MASTER_SITES= http://www.openprinting.org/download/cups-filters/
8		7
Lines 23-30 Link Here
23	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \	22	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
24	libpoppler.so:${PORTSDIR}/graphics/poppler	23	libpoppler.so:${PORTSDIR}/graphics/poppler
25		24
26	MAKE_JOBS_UNSAFE=YES	25	USES= compiler:c++11-lib cpe ghostscript gmake:lite jpeg libtool pathfix \
27	USES= compiler:c++11-lib cpe ghostscript jpeg libtool pathfix \
28	pkgconfig shebangfix tar:xz	26	pkgconfig shebangfix tar:xz
29	CPE_VENDOR= linuxfoundation	27	CPE_VENDOR= linuxfoundation
30	SHEBANG_FILES= filter/textonly	28	SHEBANG_FILES= filter/textonly

Lines 1-48 Link Here

(-)files/patch-poppler-0.34 (-48 lines)
1	# http://bzr.linuxfoundation.org/loggerhead/openprinting/cups-filters/revision/7371
2
3	CHANGES IN V1.0.72
4
5	+ - pdftoopvp: Adaptations to API changes on Poppler 0.34.0, note that
6	+ this patch disables color management in this filter. Thanks to
7	+ Vincent le Garrec and Andreas K. Huettel for the patch (Bug #1301,
8	+ Gentoo bug #554782).
9	- libcupsfilters, bannertopdf, foomatic-rip, gstoraster, pdftoijs,
10	sys5ippprinter, pdftoopvp, pdftops, pdftoraster, rastertoescpx,
11	urftopdf, texttopdf: Miscellaneous fixes for build compatibility with
12
13	=== modified file 'filter/pdftoopvp/OPVPOutputDev.cxx'
14	--- filter/pdftoopvp/OPVPOutputDev.cxx 2015-02-18 03:17:28 +0000
15	+++ filter/pdftoopvp/OPVPOutputDev.cxx 2015-07-14 19:22:49 +0000
16	@@ -1811,10 +1811,14 @@
17	#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 \|\| (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2))
18	maskSplash->drawImage(&imageSrc, &imgMaskData,
19	splashModeMono8, gFalse, maskWidth, maskHeight, mat);
20	-#else
21	+#elif POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33
22	maskSplash->drawImage(&imageSrc, &imgMaskData,
23	splashModeMono8, gFalse, maskWidth, maskHeight,
24	mat,gFalse);
25	+#else
26	+ maskSplash->drawImage(&imageSrc, 0, &imgMaskData,
27	+ splashModeMono8, gFalse, maskWidth, maskHeight,
28	+ mat,gFalse);
29	#endif
30	delete imgMaskData.imgStr;
31	maskStr->close();
32
33	=== modified file 'filter/pdftoopvp/oprs/OPRS.cxx'
34	--- filter/pdftoopvp/oprs/OPRS.cxx 2013-01-09 10:42:32 +0000
35	+++ filter/pdftoopvp/oprs/OPRS.cxx 2015-07-14 19:22:49 +0000
36	@@ -240,8 +240,10 @@
37	if (rasterMode) {
38	#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 \|\| (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2))
39	return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);
40	-#else
41	+#elif POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33
42	return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse);
43	+#else
44	+ return splash->drawImage(src,0,srcData,srcMode,srcAlpha,w,h,mat,gFalse);
45	#endif
46	} else {
47	return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);
48