Update poppler to 0.18.0.

The qt3 bindings are removed upstream.
The glib library lost the last gdk-pixbuf code. And rename it from
-gtk to -glib.

Thanks to:	pav for a exp-runs
		bapt for double checking the libreoffice ports

9 files changed, 99 insertions, 136 deletions

diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index 5cde3380abc..1595dabaeaa 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	poppler
-PORTVERSION=	0.16.7
+PORTVERSION=	0.18.0
 PORTREVISION?=	0
 CATEGORIES=	graphics print
 MASTER_SITES=	http://poppler.freedesktop.org/
@@ -15,13 +15,13 @@ MASTER_SITES=	http://poppler.freedesktop.org/
 MAINTAINER?=	gnome@FreeBSD.org
 COMMENT?=	A PDF rendering library
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
 		lcms.1:${PORTSDIR}/graphics/lcms
 RUN_DEPENDS=	poppler-data>0:${PORTSDIR}/graphics/poppler-data
 
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack libxml2 ltverhack
 USE_AUTOTOOLS=	libtool
@@ -29,8 +29,9 @@ MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-zlib \
 		--enable-xpdf-headers \
+		--disable-gtk-test \
 		--with-html-dir=${DOCSDIR}
-CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 ${PTHREAD_CFLAGS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .if !defined(SLAVEPORT)
@@ -41,26 +42,17 @@ OPTIONS=	CAIRO "Enable cairo output backend" on \
 .include <bsd.port.options.mk>
 
 .if defined(SLAVEPORT)
-LIB_DEPENDS+=	poppler.13:${PORTSDIR}/graphics/poppler
+LIB_DEPENDS+=	poppler.18:${PORTSDIR}/graphics/poppler
 
-.if ${SLAVEPORT}=="gtk"
+.if ${SLAVEPORT}=="glib"
+BUILD_DEPENDS+=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
 CONFIGURE_ARGS+=--enable-poppler-glib
-USE_GNOME+=	gtk20
+USE_GNOME+=	gnomehier glib20
 BUILD_WRKSRC=	${WRKSRC}/glib
 INSTALL_WRKSRC=	${WRKSRC}/glib
 .else
-CONFIGURE_ARGS+=--disable-poppler-glib \
-		--disable-gdk \
-		--disable-gtk-test
-.endif
-
-.if ${SLAVEPORT}=="qt"
-CONFIGURE_ARGS+=--enable-poppler-qt
-USE_QT_VER+=	3
-BUILD_WRKSRC=	${WRKSRC}/qt
-INSTALL_WRKSRC=	${WRKSRC}/qt
-.else
-CONFIGURE_ARGS+=--disable-poppler-qt
+CONFIGURE_ARGS+=--disable-poppler-glib
 .endif
 
 .if ${SLAVEPORT}=="qt4"
@@ -77,20 +69,21 @@ CONFIGURE_ARGS+=--disable-poppler-qt4
 .endif
 
 .if ${SLAVEPORT}=="utils"
+LIB_DEPENDS+=	poppler-glib.8:${PORTSDIR}/graphics/poppler-glib
 CONFIGURE_ARGS+=--enable-utils
 CONFLICTS=	xpdf-[0-9]*
 BUILD_WRKSRC=	${WRKSRC}/utils
 INSTALL_WRKSRC=	${WRKSRC}/utils
-MAN1=		pdffonts.1 pdfimages.1 pdfinfo.1 \
-		pdftohtml.1  pdftops.1 pdftotext.1 pdftoppm.1
+MAN1=		pdffonts.1 pdfimages.1 pdfinfo.1 pdfseparate.1 pdftocairo.1 \
+		pdftohtml.1  pdftops.1 pdftotext.1 pdftoppm.1 pdfunite.1
 .else
 CONFIGURE_ARGS+=--disable-utils
 .endif
 
 .else
-CONFIGURE_ARGS+=--disable-poppler-glib --disable-poppler-qt \
-		--disable-poppler-qt4 --disable-utils --disable-gdk \
-		--disable-gtk-test
+CONFIGURE_ARGS+=--disable-poppler-glib \
+		--disable-poppler-qt4 \
+		--disable-utils
 
 .if defined(WITHOUT_CAIRO)
 CONFIGURE_ARGS+=--disable-cairo-output
@@ -109,12 +102,6 @@ LIB_DEPENDS+=	openjpeg.2:${PORTSDIR}/graphics/openjpeg
 .endif
 
 post-patch:
-.if defined(SLAVEPORT) && ${SLAVEPORT}=="qt"
-	@${REINPLACE_CMD} -e 's|/usr/local/qt/include|${LOCALBASE}/include|; \
-		s|$$QTDIR|${QT_PREFIX}|; \
-		s|/usr/local/qt/lib|${LOCALBASE}/lib|' \
-		${WRKSRC}/configure
-.endif
 .if defined(SLAVEPORT) && ${SLAVEPORT}=="qt4"
 	@${REINPLACE_CMD} -e 's|MOCQT4=`.*|MOCQT4="${LOCALBASE}/bin/moc-qt4"|' \
 		${WRKSRC}/configure
@@ -122,10 +109,8 @@ post-patch:
 
 post-install:
 .if defined(SLAVEPORT)
-.if ${SLAVEPORT}=="gtk"
+.if ${SLAVEPORT}=="glib"
 	${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc ${PREFIX}/libdata/pkgconfig
-.elif ${SLAVEPORT}=="qt"
-	${INSTALL_DATA} ${WRKSRC}/poppler-qt.pc ${PREFIX}/libdata/pkgconfig
 .elif ${SLAVEPORT}=="qt4"
 	${INSTALL_DATA} ${WRKSRC}/poppler-qt4.pc ${PREFIX}/libdata/pkgconfig
 .endif
diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo
index 24b6b668852..efbd2491d72 100644
--- a/graphics/poppler/distinfo
+++ b/graphics/poppler/distinfo
@@ -1,2 +1,2 @@
-SHA256 (poppler-0.16.7.tar.gz) = fab4e8af2d34d4142a718819fd747d40930b71ef520ee0e6bcc94e2c44f22bcd
-SIZE (poppler-0.16.7.tar.gz) = 1952179
+SHA256 (poppler-0.18.0.tar.gz) = 9019b15ef10a878e607e4088a27fb4967f61cdfada7806d0fee97954f76648e8
+SIZE (poppler-0.18.0.tar.gz) = 1949737
diff --git a/graphics/poppler/files/patch-glib_Makefile.in b/graphics/poppler/files/patch-glib_Makefile.in
index 4afb4b2aa87..3cebc9ce24f 100644
--- a/graphics/poppler/files/patch-glib_Makefile.in
+++ b/graphics/poppler/files/patch-glib_Makefile.in
@@ -1,47 +1,19 @@
---- glib/Makefile.in.orig	2010-08-14 16:50:48.000000000 +0200
-+++ glib/Makefile.in	2010-08-14 16:50:48.000000000 +0200
-@@ -82,7 +82,6 @@
+--- glib/Makefile.in.orig	2011-10-03 23:55:25.000000000 +0200
++++ glib/Makefile.in	2011-10-03 23:56:20.000000000 +0200
+@@ -84,7 +84,6 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
  LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
  libpoppler_glib_la_DEPENDENCIES =  \
 -	$(top_builddir)/poppler/libpoppler.la \
  	$(top_builddir)/poppler/libpoppler-cairo.la \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-@@ -105,8 +104,7 @@
- @BUILD_WITH_GDK_TRUE@	test-poppler-glib.$(OBJEXT)
- test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS)
- @BUILD_WITH_GDK_TRUE@test_poppler_glib_DEPENDENCIES =  \
--@BUILD_WITH_GDK_TRUE@	$(top_builddir)/poppler/libpoppler.la \
--@BUILD_WITH_GDK_TRUE@	libpoppler-glib.la $(am__DEPENDENCIES_1) \
-+@BUILD_WITH_GDK_TRUE@	$(am__DEPENDENCIES_1) \
- @BUILD_WITH_GDK_TRUE@	$(am__DEPENDENCIES_1) \
- @BUILD_WITH_GDK_TRUE@	$(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
-@@ -386,7 +384,7 @@
- top_srcdir = @top_srcdir@
- win32_libs = @win32_libs@
- AM_LDFLAGS = @auto_import_flags@
--SUBDIRS = . reference demo
-+SUBDIRS = . reference
- INCLUDES = \
- 	-DG_LOG_DOMAIN=\"Poppler\"		\
- 	-I$(top_srcdir)				\
-@@ -439,7 +437,7 @@
+ 	$(am__DEPENDENCIES_1)
+@@ -433,7 +432,7 @@ libpoppler_glib_la_SOURCES = \
  	poppler-private.h
  
  libpoppler_glib_la_LIBADD = \
 -	$(top_builddir)/poppler/libpoppler.la		\
-+	-lpoppler	\
++	-lpoppler		\
  	$(top_builddir)/poppler/libpoppler-cairo.la	\
  	$(POPPLER_GLIB_LIBS)				\
- 	$(GDK_LIBS)					\
-@@ -451,7 +449,7 @@
- @BUILD_WITH_GDK_TRUE@       test-poppler-glib.cc
- 
- @BUILD_WITH_GDK_TRUE@test_poppler_glib_LDADD = \
--@BUILD_WITH_GDK_TRUE@	$(top_builddir)/poppler/libpoppler.la	\
-+@BUILD_WITH_GDK_TRUE@	-lpoppler				\
- @BUILD_WITH_GDK_TRUE@	libpoppler-glib.la			\
- @BUILD_WITH_GDK_TRUE@	$(POPPLER_GLIB_LIBS)			\
- @BUILD_WITH_GDK_TRUE@	$(GDK_LIBS)				\
+ 	$(FREETYPE_LIBS)				\
diff --git a/graphics/poppler/files/patch-glib_demo_Makefile.in b/graphics/poppler/files/patch-glib_demo_Makefile.in
new file mode 100644
index 00000000000..4671dc0998e
--- /dev/null
+++ b/graphics/poppler/files/patch-glib_demo_Makefile.in
@@ -0,0 +1,20 @@
+--- glib/demo/Makefile.in.orig	2011-10-04 00:03:29.000000000 +0200
++++ glib/demo/Makefile.in	2011-10-04 00:04:47.000000000 +0200
+@@ -66,7 +66,7 @@ poppler_glib_demo_LDADD = $(LDADD)
+ am__DEPENDENCIES_1 =
+ poppler_glib_demo_DEPENDENCIES =  \
+ 	$(top_builddir)/glib/libpoppler-glib.la \
+-	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1)
++	-lpoppler $(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_$(V))
+ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+ am__v_lt_0 = --silent
+@@ -355,7 +355,7 @@ poppler_glib_demo_SOURCES = \
+ 
+ LDADD = \
+ 	$(top_builddir)/glib/libpoppler-glib.la	\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler	\
+ 	$(GTK_TEST_LIBS)
+ 
+ all: all-am
diff --git a/graphics/poppler/files/patch-poppler_PSOutputDev.cc b/graphics/poppler/files/patch-poppler_PSOutputDev.cc
new file mode 100644
index 00000000000..b345cdbc48d
--- /dev/null
+++ b/graphics/poppler/files/patch-poppler_PSOutputDev.cc
@@ -0,0 +1,11 @@
+--- poppler/PSOutputDev.cc.orig	2011-10-03 23:24:27.000000000 +0200
++++ poppler/PSOutputDev.cc	2011-10-03 23:26:21.000000000 +0200
+@@ -1315,7 +1315,7 @@
+     writePS("%!PS-Adobe-3.0 Resource-Form\n");
+     break;
+   }
+-  writePSFmt("% Produced by poppler pdftops version: {0:s} (http://poppler.freedesktop.org)\n", PACKAGE_VERSION);
++  writePSFmt("%Produced by poppler pdftops version: {0:s} (http://poppler.freedesktop.org)\n", PACKAGE_VERSION);
+   xref->getDocInfo(&info);
+   if (info.isDict() && info.dictLookup("Creator", &obj1)->isString()) {
+     writePS("%%Creator: ");
diff --git a/graphics/poppler/files/patch-poppler_Page.cc b/graphics/poppler/files/patch-poppler_Page.cc
deleted file mode 100644
index 1d0f6329831..00000000000
--- a/graphics/poppler/files/patch-poppler_Page.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- poppler/Page.cc.orig	2008-07-09 17:53:56.000000000 +0200
-+++ poppler/Page.cc	2008-07-09 17:54:49.000000000 +0200
-@@ -230,7 +230,7 @@
- 
- Page::Page(XRef *xrefA, int numA, Dict *pageDict, PageAttrs *attrsA, Form *form) {
-   Object tmp;
--	
-+  pageWidgets =	NULL;
-   ok = gTrue;
-   xref = xrefA;
-   num = numA;
diff --git a/graphics/poppler/files/patch-qt_Makefile.in b/graphics/poppler/files/patch-qt_Makefile.in
deleted file mode 100644
index d872262ea02..00000000000
--- a/graphics/poppler/files/patch-qt_Makefile.in
+++ /dev/null
@@ -1,39 +0,0 @@
---- qt/Makefile.in.orig	2008-03-27 08:17:35.000000000 -0400
-+++ qt/Makefile.in	2008-03-27 08:18:20.000000000 -0400
-@@ -59,8 +59,7 @@
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
--libpoppler_qt_la_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
--	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+libpoppler_qt_la_DEPENDENCIES = 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1)
- am_libpoppler_qt_la_OBJECTS = poppler-document.lo poppler-fontinfo.lo \
- 	poppler-link.lo poppler-page.lo poppler-page-transition.lo
-@@ -71,7 +70,7 @@
- PROGRAMS = $(noinst_PROGRAMS)
- am_test_poppler_qt_OBJECTS = test-poppler-qt.$(OBJEXT)
- test_poppler_qt_OBJECTS = $(am_test_poppler_qt_OBJECTS)
--test_poppler_qt_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-+test_poppler_qt_DEPENDENCIES = \
- 	libpoppler-qt.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
- depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -273,7 +272,7 @@
- 	poppler-private.h
- 
- libpoppler_qt_la_LIBADD = \
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler -lqt-mt			\
- 	$(POPPLER_QT_LIBS)			\
- 	$(FREETYPE_LIBS)			\
- 	$(FONTCONFIG_LIBS)
-@@ -283,7 +282,7 @@
-        test-poppler-qt.cpp
- 
- test_poppler_qt_LDADD = \
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler -lqt-mt			\
- 	libpoppler-qt.la			\
- 	$(POPPLER_QT_LIBS)			\
- 	$(FREETYPE_LIBS)
diff --git a/graphics/poppler/files/patch-utils_Makefile.in b/graphics/poppler/files/patch-utils_Makefile.in
index 94606516664..6407099a16e 100644
--- a/graphics/poppler/files/patch-utils_Makefile.in
+++ b/graphics/poppler/files/patch-utils_Makefile.in
@@ -1,6 +1,6 @@
---- utils/Makefile.in.orig	2011-01-05 13:06:04.000000000 +0100
-+++ utils/Makefile.in	2011-01-05 13:06:26.000000000 +0100
-@@ -64,7 +64,7 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
+--- utils/Makefile.in.orig	2011-10-04 00:18:03.000000000 +0200
++++ utils/Makefile.in	2011-10-04 00:24:39.000000000 +0200
+@@ -65,7 +65,7 @@
  pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
  pdffonts_LDADD = $(LDADD)
  am__DEPENDENCIES_1 =
@@ -9,7 +9,7 @@
  	$(am__DEPENDENCIES_1)
  AM_V_lt = $(am__v_lt_$(V))
  am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-@@ -73,19 +73,19 @@ am_pdfimages_OBJECTS = pdfimages.$(OBJEX
+@@ -74,56 +74,56 @@
  	$(am__objects_1)
  pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
  pdfimages_LDADD = $(LDADD)
@@ -23,16 +23,24 @@
 -pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
 +pdfinfo_DEPENDENCIES = \
  	$(am__DEPENDENCIES_1)
- am__pdftoabw_SOURCES_DIST = pdftoabw.cc parseargs.cc parseargs.h
- @BUILD_ABIWORD_OUTPUT_TRUE@am_pdftoabw_OBJECTS = pdftoabw.$(OBJEXT) \
- @BUILD_ABIWORD_OUTPUT_TRUE@	$(am__objects_1)
- pdftoabw_OBJECTS = $(am_pdftoabw_OBJECTS)
+ am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT) $(am__objects_1)
+ pdfseparate_OBJECTS = $(am_pdfseparate_OBJECTS)
+ pdfseparate_LDADD = $(LDADD)
+-pdfseparate_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdfseparate_DEPENDENCIES = \
+ 	$(am__DEPENDENCIES_1)
+ am__pdftocairo_SOURCES_DIST = pdftocairo.cc parseargs.cc parseargs.h
+ @BUILD_CAIRO_OUTPUT_TRUE@am_pdftocairo_OBJECTS = pdftocairo.$(OBJEXT) \
+ @BUILD_CAIRO_OUTPUT_TRUE@	$(am__objects_1)
+ pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS)
 -am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler.la \
