rpms/cups-filters
7
0
Fork 0
Code Issues Pull Requests Releases Activity

backport upstream buildfix for poppler-0.22.x

Browse Source
This commit is contained in:
Rex Dieter 2013-01-19 13:48:46 -06:00
parent c9807df225
commit 9261356b85
2 changed files with 67 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
cups-filters-1.0.29-poppler_022.patch Normal file
View File

@ -0,0 +1,58 @@
diff -urbB cups-filters-1.0.29/filter/pdftoopvp/oprs/OPRS.cxx cups-filters-1.0-20130119/filter/pdftoopvp/oprs/OPRS.cxx
--- cups-filters-1.0.29/filter/pdftoopvp/oprs/OPRS.cxx 2012-09-10 14:52:00.000000000 -0500
+++ cups-filters-1.0-20130119/filter/pdftoopvp/oprs/OPRS.cxx 2013-01-18 18:40:36.000000000 -0600
@@ -5,6 +5,9 @@
//========================================================================
#include <config.h>
+#ifdef HAVE_CPP_POPPLER_VERSION_H
+#include "cpp/poppler-version.h"
+#endif
#ifdef USE_GCC_PRAGMAS
#pragma implementation
@@ -235,7 +238,11 @@
SplashColorMode srcMode, GBool srcAlpha,
int w, int h, SplashCoord *mat) {
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
+ return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse);
+#endif
} else {
return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);
}
diff -urbB cups-filters-1.0.29/filter/pdftoopvp/OPVPOutputDev.cxx cups-filters-1.0-20130119/filter/pdftoopvp/OPVPOutputDev.cxx
--- cups-filters-1.0.29/filter/pdftoopvp/OPVPOutputDev.cxx 2012-07-20 03:22:23.000000000 -0500
+++ cups-filters-1.0-20130119/filter/pdftoopvp/OPVPOutputDev.cxx 2013-01-18 18:40:36.000000000 -0600
@@ -1804,8 +1804,14 @@
maskSplash = new Splash(maskBitmap, gFalse);
maskColor[0] = 0;
maskSplash->clear(maskColor);
+#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
+ maskSplash->drawImage(&imageSrc, &imgMaskData,
+ splashModeMono8, gFalse, maskWidth, maskHeight,
+ mat,gFalse);
+#endif
delete imgMaskData.imgStr;
maskStr->close();
gfree(imgMaskData.lookup);
diff -urbB cups-filters-1.0.29/NEWS cups-filters-1.0-20130119/NEWS
--- cups-filters-1.0.29/NEWS 2013-01-02 12:23:13.000000000 -0600
+++ cups-filters-1.0-20130119/NEWS 2013-01-18 18:40:36.000000000 -0600
@@ -1,6 +1,11 @@
NEWS - OpenPrinting CUPS Filters v1.0.29 - 2013-01-02
-----------------------------------------------------
+CHANGES IN V1.0.30
+
+ - pdftoopvp: Let it build with Poppler 0.22.x. Thanks to Koji Otani
+ from BBR Inc. (Bug #1089).
+
CHANGES IN V1.0.29
- Fixed ./configure option "--with-rcdir=no". Thanks to Jiri

10
cups-filters.spec
View File

@ -4,7 +4,7 @@
Summary: OpenPrinting CUPS filters and backends
Name: cups-filters
Version: 1.0.29
Release: 2%{?dist}
Release: 3%{?dist}
# For a breakdown of the licensing, see COPYING file
# GPLv2: filters: commandto*, imagetoraster, pdftops, rasterto*,
@ -22,6 +22,9 @@ Url: http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdf_
Source0: http://www.openprinting.org/download/cups-filters/cups-filters-%{version}.tar.xz
Source1: cups-browsed.service
# backport upstream fix(es) for poppler-0.22.x
Patch1: cups-filters-1.0.29-poppler_022.patch
Requires: cups-filters-libs%{?_isa} = %{version}-%{release}
BuildRequires: cups-devel
@ -89,6 +92,8 @@ This is the development package for OpenPrinting CUPS filters and backends.
%prep
%setup -q
%patch1 -p1 -b .poppler_022
%build
# work-around Rpath
./autogen.sh
@ -165,6 +170,9 @@ install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
%{_libdir}/libfontembed.so
%changelog
* Sat Jan 19 2013 Rex Dieter <rdieter@fedoraproject.org> 1.0.29-3
- backport upstream buildfix for poppler-0.22.x
* Fri Jan 18 2013 Adam Tkac <atkac redhat com> - 1.0.29-2
- rebuild due to "jpeg8-ABI" feature drop