From 73144b075b58f6b5ac545de94f07b3236972a1a0 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Oct 09 2019 10:33:53 +0000
Subject: Merge branch 'f30' into f29


---

diff --git a/cups-filters-qpdf-9.patch b/cups-filters-qpdf-9.patch
new file mode 100644
index 0000000..50183c0
--- /dev/null
+++ b/cups-filters-qpdf-9.patch
@@ -0,0 +1,12 @@
+diff --git a/filter/pdf.cxx b/filter/pdf.cxx
+index 5b212ca..f12607f 100644
+--- a/filter/pdf.cxx
++++ b/filter/pdf.cxx
+@@ -20,6 +20,7 @@
+ #include "pdf.h"
+ #include <vector>
+ #include <string>
++#include <cstring>
+ #include <qpdf/QPDF.hh>
+ #include <qpdf/QPDFObjectHandle.hh>
+ #include <qpdf/QPDFWriter.hh>
diff --git a/cups-filters-setfilladjust.patch b/cups-filters-setfilladjust.patch
new file mode 100644
index 0000000..c9d3be2
--- /dev/null
+++ b/cups-filters-setfilladjust.patch
@@ -0,0 +1,13 @@
+diff --git a/filter/gstoraster.c b/filter/gstoraster.c
+index 4aec079..f3424f3 100644
+--- a/filter/gstoraster.c
++++ b/filter/gstoraster.c
+@@ -895,7 +895,7 @@ main (int argc, char **argv, char *envp[])
+       (t && (!strcasecmp(t, "true") || !strcasecmp(t, "on") ||
+ 	     !strcasecmp(t, "yes")))) {
+     fprintf(stderr, "DEBUG: Ghostscript using Center-of-Pixel method to fill paths.\n");
+-    cupsArrayAdd(gs_args, strdup("0 .setfilladjust"));
++    cupsArrayAdd(gs_args, strdup("0 0 .setfilladjust2"));
+   } else
+     fprintf(stderr, "DEBUG: Ghostscript using Any-Part-of-Pixel method to fill paths.\n");
+ 
diff --git a/cups-filters.spec b/cups-filters.spec
index a916154..482c056 100644
--- a/cups-filters.spec
+++ b/cups-filters.spec
@@ -4,7 +4,7 @@
 Summary: OpenPrinting CUPS filters and backends
 Name:    cups-filters
 Version: 1.22.5
-Release: 4%{?dist}
+Release: 7%{?dist}
 
 # For a breakdown of the licensing, see COPYING file
 # GPLv2:   filters: commandto*, imagetoraster, pdftops, rasterto*,
@@ -30,6 +30,12 @@ Patch02: cups-browsed.8.patch
 # issue caused by bad covscan fix, strlen() was called on NULL pointer,
 # fixed upstream
 Patch03: cups-filters-foomaticrip-segfault.patch
+# backported from upstream, do not create encrypted file during filtering
+Patch04: pdftopdf-nocrypt.patch
+# backported from upstream, ftbfs with qpdf-9.0.0
+Patch05: cups-filters-qpdf-9.patch
+# backported from upstream, gs 9.27 uses now setfilladjust2
+Patch06: cups-filters-setfilladjust.patch
 
 Requires: cups-filters-libs%{?_isa} = %{version}-%{release}
 
@@ -84,8 +90,12 @@ Requires: cups-filesystem
 # if --with-pdftops is set to hybrid, we use poppler filters for several printers
 # and for printing banners, for other printers we need gs - ghostscript
 Requires: poppler-utils
+# several filters calls 'gs' binary during filtering
 Requires: ghostscript
 
+# for getting ICC profiles for filters (dbus must run)
+Requires: colord
+
 # texttopdf
 Requires: liberation-mono-fonts
 
@@ -138,6 +148,9 @@ This is the development package for OpenPrinting CUPS filters and backends.
 %patch02 -p1 -b .manpage
 # 1740122 - foomatic-rip segfaults when env variable PRINTER is not defined
 %patch03 -p1 -b .foomaticrip-segfault
+%patch04 -p1 -b .pdftopdf-nocrypt
+%patch05 -p1 -b .qpdf-9
+%patch06 -p1 -b .setfilladjust
 
 %build
 # work-around Rpath
@@ -286,6 +299,16 @@ make check
 %{_libdir}/libfontembed.so
 
 %changelog
+* Wed Oct 09 2019 Zdenek Dohnal <zdohnal@redhat.com> - 1.22.5-7
+- gs 9.27 now uses setfilladjust2
+
+* Tue Sep 17 2019 Zdenek Dohnal <zdohnal@redhat.com> - 1.22.5-6
+- ftbfs with qpdf-9.0.0
+- pdftopdf output should not be encrypted
+
+* Wed Sep 11 2019 Zdenek Dohnal <zdohnal@redhat.com> - 1.22.5-5
+- require colord, because it is needed for ICC profiles for filters
+
 * Tue Aug 13 2019 Zdenek Dohnal <zdohnal@redhat.com> - 1.22.5-4
 - 1740122 - foomatic-rip segfaults when env variable PRINTER is not defined
 
diff --git a/pdftopdf-nocrypt.patch b/pdftopdf-nocrypt.patch
new file mode 100644
index 0000000..24caf5c
--- /dev/null
+++ b/pdftopdf-nocrypt.patch
@@ -0,0 +1,20 @@
+diff --git a/filter/pdftopdf/qpdf_pdftopdf_processor.cc b/filter/pdftopdf/qpdf_pdftopdf_processor.cc
+index 73e4f06..0752a99 100644
+--- a/filter/pdftopdf/qpdf_pdftopdf_processor.cc
++++ b/filter/pdftopdf/qpdf_pdftopdf_processor.cc
+@@ -623,6 +623,7 @@ void QPDF_PDFTOPDF_Processor::emitFile(FILE *f,ArgOwnership take) // {{{
+   if (!extraheader.empty()) {
+     out.setExtraHeaderText(extraheader);
+   }
++  out.setPreserveEncryption(false);
+   out.write();
+ }
+ // }}}
+@@ -642,6 +643,7 @@ void QPDF_PDFTOPDF_Processor::emitFilename(const char *name) // {{{
+   if (!extraheader.empty()) {
+     out.setExtraHeaderText(extraheader);
+   }
++  out.setPreserveEncryption(false);
+   out.write();
+ }
+ // }}}