-+am__DEPENDENCIES_2 =  \
++am__DEPENDENCIES_2 = \
  	$(am__DEPENDENCIES_1)
- @BUILD_ABIWORD_OUTPUT_TRUE@pdftoabw_DEPENDENCIES =  \
- @BUILD_ABIWORD_OUTPUT_TRUE@	$(am__DEPENDENCIES_2) \
-@@ -94,25 +94,25 @@ am_pdftohtml_OBJECTS = pdftohtml.$(OBJEX
+-@BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler-cairo.la \
++@BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_DEPENDENCIES = \
+ @BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_2) \
+ @BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_1)
+ am_pdftohtml_OBJECTS = pdftohtml.$(OBJEXT) HtmlFonts.$(OBJEXT) \
  	HtmlLinks.$(OBJEXT) HtmlOutputDev.$(OBJEXT) $(am__objects_1)
  pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
  pdftohtml_LDADD = $(LDADD)
@@ -60,14 +68,29 @@
 -pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
 +pdftotext_DEPENDENCIES = \
  	$(am__DEPENDENCIES_1)
+ am_pdfunite_OBJECTS = pdfunite.$(OBJEXT) $(am__objects_1)
+ pdfunite_OBJECTS = $(am_pdfunite_OBJECTS)
+ pdfunite_LDADD = $(LDADD)
+-pdfunite_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdfunite_DEPENDENCIES = \
+ 	$(am__DEPENDENCIES_1)
  DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
  depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -405,7 +405,7 @@ INCLUDES = \
