From 479e35dafe1f5e4a12215aaddbee21152a14bd3b Mon Sep 17 00:00:00 2001
From: drochner <drochner@pkgsrc.org>
Date: Thu, 15 May 2008 09:15:41 +0000
Subject: pulla patch from upstream CVS which appearently fixes a problem
 reported by Steven M. Bellovin on pkgsrc-users, bump PKGREVISION

---
 print/poppler/Makefile         |  4 +++-
 print/poppler/distinfo         |  3 ++-
 print/poppler/patches/patch-ah | 22 ++++++++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 print/poppler/patches/patch-ah

(limited to 'print')

diff --git a/print/poppler/Makefile b/print/poppler/Makefile
index 058d416e49c..38534e3a6df 100644
--- a/print/poppler/Makefile
+++ b/print/poppler/Makefile
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.27 2008/04/29 19:23:34 drochner Exp $
+# $NetBSD: Makefile,v 1.28 2008/05/15 09:15:41 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
+PKGREVISION=		1
+
 COMMENT=		PDF rendering library
 
 USE_TOOLS+=		gmake
diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index 76515c48c9e..e74a96ed42f 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2008/05/01 13:32:08 xtraeme Exp $
+$NetBSD: distinfo,v 1.27 2008/05/15 09:15:41 drochner Exp $
 
 SHA1 (poppler-0.8.2.tar.gz) = afa4baa4e0b65c9663cddae7b0b3da8efb1c9263
 RMD160 (poppler-0.8.2.tar.gz) = 6593f26070d051c6d5054acc454e15dde97a5203
@@ -6,3 +6,4 @@ Size (poppler-0.8.2.tar.gz) = 1459274 bytes
 SHA1 (patch-aa) = 43c63c16d3a845e394a8eb0c3a321944fcf17615
 SHA1 (patch-ab) = e3d413ec50a098af06cb2efc2fac2042064498dd
 SHA1 (patch-ag) = d1581a1ca40bba34146a4a6f4ee7d38b8f6ff3b7
+SHA1 (patch-ah) = ca50d0d8ef6da70f201cc66b0e797dde904b77e0
diff --git a/print/poppler/patches/patch-ah b/print/poppler/patches/patch-ah
new file mode 100644
index 00000000000..9ae5dd95f08
--- /dev/null
+++ b/print/poppler/patches/patch-ah
@@ -0,0 +1,22 @@
+$NetBSD: patch-ah,v 1.3 2008/05/15 09:15:41 drochner Exp $
+
+--- poppler/Annot.cc.orig	2008-03-26 20:38:52.000000000 +0100
++++ poppler/Annot.cc
+@@ -1735,7 +1735,7 @@ void AnnotWidget::initialize(XRef *xrefA
+   // Only text or choice fields needs to have appearance regenerated
+   // see section 8.6.2 "Variable Text" of PDFReference
+   regen = gFalse;
+-  if (widget->getType () == formText || widget->getType () == formChoice) {
++  if (widget != NULL && (widget->getType () == formText || widget->getType () == formChoice)) {
+     regen = form->getNeedAppearances ();
+   }
+ 
+@@ -2577,7 +2577,7 @@ void AnnotWidget::generateFieldAppearanc
+   int dashLength, ff, quadding, comb, nOptions, topIdx, i, j;
+   GBool modified;
+ 
+-  if (!widget->getField () || !widget->getField ()->getObj ()->isDict ())
++  if (widget == NULL || !widget->getField () || !widget->getField ()->getObj ()->isDict ())
+     return;
+ 
+   field = widget->getField ()->getObj ()->getDict ();
-- 
cgit v1.2.3