update to 0.6.1

This switches to the new 0.6 branch which is not source compatible
to 0.5.x.
Most notable changes:
-Merge xpdf 3.02 changes
-Support for Sound objects
-Support for Opening/Closing page actions
-Support for page duration
-Improve PS Tokenizer performance
-Beginning of Interactive Form support
-xpdfrc is no longer used for anything
-Fix security issue MOAB-06-01-2007
-Lots of bugs fixed

6 files changed, 48 insertions, 182 deletions

diff --git a/print/poppler/patches/patch-aa b/print/poppler/patches/patch-aa
index e3d257c4d40..471960fb086 100644
--- a/print/poppler/patches/patch-aa
+++ b/print/poppler/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2006/05/31 18:13:54 drochner Exp $
+$NetBSD: patch-aa,v 1.7 2007/11/03 16:10:38 drochner Exp $
 
---- glib/Makefile.in.orig	2006-05-22 22:15:15.000000000 +0200
+--- glib/Makefile.in.orig	2007-05-30 20:32:26.000000000 +0200
 +++ glib/Makefile.in
 @@ -66,7 +66,7 @@ am__DEPENDENCIES_1 =
  @BUILD_CAIRO_OUTPUT_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler-cairo.la \
@@ -8,10 +8,10 @@ $NetBSD: patch-aa,v 1.6 2006/05/31 18:13:54 drochner Exp $
  libpoppler_glib_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__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_2)
  am__objects_1 = poppler-enums.lo
- am_libpoppler_glib_la_OBJECTS = $(am__objects_1) poppler-action.lo \
-@@ -77,7 +77,7 @@ PROGRAMS = $(noinst_PROGRAMS)
+@@ -78,7 +78,7 @@ PROGRAMS = $(noinst_PROGRAMS)
  am_test_poppler_glib_OBJECTS = test-poppler-glib.$(OBJEXT)
  test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS)
  test_poppler_glib_DEPENDENCIES =  \
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.6 2006/05/31 18:13:54 drochner Exp $
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_2)
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
-@@ -310,7 +310,7 @@ libpoppler_glib_la_SOURCES = \
+@@ -319,7 +319,7 @@ libpoppler_glib_la_SOURCES = \
  	poppler-private.h
  
  libpoppler_glib_la_LIBADD = \
@@ -28,8 +28,8 @@ $NetBSD: patch-aa,v 1.6 2006/05/31 18:13:54 drochner Exp $
 +	$(prefix)/lib/libpoppler.la		\
  	$(POPPLER_GLIB_LIBS)				\
  	$(FREETYPE_LIBS)				\
- 	$(cairo_libs)
-@@ -320,7 +320,7 @@ test_poppler_glib_SOURCES = \
+ 	$(FONTCONFIG_LIBS)				\
+@@ -330,7 +330,7 @@ test_poppler_glib_SOURCES = \
         test-poppler-glib.c
  
  test_poppler_glib_LDADD = \
diff --git a/print/poppler/patches/patch-ab b/print/poppler/patches/patch-ab
index 315175e7132..54d1a99811e 100644
--- a/print/poppler/patches/patch-ab
+++ b/print/poppler/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.6 2006/10/12 14:12:15 drochner Exp $
+$NetBSD: patch-ab,v 1.7 2007/11/03 16:10:39 drochner Exp $
 
---- utils/Makefile.in.orig	2006-09-22 02:54:29.000000000 +0200
+--- utils/Makefile.in.orig	2007-08-15 01:30:09.000000000 +0200
 +++ utils/Makefile.in
 @@ -52,7 +52,7 @@ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h \
@@ -8,32 +8,38 @@ $NetBSD: patch-ab,v 1.6 2006/10/12 14:12:15 drochner Exp $
  CONFIG_CLEAN_FILES =
 -@BUILD_SPLASH_OUTPUT_TRUE@am__EXEEXT_1 = pdftoppm$(EXEEXT)
 +am__EXEEXT_1 = pdftoppm$(EXEEXT)
+ @BUILD_ABIWORD_OUTPUT_TRUE@am__EXEEXT_2 = pdftoabw$(EXEEXT)
  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(bin_PROGRAMS)
-@@ -60,35 +60,35 @@ am__objects_1 = parseargs.$(OBJEXT)
- am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) $(am__objects_1)
+@@ -62,18 +62,18 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
  pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
  pdffonts_LDADD = $(LDADD)
--pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdffonts_DEPENDENCIES = $(prefix)/lib/libpoppler.la
+ am__DEPENDENCIES_1 =
+-pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdffonts_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
+ 	$(am__DEPENDENCIES_1)
  am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
  	$(am__objects_1)
  pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
  pdfimages_LDADD = $(LDADD)
--pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdfimages_DEPENDENCIES = $(prefix)/lib/libpoppler.la
+-pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdfimages_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
+ 	$(am__DEPENDENCIES_1)
  am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) $(am__objects_1)
  pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
  pdfinfo_LDADD = $(LDADD)
--pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdfinfo_DEPENDENCIES = $(prefix)/lib/libpoppler.la
- am_pdftohtml_OBJECTS = pdftohtml.$(OBJEXT) HtmlFonts.$(OBJEXT) \
+-pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdfinfo_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
+ 	$(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
  	HtmlLinks.$(OBJEXT) HtmlOutputDev.$(OBJEXT) $(am__objects_1)
  pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
  pdftohtml_LDADD = $(LDADD)
--pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdftohtml_DEPENDENCIES = $(prefix)/lib/libpoppler.la
+-pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdftohtml_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
+ 	$(am__DEPENDENCIES_1)
  am__pdftoppm_SOURCES_DIST = pdftoppm.cc parseargs.c parseargs.h
 -@BUILD_SPLASH_OUTPUT_TRUE@am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) \
 -@BUILD_SPLASH_OUTPUT_TRUE@	$(am__objects_1)
@@ -41,25 +47,27 @@ $NetBSD: patch-ab,v 1.6 2006/10/12 14:12:15 drochner Exp $
 +	$(am__objects_1)
  pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
  pdftoppm_LDADD = $(LDADD)
--pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdftoppm_DEPENDENCIES = $(prefix)/lib/libpoppler.la
+-pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdftoppm_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
+ 	$(am__DEPENDENCIES_1)
  am_pdftops_OBJECTS = pdftops.$(OBJEXT) $(am__objects_1)
  pdftops_OBJECTS = $(am_pdftops_OBJECTS)
  pdftops_LDADD = $(LDADD)
--pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdftops_DEPENDENCIES = $(prefix)/lib/libpoppler.la
+-pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdftops_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
+ 	$(am__DEPENDENCIES_1)
  am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) $(am__objects_1)
  pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)
  pdftotext_LDADD = $(LDADD)
--pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdftotext_DEPENDENCIES = $(prefix)/lib/libpoppler.la
+-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
  depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -278,12 +278,12 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
+@@ -301,12 +301,12 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
+ win32_libs = @win32_libs@
 -@BUILD_SPLASH_OUTPUT_TRUE@pdftoppm_SOURCES = \
 -@BUILD_SPLASH_OUTPUT_TRUE@	pdftoppm.cc				\
 -@BUILD_SPLASH_OUTPUT_TRUE@	$(common)
@@ -71,17 +79,19 @@ $NetBSD: patch-ab,v 1.6 2006/10/12 14:12:15 drochner Exp $
 -@BUILD_SPLASH_OUTPUT_TRUE@pdftoppm_manpage = pdftoppm.1
 +pdftoppm_binary = pdftoppm
 +pdftoppm_manpage = pdftoppm.1
- INCLUDES = \
- 	-I$(top_srcdir)				\
- 	-I$(top_srcdir)/utils			\
-@@ -291,8 +291,8 @@ INCLUDES = \
- 	$(UTILS_CFLAGS)
+ @BUILD_ABIWORD_OUTPUT_TRUE@pdftoabw_SOURCES = \
+ @BUILD_ABIWORD_OUTPUT_TRUE@	pdftoabw.cc				\
+ @BUILD_ABIWORD_OUTPUT_TRUE@	$(common)
+@@ -321,9 +321,10 @@ INCLUDES = \
+ 	$(ABIWORD_CFLAGS)
  
  LDADD = \
 -	$(top_builddir)/poppler/libpoppler.la	\
--	$(UTILS_LIBS)
 +	$(prefix)/lib/libpoppler.la	\
