From 30faa75d5038c9e4fa911ab1397a78a4a4d4e309 Mon Sep 17 00:00:00 2001 From: drochner Date: Tue, 15 Apr 2008 19:57:00 +0000 Subject: update to 0.8.0 changes: * Fix caching of members in the glib frontend causing issues with rendering * Change glib public api to have a correct naming * Some better error handling on corner cases * Check the document stream is seekable when opening it * Build fixes with autotools and with cmake * Fix infinite recursion on some malformed documents when consulting the fonts * Fix possible crash when asking for Movie contents --- print/poppler-glib/PLIST | 3 ++- print/poppler-qt4/PLIST | 4 +++- print/poppler/Makefile.common | 4 ++-- print/poppler/distinfo | 16 ++++++++------ print/poppler/patches/patch-aa | 44 ++++++++++++++++++------------------- print/poppler/patches/patch-ab | 20 ++++++++--------- print/poppler/patches/patch-ag | 25 ++++++++++++++------- print/poppler/patches/patch-ah | 50 ++++++++++++++++++++++++++++++++++++++++++ print/poppler/patches/patch-ai | 13 +++++++++++ 9 files changed, 128 insertions(+), 51 deletions(-) create mode 100644 print/poppler/patches/patch-ah create mode 100644 print/poppler/patches/patch-ai (limited to 'print') diff --git a/print/poppler-glib/PLIST b/print/poppler-glib/PLIST index b5543fb4c57..4acece81f20 100644 --- a/print/poppler-glib/PLIST +++ b/print/poppler-glib/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.7 2007/11/03 16:10:40 drochner Exp $ +@comment $NetBSD: PLIST,v 1.8 2008/04/15 19:57:00 drochner Exp $ include/poppler/glib/poppler-action.h +include/poppler/glib/poppler-annot.h include/poppler/glib/poppler-attachment.h include/poppler/glib/poppler-document.h include/poppler/glib/poppler-enums.h diff --git a/print/poppler-qt4/PLIST b/print/poppler-qt4/PLIST index 4784f74d1e4..ffd397df3bb 100644 --- a/print/poppler-qt4/PLIST +++ b/print/poppler-qt4/PLIST @@ -1,7 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2007/12/12 01:29:22 markd Exp $ +@comment $NetBSD: PLIST,v 1.2 2008/04/15 19:57:00 drochner Exp $ include/poppler/qt4/poppler-annotation.h +include/poppler/qt4/poppler-export.h include/poppler/qt4/poppler-form.h include/poppler/qt4/poppler-link.h +include/poppler/qt4/poppler-optcontent.h include/poppler/qt4/poppler-page-transition.h include/poppler/qt4/poppler-qt4.h lib/libpoppler-qt4.la diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common index bfba537bb89..30def6c2a49 100644 --- a/print/poppler/Makefile.common +++ b/print/poppler/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.11 2008/02/01 21:12:41 drochner Exp $ +# $NetBSD: Makefile.common,v 1.12 2008/04/15 19:57:00 drochner Exp $ # -POPPLER_VERS= 0.6.4 +POPPLER_VERS= 0.8.0 DISTNAME= poppler-${POPPLER_VERS} CATEGORIES= print MASTER_SITES= http://poppler.freedesktop.org/ diff --git a/print/poppler/distinfo b/print/poppler/distinfo index cf6198aa6df..54ee0b95eeb 100644 --- a/print/poppler/distinfo +++ b/print/poppler/distinfo @@ -1,8 +1,10 @@ -$NetBSD: distinfo,v 1.22 2008/02/01 21:12:41 drochner Exp $ +$NetBSD: distinfo,v 1.23 2008/04/15 19:57:00 drochner Exp $ -SHA1 (poppler-0.6.4.tar.gz) = edd248b278ceb81f8820b1a2be8abfe05ca36465 -RMD160 (poppler-0.6.4.tar.gz) = 5ece435aeac5b6cbf4e73f89c1096932a051f23e -Size (poppler-0.6.4.tar.gz) = 1294481 bytes -SHA1 (patch-aa) = af2a87317bd613e64b13e49ec92d3654f3ceb689 -SHA1 (patch-ab) = 8cb260eb13eba003f5b0ecb825bdb1a4785f042b -SHA1 (patch-ag) = f47995589fa99df9ffb26b69b347817cc95ee111 +SHA1 (poppler-0.8.0.tar.gz) = 4f1ac5daca63b1a119d3e7446b296b0990246cf4 +RMD160 (poppler-0.8.0.tar.gz) = 390b870fca46f6651a0d41c5fc0994661daa3b55 +Size (poppler-0.8.0.tar.gz) = 1447799 bytes +SHA1 (patch-aa) = 43c63c16d3a845e394a8eb0c3a321944fcf17615 +SHA1 (patch-ab) = e3d413ec50a098af06cb2efc2fac2042064498dd +SHA1 (patch-ag) = d1581a1ca40bba34146a4a6f4ee7d38b8f6ff3b7 +SHA1 (patch-ah) = b1a1d0eec0906ea1182ea059ae41422494984c7c +SHA1 (patch-ai) = b93a6bf6fb67f601f45d2f11417ac0702e5ea37e diff --git a/print/poppler/patches/patch-aa b/print/poppler/patches/patch-aa index 169df5bbd9a..133b3232899 100644 --- a/print/poppler/patches/patch-aa +++ b/print/poppler/patches/patch-aa @@ -1,40 +1,40 @@ -$NetBSD: patch-aa,v 1.8 2007/11/28 20:54:37 drochner Exp $ +$NetBSD: patch-aa,v 1.9 2008/04/15 19:57:00 drochner Exp $ ---- glib/Makefile.in.orig 2007-11-10 13:04:33.000000000 +0100 +--- glib/Makefile.in.orig 2008-03-26 19:40:19.000000000 +0100 +++ glib/Makefile.in -@@ -66,7 +66,7 @@ am__DEPENDENCIES_1 = +@@ -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) libpoppler_glib_la_DEPENDENCIES = \ - $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \ + $(prefix)/lib/libpoppler.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_2) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) am__objects_1 = poppler-enums.lo -@@ -78,7 +78,7 @@ PROGRAMS = $(noinst_PROGRAMS) - am_test_poppler_glib_OBJECTS = test-poppler-glib.$(OBJEXT) +@@ -79,7 +79,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) - test_poppler_glib_DEPENDENCIES = \ -- $(top_builddir)/poppler/libpoppler.la libpoppler-glib.la \ -+ $(prefix)/lib/libpoppler.la libpoppler-glib.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_2) - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler -@@ -324,7 +324,7 @@ libpoppler_glib_la_SOURCES = \ + @BUILD_WITH_GDK_TRUE@test_poppler_glib_DEPENDENCIES = \ +-@BUILD_WITH_GDK_TRUE@ $(top_builddir)/poppler/libpoppler.la \ ++@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 = \ poppler-private.h libpoppler_glib_la_LIBADD = \ - $(top_builddir)/poppler/libpoppler.la \ + $(prefix)/lib/libpoppler.la \ $(POPPLER_GLIB_LIBS) \ + $(GDK_LIBS) \ $(FREETYPE_LIBS) \ - $(FONTCONFIG_LIBS) \ -@@ -335,7 +335,7 @@ test_poppler_glib_SOURCES = \ - test-poppler-glib.cc +@@ -330,7 +330,7 @@ libpoppler_glib_la_LDFLAGS = -version-in + @BUILD_WITH_GDK_TRUE@ test-poppler-glib.cc - test_poppler_glib_LDADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ $(prefix)/lib/libpoppler.la \ - libpoppler-glib.la \ - $(POPPLER_GLIB_LIBS) \ - $(FREETYPE_LIBS) \ + @BUILD_WITH_GDK_TRUE@test_poppler_glib_LDADD = \ +-@BUILD_WITH_GDK_TRUE@ $(top_builddir)/poppler/libpoppler.la \ ++@BUILD_WITH_GDK_TRUE@ $(prefix)/lib/libpoppler.la \ + @BUILD_WITH_GDK_TRUE@ libpoppler-glib.la \ + @BUILD_WITH_GDK_TRUE@ $(POPPLER_GLIB_LIBS) \ + @BUILD_WITH_GDK_TRUE@ $(GDK_LIBS) \ diff --git a/print/poppler/patches/patch-ab b/print/poppler/patches/patch-ab index 54d1a99811e..de8cded1084 100644 --- a/print/poppler/patches/patch-ab +++ b/print/poppler/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.7 2007/11/03 16:10:39 drochner Exp $ +$NetBSD: patch-ab,v 1.8 2008/04/15 19:57:00 drochner Exp $ ---- utils/Makefile.in.orig 2007-08-15 01:30:09.000000000 +0200 +--- utils/Makefile.in.orig 2008-03-26 19:40:20.000000000 +0100 +++ utils/Makefile.in -@@ -52,7 +52,7 @@ mkinstalldirs = $(install_sh) -d +@@ -48,7 +48,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h \ $(top_builddir)/poppler/poppler-config.h CONFIG_CLEAN_FILES = @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.7 2007/11/03 16:10:39 drochner Exp $ @BUILD_ABIWORD_OUTPUT_TRUE@am__EXEEXT_2 = pdftoabw$(EXEEXT) am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -@@ -62,18 +62,18 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) +@@ -58,18 +58,18 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) pdffonts_OBJECTS = $(am_pdffonts_OBJECTS) pdffonts_LDADD = $(LDADD) am__DEPENDENCIES_1 = @@ -33,7 +33,7 @@ $NetBSD: patch-ab,v 1.7 2007/11/03 16:10:39 drochner Exp $ $(am__DEPENDENCIES_1) am__pdftoabw_SOURCES_DIST = pdftoabw.cc parseargs.c parseargs.h @BUILD_ABIWORD_OUTPUT_TRUE@am_pdftoabw_OBJECTS = pdftoabw.$(OBJEXT) \ -@@ -86,24 +86,24 @@ am_pdftohtml_OBJECTS = pdftohtml.$(OBJEX +@@ -82,24 +82,24 @@ am_pdftohtml_OBJECTS = pdftohtml.$(OBJEX HtmlLinks.$(OBJEXT) HtmlOutputDev.$(OBJEXT) $(am__objects_1) pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS) pdftohtml_LDADD = $(LDADD) @@ -62,11 +62,11 @@ $NetBSD: patch-ab,v 1.7 2007/11/03 16:10:39 drochner Exp $ -pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ +pdftotext_DEPENDENCIES = $(prefix)/lib/libpoppler.la \ $(am__DEPENDENCIES_1) - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler depcomp = $(SHELL) $(top_srcdir)/depcomp -@@ -301,12 +301,12 @@ sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ +@@ -282,12 +282,12 @@ target_alias = @target_alias@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ win32_libs = @win32_libs@ -@BUILD_SPLASH_OUTPUT_TRUE@pdftoppm_SOURCES = \ -@BUILD_SPLASH_OUTPUT_TRUE@ pdftoppm.cc \ @@ -82,7 +82,7 @@ $NetBSD: patch-ab,v 1.7 2007/11/03 16:10:39 drochner Exp $ @BUILD_ABIWORD_OUTPUT_TRUE@pdftoabw_SOURCES = \ @BUILD_ABIWORD_OUTPUT_TRUE@ pdftoabw.cc \ @BUILD_ABIWORD_OUTPUT_TRUE@ $(common) -@@ -321,9 +321,10 @@ INCLUDES = \ +@@ -302,9 +302,10 @@ INCLUDES = \ $(ABIWORD_CFLAGS) LDADD = \ diff --git a/print/poppler/patches/patch-ag b/print/poppler/patches/patch-ag index dd7ac1e5c5b..e20f77b7082 100644 --- a/print/poppler/patches/patch-ag +++ b/print/poppler/patches/patch-ag @@ -1,22 +1,31 @@ -$NetBSD: patch-ag,v 1.1 2007/12/12 01:25:18 markd Exp $ +$NetBSD: patch-ag,v 1.2 2008/04/15 19:57:00 drochner Exp $ ---- qt4/src/Makefile.in.orig 2007-12-09 22:59:10.000000000 +1300 +--- qt4/src/Makefile.in.orig 2008-03-26 19:40:20.000000000 +0100 +++ qt4/src/Makefile.in -@@ -66,7 +66,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES) +@@ -61,7 +61,7 @@ libLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = - @BUILD_SPLASH_OUTPUT_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler-arthur.la libpoppler_qt4_la_DEPENDENCIES = \ - $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \ + $(prefix)/lib/libpoppler.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) + $(am__DEPENDENCIES_1) $(am__append_1) am_libpoppler_qt4_la_OBJECTS = poppler-document.lo poppler-page.lo \ poppler-fontinfo.lo poppler-embeddedfile.lo poppler-textbox.lo \ -@@ -299,7 +299,7 @@ libpoppler_qt4_la_SOURCES = \ - poppler-annotation-private.h \ +@@ -297,7 +297,7 @@ libpoppler_qt4_la_SOURCES = \ + poppler-export.h \ poppler-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 2:0:0 + libpoppler_qt4_la_LDFLAGS = -version-info 3:0:0 all: all-am +@@ -622,7 +622,7 @@ SUFFIXES: .moc + + # This rule lets GNU make create any *.moc from the equivalent *.h + .h.moc: +- moc -i $< -o $@ ++ ${QTDIR}/bin/moc -i $< -o $@ + + poppler-optcontent.lo: poppler-optcontent.moc + diff --git a/print/poppler/patches/patch-ah b/print/poppler/patches/patch-ah new file mode 100644 index 00000000000..077fe5f63fa --- /dev/null +++ b/print/poppler/patches/patch-ah @@ -0,0 +1,50 @@ +$NetBSD: patch-ah,v 1.1 2008/04/15 19:57:00 drochner Exp $ + +--- poppler/CairoFontEngine.cc.orig 2008-01-29 23:03:38.000000000 +0100 ++++ poppler/CairoFontEngine.cc +@@ -31,11 +31,10 @@ static void fileWrite(void *stream, char + // CairoFont + //------------------------------------------------------------------------ + +-static void cairo_font_face_destroy (void *data) ++static void _ft_done_face (void *data) + { +- CairoFont *font = (CairoFont *) data; +- +- delete font; ++ FT_Face face = (FT_Face) data; ++ FT_Done_Face (face); + } + + CairoFont *CairoFont::create(GfxFont *gfxFont, XRef *xref, FT_Library lib, GBool useCIDs) { +@@ -224,16 +223,16 @@ CairoFont *CairoFont::create(GfxFont *gf + cairo_font_face = cairo_ft_font_face_create_for_ft_face (face, + FT_LOAD_NO_HINTING | + FT_LOAD_NO_BITMAP); +- if (cairo_font_face == NULL) { +- error(-1, "could not create cairo font\n"); ++ if (cairo_font_face_status (cairo_font_face)) { ++ error(-1, "could not create cairo font: %s\n", cairo_status_to_string (cairo_font_face_status (cairo_font_face))); + goto err2; /* this doesn't do anything, but it looks like we're + * handling the error */ + } { + CairoFont *ret = new CairoFont(ref, cairo_font_face, face, codeToGID, codeToGIDLen, substitute); +- cairo_font_face_set_user_data (cairo_font_face, ++ cairo_font_face_set_user_data (cairo_font_face, + &cairo_font_face_key, +- ret, +- cairo_font_face_destroy); ++ face, ++ _ft_done_face); + + return ret; + } +@@ -249,7 +248,7 @@ CairoFont::CairoFont(Ref ref, cairo_font + codeToGIDLen(codeToGIDLen), substitute(substitute) { } + + CairoFont::~CairoFont() { +- FT_Done_Face (face); ++ cairo_font_face_destroy (cairo_font_face); + gfree(codeToGID); + } + diff --git a/print/poppler/patches/patch-ai b/print/poppler/patches/patch-ai new file mode 100644 index 00000000000..1b9d515d3d8 --- /dev/null +++ b/print/poppler/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.1 2008/04/15 19:57:00 drochner Exp $ + +--- poppler/Gfx.cc.orig 2008-04-15 21:36:33.000000000 +0200 ++++ poppler/Gfx.cc +@@ -3627,7 +3627,7 @@ void Gfx::doImage(Object *ref, Stream *s + obj1.free(); + dict->lookup("CS", &obj1); + } +- if (obj1.isName()) { ++ if (obj1.isName() && inlineImg) { + res->lookupColorSpace(obj1.getName(), &obj2); + if (!obj2.isNull()) { + obj1.free(); -- cgit v1.2.3