From 12dc8f833461a33c90591e2b3cb04e63fa66afa2 Mon Sep 17 00:00:00 2001
From: Juergen Daubert <jue@jue.li>
Date: Fri, 21 Aug 2015 17:38:52 +0200
Subject: [PATCH] cups-filters: update to 1.0.73

---
 cups-filters/.footprint        |  1 +
 cups-filters/.md5sum           |  3 +--
 cups-filters/Pkgfile           |  9 +++-----
 cups-filters/poppler-034.patch | 38 ----------------------------------
 4 files changed, 5 insertions(+), 46 deletions(-)
 delete mode 100644 cups-filters/poppler-034.patch

diff --git a/cups-filters/.footprint b/cups-filters/.footprint
index 002532f19..a678a57d3 100644
--- a/cups-filters/.footprint
+++ b/cups-filters/.footprint
@@ -26,6 +26,7 @@ drwxr-xr-x	root/root	usr/include/fontembed/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/cups/
 drwxr-xr-x	root/root	usr/lib/cups/backend/
+-rwxr-xr-x	root/root	usr/lib/cups/backend/implicitclass
 -rwxr-xr-x	root/root	usr/lib/cups/backend/parallel
 -rwxr-xr-x	root/root	usr/lib/cups/backend/serial
 drwxr-xr-x	root/root	usr/lib/cups/filter/
diff --git a/cups-filters/.md5sum b/cups-filters/.md5sum
index 660483b04..70058aff9 100644
--- a/cups-filters/.md5sum
+++ b/cups-filters/.md5sum
@@ -1,3 +1,2 @@
 7540a6989be0042429f41770b1cdf215  cups-browsed
-f1e11dfe5fa52eb65aa0bdd3a7ee0117  cups-filters-1.0.71.tar.xz
-3b5258c23d3ebeb8ea733e5114a947c6  poppler-034.patch
+7c8d792eb872be5a5b596409e5f05f40  cups-filters-1.0.73.tar.xz
diff --git a/cups-filters/Pkgfile b/cups-filters/Pkgfile
index 3f183506d..8806ee816 100644
--- a/cups-filters/Pkgfile
+++ b/cups-filters/Pkgfile
@@ -4,17 +4,14 @@
 # Depends on:  cups ghostscript poppler qpdf
 
 name=cups-filters
-version=1.0.71
-release=2
+version=1.0.73
+release=1
 source=(http://www.openprinting.org/download/$name/$name-$version.tar.xz
-        cups-browsed
-        poppler-034.patch)
+        cups-browsed)
 
 build () {
     cd $name-$version
 
-    patch -p0 -i $SRC/poppler-034.patch
-
     ./configure --prefix=/usr \
                 --sysconfdir=/etc \
                 --mandir=/usr/man \
diff --git a/cups-filters/poppler-034.patch b/cups-filters/poppler-034.patch
deleted file mode 100644
index de7ee10ce..000000000
--- a/cups-filters/poppler-034.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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);
-