-+	$(UTILS_LIBS) $(PTHREAD_STUBLIB)
+ 	$(UTILS_LIBS)				\
+-	$(FONTCONFIG_LIBS)
++	$(FONTCONFIG_LIBS) \
++	$(PTHREAD_STUBLIB)
  
  dist_man1_MANS = \
  	pdffonts.1				\
diff --git a/print/poppler/patches/patch-ac b/print/poppler/patches/patch-ac
deleted file mode 100644
index cb48e8a6f78..00000000000
--- a/print/poppler/patches/patch-ac
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2006/10/12 14:12:15 drochner Exp $
-
---- configure.orig	2006-10-12 12:26:10.000000000 +0200
-+++ configure
-@@ -25346,7 +25346,7 @@ if test "x$qt_libdir" != "xno" ; then
-     fi
- fi
- 
--if test "x$have_qt" == "xyes"; then
-+if test "x$have_qt" = "xyes"; then
-     ac_ext=cc
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -25534,7 +25534,7 @@ if test "x$qt_libdir" != "xno" ; then
-     fi
- fi
- 
--if test "x$have_qt" == "xyes"; then
-+if test "x$have_qt" = "xyes"; then
-     ac_ext=cc
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -25754,7 +25754,7 @@ if test "x$qt4_libdir" != "xno" ; then
-     fi
- fi
- 
--if test "x$have_qt4" == "xyes"; then
-+if test "x$have_qt4" = "xyes"; then
-     POPPLER_QT4_CXXFLAGS="-I$qt4_incdir"
-     if test x$windows_qt = xyes; then
- 	POPPLER_QT4_LIBS="-L$qt4_libdir -lQtCore4 -lQtGui4 -lQtXml4"
-@@ -25827,7 +25827,7 @@ if test "x$qt4_libdir" != "xno" ; then
-     fi
- fi
- 
--if test "x$have_qt4" == "xyes"; then
-+if test "x$have_qt4" = "xyes"; then
-     POPPLER_QT4_CXXFLAGS="-I$qt4_incdir"
-     if test x$windows_qt = xyes; then
- 	POPPLER_QT4_LIBS="-L$qt4_libdir -lQtCore4 -lQtGui4 -lQtXml4"
-@@ -25910,7 +25910,7 @@ if test "x$qt4test_libdir" != "xno" ; th
-     fi
- fi
- 
--if test "x$have_qt4testlib" == "xyes"; then
-+if test "x$have_qt4testlib" = "xyes"; then
-     POPPLER_QTTEST_CXXFLAGS="-I$qt4test_incdir"
-     POPPLER_QTTEST_LIBS="-L$qt4test_libdir -lQtTest"
-     enable_poppler_qt4testlib="yes"
diff --git a/print/poppler/patches/patch-ad b/print/poppler/patches/patch-ad
deleted file mode 100644
index dbd1e1933bc..00000000000
--- a/print/poppler/patches/patch-ad
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2007/01/17 15:53:09 drochner Exp $
-
---- poppler/Catalog.cc.orig	2006-09-13 17:10:52.000000000 +0200
-+++ poppler/Catalog.cc
-@@ -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 1000
-+
- //------------------------------------------------------------------------
- // 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 *pagesDic
-     // 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());
diff --git a/print/poppler/patches/patch-ae b/print/poppler/patches/patch-ae
deleted file mode 100644
index 734d7a8adc9..00000000000
--- a/print/poppler/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2007/01/17 15:53:09 drochner Exp $
-
---- poppler/Catalog.h.orig	2006-01-23 15:43:36.000000000 +0100
-+++ poppler/Catalog.h
-@@ -193,7 +193,7 @@ 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);
- };
- 
diff --git a/print/poppler/patches/patch-af b/print/poppler/patches/patch-af
deleted file mode 100644
index 757924ba8df..00000000000
--- a/print/poppler/patches/patch-af
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-af,v 1.1 2007/08/02 14:41:19 drochner Exp $
-
---- poppler/Stream.cc.orig	2007-08-02 10:28:59.000000000 +0200
-+++ poppler/Stream.cc
-@@ -422,12 +422,6 @@ StreamPredictor::StreamPredictor(Stream 
-   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 ||
-@@ -436,7 +430,11 @@ StreamPredictor::StreamPredictor(Stream 
-   }
-   pixBytes = (nComps * nBits + 7) >> 3;
-   rowBytes = ((totalBits + 7) >> 3) + pixBytes;
--  if (rowBytes < 0) {
-+  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);