Hello community, here is the log from the commit of package cups-filters for openSUSE:Factory checked in at 2015-08-05 19:13:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cups-filters (Old) and /work/SRC/openSUSE:Factory/.cups-filters.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cups-filters" Changes: -------- --- /work/SRC/openSUSE:Factory/cups-filters/cups-filters.changes 2015-07-16 17:13:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cups-filters.new/cups-filters.changes 2015-08-05 19:13:12.000000000 +0200 @@ -1,0 +2,8 @@ +Sun Jul 26 13:16:43 UTC 2015 - zai...@opensuse.org + +- Add cups-filters-poppler-034.patch: Fix build with poppler-0.34. + See https://bugs.linuxfoundation.org/show_bug.cgi?id=1301 + pdftoopvp: Adaptations to API changes on Poppler 0.34.0, note + that this patch disables color management in this filter. + +------------------------------------------------------------------- New: ---- cups-filters-poppler-034.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups-filters.spec ++++++ --- /var/tmp/diff_new_pack.CbBDQI/_old 2015-08-05 19:13:13.000000000 +0200 +++ /var/tmp/diff_new_pack.CbBDQI/_new 2015-08-05 19:13:13.000000000 +0200 @@ -49,6 +49,8 @@ # zypper vcmp '4.0.17.256' '4.0.17.256.1' -> 4.0.17.256 is older than 4.0.17.256.1 # zypper vcmp '4.0.17.257' '4.0.17.256.1' -> 4.0.17.257 is newer than 4.0.17.256.1 %define foomatic_rip_version 4.0.17.256.1 +# PATCH-FIX-UPSTREAM cups-filters-poppler-034.patch blo#1301 zai...@opensuse.org -- Fix build with new poppler-0.34. Upstream patch. +Patch0: cups-filters-poppler-034.patch # SLE12 needs special BuildRequires. # For suse_version values see https://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto %if 0%{?suse_version} == 1315 @@ -275,6 +277,9 @@ %prep %setup -q +%if 0%{?suse_version} > 1320 +%patch0 -p0 +%endif %build # Just do what is described in the upstream INSTALL file ++++++ cups-filters-poppler-034.patch ++++++ === 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);
