testing/cups-filters: upgrade to 1.0.34

2 files changed, 13 insertions, 64 deletions

diff --git a/testing/cups-filters/APKBUILD b/testing/cups-filters/APKBUILD
index ab3766e09..b87ecc1e6 100644
--- a/testing/cups-filters/APKBUILD
+++ b/testing/cups-filters/APKBUILD
@@ -1,20 +1,19 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cups-filters
-pkgver=1.0.29
+pkgver=1.0.34
 pkgrel=0
 pkgdesc="OpenPrinting CUPS filters and backends"
 url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdf_as_standard_print_job_format"
 arch="all"
 license="GPLv2 and GPLv2+ and GPLv3 and MIT"
-depends="poppler-utils"
+depends="poppler-utils bc"
 depends_dev=""
 makedepends="$depends_dev cups-dev libjpeg-turbo-dev poppler-dev zlib-dev
 	libpng-dev tiff-dev lcms-dev freetype-dev ghostscript-dev fontconfig-dev
 	qpdf-dev avahi-dev"
 install=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
-source="http://www.openprinting.org/download/cups-filters/cups-filters-$pkgver.tar.xz
-	cups-filters-1.0.29-poppler_022.patch"
+source="http://www.openprinting.org/download/cups-filters/cups-filters-$pkgver.tar.xz"
 
 _builddir="$srcdir"/cups-filters-$pkgver
 prepare() {
@@ -49,11 +48,19 @@ package() {
 		
 }
 
+dev() {
+	default_dev
+	# cupsfilters.drv needs pcl.h
+	install -Dm644 "$_builddir"/filter/pcl.h \
+		"$pkgdir"/usr/share/cups/ppdc/pcl.h
+}
+
 libs() {
 	pkgdesc="OpenPrinting CUPS filters and backends - cupsfilters and fontembed libraries"
 	install -d "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/lib*.so.* "$subpkgdir"/usr/lib/
 }
 
-md5sums="01e2d9abc4ea69521334a0ee2f70d98a  cups-filters-1.0.29.tar.xz
-82281b049a5ef4aca479cac104de1af0  cups-filters-1.0.29-poppler_022.patch"
+md5sums="e4d605cd35ea5a42c13f7fc1e1f273de  cups-filters-1.0.34.tar.xz"
+sha256sums="24995edfd31fc58a0c5be09631650dfacea8664e0e0d2b61c3859bf992d9b371  cups-filters-1.0.34.tar.xz"
+sha512sums="1cb8e0e5998f09512276bcca17d8635223ed3717573460b351fdd5a11bcb0fc4dd46771afc1ff9c2f87d007f8035c78704dea7afc2d67978d09c035ed58cebd6  cups-filters-1.0.34.tar.xz"
diff --git a/testing/cups-filters/cups-filters-1.0.29-poppler_022.patch b/testing/cups-filters/cups-filters-1.0.29-poppler_022.patch
deleted file mode 100644
index e75f38fa3..000000000
--- a/testing/cups-filters/cups-filters-1.0.29-poppler_022.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -urbB cups-filters-1.0.29/filter/pdftoopvp/oprs/OPRS.cxx cups-filters-1.0-20130119/filter/pdftoopvp/oprs/OPRS.cxx
---- cups-filters-1.0.29/filter/pdftoopvp/oprs/OPRS.cxx	2012-09-10 14:52:00.000000000 -0500
-+++ cups-filters-1.0-20130119/filter/pdftoopvp/oprs/OPRS.cxx	2013-01-18 18:40:36.000000000 -0600
-@@ -5,6 +5,9 @@
- //========================================================================
- 
- #include <config.h>
-+#ifdef HAVE_CPP_POPPLER_VERSION_H
-+#include "cpp/poppler-version.h"
-+#endif
- 
- #ifdef USE_GCC_PRAGMAS
- #pragma implementation
-@@ -235,7 +238,11 @@
- 			      SplashColorMode srcMode, GBool srcAlpha,
- 			      int w, int h, SplashCoord *mat) {
-     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
-+	return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse);
-+#endif
-     } else {
- 	return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);
-     }
-diff -urbB cups-filters-1.0.29/filter/pdftoopvp/OPVPOutputDev.cxx cups-filters-1.0-20130119/filter/pdftoopvp/OPVPOutputDev.cxx
---- cups-filters-1.0.29/filter/pdftoopvp/OPVPOutputDev.cxx	2012-07-20 03:22:23.000000000 -0500
-+++ cups-filters-1.0-20130119/filter/pdftoopvp/OPVPOutputDev.cxx	2013-01-18 18:40:36.000000000 -0600
-@@ -1804,8 +1804,14 @@
-   maskSplash = new Splash(maskBitmap, gFalse);
-   maskColor[0] = 0;
-   maskSplash->clear(maskColor);
-+#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
-+  maskSplash->drawImage(&imageSrc, &imgMaskData,
-+			splashModeMono8, gFalse, maskWidth, maskHeight,
-+                        mat,gFalse);
-+#endif
-   delete imgMaskData.imgStr;
-   maskStr->close();
-   gfree(imgMaskData.lookup);
-diff -urbB cups-filters-1.0.29/NEWS cups-filters-1.0-20130119/NEWS
---- cups-filters-1.0.29/NEWS	2013-01-02 12:23:13.000000000 -0600
-+++ cups-filters-1.0-20130119/NEWS	2013-01-18 18:40:36.000000000 -0600
-@@ -1,6 +1,11 @@
- NEWS - OpenPrinting CUPS Filters v1.0.29 - 2013-01-02
- -----------------------------------------------------
- 
-+CHANGES IN V1.0.30
-+
-+	- pdftoopvp: Let it build with Poppler 0.22.x. Thanks to Koji Otani
-+	  from BBR Inc. (Bug #1089).
-+
- CHANGES IN V1.0.29
- 
- 	- Fixed ./configure option "--with-rcdir=no". Thanks to Jiri