update to 0.8.0

changes:
* Fix caching of members in the glib frontend causing issues with rendering
* Change glib public api to have a correct naming
* Some better error handling on corner cases
* Check the document stream is seekable when opening it
* Build fixes with autotools and with cmake
* Fix infinite recursion on some malformed documents when consulting the fonts
* Fix possible crash when asking for Movie contents

5 files changed, 112 insertions, 40 deletions

diff --git a/print/poppler/patches/patch-aa b/print/poppler/patches/patch-aa
index 169df5bbd9a..133b3232899 100644
--- a/print/poppler/patches/patch-aa
+++ b/print/poppler/patches/patch-aa
@@ -1,40 +1,40 @@
-$NetBSD: patch-aa,v 1.8 2007/11/28 20:54:37 drochner Exp $
+$NetBSD: patch-aa,v 1.9 2008/04/15 19:57:00 drochner Exp $
 
---- glib/Makefile.in.orig	2007-11-10 13:04:33.000000000 +0100
+--- glib/Makefile.in.orig	2008-03-26 19:40:19.000000000 +0100
 +++ glib/Makefile.in
-@@ -66,7 +66,7 @@ am__DEPENDENCIES_1 =
+@@ -62,7 +62,7 @@ am__DEPENDENCIES_1 =
  @BUILD_CAIRO_OUTPUT_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler-cairo.la \
  @BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_1)
  libpoppler_glib_la_DEPENDENCIES =  \
 -	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \
 +	$(prefix)/lib/libpoppler.la $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_2)
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
  am__objects_1 = poppler-enums.lo
-@@ -78,7 +78,7 @@ PROGRAMS = $(noinst_PROGRAMS)
- am_test_poppler_glib_OBJECTS = test-poppler-glib.$(OBJEXT)
+@@ -79,7 +79,7 @@ am__test_poppler_glib_SOURCES_DIST = tes
+ @BUILD_WITH_GDK_TRUE@	test-poppler-glib.$(OBJEXT)
  test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS)
- test_poppler_glib_DEPENDENCIES =  \
--	$(top_builddir)/poppler/libpoppler.la libpoppler-glib.la \
-+	$(prefix)/lib/libpoppler.la libpoppler-glib.la \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_2)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
-@@ -324,7 +324,7 @@ libpoppler_glib_la_SOURCES = \
+ @BUILD_WITH_GDK_TRUE@test_poppler_glib_DEPENDENCIES =  \
+-@BUILD_WITH_GDK_TRUE@	$(top_builddir)/poppler/libpoppler.la \
++@BUILD_WITH_GDK_TRUE@	$(prefix)/lib/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) \
+@@ -318,7 +318,7 @@ libpoppler_glib_la_SOURCES = \
  	poppler-private.h
  
  libpoppler_glib_la_LIBADD = \
 -	$(top_builddir)/poppler/libpoppler.la		\
 +	$(prefix)/lib/libpoppler.la		\
  	$(POPPLER_GLIB_LIBS)				\
+ 	$(GDK_LIBS)					\
  	$(FREETYPE_LIBS)				\
- 	$(FONTCONFIG_LIBS)				\
-@@ -335,7 +335,7 @@ test_poppler_glib_SOURCES = \
-        test-poppler-glib.cc
+@@ -330,7 +330,7 @@ libpoppler_glib_la_LDFLAGS = -version-in
+ @BUILD_WITH_GDK_TRUE@       test-poppler-glib.cc
  
- test_poppler_glib_LDADD = \
--	$(top_builddir)/poppler/libpoppler.la	\
-+	$(prefix)/lib/libpoppler.la	\
- 	libpoppler-glib.la			\
- 	$(POPPLER_GLIB_LIBS)			\
- 	$(FREETYPE_LIBS)			\
+ @BUILD_WITH_GDK_TRUE@test_poppler_glib_LDADD = \
+-@BUILD_WITH_GDK_TRUE@	$(top_builddir)/poppler/libpoppler.la	\
++@BUILD_WITH_GDK_TRUE@	$(prefix)/lib/libpoppler.la	\
+ @BUILD_WITH_GDK_TRUE@	libpoppler-glib.la			\
+ @BUILD_WITH_GDK_TRUE@	$(POPPLER_GLIB_LIBS)			\
+ @BUILD_WITH_GDK_TRUE@	$(GDK_LIBS)				\
diff --git a/print/poppler/patches/patch-ab b/print/poppler/patches/patch-ab
index 54d1a99811e..de8cded1084 100644
--- a/print/poppler/patches/patch-ab
+++ b/print/poppler/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.7 2007/11/03 16:10:39 drochner Exp $
+$NetBSD: patch-ab,v 1.8 2008/04/15 19:57:00 drochner Exp $
 
