diff options
| author | Martin Pitt <mpitt@debian.org> | 2009-11-30 22:43:02 +0100 |
|---|---|---|
| committer | Martin Pitt <mpitt@debian.org> | 2009-11-30 22:43:02 +0100 |
| commit | 560ffe7c3b39093312049e53228b0f9608f3005b (patch) | |
| tree | 8ec25f15a898b7892552103cf706ecbf24ee953c | |
| parent | 3966714ebf8c60d96bb62c9ab6d33480e95be08b (diff) | |
| download | cups-560ffe7c3b39093312049e53228b0f9608f3005b.tar.gz | |
pdftopdf, pdftoopvp: Patch to build with poppler 0.12.2, which broke ABI
without bumping SONAME or even just shlibs :-(. Thanks to Jonathan Guthrie
for the patch! (Closes: #558755)
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/local/filters/pdf-filters/pdftoopvp/OPVPOutputDev.cxx | 2 | ||||
| -rw-r--r-- | debian/local/filters/pdf-filters/pdftopdf/P2PGfx.cxx | 2 | ||||
| -rw-r--r-- | debian/local/filters/pdf-filters/pdftopdf/P2PPattern.cxx | 4 |
4 files changed, 12 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 43875ab3..ef00aa5e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +cups (1.4.2-3) UNRELEASED; urgency=low + + * pdftopdf, pdftoopvp: Patch to build with poppler 0.12.2, which broke ABI + without bumping SONAME or even just shlibs :-(. Thanks to Jonathan Guthrie + for the patch! (Closes: #558755) + + -- Martin Pitt <mpitt@debian.org> Mon, 30 Nov 2009 22:41:22 +0100 + cups (1.4.2-2) unstable; urgency=low * debian/control, debian/rules: Drop dpkg-substvars hack for poppler-utils diff --git a/debian/local/filters/pdf-filters/pdftoopvp/OPVPOutputDev.cxx b/debian/local/filters/pdf-filters/pdftoopvp/OPVPOutputDev.cxx index 41fc8a2e..0f363be7 100644 --- a/debian/local/filters/pdf-filters/pdftoopvp/OPVPOutputDev.cxx +++ b/debian/local/filters/pdf-filters/pdftoopvp/OPVPOutputDev.cxx @@ -272,7 +272,7 @@ void OPVPOutputDev::startDoc(XRef *xrefA) { #endif #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H globalParams->getEnableFreeType(), - globalParams->getForceNoFTAutoHinting(), + gFalse, #endif globalParams->getAntialias()); for (i = 0; i < nT3Fonts; ++i) { diff --git a/debian/local/filters/pdf-filters/pdftopdf/P2PGfx.cxx b/debian/local/filters/pdf-filters/pdftopdf/P2PGfx.cxx index c3b79e63..7c5da5df 100644 --- a/debian/local/filters/pdf-filters/pdftopdf/P2PGfx.cxx +++ b/debian/local/filters/pdf-filters/pdftopdf/P2PGfx.cxx @@ -699,7 +699,7 @@ void P2PGfx::doImage(Stream *istr) } } if (!obj1.isNull()) { - colorSpace = GfxColorSpace::parse(&obj1); + colorSpace = GfxColorSpace::parse(&obj1, NULL); } obj1.free(); if (!colorSpace) { diff --git a/debian/local/filters/pdf-filters/pdftopdf/P2PPattern.cxx b/debian/local/filters/pdf-filters/pdftopdf/P2PPattern.cxx index 0da16253..bd7f0a76 100644 --- a/debian/local/filters/pdf-filters/pdftopdf/P2PPattern.cxx +++ b/debian/local/filters/pdf-filters/pdftopdf/P2PPattern.cxx @@ -210,7 +210,7 @@ P2PPattern::OrgPattern::OrgPattern(int orgNumA, int orgGenA, XRef *xref) pattern = 0; refCount = 1; xref->fetch(orgNumA,orgGenA,&orgObj); - if ((pattern = GfxPattern::parse(&orgObj)) == 0) { + if ((pattern = GfxPattern::parse(&orgObj, NULL)) == 0) { error(-1,const_cast<char *>("Bad Pattern")); } } @@ -220,7 +220,7 @@ P2PPattern::OrgPattern::OrgPattern(Object *objA) pattern = 0; refCount = 1; objA->copy(&orgObj); - if ((pattern = GfxPattern::parse(&orgObj)) == 0) { + if ((pattern = GfxPattern::parse(&orgObj, NULL)) == 0) { error(-1,const_cast<char *>("Bad Pattern")); } } |