--- poppler-0.12.0.orig/debian/libpoppler-qt4-3.install +++ poppler-0.12.0/debian/libpoppler-qt4-3.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libpoppler-qt4.so.* --- poppler-0.12.0.orig/debian/changelog +++ poppler-0.12.0/debian/changelog @@ -0,0 +1,825 @@ +poppler (0.12.0-0ubuntu3~ppa1) karmic; urgency=low + + * Add poppler-glib-0.11.2-hinting.patch. + + -- Tobias Wolf Thu, 10 Sep 2009 03:14:51 +0200 + +poppler (0.12.0-0ubuntu1) karmic; urgency=low + + * New upstream version: + core: + - Fix printf format security warnings + - Improve rendering of radial shadings. Bug #20238 + - Better fallback when there's a font type mismatch. Bug #17252 + - Do not crash on attachments without data stream. Bug #10386 + - Fix infinite loop in JBIG2Decoder. Bug #23025 + build system: + - Minimizes pkg-config dependencies for Qt frontends + - Add automake 1.11 support + - Use the newest automake found and not the oldest + - Support AM_SILENT_RULES when using automake 1.11 + utils: + - Add common options to pdftoabw + + -- Sebastien Bacher Wed, 09 Sep 2009 22:59:03 +0200 + +poppler (0.11.3-0ubuntu1) karmic; urgency=low + + * New upstream version: + core: + - Optimization in the Cairo renderer for some fonts + - Do not apply masks when fill color space mode is csPattern in the Cairo renderer. Bug #22216 + - Check for overflow when parsing integers. Bug #23078 + - Do not save the font file twice for FreeType fonts in the Cairo renderer. Bug #20491 + - Use current fill_opacity when drawing images in the Cairo renderer + - Fix alpha rendering in some files in the Splash renderer. Bug #22143, #22152 + - Implement tiling patterns in the Cairo renderer + - When converting a cm matrix to PS write 4 significant digits for numbers < 1 not 4 decimals. Bug #23332 + - Fix changing of locale, now poppler no longer changes LC_NUMERIC to "C" + - Return PDF version as two integers instead of as a double + Qt4: + - Addition of the Color Management API + - Small fix to documentation + - Fix backwards text search + utils: + - Add the -png flag to pdftoppm to output to PNG + + -- Sebastien Bacher Mon, 31 Aug 2009 14:19:45 +0200 + +poppler (0.11.2-0ubuntu2) karmic; urgency=low + + * Reapply some revision dropped in the previous upload + + -- Sebastien Bacher Mon, 10 Aug 2009 16:21:34 +0200 + +poppler (0.11.2-0ubuntu1) karmic; urgency=low + + * New upstream version: + core: + - Make DecryptStream return sane values for getPos(). Bug #19706 + - Fix bug when printing pdf with multiple page sizes in duplex mode + - Initilize AnnotColot properly when the Array is not correct + - Fix crash on some files with forms. Bug #22485 + - Fix crash in files with invalid embedded files. Bug #22551 + - Improve FileSpec attribute parsing + - Cairo output device improvements. Bugs #10942, #18017, #14160 + - Implement blend modes in cairo backend + - Handle fontType1COT fonts in CairoFontEngine + - Fix generation of PS for some files. Bug #18908 + - Don't use byte_lookup table when color space doesn't support getLine methods. Bug #11027 + - Fix rendering of PDF files with malformed patterns. Bug #22835 + - Add the possibility of disabling font substitution in pdftops. Bug #23030 + - Fix some radio buttons not being detected as such + glib: + - Improvements to the demo + Qt4: + - Improvements to the demo + build system: + - Use gtkbuilder rather than libglade for some tests + utils: + - Fix bug with noCrop parameter in pdftops + * debian/control: + - require new gtk for gtkbuilder and not libglade + + -- Sebastien Bacher Wed, 05 Aug 2009 17:59:57 +0100 + +poppler (0.11.1-0ubuntu1) karmic; urgency=low + + * New upstream version: + core: + - Support colorizing text in pattern colorspace. Bug #19670 and #19994 + - Add the possibility of forcing no hinting of fonts in the Splash backend + - Support multiple page sizes when converting to PS. Bug #19777 + - Also tokens with leading 00 when parsing the char to unicode map. Bug #22025 + - Improvements of rendering speed in documents using PS transformations a lot. Bug #21562 + - More work on Annotations support + - Use Interpolate flag to decide whether applying image interpolation during rendering. Bug #9860 + - Handle Streams in CMap definitions. Bug #22334 + - Fix some bugs in JBIG2Stream handling + - Fix dashed line in page 1 of bug 20011 + - Fix exit(1) when rendering a file + - Fix pdftops crash on file from KDE bug #174899 + - Fix PS generation in some files. Bug #20420 + - Do not create the GfxColorTransform if the lcms could not be created. Bug #20108 + - Check Mask entries are int before using them, if they are real cast to int and try to use them. Bug #21841 + - Use the correct value when creating the V field for form combo boxes + - Give an error when using level1sep in pdftops without having CMYK support. Bug #22026 + - Don't include lcms.h in GfxState.h + - Fix splashColorModeNComps to correctly include all values for each SplashColorMode + - Add splashClearColor that assigns white to the given colorptr + - Kill support for specifying extension in openTmpFile. Bug #21713 + - Fix "Conditional jump or move depends on uninitialised value". Bug #20011 + glib: + - Add poppler_annot_markup_has_popup + - Hyphenate UTF-8 and UTF-16BE. Bug #21953 + - Use g_strerror instead of strerror. Bug #22095 + - Fix a crash when a destination points to an invalid page + - Improvements to the demo + Qt4: + - Add LinkDestination::destinationName + - Do not try to resolve named destinations for GoTo links pointing to external documents + - Add Page::thumbnail + - Improvements to the demo + - Improvements to the documentation + build system: + - Build fix for MSVC + - Better lcms cmake check comming from kdelibs + - Use pkgconfig for autotools lcms check + - Remove unneeded files from repo. Bug #22094 + + -- Sebastien Bacher Mon, 27 Jul 2009 14:01:51 +0200 + +poppler (0.11.0-0ubuntu4) karmic; urgency=low + + * debian/patches/10_pdftops-multiple-page-size-support.patch: Made new + page-size-conserving PostScript output mode working together with Duples, + (LP: #382379). + + -- Till Kamppeter Mon, 22 Jun 2009 16:43:49 +0200 + +poppler (0.11.0-0ubuntu3) karmic; urgency=low + + * debian/patches/15_poppler-ps-output-broken-binary-encoding-fix.patch: + Fixed bug in copying ASCII85-encoded binary data from the PDF input + file which produced broken PostScript (LP: #335397). + * debian/patches/10_pdftops-multiple-page-size-support.patch: Added new + output mode to the PostScript output device, so that the original page + sizes of PDF documents with multiple page sizes stay conserved + (LP: #382379). + + -- Till Kamppeter Thu, 4 Jun 2009 18:24:49 +0200 + +poppler (0.11.0-0ubuntu2) karmic; urgency=low + + * debian/libpoppler-dev.install: Added missing header files to + libpoppler-dev package. (LP: #380187) + + -- Till Kamppeter Mon, 25 May 2009 09:49:49 +0200 + +poppler (0.11.0-0ubuntu1) karmic; urgency=low + + * New upstream version: + core: + - Add initial support for color management + - Remove case-insensitive matching of filenames in PDFDoc constructor + - Fix extraction of some ActualText content + - More work on Annotations support + - Improve font rendering in Cairo output device + - Fix bug in cairo backend with nested masks + - Fix cairo luminosity smask rendering + - Add optionally text support to Cairo output device + - Add the possibility of setting the datadir on runtime + - Return an error code instead of a boolean when saving + - Make the font scanner more versatile + - Small opimization in documents that use PostScriptFunction transforms + - Minor optimization to Stream handling + - Fix some compile warnings + glib: + - Optional content support + - More work on Annotations support + - Improvements to the demo + - Documentation improvements + - Fix build when compiling with GTK_DISABLE_SINGLE_INCLUDES + Qt4: + - Support URI actions for Table Of Contents items + - Documentation improvements + - Improvements to the demo + - Add a FontIterator for iterating through the fonts of the document + utils: + - Allow the use of cropbox in pdftoppm + - Make pdftohtml output png images when the image stream is not a jpeg + - Make pdftotext accept cropping options like pdftoppm + - Support rendering non-square pixels in pdftoppm + build system: + - Require Cairo 1.8.4 for the Cairo output device + - Require CMake 2.6 when using the CMake build system + - Optionally require libpng for pdftohtml + - Optionally require libcms for color management + * debian/control: + - build-depends on libpng12-dev, liblcms1-dev and update cairo requirement + * debian/control, debian/rules: + - update for the new soname version + + -- Sebastien Bacher Wed, 13 May 2009 14:29:27 +0200 + +poppler (0.10.6-1ubuntu1) karmic; urgency=low + + * Sync on Debian + * debian/control, debian/rules: + - don't use openjpeg it's in universe + + -- Sebastien Bacher Wed, 29 Apr 2009 15:41:23 +0200 + +poppler (0.10.6-1) unstable; urgency=critical + + * Fix section for the debug package. + * New upstream release. + + Fix problems that happen when parsing broken JBIG2 files. + CVE-2009-0799, CVE-2009-0800, CVE-2009-1179, CVE-2009-1180, + CVE-2009-1181, CVE-2009-1182, CVE-2009-1183, CVE-2009-1187, + CVE-2009-1188. + * Bump libqt4 requirement. + * 10_jpxstream_int_crash.patch: removed, upstream has merged a + different fix quite a while ago. + * Standards version is 3.8.1. + + -- Josselin Mouette Wed, 01 Apr 2009 18:30:04 +0200 + +poppler (0.10.5-1) unstable; urgency=low + + [ Pino Toscano ] + * New upstream release, no API nor ABI changes. + + Fixes crash when rendering documents with optional content. + (Closes: #519494) + * Remove lintian override for poppler-dbg, which is no more needed with + lintian >= 2.2.1. + + -- Josselin Mouette Wed, 01 Apr 2009 15:19:53 +0200 + +poppler (0.10.4-3) unstable; urgency=low + + * Revert previous upload, now openjpeg was built successfully on + alpha. + * Build-depend on libglib2.0-doc to ensure proper xrefs. + + -- Josselin Mouette Tue, 10 Mar 2009 12:03:06 +0100 + +poppler (0.10.4-2) unstable; urgency=low + + * Don’t require openjpeg on alpha, since it doesn’t build there. + + -- Josselin Mouette Sun, 08 Mar 2009 03:33:50 +0100 + +poppler (0.10.4-1) unstable; urgency=low + + [ Pino Toscano ] + * New upstream stable release, with ABI and API changes wrt poppler 0.8. + - Rename libpoppler3 to libpoppler4, libpoppler-glib3 to libpoppler-glib4; + libpoppler-qt2 and libpoppler-qt4-3 are not renamed; update control, + DEB_DH_MAKESHLIBS_ARGS_* in rules, and rename install files. + - Add shlib version for libpoppler-qt4-3. + - Drop patches 60_manpages-cfg-flag.patch, 61_manpages-hyphens.patch, and + 62_pdftops-mandatory-arg.patch, merged upstream. + * Build-dep on libopenjpeg-dev for better JPEG2000 reading. + + [ Josselin Mouette ] + * Build-depend explicitly on libjpeg-dev, libfreetype6-dev and + libxml2-dev. + * Bump requirement on libqt4-dev. + + -- Josselin Mouette Fri, 06 Mar 2009 12:54:09 +0100 + +poppler (0.8.7-1) unstable; urgency=low + + * Bump up Standards-Version to 3.8.0. + * New patch, 61_manpages-hyphens, fixes escaping of hyphens in man pages; + FreeDesktop #17225. + * New patch, 62_pdftops-mandatory-arg, fixes synopsis of pdftops in man page + to clarify that a PDF file is required in all cases; FreeDesktop #17226; + closes: #491816. + * Build-dep on cdbs (>= 0.4.52) and add a lintian override with rationale + for the following lintian warning: + W: poppler-dbg: dbg-package-missing-depends poppler + * Add xrefs and CVE for #489756 in 0.8.5-1 as I didn't merge the 0.8.4-1.1 + NMU. + * New upstream release; no API change, bug fixes. + + -- Loic Minier Wed, 20 Aug 2008 17:36:12 +0200 + +poppler (0.8.6-1) unstable; urgency=low + + * Fix /usr/share/gtk-doc/html/poppler symlink to point at + /usr/share/doc/libpoppler-glib-dev/html/poppler instead of + /usr/share/doc/libpoppler-glib-dev/html; LP: #226677. + * New upstream stable release; bug fixes, no API change. + * New patch, 60_manpages-cfg-flag, drop unimplemented -cfg flag from man + pages; FreeDesktop #17222; closes: #461961. + * Rename patch 001_jpxstream_int_crash to 10_jpxstream_int_crash as we don't + have that many patches; also add upstream bug id (FreeDesktop #5667) and + refresh to apply cleanly. + * Build-dep on pkg-config >= 0.18 to make sure -lpoppler is only in + poppler-qt's Libs.private (it already is though); closes: #360595. + + -- Loic Minier Fri, 01 Aug 2008 15:04:05 +0200 + +poppler (0.8.5-1) unstable; urgency=low + + * New upstream release; no API changes, misc fixes. + - Initializes pageWidgets in Page.cc, otherwise it can be a rubbish + pointer as Annots is not a valid object; upstream commit + fd0bf8b05cb155e2f29df31fa01964b12e710b89; CVE-2008-2950; + closes: #489756. + + -- Loic Minier Wed, 30 Jul 2008 14:52:42 +0200 + +poppler (0.8.4-1) unstable; urgency=low + + * New upstream release; no API change. + - Fixes crash when reloading PDFs; GNOME #536482; closes: 484160. + + -- Loic Minier Mon, 30 Jun 2008 10:44:16 +0200 + +poppler (0.8.3-1) unstable; urgency=low + + * New upstream release. Closes: #487214. + + Fix crasher with some PDF files. Closes: #484224. + + -- Josselin Mouette Wed, 25 Jun 2008 16:40:39 +0200 + +poppler (0.8.2-2) unstable; urgency=low + + * Upload to unstable. + * Set myself as Maintainer instead of Uploader, taking over from Ondřej Surý + but I wish we move to an official team; closes: #481323. + + -- Loic Minier Thu, 15 May 2008 12:33:18 +0200 + +poppler (0.8.2-1) experimental; urgency=low + + * New upstream releases. + - Drop patch 006_pthreads_ldflags, upstream now calls ACX_PTHREAD() in + configure.ac which does the right thing. + - Drop patch 102_embedded-font-fixes, merged upstream. + + -- Loic Minier Sun, 11 May 2008 01:02:22 +0200 + +poppler (0.8.0-1) experimental; urgency=low + + * Bump libcairo2-dev build-dep and dep to >= 1.4; thanks + Marc 'HE' Brockschmidt. + * New upstream stable release, with ABI and API changes; closes: #476323. + - Rename libpoppler2 to libpoppler3, libpoppler-glib2 to libpoppler-glib3, + and libpoppler-qt4-2 to libpoppler-qt4-3; NB: libpoppler-qt2 not + renamed; update control, DEB_DH_MAKESHLIBS_ARGS_* in rules, rename + install files. + - Drop shlib version except for libpoppler-qt2. + - Update patch 006_pthreads_ldflags for the version-info changes in + poppler/Makefile.am. + - Force usage of qt4's moc via a PATH setting; export PATH. + * Let libpoppler-glib-dev depend on libglib2.0-dev >= 2.6 for consistency + with build-deps. + * New patch, 102_embedded-font-fixes; protects the methods of the Object + class to be more robust and prevent things like CVE-2008-1693; see also + FreeDesktop/Poppler #11392; taken from the Ubuntu package; + closes: #476842. + * Add a poppler-dbg package; closes: #408403. + - Bump up cdbs build-dep to >= 0.4.51 for -dbg handling fixes. + - Add poppler-dbg to control. + + -- Loic Minier Mon, 17 Mar 2008 21:00:13 +0100 + +poppler (0.6.4-1) unstable; urgency=medium + + * Add ${shlibs:Depends} to libpoppler-glib-dev, libpoppler-dev, + libpoppler-qt-dev, libpoppler-qt4-dev. + * Add ${misc:Depends}. + * Cleanups. + * New upstream releases; no API change; bug fixes; closes: #459342. + * Fix copyright information to use version 2 of the GPL (instead of version 2 + or later); thanks Timo Jyrinki for the patch; closes: #453865. + * Urgency medium for RC bug fix. + * List pdftohtml in poppler-utils' description; closes: #464439. + * Drop libpoppler-qt-dev dependency from libpoppler-qt4-dev; thanks + Pino Toscano; closes: #459922. + * Bump up Standards-Version to 3.7.3. + + -- Loic Minier Fri, 18 Jan 2008 13:35:06 +0100 + +poppler (0.6.2-1) unstable; urgency=low + + * New upstream version. (Closes: #447992) + * Dependency on xpdfrc was removed on 2007-02-25 (Closes: #347789, #440936) + * Changes since 0.6.1: + - Fix CVE-2007-4352, CVE-2007-5392 and CVE-2007-5393 (Closes: #450628) + - Fix a crash on documents with wrong CCITTFaxStream + - Fix a crash in the Cairo renderer with invalid embedded fonts + - Fix a crash with invalid TrueType fonts + - Check if font is inside the clip area before rendering + it to a temporary bitmap in the Splash renderer. Fixes crashes on + incorrect documents + - Do not use exit(1) on DCTStream errors + - Detect form fields at any depth level + - Do not generate appearance stream for radio buttons that are not active + + -- Ondřej Surý Wed, 14 Nov 2007 11:20:07 +0100 + +poppler (0.6.1-2) unstable; urgency=low + + * Upload to unstable. + + -- Ondřej Surý Tue, 06 Nov 2007 09:07:10 +0100 + +poppler (0.6.1-1) experimental; urgency=low + + * New upstream version. + * Changes since 0.6.0: + - poppler core: + + Fix printing with different x and y scale + + Fix crash when Form Fields array contains references to non + existent objects + + Fix crash in CairoOutputDev::drawMaskedImage() + + Fix embedded file description not working on some cases + - Qt4 frontend: + + Fix printing issue + + Avoid double free + + Fix memory leak when dealing with embedded files + - glib frontend: + + Fix build with --disable-cairo-output + + Do not return unknown field type for signature form fields + - build system: + + Support automake-1.10 + + More compatible sh code in qt.m4 + - utils: + + Fix build on Sun Studio compiler + + -- Ondřej Surý Thu, 25 Oct 2007 11:33:04 +0200 + +poppler (0.6-1) experimental; urgency=low + + * New upstream release. (Closes: #429700) + - merged changes from Ubuntu, courtesy of Sebastien Bacher + - Fix security issue MOAB-06-01-2007 + - Fix security issue CVE-2007-3387 + - Fix security issue CVE-2007-5049 (Closes: #443903) + * debian/watch: + - update (Closes: #441012) + * debian/control, debian/libpoppler2.install, debian/libpoppler-glib2.install, + debian/libpoppler-qt2.install, debian/libpoppler-qt4-2.install, + debian/rules: + - updated for soname change + * debian/libpoppler-glib-dev.install: + - install new test-poppler-glib + * debian/patches/002_CVE-2006-0301.patch: + - dropped, deprecated by the upstream changes + * debian/patches/003_glib-2.0-configure.patch: + * debian/patches/004_CVE-2007-0104.patch: + * debian/patches/005_fix_inverted_text_from_bug_8944.patch: + - dropped, fixed with the new version + * debian/patches/006_pthreads_ldflags.patch: + - updated + + -- Ondřej Surý Thu, 27 Sep 2007 09:03:33 +0200 + +poppler (0.5.4-6) unstable; urgency=low + + * Conflict with old library names from experimental. (Closes: #426023) + + -- Ondřej Surý Wed, 30 May 2007 08:42:32 +0200 + +poppler (0.5.4-5) unstable; urgency=low + + * Add missing poppler/poppler-link-qt3.h header to libpoppler-qt-dev; thanks + Sune Vuorela; closes: #425486. + * Let libpoppler-qt4-dev depend on libpoppler-qt-dev since some of its + headers require poppler-page-transition.h which is clearly from the Qt + bindings; thanks Sune Vuorela; closes: #425540. + * Wrap build-deps and deps. + * Drop useless debian/*.dirs. + * Misc cleanups. + * Build-dep on autotools-dev and drop bogus lintian overrides. + + -- Loic Minier Thu, 24 May 2007 23:09:23 +0200 + +poppler (0.5.4-4) unstable; urgency=low + + * The "Augean Stables" release. + * 0.5.x branch fixes all kind of displaying errors + Closes: #372169, #235360, #331380, #332426, #336616 + Closes: #402647, #369164, #413953, #343654 + * Add versioned conflict to pdftohtml (Closes: #393169) + * We dropped .la files some time ago, libjpeg62-dev dependency not + needed now (Closes: #413112) + * Crash fixed in 0.5.4 (Closes: #418638) + * [control.in]: dropped some time ago (Closes: #407818) + * NMU 0.5.4-5.1 merged as 004_CVE-2007-0104.patch (Closes: #407810) + * 0.5.x uploaded to unstable (Closes: #352522) + * qt4 libraries are now part of build (Closes: #414643) + * No longer depends on poppler-data (Closes: #389753) + * [debian/patches/006_pthreads_ldflags.patch]: + + Add -lpthread to poppler/Makefile.am (Closes: #399275) + + -- Ondřej Surý Wed, 16 May 2007 10:45:39 +0200 + +poppler (0.5.4-3) unstable; urgency=low + + * Upload to unstable. + * Enable Cairo output again. + * Enable gtk-doc build. + * Add lintian override for outdated-autotools-helper-files (we use CDBS). + * Change shared library packages names according to Library Packaging Guide. + * Change ${Source-Version} to ${binary:Version} to allow binNMU + * Drop (= ${Source-Version}) dependency in glib, qt3, qt4 libraries; we are + adding that from debian/rules + * Merge changes from Ubuntu: + + Enable Qt4 library build (but change name to libpoppler-qt4-1). + + [debian/patches/004_CVE-2007-0104.patch]: + - Limit recursion depth of the parsing tree to 100 to avoid infinite loop + with crafted documents. + - Patch taken from koffice security update (which has a copy of xpdf + sources). + + [debian/patches/005_fix_inverted_text_from_bug_8944.patch]: + - fixes "text is inverted in some PDFs" + + -- Ondřej Surý Wed, 16 May 2007 08:26:47 +0200 + +poppler (0.5.4-2) experimental; urgency=low + + * [debian/control]: poppler-data is non-free, do not depend on it (Closes: #389753) + + -- Ondřej Surý Mon, 2 Oct 2006 14:41:58 +0200 + +poppler (0.5.4-1) experimental; urgency=low + + * New upstrem release. + * [debian/control.in]: remove file and add all pkg-freedesktop people + to Uploaders: field + * [debian/control]: Add dependency on poppler-data package. + * [debian/patches/03_glib-2.0-configure.patch]: fix broken configure.ac + + -- Ondřej Surý Fri, 22 Sep 2006 16:49:17 +0200 + +poppler (0.5.3-1) experimental; urgency=low + + * New upstream release. + * debian/lib{poppler,poppler-glib,poppler-qt}-dev.install: + Stop shipping /usr/lib/*.la in libpoppler*-dev. + + -- Ondřej Surý Wed, 31 May 2006 17:19:34 +0200 + +poppler (0.5.2-1) experimental; urgency=low + + * New upstream release. + * Remove patches adopted upstream: + debian/patches/000_incorrect_define_fix.patch + debian/patches/000_splash_build_fix.patch + + -- Ondřej Surý Tue, 23 May 2006 20:21:30 +0200 + +poppler (0.5.1-1) experimental; urgency=low + + * Merge back changes from Ubuntu. + * Upload to experimental (Closes: 352522) + + -- Ondřej Surý Tue, 18 Apr 2006 15:08:26 +0200 + +poppler (0.5.1-0ubuntu6) dapper; urgency=low + + * Install poppler-page-transition into libpoppler-qt-dev (not + libpoppler-dev), since it comes from the Qt bindings. Closes: LP#32179 + + -- Martin Pitt Mon, 10 Apr 2006 12:20:46 +0200 + +poppler (0.5.1-0ubuntu5) dapper; urgency=low + + * debian/patches/000_incorrect_define_fix.patch: + - patch from the CVS, fix an incorrect boxes rendering (Ubuntu: #33239) + + -- Sebastien Bacher Thu, 23 Mar 2006 12:33:17 +0100 + +poppler (0.5.1-0ubuntu4) dapper; urgency=low + + * debian/control.in: libpoppler-dev needs to depend on libfontconfig1-dev, + because we directly include in GlobalParams.h + + -- Adam Conrad Thu, 16 Mar 2006 11:23:00 +1100 + +poppler (0.5.1-0ubuntu3) dapper; urgency=low + + * debian/control.in: Have poppler-utils Replace: xpdf-reader, since both + contain pdftoppm.1.gz. + + -- Martin Pitt Mon, 13 Mar 2006 09:10:12 +0100 + +poppler (0.5.1-0ubuntu2) dapper; urgency=low + + * debian/control.in: + - fix the libpoppler1 package description + + -- Sebastien Bacher Thu, 9 Mar 2006 09:43:15 +0000 + +poppler (0.5.1-0ubuntu1) dapper; urgency=low + + * New upstream version: + - Support for embedded files. + - Handle 0-width lines correctly. + - Avoid external file use when opening fonts. + - Only use vector fonts returned from fontconfig (#5758). + - Fix scaled 1x1 pixmaps use for drawing lines (#3387). + - drawSoftMaskedImage support in cairo backend. + - Misc bug fixes: #5922, #5946, #5749, #5952, #4030, #5420. + * debian/control.in, debian/libpoppler0c2.dirs, + debian/libpoppler0c2-glib.dirs, debian/libpoppler0c2-glib.install, + debian/libpoppler0c2.install, debian/libpoppler0c2-qt.dirs, + debian/libpoppler0c2-qt.install, debian/rules: + - updated for the soname change + * debian/patches/000_splash_build_fix.patch: + - fix build when using splash + * debian/patches/001_fixes_for_fonts_selection.patch: + - fix with the new version + + -- Sebastien Bacher Mon, 6 Mar 2006 18:42:44 +0000 + +poppler (0.5.0-0ubuntu5) dapper; urgency=low + + * debian/control.in, debian/rules: + - build without libcairo + + -- Sebastien Bacher Sun, 26 Feb 2006 20:05:10 +0100 + +poppler (0.5.0-0ubuntu4) dapper; urgency=low + + * debian/patches/001_fixes_for_fonts_selection.patch: + - change from the CVS, fix some renderings issues and fonts selection + + -- Sebastien Bacher Tue, 7 Feb 2006 13:38:04 +0100 + +poppler (0.5.0-0ubuntu3) dapper; urgency=low + + * SECURITY UPDATE: Buffer overflow. + * Add debian/patches/002_CVE-2006-0301.patch: + - splash/Splash.cc, Splash::drawPixel(), Splash::drawSpan(), + Splash::xorSpan(): Check coordinates for integer overflow. + * CVE-2006-0301 + + -- Martin Pitt Fri, 3 Feb 2006 18:13:30 +0000 + +poppler (0.5.0-0ubuntu2) dapper; urgency=low + + * debian/rules: Bump shlibs version to 0.5.0. + + -- Martin Pitt Fri, 20 Jan 2006 16:56:40 +0100 + +poppler (0.5.0-0ubuntu1) dapper; urgency=low + + * New upstream release 0.5.0, required for new evince 0.5. + * Merge with Debian. + * Remove patches adopted upstream: + - debian/patches/000_add-poppler-utils.patch + - debian/patches/002-selection-crash-bug.patch + * debian/libpoppler-dev.install: + - Install poppler-page-transition.h. + - Do not install poppler-config.h, it doesn't exist any more. + - Upstream doesn't install legacy xpdf includes any more, fix path to + install them into libpoppler-dev. + * Add debian/patches/001_jpxstream_int_crash.patch: + - poppler/JPXStream.h: Fix declaration of cbW to be signed. + JPXStream.cc, readCodeBlockData() negates the value, which results in an + invalid value on 64 bit platforms if using unsigned types. + - Thanks to Vladimir Nadvornik for pointing at this. + + -- Martin Pitt Thu, 19 Jan 2006 23:49:52 +0100 + +poppler (0.4.4-1) unstable; urgency=high + + * New upstream security release + - fixes CVE-2005-3624, CVE-2005-3625, CVE-2005-3627 + * Remove debian/patches/003-CVE-2005-3624_5_7.patch: + - Merged upstream + * Remove debian/patches/004-fix-CVE-2005-3192.patch: + - Merged upstream + * Remove debian/patches/001-relibtoolize.patch + - Upstream uses recent libtool + + -- Ondřej Surý Thu, 12 Jan 2006 20:40:27 +0100 + +poppler (0.4.3-3) unstable; urgency=low + + * Fix missing libcairo2-dev dependency (Closes: #346277) + + -- Ondřej Surý Fri, 6 Jan 2006 21:37:10 +0100 + +poppler (0.4.3-2) unstable; urgency=high + + [ Martin Pitt ] + * SECURITY UPDATE: Multiple integer/buffer overflows. + * Add debian/patches/003-CVE-2005-3624_5_7.patch: + - poppler/Stream.cc, CCITTFaxStream::CCITTFaxStream(): + + Check columns for negative or large values. + + CVE-2005-3624 + - poppler/Stream.cc, numComps checks introduced in CVE-2005-3191 patch: + + Reset numComps to 0 since it's a global variable that is used later. + + CVE-2005-3627 + - poppler/Stream.cc, DCTStream::readHuffmanTables(): + + Fix out of bounds array access in Huffman tables. + + CVE-2005-3627 + - poppler/Stream.cc, DCTStream::readMarker(): + + Check for EOF in while loop to prevent endless loops. + + CVE-2005-3625 + - poppler/JBIG2Stream.cc, JBIG2Bitmap::JBIG2Bitmap(), + JBIG2Bitmap::expand(), JBIG2Stream::readHalftoneRegionSeg(): + + Check user supplied width and height against invalid values. + + Allocate one extra byte to prevent out of bounds access in combine(). + * Add debian/patches/004-fix-CVE-2005-3192.patch: + - Fix nVals int overflow check in StreamPredictor::StreamPredictor(). + - Forwarded upstream to https://bugs.freedesktop.org/show_bug.cgi?id=5514. + + [ Ondřej Surý ] + * Merge changes from Ubuntu (Closes: #346076). + * Enable Cairo output again. + + -- Ondřej Surý Thu, 5 Jan 2006 14:54:44 +0100 + +poppler (0.4.3-1) unstable; urgency=high + + * New upstream release. + * New maintainer (Closes: #344738) + * CVE-2005-3191 and CAN-2005-2097 fixes merged upstream. + * Fixed some rendering bugs and disabled Cairo output + (Closes: #314556, #322964, #328211) + * Acknowledge NMU (Closes: #342288) + * Add 001-selection-crash-bug.patch (Closes: #330544) + * Add poppler-utils (merge patch from Ubuntu) + + -- Ondřej Surý Fri, 30 Dec 2005 11:34:07 +0100 + +poppler (0.4.2-1.1) unstable; urgency=high + + * SECURITY UPDATE: Multiple integer/buffer overflows. + + * NMU to fix RC security bug (closes: #342288) + * Add debian/patches/04_CVE-2005-3191_2_3.patch taken from Ubuntu, + thanks to Martin Pitt: + * poppler/Stream.cc, DCTStream::readBaselineSOF(), + DCTStream::readProgressiveSOF(), DCTStream::readScanInfo(): + - Check numComps for invalid values. + - http://www.idefense.com/application/poi/display?id=342&type=vulnerabilities + - CVE-2005-3191 + * poppler/Stream.cc, StreamPredictor::StreamPredictor(): + - Check rowBytes for invalid values. + - http://www.idefense.com/application/poi/display?id=344&type=vulnerabilities + - CVE-2005-3192 + * poppler/JPXStream.cc, JPXStream::readCodestream(): + - Check img.nXTiles * img.nYTiles for integer overflow. + - http://www.idefense.com/application/poi/display?id=345&type=vulnerabilities + - CVE-2005-3193 + + -- Frank Küster Fri, 23 Dec 2005 16:36:30 +0100 + +poppler (0.4.2-1) unstable; urgency=low + + * GNOME Team upload. + * New upstream version. + * debian/control.in: + - updated the Build-Depends on libqt (Closes: #326130). + * debian/rules: + - updated the shlibs. + + -- Sebastien Bacher Wed, 7 Sep 2005 12:41:48 +0200 + +poppler (0.4.0-1) unstable; urgency=low + + * GNOME Team Upload. + * Rebuild for the CPP transition. + * New upstream version (Closes: #311133): + - fix some crashers (Closes: #315590, #312261, #309410). + - fix some rendering defaults (Closes: #314441, #315383, #309697, #308785). + * debian/control.in, debian/rules: + - build with the current cairo version (Closes: #321368, #318293). + - update for the renamed the packages. + * debian/patches/01_CAN-2005-2097.patch: + - Patch from Ubuntu, thanks Martin Pitt. + - Check sanity of the TrueType "loca" table. Specially crafted broken + tables caused disk space exhaustion due to very large generated glyph + descriptions when attempting to fix the table. + - Upstream patch scheduled for xpdf 3.01. + - CAN-2005-2097 + * debian/watch: + - fixed, patch by Jerome Warnier (Closes: #310996). + + -- Sebastien Bacher Wed, 17 Aug 2005 21:54:07 +0200 + +poppler (0.3.1-1) unstable; urgency=low + + * New upstream release + * Upstream fixed the Qt build bug, so now I can enable Qt + build. (Closes:#307340) It leads two new binary packages + libpoppler0-qt and libpoppler-qt-dev. + * Excluded DEB_CONFIGURE_SYSCONFDIR setting, which is obsolete by the + upstream removal of xpdfrc config. + + -- Changwoo Ryu Wed, 4 May 2005 00:19:35 +0900 + +poppler (0.3.0-2) unstable; urgency=high + + * Added shlib version info for libpoppler0-glib. + * Corrected dependencies of libpoppler0-glib and libpoppler-glib-dev. + (Closes: #306897) + * Build-Depends on libgtk2.0-dev for -glib packages. (Closes: #306885) + * Corrected descriptions of -glib packages. + + -- Changwoo Ryu Thu, 28 Apr 2005 02:41:25 +0900 + +poppler (0.3.0-1) unstable; urgency=low + + * New upstream release (Closes: #306573) + * Added new binary packages libpoppler0-glib and libpoppler-glib-dev, + which are GLib-based interfaces. Qt interface build is termporarily + disabled, because of an upstream FTBFS. + + -- Changwoo Ryu Thu, 28 Apr 2005 02:07:23 +0900 + +poppler (0.1.2-1) unstable; urgency=low + + * Initial Release (Closes: #299518) + + -- Changwoo Ryu Tue, 15 Mar 2005 02:08:00 +0900 --- poppler-0.12.0.orig/debian/libpoppler-qt2.install +++ poppler-0.12.0/debian/libpoppler-qt2.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libpoppler-qt.so.* --- poppler-0.12.0.orig/debian/libpoppler5.install +++ poppler-0.12.0/debian/libpoppler5.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libpoppler.so.* --- poppler-0.12.0.orig/debian/libpoppler-glib-dev.links +++ poppler-0.12.0/debian/libpoppler-glib-dev.links @@ -0,0 +1 @@ +usr/share/doc/libpoppler-glib-dev/html/poppler usr/share/gtk-doc/html/poppler --- poppler-0.12.0.orig/debian/libpoppler-glib-dev.install +++ poppler-0.12.0/debian/libpoppler-glib-dev.install @@ -0,0 +1,6 @@ +debian/tmp/usr/share/gtk-doc/html/poppler/ usr/share/doc/libpoppler-glib-dev/html/ +debian/tmp/usr/include/poppler/glib/ +debian/tmp/usr/lib/libpoppler-glib.a +debian/tmp/usr/lib/libpoppler-glib.so +debian/tmp/usr/lib/pkgconfig/poppler-glib.pc +glib/.libs/test-poppler-glib usr/lib/poppler --- poppler-0.12.0.orig/debian/control +++ poppler-0.12.0/debian/control @@ -0,0 +1,155 @@ +Source: poppler +Section: devel +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Loic Minier +Uploaders: Josselin Mouette , + Dave Beckett , + Ross Burton +Build-Depends: cdbs (>= 0.4.52), + debhelper (>= 5), + autotools-dev, + gnome-pkg-tools, + libglib2.0-dev (>= 2.6), + libgtk2.0-dev (>= 2.12), + libfontconfig1-dev, + libqt3-mt-dev (>= 3:3.3.4-4), + libqt4-dev (>= 4.3.0), + libcairo2-dev (>= 1.8.4), + libjpeg-dev, + libfreetype6-dev, + libpng12-dev, liblcms1-dev, + libxml2-dev, + gtk-doc-tools (>= 1.0), + pkg-config (>= 0.18), + libglib2.0-doc +Standards-Version: 3.8.1 + +Package: libpoppler5 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: PDF rendering library + Poppler is a PDF rendering library based on xpdf PDF viewer. + . + This package contains the shared library. + +Package: libpoppler-dev +Architecture: any +Section: libdevel +Depends: libpoppler5 (= ${binary:Version}), + libfontconfig1-dev, + ${shlibs:Depends}, + ${misc:Depends} +Description: PDF rendering library -- development files + Poppler is a PDF rendering library based on xpdf PDF viewer. + . + This package contains the headers and development libraries needed to + build applications using Poppler. + +Package: libpoppler-glib4 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: PDF rendering library (GLib-based shared library) + Poppler is a PDF rendering library based on xpdf PDF viewer. + . + This package provides the GLib-based shared library for applications + using the GLib interface to Poppler. + +Package: libpoppler-glib-dev +Architecture: any +Section: libdevel +Depends: libpoppler-glib4 (= ${binary:Version}), + libpoppler-dev (= ${binary:Version}), + libglib2.0-dev (>= 2.6), + libpango1.0-dev, + libcairo2-dev (>= 1.4), + ${shlibs:Depends}, + ${misc:Depends} +Description: PDF rendering library -- development files (GLib interface) + Poppler is a PDF rendering library based on xpdf PDF viewer. + . + This package provides a GLib-style interface to Poppler. + +Package: libpoppler-qt2 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: PDF rendering library (Qt 3 based shared library) + Poppler is a PDF rendering library based on xpdf PDF viewer. + . + This package provides the Qt 3 based shared library for applications + using the Qt 3 interface to Poppler. + +Package: libpoppler-qt-dev +Architecture: any +Section: libdevel +Depends: libpoppler-qt2 (= ${binary:Version}), + libpoppler-dev (= ${binary:Version}), + libqt3-mt-dev, + ${shlibs:Depends}, + ${misc:Depends} +Description: PDF rendering library -- development files (Qt 3 interface) + Poppler is a PDF rendering library based on xpdf PDF viewer. + . + This package provides a Qt 3 style interface to Poppler. + +Package: libpoppler-qt4-3 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: PDF rendering library (Qt 4 based shared library) + Poppler is a PDF rendering library based on xpdf PDF viewer. + . + This package provides the Qt 4 based shared library for applications + using the Qt 4 interface to Poppler. + +Package: libpoppler-qt4-dev +Architecture: any +Section: libdevel +Depends: libpoppler-qt4-3 (= ${binary:Version}), + libpoppler-dev (= ${binary:Version}), + libqt4-dev, + ${shlibs:Depends}, + ${misc:Depends} +Description: PDF rendering library -- development files (Qt 4 interface) + Poppler is a PDF rendering library based on xpdf PDF viewer. + . + This package provides a Qt 4 style interface to Poppler. + +Package: poppler-utils +Architecture: any +Section: utils +Depends: ${shlibs:Depends}, + ${misc:Depends} +Recommends: ghostscript +Conflicts: xpdf-utils, + pdftohtml (<< 0.36-14) +Replaces: xpdf-utils, + pdftohtml, + xpdf-reader +Provides: xpdf-utils, + pdftohtml +Description: PDF utilitites (based on libpoppler) + This package contains pdftops (PDF to PostScript converter), pdfinfo + (PDF document information extractor), pdfimages (PDF image extractor), + pdftohtml (PDF to HTML converter), pdftotext (PDF to text converter), + and pdffonts (PDF font analyzer). + +Package: poppler-dbg +Architecture: any +Section: debug +Priority: extra +Depends: ${misc:Depends}, + libpoppler5 (= ${binary:Version}), + ${shlibs:Depends} +Description: PDF rendering library - detached debugging symbols + Poppler is a PDF rendering library based on xpdf PDF viewer. + . + This package contains the detached debugging symbols. + --- poppler-0.12.0.orig/debian/libpoppler-qt4-dev.install +++ poppler-0.12.0/debian/libpoppler-qt4-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/include/poppler/qt4 +debian/tmp/usr/lib/libpoppler-qt4.a +debian/tmp/usr/lib/libpoppler-qt4.so +debian/tmp/usr/lib/pkgconfig/poppler-qt4.pc --- poppler-0.12.0.orig/debian/libpoppler-dev.install +++ poppler-0.12.0/debian/libpoppler-dev.install @@ -0,0 +1,9 @@ +poppler/*.h usr/include/poppler/ +goo/*.h usr/include/poppler/goo/ +splash/*.h usr/include/poppler/splash/ +fofi/*.h usr/include/poppler/fofi/ +debian/tmp/usr/lib/libpoppler.a +debian/tmp/usr/lib/libpoppler.so +debian/tmp/usr/lib/pkgconfig/poppler.pc +debian/tmp/usr/lib/pkgconfig/poppler-splash.pc +debian/tmp/usr/lib/pkgconfig/poppler-cairo.pc --- poppler-0.12.0.orig/debian/watch +++ poppler-0.12.0/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://poppler.freedesktop.org/ poppler-([0-9.]*)\.tar\.gz debian uupdate --- poppler-0.12.0.orig/debian/copyright +++ poppler-0.12.0/debian/copyright @@ -0,0 +1,27 @@ +This package was debianized by Changwoo Ryu . + +It was downloaded from http://poppler.freedesktop.org + +Copyright: + Copyright (C) 1996-2003 Glyph & Cog, LLC + +Upstream Author: + Kristian Høgsberg + +License: + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. --- poppler-0.12.0.orig/debian/libpoppler-glib4.install +++ poppler-0.12.0/debian/libpoppler-glib4.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libpoppler-glib.so.* --- poppler-0.12.0.orig/debian/docs +++ poppler-0.12.0/debian/docs @@ -0,0 +1,5 @@ +AUTHORS +NEWS +README +README-XPDF +TODO --- poppler-0.12.0.orig/debian/libpoppler-qt-dev.install +++ poppler-0.12.0/debian/libpoppler-qt-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/include/poppler/qt3 +debian/tmp/usr/lib/libpoppler-qt.a +debian/tmp/usr/lib/libpoppler-qt.so +debian/tmp/usr/lib/pkgconfig/poppler-qt.pc --- poppler-0.12.0.orig/debian/poppler-utils.install +++ poppler-0.12.0/debian/poppler-utils.install @@ -0,0 +1,2 @@ +debian/tmp/usr/bin/ +debian/tmp/usr/share/man/man1/ --- poppler-0.12.0.orig/debian/rules +++ poppler-0.12.0/debian/rules @@ -0,0 +1,31 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/autotools.mk + +# use qt4's moc as the default moc is qt3's when both are installed +PATH := /usr/share/qt4/bin:$(PATH) +export PATH + +# a trick to fix xpdfrc location without modifying autotools stuff +DEB_CONFIGURE_SYSCONFDIR := /etc/xpdf + +# disable gtk stuff to minimize Build-Depends +DEB_CONFIGURE_EXTRA_FLAGS += \ + --enable-libjpeg \ + --disable-openjpeg \ + --enable-splash-output \ + --enable-cairo-output \ + --enable-poppler-glib \ + --enable-poppler-qt \ + --enable-poppler-qt4 \ + --enable-a4-paper \ + --enable-gtk-doc \ + --disable-gtk-test + +DEB_DH_MAKESHLIBS_ARGS_libpoppler5 += -V"libpoppler5" +DEB_DH_MAKESHLIBS_ARGS_libpoppler-glib4 += -V"libpoppler-glib4" +DEB_DH_MAKESHLIBS_ARGS_libpoppler-qt2 += -V"libpoppler-qt2 (>= 0.6)" +DEB_DH_MAKESHLIBS_ARGS_libpoppler-qt4-3 += -V"libpoppler-qt4-3 (>= 0.10)" + --- poppler-0.12.0.orig/debian/compat +++ poppler-0.12.0/debian/compat @@ -0,0 +1 @@ +5 --- poppler-0.12.0.orig/debian/patches/poppler-glib-0.11.2-hinting.patch +++ poppler-0.12.0/debian/patches/poppler-glib-0.11.2-hinting.patch @@ -0,0 +1,352 @@ +diff -Naur poppler-0.11.2/poppler/CairoFont.cc poppler-0.11.2.new/poppler/CairoFont.cc +--- poppler-0.11.2/poppler/CairoFont.cc 1970-01-01 01:00:00.000000000 +0100 ++++ poppler-0.11.2.new/poppler/CairoFont.cc 2009-08-13 22:26:52.406878646 +0200 +@@ -0,0 +1,193 @@ ++// #include "config.h" ++ ++#include "CairoFont.h" ++ ++#include ++ ++#include ++#include ++ ++#ifdef POPPLER_WITH_GDK ++static int ++parse_boolean (const char *v) ++{ ++ char c0, c1; ++ ++ c0 = *v; ++ if (c0 == 't' || c0 == 'T' || c0 == 'y' || c0 == 'Y' || c0 == '1') ++ return 1; ++ if (c0 == 'f' || c0 == 'F' || c0 == 'n' || c0 == 'N' || c0 == '0') ++ return 0; ++ if (c0 == 'o') ++ { ++ c1 = v[1]; ++ if (c1 == 'n' || c1 == 'N') ++ return 1; ++ if (c1 == 'f' || c1 == 'F') ++ return 0; ++ } ++ ++ return -1; ++} ++ ++static int ++get_boolean_default (Display *dpy, const char *option, cairo_bool_t *value) ++{ ++ char *v; ++ int i; ++ ++ v = XGetDefault (dpy, "Xft", option); ++ if (v) ++ { ++ i = parse_boolean (v); ++ if (i >= 0) ++ { ++ *value = i; ++ return TRUE; ++ } ++ } ++ ++ return FALSE; ++} ++ ++static int ++get_integer_default (Display *dpy, const char *option, int *value) ++{ ++ char *v, *e; ++ ++ v = XGetDefault (dpy, "Xft", option); ++ if (v) ++ { ++#if CAIRO_HAS_FT_FONT ++ if (FcNameConstant ((FcChar8 *) v, value)) ++ return TRUE; ++#endif ++ ++ *value = strtol (v, &e, 0); ++ if (e != v) ++ return TRUE; ++ } ++ ++ return FALSE; ++} ++#endif ++ ++int ++cairo_font_set_hinting_options (cairo_font_options_t *options) ++{ ++ int antialias = 0, rgba = FC_RGBA_UNKNOWN, hinting = 0, hint_style = FC_HINT_NONE; ++ ++#ifdef POPPLER_WITH_GDK ++ Display *dpy; ++ ++ dpy = gdk_x11_get_default_xdisplay (); ++ if (!dpy) ++ return -1; ++ ++ if (!get_boolean_default (dpy, "antialias", &antialias)) ++ return -1; ++ ++ if (antialias) ++ { ++ if (!get_integer_default (dpy, "rgba", &rgba)) ++ return -1; ++ ++ if (!get_boolean_default (dpy, "hinting", &hinting)) ++ return -1; ++ ++ if (!get_integer_default (dpy, "hintstyle", &hint_style)) ++ return -1; ++ } ++#else ++ FcConfig *config; ++ FcPattern *pattern; ++ ++ config = FcConfigGetCurrent (); ++ ++ pattern = FcPatternCreate (); ++ if (!pattern) ++ return -1; ++ ++ FcConfigSubstitute (config, pattern, FcMatchFont); ++ FcDefaultSubstitute (pattern); ++ ++ if (FcPatternGetBool (pattern, FC_ANTIALIAS, 0, &antialias) != FcResultMatch) ++ { ++ FcPatternDestroy (pattern); ++ return -1; ++ } ++ ++ if (antialias) ++ { ++ if (FcPatternGetInteger (pattern, FC_RGBA, 0, &rgba) != FcResultMatch) ++ { ++ FcPatternDestroy (pattern); ++ return -1; ++ } ++ ++ if (FcPatternGetBool (pattern, FC_HINTING, 0, &hinting) != FcResultMatch) ++ { ++ FcPatternDestroy (pattern); ++ return -1; ++ } ++ ++ if (FcPatternGetInteger (pattern, FC_HINT_STYLE, 0, &hint_style) != FcResultMatch) ++ { ++ FcPatternDestroy (pattern); ++ return -1; ++ } ++ } ++#endif ++ ++ if (!antialias) ++ cairo_font_options_set_antialias (options, CAIRO_ANTIALIAS_NONE); ++ else ++ { ++ switch (rgba) ++ { ++ case FC_RGBA_RGB: ++ cairo_font_options_set_antialias (options, CAIRO_ANTIALIAS_SUBPIXEL); ++ cairo_font_options_set_subpixel_order (options, CAIRO_SUBPIXEL_ORDER_RGB); ++ break; ++ case FC_RGBA_BGR: ++ cairo_font_options_set_antialias (options, CAIRO_ANTIALIAS_SUBPIXEL); ++ cairo_font_options_set_subpixel_order (options, CAIRO_SUBPIXEL_ORDER_BGR); ++ break; ++ case FC_RGBA_VRGB: ++ cairo_font_options_set_antialias (options, CAIRO_ANTIALIAS_SUBPIXEL); ++ cairo_font_options_set_subpixel_order (options, CAIRO_SUBPIXEL_ORDER_VRGB); ++ break; ++ case FC_RGBA_VBGR: ++ cairo_font_options_set_antialias (options, CAIRO_ANTIALIAS_SUBPIXEL); ++ cairo_font_options_set_subpixel_order (options, CAIRO_SUBPIXEL_ORDER_VBGR); ++ break; ++ default: ++ cairo_font_options_set_antialias (options, CAIRO_ANTIALIAS_GRAY); ++ break; ++ } ++ ++ cairo_font_options_set_lcd_filter (options, CAIRO_LCD_FILTER_FIR5); ++ ++ if (!hinting) ++ hint_style = FC_HINT_NONE; ++ ++ switch (hint_style) ++ { ++ case FC_HINT_SLIGHT: ++ cairo_font_options_set_hint_style (options, CAIRO_HINT_STYLE_SLIGHT); ++ break; ++ case FC_HINT_MEDIUM: ++ cairo_font_options_set_hint_style (options, CAIRO_HINT_STYLE_MEDIUM); ++ break; ++ case FC_HINT_FULL: ++ cairo_font_options_set_hint_style (options, CAIRO_HINT_STYLE_FULL); ++ break; ++ default: ++ cairo_font_options_set_hint_style (options, CAIRO_HINT_STYLE_NONE); ++ break; ++ } ++ } ++ ++ return 0; ++} ++ +diff -Naur poppler-0.11.2/poppler/CairoFontEngine.cc poppler-0.11.2.new/poppler/CairoFontEngine.cc +--- poppler-0.11.2/poppler/CairoFontEngine.cc 2009-07-25 16:35:07.000000000 +0200 ++++ poppler-0.11.2.new/poppler/CairoFontEngine.cc 2009-08-13 22:27:06.314877634 +0200 +@@ -123,7 +123,7 @@ + cairo_matrix_t m; + cairo_matrix_init_identity(&m); + cairo_font_options_t *options = cairo_font_options_create(); +- cairo_font_options_set_hint_style(options, CAIRO_HINT_STYLE_NONE); ++ cairo_font_options_set_hint_style(options, CAIRO_HINT_STYLE_SLIGHT); + cairo_font_options_set_hint_metrics(options, CAIRO_HINT_METRICS_OFF); + cairo_scaled_font_t *scaled_font = cairo_scaled_font_create(cairo_font_face, &m, &m, options); + +@@ -178,7 +178,7 @@ + return gFalse; + + font_face = cairo_ft_font_face_create_for_ft_face (face, +- FT_LOAD_NO_HINTING | ++ FT_LOAD_TARGET_LIGHT | + FT_LOAD_NO_BITMAP); + if (cairo_font_face_set_user_data (font_face, + &_ft_cairo_key, +@@ -325,7 +325,7 @@ + _ft_open_faces = l; + + l->font_face = cairo_ft_font_face_create_for_ft_face (tmpl.face, +- FT_LOAD_NO_HINTING | ++ FT_LOAD_TARGET_LIGHT | + FT_LOAD_NO_BITMAP); + if (cairo_font_face_set_user_data (l->font_face, + &_ft_cairo_key, +diff -Naur poppler-0.11.2/poppler/CairoFont.h poppler-0.11.2.new/poppler/CairoFont.h +--- poppler-0.11.2/poppler/CairoFont.h 1970-01-01 01:00:00.000000000 +0100 ++++ poppler-0.11.2.new/poppler/CairoFont.h 2009-08-13 22:26:52.406878646 +0200 +@@ -0,0 +1,8 @@ ++#ifndef CAIRO_FONT_H ++#define CAIRO_FONT_H ++ ++#include ++ ++int cairo_font_set_hinting_options (cairo_font_options_t *options); ++ ++#endif +diff -Naur poppler-0.11.2/poppler/CairoOutputDev.cc poppler-0.11.2.new/poppler/CairoOutputDev.cc +--- poppler-0.11.2/poppler/CairoOutputDev.cc 2009-07-31 20:23:21.000000000 +0200 ++++ poppler-0.11.2.new/poppler/CairoOutputDev.cc 2009-08-13 22:26:52.406878646 +0200 +@@ -55,6 +55,7 @@ + #include + #include "CairoOutputDev.h" + #include "CairoFontEngine.h" ++#include "CairoFont.h" + //------------------------------------------------------------------------ + + // #define LOG_CAIRO +@@ -176,6 +179,11 @@ + assert(!cairo_shape); + } + if (cairo != NULL) { ++ cairo_font_options_t *options = cairo_font_options_create (); ++ cairo_get_font_options (cairo, options); ++ cairo_font_set_hinting_options (options); ++ cairo_set_font_options (cairo, options); ++ cairo_font_options_destroy (options); + this->cairo = cairo_reference (cairo); + /* save the initial matrix so that we can use it for type3 fonts. */ + //XXX: is this sufficient? could we miss changes to the matrix somehow? +diff -Naur poppler-0.11.2/poppler/Makefile.am poppler-0.11.2.new/poppler/Makefile.am +--- poppler-0.11.2/poppler/Makefile.am 2009-07-12 19:09:18.000000000 +0200 ++++ poppler-0.11.2.new/poppler/Makefile.am 2009-08-13 22:26:52.406878646 +0200 +@@ -47,7 +47,9 @@ + CairoFontEngine.cc \ + CairoFontEngine.h \ + CairoOutputDev.cc \ +- CairoOutputDev.h ++ CairoOutputDev.h \ ++ CairoFont.cc \ ++ CairoFont.h + + endif + +@@ -119,7 +121,8 @@ + $(arthur_includes) \ + $(abiword_includes) \ + $(FREETYPE_CFLAGS) \ +- $(FONTCONFIG_CFLAGS) ++ $(FONTCONFIG_CFLAGS) \ ++ $(GDK_CFLAGS) + + lib_LTLIBRARIES = libpoppler.la + +@@ -141,7 +144,8 @@ + $(FREETYPE_LIBS) \ + $(FONTCONFIG_LIBS) \ + $(PTHREAD_LIBS) \ +- $(win32_libs) ++ $(win32_libs) \ ++ $(GDK_LIBS) + + libpoppler_la_LDFLAGS = -version-info 5:0:0 @create_shared_lib@ + +diff -Naur poppler-0.11.2/poppler/Makefile.in poppler-0.11.2.new/poppler/Makefile.in +--- poppler-0.11.2/poppler/Makefile.in 2009-08-01 17:19:09.000000000 +0200 ++++ poppler-0.11.2.new/poppler/Makefile.in 2009-08-14 19:39:00.546219879 +0200 +@@ -68,9 +79,11 @@ + @BUILD_POPPLER_QT4_TRUE@@BUILD_SPLASH_OUTPUT_TRUE@am_libpoppler_arthur_la_rpath = + libpoppler_cairo_la_LIBADD = + am__libpoppler_cairo_la_SOURCES_DIST = CairoFontEngine.cc \ +- CairoFontEngine.h CairoOutputDev.cc CairoOutputDev.h ++ CairoFontEngine.h CairoOutputDev.cc CairoOutputDev.h \ ++ CairoFont.cc CairoFont.h + @BUILD_CAIRO_OUTPUT_TRUE@am_libpoppler_cairo_la_OBJECTS = \ +-@BUILD_CAIRO_OUTPUT_TRUE@ CairoFontEngine.lo CairoOutputDev.lo ++@BUILD_CAIRO_OUTPUT_TRUE@ CairoFontEngine.lo CairoOutputDev.lo \ ++@BUILD_CAIRO_OUTPUT_TRUE@ CairoFont.lo + libpoppler_cairo_la_OBJECTS = $(am_libpoppler_cairo_la_OBJECTS) + @BUILD_CAIRO_OUTPUT_TRUE@am_libpoppler_cairo_la_rpath = + am__DEPENDENCIES_1 = +@@ -384,7 +388,9 @@ + @BUILD_CAIRO_OUTPUT_TRUE@ CairoFontEngine.cc \ + @BUILD_CAIRO_OUTPUT_TRUE@ CairoFontEngine.h \ + @BUILD_CAIRO_OUTPUT_TRUE@ CairoOutputDev.cc \ +-@BUILD_CAIRO_OUTPUT_TRUE@ CairoOutputDev.h ++@BUILD_CAIRO_OUTPUT_TRUE@ CairoOutputDev.h \ ++@BUILD_CAIRO_OUTPUT_TRUE@ CairoFont.cc \ ++@BUILD_CAIRO_OUTPUT_TRUE@ CairoFont.h + + @BUILD_LIBJPEG_TRUE@libjpeg_sources = \ + @BUILD_LIBJPEG_TRUE@ DCTStream.h \ +@@ -432,7 +438,8 @@ + $(arthur_includes) \ + $(abiword_includes) \ + $(FREETYPE_CFLAGS) \ +- $(FONTCONFIG_CFLAGS) ++ $(FONTCONFIG_CFLAGS) \ ++ $(GDK_CFLAGS) + + lib_LTLIBRARIES = libpoppler.la + noinst_LTLIBRARIES = $(poppler_cairo) \ +@@ -450,7 +457,8 @@ + $(FREETYPE_LIBS) \ + $(FONTCONFIG_LIBS) \ + $(PTHREAD_LIBS) \ +- $(win32_libs) ++ $(win32_libs) \ ++ $(GDK_LIBS) + + libpoppler_la_LDFLAGS = -version-info 5:0:0 @create_shared_lib@ + @ENABLE_XPDF_HEADERS_TRUE@poppler_includedir = $(includedir)/poppler +@@ -686,6 +699,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BuiltinFont.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BuiltinFontTables.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CMap.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CairoFont.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CairoFontEngine.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CairoOutputDev.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Catalog.Plo@am__quote@