From e2e926615bc9e75d70a06ddce1327a3950034779 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 19 Aug 2015 08:54:33 +0200 Subject: [PATCH] cups-filters: update to 1.0.73. --- .../cups-filters/patches/poppler0340.patch | 38 ------------------- srcpkgs/cups-filters/template | 8 ++-- 2 files changed, 4 insertions(+), 42 deletions(-) delete mode 100644 srcpkgs/cups-filters/patches/poppler0340.patch diff --git a/srcpkgs/cups-filters/patches/poppler0340.patch b/srcpkgs/cups-filters/patches/poppler0340.patch deleted file mode 100644 index ab858c0ac08..00000000000 --- a/srcpkgs/cups-filters/patches/poppler0340.patch +++ /dev/null @@ -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); diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template index a12d2e21d40..11a6f45063e 100644 --- a/srcpkgs/cups-filters/template +++ b/srcpkgs/cups-filters/template @@ -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 " 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