update to 0.14.1

this is a new major branch, many fixes and improvements

6 files changed, 41 insertions, 41 deletions

diff --git a/print/poppler/Makefile b/print/poppler/Makefile
index 98f8f3e302f..86284563a91 100644
--- a/print/poppler/Makefile
+++ b/print/poppler/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2010/06/13 22:45:16 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2010/07/14 17:04:22 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
-PKGREVISION=		1
 
 COMMENT=		PDF rendering library
 MAINTAINER=		reed@reedmedia.net
@@ -30,6 +29,7 @@ CONFIGURE_ARGS+=	--disable-gtk-test
 CONFIGURE_ARGS+=	--disable-poppler-glib
 # Don't build and install the tools
 CONFIGURE_ARGS+=	--disable-utils
+CONFIGURE_ARGS+=	--disable-poppler-cpp
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.poppler
 PKG_SUPPORTED_OPTIONS=	poppler-cms
diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common
index 9f44df8d844..d44d842af75 100644
--- a/print/poppler/Makefile.common
+++ b/print/poppler/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2010/02/23 20:11:58 drochner Exp $
+# $NetBSD: Makefile.common,v 1.36 2010/07/14 17:04: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.12.4
+POPPLER_VERS=		0.14.1
 DISTNAME=		poppler-${POPPLER_VERS}
 CATEGORIES=		print
 MASTER_SITES=		http://poppler.freedesktop.org/
diff --git a/print/poppler/buildlink3.mk b/print/poppler/buildlink3.mk
index 4a2d08562e6..7b837eac817 100644
--- a/print/poppler/buildlink3.mk
+++ b/print/poppler/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2010/01/18 09:59:23 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2010/07/14 17:04:22 drochner Exp $
 
 BUILDLINK_TREE+=	poppler
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	poppler
 POPPLER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.poppler+=	poppler>=0.5.1
-BUILDLINK_ABI_DEPENDS.poppler+=	poppler>=0.12.3nb1
+BUILDLINK_ABI_DEPENDS.poppler+=	poppler>=0.14.1
 BUILDLINK_PKGSRCDIR.poppler?=	../../print/poppler
 
 pkgbase := poppler
diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index 832fb6d718c..4a301e19d0a 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.54 2010/02/23 20:11:58 drochner Exp $
+$NetBSD: distinfo,v 1.55 2010/07/14 17:04:22 drochner Exp $
 
-SHA1 (poppler-0.12.4.tar.gz) = 306507e0fbf47736b456218618f043a216c263ef
-RMD160 (poppler-0.12.4.tar.gz) = 9c212ebb8fc3d4cbc532f1c826428cc4d195cb5b
-Size (poppler-0.12.4.tar.gz) = 1674400 bytes
-SHA1 (patch-aa) = 43c63c16d3a845e394a8eb0c3a321944fcf17615
+SHA1 (poppler-0.14.1.tar.gz) = 28229f897451feba5682d74defe7d67361eeee11
+RMD160 (poppler-0.14.1.tar.gz) = 7b8d084b05ccc374e9add9771b781a88948907a7
+Size (poppler-0.14.1.tar.gz) = 1782771 bytes
+SHA1 (patch-aa) = b8c24eb7358410069f7ce6ad62576bc288cd55bb
 SHA1 (patch-ab) = 441308aec73c66a34c00ee1fad30a38748c89a7d
 SHA1 (patch-ac) = c343775da48a1d86dea1451b74355d117e30f6c5
-SHA1 (patch-ag) = 58d01b019daec19de80867ce0941e5160591bf62
+SHA1 (patch-ag) = 7ef9ccdb1a6719510c6941864b8c7db3cc0255f1
 SHA1 (patch-ai) = a51dba3fb0e7131873ef82ae5e256fb1d17cee53
 SHA1 (patch-ao) = cf7e0f086522147a91f59b1b26ca510d1971ac74
 SHA1 (patch-ap) = fc985510d4ebabe097e55bc4cbb0477267e95a7d
diff --git a/print/poppler/patches/patch-aa b/print/poppler/patches/patch-aa
index 133b3232899..5ac69892790 100644
--- a/print/poppler/patches/patch-aa
+++ b/print/poppler/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.9 2008/04/15 19:57:00 drochner Exp $
+$NetBSD: patch-aa,v 1.10 2010/07/14 17:04:23 drochner Exp $
 
---- glib/Makefile.in.orig	2008-03-26 19:40:19.000000000 +0100
+--- glib/Makefile.in.orig	2010-07-08 18:57:56.000000000 +0000
 +++ glib/Makefile.in
-@@ -62,7 +62,7 @@ am__DEPENDENCIES_1 =
- @BUILD_CAIRO_OUTPUT_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler-cairo.la \
- @BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_1)
+@@ -82,7 +82,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
  libpoppler_glib_la_DEPENDENCIES =  \
