On Tue, Nov 18, 2008 at 10:26:03PM +0100, Matthias Kilian wrote:
> > This is for poppler-qt4, not qt4 (as the subject tmay suggest)
>
> Thanks. I'll care for it when my gtk+2 and qt4 builds are finished.
Here's the complete diff, with additional WANTLIB changes (and all
pkgnames bumped):
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile 28 Oct 2008 12:59:55 -0000 1.21
+++ Makefile 19 Nov 2008 10:33:34 -0000
@@ -7,9 +7,9 @@ COMMENT-qt4= qt4 interface to PDF render
V= 0.10.0
DISTNAME= poppler-$V
CATEGORIES= print
-PKGNAME-main= poppler-$V
-FULLPKGNAME-qt= poppler-qt-$V
-FULLPKGNAME-qt4=poppler-qt4-$V
+PKGNAME-main= poppler-$Vp0
+FULLPKGNAME-qt= poppler-qt-$Vp0
+FULLPKGNAME-qt4=poppler-qt4-$Vp0
SHARED_LIBS += poppler 4.0 # .2.0
SHARED_LIBS += poppler-glib 4.0 # .2.0
@@ -61,7 +61,7 @@ MODULES+= x11/qt4
QT4INC= -I${MODQT4_INCDIR}
.endif
-WANTLIB= expat freetype fontconfig jpeg m pixman-1 z
+WANTLIB= expat freetype fontconfig jpeg m z
MODULES+= devel/gettext
@@ -71,9 +71,9 @@ LIB_DEPENDS-main=${MODGETTEXT_LIB_DEPEND
LIB_DEPENDS-qt= ${MODQT3_LIB_DEPENDS} poppler::print/poppler
LIB_DEPENDS-qt4=QtCore,QtGui,QtXml::x11/qt4 poppler::print/poppler
-WANTLIB-main= ${WANTLIB} Xcursor Xext Xfixes Xi Xinerama Xrandr \
+WANTLIB-main= ${WANTLIB} Xcursor Xext Xfixes Xi Xinerama Xrandr gio-2.0 \
glib-2.0 gmodule-2.0 gobject-2.0 pango-1.0 pangocairo-1.0 \
- pangoft2-1.0 \
+ pangoft2-1.0 pixman-1 \
X11 Xau Xcomposite Xdamage Xdmcp Xrender cairo glitz pcre png
WANTLIB-qt= ${WANTLIB} iconv xml2
WANTLIB-qt4= ${WANTLIB} iconv xml2
Index: pkg/PLIST-qt4
===================================================================
RCS file: /cvs/ports/print/poppler/pkg/PLIST-qt4,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-qt4
--- pkg/PLIST-qt4 7 Dec 2007 19:55:58 -0000 1.2
+++ pkg/PLIST-qt4 19 Nov 2008 10:33:34 -0000
@@ -2,8 +2,11 @@
%%SHARED%%
include/poppler/qt4/
include/poppler/qt4/poppler-annotation.h
+include/poppler/qt4/poppler-export.h
include/poppler/qt4/poppler-form.h
include/poppler/qt4/poppler-link.h
+include/poppler/qt4/poppler-optcontent.h
+include/poppler/qt4/poppler-page-transition-private.h
include/poppler/qt4/poppler-page-transition.h
include/poppler/qt4/poppler-qt4.h
lib/libpoppler-qt4.a
