From 1eb9c826de18ebe1cf5c926a43f325eade968c34 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Wed, 21 Aug 2013 11:31:37 +0100 Subject: [PATCH] Upstream patch to re-work filter costs (bug #998977). No longer need text filter costs patch as paps gets used by default now if installed. Resolves: rhbz#998977 (cherry picked from commit 6d976f67d4860bf5fab9979cf2ab9b39da0c9a10) --- cups-filters-filter-costs.patch | 71 +++++++++++++++++++++++++++++++++ cups-filters-textfilters.patch | 22 ---------- cups-filters.spec | 13 ++++-- 3 files changed, 80 insertions(+), 26 deletions(-) create mode 100644 cups-filters-filter-costs.patch delete mode 100644 cups-filters-textfilters.patch diff --git a/cups-filters-filter-costs.patch b/cups-filters-filter-costs.patch new file mode 100644 index 0000000..cba17ef --- /dev/null +++ b/cups-filters-filter-costs.patch @@ -0,0 +1,71 @@ +diff -up cups-filters-1.0.36/mime/cupsfilters.convs.filter-costs cups-filters-1.0.36/mime/cupsfilters.convs +--- cups-filters-1.0.36/mime/cupsfilters.convs.filter-costs 2013-07-29 20:45:51.000000000 +0100 ++++ cups-filters-1.0.36/mime/cupsfilters.convs 2013-08-21 11:24:23.708994885 +0100 +@@ -42,32 +42,32 @@ + # if it comes from an encrypted PDF file, we simply override pstopdf and the + # PDF workflow. + +-application/postscript application/pdf 100 pstopdf ++application/postscript application/pdf 0 pstopdf + application/vnd.adobe-reader-postscript application/vnd.cups-postscript 66 pstops + + application/pdf application/vnd.cups-pdf 66 pdftopdf +-application/x-cshell application/pdf 0 texttopdf +-application/x-csource application/pdf 0 texttopdf +-application/x-perl application/pdf 0 texttopdf +-application/x-shell application/pdf 0 texttopdf +-text/plain application/pdf 0 texttopdf +-text/html application/pdf 0 texttopdf +-image/gif application/vnd.cups-pdf 33 imagetopdf +-image/png application/vnd.cups-pdf 33 imagetopdf +-image/jpeg application/vnd.cups-pdf 33 imagetopdf +-image/tiff application/vnd.cups-pdf 33 imagetopdf +-image/x-bitmap application/vnd.cups-pdf 33 imagetopdf +-image/x-photocd application/vnd.cups-pdf 33 imagetopdf +-image/x-portable-anymap application/vnd.cups-pdf 33 imagetopdf +-image/x-portable-bitmap application/vnd.cups-pdf 33 imagetopdf +-image/x-portable-graymap application/vnd.cups-pdf 33 imagetopdf +-image/x-portable-pixmap application/vnd.cups-pdf 33 imagetopdf +-image/x-sgi-rgb application/vnd.cups-pdf 33 imagetopdf +-image/x-xbitmap application/vnd.cups-pdf 33 imagetopdf +-image/x-xpixmap application/vnd.cups-pdf 33 imagetopdf +-image/x-xwindowdump application/vnd.cups-pdf 33 imagetopdf +-image/x-sun-raster application/vnd.cups-pdf 33 imagetopdf +-application/vnd.cups-pdf-banner application/pdf 33 bannertopdf ++application/x-cshell application/pdf 32 texttopdf ++application/x-csource application/pdf 32 texttopdf ++application/x-perl application/pdf 32 texttopdf ++application/x-shell application/pdf 32 texttopdf ++text/plain application/pdf 32 texttopdf ++text/html application/pdf 32 texttopdf ++image/gif application/vnd.cups-pdf 65 imagetopdf ++image/png application/vnd.cups-pdf 65 imagetopdf ++image/jpeg application/vnd.cups-pdf 65 imagetopdf ++image/tiff application/vnd.cups-pdf 65 imagetopdf ++image/x-bitmap application/vnd.cups-pdf 65 imagetopdf ++image/x-photocd application/vnd.cups-pdf 65 imagetopdf ++image/x-portable-anymap application/vnd.cups-pdf 65 imagetopdf ++image/x-portable-bitmap application/vnd.cups-pdf 65 imagetopdf ++image/x-portable-graymap application/vnd.cups-pdf 65 imagetopdf ++image/x-portable-pixmap application/vnd.cups-pdf 65 imagetopdf ++image/x-sgi-rgb application/vnd.cups-pdf 65 imagetopdf ++image/x-xbitmap application/vnd.cups-pdf 65 imagetopdf ++image/x-xpixmap application/vnd.cups-pdf 65 imagetopdf ++image/x-xwindowdump application/vnd.cups-pdf 65 imagetopdf ++image/x-sun-raster application/vnd.cups-pdf 65 imagetopdf ++application/vnd.cups-pdf-banner application/pdf 32 bannertopdf + image/urf application/pdf 0 urftopdf + + ######################################################################## +@@ -84,8 +84,8 @@ application/vnd.cups-pdf application/vnd + # Raster filters... + # + +-application/vnd.cups-pdf application/vnd.cups-raster 66 gstoraster +-application/vnd.cups-postscript application/vnd.cups-raster 100 gstoraster ++application/vnd.cups-pdf application/vnd.cups-raster 99 gstoraster ++application/vnd.cups-postscript application/vnd.cups-raster 200 gstoraster + application/vnd.cups-pdf application/vnd.cups-raster 100 pdftoraster + image/gif application/vnd.cups-raster 100 imagetoraster + image/png application/vnd.cups-raster 100 imagetoraster +diff -up cups-filters-1.0.36/NEWS.filter-costs cups-filters-1.0.36/NEWS diff --git a/cups-filters-textfilters.patch b/cups-filters-textfilters.patch deleted file mode 100644 index bd44876..0000000 --- a/cups-filters-textfilters.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up cups-filters-1.0.35/mime/cupsfilters.convs.textfilters cups-filters-1.0.35/mime/cupsfilters.convs ---- cups-filters-1.0.35/mime/cupsfilters.convs.textfilters 2013-07-29 16:08:25.244864850 +0100 -+++ cups-filters-1.0.35/mime/cupsfilters.convs 2013-07-29 16:09:40.030216976 +0100 -@@ -46,12 +46,12 @@ application/postscript application/pdf - application/vnd.adobe-reader-postscript application/vnd.cups-postscript 66 pstops - - application/pdf application/vnd.cups-pdf 66 pdftopdf --application/x-cshell application/pdf 0 texttopdf --application/x-csource application/pdf 0 texttopdf --application/x-perl application/pdf 0 texttopdf --application/x-shell application/pdf 0 texttopdf --text/plain application/pdf 0 texttopdf --text/html application/pdf 0 texttopdf -+application/x-cshell application/pdf 200 texttopdf -+application/x-csource application/pdf 200 texttopdf -+application/x-perl application/pdf 200 texttopdf -+application/x-shell application/pdf 200 texttopdf -+text/plain application/pdf 200 texttopdf -+text/html application/pdf 200 texttopdf - image/gif application/vnd.cups-pdf 33 imagetopdf - image/png application/vnd.cups-pdf 33 imagetopdf - image/jpeg application/vnd.cups-pdf 33 imagetopdf diff --git a/cups-filters.spec b/cups-filters.spec index 6e42331..46fc32b 100644 --- a/cups-filters.spec +++ b/cups-filters.spec @@ -4,7 +4,7 @@ Summary: OpenPrinting CUPS filters and backends Name: cups-filters Version: 1.0.36 -Release: 1%{?dist} +Release: 2%{?dist} # For a breakdown of the licensing, see COPYING file # GPLv2: filters: commandto*, imagetoraster, pdftops, rasterto*, @@ -22,7 +22,7 @@ Url: http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups Source0: http://www.openprinting.org/download/cups-filters/cups-filters-%{version}.tar.xz Source1: cups-browsed.service -Patch1: cups-filters-textfilters.patch +Patch1: cups-filters-filter-costs.patch Requires: cups-filters-libs%{?_isa} = %{version}-%{release} @@ -98,8 +98,8 @@ This is the development package for OpenPrinting CUPS filters and backends. %prep %setup -q -# Set cost for text filters to 200 (bug #988909). -%patch1 -p1 -b .textfilters +# Upstream patch to re-work filter costs (bug #998977). +%patch1 -p1 -b .filter-costs %build # work-around Rpath @@ -214,6 +214,11 @@ fi %{_libdir}/libfontembed.so %changelog +* Wed Aug 21 2013 Tim Waugh - 1.0.36-2 +- Upstream patch to re-work filter costs (bug #998977). No longer need + text filter costs patch as paps gets used by default now if + installed. + * Tue Aug 13 2013 Tim Waugh - 1.0.36-1 - 1.0.36 (without ghostscript filters, which are still in ghostscript-cups).