Update to poppler-0.16.5. Tested with some of my not-so-favorite PDF viewers (evince, epdfview) on amd64. Other ports depending on it still build fine (with some diffs I'll send in a few).
This update breaks the following ports (but I'll send diffs to unbreak them soon): print/apvlv needs a patch to build; text selection doesn't (and didn't) work print/epdfview needs a patch to build print/py-poppler needs a patch to build Other ports depending on it (you may want to test those): editors/gummi editors/texmaker editors/texworks graphics/evince graphics/gimp/stable graphics/inkscape graphics/pdfmod print/poppler-data print/pdfshuffler print/texlive/base textproc/calibre textproc/dblatex textproc/zathura x11/gnome/tracker x11/kde/graphics3 x11/kde/office3 x11/tellico x11/xfce4/tumbler editors/libreoffice ok? Index: Makefile =================================================================== RCS file: /cvs/ports/print/poppler/Makefile,v retrieving revision 1.46 diff -u -p -r1.46 Makefile --- Makefile 20 Mar 2011 20:52:01 -0000 1.46 +++ Makefile 1 Jun 2011 10:27:44 -0000 @@ -5,22 +5,21 @@ COMMENT-main= PDF rendering library COMMENT-qt= qt interface to PDF rendering library COMMENT-qt4= qt4 interface to PDF rendering library -V= 0.14.5 +V= 0.16.5 DISTNAME= poppler-$V CATEGORIES= print PKGNAME-main= poppler-$V -REVISION-main= 2 FULLPKGNAME-qt= poppler-qt-$V FULLPKGNAME-qt4=poppler-qt4-$V -SHARED_LIBS += poppler 9.0 -SHARED_LIBS += poppler-glib 7.0 -SHARED_LIBS += poppler-qt 7.0 -SHARED_LIBS += poppler-qt4 6.0 +SHARED_LIBS += poppler 10.0 +SHARED_LIBS += poppler-glib 8.0 +SHARED_LIBS += poppler-qt 8.0 +SHARED_LIBS += poppler-qt4 7.0 HOMEPAGE= http://poppler.freedesktop.org/ -MAINTAINER= Matthias Kilian <k...@openbsd.org> +MAINTAINER= Matthias Kilian <k...@openbsd.org> # GPLv2 PERMIT_PACKAGE_FTP= Yes @@ -86,6 +85,7 @@ WANTLIB-qt4= ${cWANTLIB} ICE QtCore QtGu CONFIGURE_STYLE=gnu CONFIGURE_ARGS+= --enable-xpdf-headers \ + --disable-introspection \ --disable-poppler-cpp \ --disable-silent-rules \ --enable-utils \ Index: distinfo =================================================================== RCS file: /cvs/ports/print/poppler/distinfo,v retrieving revision 1.14 diff -u -p -r1.14 distinfo --- distinfo 24 Dec 2010 14:02:12 -0000 1.14 +++ distinfo 1 Jun 2011 10:27:44 -0000 @@ -1,5 +1,5 @@ -MD5 (poppler-0.14.5.tar.gz) = 9gA48iKEh28CHynxsaD+HA== -RMD160 (poppler-0.14.5.tar.gz) = gNREGRKwLYl3dAXOA/jhdcTM+p4= -SHA1 (poppler-0.14.5.tar.gz) = 4jsRXk68Bsk3MYaIsGp8azMZoAo= -SHA256 (poppler-0.14.5.tar.gz) = yAUxfEwacIAJiujHwqHBuOLHhIWPwuBJQYeO64FkgUw= -SIZE (poppler-0.14.5.tar.gz) = 1798194 +MD5 (poppler-0.16.5.tar.gz) = K24MJrd6lD3zubsC1nyiNg== +RMD160 (poppler-0.16.5.tar.gz) = 3Si+xkvxkFC6LL3Vpx+jmDcN4ho= +SHA1 (poppler-0.16.5.tar.gz) = KZlOCxvhEQQA2UP5uSFnW6GlLrU= +SHA256 (poppler-0.16.5.tar.gz) = nye5ScDNUu75gWVLjhOs1i4eD5pL3k2Wh22hGthMOdk= +SIZE (poppler-0.16.5.tar.gz) = 1950312 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/print/poppler/patches/patch-configure,v retrieving revision 1.2 diff -u -p -r1.2 patch-configure --- patches/patch-configure 24 Dec 2010 14:02:12 -0000 1.2 +++ patches/patch-configure 1 Jun 2011 10:27:44 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-configure,v 1.2 2010/12/24 14:02:12 kili Exp $ ---- configure.orig Sun Nov 7 17:08:48 2010 -+++ configure Wed Nov 10 12:56:41 2010 -@@ -20802,7 +20802,7 @@ fi +--- configure.orig Mon Mar 28 23:33:11 2011 ++++ configure Mon Apr 25 13:00:42 2011 +@@ -21731,7 +21731,7 @@ fi if test x$enable_poppler_qt4 = xyes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt4 moc" >&5 $as_echo_n "checking for Qt4 moc... " >&6; } Index: patches/patch-poppler_SplashOutputDev_cc =================================================================== RCS file: patches/patch-poppler_SplashOutputDev_cc diff -N patches/patch-poppler_SplashOutputDev_cc --- patches/patch-poppler_SplashOutputDev_cc 3 Mar 2011 21:25:38 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,26 +0,0 @@ -$OpenBSD: patch-poppler_SplashOutputDev_cc,v 1.1 2011/03/03 21:25:38 stsp Exp $ - -Upstream commit 37077aa475d2dee81f87daa05297b201eeb99c87. -Fixes a heap overflow. - ---- poppler/SplashOutputDev.cc.orig Sat Feb 19 15:18:31 2011 -+++ poppler/SplashOutputDev.cc Sat Feb 19 15:19:20 2011 -@@ -2881,14 +2881,14 @@ void SplashOutputDev::beginTransparencyGroup(GfxState - tx = (int)floor(xMin); - if (tx < 0) { - tx = 0; -- } else if (tx > bitmap->getWidth()) { -- tx = bitmap->getWidth(); -+ } else if (tx >= bitmap->getWidth()) { -+ tx = bitmap->getWidth() - 1; - } - ty = (int)floor(yMin); - if (ty < 0) { - ty = 0; -- } else if (ty > bitmap->getHeight()) { -- ty = bitmap->getHeight(); -+ } else if (ty >= bitmap->getHeight()) { -+ ty = bitmap->getHeight() - 1; - } - w = (int)ceil(xMax) - tx + 1; - if (tx + w > bitmap->getWidth()) { Index: patches/patch-poppler_XRef_cc =================================================================== RCS file: /cvs/ports/print/poppler/patches/patch-poppler_XRef_cc,v retrieving revision 1.7 diff -u -p -r1.7 patch-poppler_XRef_cc --- patches/patch-poppler_XRef_cc 9 Oct 2010 08:05:30 -0000 1.7 +++ patches/patch-poppler_XRef_cc 1 Jun 2011 10:27:44 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-poppler_XRef_cc,v 1.7 2010/10/09 08:05:30 kili Exp $ ---- poppler/XRef.cc.orig Mon Jun 14 20:19:46 2010 -+++ poppler/XRef.cc Wed Oct 6 17:22:17 2010 -@@ -926,49 +926,38 @@ void XRef::setEncryption(int permFlagsA, GBool ownerPa +--- poppler/XRef.cc.orig Mon Dec 27 21:44:28 2010 ++++ poppler/XRef.cc Mon Apr 25 13:00:42 2011 +@@ -922,49 +922,38 @@ void XRef::setEncryption(int permFlagsA, GBool ownerPa } GBool XRef::okToPrint(GBool ignoreOwnerPW) { @@ -58,4 +58,4 @@ $OpenBSD: patch-poppler_XRef_cc,v 1.7 20 + return gTrue; } - Object *XRef::fetch(int num, int gen, Object *obj) { + Object *XRef::fetch(int num, int gen, Object *obj, std::set<int> *fetchOriginatorNums) { Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/print/poppler/pkg/PLIST-main,v retrieving revision 1.8 diff -u -p -r1.8 PLIST-main --- pkg/PLIST-main 20 Mar 2011 20:52:01 -0000 1.8 +++ pkg/PLIST-main 1 Jun 2011 10:27:44 -0000 @@ -10,6 +10,7 @@ @comment @bin bin/pdftoppm @comment @bin bin/pdftops @comment @bin bin/pdftotext +@comment @bin bin/poppler-glib-demo include/poppler/ include/poppler/Annot.h include/poppler/Array.h @@ -36,9 +37,11 @@ include/poppler/GfxFont.h include/poppler/GfxState.h include/poppler/GfxState_helpers.h include/poppler/GlobalParams.h +include/poppler/Hints.h include/poppler/JArithmeticDecoder.h include/poppler/JBIG2Stream.h include/poppler/Lexer.h +include/poppler/Linearization.h include/poppler/Link.h include/poppler/LocalPDFDocBuilder.h include/poppler/Movie.h @@ -101,11 +104,11 @@ include/poppler/glib/poppler.h include/poppler/goo/ include/poppler/goo/FixedPoint.h include/poppler/goo/GooHash.h +include/poppler/goo/GooLikely.h include/poppler/goo/GooList.h include/poppler/goo/GooMutex.h include/poppler/goo/GooString.h include/poppler/goo/GooTimer.h -include/poppler/goo/GooVector.h include/poppler/goo/ImgWriter.h include/poppler/goo/JpegWriter.h include/poppler/goo/PNGWriter.h @@ -157,19 +160,27 @@ lib/pkgconfig/poppler.pc share/gtk-doc/ share/gtk-doc/html/ share/gtk-doc/html/poppler/ +share/gtk-doc/html/poppler/PopplerAnnot.html +share/gtk-doc/html/poppler/PopplerAttachment.html +share/gtk-doc/html/poppler/PopplerDocument.html +share/gtk-doc/html/poppler/PopplerFormField.html +share/gtk-doc/html/poppler/PopplerLayer.html +share/gtk-doc/html/poppler/PopplerMedia.html +share/gtk-doc/html/poppler/PopplerMovie.html +share/gtk-doc/html/poppler/PopplerPage.html +share/gtk-doc/html/poppler/annotation-glossary.html +share/gtk-doc/html/poppler/api-index-0-12.html +share/gtk-doc/html/poppler/api-index-0-14.html +share/gtk-doc/html/poppler/api-index-0-16.html +share/gtk-doc/html/poppler/api-index-deprecated.html +share/gtk-doc/html/poppler/api-index-full.html share/gtk-doc/html/poppler/ch01.html share/gtk-doc/html/poppler/home.png share/gtk-doc/html/poppler/index.html share/gtk-doc/html/poppler/index.sgml share/gtk-doc/html/poppler/left.png -share/gtk-doc/html/poppler/poppler-poppler-action.html -share/gtk-doc/html/poppler/poppler-poppler-annot.html -share/gtk-doc/html/poppler/poppler-poppler-document.html -share/gtk-doc/html/poppler/poppler-poppler-enums.html -share/gtk-doc/html/poppler/poppler-poppler-features.html -share/gtk-doc/html/poppler/poppler-poppler-form-field.html -share/gtk-doc/html/poppler/poppler-poppler-layer.html -share/gtk-doc/html/poppler/poppler-poppler-page.html +share/gtk-doc/html/poppler/poppler-PopplerAction.html +share/gtk-doc/html/poppler/poppler-Version-and-Features-Information.html share/gtk-doc/html/poppler/poppler-poppler.html share/gtk-doc/html/poppler/poppler.devhelp share/gtk-doc/html/poppler/poppler.devhelp2
