update to 0.16.3

changes:
-Increase precision in PS output device
-bugfixes
(shlib name changed)

4 files changed, 79 insertions, 6 deletions

diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common
index 23728ee9c91..e09fd00601b 100644
--- a/print/poppler/Makefile.common
+++ b/print/poppler/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.43 2011/01/31 16:55:28 drochner Exp $
+# $NetBSD: Makefile.common,v 1.44 2011/03/09 12:07:11 drochner Exp $
 #
 # used by print/poppler/Makefile
 # used by print/poppler-glib/Makefile
@@ -7,7 +7,7 @@
 # used by print/poppler-qt4/Makefile
 # used by print/poppler-utils/Makefile
 
-POPPLER_VERS=		0.16.2
+POPPLER_VERS=		0.16.3
 DISTNAME=		poppler-${POPPLER_VERS}
 CATEGORIES=		print
 MASTER_SITES=		http://poppler.freedesktop.org/
diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index 3d821facea7..97fc0c7a762 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.67 2011/01/31 16:55:28 drochner Exp $
+$NetBSD: distinfo,v 1.68 2011/03/09 12:07:11 drochner Exp $
 
-SHA1 (poppler-0.16.2.tar.gz) = 1d7bcb7aa5601db4526a309da8cadfc12c686788
-RMD160 (poppler-0.16.2.tar.gz) = 0344c760f1e0c0f53bdaf88952c4a7280fe0de41
-Size (poppler-0.16.2.tar.gz) = 5813608 bytes
+SHA1 (poppler-0.16.3.tar.gz) = 0da87a1c3dc11a2c1e31c5c6603d5479545354bb
+RMD160 (poppler-0.16.3.tar.gz) = fa32924ef23f0eb9e134f8d98ae35ecf2cbf29df
+Size (poppler-0.16.3.tar.gz) = 1948009 bytes
 SHA1 (patch-aa) = b8c24eb7358410069f7ce6ad62576bc288cd55bb
 SHA1 (patch-ab) = 145cd675a46d56455021660b0a732daf4ec52ec2
 SHA1 (patch-ac) = c343775da48a1d86dea1451b74355d117e30f6c5
@@ -10,3 +10,5 @@ SHA1 (patch-ag) = 4b914e85bb08ce83305d20de9c0a3e74d3cabdd2
 SHA1 (patch-ai) = a51dba3fb0e7131873ef82ae5e256fb1d17cee53
 SHA1 (patch-ao) = cf7e0f086522147a91f59b1b26ca510d1971ac74
 SHA1 (patch-aq) = 01e115ca868e0bbd398bade92485d83edbe98d66
+SHA1 (patch-ba) = be7d1d2d6659f815d4a1bc27563e61e09cd8d272
+SHA1 (patch-bb) = 708061bb00dafe05cbaa0ed1ade80c8a9a48667d
diff --git a/print/poppler/patches/patch-ba b/print/poppler/patches/patch-ba
new file mode 100644
index 00000000000..b6d600e511b
--- /dev/null
+++ b/print/poppler/patches/patch-ba
@@ -0,0 +1,33 @@
+$NetBSD: patch-ba,v 1.7 2011/03/09 12:07:12 drochner Exp $
+
+--- poppler/Annot.cc.orig	2011-02-27 10:54:37.000000000 +0000
++++ poppler/Annot.cc
+@@ -790,22 +790,22 @@ AnnotAppearanceCharacs::AnnotAppearanceC
+   }
+   obj1.free();
+ 
+-  if (dict->lookup("CA", &obj1)->isName()) {
+-    normalCaption = new GooString(obj1.getName());
++  if (dict->lookup("CA", &obj1)->isString()) {
++    normalCaption = new GooString(obj1.getString());
+   } else {
+     normalCaption = NULL;
+   }
+   obj1.free();
+ 
+-  if (dict->lookup("RC", &obj1)->isName()) {
+-    rolloverCaption = new GooString(obj1.getName());
++  if (dict->lookup("RC", &obj1)->isString()) {
++    rolloverCaption = new GooString(obj1.getString());
+   } else {
+     rolloverCaption = NULL;
+   }
+   obj1.free();
+ 
+-  if (dict->lookup("AC", &obj1)->isName()) {
+-    alternateCaption = new GooString(obj1.getName());
++  if (dict->lookup("AC", &obj1)->isString()) {
++    alternateCaption = new GooString(obj1.getString());
+   } else {
+     alternateCaption = NULL;
+   }
diff --git a/print/poppler/patches/patch-bb b/print/poppler/patches/patch-bb
new file mode 100644
index 00000000000..746b0fcfe12
--- /dev/null
+++ b/print/poppler/patches/patch-bb
@@ -0,0 +1,38 @@
+$NetBSD: patch-bb,v 1.7 2011/03/09 12:07:12 drochner Exp $
+
+--- qt4/src/poppler-form.cc.orig	2010-12-27 20:44:28.000000000 +0000
++++ qt4/src/poppler-form.cc
+@@ -188,11 +188,29 @@ FormFieldButton::ButtonType FormFieldBut
+ QString FormFieldButton::caption() const
+ {
+   FormWidgetButton* fwb = static_cast<FormWidgetButton*>(m_formData->fm);
+-  // HACK push buttons seems to have a null GooString for the caption
++  QString ret;
+   if (fwb->getButtonType() == formButtonPush)
+-    return QString();
+-
+-  return fwb->getOnStr() ? QString::fromUtf8(fwb->getOnStr()) : QString();
++  {
++    Dict *dict = m_formData->fm->getObj()->getDict();
++    Object obj1;
++    if (dict->lookup("MK", &obj1)->isDict())
++    {
++      AnnotAppearanceCharacs appearCharacs(obj1.getDict());
++      if (appearCharacs.getNormalCaption())
++      {
++        ret = UnicodeParsedString(appearCharacs.getNormalCaption());
++      }
++    }
++    obj1.free();
++  }
++  else
++  {
++    if (const char *str = fwb->getOnStr())
++    {
++      ret = QString::fromUtf8(str);
++    }
++  }
++  return ret;
+ }
+ 
+ bool FormFieldButton::state() const