From: Jan Palus <atler@pld-linux.org>
Date: Tue, 22 May 2018 20:52:14 +0000 (+0200)
Subject: upstream patch to fix build with new poppler
X-Git-Tag: auto/th/cups-filters-1.20.3-2~1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=7646e7318ae336318c029a942c005da0ffe504c2;p=packages%2Fcups-filters.git

upstream patch to fix build with new poppler
---

diff --git a/cups-filters-poppler.patch b/cups-filters-poppler.patch
new file mode 100644
index 0000000..7cdfc26
--- /dev/null
+++ b/cups-filters-poppler.patch
@@ -0,0 +1,35 @@
+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 bc4b25f..04d4384 100644
--- a/cups-filters.spec
+++ b/cups-filters.spec
@@ -29,6 +29,7 @@ Source0:	http://www.openprinting.org/download/cups-filters/%{name}-%{version}.ta
 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
@@ -248,6 +249,7 @@ Moduł PHP do ogólnego systemu druku dla Uniksa.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__aclocal}