[pkgsrc/trunk]: pkgsrc/print/poppler update to 0.10.5

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/33aa163a3d49
branches:  trunk
changeset: 556307:33aa163a3d49
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Thu Mar 19 12:12:24 2009 +0000

description:
update to 0.10.5
Changes since 0.10.4:
core:
 * Read the UF entry if present and prefer it over F in Filespec dictionary
 * Fix typo that was making CairoOutputDev crash on some files. Bug #17337
 * Make JBIG2Stream more robust to corrupt input data
 * Do not blindly follow loops parsing OutlineItem. Bug #18364
 * Set up the error manager before calling jpeg_create_decompress. Bug #20484
 * Check there is an optional content config before using it. Bug #20587
 * Fix rendering of some PDF with OpenType fonts. Bug #20605

build system:
 * Yet more support for build on windows
 * Use AC_CHECK_HEADER to find headers. Bug #20538
 * Check for pkgconfig before using it
 * General autotools improvements

diffstat:

 print/poppler/Makefile         |    4 +-
 print/poppler/Makefile.common  |    4 +-
 print/poppler/distinfo         |   13 +-
 print/poppler/patches/patch-ai |   62 ++++++++----
 print/poppler/patches/patch-ba |   13 --
 print/poppler/patches/patch-bb |  197 -----------------------------------------
 print/poppler/patches/patch-bc |   90 ++++++++++++++++++
 7 files changed, 139 insertions(+), 244 deletions(-)

diffs (truncated from 500 to 300 lines):

diff -r 251dbca3a812 -r 33aa163a3d49 print/poppler/Makefile
--- a/print/poppler/Makefile    Thu Mar 19 12:02:09 2009 +0000
+++ b/print/poppler/Makefile    Thu Mar 19 12:12:24 2009 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2009/02/26 20:23:02 drochner Exp $
+# $NetBSD: Makefile,v 1.37 2009/03/19 12:12:24 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
-PKGREVISION=           1
-
 COMMENT=               PDF rendering library
 MAINTAINER=            reed%reedmedia.net@localhost
 
diff -r 251dbca3a812 -r 33aa163a3d49 print/poppler/Makefile.common
--- a/print/poppler/Makefile.common     Thu Mar 19 12:02:09 2009 +0000
+++ b/print/poppler/Makefile.common     Thu Mar 19 12:12:24 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2009/02/12 20:55:07 drochner Exp $
+# $NetBSD: Makefile.common,v 1.28 2009/03/19 12:12:24 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.10.4
+POPPLER_VERS=          0.10.5
 DISTNAME=              poppler-${POPPLER_VERS}
 CATEGORIES=            print
 MASTER_SITES=          http://poppler.freedesktop.org/
diff -r 251dbca3a812 -r 33aa163a3d49 print/poppler/distinfo
--- a/print/poppler/distinfo    Thu Mar 19 12:02:09 2009 +0000
+++ b/print/poppler/distinfo    Thu Mar 19 12:12:24 2009 +0000
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.40 2009/02/26 20:23:02 drochner Exp $
+$NetBSD: distinfo,v 1.41 2009/03/19 12:12:24 drochner Exp $
 
-SHA1 (poppler-0.10.4.tar.gz) = e8a5a1090394a2cfab3c9aa67d188f3628c60165
-RMD160 (poppler-0.10.4.tar.gz) = 62815f486a4f1eaa226e84aa953134be6a209ed6
-Size (poppler-0.10.4.tar.gz) = 1513213 bytes
+SHA1 (poppler-0.10.5.tar.gz) = 720b79adbeb6e7b722d3f0f61e165b9310fe61fc
+RMD160 (poppler-0.10.5.tar.gz) = 73e2330c2c874fb58f95c39fcdb5421766b6742c
+Size (poppler-0.10.5.tar.gz) = 1516687 bytes
 SHA1 (patch-aa) = 43c63c16d3a845e394a8eb0c3a321944fcf17615
 SHA1 (patch-ab) = 5a2785bccd71990e20cd81a3cd2697804e31788d
 SHA1 (patch-ag) = 0bf1bc080cad55792fe6cc761bf22ecccba7d13a
