up to 1.20.4

- poppler patch no longer needed

diff --git a/cups-filters-poppler.patch b/cups-filters-poppler.patch
deleted file mode 100644 (file)
index 7cdfc26..0000000
--- a/cups-filters-poppler.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 2561a9dc5ebdfd90cc2781ca8f1560f4faff19a1 Mon Sep 17 00:00:00 2001
-From: Till Kamppeter <till.kamppeter@gmail.com>
-Date: Tue, 8 May 2018 20:57:56 +0200
-Subject: [PATCH] pdftoopvp: Silence compiler warning.
-
----
- NEWS                               | 1 +
- filter/pdftoopvp/OPVPOutputDev.cxx | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/NEWS b/NEWS
-index e29e3ba8..19caf601 100644
---- a/NEWS
-+++ b/NEWS
-@@ -3,6 +3,7 @@ NEWS - OpenPrinting CUPS Filters v1.20.3 - 2018-04-12
- 
- CHANGES IN V1.20.4
- 
-+      - pdftoopvp: Silence compiler warning (Issue #42).
-       - cups-browsed: If the user modifies/overwrites a print queue
-         created by cups-browsed, it will now not only be
-         automatically released from the control of cups-browsed, but
-diff --git a/filter/pdftoopvp/OPVPOutputDev.cxx b/filter/pdftoopvp/OPVPOutputDev.cxx
-index 63806e8a..45ebe02c 100644
---- a/filter/pdftoopvp/OPVPOutputDev.cxx
-+++ b/filter/pdftoopvp/OPVPOutputDev.cxx
-@@ -66,7 +66,7 @@ struct SplashOutFontSubst {
- class SplashOutFontFileID: public SplashFontFileID {
- public:
- 
--  SplashOutFontFileID(Ref *rA) { r = *rA; substIdx = -1; }
-+  SplashOutFontFileID(const Ref *rA) { r = *rA; substIdx = -1; }
- 
-   ~SplashOutFontFileID() {}
- 

diff --git a/cups-filters.spec b/cups-filters.spec
index 7a3359ce68061507313ddc0dbc92ecb709cdf9f3..9f3e5090fc8dd686db1545b47860796b129e5866 100644 (file)
--- a/cups-filters.spec
+++ b/cups-filters.spec
@@ -11,8 +11,8 @@
 Summary:       OpenPrinting CUPS filters and backends
 Summary(pl.UTF-8):     Filtry i backendy CUPS-a z projektu OpenPrinting
 Name:          cups-filters
-Version:       1.20.3
-Release:       2
+Version:       1.20.4
+Release:       1
 # For a breakdown of the licensing, see COPYING file
 # GPLv2:   filters: commandto*, imagetoraster, pdftops, rasterto*,
 #                   imagetopdf, pstopdf, texttopdf
@@ -25,11 +25,10 @@ Release:    2
 License:       GPL v2, GPL v2+, GPL v3, GPL v3+, LGPL v2+, MIT
 Group:         Applications/Printing
 Source0:       http://www.openprinting.org/download/cups-filters/%{name}-%{version}.tar.xz
-# Source0-md5: 935aaad8f5b470770aab1d15466c1337
+# Source0-md5: 173045bbc4bca59230543f225b8fa16c
 Patch0:                %{name}-dbus.patch
 Patch1:                %{name}-php.patch
 Patch2:                %{name}-php7.patch
-Patch3:                %{name}-poppler.patch
 URL:           http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters
 BuildRequires: autoconf >= 2.65
 BuildRequires: automake >= 1:1.11
@@ -249,7 +248,6 @@ Moduł PHP do ogólnego systemu druku dla Uniksa.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__aclocal}