On Sat, Nov 10, 2007 at 03:20:41PM +0100, Matthias Kilian wrote: > However, I'm building the newest poppler (0.6.2) right now, so let's > wait some hours.
yttocs (scotty reversed) -- talking of hours and meaning days ;-) But i've an excuse: i've tested this on i3860 with epdfview, kdegraphics, koffice (all of them need some WANTLIB fixes for this), and also with a (yet unfinished) update of evince to version 2.20.1. Please note that this poppler update also contains some security fixes. More tests and comments are welcome. I hope to get diffs for evince ready until tomorrow evening (CET). Ciao, Kili Index: Makefile =================================================================== RCS file: /cvs/ports/print/poppler/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- Makefile 31 Jul 2007 22:22:01 -0000 1.12 +++ Makefile 10 Nov 2007 18:10:55 -0000 @@ -4,17 +4,17 @@ COMMENT-main= PDF rendering library COMMENT-qt= qt interface to PDF rendering library COMMENT-qt4= qt4 interface to PDF rendering library -V= 0.5.4 +V= 0.6.2 DISTNAME= poppler-$V CATEGORIES= print -PKGNAME-main= poppler-$Vp1 -FULLPKGNAME-qt= poppler-qt-$Vp1 -FULLPKGNAME-qt4=poppler-qt4-$Vp0 - -SHARED_LIBS += poppler 2.0 # .1.0 -SHARED_LIBS += poppler-glib 2.0 # .1.0 -SHARED_LIBS += poppler-qt 2.0 # .1.0 -SHARED_LIBS += poppler-qt4 0.0 # .1.0 +PKGNAME-main= poppler-$V +FULLPKGNAME-qt= poppler-qt-$V +FULLPKGNAME-qt4=poppler-qt4-$V + +SHARED_LIBS += poppler 3.0 # .2.0 +SHARED_LIBS += poppler-glib 3.0 # .2.0 +SHARED_LIBS += poppler-qt 3.0 # .2.0 +SHARED_LIBS += poppler-qt4 2.0 # .2.0 HOMEPAGE= http://poppler.freedesktop.org/ @@ -45,7 +45,7 @@ MODULES+= x11/qt3 .endif .if empty(FLAVOR:L:Mno_qt4) MULTI_PACKAGES+=-qt4 -MAKE_FLAGS+= POPPLER_QT4_CXXFLAGS='-pthread -I${X11BASE}/include -I${MODQT4_INCDIR}' \ +MAKE_FLAGS+= POPPLER_QT4_CFLAGS='-pthread -I${X11BASE}/include -I${MODQT4_INCDIR}' \ POPPLER_QT4_LIBS='-pthread -L${MODQT4_LIBDIR} -lQtCore -lQtGui -lQtXml' \ qt4_subdir=qt4 \ qt4_pc_file=poppler-qt4.pc \ @@ -57,19 +57,23 @@ MAKE_FLAGS+= POPPLER_QT4_CXXFLAGS='-pthr MODULES+= x11/qt4 .endif -WANTLIB= X11 Xau Xdmcp Xrender cairo expat freetype fontconfig \ - glitz m png z +WANTLIB= expat freetype fontconfig jpeg m z +MODULES+= devel/gettext + +LIB_DEPENDS-main=${MODGETTEXT_LIB_DEPENDS} \ + gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 \ + xml2::textproc/libxml LIB_DEPENDS-qt= ${MODQT3_LIB_DEPENDS} poppler::print/poppler LIB_DEPENDS-qt4=QtCore,QtGui,QtXml::x11/qt4 poppler::print/poppler -MODULES+= devel/gettext -LIB_DEPENDS-main=${MODGETTEXT_LIB_DEPENDS} \ - gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 WANTLIB-main= ${WANTLIB} Xcursor Xext Xfixes Xi Xinerama Xrandr \ glib-2.0 gmodule-2.0 gobject-2.0 pango-1.0 pangocairo-1.0 \ - pangoft2-1.0 + pangoft2-1.0 \ + X11 Xau Xcomposite Xdamage Xdmcp Xrender cairo glitz pcre png +WANTLIB-qt= ${WANTLIB} iconv xml2 +WANTLIB-qt4= ${WANTLIB} iconv xml2 CONFIGURE_STYLE=gnu CONFIGURE_ARGS= --enable-xpdf-headers \ @@ -78,20 +82,14 @@ CONFIGURE_ARGS= --enable-xpdf-headers \ --disable-utils \ --enable-zlib -CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" +CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ + CFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" FAKE_FLAGS= ${MAKE_FLAGS} DESTDIR=${WRKINST} USE_LIBTOOL= Yes USE_X11= Yes USE_GMAKE= Yes - -# Force installation to avoid PLIST headaches. -.if ${FLAVOR:L:Mno_qt} && ${FLAVOR:L:Mno_qt4} -post-install: - echo ${PREFIX} - ${INSTALL_DATA} ${WRKSRC}/qt/poppler-page-transition.h \ - ${PREFIX}/include/poppler -.endif .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/print/poppler/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo 5 Apr 2007 16:20:19 -0000 1.3 +++ distinfo 10 Nov 2007 18:10:55 -0000 @@ -1,5 +1,5 @@ -MD5 (poppler-0.5.4.tar.gz) = BT/f1wUz7M4aBjU/qUXwYQ== -RMD160 (poppler-0.5.4.tar.gz) = 8oyJsDOIdXBnUF3zxgodh4YmsN0= -SHA1 (poppler-0.5.4.tar.gz) = 7fTk/xfvhqf2Dwl5Sa19tT+iw7E= -SHA256 (poppler-0.5.4.tar.gz) = yg+ICk/wc5Hpm0Q/DnyYYCQd9qaqoye52BGzWNlKKck= -SIZE (poppler-0.5.4.tar.gz) = 1062401 +MD5 (poppler-0.6.2.tar.gz) = mqMkcnf1bU6owEViZTHRmw== +RMD160 (poppler-0.6.2.tar.gz) = 1YLZoi2HVUoiJqpznNN+ZPMUe3M= +SHA1 (poppler-0.6.2.tar.gz) = PjZ8qyuhEL/kLDqxA2WXQQrVkdo= +SHA256 (poppler-0.6.2.tar.gz) = E1K0S/AwNZsL/CQiym2ioQrOElv7dCF15K2X8aFLXhs= +SIZE (poppler-0.6.2.tar.gz) = 1289454 Index: patches/patch-goo_Makefile_in =================================================================== RCS file: patches/patch-goo_Makefile_in diff -N patches/patch-goo_Makefile_in --- patches/patch-goo_Makefile_in 23 Mar 2007 17:49:03 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,35 +0,0 @@ -$OpenBSD: patch-goo_Makefile_in,v 1.3 2007/03/23 17:49:03 kurt Exp $ ---- goo/Makefile.in.orig Thu Sep 21 20:54:22 2006 -+++ goo/Makefile.in Fri Feb 23 18:04:05 2007 -@@ -334,25 +334,25 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ - - .c.o: [EMAIL PROTECTED]@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ [EMAIL PROTECTED]@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ [EMAIL PROTECTED]@ $(COMPILE) -c $< [EMAIL PROTECTED]@ $(CXXCOMPILE) -c $< - - .c.obj: [EMAIL PROTECTED]@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ [EMAIL PROTECTED]@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ [EMAIL PROTECTED]@ $(COMPILE) -c `$(CYGPATH_W) '$<'` [EMAIL PROTECTED]@ $(CXXCOMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: [EMAIL PROTECTED]@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ [EMAIL PROTECTED]@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ [EMAIL PROTECTED]@ $(LTCOMPILE) -c -o $@ $< [EMAIL PROTECTED]@ $(LTCXXCOMPILE) -c -o $@ $< - - .cc.o: - @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ Index: patches/patch-poppler_Catalog_cc =================================================================== RCS file: patches/patch-poppler_Catalog_cc diff -N patches/patch-poppler_Catalog_cc --- patches/patch-poppler_Catalog_cc 31 Jul 2007 22:22:01 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,55 +0,0 @@ -$OpenBSD: patch-poppler_Catalog_cc,v 1.1 2007/07/31 22:22:01 kili Exp $ - -Fix CVE-2007-0104. From poppler CVS, but with a smaller value for -MAX_CALL_DEPTH to avoid crashes. - ---- poppler/Catalog.cc.orig Wed Sep 13 17:10:52 2006 -+++ poppler/Catalog.cc Wed Jul 25 21:00:04 2007 -@@ -26,6 +26,12 @@ - #include "UGooString.h" - #include "Catalog.h" - -+// This define is used to limit the depth of recursive readPageTree calls -+// This is needed because the page tree nodes can reference their parents -+// leaving us in an infinite loop -+// Most sane pdf documents don't have a call depth higher than 10 -+#define MAX_CALL_DEPTH 250 -+ - //------------------------------------------------------------------------ - // Catalog - //------------------------------------------------------------------------ -@@ -75,7 +81,7 @@ Catalog::Catalog(XRef *xrefA) { - pageRefs[i].num = -1; - pageRefs[i].gen = -1; - } -- numPages = readPageTree(pagesDict.getDict(), NULL, 0); -+ numPages = readPageTree(pagesDict.getDict(), NULL, 0, 0); - if (numPages != numPages0) { - error(-1, "Page count in top-level pages object is incorrect"); - } -@@ -217,7 +223,7 @@ GooString *Catalog::readMetadata() { - return s; - } - --int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start) { -+int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start, int callDepth) { - Object kids; - Object kid; - Object kidRef; -@@ -262,9 +268,13 @@ int Catalog::readPageTree(Dict *pagesDict, PageAttrs * - // This should really be isDict("Pages"), but I've seen at least one - // PDF file where the /Type entry is missing. - } else if (kid.isDict()) { -- if ((start = readPageTree(kid.getDict(), attrs1, start)) -- < 0) -- goto err2; -+ if (callDepth > MAX_CALL_DEPTH) { -+ error(-1, "Limit of %d recursive calls reached while reading the page tree. If your document is correct and not a test to try to force a crash, please report a bug.", MAX_CALL_DEPTH); -+ } else { -+ if ((start = readPageTree(kid.getDict(), attrs1, start, callDepth + 1)) -+ < 0) -+ goto err2; -+ } - } else { - error(-1, "Kid object (page %d) is wrong type (%s)", - start+1, kid.getTypeName()); Index: patches/patch-poppler_Catalog_h =================================================================== RCS file: patches/patch-poppler_Catalog_h diff -N patches/patch-poppler_Catalog_h --- patches/patch-poppler_Catalog_h 31 Jul 2007 22:22:01 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-poppler_Catalog_h,v 1.1 2007/07/31 22:22:01 kili Exp $ - -Fix CVE-2007-0104. From poppler CVS. - ---- poppler/Catalog.h.orig Mon Jan 23 15:43:36 2006 -+++ poppler/Catalog.h Wed Jul 25 21:00:04 2007 -@@ -193,7 +193,7 @@ class Catalog { (private) - PageMode pageMode; // page mode - PageLayout pageLayout; // page layout - -- int readPageTree(Dict *pages, PageAttrs *attrs, int start); -+ int readPageTree(Dict *pages, PageAttrs *attrs, int start, int callDepth); - Object *findDestInTree(Object *tree, GooString *name, Object *obj); - }; - Index: patches/patch-poppler_Stream_cc =================================================================== RCS file: patches/patch-poppler_Stream_cc diff -N patches/patch-poppler_Stream_cc --- patches/patch-poppler_Stream_cc 31 Jul 2007 22:22:01 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,34 +0,0 @@ -$OpenBSD: patch-poppler_Stream_cc,v 1.1 2007/07/31 22:22:01 kili Exp $ - -Fix for CVE-2007-3387. - ---- poppler/Stream.cc.orig Fri Jul 28 20:07:41 2006 -+++ poppler/Stream.cc Tue Jul 31 21:39:35 2007 -@@ -422,21 +422,13 @@ StreamPredictor::StreamPredictor(Stream *strA, int pre - ok = gFalse; - - nVals = width * nComps; -- if (width <= 0 || nComps <= 0 || nBits <= 0 || -- nComps >= INT_MAX/nBits || -- width >= INT_MAX/nComps/nBits || -- nVals * nBits + 7 < 0) { -- return; -- } -- totalBits = nVals * nBits; -- if (totalBits == 0 || -- (totalBits / nBits) / nComps != width || -- totalBits + 7 < 0) { -- return; -- } - pixBytes = (nComps * nBits + 7) >> 3; -- rowBytes = ((totalBits + 7) >> 3) + pixBytes; -- if (rowBytes < 0) { -+ rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; -+ if (width <= 0 || nComps <= 0 || nBits <= 0 || -+ nComps > gfxColorMaxComps || -+ nBits > 16 || -+ width >= INT_MAX / nComps || // check for overflow in nVals -+ nVals >= (INT_MAX - 7) / nBits) { // check for overflow in rowBytes - return; - } - predLine = (Guchar *)gmalloc(rowBytes); Index: patches/patch-qt4_Makefile_in =================================================================== RCS file: /cvs/ports/print/poppler/patches/patch-qt4_Makefile_in,v retrieving revision 1.2 diff -u -p -r1.2 patch-qt4_Makefile_in --- patches/patch-qt4_Makefile_in 31 Jul 2007 22:22:01 -0000 1.2 +++ patches/patch-qt4_Makefile_in 10 Nov 2007 18:10:55 -0000 @@ -1,10 +1,10 @@ -$OpenBSD: patch-qt4_Makefile_in,v 1.2 2007/07/31 22:22:01 kili Exp $ ---- qt4/Makefile.in.orig Fri Sep 22 02:54:24 2006 -+++ qt4/Makefile.in Wed Jul 25 20:59:03 2007 -@@ -216,7 +216,7 @@ sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ +$OpenBSD$ +--- qt4/Makefile.in.orig Sat Nov 10 13:04:34 2007 ++++ qt4/Makefile.in Sat Nov 10 17:13:52 2007 +@@ -223,7 +223,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ + win32_libs = @win32_libs@ -SUBDIRS = src tests +SUBDIRS = src all: all-recursive Index: patches/patch-splash_Splash_cc =================================================================== RCS file: patches/patch-splash_Splash_cc diff -N patches/patch-splash_Splash_cc --- patches/patch-splash_Splash_cc 31 Jul 2007 22:22:01 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,43 +0,0 @@ -$OpenBSD: patch-splash_Splash_cc,v 1.1 2007/07/31 22:22:01 kili Exp $ - -Fix CVE-2006-0301. From poppler mailinglist archives (also in the -POPPLER_0_4_X branch, but not merged into 0.5 until the xpdf 3.02 -merge in the "unstable" 0.5.9 release). - ---- splash/Splash.cc.orig Mon Jul 24 21:04:51 2006 -+++ splash/Splash.cc Wed Jul 25 22:48:11 2007 -@@ -950,6 +950,10 @@ void Splash::drawPixel(int x, int y, SplashColorPtr co - int alpha2, ialpha2; - Guchar t; - -+ if ( (unsigned) x >= (unsigned) bitmap->getWidth() || -+ (unsigned) y >= (unsigned) bitmap->getHeight()) -+ return; -+ - if (noClip || state->clip->test(x, y)) { - if (alpha != 1 || softMask || state->blendFunc) { - blendFunc = state->blendFunc ? state->blendFunc : &blendNormal; -@@ -1243,6 +1247,11 @@ void Splash::drawSpan(int x0, int x1, int y, SplashPat - updateModY(y); - } - -+ if ((unsigned) x0 >= (unsigned) bitmap->getWidth() || -+ (unsigned) x1 >= (unsigned) bitmap->getWidth() || -+ (unsigned) y >= (unsigned) bitmap->getHeight()) -+ return; -+ - if (alpha != 1 || softMask || state->blendFunc) { - blendFunc = state->blendFunc ? state->blendFunc : &blendNormal; - if (softMask) { -@@ -1950,6 +1959,11 @@ void Splash::xorSpan(int x0, int x1, int y, SplashPatt - updateModX(x1); - updateModY(y); - } -+ -+ if ((unsigned) x0 >= (unsigned) bitmap->getWidth() || -+ (unsigned) x1 >= (unsigned) bitmap->getWidth() || -+ (unsigned) y >= (unsigned) bitmap->getHeight()) -+ return; - - switch (bitmap->mode) { - case splashModeMono1: Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/print/poppler/pkg/PLIST-main,v retrieving revision 1.2 diff -u -p -r1.2 PLIST-main --- pkg/PLIST-main 24 Mar 2007 13:21:26 -0000 1.2 +++ pkg/PLIST-main 10 Nov 2007 18:10:55 -0000 @@ -1,6 +1,6 @@ @comment $OpenBSD: PLIST-main,v 1.2 2007/03/24 13:21:26 espie Exp $ [EMAIL PROTECTED] print/poppler @conflict poppler-qt-<0.5.4p0 [EMAIL PROTECTED] print/poppler %%SHARED%% include/poppler/ include/poppler/Annot.h @@ -19,6 +19,7 @@ include/poppler/Error.h include/poppler/ErrorCodes.h include/poppler/FontEncodingTables.h include/poppler/FontInfo.h +include/poppler/Form.h include/poppler/Function.cc include/poppler/Function.h include/poppler/Gfx.h @@ -40,14 +41,16 @@ include/poppler/PDFDocEncoding.h include/poppler/PSOutputDev.h include/poppler/PSTokenizer.h include/poppler/Page.h +include/poppler/PageTransition.h include/poppler/Parser.h +include/poppler/PreScanOutputDev.h include/poppler/ProfileData.h include/poppler/SecurityHandler.h +include/poppler/Sound.h include/poppler/SplashOutputDev.h include/poppler/Stream-CCITT.h include/poppler/Stream.h include/poppler/TextOutputDev.h -include/poppler/UGooString.h include/poppler/UTF8.h include/poppler/UnicodeCClassTables.h include/poppler/UnicodeCompTables.h @@ -63,6 +66,7 @@ include/poppler/glib/poppler-attachment. include/poppler/glib/poppler-document.h include/poppler/glib/poppler-enums.h include/poppler/glib/poppler-features.h +include/poppler/glib/poppler-form-field.h include/poppler/glib/poppler-page.h include/poppler/glib/poppler.h include/poppler/goo/ @@ -77,7 +81,6 @@ include/poppler/goo/gfile.h include/poppler/goo/gmem.h include/poppler/goo/gtypes.h include/poppler/poppler-config.h -include/poppler/poppler-page-transition.h include/poppler/splash/ include/poppler/splash/Splash.h include/poppler/splash/SplashBitmap.h @@ -120,8 +123,10 @@ 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-attachment.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-form-field.html share/gtk-doc/html/poppler/poppler-poppler-page.html share/gtk-doc/html/poppler/poppler-poppler.html share/gtk-doc/html/poppler/poppler.devhelp Index: pkg/PLIST-qt =================================================================== RCS file: /cvs/ports/print/poppler/pkg/PLIST-qt,v retrieving revision 1.4 diff -u -p -r1.4 PLIST-qt --- pkg/PLIST-qt 24 Mar 2007 13:21:26 -0000 1.4 +++ pkg/PLIST-qt 10 Nov 2007 18:10:55 -0000 @@ -1,8 +1,10 @@ @comment $OpenBSD: PLIST-qt,v 1.4 2007/03/24 13:21:26 espie Exp $ @conflict poppler-<0.5.4p0 %%SHARED%% -include/poppler/poppler-link-qt3.h -include/poppler/poppler-qt.h +include/poppler/qt3/ +include/poppler/qt3/poppler-link-qt3.h +include/poppler/qt3/poppler-page-transition.h +include/poppler/qt3/poppler-qt.h lib/libpoppler-qt.a lib/libpoppler-qt.la lib/pkgconfig/poppler-qt.pc Index: pkg/PLIST-qt4 =================================================================== RCS file: /cvs/ports/print/poppler/pkg/PLIST-qt4,v retrieving revision 1.1 diff -u -p -r1.1 PLIST-qt4 --- pkg/PLIST-qt4 24 Mar 2007 13:21:26 -0000 1.1 +++ pkg/PLIST-qt4 10 Nov 2007 18:10:55 -0000 @@ -1,8 +1,11 @@ @comment $OpenBSD: PLIST-qt4,v 1.1 2007/03/24 13:21:26 espie Exp $ %%SHARED%% -include/poppler/poppler-annotation.h -include/poppler/poppler-link.h -include/poppler/poppler-qt4.h +include/poppler/qt4/ +include/poppler/qt4/poppler-annotation.h +include/poppler/qt4/poppler-form.h +include/poppler/qt4/poppler-link.h +include/poppler/qt4/poppler-page-transition.h +include/poppler/qt4/poppler-qt4.h lib/libpoppler-qt4.a lib/libpoppler-qt4.la lib/pkgconfig/poppler-qt4.pc