-SHA1 (patch-ai) = 852332490394756c496d06eb109f3d1d637f8717
+SHA1 (patch-ai) = 614a310e9dabbc52e47fb17b116e139ab8880995
 SHA1 (patch-aj) = 8bb1fe169bddb76ecc72129cc1dbd32030073dfd
 SHA1 (patch-ak) = ab4d0c91a6f2806b405954f8dab6e3d61a03b054
-SHA1 (patch-ba) = c53d76e13dc7afeb9410f4566ea917b83a76a133
-SHA1 (patch-bb) = c9fa8638988e335f9d80cda25015d9a18d78fa94
+SHA1 (patch-bc) = d2f51580ae122545a0f9139714d7a7ff94814698
 SHA1 (patch-ca) = 5bd31c497c8cbfb6c1d6cb5b9183088113bef6e3
 SHA1 (patch-cb) = e8cfb16a0641788759b13cf5fcf97d82f9485adc
diff -r 251dbca3a812 -r 33aa163a3d49 print/poppler/patches/patch-ai
--- a/print/poppler/patches/patch-ai    Thu Mar 19 12:02:09 2009 +0000
+++ b/print/poppler/patches/patch-ai    Thu Mar 19 12:12:24 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.6 2009/02/12 20:55:07 drochner Exp $
+$NetBSD: patch-ai,v 1.7 2009/03/19 12:12:24 drochner Exp $
 
---- configure.orig     2009-02-10 20:06:59.000000000 +0100
+--- configure.orig     2009-03-12 00:15:52.000000000 +0100
 +++ configure
-@@ -945,6 +945,8 @@ BUILD_ABIWORD_OUTPUT_TRUE
+@@ -948,6 +948,8 @@ BUILD_ABIWORD_OUTPUT_TRUE
  BUILD_ABIWORD_OUTPUT_FALSE
  BUILD_UTILS_TRUE
  BUILD_UTILS_FALSE
@@ -11,7 +11,7 @@
  PC_REQUIRES
  PC_REQUIRES_PRIVATE
  LIBOBJS
-@@ -1594,6 +1596,7 @@ Optional Features:
+@@ -1597,6 +1599,7 @@ Optional Features:
    --enable-compile-warnings=[no/yes/kde]
                               Turn on compiler warnings.
  
@@ -19,7 +19,7 @@
  
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -19915,13 +19918,11 @@ _ACEOF
+@@ -20355,13 +20358,11 @@ _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -35,7 +35,7 @@
    ;
    return 0;
  }
-@@ -19961,13 +19962,11 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -20401,13 +20402,11 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #define _LARGEFILE_SOURCE 1
@@ -51,16 +51,7 @@
    ;
    return 0;
  }
-@@ -21325,7 +21324,7 @@ for i in $jpeg_incdirs;
- do
-   for j in jpeglib.h;
-   do
--    echo "configure: 21328: $i/$j" >&5
-+    echo "configure: 21327: $i/$j" >&5
-     if test -r "$i/$j"; then
-       echo "taking that" >&5
-       jpeg_incdir=$i
-@@ -23687,7 +23686,7 @@ fi
+@@ -24123,7 +24122,7 @@ fi
  if test x$enable_poppler_qt4 = xyes; then
    { echo "$as_me:$LINENO: checking for Qt4 moc" >&5
  echo $ECHO_N "checking for Qt4 moc... $ECHO_C" >&6; }
@@ -69,7 +60,7 @@
    mocversion=`$MOCQT4 -v 2>&1`
    mocversiongrep=`echo $mocversion | grep "Qt 4"`
    if test x"$mocversiongrep" != x"$mocversion"; then
-@@ -24142,6 +24141,249 @@ else
+@@ -24578,6 +24577,249 @@ else
  fi
  
  
@@ -319,7 +310,7 @@
  if test "x$GCC" != xyes; then
    enable_compile_warnings=no
  fi
