cups-filters: update to 1.0.73.

This commit is contained in:
Juan RP 2015-08-19 08:54:33 +02:00
parent cf79e20083
commit e2e926615b
2 changed files with 4 additions and 42 deletions

View File

@ -1,38 +0,0 @@
Hack to make this build against poppler-0.34. Just disables color management in some places.
We should probably find a better solution. dilfridge@gentoo.org
diff -ruN cups-filters-1.0.71.orig/filter/pdftoopvp/OPVPOutputDev.cxx cups-filters-1.0.71/filter/pdftoopvp/OPVPOutputDev.cxx
--- filter/pdftoopvp/OPVPOutputDev.cxx 2015-06-26 17:45:26.000000000 +0200
+++ filter/pdftoopvp/OPVPOutputDev.cxx 2015-07-14 19:02:51.666737621 +0200
@@ -1812,9 +1812,15 @@
maskSplash->drawImage(&imageSrc, &imgMaskData,
splashModeMono8, gFalse, maskWidth, maskHeight, mat);
#else
+#if POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33
maskSplash->drawImage(&imageSrc, &imgMaskData,
splashModeMono8, gFalse, maskWidth, maskHeight,
mat,gFalse);
+#else
+ maskSplash->drawImage(&imageSrc, NULL, &imgMaskData,
+ splashModeMono8, gFalse, maskWidth, maskHeight,
+ mat,gFalse);
+#endif
#endif
delete imgMaskData.imgStr;
maskStr->close();
diff -ruN cups-filters-1.0.71.orig/filter/pdftoopvp/oprs/OPRS.cxx cups-filters-1.0.71/filter/pdftoopvp/oprs/OPRS.cxx
--- filter/pdftoopvp/oprs/OPRS.cxx 2015-06-26 17:45:26.000000000 +0200
+++ filter/pdftoopvp/oprs/OPRS.cxx 2015-07-14 19:00:20.655740720 +0200
@@ -241,7 +241,11 @@
#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
+#if POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33
return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse);
+#else
+ return splash->drawImage(src,NULL,srcData,srcMode,srcAlpha,w,h,mat,gFalse);
+#endif
#endif
} else {
return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);

View File

@ -1,11 +1,11 @@
# Template file for 'cups-filters'
pkgname=cups-filters
version=1.0.71
revision=3
version=1.0.73
revision=1
build_style=gnu-configure
configure_args="--disable-static --with-rcdir=no --enable-avahi
--with-browseremoteprotocols=DNSSD,CUPS"
hostmakedepends="pkg-config ghostscript poppler-utils"
hostmakedepends="pkg-config ghostscript poppler-utils glib-devel"
makedepends="lcms2-devel libpng-devel libqpdf-devel
poppler-cpp-devel fontconfig-devel avahi-glib-libs-devel
ghostscript-devel cups-devel"
@ -16,7 +16,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2, LGPL-2.1, MIT"
homepage="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
distfiles="http://www.openprinting.org/download/${pkgname}/${pkgname}-${version}.tar.xz"
checksum=3180aa209c383402822e568ccef8e1ca43f51e30b3af2039c34ebae919a69c1f
checksum=84521dc5079e683144e95e22ffcdbc3d51c44f9d4079c5bcc7f7ff421e94ec75
lib32disabled=yes
disable_parallel_build=yes