diff --git a/cups-filters-poppler34.patch b/cups-filters-poppler34.patch new file mode 100644 index 0000000..f50a304 --- /dev/null +++ b/cups-filters-poppler34.patch @@ -0,0 +1,36 @@ +=== modified file 'filter/pdftoopvp/OPVPOutputDev.cxx' +--- filter/pdftoopvp/OPVPOutputDev.cxx 2015-02-18 03:17:28 +0000 ++++ filter/pdftoopvp/OPVPOutputDev.cxx 2015-07-14 19:22:49 +0000 +@@ -1811,10 +1811,14 @@ + #if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2)) + maskSplash->drawImage(&imageSrc, &imgMaskData, + splashModeMono8, gFalse, maskWidth, maskHeight, mat); +-#else ++#elif POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33 + maskSplash->drawImage(&imageSrc, &imgMaskData, + splashModeMono8, gFalse, maskWidth, maskHeight, + mat,gFalse); ++#else ++ maskSplash->drawImage(&imageSrc, 0, &imgMaskData, ++ splashModeMono8, gFalse, maskWidth, maskHeight, ++ mat,gFalse); + #endif + delete imgMaskData.imgStr; + maskStr->close(); + +=== modified file 'filter/pdftoopvp/oprs/OPRS.cxx' +--- filter/pdftoopvp/oprs/OPRS.cxx 2013-01-09 10:42:32 +0000 ++++ filter/pdftoopvp/oprs/OPRS.cxx 2015-07-14 19:22:49 +0000 +@@ -240,8 +240,10 @@ + if (rasterMode) { + #if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2)) + return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat); +-#else ++#elif POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33 + return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse); ++#else ++ return splash->drawImage(src,0,srcData,srcMode,srcAlpha,w,h,mat,gFalse); + #endif + } else { + return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat); + diff --git a/cups-filters.spec b/cups-filters.spec index 8c929f2..8e2bfe3 100644 --- a/cups-filters.spec +++ b/cups-filters.spec @@ -19,6 +19,9 @@ License: GPLv2 and GPLv2+ and GPLv3 and GPLv3+ and LGPLv2+ and MIT Url: http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters Source0: http://www.openprinting.org/download/cups-filters/cups-filters-%{version}.tar.xz +# Upstream patch for poppler 0.34 support +# http://bzr.linuxfoundation.org/loggerhead/openprinting/cups-filters/revision/7371 +Patch0: cups-filters-poppler34.patch Requires: cups-filters-libs%{?_isa} = %{version}-%{release} @@ -113,6 +116,7 @@ This is the development package for OpenPrinting CUPS filters and backends. %prep %setup -q +%patch0 -p0 -b .poppler34 %build # work-around Rpath @@ -245,6 +249,9 @@ fi %{_libdir}/libfontembed.so %changelog +* Thu Jul 23 2015 Orion Poplawski - 1.0.71-2 +- Add upstream patch for poppler 0.34 support + * Wed Jul 22 2015 Marek Kasik - 1.0.71-2 - Rebuild (poppler-0.34.0)