diff --git a/cups-filters-poppler-0.84.0.patch b/cups-filters-poppler-0.84.0.patch new file mode 100644 index 0000000..02423fa --- /dev/null +++ b/cups-filters-poppler-0.84.0.patch @@ -0,0 +1,42 @@ +--- cups-filters-1.22.5/filter/pdftoijs.cxx ++++ cups-filters-1.22.5/filter/pdftoijs.cxx +@@ -286,7 +286,7 @@ int main(int argc, char *argv[]) { + bool reverseVideo; + + setErrorCallback(::myErrorFun,NULL); +- globalParams = new GlobalParams(); ++ globalParams = std::make_unique(); + parseOpts(argc, argv); + + if (argc == 6) { +--- cups-filters-1.22.5/filter/pdftoopvp/pdftoopvp.cxx.orig 2019-04-07 17:00:58.000000000 +0200 ++++ cups-filters-1.22.5/filter/pdftoopvp/pdftoopvp.cxx 2020-01-03 17:56:44.571862630 +0100 +@@ -605,7 +605,7 @@ exit(0); + } + + // read config file +- globalParams = new GlobalParams(); ++ globalParams = std::make_unique(); + if (enableFreeTypeStr[0]) { + if (!globalParams->setEnableFreeType(enableFreeTypeStr)) { + opvpError(-1,"Bad '-freetype' value on command line"); +@@ -766,7 +766,7 @@ err2: + err05: + delete doc; + err0: +- delete globalParams; ++ globalParams.reset(); + + #if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 69 + // check for memory leaks +--- cups-filters-1.22.5/filter/pdftoraster.cxx.orig 2019-04-07 17:00:58.000000000 +0200 ++++ cups-filters-1.22.5/filter/pdftoraster.cxx 2020-01-03 17:56:05.477767380 +0100 +@@ -1958,7 +1958,7 @@ int main(int argc, char *argv[]) { + + setErrorCallback(::myErrorFun,NULL); + cmsSetLogErrorHandler(lcmsErrorHandler); +- globalParams = new GlobalParams(); ++ globalParams = std::make_unique(); + parseOpts(argc, argv); + + if (argc == 6) { diff --git a/cups-filters.spec b/cups-filters.spec index 10cd5c6..9c8bc8d 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: 11%{?dist} +Release: 12%{?dist} # For a breakdown of the licensing, see COPYING file # GPLv2: filters: commandto*, imagetoraster, pdftops, rasterto*, @@ -43,6 +43,8 @@ Patch07: 0001-libcupsfilters-In-generated-PPDs-prefer-Apple-Raster.patch # 1776271 - Updated cups-browsed in RHEL 7.7 leaks sockets Patch08: cups-browsed-socket-leak.patch +Patch09: cups-filters-poppler-0.84.0.patch + Requires: cups-filters-libs%{?_isa} = %{version}-%{release} # gcc and gcc-c++ is not in buildroot by default @@ -164,6 +166,7 @@ This is the development package for OpenPrinting CUPS filters and backends. %patch06 -p1 -b .setfilladjust %patch07 -p1 -b .prefer-apple-raster %patch08 -p1 -b .socket-leak +%patch09 -p1 -b .poppler-0.84.0 %build # work-around Rpath @@ -312,6 +315,9 @@ make check %{_libdir}/libfontembed.so %changelog +* Fri Jan 17 2020 Marek Kasik - 1.22.5-11 +- Rebuild for poppler-0.84.0 + * Wed Jan 15 2020 Zdenek Dohnal - 1.22.5-11 - add buildrequires fro systemd-rpm-macros