-@@ -24413,6 +24655,13 @@ echo "$as_me: error: conditional \"BUILD
+@@ -24849,6 +25091,13 @@ echo "$as_me: error: conditional \"BUILD
  Usually this means the macro was only invoked conditionally." >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -333,7 +324,7 @@
  
  : ${CONFIG_STATUS=./config.status}
  ac_clean_files_save=$ac_clean_files
-@@ -25542,13 +25791,15 @@ BUILD_ABIWORD_OUTPUT_TRUE!$BUILD_ABIWORD
+@@ -25984,13 +26233,15 @@ BUILD_ABIWORD_OUTPUT_TRUE!$BUILD_ABIWORD
  BUILD_ABIWORD_OUTPUT_FALSE!$BUILD_ABIWORD_OUTPUT_FALSE$ac_delim
  BUILD_UTILS_TRUE!$BUILD_UTILS_TRUE$ac_delim
  BUILD_UTILS_FALSE!$BUILD_UTILS_FALSE$ac_delim
@@ -345,12 +336,39 @@
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 93; then
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -26961,6 +27212,7 @@ echo "  use gtk-doc:        $enable_gtk_
+@@ -26009,7 +26260,7 @@ fi
+ 
+ cat >>$CONFIG_STATUS <<_ACEOF
+ cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
+-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+ _ACEOF
+ sed '
+ s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+@@ -26022,8 +26273,6 @@ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!
+ ' >>$CONFIG_STATUS <conf$$subs.sed
+ rm -f conf$$subs.sed
+ cat >>$CONFIG_STATUS <<_ACEOF
+-:end
+-s/|#_!!_#|//g
+ CEOF$ac_eof
+ _ACEOF
+ 
+@@ -26277,7 +26526,7 @@ s&@abs_top_builddir@&$ac_abs_top_builddi
+ s&@INSTALL@&$ac_INSTALL&;t t
+ s&@MKDIR_P@&$ac_MKDIR_P&;t t
+ $ac_datarootdir_hack
+-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
++" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed 's/|#_!!_#|//g' >$tmp/out
+ 
+ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+@@ -27412,6 +27661,7 @@ echo "  use gtk-doc:        $enable_gtk_
  echo "  use libjpeg:        $enable_libjpeg"
  echo "  use zlib:           $enable_zlib"
  echo "  use libopenjpeg:    $enable_libopenjpeg"
