From 976e1f0e93b282160b0804d137999f9c17c6b51e Mon Sep 17 00:00:00 2001 From: tnn Date: Sun, 29 Nov 2009 20:51:51 +0000 Subject: 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 --- graphics/inkscape/Makefile | 7 +- graphics/inkscape/PLIST | 288 +++++++++++++++++++++++++++++++++---- graphics/inkscape/distinfo | 24 ++-- graphics/inkscape/patches/patch-ab | 8 +- graphics/inkscape/patches/patch-af | 8 +- graphics/inkscape/patches/patch-ah | 39 ++--- graphics/inkscape/patches/patch-ai | 19 ++- graphics/inkscape/patches/patch-aj | 33 ++--- graphics/inkscape/patches/patch-ak | 73 +++------- graphics/inkscape/patches/patch-al | 12 -- graphics/inkscape/patches/patch-am | 12 -- graphics/inkscape/patches/patch-an | 13 -- graphics/inkscape/patches/patch-ao | 13 -- 13 files changed, 338 insertions(+), 211 deletions(-) delete mode 100644 graphics/inkscape/patches/patch-al delete mode 100644 graphics/inkscape/patches/patch-am delete mode 100644 graphics/inkscape/patches/patch-an delete mode 100644 graphics/inkscape/patches/patch-ao (limited to 'graphics/inkscape') diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index ef7a8252fb1..05e5942ea98 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.45 2009/11/22 16:08:46 drochner Exp $ +# $NetBSD: Makefile,v 1.46 2009/11/29 20:51:51 tnn Exp $ -DISTNAME= inkscape-0.46 -PKGREVISION= 6 +DISTNAME= inkscape-0.47 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=inkscape/} EXTRACT_SUFX= .tar.bz2 @@ -16,6 +15,7 @@ PKG_DESTDIR_SUPPORT= user-destdir BUILD_DEPENDS+= libiconv-[0-9]*:../../converters/libiconv .endif +EXTRACT_USING= bsdtar GCC_REQD+= 3.0 USE_LANGUAGES= c c++ USE_LIBTOOL= yes @@ -53,6 +53,7 @@ BUILDLINK_API_DEPENDS.poppler-includes+= poppler-includes>=0.12.2 .include "../../graphics/lcms/buildlink3.mk" .include "../../graphics/libart/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../math/gsl/buildlink3.mk" .include "../../print/poppler-glib/buildlink3.mk" .include "../../print/poppler-includes/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" diff --git a/graphics/inkscape/PLIST b/graphics/inkscape/PLIST index 842d6c05d47..7501f85f3cb 100644 --- a/graphics/inkscape/PLIST +++ b/graphics/inkscape/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.16 2009/06/14 17:59:18 joerg Exp $ +@comment $NetBSD: PLIST,v 1.17 2009/11/29 20:51:51 tnn Exp $ bin/inkscape bin/inkview man/fr/man1/inkscape.1 @@ -18,6 +18,7 @@ share/inkscape/examples/blend_modes.svg share/inkscape/examples/car.svgz share/inkscape/examples/data_uri.svg share/inkscape/examples/eastern-motive-P4G.svg +share/inkscape/examples/filters.svg share/inkscape/examples/flow-go.svg share/inkscape/examples/flowsample.svg share/inkscape/examples/gallardo.svgz @@ -27,17 +28,20 @@ share/inkscape/examples/gradient.svg share/inkscape/examples/i18n.svg share/inkscape/examples/istest.pov share/inkscape/examples/l-systems.svgz -share/inkscape/examples/lighting_effects.svg +share/inkscape/examples/lighting_filters.svg share/inkscape/examples/live-path-effects-curvestitch.svg share/inkscape/examples/live-path-effects-gears.svg share/inkscape/examples/live-path-effects-pathalongpath.svg share/inkscape/examples/markers.svg +share/inkscape/examples/replace-hue.svg share/inkscape/examples/rope-3D.svg share/inkscape/examples/stars.svgz +share/inkscape/examples/svgfont.svg share/inkscape/examples/tesselation-P3.svg share/inkscape/examples/text-on-path.svg share/inkscape/examples/tiger.svgz -share/inkscape/examples/turbulence_effects.svg +share/inkscape/examples/tref.svg +share/inkscape/examples/turbulence_filters.svg share/inkscape/extensions/Barcode/Base.py share/inkscape/extensions/Barcode/Code128.py share/inkscape/extensions/Barcode/Code39.py @@ -49,17 +53,119 @@ share/inkscape/extensions/Barcode/RM4CC.py share/inkscape/extensions/Barcode/UPCA.py share/inkscape/extensions/Barcode/UPCE.py share/inkscape/extensions/Barcode/__init__.py +share/inkscape/extensions/Inkscape.pm +share/inkscape/extensions/Poly3DObjects/cube.obj +share/inkscape/extensions/Poly3DObjects/cuboct.obj +share/inkscape/extensions/Poly3DObjects/dodec.obj +share/inkscape/extensions/Poly3DObjects/great_dodec.obj +share/inkscape/extensions/Poly3DObjects/great_rhombicosidodec.obj +share/inkscape/extensions/Poly3DObjects/great_rhombicuboct.obj +share/inkscape/extensions/Poly3DObjects/great_stel_dodec.obj +share/inkscape/extensions/Poly3DObjects/icos.obj +share/inkscape/extensions/Poly3DObjects/icosidodec.obj +share/inkscape/extensions/Poly3DObjects/jessens_orthog_icos.obj +share/inkscape/extensions/Poly3DObjects/methane.obj +share/inkscape/extensions/Poly3DObjects/oct.obj +share/inkscape/extensions/Poly3DObjects/rh_axes.obj +share/inkscape/extensions/Poly3DObjects/rhomb_dodec.obj +share/inkscape/extensions/Poly3DObjects/rhomb_triacont.obj +share/inkscape/extensions/Poly3DObjects/small_rhombicosidodec.obj +share/inkscape/extensions/Poly3DObjects/small_rhombicuboct.obj +share/inkscape/extensions/Poly3DObjects/small_triam_icos.obj +share/inkscape/extensions/Poly3DObjects/snub_cube.obj +share/inkscape/extensions/Poly3DObjects/snub_dodec.obj +share/inkscape/extensions/Poly3DObjects/szilassi.obj +share/inkscape/extensions/Poly3DObjects/tet.obj +share/inkscape/extensions/Poly3DObjects/trunc_cube.obj +share/inkscape/extensions/Poly3DObjects/trunc_dodec.obj +share/inkscape/extensions/Poly3DObjects/trunc_icos.obj +share/inkscape/extensions/Poly3DObjects/trunc_oct.obj +share/inkscape/extensions/Poly3DObjects/trunc_tet.obj share/inkscape/extensions/SpSVG.pm share/inkscape/extensions/addnodes.inx share/inkscape/extensions/addnodes.py share/inkscape/extensions/ai_input.inx -share/inkscape/extensions/ai_output.inx share/inkscape/extensions/aisvg.inx share/inkscape/extensions/aisvg.xslt +share/inkscape/extensions/alphabet_soup/2.svg +share/inkscape/extensions/alphabet_soup/3.svg +share/inkscape/extensions/alphabet_soup/6.svg +share/inkscape/extensions/alphabet_soup/7.svg +share/inkscape/extensions/alphabet_soup/Cblob.svg +share/inkscape/extensions/alphabet_soup/Chook.svg +share/inkscape/extensions/alphabet_soup/Ctail.svg +share/inkscape/extensions/alphabet_soup/Delta.svg +share/inkscape/extensions/alphabet_soup/Eb.svg +share/inkscape/extensions/alphabet_soup/Eserif.svg +share/inkscape/extensions/alphabet_soup/Et.svg +share/inkscape/extensions/alphabet_soup/G.svg +share/inkscape/extensions/alphabet_soup/IBSerif.svg +share/inkscape/extensions/alphabet_soup/ITSerif.svg +share/inkscape/extensions/alphabet_soup/Lb.svg +share/inkscape/extensions/alphabet_soup/Lt.svg +share/inkscape/extensions/alphabet_soup/Ocross.svg +share/inkscape/extensions/alphabet_soup/Oterm.svg +share/inkscape/extensions/alphabet_soup/P.svg +share/inkscape/extensions/alphabet_soup/Q.svg +share/inkscape/extensions/alphabet_soup/Rblock.svg +share/inkscape/extensions/alphabet_soup/Tb.svg +share/inkscape/extensions/alphabet_soup/Tt.svg +share/inkscape/extensions/alphabet_soup/U.svg +share/inkscape/extensions/alphabet_soup/Vser.svg +share/inkscape/extensions/alphabet_soup/Xh.svg +share/inkscape/extensions/alphabet_soup/Xne.svg +share/inkscape/extensions/alphabet_soup/Xnw.svg +share/inkscape/extensions/alphabet_soup/Xvb.svg +share/inkscape/extensions/alphabet_soup/Xvt.svg +share/inkscape/extensions/alphabet_soup/a.svg +share/inkscape/extensions/alphabet_soup/abase.svg +share/inkscape/extensions/alphabet_soup/acap.svg +share/inkscape/extensions/alphabet_soup/b.svg +share/inkscape/extensions/alphabet_soup/bar.svg +share/inkscape/extensions/alphabet_soup/bar2.svg +share/inkscape/extensions/alphabet_soup/barcap.svg +share/inkscape/extensions/alphabet_soup/c.svg +share/inkscape/extensions/alphabet_soup/cross.svg +share/inkscape/extensions/alphabet_soup/cserif.svg +share/inkscape/extensions/alphabet_soup/e.svg +share/inkscape/extensions/alphabet_soup/epsilon.svg +share/inkscape/extensions/alphabet_soup/f.svg +share/inkscape/extensions/alphabet_soup/gamma.svg +share/inkscape/extensions/alphabet_soup/h.svg +share/inkscape/extensions/alphabet_soup/h2.svg +share/inkscape/extensions/alphabet_soup/hcap.svg +share/inkscape/extensions/alphabet_soup/idot.svg +share/inkscape/extensions/alphabet_soup/j.svg +share/inkscape/extensions/alphabet_soup/k.svg +share/inkscape/extensions/alphabet_soup/l.svg +share/inkscape/extensions/alphabet_soup/lserif.svg +share/inkscape/extensions/alphabet_soup/m.svg +share/inkscape/extensions/alphabet_soup/mcap.svg +share/inkscape/extensions/alphabet_soup/n.svg +share/inkscape/extensions/alphabet_soup/o.svg +share/inkscape/extensions/alphabet_soup/ocap.svg +share/inkscape/extensions/alphabet_soup/question.svg +share/inkscape/extensions/alphabet_soup/r.svg +share/inkscape/extensions/alphabet_soup/rcap.svg +share/inkscape/extensions/alphabet_soup/s.svg +share/inkscape/extensions/alphabet_soup/serif.svg +share/inkscape/extensions/alphabet_soup/t.svg +share/inkscape/extensions/alphabet_soup/tserif.svg +share/inkscape/extensions/alphabet_soup/v.svg +share/inkscape/extensions/alphabet_soup/vcap.svg +share/inkscape/extensions/alphabet_soup/vserl.svg +share/inkscape/extensions/alphabet_soup/vserr.svg +share/inkscape/extensions/alphabet_soup/x.svg +share/inkscape/extensions/alphabet_soup/y.svg +share/inkscape/extensions/alphabet_soup/yogh.svg +share/inkscape/extensions/alphabet_soup/z.svg share/inkscape/extensions/bezmisc.py -share/inkscape/extensions/cdr2svg.sh +share/inkscape/extensions/ccx_input.inx share/inkscape/extensions/cdr_input.inx +share/inkscape/extensions/cdt_input.inx +share/inkscape/extensions/cgm_input.inx share/inkscape/extensions/chardataeffect.py +share/inkscape/extensions/cmx_input.inx share/inkscape/extensions/color_brighter.inx share/inkscape/extensions/color_brighter.py share/inkscape/extensions/color_custom.inx @@ -98,6 +204,8 @@ share/inkscape/extensions/color_rgbbarrel.inx share/inkscape/extensions/color_rgbbarrel.py share/inkscape/extensions/coloreffect.py share/inkscape/extensions/colors.xml +share/inkscape/extensions/convert2dashes.inx +share/inkscape/extensions/convert2dashes.py share/inkscape/extensions/cspsubdiv.py share/inkscape/extensions/cubicsuperpath.py share/inkscape/extensions/dia.inx @@ -106,28 +214,35 @@ share/inkscape/extensions/dimension.inx share/inkscape/extensions/dimension.py share/inkscape/extensions/dots.inx share/inkscape/extensions/dots.py +share/inkscape/extensions/draw_from_triangle.inx +share/inkscape/extensions/draw_from_triangle.py share/inkscape/extensions/dxf_input.inx +share/inkscape/extensions/dxf_input.py share/inkscape/extensions/dxf_outlines.inx share/inkscape/extensions/dxf_outlines.py share/inkscape/extensions/dxf_output.inx +share/inkscape/extensions/dxf_templates.py share/inkscape/extensions/edge3d.inx share/inkscape/extensions/edge3d.py share/inkscape/extensions/embed_raster_in_svg.pl share/inkscape/extensions/embedimage.inx share/inkscape/extensions/embedimage.py share/inkscape/extensions/eps_input.inx -share/inkscape/extensions/epsi_output.inx share/inkscape/extensions/eqtexsvg.inx share/inkscape/extensions/eqtexsvg.py share/inkscape/extensions/export_gimp_palette.inx share/inkscape/extensions/export_gimp_palette.py share/inkscape/extensions/extractimage.inx share/inkscape/extensions/extractimage.py +share/inkscape/extensions/extrude.inx +share/inkscape/extensions/extrude.py share/inkscape/extensions/ffgeom.py -share/inkscape/extensions/fig2svg.sh +share/inkscape/extensions/fig2dev-ext.py share/inkscape/extensions/fig_input.inx share/inkscape/extensions/flatten.inx share/inkscape/extensions/flatten.py +share/inkscape/extensions/foldablebox.inx +share/inkscape/extensions/foldablebox.py share/inkscape/extensions/fractalize.inx share/inkscape/extensions/fractalize.py share/inkscape/extensions/funcplot.inx @@ -136,12 +251,18 @@ share/inkscape/extensions/gears.inx share/inkscape/extensions/gears.py share/inkscape/extensions/gimp_xcf.inx share/inkscape/extensions/gimp_xcf.py +share/inkscape/extensions/grid_cartesian.inx +share/inkscape/extensions/grid_cartesian.py +share/inkscape/extensions/grid_polar.inx +share/inkscape/extensions/grid_polar.py +share/inkscape/extensions/guides_creator.inx +share/inkscape/extensions/guides_creator.py share/inkscape/extensions/handles.inx share/inkscape/extensions/handles.py +share/inkscape/extensions/hpgl_output.inx +share/inkscape/extensions/hpgl_output.py share/inkscape/extensions/ill2svg.pl share/inkscape/extensions/inkex.py -share/inkscape/extensions/inkscape-shadow-white.sh -share/inkscape/extensions/inkscape-shadow.sh share/inkscape/extensions/inkscape_help_askaquestion.inx share/inkscape/extensions/inkscape_help_commandline.inx share/inkscape/extensions/inkscape_help_faq.inx @@ -150,8 +271,13 @@ share/inkscape/extensions/inkscape_help_manual.inx share/inkscape/extensions/inkscape_help_relnotes.inx share/inkscape/extensions/inkscape_help_reportabug.inx share/inkscape/extensions/inkscape_help_svgspec.inx +share/inkscape/extensions/inkweb.js +share/inkscape/extensions/inkwebeffect.py share/inkscape/extensions/interp.inx share/inkscape/extensions/interp.py +share/inkscape/extensions/interp_att_g.inx +share/inkscape/extensions/interp_att_g.py +share/inkscape/extensions/launch_webbrowser.py share/inkscape/extensions/lindenmayer.inx share/inkscape/extensions/lindenmayer.py share/inkscape/extensions/lorem_ipsum.inx @@ -164,35 +290,52 @@ share/inkscape/extensions/motion.inx share/inkscape/extensions/motion.py share/inkscape/extensions/outline2svg.inx share/inkscape/extensions/outline2svg.pl +share/inkscape/extensions/param_curves.inx +share/inkscape/extensions/param_curves.py share/inkscape/extensions/pathalongpath.inx share/inkscape/extensions/pathalongpath.py share/inkscape/extensions/pathmodifier.py -share/inkscape/extensions/pdf_output.inx.txt -share/inkscape/extensions/pdf_output_via_gs_on_win32.inx.txt +share/inkscape/extensions/pathscatter.inx +share/inkscape/extensions/pathscatter.py share/inkscape/extensions/perfectboundcover.inx share/inkscape/extensions/perfectboundcover.py share/inkscape/extensions/perspective.inx share/inkscape/extensions/perspective.py +share/inkscape/extensions/plt_input.inx +share/inkscape/extensions/plt_output.inx +share/inkscape/extensions/plt_output.py +share/inkscape/extensions/polyhedron_3d.inx +share/inkscape/extensions/polyhedron_3d.py +share/inkscape/extensions/printing-marks.inx +share/inkscape/extensions/printing-marks.py share/inkscape/extensions/ps2dxf.sh -share/inkscape/extensions/ps2epsi.sh -share/inkscape/extensions/ps2pdf.cmd -share/inkscape/extensions/ps2pdf.sh +share/inkscape/extensions/ps2pdf-ext.py share/inkscape/extensions/ps_input.inx share/inkscape/extensions/pturtle.py share/inkscape/extensions/radiusrand.inx share/inkscape/extensions/radiusrand.py -share/inkscape/extensions/randompnt.inx -share/inkscape/extensions/randompos.inx +share/inkscape/extensions/render_alphabetsoup.inx +share/inkscape/extensions/render_alphabetsoup.py +share/inkscape/extensions/render_alphabetsoup_config.py share/inkscape/extensions/render_barcode.inx share/inkscape/extensions/render_barcode.py +share/inkscape/extensions/restack.inx +share/inkscape/extensions/restack.py share/inkscape/extensions/rtree.inx share/inkscape/extensions/rtree.py share/inkscape/extensions/rubberstretch.inx share/inkscape/extensions/rubberstretch.py +share/inkscape/extensions/run_command.py +share/inkscape/extensions/scour.inkscape.py +share/inkscape/extensions/scour.inx +share/inkscape/extensions/scour.py share/inkscape/extensions/simplepath.py share/inkscape/extensions/simplepath.rb share/inkscape/extensions/simplestyle.py share/inkscape/extensions/simpletransform.py +share/inkscape/extensions/sk1_input.inx +share/inkscape/extensions/sk1_output.inx +share/inkscape/extensions/sk1_output.py share/inkscape/extensions/sk2svg.sh share/inkscape/extensions/sk_input.inx share/inkscape/extensions/spirograph.inx @@ -205,8 +348,11 @@ share/inkscape/extensions/svg2xaml.inx share/inkscape/extensions/svg2xaml.xsl share/inkscape/extensions/svg_and_media_zip_output.inx share/inkscape/extensions/svg_and_media_zip_output.py -share/inkscape/extensions/svgz_input.inx -share/inkscape/extensions/svgz_output.inx +share/inkscape/extensions/svg_regex.py +share/inkscape/extensions/svgcalendar.inx +share/inkscape/extensions/svgcalendar.py +share/inkscape/extensions/text_braille.inx +share/inkscape/extensions/text_braille.py share/inkscape/extensions/text_flipcase.inx share/inkscape/extensions/text_flipcase.py share/inkscape/extensions/text_lowercase.inx @@ -221,19 +367,21 @@ share/inkscape/extensions/text_titlecase.inx share/inkscape/extensions/text_titlecase.py share/inkscape/extensions/text_uppercase.inx share/inkscape/extensions/text_uppercase.py +share/inkscape/extensions/triangle.inx +share/inkscape/extensions/triangle.py share/inkscape/extensions/txt2svg.inx share/inkscape/extensions/txt2svg.pl -share/inkscape/extensions/webbrowser_askaquestion.py -share/inkscape/extensions/webbrowser_commandline.py -share/inkscape/extensions/webbrowser_faq.py -share/inkscape/extensions/webbrowser_keys.py -share/inkscape/extensions/webbrowser_manual.py -share/inkscape/extensions/webbrowser_relnotes.py -share/inkscape/extensions/webbrowser_reportabug.py -share/inkscape/extensions/webbrowser_svgspec.py +share/inkscape/extensions/uniconv-ext.py +share/inkscape/extensions/uniconv_output.py +share/inkscape/extensions/web-set-att.inx +share/inkscape/extensions/web-set-att.py +share/inkscape/extensions/web-transmit-att.inx +share/inkscape/extensions/web-transmit-att.py share/inkscape/extensions/whirl.inx share/inkscape/extensions/whirl.py share/inkscape/extensions/wmf_input.inx +share/inkscape/extensions/wmf_output.inx +share/inkscape/extensions/wmf_output.py share/inkscape/extensions/xaml2svg.inx share/inkscape/extensions/xaml2svg.xsl share/inkscape/extensions/xaml2svg/Makefile.am @@ -244,10 +392,13 @@ share/inkscape/extensions/xaml2svg/geometry.xsl share/inkscape/extensions/xaml2svg/properties.xsl share/inkscape/extensions/xaml2svg/shapes.xsl share/inkscape/extensions/xaml2svg/transform.xsl +share/inkscape/extensions/yocto_css.py +share/inkscape/filters/README +share/inkscape/filters/filters.svg +share/inkscape/filters/filters.svg.h share/inkscape/fonts/README share/inkscape/gradients/README -share/inkscape/icons/README.icon_themes -share/inkscape/icons/README.legacy_icons +share/inkscape/icons/README share/inkscape/icons/feBlend-icon.png share/inkscape/icons/feBlend-icon.svg share/inkscape/icons/feColorMatrix-icon.png @@ -280,7 +431,8 @@ share/inkscape/icons/icons.svg share/inkscape/icons/inkscape.file.png share/inkscape/icons/inkscape.file.svg share/inkscape/icons/inkscape.svg -share/inkscape/icons/legacy_icons.svg +share/inkscape/icons/remove-color.png +share/inkscape/icons/remove-color.svg share/inkscape/icons/tango_icons.svg share/inkscape/icons/ticotico.jpg share/inkscape/keys/acd-canvas.xml @@ -300,12 +452,14 @@ share/inkscape/palettes/Greens.gpl share/inkscape/palettes/Hilite.gpl share/inkscape/palettes/Khaki.gpl share/inkscape/palettes/LaTeX-Beamer.gpl +share/inkscape/palettes/MATLAB-Jet-72.gpl share/inkscape/palettes/README share/inkscape/palettes/Reds.gpl share/inkscape/palettes/Royal.gpl share/inkscape/palettes/Tango-Palette.gpl share/inkscape/palettes/Topographic.gpl share/inkscape/palettes/Ubuntu.gpl +share/inkscape/palettes/echo-palette.gpl share/inkscape/palettes/inkscape.gpl share/inkscape/palettes/svg.gpl share/inkscape/palettes/webhex.gpl @@ -313,10 +467,22 @@ share/inkscape/palettes/websafe22.gpl share/inkscape/palettes/windowsXP.gpl share/inkscape/patterns/README share/inkscape/patterns/patterns.svg +share/inkscape/patterns/patterns.svg.h +share/inkscape/screens/about.be.svg share/inkscape/screens/about.bg.svg share/inkscape/screens/about.br.svg +share/inkscape/screens/about.ca.svg +share/inkscape/screens/about.cs.svg +share/inkscape/screens/about.de.svg +share/inkscape/screens/about.es.svg +share/inkscape/screens/about.eu.svg +share/inkscape/screens/about.fi.svg +share/inkscape/screens/about.fr.svg share/inkscape/screens/about.gl.svg +share/inkscape/screens/about.hu.svg share/inkscape/screens/about.it.svg +share/inkscape/screens/about.nl.svg +share/inkscape/screens/about.pl.svg share/inkscape/screens/about.pt_BR.svg share/inkscape/screens/about.ru.svg share/inkscape/screens/about.sk.svg @@ -324,6 +490,7 @@ share/inkscape/screens/about.sl.svg share/inkscape/screens/about.sr.svg share/inkscape/screens/about.sr@latin.svg share/inkscape/screens/about.svg +share/inkscape/screens/about.uk.svg share/inkscape/templates/A4.svg share/inkscape/templates/A4_landscape.svg share/inkscape/templates/CD_cover_300dpi.svg @@ -338,6 +505,7 @@ share/inkscape/templates/README share/inkscape/templates/black_opaque.svg share/inkscape/templates/business_card_85x54mm.svg share/inkscape/templates/business_card_90x50mm.svg +share/inkscape/templates/default.be.svg share/inkscape/templates/default.ca.svg share/inkscape/templates/default.cs.svg share/inkscape/templates/default.de.svg @@ -348,7 +516,9 @@ share/inkscape/templates/default.fi.svg share/inkscape/templates/default.fr.svg share/inkscape/templates/default.hu.svg share/inkscape/templates/default.it.svg +share/inkscape/templates/default.ja.svg share/inkscape/templates/default.lt.svg +share/inkscape/templates/default.nl.svg share/inkscape/templates/default.pl.svg share/inkscape/templates/default.pt_BR.svg share/inkscape/templates/default.sk.svg @@ -373,20 +543,37 @@ share/inkscape/templates/web_banner_468x60.svg share/inkscape/templates/web_banner_728x90.svg share/inkscape/templates/white_opaque.svg share/inkscape/tutorials/README +share/inkscape/tutorials/edge3d.svg share/inkscape/tutorials/gpl-2.svg share/inkscape/tutorials/making_markers.svg share/inkscape/tutorials/oldguitar.jpg +share/inkscape/tutorials/potrace-ca.png share/inkscape/tutorials/potrace-de.png +share/inkscape/tutorials/potrace-en.png +share/inkscape/tutorials/potrace-es.png +share/inkscape/tutorials/potrace-eu.png share/inkscape/tutorials/potrace-fr.png +share/inkscape/tutorials/potrace-hu.png +share/inkscape/tutorials/potrace-ja.png +share/inkscape/tutorials/potrace-pl.png +share/inkscape/tutorials/potrace-pt_BR.png share/inkscape/tutorials/potrace-ru.png +share/inkscape/tutorials/potrace-sk.png +share/inkscape/tutorials/potrace-sl.png +share/inkscape/tutorials/potrace-vi.png +share/inkscape/tutorials/potrace-zh_CN.png +share/inkscape/tutorials/potrace-zh_TW.png share/inkscape/tutorials/potrace.png share/inkscape/tutorials/tutorial-advanced.ca.svg share/inkscape/tutorials/tutorial-advanced.cs.svg share/inkscape/tutorials/tutorial-advanced.de.svg share/inkscape/tutorials/tutorial-advanced.es.svg +share/inkscape/tutorials/tutorial-advanced.eu.svg share/inkscape/tutorials/tutorial-advanced.fr.svg +share/inkscape/tutorials/tutorial-advanced.hu.svg share/inkscape/tutorials/tutorial-advanced.it.svg share/inkscape/tutorials/tutorial-advanced.ja.svg +share/inkscape/tutorials/tutorial-advanced.pl.svg share/inkscape/tutorials/tutorial-advanced.pt_BR.svg share/inkscape/tutorials/tutorial-advanced.ru.svg share/inkscape/tutorials/tutorial-advanced.sk.svg @@ -394,16 +581,22 @@ share/inkscape/tutorials/tutorial-advanced.sl.svg share/inkscape/tutorials/tutorial-advanced.svg share/inkscape/tutorials/tutorial-advanced.vi.svg share/inkscape/tutorials/tutorial-advanced.zh_CN.svg +share/inkscape/tutorials/tutorial-advanced.zh_TW.svg share/inkscape/tutorials/tutorial-basic.bg.svg share/inkscape/tutorials/tutorial-basic.ca.svg share/inkscape/tutorials/tutorial-basic.cs.svg share/inkscape/tutorials/tutorial-basic.da.svg share/inkscape/tutorials/tutorial-basic.de.svg +share/inkscape/tutorials/tutorial-basic.eo.svg share/inkscape/tutorials/tutorial-basic.es.svg +share/inkscape/tutorials/tutorial-basic.eu.svg share/inkscape/tutorials/tutorial-basic.fr.svg +share/inkscape/tutorials/tutorial-basic.hu.svg share/inkscape/tutorials/tutorial-basic.it.svg share/inkscape/tutorials/tutorial-basic.ja.svg +share/inkscape/tutorials/tutorial-basic.nl.svg share/inkscape/tutorials/tutorial-basic.nn.svg +share/inkscape/tutorials/tutorial-basic.pl.svg share/inkscape/tutorials/tutorial-basic.pt_BR.svg share/inkscape/tutorials/tutorial-basic.ru.svg share/inkscape/tutorials/tutorial-basic.sk.svg @@ -412,31 +605,54 @@ share/inkscape/tutorials/tutorial-basic.svg share/inkscape/tutorials/tutorial-basic.tr.svg share/inkscape/tutorials/tutorial-basic.vi.svg share/inkscape/tutorials/tutorial-basic.zh_CN.svg +share/inkscape/tutorials/tutorial-basic.zh_TW.svg share/inkscape/tutorials/tutorial-calligraphy.ca.svg share/inkscape/tutorials/tutorial-calligraphy.cs.svg share/inkscape/tutorials/tutorial-calligraphy.de.svg share/inkscape/tutorials/tutorial-calligraphy.es.svg +share/inkscape/tutorials/tutorial-calligraphy.eu.svg share/inkscape/tutorials/tutorial-calligraphy.fr.svg +share/inkscape/tutorials/tutorial-calligraphy.hu.svg +share/inkscape/tutorials/tutorial-calligraphy.ja.svg +share/inkscape/tutorials/tutorial-calligraphy.pl.svg share/inkscape/tutorials/tutorial-calligraphy.pt_BR.svg share/inkscape/tutorials/tutorial-calligraphy.ru.svg +share/inkscape/tutorials/tutorial-calligraphy.sk.svg share/inkscape/tutorials/tutorial-calligraphy.sl.svg share/inkscape/tutorials/tutorial-calligraphy.svg share/inkscape/tutorials/tutorial-calligraphy.vi.svg +share/inkscape/tutorials/tutorial-calligraphy.zh_TW.svg share/inkscape/tutorials/tutorial-elements.ca.svg share/inkscape/tutorials/tutorial-elements.de.svg share/inkscape/tutorials/tutorial-elements.es.svg +share/inkscape/tutorials/tutorial-elements.eu.svg share/inkscape/tutorials/tutorial-elements.fr.svg +share/inkscape/tutorials/tutorial-elements.hu.svg +share/inkscape/tutorials/tutorial-elements.ja.svg +share/inkscape/tutorials/tutorial-elements.pl.svg share/inkscape/tutorials/tutorial-elements.pt_BR.svg share/inkscape/tutorials/tutorial-elements.ru.svg +share/inkscape/tutorials/tutorial-elements.sk.svg share/inkscape/tutorials/tutorial-elements.sl.svg share/inkscape/tutorials/tutorial-elements.svg +share/inkscape/tutorials/tutorial-elements.zh_TW.svg +share/inkscape/tutorials/tutorial-interpolate.de.svg +share/inkscape/tutorials/tutorial-interpolate.fr.svg +share/inkscape/tutorials/tutorial-interpolate.hu.svg +share/inkscape/tutorials/tutorial-interpolate.pl.svg +share/inkscape/tutorials/tutorial-interpolate.sl.svg +share/inkscape/tutorials/tutorial-interpolate.svg +share/inkscape/tutorials/tutorial-interpolate.vi.svg share/inkscape/tutorials/tutorial-shapes.ca.svg share/inkscape/tutorials/tutorial-shapes.cs.svg share/inkscape/tutorials/tutorial-shapes.de.svg share/inkscape/tutorials/tutorial-shapes.es.svg +share/inkscape/tutorials/tutorial-shapes.eu.svg share/inkscape/tutorials/tutorial-shapes.fr.svg +share/inkscape/tutorials/tutorial-shapes.hu.svg share/inkscape/tutorials/tutorial-shapes.it.svg share/inkscape/tutorials/tutorial-shapes.ja.svg +share/inkscape/tutorials/tutorial-shapes.pl.svg share/inkscape/tutorials/tutorial-shapes.pt_BR.svg share/inkscape/tutorials/tutorial-shapes.ru.svg share/inkscape/tutorials/tutorial-shapes.sk.svg @@ -444,25 +660,38 @@ share/inkscape/tutorials/tutorial-shapes.sl.svg share/inkscape/tutorials/tutorial-shapes.svg share/inkscape/tutorials/tutorial-shapes.vi.svg share/inkscape/tutorials/tutorial-shapes.zh_CN.svg +share/inkscape/tutorials/tutorial-shapes.zh_TW.svg share/inkscape/tutorials/tutorial-tips.ca.svg share/inkscape/tutorials/tutorial-tips.de.svg share/inkscape/tutorials/tutorial-tips.es.svg +share/inkscape/tutorials/tutorial-tips.eu.svg share/inkscape/tutorials/tutorial-tips.fr.svg +share/inkscape/tutorials/tutorial-tips.hu.svg share/inkscape/tutorials/tutorial-tips.it.svg +share/inkscape/tutorials/tutorial-tips.ja.svg +share/inkscape/tutorials/tutorial-tips.pl.svg share/inkscape/tutorials/tutorial-tips.pt_BR.svg share/inkscape/tutorials/tutorial-tips.ru.svg share/inkscape/tutorials/tutorial-tips.sk.svg share/inkscape/tutorials/tutorial-tips.sl.svg share/inkscape/tutorials/tutorial-tips.svg +share/inkscape/tutorials/tutorial-tips.vi.svg +share/inkscape/tutorials/tutorial-tips.zh_TW.svg share/inkscape/tutorials/tutorial-tracing.ca.svg share/inkscape/tutorials/tutorial-tracing.de.svg share/inkscape/tutorials/tutorial-tracing.es.svg +share/inkscape/tutorials/tutorial-tracing.eu.svg share/inkscape/tutorials/tutorial-tracing.fr.svg +share/inkscape/tutorials/tutorial-tracing.hu.svg +share/inkscape/tutorials/tutorial-tracing.ja.svg +share/inkscape/tutorials/tutorial-tracing.pl.svg share/inkscape/tutorials/tutorial-tracing.pt_BR.svg share/inkscape/tutorials/tutorial-tracing.ru.svg +share/inkscape/tutorials/tutorial-tracing.sk.svg share/inkscape/tutorials/tutorial-tracing.sl.svg share/inkscape/tutorials/tutorial-tracing.svg share/inkscape/tutorials/tutorial-tracing.vi.svg +share/inkscape/tutorials/tutorial-tracing.zh_TW.svg share/inkscape/tutorials/tux.png share/inkscape/ui/keybindings.rc share/inkscape/ui/menus-bars.xml @@ -499,6 +728,7 @@ share/locale/gl/LC_MESSAGES/inkscape.mo share/locale/he/LC_MESSAGES/inkscape.mo share/locale/hr/LC_MESSAGES/inkscape.mo share/locale/hu/LC_MESSAGES/inkscape.mo +share/locale/hy/LC_MESSAGES/inkscape.mo share/locale/id/LC_MESSAGES/inkscape.mo share/locale/it/LC_MESSAGES/inkscape.mo share/locale/ja/LC_MESSAGES/inkscape.mo diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo index 28078c8dbb1..a2b76a5c089 100644 --- a/graphics/inkscape/distinfo +++ b/graphics/inkscape/distinfo @@ -1,21 +1,17 @@ -$NetBSD: distinfo,v 1.29 2009/11/22 16:08:46 drochner Exp $ +$NetBSD: distinfo,v 1.30 2009/11/29 20:51:51 tnn Exp $ -SHA1 (inkscape-0.46.tar.bz2) = ca68fc9bf539d7bcfc31f36d24f884255b2154e7 -RMD160 (inkscape-0.46.tar.bz2) = c90713493557bdc17515de1287c9af401a4a3e26 -Size (inkscape-0.46.tar.bz2) = 13368645 bytes +SHA1 (inkscape-0.47.tar.bz2) = 7c75352f3882ebf4fcaebc22413bcb79bf3b7895 +RMD160 (inkscape-0.47.tar.bz2) = 5f9dc6117e5670e8501769fe1d26945c4de76ffa +Size (inkscape-0.47.tar.bz2) = 20742550 bytes SHA1 (patch-aa) = 595eaa0e71483abe731bc3f69090b0ab5d1d5deb -SHA1 (patch-ab) = 7eca63e71523f47d968d7b2c513a11010381f1ed +SHA1 (patch-ab) = b70ffa613c054c26185d4728da4133aed6d88e63 SHA1 (patch-ac) = 8034de5cf024ef6ec55e378681a1f450da23bbce SHA1 (patch-ad) = 3136850b7d34370feb951fc8fdde8cda78d54d60 SHA1 (patch-ae) = 2b3f06a545d3cf27f59d41619528c59ac142c758 -SHA1 (patch-af) = 190f59d9b3233154e41dd43964265b0a4709c977 +SHA1 (patch-af) = 5f9317fcb7a798afc569aada9683fb1c7f6ba4c7 SHA1 (patch-ag) = 6b6000f3940ec6db9404a206f9757928c1d5740b -SHA1 (patch-ah) = 964e51dca7e1212037a9f0122fa0ef812bf8f46c -SHA1 (patch-ai) = 56271685b207f4056952929895f1fdd2ec74e3ef -SHA1 (patch-aj) = ae258d2b4f3d5bdbfbc6d76d13361b6e672de73c -SHA1 (patch-ak) = ec8a8ff767da9adeec8e40453d7a2c56fa373cd9 -SHA1 (patch-al) = 0059368f58bc41395d96125c010c6cb574cfca6a -SHA1 (patch-am) = 0ca65739b623945283569580fe0b194fe89fb392 -SHA1 (patch-an) = 6426a52af7b16c3dfeb51f5e48d879d56f067807 -SHA1 (patch-ao) = e7ac9857bf0d686ae77aaa2f3ab90009bfc0a797 +SHA1 (patch-ah) = 7f5517171073017b3e96367237af2c981cecf628 +SHA1 (patch-ai) = e9c5cdf9ee4c123dd5a1e7ecb85eff9244774ea8 +SHA1 (patch-aj) = 8564ee2d4e884dc31e4ad4232267f6fad09f71ee +SHA1 (patch-ak) = f10ff5a1e9a45647e6a59ce3219ea8867bbeb641 SHA1 (patch-ap) = cd29bd178dc2c6c9456bc09d6663d6a25acc7da1 diff --git a/graphics/inkscape/patches/patch-ab b/graphics/inkscape/patches/patch-ab index b3c904e4950..ca7d1d5c1e1 100644 --- a/graphics/inkscape/patches/patch-ab +++ b/graphics/inkscape/patches/patch-ab @@ -1,9 +1,9 @@ -$NetBSD: patch-ab,v 1.8 2008/06/05 10:17:28 drochner Exp $ +$NetBSD: patch-ab,v 1.9 2009/11/29 20:51:51 tnn Exp $ ---- ./src/ui/dialog/print.cpp.orig 2008-06-02 23:26:59 +0300 -+++ ./src/ui/dialog/print.cpp 2008-06-02 23:28:48 +0300 +--- src/ui/dialog/print.cpp.orig 2009-11-16 18:29:40.000000000 +0100 ++++ src/ui/dialog/print.cpp @@ -16,6 +16,8 @@ - #include + #include #endif +#include // close() and unlink() diff --git a/graphics/inkscape/patches/patch-af b/graphics/inkscape/patches/patch-af index 81f8be0be90..6aa7f99da2b 100644 --- a/graphics/inkscape/patches/patch-af +++ b/graphics/inkscape/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.3 2008/04/07 17:08:53 adam Exp $ +$NetBSD: patch-af,v 1.4 2009/11/29 20:51:51 tnn Exp $ ---- packaging/macosx/Resources/script.orig 2008-03-11 05:19:27.000000000 +0100 +--- packaging/macosx/Resources/script.orig 2009-11-16 18:29:06.000000000 +0100 +++ packaging/macosx/Resources/script -@@ -30,7 +30,7 @@ if [[ $VERSION -le 4 ]]; then +@@ -31,7 +31,7 @@ if [[ $VERSION -le 4 ]]; then open -a XDarwin /tmp/getdisplay.sh || \ echo ":0" > /tmp/display.$UID @@ -10,4 +10,4 @@ $NetBSD: patch-af,v 1.3 2008/04/07 17:08:53 adam Exp $ + while [ "$?" = "0" -a ! -f /tmp/display.$UID ]; do sleep 1 done - export DISPLAY="`cat /tmp/display.$UID`" + export DISPLAY=`cat /tmp/display.$UID` diff --git a/graphics/inkscape/patches/patch-ah b/graphics/inkscape/patches/patch-ah index 386f3f41ecc..21dde7be6bc 100644 --- a/graphics/inkscape/patches/patch-ah +++ b/graphics/inkscape/patches/patch-ah @@ -1,28 +1,13 @@ -$NetBSD: patch-ah,v 1.3 2009/05/20 12:00:17 tnn Exp $ +$NetBSD: patch-ah,v 1.4 2009/11/29 20:51:51 tnn Exp $ ---- src/widgets/sp-color-slider.cpp.orig 2009-05-20 13:21:10.000000000 +0200 -+++ src/widgets/sp-color-slider.cpp -@@ -12,6 +12,7 @@ - * This code is in public domain - */ - -+#include - #include - #include "sp-color-scales.h" - -@@ -330,8 +331,14 @@ sp_color_slider_set_adjustment (SPColorS - g_return_if_fail (SP_IS_COLOR_SLIDER (slider)); - - if (!adjustment) { -- adjustment = (GtkAdjustment *) gtk_adjustment_new (0.0, 0.0, 1.0, 0.01, 0.1, 0.1); -+ adjustment = (GtkAdjustment *) gtk_adjustment_new (0.0, 0.0, 1.0, 0.01, 0.0, 0.0); - } -+#if GTK_CHECK_VERSION (2,14,0) -+ else { -+ gtk_adjustment_set_page_increment(adjustment, 0.0); -+ gtk_adjustment_set_page_size(adjustment, 0.0); -+ } -+#endif - - if (slider->adjustment != adjustment) { - if (slider->adjustment) { +--- packaging/macosx/Resources/bin/inkscape.orig 2009-11-16 18:29:06.000000000 +0100 ++++ packaging/macosx/Resources/bin/inkscape +@@ -104,7 +104,7 @@ fi + # If the AppleCollationOrder preference doesn't exist, we fall back to using + # the AppleLocale preference. + LANGSTR=`defaults read .GlobalPreferences AppleCollationOrder 2>/dev/null` +-if [ "x$LANGSTR" == "x" ] ++if [ "x$LANGSTR" = "x" ] + then + echo "Warning: AppleCollationOrder setting not found, using AppleLocale." 1>&2 + LANGSTR=`defaults read .GlobalPreferences AppleLocale 2>/dev/null | \ diff --git a/graphics/inkscape/patches/patch-ai b/graphics/inkscape/patches/patch-ai index 07e5c1a8d6d..3a0d98fb1af 100644 --- a/graphics/inkscape/patches/patch-ai +++ b/graphics/inkscape/patches/patch-ai @@ -1,13 +1,12 @@ -$NetBSD: patch-ai,v 1.3 2009/05/20 12:00:17 tnn Exp $ +$NetBSD: patch-ai,v 1.4 2009/11/29 20:51:51 tnn Exp $ ---- src/widgets/dash-selector.cpp.orig 2008-03-11 05:20:14.000000000 +0100 -+++ src/widgets/dash-selector.cpp -@@ -116,7 +116,7 @@ sp_dash_selector_init (SPDashSelector *d - } - gtk_option_menu_set_menu (GTK_OPTION_MENU (dsel->dash), m); +--- src/display/nr-arena-shape.cpp.orig 2009-11-16 18:29:13.000000000 +0100 ++++ src/display/nr-arena-shape.cpp +@@ -38,7 +38,6 @@ -- dsel->offset = gtk_adjustment_new (0.0, 0.0, 10.0, 0.1, 1.0, 1.0); -+ dsel->offset = gtk_adjustment_new (0.0, 0.0, 10.0, 0.1, 1.0, 0.0); - GtkWidget *sb = gtk_spin_button_new (GTK_ADJUSTMENT (dsel->offset), 0.1, 2); - gtk_tooltips_set_tip (tt, sb, _("Pattern offset"), NULL); + #include + #include "svg/svg.h" +-#include + //int showRuns=0; + void nr_pixblock_render_shape_mask_or(NRPixBlock &m,Shape* theS); diff --git a/graphics/inkscape/patches/patch-aj b/graphics/inkscape/patches/patch-aj index b5620e7db45..767a1295a97 100644 --- a/graphics/inkscape/patches/patch-aj +++ b/graphics/inkscape/patches/patch-aj @@ -1,22 +1,15 @@ -$NetBSD: patch-aj,v 1.1 2009/05/20 12:00:17 tnn Exp $ +$NetBSD: patch-aj,v 1.2 2009/11/29 20:51:51 tnn Exp $ ---- src/dialogs/stroke-style.cpp.orig 2008-03-11 05:19:51.000000000 +0100 -+++ src/dialogs/stroke-style.cpp -@@ -1098,7 +1098,7 @@ sp_stroke_style_line_widget_new(void) - // with it, the two remaining calls of stroke_average_width, allowing us to get rid of that - // function in desktop-style. +--- src/live_effects/lpe-dynastroke.cpp.orig 2009-11-16 18:29:33.000000000 +0100 ++++ src/live_effects/lpe-dynastroke.cpp +@@ -25,6 +25,10 @@ + #include <2geom/sbasis-math.h> + #include <2geom/piecewise.h> + ++/* xxx should test if this is needed */ ++#define fmin(a,b) ((a)<(b)?(a):(b)) ++#define fmax(a,b) ((a)>(b)?(a):(b)) ++ + namespace Inkscape { + namespace LivePathEffect { -- a = gtk_adjustment_new(1.0, 0.0, 1000.0, 0.1, 10.0, 10.0); -+ a = gtk_adjustment_new(1.0, 0.0, 1000.0, 0.1, 10.0, 0.0); - gtk_object_set_data(GTK_OBJECT(spw), "width", a); - sb = gtk_spin_button_new(GTK_ADJUSTMENT(a), 0.1, 3); - gtk_tooltips_set_tip(tt, sb, _("Stroke width"), NULL); -@@ -1167,7 +1167,7 @@ sp_stroke_style_line_widget_new(void) - - hb = spw_hbox(t, 3, 1, i); - -- a = gtk_adjustment_new(4.0, 0.0, 100.0, 0.1, 10.0, 10.0); -+ a = gtk_adjustment_new(4.0, 0.0, 100.0, 0.1, 10.0, 0.0); - gtk_object_set_data(GTK_OBJECT(spw), "miterlimit", a); - - sb = gtk_spin_button_new(GTK_ADJUSTMENT(a), 0.1, 2); diff --git a/graphics/inkscape/patches/patch-ak b/graphics/inkscape/patches/patch-ak index 82d0e7d0687..ffa82d0eb92 100644 --- a/graphics/inkscape/patches/patch-ak +++ b/graphics/inkscape/patches/patch-ak @@ -1,41 +1,41 @@ -$NetBSD: patch-ak,v 1.2 2009/11/22 16:08:46 drochner Exp $ +$NetBSD: patch-ak,v 1.3 2009/11/29 20:51:51 tnn Exp $ ---- src/extension/internal/pdfinput/pdf-parser.cpp.orig 2008-03-11 05:20:21.000000000 +0100 +--- src/extension/internal/pdfinput/pdf-parser.cpp.orig 2009-11-16 18:29:17.000000000 +0100 +++ src/extension/internal/pdfinput/pdf-parser.cpp -@@ -810,7 +810,7 @@ void PdfParser::opSetExtGState(Object ar +@@ -809,7 +809,7 @@ void PdfParser::opSetExtGState(Object ar blendingColorSpace = NULL; isolated = knockout = gFalse; - if (!obj4.dictLookup("CS", &obj5)->isNull()) { + if (!obj4.dictLookup(const_cast("CS"), &obj5)->isNull()) { - blendingColorSpace = GfxColorSpace::parse(&obj5); -+ blendingColorSpace = GfxColorSpace::parse(&obj5, NULL); ++ blendingColorSpace = GfxColorSpace::parse(&obj5, NULL); } obj5.free(); - if (obj4.dictLookup("I", &obj5)->isBool()) { -@@ -1010,9 +1010,9 @@ void PdfParser::opSetFillColorSpace(Obje + if (obj4.dictLookup(const_cast("I"), &obj5)->isBool()) { +@@ -1009,9 +1009,9 @@ void PdfParser::opSetFillColorSpace(Obje state->setFillPattern(NULL); res->lookupColorSpace(args[0].getName(), &obj); if (obj.isNull()) { - colorSpace = GfxColorSpace::parse(&args[0]); -+ colorSpace = GfxColorSpace::parse(&args[0], NULL); ++ colorSpace = GfxColorSpace::parse(&args[0], NULL); } else { - colorSpace = GfxColorSpace::parse(&obj); -+ colorSpace = GfxColorSpace::parse(&obj, NULL); ++ colorSpace = GfxColorSpace::parse(&obj, NULL); } obj.free(); if (colorSpace) { -@@ -1033,9 +1033,9 @@ void PdfParser::opSetStrokeColorSpace(Ob +@@ -1032,9 +1032,9 @@ void PdfParser::opSetStrokeColorSpace(Ob state->setStrokePattern(NULL); res->lookupColorSpace(args[0].getName(), &obj); if (obj.isNull()) { - colorSpace = GfxColorSpace::parse(&args[0]); -+ colorSpace = GfxColorSpace::parse(&args[0], NULL); ++ colorSpace = GfxColorSpace::parse(&args[0], NULL); } else { - colorSpace = GfxColorSpace::parse(&obj); -+ colorSpace = GfxColorSpace::parse(&obj, NULL); ++ colorSpace = GfxColorSpace::parse(&obj, NULL); } obj.free(); if (colorSpace) { -@@ -1102,7 +1102,7 @@ void PdfParser::opSetFillColorN(Object a +@@ -1101,7 +1101,7 @@ void PdfParser::opSetFillColorN(Object a builder->updateStyle(state); } if (args[numArgs-1].isName() && @@ -44,7 +44,7 @@ $NetBSD: patch-ak,v 1.2 2009/11/22 16:08:46 drochner Exp $ state->setFillPattern(pattern); builder->updateStyle(state); } -@@ -1146,7 +1146,7 @@ void PdfParser::opSetStrokeColorN(Object +@@ -1145,7 +1145,7 @@ void PdfParser::opSetStrokeColorN(Object builder->updateStyle(state); } if (args[numArgs-1].isName() && @@ -53,7 +53,7 @@ $NetBSD: patch-ak,v 1.2 2009/11/22 16:08:46 drochner Exp $ state->setStrokePattern(pattern); builder->updateStyle(state); } -@@ -1544,7 +1544,7 @@ void PdfParser::opShFill(Object args[], +@@ -1543,7 +1543,7 @@ void PdfParser::opShFill(Object args[], double *matrix = NULL; GBool savedState = gFalse; @@ -62,43 +62,16 @@ $NetBSD: patch-ak,v 1.2 2009/11/22 16:08:46 drochner Exp $ return; } -@@ -2196,7 +2196,7 @@ void PdfParser::doShowText(GooString *s) - int wMode; - double riseX, riseY; - CharCode code; -- Unicode u[8]; -+ Unicode *u = NULL; - double x, y, dx, dy, dx2, dy2, curX, curY, tdx, tdy, lineX, lineY; - double originX, originY, tOriginX, tOriginY; - double oldCTM[6], newCTM[6]; -@@ -2244,7 +2244,7 @@ void PdfParser::doShowText(GooString *s) - len = s->getLength(); - while (len > 0) { - n = font->getNextChar(p, len, &code, -- u, (int)(sizeof(u) / sizeof(Unicode)), &uLen, -+ &u, &uLen, - &dx, &dy, &originX, &originY); - dx = dx * state->getFontSize() + state->getCharSpace(); - if (n == 1 && *p == ' ') { -@@ -2293,7 +2293,7 @@ void PdfParser::doShowText(GooString *s) - len = s->getLength(); - while (len > 0) { - n = font->getNextChar(p, len, &code, -- u, (int)(sizeof(u) / sizeof(Unicode)), &uLen, -+ &u, &uLen, - &dx, &dy, &originX, &originY); - - if (wMode) { -@@ -2487,7 +2487,7 @@ void PdfParser::doImage(Object *ref, Str +@@ -2507,7 +2507,7 @@ void PdfParser::doImage(Object *ref, Str } } if (!obj1.isNull()) { - colorSpace = GfxColorSpace::parse(&obj1); -+ colorSpace = GfxColorSpace::parse(&obj1, NULL); ++ colorSpace = GfxColorSpace::parse(&obj1, NULL); } else if (csMode == streamCSDeviceGray) { colorSpace = new GfxDeviceGrayColorSpace(); } else if (csMode == streamCSDeviceRGB) { -@@ -2572,7 +2572,7 @@ void PdfParser::doImage(Object *ref, Str +@@ -2592,7 +2592,7 @@ void PdfParser::doImage(Object *ref, Str obj2.free(); } } @@ -107,12 +80,12 @@ $NetBSD: patch-ak,v 1.2 2009/11/22 16:08:46 drochner Exp $ obj1.free(); if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) { goto err1; -@@ -2747,7 +2747,7 @@ void PdfParser::doForm(Object *str) { - if (obj1.dictLookup("S", &obj2)->isName("Transparency")) { +@@ -2767,7 +2767,7 @@ void PdfParser::doForm(Object *str) { + if (obj1.dictLookup(const_cast("S"), &obj2)->isName(const_cast("Transparency"))) { transpGroup = gTrue; - if (!obj1.dictLookup("CS", &obj3)->isNull()) { + if (!obj1.dictLookup(const_cast("CS"), &obj3)->isNull()) { - blendingColorSpace = GfxColorSpace::parse(&obj3); -+ blendingColorSpace = GfxColorSpace::parse(&obj3, NULL); ++ blendingColorSpace = GfxColorSpace::parse(&obj3, NULL); } obj3.free(); - if (obj1.dictLookup("I", &obj3)->isBool()) { + if (obj1.dictLookup(const_cast("I"), &obj3)->isBool()) { diff --git a/graphics/inkscape/patches/patch-al b/graphics/inkscape/patches/patch-al deleted file mode 100644 index b117a9b942c..00000000000 --- a/graphics/inkscape/patches/patch-al +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-al,v 1.1 2009/10/06 00:53:26 dmcmahill Exp $ - -gcc44 fixes - ---- src/streams-handles.cpp.orig 2008-03-11 04:20:00.000000000 +0000 -+++ src/streams-handles.cpp 2009-10-05 18:16:03.000000000 +0000 -@@ -14,4 +14,5 @@ - - #include -+#include - - namespace Inkscape { diff --git a/graphics/inkscape/patches/patch-am b/graphics/inkscape/patches/patch-am deleted file mode 100644 index 230b00d0fd8..00000000000 --- a/graphics/inkscape/patches/patch-am +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-am,v 1.1 2009/10/06 00:53:26 dmcmahill Exp $ - -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 diff --git a/graphics/inkscape/patches/patch-an b/graphics/inkscape/patches/patch-an deleted file mode 100644 index 0286c06f58c..00000000000 --- a/graphics/inkscape/patches/patch-an +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-an,v 1.1 2009/10/06 00:53:26 dmcmahill Exp $ - -gcc44 fixes - ---- src/dom/io/uristream.cpp.orig 2008-03-11 04:19:31.000000000 +0000 -+++ src/dom/io/uristream.cpp 2009-10-05 20:00:03.000000000 +0000 -@@ -42,5 +42,5 @@ - - #include "uristream.h" -- -+#include - - diff --git a/graphics/inkscape/patches/patch-ao b/graphics/inkscape/patches/patch-ao deleted file mode 100644 index 79f53eb4052..00000000000 --- a/graphics/inkscape/patches/patch-ao +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD4 - -gcc44 fixes - ---- src/io/sys.cpp.orig 2008-03-11 04:20:06.000000000 +0000 -+++ src/io/sys.cpp 2009-10-05 21:07:59.000000000 +0000 -@@ -16,4 +16,6 @@ - #endif - -+#include -+ - #include - #if GLIB_CHECK_VERSION(2,6,0) -- cgit v1.2.3