Date: Monday, November 4, 2013 @ 16:31:43 Author: andyrtr Revision: 198796
upgpkg: cups 1.7.0-2 add workaround for FS#37605 Added: cups/trunk/cups-final-content-type.patch Modified: cups/trunk/PKGBUILD -------------------------------+ PKGBUILD | 7 ++++++- cups-final-content-type.patch | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-11-04 15:20:16 UTC (rev 198795) +++ PKGBUILD 2013-11-04 15:31:43 UTC (rev 198796) @@ -4,7 +4,7 @@ pkgbase="cups" pkgname=('libcups' 'cups') pkgver=1.7.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('GPL') url="http://www.cups.org/" @@ -23,6 +23,7 @@ cups-res_init.patch cups-avahi-address.patch cups-enum-all.patch + cups-final-content-type.patch # Gentoo cups-1.6.0-fix-install-perms.patch cups-1.6.2-statedir.patch @@ -41,6 +42,7 @@ '8fe27d4248cacbc02824e7937cab4088' 'df0c367c0022e3c7d8e01827e8a6c5e7' 'f30c2a161caaf27854581507cde8cac6' + 'a31b64ba25a985fbae65d8ddf311b08c' '5117f65342fcc69c6a506529e4daca9e' '451609db34f95209d64c38474de27ce1' 'cb58bf4e0b80eaee383712e5c84a1ab4' @@ -88,6 +90,9 @@ # Return from cupsEnumDests() once all records have been returned. patch -Np1 -i ${srcdir}/cups-enum-all.patch + # Fix printing to some network printers fails - https://bugs.archlinux.org/task/37605 + patch -Np1 -i ${srcdir}/cups-final-content-type.patch + # Rebuild configure script for not zipping man-pages. aclocal -I config-scripts autoconf -I config-scripts Added: cups-final-content-type.patch =================================================================== --- cups-final-content-type.patch (rev 0) +++ cups-final-content-type.patch 2013-11-04 15:31:43 UTC (rev 198796) @@ -0,0 +1,18 @@ +diff -up cups-1.6.4/scheduler/job.c.final-content-type cups-1.6.4/scheduler/job.c +--- cups-1.6.4/scheduler/job.c.final-content-type 2013-09-27 16:58:13.934775402 +0100 ++++ cups-1.6.4/scheduler/job.c 2013-09-27 17:00:57.716549576 +0100 +@@ -692,12 +692,7 @@ cupsdContinueJob(cupsd_job_t *job) /* I + + if (!job->printer->remote) + { +- for (filter = (mime_filter_t *)cupsArrayLast(filters); +- filter && filter->dst; +- filter = (mime_filter_t *)cupsArrayPrev(filters)) +- if (strcmp(filter->dst->super, "printer") || +- strcmp(filter->dst->type, job->printer->name)) +- break; ++ filter = (mime_filter_t *)cupsArrayLast(filters); + + if (filter && filter->dst) + { +