update to 0.8.7

changes:
-Fix regression in Form rendering

4 files changed, 21 insertions, 51 deletions

diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common
index ebfff36efc4..f8bf83ae0ee 100644
--- a/print/poppler/Makefile.common
+++ b/print/poppler/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.19 2008/08/26 17:10:02 drochner Exp $
+# $NetBSD: Makefile.common,v 1.20 2008/09/14 14:17:58 drochner Exp $
 # used by print/poppler/Makefile
 # used by print/poppler-qt4/Makefile
 
-POPPLER_VERS=		0.8.6
+POPPLER_VERS=		0.8.7
 DISTNAME=		poppler-${POPPLER_VERS}
 CATEGORIES=		print
 MASTER_SITES=		http://poppler.freedesktop.org/
diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index d1526e9c6bd..9162c177dfe 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.33 2008/08/26 17:10:02 drochner Exp $
+$NetBSD: distinfo,v 1.34 2008/09/14 14:17:58 drochner Exp $
 
-SHA1 (poppler-0.8.6.tar.gz) = 649714e66751effa1585882e23c24bc35f4945bd
-RMD160 (poppler-0.8.6.tar.gz) = 61abe25f8c5f8496209ae767f12ad5aec6c2a6b1
-Size (poppler-0.8.6.tar.gz) = 1469172 bytes
+SHA1 (poppler-0.8.7.tar.gz) = 01247676ee74b78b86b76169503910f30d6c86c1
+RMD160 (poppler-0.8.7.tar.gz) = ea03cdf88a432e5748988e3576110a2989aa79ec
+Size (poppler-0.8.7.tar.gz) = 1469587 bytes
 SHA1 (patch-aa) = 43c63c16d3a845e394a8eb0c3a321944fcf17615
 SHA1 (patch-ab) = e3d413ec50a098af06cb2efc2fac2042064498dd
 SHA1 (patch-ag) = 258b8bff3d167914539e40c3263d36ce55e2ea01
 SHA1 (patch-ai) = d3d4411092b5c6dd61d3f197c01c3bcdad88cc0e
-SHA1 (patch-aj) = f77f225d209a7a692e3ba4b7dae0c050f739bf5a
+SHA1 (patch-ak) = e64693fc247a634fc58885738e975c8dfc4014b8
diff --git a/print/poppler/patches/patch-aj b/print/poppler/patches/patch-aj
deleted file mode 100644
index 5c63f03f750..00000000000
--- a/print/poppler/patches/patch-aj
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-aj,v 1.5 2008/08/26 17:10:02 drochner Exp $
-
---- poppler/CairoOutputDev.cc.orig	2008-06-28 17:11:01.000000000 +0200
-+++ poppler/CairoOutputDev.cc
-@@ -122,6 +122,8 @@ CairoOutputDev::~CairoOutputDev() {
-   cairo_pattern_destroy (fill_pattern);
-   if (group)
-     cairo_pattern_destroy (group);
-+  if (mask)
-+    cairo_pattern_destroy (mask);
-   if (shape)
-     cairo_pattern_destroy (shape);
- }
-@@ -818,6 +820,8 @@ static uint32_t luminocity(uint32_t x)
- /* XXX: do we need to deal with shape here? */
- void CairoOutputDev::setSoftMask(GfxState * state, double * bbox, GBool alpha,
-                                  Function * transferFunc, GfxColor * backdropColor) {
-+  cairo_pattern_destroy(mask);
-+
-   if (alpha == false) {
-     /* We need to mask according to the luminocity of the group.
-      * So we paint the group to an image surface convert it to a luminocity map
-@@ -855,6 +859,9 @@ void CairoOutputDev::setSoftMask(GfxStat
-     cairo_set_source(maskCtx, group);
-     cairo_paint(maskCtx);
- 
-+    /* XXX status = cairo_status(maskCtx); */
-+    cairo_destroy(maskCtx);
-+
-     /* convert to a luminocity map */
-     uint32_t *source_data = (uint32_t*)cairo_image_surface_get_data(source);
-     /* get stride in units of 32 bits */
-@@ -884,10 +891,8 @@ void CairoOutputDev::setSoftMask(GfxStat
-     cairo_pattern_set_matrix(mask, &patMatrix);
- 
-     cairo_surface_destroy(source);
--    cairo_surface_destroy(pats);
-   } else {
--    cairo_pattern_reference(group);
--    mask = group;
-+    mask = cairo_pattern_reference(group);
-   }
- 
-   popTransparencyGroup();
diff --git a/print/poppler/patches/patch-ak b/print/poppler/patches/patch-ak
new file mode 100644
index 00000000000..a6bf4786b6e
--- /dev/null
+++ b/print/poppler/patches/patch-ak
@@ -0,0 +1,14 @@
+$NetBSD: patch-ak,v 1.3 2008/09/14 14:17:58 drochner Exp $
+
+--- poppler/Annot.cc.orig	2008-09-12 13:49:37.000000000 +0200
++++ poppler/Annot.cc
+@@ -1732,7 +1732,8 @@ void AnnotWidget::initialize(XRef *xrefA
+   Object obj1;
+ 
+   form = catalog->getForm ();
+-  widget = form->findWidgetByRef (ref);
++  if (form) widget = form->findWidgetByRef (ref);
++  else widget = NULL;
+ 
+   // check if field apperances need to be regenerated
+   // Only text or choice fields needs to have appearance regenerated