- 	$(ABIWORD_CFLAGS)
+@@ -409,7 +409,7 @@
+ 	$(CAIRO_CFLAGS)
  
  LDADD = \
 -	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler				\
++	-lpoppler	\
  	$(UTILS_LIBS)				\
  	$(FONTCONFIG_LIBS)
  
+@@ -418,7 +418,7 @@
+ @BUILD_CAIRO_OUTPUT_TRUE@	$(common)
+ 
+ @BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_LDADD = \
+-@BUILD_CAIRO_OUTPUT_TRUE@	$(top_builddir)/poppler/libpoppler-cairo.la \
++@BUILD_CAIRO_OUTPUT_TRUE@	-lpoppler-glib \
+ @BUILD_CAIRO_OUTPUT_TRUE@	$(LDADD) $(CAIRO_LIBS)
+ 
+ @BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_binary = pdftocairo
diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist
index 9ce414c391e..18c37146ede 100644
--- a/graphics/poppler/pkg-plist
+++ b/graphics/poppler/pkg-plist
@@ -65,6 +65,7 @@ include/poppler/UnicodeDecompTables.h
 include/poppler/UnicodeMap.h
 include/poppler/UnicodeMapTables.h
 include/poppler/UnicodeTypeTable.h
+include/poppler/ViewerPreferences.h
 include/poppler/XRef.h
 include/poppler/XpdfPluginAPI.h
 include/poppler/cpp/poppler-document.h
@@ -93,6 +94,7 @@ include/poppler/goo/GooTimer.h
 include/poppler/goo/ImgWriter.h
 include/poppler/goo/JpegWriter.h
 include/poppler/goo/PNGWriter.h
+include/poppler/goo/TiffWriter.h
 include/poppler/goo/gfile.h
 include/poppler/goo/gmem.h
 include/poppler/goo/gstrtod.h
@@ -128,7 +130,7 @@ lib/libpoppler-cpp.so.0
 lib/libpoppler.a
 lib/libpoppler.la
 lib/libpoppler.so
-lib/libpoppler.so.13
+lib/libpoppler.so.18
 %%CAIRO%%libdata/pkgconfig/poppler-cairo.pc
 libdata/pkgconfig/poppler-cpp.pc
 libdata/pkgconfig/poppler-splash.pc