From 5484796d899add88cd4bd433634ad6f1513ff3bc Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Dec 20 2013 08:59:27 +0000 Subject: 1.0.43: upstream fix for bug #768811 (pdf-landscape) --- diff --git a/.gitignore b/.gitignore index 56161f0..cded8dd 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /cups-filters-1.0.40.tar.xz /cups-filters-1.0.41.tar.xz /cups-filters-1.0.42.tar.xz +/cups-filters-1.0.43.tar.xz diff --git a/cups-filters-pdf-landscape.patch b/cups-filters-pdf-landscape.patch deleted file mode 100644 index 5c9a776..0000000 --- a/cups-filters-pdf-landscape.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -up cups-filters-1.0.40/filter/pdftops.c.pdf-landscape cups-filters-1.0.40/filter/pdftops.c ---- cups-filters-1.0.40/filter/pdftops.c.pdf-landscape 2013-10-11 17:15:45.639623613 +0100 -+++ cups-filters-1.0.40/filter/pdftops.c 2013-10-11 17:22:41.517421905 +0100 -@@ -273,7 +273,6 @@ main(int argc, /* I - Number of comm - *pstops_options, /* Options for pstops filter */ - *pstops_end; /* End of pstops filter option */ - const char *cups_serverbin; /* CUPS_SERVERBIN environment variable */ -- const char *content_type; /* CONTENT_TYPE environment variable */ - #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET) - struct sigaction action; /* Actions for POSIX signals */ - #endif /* HAVE_SIGACTION && !HAVE_SIGSET */ -@@ -457,7 +456,6 @@ main(int argc, /* I - Number of comm - * Build the command-line for the pdftops or gs filter... - */ - -- content_type = getenv("CONTENT_TYPE"); - if (renderer == PDFTOPS) - { - pdf_argv[0] = (char *)"pdftops"; -@@ -646,25 +644,17 @@ main(int argc, /* I - Number of comm - else if ((renderer == PDFTOPS) || (renderer == PDFTOCAIRO)) - { - /* -- * Use the page sizes of the original PDF document, this way documents -- * which contain pages of different sizes can be printed correctly -+ * No options to add. Note: pdftopdf has already rotated pages -+ * for us. - */ -- -- /* Only do this for unprocessed PDF files */ -- if (content_type && !strstr (content_type, "/vnd.cups-")) -- pdf_argv[pdf_argc++] = (char *)"-origpagesizes"; - } - #endif /* HAVE_POPPLER_PDFTOPS_WITH_ORIGPAGESIZES */ - else if (renderer == ACROREAD) - { - /* -- * Use the page sizes of the original PDF document, this way documents -- * which contain pages of different sizes can be printed correctly -+ * No options to add. Note: pdftopdf has already rotated pages -+ * for us. - */ -- -- /* Only do this for unprocessed PDF files */ -- if (content_type && !strstr (content_type, "/vnd.cups-")) -- pdf_argv[pdf_argc++] = (char *)"-choosePaperByPDFPageSize"; - } - - /* diff --git a/cups-filters.spec b/cups-filters.spec index a9ff4d1..ea12410 100644 --- a/cups-filters.spec +++ b/cups-filters.spec @@ -3,7 +3,7 @@ Summary: OpenPrinting CUPS filters and backends Name: cups-filters -Version: 1.0.42 +Version: 1.0.43 Release: 1%{?dist} # For a breakdown of the licensing, see COPYING file @@ -17,12 +17,9 @@ Release: 1%{?dist} # MIT: filters: gstoraster, pdftoijs, pdftoopvp, pdftopdf, pdftoraster License: GPLv2 and GPLv2+ and GPLv3 and GPLv3+ and LGPLv2+ and MIT -Group: System Environment/Base Url: http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters Source0: http://www.openprinting.org/download/cups-filters/cups-filters-%{version}.tar.xz -Patch1: cups-filters-pdf-landscape.patch - Requires: cups-filters-libs%{?_isa} = %{version}-%{release} # Obsolete cups-php (bug #971741) @@ -109,9 +106,6 @@ This is the development package for OpenPrinting CUPS filters and backends. %prep %setup -q -# Fix PDF landscape printing (bug #768811). -%patch1 -p1 -b .pdf-landscape - %build # work-around Rpath ./autogen.sh @@ -227,6 +221,9 @@ fi %{_libdir}/libfontembed.so %changelog +* Fri Dec 20 2013 Jiri Popelka - 1.0.43-1 +- 1.0.43: upstream fix for bug #768811 (pdf-landscape) + * Sat Nov 30 2013 Jiri Popelka - 1.0.42-1 - 1.0.42: includes foomatic-rip (obsoletes foomatic-filters package) diff --git a/sources b/sources index be78c1d..17454cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3047524b51f2ac064663f1997c7d2c81 cups-filters-1.0.42.tar.xz +50f760c4cb7be37544c1174a12b1900e cups-filters-1.0.43.tar.xz