From 6bd4daa538b0a3ce322a0eced2292a6e0d2aed24 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Mon, 21 Jan 2008 22:52:43 +0000
Subject: [PATCH] fix qt4 plugin compilation.

---
 print/poppler/Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/print/poppler/Makefile b/print/poppler/Makefile
index ed1bae23554..738eb0aed8d 100644
--- a/print/poppler/Makefile
+++ b/print/poppler/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2008/01/04 17:48:37 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2008/01/21 22:52:43 espie Exp $
 
 COMMENT-main=	PDF rendering library
 COMMENT-qt=	qt interface to PDF rendering library
@@ -9,7 +9,7 @@ DISTNAME=	poppler-$V
 CATEGORIES=	print
 PKGNAME-main=	poppler-$V
 FULLPKGNAME-qt=	poppler-qt-$V
-FULLPKGNAME-qt4=poppler-qt4-$V
+FULLPKGNAME-qt4=poppler-qt4-$Vp0
 
 SHARED_LIBS +=	poppler              3.0      # .2.0
 SHARED_LIBS +=	poppler-glib         3.0      # .2.0
@@ -26,6 +26,8 @@ PERMIT_DISTFILES_CDROM=	Yes
 
 MASTER_SITES=	${HOMEPAGE}
 
+QT4INC=
+
 PSEUDO_FLAVORS=no_qt no_qt4
 MULTI_PACKAGES=-main
 FLAVOR?=
@@ -51,10 +53,12 @@ MAKE_FLAGS+=	POPPLER_QT4_CFLAGS='-pthread -I${X11BASE}/include -I${MODQT4_INCDIR
 		qt4_pc_file=poppler-qt4.pc \
 		poppler_arthur=libpoppler-arthur.la \
 		libpoppler_arthur_la_SOURCES="ArthurOutputDev.h ArthurOutputDev.cc" \
+		am_libpoppler_arthur_la_OBJECTS=ArthurOutputDev.lo \
 		arthur_includes='$$(POPPLER_QT4_CXXFLAGS)' \
 		arthur_libs='$$(POPPLER_QT4_LIBS)'
 
 MODULES+=	x11/qt4
+QT4INC=		-I${MODQT4_INCDIR}
 .endif
 
 WANTLIB=	expat freetype fontconfig jpeg m z
@@ -82,7 +86,7 @@ CONFIGURE_ARGS= --enable-xpdf-headers \
 		--disable-utils \
 		--enable-zlib
 
-CONFIGURE_ENV+=	CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
+CONFIGURE_ENV+=	CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include ${QT4INC}" \
 		CFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"