Update poppler to 0.26.0.

Release 0.26.0
        qt4:
         * Fix mismatched boolean logic in TextAnnotation::setInplaceIntent

        qt5:
         * Fix mismatched boolean logic in TextAnnotation::setInplaceIntent

        core:
         * Very small code cleanup

        cpp:
         * Very small code cleanup

Release 0.25.3
        core:
         * Fix crashes on broken files
         * Avoid MinGW/Cygwin warnings due to redefinition of NOMINMAX
         * Fix some small memory leaks

        qt5:
         * Fix some kinds of OCG models
         * Cleanup some deprecated methods

        glib:
         * Fix the first coord of the quadrilateral in create_poppler_quads_from_annot_quads(). Bug #76504

        utils:
         * pdftohtml: Fix typo in manpage

        qt4:
         * Fix some kinds of OCG models

Release 0.25.2
        core:
         * Tagged-PDF support
         * Open some broken files. Bug #75232
         * Fix crashes on broken files
         * Fix regression parsing some broken files. KDE Bug #329600
         * Improve compilation under Win 8 with Visual Studio 2012. Bug #73111
         * PSOutputDev: Ensure paper size takes into account rotation. Bug #72312
         * PSOutputDev: Fix DocumentMedia/Page/Media/PageBBox DSC comments
         * PSOutputDev: Use crop box as page size
         * PSOutputDev: Remove origpagesizes mode and make -origpagesizes an alias for -paper match
         * PSOutputDev: Only change paper size when different to previous size
         * PSOutputDev: Ensure there is always a page size in the output
         * PSOutputDev: Fix regression when creating level1 PS. Bug #75241
         * CairoOutputDev: Clip to crop box. Gnome Bug #649886
         * Splash: Blend usage in PDF with spot colors casue random output. Bug #74883
         * Splash: Fix off by one that caused crash in a file. Bug #76387
         * Make sure number of least objects in hints table is valid. Bug #74741
         * Limit numeric parsing of character names. Bug #38456

        glib:
         * Tagged-PDF support
         * Annotation improvements
         * Install error callback. Bug #73269
         * Fix gobject-introspection warnings
         * demo: Fix performance in text markup annotations
         * Increase gtk3 dependency

        qt4:
         * Improve naming of internal export/import macros
         * Add GCC visibility export attributes
         * Expose document-supplied text direction

        qt5:
         * Improve naming of internal export/import macros
         * Add GCC visibility export attributes
         * Expose document-supplied text direction

        utils:
         * pdftocairo: Ensure page size and crop box works the same as pdftops
         * Fix TIFF writting in Windows. Bug #75969

        buildsystem:
         * Learn about automake 1.14
         * Do not define -ansi. Bug #72499
         * cmake: Install JpegWriter.h depending on libjpeg
         * cmake: Use c99 for the c compiler

Release 0.25.1
        core:
         * GooString format: Added some tests + improved documentation
         * GooString format: fixed bug with printing LLONG_MIN
         * regression test improvements

        qt4:
         * Arthur backend font rendering improvements
         * test program to save to file

        qt5:
         * Arthur backend font rendering improvements
         * Improve detection of Qt5 moc. Bug #72744
         * test program to save to file

        utils:
         * pdfunite: Work even if there's a single file given
         * pdfunite: do not lose fonts when merging some files

Release 0.25.0
        core:
         * Annotation improvements
         * Tagged PDF work
         * Improve speed on some files using ICC color space
         * Use ICC profile in OutputIntents. Bug #34053
         * Limit use of ZapfDingbats character names. Bug #60243
         * Splash: correction for knockout transparency groups
         * regression test improvements

        utils:
         * pdftoppm: Added thinlinemode option setting
         * pdfinfo: Indicate if pdf contains javascript
         * pdfinfo: Add option to print out javascript
         * pdfimages: Print size, ratio, and ppi
         * pdfimages: More image output format support
         * pdfseparate: allow zero-padded pagespecs

        glib:
         * Annotation improvements
         * Add API to get text, text layout and text attributes for a given area
         * demo improvements

6 files changed, 28 insertions, 28 deletions

diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common
index 5a56b279e94..f45b4d9057d 100644
--- a/print/poppler/Makefile.common
+++ b/print/poppler/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.62 2014/01/14 08:49:53 markd Exp $
+# $NetBSD: Makefile.common,v 1.63 2014/04/29 07:56:48 wiz Exp $
 #
 # used by print/poppler/Makefile
 # used by print/poppler-cpp/Makefile
