From 5d00506944c3974e75a3884dfea202f5896a6e32 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Aug 13 2018 23:11:34 +0000 Subject: Rebuild for poppler-0.67.0 --- diff --git a/cups-filters.spec b/cups-filters.spec index bed5b67..f1ed072 100644 --- a/cups-filters.spec +++ b/cups-filters.spec @@ -4,7 +4,7 @@ Summary: OpenPrinting CUPS filters and backends Name: cups-filters Version: 1.20.3 -Release: 6%{?dist} +Release: 7%{?dist} # For a breakdown of the licensing, see COPYING file # GPLv2: filters: commandto*, imagetoraster, pdftops, rasterto*, @@ -21,6 +21,7 @@ Url: http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups Source0: http://www.openprinting.org/download/cups-filters/cups-filters-%{version}.tar.xz Patch01: cups-filters-createall.patch +Patch02: poppler-0.64.patch Requires: cups-filters-libs%{?_isa} = %{version}-%{release} @@ -119,6 +120,7 @@ This is the development package for OpenPrinting CUPS filters and backends. # set LocalQueueNamingRemoteCUPS and CreateIPPPrinterQueues by default %patch01 -p1 -b .createall +%patch02 -p1 -b .poppler-0.64 %build # work-around Rpath @@ -291,6 +293,9 @@ fi %{_libdir}/libfontembed.so %changelog +* Tue Aug 14 2018 Marek Kasik - 1.20.3-7 +- Rebuild for poppler-0.67.0 + * Tue Jul 24 2018 Zdenek Dohnal - 1.20.3-6 - correcting license diff --git a/poppler-0.64.patch b/poppler-0.64.patch new file mode 100644 index 0000000..4babcf1 --- /dev/null +++ b/poppler-0.64.patch @@ -0,0 +1,28 @@ +From 07a0a423a8469a2dd6d7f64bb3b62ba6ac42cc28 Mon Sep 17 00:00:00 2001 +From: Lars Wendler +Date: Fri, 20 Jul 2018 15:20:11 +0200 +Subject: [PATCH] GooString needs to be const since >=poppler-0.64.0 + +This only fails with >=poppler-0.67.0 but the change to const was done +in 0.64.0 +--- + filter/pdf.cxx | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/filter/pdf.cxx b/filter/pdf.cxx +index 206ccf88..665eab09 100644 +--- a/filter/pdf.cxx ++++ b/filter/pdf.cxx +@@ -734,6 +734,9 @@ extern "C" int pdf_fill_form(pdf_t *doc, opt_t *opt) + } + + FormField *ff = fm_text->getField(); ++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 64 ++ const ++#endif + GooString *field_name; + field_name = ff->getFullyQualifiedName(); + if ( ! field_name ) +-- +2.17.1 +