diff options
| -rw-r--r-- | print/poppler/Makefile | 4 | ||||
| -rw-r--r-- | print/poppler/Makefile.common | 4 | ||||
| -rw-r--r-- | print/poppler/distinfo | 10 | ||||
| -rw-r--r-- | print/poppler/patches/patch-ba | 12 | ||||
| -rw-r--r-- | print/poppler/patches/patch-bb | 51 |
5 files changed, 7 insertions, 74 deletions
diff --git a/print/poppler/Makefile b/print/poppler/Makefile index a87bb64cb56..00c1d6ec160 100644 --- a/print/poppler/Makefile +++ b/print/poppler/Makefile @@ -1,10 +1,8 @@ -# $NetBSD: Makefile,v 1.44 2009/11/19 17:58:41 drochner Exp $ +# $NetBSD: Makefile,v 1.45 2009/11/20 11:20:11 drochner Exp $ # .include "../../print/poppler/Makefile.common" -PKGREVISION= 1 - COMMENT= PDF rendering library MAINTAINER= reed@reedmedia.net diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common index 376f766f80e..2c6fc7ff918 100644 --- a/print/poppler/Makefile.common +++ b/print/poppler/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.32 2009/10/21 10:18:57 drochner Exp $ +# $NetBSD: Makefile.common,v 1.33 2009/11/20 11:20:11 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.1 +POPPLER_VERS= 0.12.2 DISTNAME= poppler-${POPPLER_VERS} CATEGORIES= print MASTER_SITES= http://poppler.freedesktop.org/ diff --git a/print/poppler/distinfo b/print/poppler/distinfo index 77a842285ac..e40a52fd146 100644 --- a/print/poppler/distinfo +++ b/print/poppler/distinfo @@ -1,13 +1,11 @@ -$NetBSD: distinfo,v 1.49 2009/11/19 17:58:41 drochner Exp $ +$NetBSD: distinfo,v 1.50 2009/11/20 11:20:11 drochner Exp $ -SHA1 (poppler-0.12.1.tar.gz) = 0c8514f789eaab4e91ba1a841f58f8bee95e4a43 -RMD160 (poppler-0.12.1.tar.gz) = 92ea043b8b329e23d13068af5cfed8fd47eea5e8 -Size (poppler-0.12.1.tar.gz) = 1641986 bytes +SHA1 (poppler-0.12.2.tar.gz) = 3138c456f7e6a429100109ac6cd5a948437b9f04 +RMD160 (poppler-0.12.2.tar.gz) = d2c06fd23012e16505ae5e5eced7cbd4d03c0b2c +Size (poppler-0.12.2.tar.gz) = 1614984 bytes SHA1 (patch-aa) = 43c63c16d3a845e394a8eb0c3a321944fcf17615 SHA1 (patch-ab) = 441308aec73c66a34c00ee1fad30a38748c89a7d SHA1 (patch-ag) = 58d01b019daec19de80867ce0941e5160591bf62 SHA1 (patch-ai) = a51dba3fb0e7131873ef82ae5e256fb1d17cee53 SHA1 (patch-ao) = cf7e0f086522147a91f59b1b26ca510d1971ac74 SHA1 (patch-ap) = f39b70d9420201281a6735114029514ef636f1bb -SHA1 (patch-ba) = 9b98dcfae8d997f9250e161faf8cce7f168798b5 -SHA1 (patch-bb) = 23fe8bab6eaadc0c9701c0125f07afbf6bffcbaa diff --git a/print/poppler/patches/patch-ba b/print/poppler/patches/patch-ba deleted file mode 100644 index 60aca098269..00000000000 --- a/print/poppler/patches/patch-ba +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ba,v 1.3 2009/10/21 10:18:57 drochner Exp $ - ---- poppler/PSOutputDev.cc.orig 2009-10-05 00:40:39.000000000 +0200 -+++ poppler/PSOutputDev.cc -@@ -3163,6 +3163,7 @@ void PSOutputDev::startPage(int pageNum, - } else { - writePSFmt("%%Page: {0:t} {1:d}\n", filteredString, seqPage); - } -+ delete filteredString; - } else { - writePSFmt("%%Page: {0:d} {1:d}\n", pageNum, seqPage); - } diff --git a/print/poppler/patches/patch-bb b/print/poppler/patches/patch-bb deleted file mode 100644 index 421a5adc77f..00000000000 --- a/print/poppler/patches/patch-bb +++ /dev/null @@ -1,51 +0,0 @@ -$NetBSD: patch-bb,v 1.3 2009/10/21 10:18:57 drochner Exp $ - ---- glib/poppler-page.cc.orig 2009-09-09 23:22:31.000000000 +0200 -+++ glib/poppler-page.cc -@@ -609,28 +609,28 @@ create_surface_from_thumbnail_data (guch - gint rowstride) - { - guchar *cairo_pixels; -+ gint cairo_stride; - cairo_surface_t *surface; -- static cairo_user_data_key_t key; - int j; - -- cairo_pixels = (guchar *)g_malloc (4 * width * height); -- surface = cairo_image_surface_create_for_data ((unsigned char *)cairo_pixels, -- CAIRO_FORMAT_RGB24, -- width, height, 4 * width); -- cairo_surface_set_user_data (surface, &key, -- cairo_pixels, (cairo_destroy_func_t)g_free); -+ surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, width, height); -+ if (cairo_surface_status (surface)) -+ return NULL; -+ -+ cairo_pixels = cairo_image_surface_get_data (surface); -+ cairo_stride = cairo_image_surface_get_stride (surface); - - for (j = height; j; j--) { - guchar *p = data; - guchar *q = cairo_pixels; - guchar *end = p + 3 * width; -- -+ - while (p < end) { - #if G_BYTE_ORDER == G_LITTLE_ENDIAN - q[0] = p[2]; - q[1] = p[1]; - q[2] = p[0]; --#else -+#else - q[1] = p[0]; - q[2] = p[1]; - q[3] = p[2]; -@@ -640,7 +640,7 @@ create_surface_from_thumbnail_data (guch - } - - data += rowstride; -- cairo_pixels += 4 * width; -+ cairo_pixels += cairo_stride; - } - - return surface; |