---- utils/Makefile.in.orig	2007-08-15 01:30:09.000000000 +0200
+--- utils/Makefile.in.orig	2008-03-26 19:40:20.000000000 +0100
 +++ utils/Makefile.in
-@@ -52,7 +52,7 @@ mkinstalldirs = $(install_sh) -d
+@@ -48,7 +48,7 @@ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h \
  	$(top_builddir)/poppler/poppler-config.h
  CONFIG_CLEAN_FILES =
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.7 2007/11/03 16:10:39 drochner Exp $
  @BUILD_ABIWORD_OUTPUT_TRUE@am__EXEEXT_2 = pdftoabw$(EXEEXT)
  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-@@ -62,18 +62,18 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
+@@ -58,18 +58,18 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
  pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
  pdffonts_LDADD = $(LDADD)
  am__DEPENDENCIES_1 =
@@ -33,7 +33,7 @@ $NetBSD: patch-ab,v 1.7 2007/11/03 16:10:39 drochner Exp $
  	$(am__DEPENDENCIES_1)
  am__pdftoabw_SOURCES_DIST = pdftoabw.cc parseargs.c parseargs.h
  @BUILD_ABIWORD_OUTPUT_TRUE@am_pdftoabw_OBJECTS = pdftoabw.$(OBJEXT) \
