Wed Mar 9 12:07:12 2011 UTC ()
update to 0.16.3
changes:
-Increase precision in PS output device
-bugfixes
(shlib name changed)


(drochner)
diff -r1.43 -r1.44 pkgsrc/print/poppler/Makefile.common
diff -r1.67 -r1.68 pkgsrc/print/poppler/distinfo
diff -r0 -r1.7 pkgsrc/print/poppler/patches/patch-ba
diff -r0 -r1.7 pkgsrc/print/poppler/patches/patch-bb

cvs diff -r1.43 -r1.44 pkgsrc/print/poppler/Makefile.common (expand / switch to unified diff)

--- pkgsrc/print/poppler/Makefile.common 2011/01/31 16:55:28 1.43
+++ pkgsrc/print/poppler/Makefile.common 2011/03/09 12:07:11 1.44
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1# $NetBSD: Makefile.common,v 1.43 2011/01/31 16:55:28 drochner Exp $ 1# $NetBSD: Makefile.common,v 1.44 2011/03/09 12:07:11 drochner Exp $
2# 2#
3# used by print/poppler/Makefile 3# used by print/poppler/Makefile
4# used by print/poppler-glib/Makefile 4# used by print/poppler-glib/Makefile
5# used by print/poppler-includes/Makefile 5# used by print/poppler-includes/Makefile
6# used by print/poppler-qt/Makefile 6# used by print/poppler-qt/Makefile
7# used by print/poppler-qt4/Makefile 7# used by print/poppler-qt4/Makefile
8# used by print/poppler-utils/Makefile 8# used by print/poppler-utils/Makefile
9 9
10POPPLER_VERS= 0.16.2 10POPPLER_VERS= 0.16.3
11DISTNAME= poppler-${POPPLER_VERS} 11DISTNAME= poppler-${POPPLER_VERS}
12CATEGORIES= print 12CATEGORIES= print
13MASTER_SITES= http://poppler.freedesktop.org/ 13MASTER_SITES= http://poppler.freedesktop.org/
14 14
15HOMEPAGE= http://poppler.freedesktop.org/ 15HOMEPAGE= http://poppler.freedesktop.org/
16LICENSE= gnu-gpl-v2 16LICENSE= gnu-gpl-v2
17 17
18PKG_DESTDIR_SUPPORT= user-destdir 18PKG_DESTDIR_SUPPORT= user-destdir
19 19
20DISTINFO_FILE= ${.CURDIR}/../../print/poppler/distinfo 20DISTINFO_FILE= ${.CURDIR}/../../print/poppler/distinfo
21PATCHDIR= ${.CURDIR}/../../print/poppler/patches 21PATCHDIR= ${.CURDIR}/../../print/poppler/patches
22 22
23USE_TOOLS+= pkg-config 23USE_TOOLS+= pkg-config

cvs diff -r1.67 -r1.68 pkgsrc/print/poppler/distinfo (expand / switch to unified diff)

--- pkgsrc/print/poppler/distinfo 2011/01/31 16:55:28 1.67
+++ pkgsrc/print/poppler/distinfo 2011/03/09 12:07:11 1.68
@@ -1,12 +1,14 @@ @@ -1,12 +1,14 @@
1$NetBSD: distinfo,v 1.67 2011/01/31 16:55:28 drochner Exp $ 1$NetBSD: distinfo,v 1.68 2011/03/09 12:07:11 drochner Exp $
2 2
3SHA1 (poppler-0.16.2.tar.gz) = 1d7bcb7aa5601db4526a309da8cadfc12c686788 3SHA1 (poppler-0.16.3.tar.gz) = 0da87a1c3dc11a2c1e31c5c6603d5479545354bb
4RMD160 (poppler-0.16.2.tar.gz) = 0344c760f1e0c0f53bdaf88952c4a7280fe0de41 4RMD160 (poppler-0.16.3.tar.gz) = fa32924ef23f0eb9e134f8d98ae35ecf2cbf29df
5Size (poppler-0.16.2.tar.gz) = 5813608 bytes 5Size (poppler-0.16.3.tar.gz) = 1948009 bytes
6SHA1 (patch-aa) = b8c24eb7358410069f7ce6ad62576bc288cd55bb 6SHA1 (patch-aa) = b8c24eb7358410069f7ce6ad62576bc288cd55bb
7SHA1 (patch-ab) = 145cd675a46d56455021660b0a732daf4ec52ec2 7SHA1 (patch-ab) = 145cd675a46d56455021660b0a732daf4ec52ec2
8SHA1 (patch-ac) = c343775da48a1d86dea1451b74355d117e30f6c5 8SHA1 (patch-ac) = c343775da48a1d86dea1451b74355d117e30f6c5
9SHA1 (patch-ag) = 4b914e85bb08ce83305d20de9c0a3e74d3cabdd2 9SHA1 (patch-ag) = 4b914e85bb08ce83305d20de9c0a3e74d3cabdd2
10SHA1 (patch-ai) = a51dba3fb0e7131873ef82ae5e256fb1d17cee53 10SHA1 (patch-ai) = a51dba3fb0e7131873ef82ae5e256fb1d17cee53
11SHA1 (patch-ao) = cf7e0f086522147a91f59b1b26ca510d1971ac74 11SHA1 (patch-ao) = cf7e0f086522147a91f59b1b26ca510d1971ac74
12SHA1 (patch-aq) = 01e115ca868e0bbd398bade92485d83edbe98d66 12SHA1 (patch-aq) = 01e115ca868e0bbd398bade92485d83edbe98d66
 13SHA1 (patch-ba) = be7d1d2d6659f815d4a1bc27563e61e09cd8d272
 14SHA1 (patch-bb) = 708061bb00dafe05cbaa0ed1ade80c8a9a48667d

File Added: pkgsrc/print/poppler/patches/Attic/patch-ba
$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;
   }

File Added: pkgsrc/print/poppler/patches/Attic/patch-bb
$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