head 1.8; access; symbols pkgsrc-2017Q3:1.7.0.26 pkgsrc-2017Q3-base:1.7 pkgsrc-2017Q2:1.7.0.22 pkgsrc-2017Q2-base:1.7 pkgsrc-2017Q1:1.7.0.20 pkgsrc-2017Q1-base:1.7 pkgsrc-2016Q4:1.7.0.18 pkgsrc-2016Q4-base:1.7 pkgsrc-2016Q3:1.7.0.16 pkgsrc-2016Q3-base:1.7 pkgsrc-2016Q2:1.7.0.14 pkgsrc-2016Q2-base:1.7 pkgsrc-2016Q1:1.7.0.12 pkgsrc-2016Q1-base:1.7 pkgsrc-2015Q4:1.7.0.10 pkgsrc-2015Q4-base:1.7 pkgsrc-2015Q3:1.7.0.8 pkgsrc-2015Q3-base:1.7 pkgsrc-2015Q2:1.7.0.6 pkgsrc-2015Q2-base:1.7 pkgsrc-2015Q1:1.7.0.4 pkgsrc-2015Q1-base:1.7 pkgsrc-2014Q4:1.7.0.2 pkgsrc-2014Q4-base:1.7 pkgsrc-2014Q3:1.6.0.4 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.6.0.2 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.5.0.6 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.4 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.2 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.4.0.8 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.6 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.4 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.2 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.3.0.6 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.4 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.2 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.2.0.2 pkgsrc-2011Q2-base:1.2; locks; strict; comment @# @; 1.8 date 2017.12.08.07.48.11; author spz; state dead; branches; next 1.7; commitid mfKIOzamkmRLN3iA; 1.7 date 2014.11.20.16.03.46; author wiz; state Exp; branches; next 1.6; commitid NlLT9fUn0vZYmWYx; 1.6 date 2014.04.29.07.56.48; author wiz; state Exp; branches; next 1.5; commitid uaKVDDDdpwgogyyx; 1.5 date 2013.07.04.13.13.55; author wiz; state Exp; branches; next 1.4; commitid aljE9Ba5qaXDC9Ww; 1.4 date 2012.07.04.20.25.16; author drochner; state Exp; branches; next 1.3; 1.3 date 2011.10.20.16.32.57; author drochner; state Exp; branches; next 1.2; 1.2 date 2011.01.31.16.55.29; author drochner; state dead; branches; next 1.1; 1.1 date 2011.01.11.12.17.15; author drochner; state Exp; branches; next ; desc @@ 1.8 log @Update poppler packages from 0.59.0 to 0.61.1 fixing CVE-2017-14517 CVE-2017-14518 CVE-2017-14519 CVE-2017-14520 CVE-2017-15565 upstream notable changes: Release 0.61.1 core: * CairoOutputDev: don't overflow y * stride when accessing image data cpp: * Fix for corrupted image files on Windows. Bug #102494 build system: * Fix incorrect paths in .pc files. Bug #103578 * add the custom buildtests target only once. Bug #103003 Release 0.61.0 core: * Fix crashes in broken files * Cleanup unused functions from GlobalParams * Tweak LZWStream::processNextCode error handling. Bug #103174 * Warning fixes * Remove t1lib code qt5: * Clean up the remaining Splash code in Arthur backend. Bug #103117 * ArthurOutputDev: Properly implement saveState/restoreState. Bug #103118 * Fix leak in ArthurOutputDev::updateFont. Bug #103508 build system: * Use GNUInstallDirs. Bug #103211 * mingw: Install pkg-config files * mingw: change library names to include the soversion. Bug #103157 * Fix installing a .cc file as header * Use -pthread flag instead of -lpthread Release 0.60.1 qt5: * ArthurOutputDev: Add missing 'return' in error paths build system: * FindLIBOPENJPEG.cmake: Add CheckCXXSourceCompiles Release 0.60.0 core: * Enable libcurl support by default * PSOutputDev: Fix wrong text generation. Bug #102760 * Added methods to get and set the font size of text fields. Bug #101692 * CairoOutputDev: Do not extend the pattern in drawImageMaskRegular * CairoOutputDev: do not use the custom downscaling for rendering images when using cairo >= 1.14 * Fix build with old clang * Fix various crashes in broken files * Fix some warnings * Add some constness to the basic classes * Remove unused functions from GlobalParams qt5: * Added methods to get and set the font size of text fields. Bug #101692 * Add whether renderToImage shows annotations * ArthurOutputDev: Replace Splash font rendering by Qt font rendering * ArthurOutputDev: Implement the drawSoftMaskedImage method * ArthurOutputDev: Fix several small bugs related to dash pattern handling * Fix two minor typos build system: * cmake is now the default build system * autotools based build system has been removed utils: * pdfinfo: don't truncate dest name @ text @$NetBSD: patch-ar,v 1.7 2014/11/20 16:03:46 wiz Exp $ Use installed poppler library so we can have a separate poppler-cpp package. Do not descend into tests directory to avoid dependency on utils/ directory. --- cpp/Makefile.in.orig 2014-11-04 18:46:21.000000000 +0000 +++ cpp/Makefile.in @@@@ -130,7 +130,7 @@@@ am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = libpoppler_cpp_la_DEPENDENCIES = \ - $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) + $(prefix)/lib/libpoppler.la $(am__DEPENDENCIES_1) am_libpoppler_cpp_la_OBJECTS = libpoppler_cpp_la-poppler-document.lo \ libpoppler_cpp_la-poppler-embedded-file.lo \ libpoppler_cpp_la-poppler-font.lo \ @@@@ -483,7 +483,7 @@@@ top_build_prefix = @@top_build_prefix@@ top_builddir = @@top_builddir@@ top_srcdir = @@top_srcdir@@ win32_libs = @@win32_libs@@ -SUBDIRS = . tests +SUBDIRS = . lib_LTLIBRARIES = libpoppler-cpp.la libpoppler_cpp_includedir = $(includedir)/poppler/cpp libpoppler_cpp_include_HEADERS = \ @@@@ -536,7 +536,7 @@@@ libpoppler_cpp_la_CXXFLAGS = \ -Dpoppler_cpp_EXPORTS libpoppler_cpp_la_LIBADD = \ - $(top_builddir)/poppler/libpoppler.la \ + $(prefix)/lib/libpoppler.la \ $(LIBICONV) libpoppler_cpp_la_LDFLAGS = \ @ 1.7 log @Update poppler to 0.28.1: Release 0.28.0 core: * Fix rendering of file with a wrong embedded font. Bug #84270 * Use alt colorspace to get CMYK values for an ICC based CMYK colorspace. Bug #79019 * Map Standard/Expert encoding ligatures to AGLFN names. Bug #80093 * Make Attribute::getName() work when UTF-16BE is used. Bug #84722 * Fix memory leak in Dict::remove. Bug #84607 * Fix crashes in broken files * SplashOutputDev: Improve Overprintmode and shadings. Bug #80998 * CairoOutputDev: fix crash when no group color space. Bug #85137 * CairoOutputDev: Don't render text when text matrix is not invertable. Bug #78042 * CairoOutputDev: Only embed mime data for gray/rgb/cmyk colorspaces. Bug #80719 * CairoOutputDev: Only embed mime data if image decode map is identity * cairo: Use matrix to determine pattern size. Bug #33364 * Fix compile warnings * regression test improvements glib: * Fix use of uninitialized members in PopplerInputStream. Bug #82630 * Documentation improvements * Do not dist gir_DATA * Remove use of GTK deprecated functions. Bug #82384. Bug #82385 * Build introspection linking to the uninstalled libraries. Big #84526 qt4: * Add a new Page::annotations() that lets you specify subtypes qt5: * Add a new Page::annotations() that lets you specify subtypes utils: * pdfseparate: additional handling for annotations. Bug #77549 * pdfdetach: fix crash when getPage() returns null. Bug #85145 * pdftocairo: Add support for printing to a Windows printer. Bug #79936 build system: * Move automake version check from autogen.sh to configure.ac. Bug #79797 * Makefile.am cleanups. Bug #79411 * Use poppler-data pkg-config * Make autogen.sh work with variables with spaces * Don't use -fPIC on mingw * Fix build with --disable-utils. Bug #84448 @ text @d1 1 a1 1 $NetBSD: patch-ar,v 1.6 2014/04/29 07:56:48 wiz Exp $ @ 1.6 log @Update poppler to 0.26.0. Release 0.26.0 qt4: * Fix mismatched boolean logic in TextAnnotation::setInplaceIntent qt5: * Fix mismatched boolean logic in TextAnnotation::setInplaceIntent core: * Very small code cleanup cpp: * Very small code cleanup Release 0.25.3 core: * Fix crashes on broken files * Avoid MinGW/Cygwin warnings due to redefinition of NOMINMAX * Fix some small memory leaks qt5: * Fix some kinds of OCG models * Cleanup some deprecated methods glib: * Fix the first coord of the quadrilateral in create_poppler_quads_from_annot_quads(). Bug #76504 utils: * pdftohtml: Fix typo in manpage qt4: * Fix some kinds of OCG models Release 0.25.2 core: * Tagged-PDF support * Open some broken files. Bug #75232 * Fix crashes on broken files * Fix regression parsing some broken files. KDE Bug #329600 * Improve compilation under Win 8 with Visual Studio 2012. Bug #73111 * PSOutputDev: Ensure paper size takes into account rotation. Bug #72312 * PSOutputDev: Fix DocumentMedia/Page/Media/PageBBox DSC comments * PSOutputDev: Use crop box as page size * PSOutputDev: Remove origpagesizes mode and make -origpagesizes an alias for -paper match * PSOutputDev: Only change paper size when different to previous size * PSOutputDev: Ensure there is always a page size in the output * PSOutputDev: Fix regression when creating level1 PS. Bug #75241 * CairoOutputDev: Clip to crop box. Gnome Bug #649886 * Splash: Blend usage in PDF with spot colors casue random output. Bug #74883 * Splash: Fix off by one that caused crash in a file. Bug #76387 * Make sure number of least objects in hints table is valid. Bug #74741 * Limit numeric parsing of character names. Bug #38456 glib: * Tagged-PDF support * Annotation improvements * Install error callback. Bug #73269 * Fix gobject-introspection warnings * demo: Fix performance in text markup annotations * Increase gtk3 dependency qt4: * Improve naming of internal export/import macros * Add GCC visibility export attributes * Expose document-supplied text direction qt5: * Improve naming of internal export/import macros * Add GCC visibility export attributes * Expose document-supplied text direction utils: * pdftocairo: Ensure page size and crop box works the same as pdftops * Fix TIFF writting in Windows. Bug #75969 buildsystem: * Learn about automake 1.14 * Do not define -ansi. Bug #72499 * cmake: Install JpegWriter.h depending on libjpeg * cmake: Use c99 for the c compiler Release 0.25.1 core: * GooString format: Added some tests + improved documentation * GooString format: fixed bug with printing LLONG_MIN * regression test improvements qt4: * Arthur backend font rendering improvements * test program to save to file qt5: * Arthur backend font rendering improvements * Improve detection of Qt5 moc. Bug #72744 * test program to save to file utils: * pdfunite: Work even if there's a single file given * pdfunite: do not lose fonts when merging some files Release 0.25.0 core: * Annotation improvements * Tagged PDF work * Improve speed on some files using ICC color space * Use ICC profile in OutputIntents. Bug #34053 * Limit use of ZapfDingbats character names. Bug #60243 * Splash: correction for knockout transparency groups * regression test improvements utils: * pdftoppm: Added thinlinemode option setting * pdfinfo: Indicate if pdf contains javascript * pdfinfo: Add option to print out javascript * pdfimages: Print size, ratio, and ppi * pdfimages: More image output format support * pdfseparate: allow zero-padded pagespecs glib: * Annotation improvements * Add API to get text, text layout and text attributes for a given area * demo improvements @ text @d1 1 a1 1 $NetBSD: patch-ar,v 1.5 2013/07/04 13:13:55 wiz Exp $ d6 4 a9 1 --- cpp/Makefile.in.orig 2014-04-24 22:42:56.000000000 +0000 d20 10 a29 1 @@@@ -537,7 +537,7 @@@@ libpoppler_cpp_la_CXXFLAGS = \ d37 1 a37 1 libpoppler_cpp_la_LDFLAGS = -version-info 2:0:2 @@create_shared_lib@@ @@auto_import_flags@@ @ 1.5 log @Update to 0.22.5. Use "lcms" option instead of package-specific "poppler-cms" one. Add backwards compat for this. Add comments to most patches. Changes: Release 0.22.5 core: * PSOutputDev: Make sure that Title: doesn't contain \n or \r (Bug #63862) * Fix slowlyness reading malformed files (Bug #46703) * Fix infinite loop while feeding wrong data in stdin (Bug #64967) * Fix crash on malformed file (Bug #65221) * Fix mismatched delete (Bug #65553) qt4: * Fix mismatched delete (Bug #65551) utils: * pdftohtml: Fix memory leak @ text @d1 1 a1 1 $NetBSD: patch-ar,v 1.4 2012/07/04 20:25:16 drochner Exp $ d6 1 a6 1 --- cpp/Makefile.in.orig 2011-10-26 12:40:03.000000000 +0000 d8 1 a8 1 @@@@ -79,7 +79,7 @@@@ am__installdirs = "$(DESTDIR)$(libdir)" d14 1 a14 2 am_libpoppler_cpp_la_OBJECTS = libpoppler_cpp_la-PNMWriter.lo \ libpoppler_cpp_la-poppler-document.lo \ d16 2 a17 1 @@@@ -426,7 +426,7 @@@@ libpoppler_cpp_la_CXXFLAGS = \ @ 1.4 log @update to 0.20.1 This switches to the 0.20 release branch - many fixes and improvements. (0.18 was skipped) The qt3 frontend isn't supported anymore - the poppler016 pkg is kept for now for KDE3. Atm, it conflicts with newer popper pkgs. This can be fixed by renaming include paths and libraries, but this would need modifications of the KDE3 pkgs. @ text @d1 4 a4 1 $NetBSD$ @ 1.3 log @build poppler's "cpp" wrapper as a seperate pkg, addresses PR pkg/45498 by Francois Tigeot @ text @d3 1 a3 1 --- cpp/Makefile.in.orig 2011-06-27 18:45:13.000000000 +0000 d11 2 a12 1 am_libpoppler_cpp_la_OBJECTS = libpoppler_cpp_la-poppler-document.lo \ d14 1 a14 2 libpoppler_cpp_la-poppler-font.lo \ @@@@ -430,7 +430,7 @@@@ libpoppler_cpp_la_CXXFLAGS = \ @ 1.2 log @update to 0.16.2 This switches to a new major branch -- many improvements and fixes. @ text @d1 1 a1 1 $NetBSD: patch-ar,v 1.1 2011/01/11 12:17:15 drochner Exp $ d3 13 a15 5 --- poppler/CairoOutputDev.cc.orig 2010-11-02 19:20:36.000000000 +0000 +++ poppler/CairoOutputDev.cc @@@@ -2286,6 +2286,36 @@@@ GBool CairoOutputDev::getStreamData (Str return gTrue; } d17 4 a20 34 +void CairoOutputDev::setMimeData(Stream *str, cairo_surface_t *image) +{ + char *strBuffer; + int len; + Object obj; + + if (!printing || !(str->getKind() == strDCT || str->getKind() == strJPX)) + return; + + // colorspace in stream dict may be different from colorspace in jpx + // data + if (str->getKind() == strJPX) { + GBool hasColorSpace = !str->getDict()->lookup("ColorSpace", &obj)->isNull(); + obj.free(); + if (hasColorSpace) + return; + } + + if (getStreamData (str->getNextStream(), &strBuffer, &len)) { + cairo_status_t st; + st = cairo_surface_set_mime_data (image, + str->getKind() == strDCT ? + CAIRO_MIME_TYPE_JPEG : CAIRO_MIME_TYPE_JP2, + (const unsigned char *)strBuffer, len, + gfree, strBuffer); + if (st) + gfree (strBuffer); + } +} + void CairoOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, @@@@ -2399,23 +2429,7 @@@@ void CairoOutputDev::drawImage(GfxState d22 1 a22 23 cairo_surface_mark_dirty (image); -#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 9, 6) - if (printing && (str->getKind() == strDCT || str->getKind() == strJPX)) { - char *strBuffer; - int len; - - if (getStreamData (str->getNextStream(), &strBuffer, &len)) { - cairo_status_t st; - st = cairo_surface_set_mime_data (image, - str->getKind() == strDCT ? - CAIRO_MIME_TYPE_JPEG : CAIRO_MIME_TYPE_JP2, - (const unsigned char *)strBuffer, len, - gfree, strBuffer); - if (st) - gfree (strBuffer); - } - } -#endif /* CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 9, 6) */ + setMimeData(str, image); pattern = cairo_pattern_create_for_surface (image); cairo_surface_destroy (image); @ 1.1 log @add patch from upstream which fixes a colorspace problem in the glib/cairo frontend (ie pdf generation), bump PKGREV @ text @d1 1 a1 1 $NetBSD$ @