-@@ -86,24 +86,24 @@ am_pdftohtml_OBJECTS = pdftohtml.$(OBJEX
+@@ -82,24 +82,24 @@ am_pdftohtml_OBJECTS = pdftohtml.$(OBJEX
  	HtmlLinks.$(OBJEXT) HtmlOutputDev.$(OBJEXT) $(am__objects_1)
  pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
  pdftohtml_LDADD = $(LDADD)
@@ -62,11 +62,11 @@ $NetBSD: patch-ab,v 1.7 2007/11/03 16:10:39 drochner Exp $
 -pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
 +pdftotext_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
  	$(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
  depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -301,12 +301,12 @@ sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+@@ -282,12 +282,12 @@ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
  win32_libs = @win32_libs@
 -@BUILD_SPLASH_OUTPUT_TRUE@pdftoppm_SOURCES = \
 -@BUILD_SPLASH_OUTPUT_TRUE@	pdftoppm.cc				\
@@ -82,7 +82,7 @@ $NetBSD: patch-ab,v 1.7 2007/11/03 16:10:39 drochner Exp $
  @BUILD_ABIWORD_OUTPUT_TRUE@pdftoabw_SOURCES = \
  @BUILD_ABIWORD_OUTPUT_TRUE@	pdftoabw.cc				\
  @BUILD_ABIWORD_OUTPUT_TRUE@	$(common)
-@@ -321,9 +321,10 @@ INCLUDES = \
+@@ -302,9 +302,10 @@ INCLUDES = \
  	$(ABIWORD_CFLAGS)
  
  LDADD = \
diff --git a/print/poppler/patches/patch-ag b/print/poppler/patches/patch-ag
index dd7ac1e5c5b..e20f77b7082 100644
--- a/print/poppler/patches/patch-ag
+++ b/print/poppler/patches/patch-ag
@@ -1,22 +1,31 @@
-$NetBSD: patch-ag,v 1.1 2007/12/12 01:25:18 markd Exp $
+$NetBSD: patch-ag,v 1.2 2008/04/15 19:57:00 drochner Exp $
 
---- qt4/src/Makefile.in.orig	2007-12-09 22:59:10.000000000 +1300
+--- qt4/src/Makefile.in.orig	2008-03-26 19:40:20.000000000 +0100
 +++ qt4/src/Makefile.in
-@@ -66,7 +66,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
+@@ -61,7 +61,7 @@ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
- @BUILD_SPLASH_OUTPUT_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler-arthur.la
  libpoppler_qt4_la_DEPENDENCIES =  \
 -	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \
 +	$(prefix)/lib/libpoppler.la $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+ 	$(am__DEPENDENCIES_1) $(am__append_1)
  am_libpoppler_qt4_la_OBJECTS = poppler-document.lo poppler-page.lo \
  	poppler-fontinfo.lo poppler-embeddedfile.lo poppler-textbox.lo \
-@@ -299,7 +299,7 @@ libpoppler_qt4_la_SOURCES = \
- 	poppler-annotation-private.h		\
+@@ -297,7 +297,7 @@ libpoppler_qt4_la_SOURCES = \
+ 	poppler-export.h			\
  	poppler-private.h
  
 -libpoppler_qt4_la_LIBADD = $(top_builddir)/poppler/libpoppler.la \
 +libpoppler_qt4_la_LIBADD = $(prefix)/lib/libpoppler.la \
  	$(FONTCONFIG_LIBS) $(POPPLER_QT4_LIBS) $(am__append_1)
- libpoppler_qt4_la_LDFLAGS = -version-info 2:0:0
+ libpoppler_qt4_la_LDFLAGS = -version-info 3:0:0
  all: all-am
+@@ -622,7 +622,7 @@ SUFFIXES: .moc
+ 
+ # This rule lets GNU make create any *.moc from the equivalent *.h
+ .h.moc:
+-	moc -i $< -o $@
++	${QTDIR}/bin/moc -i $< -o $@
+ 
+ poppler-optcontent.lo: poppler-optcontent.moc
+ 
diff --git a/print/poppler/patches/patch-ah b/print/poppler/patches/patch-ah
new file mode 100644
index 00000000000..077fe5f63fa
--- /dev/null
+++ b/print/poppler/patches/patch-ah
@@ -0,0 +1,50 @@
+$NetBSD: patch-ah,v 1.1 2008/04/15 19:57:00 drochner Exp $
+
+--- poppler/CairoFontEngine.cc.orig	2008-01-29 23:03:38.000000000 +0100
++++ poppler/CairoFontEngine.cc
+@@ -31,11 +31,10 @@ static void fileWrite(void *stream, char
+ // CairoFont
+ //------------------------------------------------------------------------
+ 
+-static void cairo_font_face_destroy (void *data)
++static void _ft_done_face (void *data)
+ {
+-  CairoFont *font = (CairoFont *) data;
+-
+-  delete font;
++  FT_Face face = (FT_Face) data;
++  FT_Done_Face (face);
+ }
+ 
+ CairoFont *CairoFont::create(GfxFont *gfxFont, XRef *xref, FT_Library lib, GBool useCIDs) {
+@@ -224,16 +223,16 @@ CairoFont *CairoFont::create(GfxFont *gf
+   cairo_font_face = cairo_ft_font_face_create_for_ft_face (face,
+ 							   FT_LOAD_NO_HINTING |
+ 							   FT_LOAD_NO_BITMAP);
+-  if (cairo_font_face == NULL) {
+-    error(-1, "could not create cairo font\n");
++  if (cairo_font_face_status (cairo_font_face)) {
++    error(-1, "could not create cairo font: %s\n", cairo_status_to_string (cairo_font_face_status (cairo_font_face)));
+     goto err2; /* this doesn't do anything, but it looks like we're
+ 		* handling the error */
+   } {
+   CairoFont *ret = new CairoFont(ref, cairo_font_face, face, codeToGID, codeToGIDLen, substitute);
+-  cairo_font_face_set_user_data (cairo_font_face, 
++  cairo_font_face_set_user_data (cairo_font_face,
+ 				 &cairo_font_face_key,
+-				 ret,
+-				 cairo_font_face_destroy);
++				 face,
++				 _ft_done_face);
+ 
+   return ret;
+   }
+@@ -249,7 +248,7 @@ CairoFont::CairoFont(Ref ref, cairo_font
+ 					    codeToGIDLen(codeToGIDLen), substitute(substitute) { }
+ 
+ CairoFont::~CairoFont() {
+-  FT_Done_Face (face);
++  cairo_font_face_destroy (cairo_font_face);
+   gfree(codeToGID);
+ }
+ 
diff --git a/print/poppler/patches/patch-ai b/print/poppler/patches/patch-ai
new file mode 100644
index 00000000000..1b9d515d3d8
--- /dev/null
+++ b/print/poppler/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2008/04/15 19:57:00 drochner Exp $
+
+--- poppler/Gfx.cc.orig	2008-04-15 21:36:33.000000000 +0200
++++ poppler/Gfx.cc
+@@ -3627,7 +3627,7 @@ void Gfx::doImage(Object *ref, Stream *s
+       obj1.free();
+       dict->lookup("CS", &obj1);
+     }
+-    if (obj1.isName()) {
++    if (obj1.isName() && inlineImg) {
+       res->lookupColorSpace(obj1.getName(), &obj2);
+       if (!obj2.isNull()) {
+ 	obj1.free();