@@ -7,7 +7,7 @@
 # used by print/poppler-qt4/Makefile
 # used by print/poppler-utils/Makefile
 
-POPPLER_VERS=		0.24.5
+POPPLER_VERS=		0.26.0
 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 588d45e17c0..09672b8107f 100644
--- a/print/poppler/buildlink3.mk
+++ b/print/poppler/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.38 2013/10/29 19:05:23 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.39 2014/04/29 07:56:48 wiz 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.24.0
+BUILDLINK_ABI_DEPENDS.poppler+=	poppler>=0.26.0
 BUILDLINK_PKGSRCDIR.poppler?=	../../print/poppler
 
 .include "../../graphics/lcms2/buildlink3.mk"
diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index 1583a38a1a7..94d3e23565a 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.88 2014/01/06 14:32:33 wiz Exp $
+$NetBSD: distinfo,v 1.89 2014/04/29 07:56:48 wiz Exp $
 
-SHA1 (poppler-0.24.5.tar.xz) = 7b7cabee85bd81a7e55c939740d5d7ccd7c0dda5
-RMD160 (poppler-0.24.5.tar.xz) = 34a017f79e624091a62845beb26b3f81fb971645
-Size (poppler-0.24.5.tar.xz) = 1512476 bytes
+SHA1 (poppler-0.26.0.tar.xz) = 1f5d08ee01683c309688f17116d18bf47b13f001
+RMD160 (poppler-0.26.0.tar.xz) = 9c74dd6fb617928375b64c3576575603ed2a72a5
+Size (poppler-0.26.0.tar.xz) = 1591180 bytes
 SHA1 (patch-aa) = f67de7b11651207d968972e5b27eb017cf59ceb7
-SHA1 (patch-ab) = 758c541fa14c82cb44a247cbc37e1582b0167229
-SHA1 (patch-ag) = de9ef3e2498d5c07a8f35f1d215e377953a5dad8
+SHA1 (patch-ab) = fc2e9e5dbbc2cda25b79d8342e82c10d542211a6
+SHA1 (patch-ag) = 7a3e0cb67bfb3856b3c5fbb581572a113eeb9fe5
 SHA1 (patch-aq) = b1e1cd6e234a68ebc352d76dbf89ed4e3cb7b3c0
-SHA1 (patch-ar) = f72681a2148ec846a334774339836d468925b20c
+SHA1 (patch-ar) = c3f9c4d0176f215cfee6127d2ac077a26c23ffa2
 SHA1 (patch-as) = 9e2329c923c904074495076fd7cc594fced51a0d
 SHA1 (patch-configure) = a2488314e1da41c94bc78c327795e126515bdde5
diff --git a/print/poppler/patches/patch-ab b/print/poppler/patches/patch-ab
index d418bea8251..c83d271767b 100644
--- a/print/poppler/patches/patch-ab
+++ b/print/poppler/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.16 2013/07/04 13:13:55 wiz Exp $
+$NetBSD: patch-ab,v 1.17 2014/04/29 07:56:48 wiz Exp $
 
 Use installed poppler library so we can have a separate poppler-utils
 package.
 
---- utils/Makefile.in.orig	2013-06-16 16:24:11.000000000 +0000
+--- utils/Makefile.in.orig	2014-04-24 22:42:57.000000000 +0000
 +++ utils/Makefile.in
 @@ -103,7 +103,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
  	$(top_builddir)/poppler/poppler-config.h
@@ -30,13 +30,13 @@ package.
 -pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
 +pdffonts_DEPENDENCIES = $(prefix)/lib/libpoppler.la
  am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
- 	$(am__objects_1)
+ 	JSInfo.$(OBJEXT) $(am__objects_1)
  pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
  pdfimages_LDADD = $(LDADD)
 -pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
 +pdfimages_DEPENDENCIES = $(prefix)/lib/libpoppler.la
  am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \
- 	$(am__objects_1)
+ 	JSInfo.$(OBJEXT) $(am__objects_1)
  pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
  pdfinfo_LDADD = $(LDADD)
 -pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
@@ -55,7 +55,7 @@ package.
  am__DEPENDENCIES_2 =
  @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 =  \
  @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@	$(am__DEPENDENCIES_2)
-@@ -152,29 +152,29 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht
+@@ -153,29 +153,29 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht
  	pdftohtml-HtmlOutputDev.$(OBJEXT) $(am__objects_2)
  pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
  pdftohtml_LDADD = $(LDADD)
