update to 0.16.7

 changes: bugfixes
pkgsrc change: set --enable-cms in frontend components if it was
set in the base pkg -- the layout of some classes depends on this
definition, and inconsistencies can lead to crashes
(see poppler bug #35381)

8 files changed, 26 insertions, 87 deletions

diff --git a/print/poppler-glib/Makefile b/print/poppler-glib/Makefile
index 88f0c7bc81e..f302e555b7d 100644
--- a/print/poppler-glib/Makefile
+++ b/print/poppler-glib/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.39 2011/04/22 13:42:23 obache Exp $
+# $NetBSD: Makefile,v 1.40 2011/07/11 10:05:22 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=		poppler-glib-${POPPLER_VERS}
-PKGREVISION=		1
 
 COMMENT=		PDF rendering library (GLib wrapper)
 MAINTAINER=		reed@reedmedia.net
@@ -25,7 +24,11 @@ CONFIGURE_ARGS+=	--disable-poppler-qt
 # Don't compile GTK+ test program.
 CONFIGURE_ARGS+=	--disable-gtk-test
 CONFIGURE_ARGS+=	--disable-utils
+.if !empty(PKG_BUILD_OPTIONS.poppler:Mpoppler-cms)
+CONFIGURE_ARGS+=	--enable-cms
+.else
 CONFIGURE_ARGS+=	--disable-cms
+.endif
 CONFIGURE_ARGS+=	--disable-poppler-cpp
 
 BUILD_DIRS=		goo fofi poppler glib
diff --git a/print/poppler-qt/Makefile b/print/poppler-qt/Makefile
index 54570b18954..2d68e1c9f46 100644
--- a/print/poppler-qt/Makefile
+++ b/print/poppler-qt/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2011/01/13 13:39:13 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2011/07/11 10:05:22 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=		poppler-qt-${POPPLER_VERS}
-PKGREVISION=		1
 
 COMMENT=		PDF rendering library (QT wrapper)
 MAINTAINER=		reed@reedmedia.net
@@ -15,7 +14,11 @@ CONFIGURE_ARGS+=	--disable-splash-output
 CONFIGURE_ARGS+=	--enable-poppler-qt
 CONFIGURE_ARGS+=	--disable-gtk-test
 CONFIGURE_ARGS+=	--disable-utils
+.if !empty(PKG_BUILD_OPTIONS.poppler:Mpoppler-cms)
+CONFIGURE_ARGS+=	--enable-cms
+.else
 CONFIGURE_ARGS+=	--disable-cms
+.endif
 
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/poppler-qt.pc.in
 
diff --git a/print/poppler-qt4/Makefile b/print/poppler-qt4/Makefile
index 91da15f77cf..8d6bbc5cc87 100644
--- a/print/poppler-qt4/Makefile
+++ b/print/poppler-qt4/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2011/04/22 13:44:32 obache Exp $
+# $NetBSD: Makefile,v 1.22 2011/07/11 10:05:22 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=		poppler-qt4-${POPPLER_VERS}
-PKGREVISION=		1
 
 COMMENT=		PDF rendering library (QT4 wrapper)
 MAINTAINER=		reed@reedmedia.net
@@ -14,7 +13,11 @@ CONFIGURE_ARGS+=	--disable-cairo-output
 CONFIGURE_ARGS+=	--enable-poppler-qt4
 CONFIGURE_ARGS+=	--disable-gtk-test
 CONFIGURE_ARGS+=	--disable-utils
+.if !empty(PKG_BUILD_OPTIONS.poppler:Mpoppler-cms)
+CONFIGURE_ARGS+=	--enable-cms
+.else
 CONFIGURE_ARGS+=	--disable-cms
+.endif
 
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/poppler-qt4.pc.in
 
diff --git a/print/poppler-utils/Makefile b/print/poppler-utils/Makefile
index a8054a24516..3e61a407f93 100644
--- a/print/poppler-utils/Makefile
+++ b/print/poppler-utils/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2011/05/11 07:05:46 abs Exp $
+# $NetBSD: Makefile,v 1.22 2011/07/11 10:05:23 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=		poppler-utils-${POPPLER_VERS}
-PKGREVISION=		2
 
 COMMENT=		PDF utilities (from poppler)
 MAINTAINER=		reed@reedmedia.net
@@ -28,7 +27,11 @@ CONFIGURE_ARGS+=	--disable-gtk-test
 CONFIGURE_ARGS+=	--disable-poppler-glib
 # Enable build and install of the tools
 CONFIGURE_ARGS+=	--enable-utils	# the default
+.if !empty(PKG_BUILD_OPTIONS.poppler:Mpoppler-cms)
+CONFIGURE_ARGS+=	--enable-cms
+.else
 CONFIGURE_ARGS+=	--disable-cms
+.endif
 
 BUILD_DIRS=		utils # implies INSTALL_DIRS too
 
diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common
index e09fd00601b..ac2eed442d6 100644
--- a/print/poppler/Makefile.common
+++ b/print/poppler/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.44 2011/03/09 12:07:11 drochner Exp $
+# $NetBSD: Makefile.common,v 1.45 2011/07/11 10:05:22 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.3
+POPPLER_VERS=		0.16.7
 DISTNAME=		poppler-${POPPLER_VERS}
 CATEGORIES=		print
 MASTER_SITES=		http://poppler.freedesktop.org/
diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index 97fc0c7a762..6d06b45d466 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.68 2011/03/09 12:07:11 drochner Exp $
+$NetBSD: distinfo,v 1.69 2011/07/11 10:05:22 drochner Exp $
 
-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 (poppler-0.16.7.tar.gz) = 26c735f863688f62b57d5159863fdad4272be89f
+RMD160 (poppler-0.16.7.tar.gz) = 279330e6feaf97a207f3396eab1af836d3d1f16c
+Size (poppler-0.16.7.tar.gz) = 1952179 bytes
 SHA1 (patch-aa) = b8c24eb7358410069f7ce6ad62576bc288cd55bb
 SHA1 (patch-ab) = 145cd675a46d56455021660b0a732daf4ec52ec2
 SHA1 (patch-ac) = c343775da48a1d86dea1451b74355d117e30f6c5
@@ -10,5 +10,3 @@ 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
deleted file mode 100644
index b6d600e511b..00000000000
--- a/print/poppler/patches/patch-ba
+++ /dev/null
@@ -1,33 +0,0 @@
-$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
deleted file mode 100644
index 746b0fcfe12..00000000000
--- a/print/poppler/patches/patch-bb
+++ /dev/null
@@ -1,38 +0,0 @@
-$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