From 644a78538954c21f7efb06bfba3c6c260e7119e4 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 25 Aug 2016 23:36:49 +0000
Subject: main/cups-filters: upgrade to 1.11.1

---
 ...1-Make-textonly-conform-with-POSIX-better.patch | 73 ----------------------
 main/cups-filters/APKBUILD                         | 12 ++--
 2 files changed, 4 insertions(+), 81 deletions(-)
 delete mode 100644 main/cups-filters/0001-Make-textonly-conform-with-POSIX-better.patch

diff --git a/main/cups-filters/0001-Make-textonly-conform-with-POSIX-better.patch b/main/cups-filters/0001-Make-textonly-conform-with-POSIX-better.patch
deleted file mode 100644
index 1653623065..0000000000
--- a/main/cups-filters/0001-Make-textonly-conform-with-POSIX-better.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 1301945446a0972a0849e4b2f29e5e3b59209527 Mon Sep 17 00:00:00 2001
-From: Isaac Dunham <ibid.ag@gmail.com>
-Date: Thu, 14 Jan 2016 06:51:07 -0800
-Subject: [PATCH] Make textonly conform with POSIX better.
-
-echo -ne was the only thing that could be expected to not work on every shell.
----
- filter/textonly | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/filter/textonly b/filter/textonly
-index dd55a9d..630cb8f 100644
---- a/filter/textonly
-+++ b/filter/textonly
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- ## Copyright (C) 2003-2006 Red Hat, Inc.
- ## Copyright (C) 2003-2006 Tim Waugh <twaugh@redhat.com>
- ## Changed on 2007/05/17, Opher Shachar, LADPC Ltd.
-@@ -64,7 +64,7 @@ if [[ "$PR" ]]; then
-     (( pl > pu )) && continue
-     
-     # Loop reading pages until at or over lower page of subrange.
--    while read -d `echo -ne '\f'` -r; do
-+    while read -d `printf '\f'` -r; do
-       (( pagenum++ ))
-       (( pagenum == pl )) && break
-     done
-@@ -78,15 +78,15 @@ if [[ "$PR" ]]; then
-     if (( pagenum == pl )); then
-       echo -n "${REPLY}" >>"$TMPFILE2"
-       # If EOF then page has no final FF
--      [[ ! "$EOF" ]] && echo -ne '\f' >>"$TMPFILE2"
-+      [[ ! "$EOF" ]] && printf '\f' >>"$TMPFILE2"
-       echo "PAGE: $pagenum $COPIES" >&2
-     fi
-     [[ "$EOF" ]] && break
-     # Is the current subrange a single page?
-     (( pagenum == pu )) && continue
--    while read -d `echo -ne '\f'` -r; do
-+    while read -d `printf '\f'` -r; do
-       (( pagenum++ ))
--      echo -ne "${REPLY}\f" >>"$TMPFILE2"
-+      printf "${REPLY}\f" >>"$TMPFILE2"
-       echo "PAGE: $pagenum $COPIES" >&2
-       (( pagenum == pu )) && break
-     done
-@@ -103,18 +103,18 @@ if [[ "$PR" ]]; then
-   } <"$TMPFILE"
- else
-   TMPFILE2="$TMPFILE"
--  pc=$(grep -co `echo -ne '\f'` "$TMPFILE2")
-+  pc=$(grep -co `printf '\f'` "$TMPFILE2")
-   pc=$(( pc * $COPIES ))
-   echo "PAGE: $pc" >&2
- fi
- 
- while [ "$COPIES" -gt 0 ]; do
-   # Just translate LF->CRLF at the moment, until the PPD has options added.
--  sed -e 's/$/'`echo -ne '\r'`'/g' "$TMPFILE2"
-+  sed -e 's/$/'`printf '\r'`'/g' "$TMPFILE2"
- 
-   if [ "$SENDFF" == "True" ]
-     then
--    echo -ne \\014
-+    printf \\014
-   fi
- 
-   COPIES=$(($COPIES - 1))
--- 
-2.7.0
-
diff --git a/main/cups-filters/APKBUILD b/main/cups-filters/APKBUILD
index 73ce6a61f4..769559ac7a 100644
--- a/main/cups-filters/APKBUILD
+++ b/main/cups-filters/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cups-filters
-pkgver=1.9.0
+pkgver=1.11.1
 pkgrel=0
 pkgdesc="OpenPrinting CUPS filters and backends"
 url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdf_as_standard_print_job_format"
@@ -21,7 +21,6 @@ makedepends="$depends_dev cups-dev libjpeg-turbo-dev poppler-dev zlib-dev
 install=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
 source="http://www.openprinting.org/download/cups-filters/cups-filters-$pkgver.tar.xz
-	0001-Make-textonly-conform-with-POSIX-better.patch
 	"
 
 _builddir="$srcdir"/cups-filters-$pkgver
@@ -76,9 +75,6 @@ libs() {
 	mv "$pkgdir"/usr/lib/lib*.so.* "$subpkgdir"/usr/lib/
 }
 
-md5sums="f9e268451b496f0c851f2aa6b660c70d  cups-filters-1.9.0.tar.xz
-b65f5b5191fee1834623b6aedf7f5c50  0001-Make-textonly-conform-with-POSIX-better.patch"
-sha256sums="63421044883a9250428655dc0b0c2531dead4a009fb2fd33d6fb6a9598598522  cups-filters-1.9.0.tar.xz
-33f5589e8c8fc98d9715c3a1b93c459c5902ff7115804852f79bbcc1638d6cb3  0001-Make-textonly-conform-with-POSIX-better.patch"
-sha512sums="e92da46e03686bc9c94b57bb7d1b8cea99a02ebc6ab39575f6842b4a69679af7771199fef76eafd7b6d6298a28f3175edfb8aaeeca0416cf5b8b747922849d76  cups-filters-1.9.0.tar.xz
-522f431e0a531b797a2f8626c22b711adce59c68564c3146db4c684ea81c51a265e8915b3e6148e1771a0bbd42d3bc6dd741793562cc145c52945658e43335b5  0001-Make-textonly-conform-with-POSIX-better.patch"
+md5sums="1c2397093639aa728e4ba866bbdc440c  cups-filters-1.11.1.tar.xz"
+sha256sums="a886497313ca7f405d3b2babb85b3a4edf5702803863df4e15c9450b83ed1274  cups-filters-1.11.1.tar.xz"
+sha512sums="be475126fb30690b86471733bcfd27a9696fdc0e1053e5c3ac99673608383ad446ecbc8f45ecdeced3ebe70918976f9253ea0097b54bcd01e79e9887c230c22f  cups-filters-1.11.1.tar.xz"
-- 
cgit v1.2.3