@@ -92,7 +92,7 @@ package.
  AM_V_P = $(am__v_P_@AM_V@)
  am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
  am__v_P_0 = false
-@@ -491,12 +491,12 @@ top_build_prefix = @top_build_prefix@
+@@ -502,12 +502,12 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  win32_libs = @win32_libs@
@@ -110,7 +110,7 @@ package.
  INCLUDES = \
  	-I$(top_srcdir)				\
  	-I$(top_srcdir)/goo			\
-@@ -506,8 +506,9 @@ INCLUDES = \
+@@ -517,8 +517,9 @@ INCLUDES = \
  	$(PDFTOCAIRO_CFLAGS)
  
  LDADD = \
diff --git a/print/poppler/patches/patch-ag b/print/poppler/patches/patch-ag
index 68d1aa87ce9..f27a5a85656 100644
--- a/print/poppler/patches/patch-ag
+++ b/print/poppler/patches/patch-ag
@@ -1,9 +1,9 @@
-$NetBSD: patch-ag,v 1.10 2013/08/22 09:11:16 prlw1 Exp $
+$NetBSD: patch-ag,v 1.11 2014/04/29 07:56:48 wiz Exp $
 
 Use installed copy of poppler library so we can have a separate
 poppler-glib package.
 
---- qt4/src/Makefile.in.orig	2013-07-29 17:13:29.000000000 +0000
+--- qt4/src/Makefile.in.orig	2014-04-24 22:42:56.000000000 +0000
 +++ qt4/src/Makefile.in
 @@ -129,7 +129,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
  LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -14,7 +14,7 @@ poppler-glib package.
  am_libpoppler_qt4_la_OBJECTS = libpoppler_qt4_la-poppler-document.lo \
  	libpoppler_qt4_la-poppler-page.lo \
  	libpoppler_qt4_la-poppler-fontinfo.lo \
-@@ -505,7 +505,7 @@ libpoppler_qt4_la_CXXFLAGS = \
+@@ -506,7 +506,7 @@ libpoppler_qt4_la_CXXFLAGS = \
  	-Dpoppler_qt4_EXPORTS
  
  libpoppler_qt4_la_LIBADD = \
@@ -22,4 +22,4 @@ poppler-glib package.
 +	$(prefix)/lib/libpoppler.la	\
  	$(POPPLER_QT4_LIBS)
  
- libpoppler_qt4_la_LDFLAGS = -version-info 7:0:3 @create_shared_lib@ @auto_import_flags@
+ libpoppler_qt4_la_LDFLAGS = -version-info 8:0:4 @create_shared_lib@ @auto_import_flags@
diff --git a/print/poppler/patches/patch-ar b/print/poppler/patches/patch-ar
index 0e2bc3b9548..9acee5ea0ee 100644
--- a/print/poppler/patches/patch-ar
+++ b/print/poppler/patches/patch-ar
@@ -1,20 +1,20 @@
-$NetBSD: patch-ar,v 1.5 2013/07/04 13:13:55 wiz Exp $
+$NetBSD: patch-ar,v 1.6 2014/04/29 07:56:48 wiz Exp $
 
 Use installed poppler library so we can have a separate poppler-cpp
 package.
 
---- cpp/Makefile.in.orig	2011-10-26 12:40:03.000000000 +0000
+--- cpp/Makefile.in.orig	2014-04-24 22:42:56.000000000 +0000
 +++ cpp/Makefile.in
-@@ -79,7 +79,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
+@@ -130,7 +130,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
  LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
  libpoppler_cpp_la_DEPENDENCIES =  \
 -	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1)
 +	$(prefix)/lib/libpoppler.la $(am__DEPENDENCIES_1)
- am_libpoppler_cpp_la_OBJECTS = libpoppler_cpp_la-PNMWriter.lo \
- 	libpoppler_cpp_la-poppler-document.lo \
+ am_libpoppler_cpp_la_OBJECTS = libpoppler_cpp_la-poppler-document.lo \
  	libpoppler_cpp_la-poppler-embedded-file.lo \
-@@ -426,7 +426,7 @@ libpoppler_cpp_la_CXXFLAGS = \
+ 	libpoppler_cpp_la-poppler-font.lo \
+@@ -537,7 +537,7 @@ libpoppler_cpp_la_CXXFLAGS = \
  	-Dpoppler_cpp_EXPORTS
  
  libpoppler_cpp_la_LIBADD = \