head 1.7; access; symbols pkgsrc-2013Q2:1.7.0.4 pkgsrc-2013Q2-base:1.7 pkgsrc-2012Q4:1.7.0.2 pkgsrc-2012Q4-base:1.7 pkgsrc-2012Q3:1.6.0.2 pkgsrc-2012Q3-base:1.6 pkgsrc-2012Q2:1.4.0.12 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.10 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.8 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.6 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.4 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.2 pkgsrc-2011Q1-base:1.4 pkgsrc-2009Q4:1.2.0.2 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.1.0.2 pkgsrc-2009Q3-base:1.1; locks; strict; comment @# @; 1.7 date 2012.12.18.14.01.06; author drochner; state dead; branches; next 1.6; 1.6 date 2012.07.05.10.23.31; author wiz; state Exp; branches; next 1.5; 1.5 date 2012.07.04.20.33.15; author drochner; state Exp; branches; next 1.4; 1.4 date 2011.02.05.07.57.15; author adam; state Exp; branches; next 1.3; 1.3 date 2011.01.16.18.18.19; author tnn; state Exp; branches; next 1.2; 1.2 date 2009.11.29.20.51.51; author tnn; state dead; branches; next 1.1; 1.1 date 2009.10.06.00.53.26; author dmcmahill; state Exp; branches; next ; desc @@ 1.7 log @update to 0.48.4 changes: -bugfixes -patches to allow build against newer png and poppler were included -security fix for "XXE" vulneralility: inkscape could be used to put contents of other files into SVG output @ text @$NetBSD: patch-am,v 1.6 2012/07/05 10:23:31 wiz Exp $ First chunk: Fix build with poppler-0.20. Second chunk: Fix build with png-1.5. --- src/extension/internal/pdfinput/svg-builder.cpp.orig 2011-07-08 18:25:09.000000000 +0000 +++ src/extension/internal/pdfinput/svg-builder.cpp @@@@ -961,9 +961,7 @@@@ void SvgBuilder::updateFont(GfxState *st _font_style = sp_repr_css_attr_new(); GfxFont *font = state->getFont(); // Store original name - if (font->getOrigName()) { - _font_specification = font->getOrigName()->getCString(); - } else if (font->getName()) { + if (font->getName()) { _font_specification = font->getName()->getCString(); } else { _font_specification = (char*) "Arial"; @@@@ -1443,7 +1441,7 @@@@ Inkscape::XML::Node *SvgBuilder::_create return NULL; } // Set error handler - if (setjmp(png_ptr->jmpbuf)) { + if (setjmp(png_jmpbuf(png_ptr))) { png_destroy_write_struct(&png_ptr, &info_ptr); return NULL; } @ 1.6 log @Add comment (hi drochner!) @ text @d1 1 a1 1 $NetBSD: patch-am,v 1.5 2012/07/04 20:33:15 drochner Exp $ @ 1.5 log @make this build with poppler-0.20, bump PKGREV @ text @d1 4 a4 1 $NetBSD$ @ 1.4 log @Changes 0.48.1: No release information available. @ text @d1 1 a1 1 $NetBSD: patch-am,v 1.3 2011/01/16 18:18:19 tnn Exp $ d3 1 a3 1 --- src/extension/internal/pdfinput/svg-builder.cpp.orig 2010-07-13 03:48:40.000000000 +0000 d5 12 a16 1 @@@@ -1443,7 +1443,7 @@@@ Inkscape::XML::Node *SvgBuilder::_create @ 1.3 log @png-1.5 build fix @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 @@@@ -1440,7 +1440,7 @@@@ Inkscape::XML::Node *SvgBuilder::_create @ 1.2 log @Update to inkscape-0.47. -- Inkscape 0.47 brings a host of important improvements all across the program: * Timed autosave: no more lost work * Spiro splines: an exciting new way to work with paths, fully supported in Pen, Pencil, and Node tools * Auto smooth nodes: a new type of node that keeps the path as smooth as possible as you move it or its neighbors * New modes in Tweak tool: pushing and jittering whole objects, scaling/rotating objects, deleting and duplicating using the "soft brush" * Reworked, much more usable snapping system and a Snapping toolbar * New path effects, including sketch, hatching, envelope deformation; effects can be stacked and assigned to groups * A huge collection of preset filters in the new Filters menu * New cairo-based PS and EPS export: improved quality, more features supported, fallback rasterization for filters and transparency * Spell checker for text objects in a document * Many new extensions: restacking, calendar, printing marks, cartesian and polar grids, interpolating attributes * Optimized SVG code options, now with their own Preferences page @ text @d1 1 a1 1 $NetBSD: patch-am,v 1.1 2009/10/06 00:53:26 dmcmahill Exp $ d3 11 a13 10 gcc44 fixes --- src/streams-zlib.cpp.orig 2008-03-11 04:19:29.000000000 +0000 +++ src/streams-zlib.cpp 2009-10-05 19:41:10.000000000 +0000 @@@@ -10,4 +10,5 @@@@ */ +#include #include #include @ 1.1 log @add missing headers to let this build with gcc44 @ text @d1 1 a1 1 $NetBSD$ @