diff -r 251dbca3a812 -r 33aa163a3d49 print/poppler/patches/patch-ba
--- a/print/poppler/patches/patch-ba    Thu Mar 19 12:02:09 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2009/02/26 20:23:02 drochner Exp $
-
---- poppler/CairoOutputDev.cc.orig     2009-02-24 15:34:03.000000000 +0100
-+++ poppler/CairoOutputDev.cc
-@@ -236,7 +236,7 @@ void CairoOutputDev::setDefaultCTM(doubl
-   matrix.y0 = ctm[5];
- 
-   cairo_transform (cairo, &matrix);
--  if (shape)
-+  if (cairo_shape)
-       cairo_transform (cairo_shape, &matrix);
- 
-   OutputDev::setDefaultCTM(ctm);
diff -r 251dbca3a812 -r 33aa163a3d49 print/poppler/patches/patch-bb
--- a/print/poppler/patches/patch-bb    Thu Mar 19 12:02:09 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,197 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2009/02/26 20:23:02 drochner Exp $
-
---- poppler/JBIG2Stream.cc.orig        2009-01-23 23:09:41.000000000 +0100
-+++ poppler/JBIG2Stream.cc
-@@ -684,6 +684,7 @@ public:
-   void combine(JBIG2Bitmap *bitmap, int x, int y, Guint combOp);
-   Guchar *getDataPtr() { return data; }
-   int getDataSize() { return h * line; }
-+  GBool isOk() { return data != NULL; }
- 
- private:
- 
-@@ -2074,18 +2075,20 @@ void JBIG2Stream::readTextRegionSeg(Guin
- 
-   gfree(syms);
- 
--  // combine the region bitmap into the page bitmap
--  if (imm) {
--    if (pageH == 0xffffffff && y + h > curPageH) {
--      pageBitmap->expand(y + h, pageDefPixel);
--    }
--    pageBitmap->combine(bitmap, x, y, extCombOp);
--    delete bitmap;
-+  if (bitmap) {
-+    // combine the region bitmap into the page bitmap
-+    if (imm) {
-+      if (pageH == 0xffffffff && y + h > curPageH) {
-+        pageBitmap->expand(y + h, pageDefPixel);
-+      }
-+      pageBitmap->combine(bitmap, x, y, extCombOp);
-+      delete bitmap;
- 
--  // store the region bitmap
--  } else {
--    bitmap->setSegNum(segNum);
--    segments->append(bitmap);
-+    // store the region bitmap
-+    } else {
-+      bitmap->setSegNum(segNum);
-+      segments->append(bitmap);
-+    }
-   }
- 
-   // clean up the Huffman decoder
-@@ -2207,73 +2210,84 @@ JBIG2Bitmap *JBIG2Stream::readTextRegion
-         ri = 0;
-       }
-       if (ri) {
-+        GBool decodeSuccess;
-         if (huff) {
--          huffDecoder->decodeInt(&rdw, huffRDWTable);
--          huffDecoder->decodeInt(&rdh, huffRDHTable);
--          huffDecoder->decodeInt(&rdx, huffRDXTable);
--          huffDecoder->decodeInt(&rdy, huffRDYTable);
--          huffDecoder->decodeInt(&bmSize, huffRSizeTable);
-+          decodeSuccess = huffDecoder->decodeInt(&rdw, huffRDWTable);
-+          decodeSuccess = decodeSuccess && huffDecoder->decodeInt(&rdh, huffRDHTable);
-+          decodeSuccess = decodeSuccess && huffDecoder->decodeInt(&rdx, huffRDXTable);
-+          decodeSuccess = decodeSuccess && huffDecoder->decodeInt(&rdy, huffRDYTable);
-+          decodeSuccess = decodeSuccess && huffDecoder->decodeInt(&bmSize, huffRSizeTable);
-           huffDecoder->reset();
-           arithDecoder->start();
-         } else {
--          arithDecoder->decodeInt(&rdw, iardwStats);
--          arithDecoder->decodeInt(&rdh, iardhStats);
--          arithDecoder->decodeInt(&rdx, iardxStats);
--          arithDecoder->decodeInt(&rdy, iardyStats);
--        }
--        refDX = ((rdw >= 0) ? rdw : rdw - 1) / 2 + rdx;
--        refDY = ((rdh >= 0) ? rdh : rdh - 1) / 2 + rdy;
--
--        symbolBitmap =
--          readGenericRefinementRegion(rdw + syms[symID]->getWidth(),
--                                      rdh + syms[symID]->getHeight(),
--                                      templ, gFalse, syms[symID],
--                                      refDX, refDY, atx, aty);
-+          decodeSuccess = arithDecoder->decodeInt(&rdw, iardwStats);
-+          decodeSuccess = decodeSuccess && arithDecoder->decodeInt(&rdh, iardhStats);
-+          decodeSuccess = decodeSuccess && arithDecoder->decodeInt(&rdx, iardxStats);
-+          decodeSuccess = decodeSuccess && arithDecoder->decodeInt(&rdy, iardyStats);
-+        }
-+        
-+        if (decodeSuccess)
-+        {
-+          refDX = ((rdw >= 0) ? rdw : rdw - 1) / 2 + rdx;
-+          refDY = ((rdh >= 0) ? rdh : rdh - 1) / 2 + rdy;
-+
-+          symbolBitmap =
-+            readGenericRefinementRegion(rdw + syms[symID]->getWidth(),
-+                                        rdh + syms[symID]->getHeight(),
-+                                        templ, gFalse, syms[symID],