--	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \
-+	$(prefix)/lib/libpoppler.la $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/poppler/libpoppler.la \
++	$(prefix)/lib/libpoppler.la \
+ 	$(top_builddir)/poppler/libpoppler-cairo.la \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
- am__objects_1 = poppler-enums.lo
-@@ -79,7 +79,7 @@ am__test_poppler_glib_SOURCES_DIST = tes
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+@@ -105,7 +105,7 @@ am__test_poppler_glib_SOURCES_DIST = tes
  @BUILD_WITH_GDK_TRUE@	test-poppler-glib.$(OBJEXT)
  test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS)
  @BUILD_WITH_GDK_TRUE@test_poppler_glib_DEPENDENCIES =  \
@@ -19,17 +19,17 @@ $NetBSD: patch-aa,v 1.9 2008/04/15 19:57:00 drochner Exp $
 +@BUILD_WITH_GDK_TRUE@	$(prefix)/lib/libpoppler.la \
  @BUILD_WITH_GDK_TRUE@	libpoppler-glib.la $(am__DEPENDENCIES_1) \
  @BUILD_WITH_GDK_TRUE@	$(am__DEPENDENCIES_1) \
- @BUILD_WITH_GDK_TRUE@	$(am__DEPENDENCIES_1) \
-@@ -318,7 +318,7 @@ libpoppler_glib_la_SOURCES = \
+ @BUILD_WITH_GDK_TRUE@	$(am__DEPENDENCIES_1)
+@@ -438,7 +438,7 @@ libpoppler_glib_la_SOURCES = \
  	poppler-private.h
  
  libpoppler_glib_la_LIBADD = \
 -	$(top_builddir)/poppler/libpoppler.la		\
 +	$(prefix)/lib/libpoppler.la		\
+ 	$(top_builddir)/poppler/libpoppler-cairo.la	\
  	$(POPPLER_GLIB_LIBS)				\
  	$(GDK_LIBS)					\
- 	$(FREETYPE_LIBS)				\
-@@ -330,7 +330,7 @@ libpoppler_glib_la_LDFLAGS = -version-in
+@@ -450,7 +450,7 @@ libpoppler_glib_la_LDFLAGS = -version-in
  @BUILD_WITH_GDK_TRUE@       test-poppler-glib.cc
  
  @BUILD_WITH_GDK_TRUE@test_poppler_glib_LDADD = \
diff --git a/print/poppler/patches/patch-ag b/print/poppler/patches/patch-ag
index 0053ef4fd6c..d0c4d51d0c5 100644
--- a/print/poppler/patches/patch-ag
+++ b/print/poppler/patches/patch-ag
@@ -1,22 +1,22 @@
-$NetBSD: patch-ag,v 1.6 2009/10/21 10:18:57 drochner Exp $
+$NetBSD: patch-ag,v 1.7 2010/07/14 17:04:23 drochner Exp $
 
---- qt4/src/Makefile.in.orig	2009-10-18 01:28:48.000000000 +0200
+--- qt4/src/Makefile.in.orig	2010-07-08 18:57:57.000000000 +0000
 +++ qt4/src/Makefile.in
-@@ -82,7 +82,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
+@@ -79,7 +79,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
  LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
  libpoppler_qt4_la_DEPENDENCIES =  \
--	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \
-+	$(prefix)/lib/libpoppler.la $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__append_1)
+-	$(top_builddir)/poppler/libpoppler.la \
++	$(prefix)/lib/libpoppler.la \
+ 	$(top_builddir)/poppler/libpoppler-arthur.la \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
  am_libpoppler_qt4_la_OBJECTS = poppler-document.lo poppler-page.lo \
- 	poppler-fontinfo.lo poppler-embeddedfile.lo poppler-textbox.lo \
-@@ -373,7 +373,7 @@ libpoppler_qt4_la_SOURCES = \
- 	poppler-export.h			\
- 	poppler-private.h
+@@ -384,7 +384,7 @@ libpoppler_qt4_la_SOURCES = \
+ 	poppler-page-transition-private.h
  
--libpoppler_qt4_la_LIBADD = $(top_builddir)/poppler/libpoppler.la \
-+libpoppler_qt4_la_LIBADD = $(prefix)/lib/libpoppler.la \
- 	$(FONTCONFIG_LIBS) $(POPPLER_QT4_LIBS) $(am__append_1)
- libpoppler_qt4_la_LDFLAGS = -version-info 5:0:2 @create_shared_lib@
- all: all-am
+ libpoppler_qt4_la_LIBADD = \
+-	$(top_builddir)/poppler/libpoppler.la	\
++	$(prefix)/lib/libpoppler.la	\
+ 	$(top_builddir)/poppler/libpoppler-arthur.la	\
+ 	$(FONTCONFIG_LIBS)				\
+ 	$(POPPLER_QT4_LIBS)