Changes 0.91:

Cairo rendering for display and PNG export
OpenMP multithreading for all filters
C++ code conversion
Major improvements in the Text tool
Measure tool
Type design features
Symbol library and support for Visio stencils
Cross platform WMF and EMF import and export
Improved support for Corel DRAW documents, Visio importer
Support for real world document and page size units, e.g. millimeters
Numerous usability improvements
Native Windows 64-bit build
This commit is contained in:
adam 2015-02-03 13:55:12 +00:00
parent eb80f999c9
commit a0d4e6d4a4
20 changed files with 207 additions and 429 deletions

View file

@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.112 2015/01/08 16:16:55 wiz Exp $
# $NetBSD: Makefile,v 1.113 2015/02/03 13:55:12 adam Exp $
DISTNAME= inkscape-0.48.5
PKGREVISION= 2
DISTNAME= inkscape-0.91
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=inkscape/}
#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=inkscape/}
MASTER_SITES= https://inkscape.global.ssl.fastly.net/media/resources/file/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= reed@reedmedia.net
@ -11,8 +11,8 @@ HOMEPAGE= http://www.inkscape.org/
COMMENT= Scalable Vector Graphics (SVG) editor
LICENSE= gnu-gpl-v2
.if !exists (/usr/bin/iconv)
BUILD_DEPENDS+= libiconv-[0-9]*:../../converters/libiconv
.if !exists(/usr/bin/iconv)
BUILD_DEPENDS+= libiconv-[0-9]*:../../converters/libiconv
.endif
DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
# for inkex.py, needed by most python extension scripts
@ -38,39 +38,40 @@ UNLIMIT_RESOURCES= datasize
LDFLAGS.DragonFly= -lX11
SUBST_CLASSES+= pypath
SUBST_STAGE.pypath= pre-configure
SUBST_FILES.pypath= src/extension/implementation/script.cpp
SUBST_VARS.pypath= PYTHONBIN
SUBST_CLASSES+= pypath
SUBST_STAGE.pypath= pre-configure
SUBST_FILES.pypath= src/extension/implementation/script.cpp
SUBST_VARS.pypath= PYTHONBIN
PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 0.48.4
REPLACE_PYTHON+= cxxtest/cxxtestgen.py
REPLACE_PYTHON+= share/filters/i18n.py
REPLACE_PYTHON+= share/extensions/*.py
REPLACE_PYTHON+= share/extensions/test/*.test.py
REPLACE_PYTHON+= share/extensions/Barcode/*.py
REPLACE_PYTHON+= share/extensions/ink2canvas/*.py
REPLACE_PYTHON+= share/extensions/test/*.test.py
REPLACE_PYTHON+= share/patterns/i18n.py
# XXX I don't see where this is used
CHECK_INTERPRETER_SKIP+= share/inkscape/extensions/simplepath.rb
CHECK_INTERPRETER_SKIP+=share/inkscape/extensions/genpofiles.sh
CHECK_INTERPRETER_SKIP+=share/inkscape/extensions/simplepath.rb
CHECK_PORTABILITY_SKIP+=packaging/macosx/Resources/bin/inkscape
CHECK_PORTABILITY_SKIP+=packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh
# XXX these libraries are not auto-detected, at least on Darwin
LDFLAGS.Darwin= -lfontconfig -lpangoft2-1.0
PKG_OPTIONS_VAR= PKG_OPTIONS.inkscape
PKG_SUPPORTED_OPTIONS= gnome
PKG_SUGGESTED_OPTIONS= gnome
PKG_OPTIONS_VAR= PKG_OPTIONS.inkscape
PKG_SUPPORTED_OPTIONS= gnome
PKG_SUGGESTED_OPTIONS= gnome
.include "../../mk/bsd.options.mk"
# gnome-vfs support for the inkscape file open window.
.if !empty(PKG_OPTIONS:Mgnome)
CONFIGURE_ARGS+= --with-gnome-vfs
CONFIGURE_ARGS+= --with-gnome-vfs
.include "../../sysutils/gnome-vfs/buildlink3.mk"
.endif
BUILDLINK_API_DEPENDS.poppler-includes+= poppler-includes>=0.12.2
BUILDLINK_API_DEPENDS.boehm-gc+= boehm-gc>=7.4
.include "../../converters/libcdr/buildlink3.mk"
.include "../../converters/libvisio/buildlink3.mk"
.include "../../devel/boehm-gc/buildlink3.mk"
.include "../../devel/boost-headers/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.21 2014/07/29 07:03:27 adam Exp $
@comment $NetBSD: PLIST,v 1.22 2015/02/03 13:55:12 adam Exp $
bin/inkscape
bin/inkview
man/el/man1/inkscape.el.1
@ -20,11 +20,16 @@ share/icons/hicolor/24x24/apps/inkscape.png
share/icons/hicolor/256x256/apps/inkscape.png
share/icons/hicolor/32x32/apps/inkscape.png
share/icons/hicolor/48x48/apps/inkscape.png
share/inkscape/clipart/README
share/inkscape/clipart/draw-freely.ru.svg
share/inkscape/clipart/draw-freely.svg
share/inkscape/clipart/orav.svg
share/inkscape/clipart/tux.svg
share/inkscape/attributes/README
share/inkscape/attributes/css_defaults
share/inkscape/attributes/cssprops
share/inkscape/attributes/svgprops
share/inkscape/branding/README
share/inkscape/branding/draw-freely.ru.svg
share/inkscape/branding/draw-freely.svg
share/inkscape/branding/inkscape.svg
share/inkscape/branding/sodipodi.svg
share/inkscape/branding/tux.svg
share/inkscape/examples/README
share/inkscape/examples/animated-clock.svg
share/inkscape/examples/art-nouveau-P3.svg
@ -57,18 +62,19 @@ share/inkscape/examples/tiger.svgz
share/inkscape/examples/tref.svg
share/inkscape/examples/turbulence_filters.svg
share/inkscape/extensions/Barcode/Base.py
share/inkscape/extensions/Barcode/BaseEan.py
share/inkscape/extensions/Barcode/Code128.py
share/inkscape/extensions/Barcode/Code25i.py
share/inkscape/extensions/Barcode/Code39.py
share/inkscape/extensions/Barcode/Code39Ext.py
share/inkscape/extensions/Barcode/Code93.py
share/inkscape/extensions/Barcode/EAN13.py
share/inkscape/extensions/Barcode/EAN5.py
share/inkscape/extensions/Barcode/EAN8.py
share/inkscape/extensions/Barcode/RM4CC.py
share/inkscape/extensions/Barcode/UPCA.py
share/inkscape/extensions/Barcode/UPCE.py
share/inkscape/extensions/Barcode/Ean13.py
share/inkscape/extensions/Barcode/Ean5.py
share/inkscape/extensions/Barcode/Ean8.py
share/inkscape/extensions/Barcode/Rm4scc.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
@ -96,7 +102,6 @@ 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
@ -181,6 +186,8 @@ 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_HSL_adjust.inx
share/inkscape/extensions/color_HSL_adjust.py
share/inkscape/extensions/color_blackandwhite.inx
share/inkscape/extensions/color_blackandwhite.py
share/inkscape/extensions/color_brighter.inx
@ -225,10 +232,12 @@ share/inkscape/extensions/convert2dashes.inx
share/inkscape/extensions/convert2dashes.py
share/inkscape/extensions/cspsubdiv.py
share/inkscape/extensions/cubicsuperpath.py
share/inkscape/extensions/dhw_input.inx
share/inkscape/extensions/dia.inx
share/inkscape/extensions/dia2svg.sh
share/inkscape/extensions/dimension.inx
share/inkscape/extensions/dimension.py
share/inkscape/extensions/dm2svg.py
share/inkscape/extensions/dots.inx
share/inkscape/extensions/dots.py
share/inkscape/extensions/draw_from_triangle.inx
@ -244,6 +253,9 @@ 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/embedselectedimages.inx
share/inkscape/extensions/empty_page.inx
share/inkscape/extensions/empty_page.py
share/inkscape/extensions/eps_input.inx
share/inkscape/extensions/eqtexsvg.inx
share/inkscape/extensions/eqtexsvg.py
@ -260,28 +272,58 @@ share/inkscape/extensions/flatten.inx
share/inkscape/extensions/flatten.py
share/inkscape/extensions/foldablebox.inx
share/inkscape/extensions/foldablebox.py
share/inkscape/extensions/fontfix.conf
share/inkscape/extensions/fractalize.inx
share/inkscape/extensions/fractalize.py
share/inkscape/extensions/funcplot.inx
share/inkscape/extensions/funcplot.py
share/inkscape/extensions/gears.inx
share/inkscape/extensions/gears.py
share/inkscape/extensions/gcodetools.py
share/inkscape/extensions/gcodetools_about.inx
share/inkscape/extensions/gcodetools_area.inx
share/inkscape/extensions/gcodetools_check_for_updates.inx
share/inkscape/extensions/gcodetools_dxf_points.inx
share/inkscape/extensions/gcodetools_engraving.inx
share/inkscape/extensions/gcodetools_graffiti.inx
share/inkscape/extensions/gcodetools_lathe.inx
share/inkscape/extensions/gcodetools_orientation_points.inx
share/inkscape/extensions/gcodetools_path_to_gcode.inx
share/inkscape/extensions/gcodetools_prepare_path_for_plasma.inx
share/inkscape/extensions/gcodetools_tools_library.inx
share/inkscape/extensions/generate_voronoi.inx
share/inkscape/extensions/generate_voronoi.py
share/inkscape/extensions/genpofiles.sh
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_isometric.inx
share/inkscape/extensions/grid_isometric.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/guillotine.inx
share/inkscape/extensions/guillotine.py
share/inkscape/extensions/handles.inx
share/inkscape/extensions/handles.py
share/inkscape/extensions/hershey.inx
share/inkscape/extensions/hershey.py
share/inkscape/extensions/hersheydata.py
share/inkscape/extensions/hpgl_decoder.py
share/inkscape/extensions/hpgl_encoder.py
share/inkscape/extensions/hpgl_input.inx
share/inkscape/extensions/hpgl_input.py
share/inkscape/extensions/hpgl_output.inx
share/inkscape/extensions/hpgl_output.py
share/inkscape/extensions/ill2svg.pl
share/inkscape/extensions/ink2canvas.inx
share/inkscape/extensions/ink2canvas.py
share/inkscape/extensions/ink2canvas/__init__.py
share/inkscape/extensions/ink2canvas/canvas.py
share/inkscape/extensions/ink2canvas/svg.py
share/inkscape/extensions/inkex.py
share/inkscape/extensions/inkscape.extension.rng
share/inkscape/extensions/inkscape_follow_link.inx
share/inkscape/extensions/inkscape_follow_link.py
share/inkscape/extensions/inkscape_help_askaquestion.inx
share/inkscape/extensions/inkscape_help_commandline.inx
share/inkscape/extensions/inkscape_help_faq.inx
@ -325,18 +367,26 @@ share/inkscape/extensions/jessyInk_video.svg
share/inkscape/extensions/jessyInk_view.inx
share/inkscape/extensions/jessyInk_view.py
share/inkscape/extensions/launch_webbrowser.py
share/inkscape/extensions/layers2svgfont.inx
share/inkscape/extensions/layers2svgfont.py
share/inkscape/extensions/layout_nup.inx
share/inkscape/extensions/layout_nup.py
share/inkscape/extensions/layout_nup_pageframe.py
share/inkscape/extensions/lindenmayer.inx
share/inkscape/extensions/lindenmayer.py
share/inkscape/extensions/lorem_ipsum.inx
share/inkscape/extensions/lorem_ipsum.py
share/inkscape/extensions/markers_strokepaint.inx
share/inkscape/extensions/markers_strokepaint.py
share/inkscape/extensions/measure.inx
share/inkscape/extensions/measure.py
share/inkscape/extensions/merge_styles.inx
share/inkscape/extensions/merge_styles.py
share/inkscape/extensions/motion.inx
share/inkscape/extensions/motion.py
share/inkscape/extensions/outline2svg.inx
share/inkscape/extensions/outline2svg.pl
share/inkscape/extensions/new_glyph_layer.inx
share/inkscape/extensions/new_glyph_layer.py
share/inkscape/extensions/next_glyph_layer.inx
share/inkscape/extensions/next_glyph_layer.py
share/inkscape/extensions/param_curves.inx
share/inkscape/extensions/param_curves.py
share/inkscape/extensions/pathalongpath.inx
@ -350,13 +400,19 @@ share/inkscape/extensions/perspective.inx
share/inkscape/extensions/perspective.py
share/inkscape/extensions/pixelsnap.inx
share/inkscape/extensions/pixelsnap.py
share/inkscape/extensions/plotter.inx
share/inkscape/extensions/plotter.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/previous_glyph_layer.inx
share/inkscape/extensions/previous_glyph_layer.py
share/inkscape/extensions/print_win32_vector.inx
share/inkscape/extensions/print_win32_vector.py
share/inkscape/extensions/printing_marks.inx
share/inkscape/extensions/printing_marks.py
share/inkscape/extensions/ps2dxf.sh
share/inkscape/extensions/ps2pdf-ext.py
share/inkscape/extensions/ps_input.inx
@ -370,6 +426,14 @@ share/inkscape/extensions/render_barcode.inx
share/inkscape/extensions/render_barcode.py
share/inkscape/extensions/render_barcode_datamatrix.inx
share/inkscape/extensions/render_barcode_datamatrix.py
share/inkscape/extensions/render_barcode_qrcode.inx
share/inkscape/extensions/render_barcode_qrcode.py
share/inkscape/extensions/render_gear_rack.inx
share/inkscape/extensions/render_gear_rack.py
share/inkscape/extensions/render_gears.inx
share/inkscape/extensions/render_gears.py
share/inkscape/extensions/replace_font.inx
share/inkscape/extensions/replace_font.py
share/inkscape/extensions/restack.inx
share/inkscape/extensions/restack.py
share/inkscape/extensions/rtree.inx
@ -380,6 +444,8 @@ 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/setup_typography_canvas.inx
share/inkscape/extensions/setup_typography_canvas.py
share/inkscape/extensions/simplepath.py
share/inkscape/extensions/simplepath.rb
share/inkscape/extensions/simplestyle.py
@ -397,23 +463,36 @@ share/inkscape/extensions/straightseg.inx
share/inkscape/extensions/straightseg.py
share/inkscape/extensions/summersnight.inx
share/inkscape/extensions/summersnight.py
share/inkscape/extensions/svg2fxg.inx
share/inkscape/extensions/svg2fxg.xsl
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/svg_regex.py
share/inkscape/extensions/svg_transform.py
share/inkscape/extensions/svgcalendar.inx
share/inkscape/extensions/svgcalendar.py
share/inkscape/extensions/svgfont2layers.inx
share/inkscape/extensions/svgfont2layers.py
share/inkscape/extensions/synfig_fileformat.py
share/inkscape/extensions/synfig_output.inx
share/inkscape/extensions/synfig_output.py
share/inkscape/extensions/synfig_prepare.py
share/inkscape/extensions/tar_layers.inx
share/inkscape/extensions/tar_layers.py
share/inkscape/extensions/text_braille.inx
share/inkscape/extensions/text_braille.py
share/inkscape/extensions/text_extract.inx
share/inkscape/extensions/text_extract.py
share/inkscape/extensions/text_flipcase.inx
share/inkscape/extensions/text_flipcase.py
share/inkscape/extensions/text_lowercase.inx
share/inkscape/extensions/text_lowercase.py
share/inkscape/extensions/text_merge.inx
share/inkscape/extensions/text_merge.py
share/inkscape/extensions/text_randomcase.inx
share/inkscape/extensions/text_randomcase.py
share/inkscape/extensions/text_replace.inx
share/inkscape/extensions/text_replace.py
share/inkscape/extensions/text_sentencecase.inx
share/inkscape/extensions/text_sentencecase.py
share/inkscape/extensions/text_titlecase.inx
@ -422,11 +501,10 @@ 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/uniconv-ext.py
share/inkscape/extensions/uniconv_output.py
share/inkscape/extensions/voronoi.py
share/inkscape/extensions/voronoi2svg.inx
share/inkscape/extensions/voronoi2svg.py
share/inkscape/extensions/web-set-att.inx
share/inkscape/extensions/web-set-att.py
@ -462,6 +540,7 @@ share/inkscape/filters/filters.svg
share/inkscape/filters/filters.svg.h
share/inkscape/fonts/README
share/inkscape/gradients/README
share/inkscape/icons/OCAL.png
share/inkscape/icons/README
share/inkscape/icons/color-management-icon.png
share/inkscape/icons/feBlend-icon.png
@ -500,6 +579,7 @@ share/inkscape/icons/out-of-gamut-icon.png
share/inkscape/icons/out-of-gamut-icon.svg
share/inkscape/icons/remove-color.png
share/inkscape/icons/remove-color.svg
share/inkscape/icons/symbolic_icons.svg
share/inkscape/icons/tango_icons.svg
share/inkscape/icons/ticotico.jpg
share/inkscape/icons/too-much-ink-icon.png
@ -514,6 +594,7 @@ share/inkscape/keys/right-handed-illustration.xml
share/inkscape/keys/xara.xml
share/inkscape/keys/zoner-draw.xml
share/inkscape/markers/markers.svg
share/inkscape/palettes/Android-icon-palette.gpl
share/inkscape/palettes/Blues.gpl
share/inkscape/palettes/Gold.gpl
share/inkscape/palettes/Gray.gpl
@ -530,6 +611,7 @@ share/inkscape/palettes/Topographic.gpl
share/inkscape/palettes/Ubuntu.gpl
share/inkscape/palettes/echo-palette.gpl
share/inkscape/palettes/inkscape.gpl
share/inkscape/palettes/palettes.h
share/inkscape/palettes/svg.gpl
share/inkscape/palettes/webhex.gpl
share/inkscape/palettes/websafe22.gpl
@ -538,9 +620,17 @@ share/inkscape/patterns/README
share/inkscape/patterns/patterns.svg
share/inkscape/patterns/patterns.svg.h
share/inkscape/screens/about.svg
share/inkscape/symbols/AigaSymbols.svg
share/inkscape/symbols/BalloonSymbols.svg
share/inkscape/symbols/FlowSymbols.svg
share/inkscape/symbols/LogicSymbols.svg
share/inkscape/symbols/MapSymbolsNPS.svg
share/inkscape/symbols/README
share/inkscape/symbols/symbols.h
share/inkscape/templates/A4.svg
share/inkscape/templates/A4_landscape.svg
share/inkscape/templates/CD_cover_300dpi.svg
share/inkscape/templates/CD_label_120x120.svg
share/inkscape/templates/DVD_cover_regular_300dpi.svg
share/inkscape/templates/DVD_cover_slim_300dpi.svg
share/inkscape/templates/DVD_cover_superslim_300dpi.svg
@ -549,6 +639,7 @@ share/inkscape/templates/LaTeX_Beamer.svg
share/inkscape/templates/Letter.svg
share/inkscape/templates/Letter_landscape.svg
share/inkscape/templates/README
share/inkscape/templates/Typography_Canvas.svg
share/inkscape/templates/black_opaque.svg
share/inkscape/templates/business_card_85x54mm.svg
share/inkscape/templates/business_card_90x50mm.svg
@ -583,6 +674,7 @@ share/inkscape/templates/icon_48x48.svg
share/inkscape/templates/icon_64x64.svg
share/inkscape/templates/no_borders.svg
share/inkscape/templates/no_layers.svg
share/inkscape/templates/templates.h
share/inkscape/templates/video_HDTV_1920x1080.svg
share/inkscape/templates/video_NTSC_720x486.svg
share/inkscape/templates/video_PAL_720x576.svg
@ -597,10 +689,12 @@ share/inkscape/tutorials/oldguitar.jpg
share/inkscape/tutorials/potrace-be.png
share/inkscape/tutorials/potrace-ca.png
share/inkscape/tutorials/potrace-de.png
share/inkscape/tutorials/potrace-el.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-gl.png
share/inkscape/tutorials/potrace-hu.png
share/inkscape/tutorials/potrace-id.png
share/inkscape/tutorials/potrace-ja.png
@ -618,6 +712,7 @@ share/inkscape/tutorials/tutorial-advanced.be.svg
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.el.svg
share/inkscape/tutorials/tutorial-advanced.es.svg
share/inkscape/tutorials/tutorial-advanced.eu.svg
share/inkscape/tutorials/tutorial-advanced.fa.svg
@ -642,11 +737,13 @@ 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.el.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.fa.svg
share/inkscape/tutorials/tutorial-basic.fr.svg
share/inkscape/tutorials/tutorial-basic.gl.svg
share/inkscape/tutorials/tutorial-basic.hu.svg
share/inkscape/tutorials/tutorial-basic.id.svg
share/inkscape/tutorials/tutorial-basic.it.svg
@ -667,6 +764,7 @@ share/inkscape/tutorials/tutorial-calligraphy.be.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.el.svg
share/inkscape/tutorials/tutorial-calligraphy.es.svg
share/inkscape/tutorials/tutorial-calligraphy.eu.svg
share/inkscape/tutorials/tutorial-calligraphy.fa.svg
@ -686,6 +784,7 @@ share/inkscape/tutorials/tutorial-calligraphy.zh_TW.svg
share/inkscape/tutorials/tutorial-elements.be.svg
share/inkscape/tutorials/tutorial-elements.ca.svg
share/inkscape/tutorials/tutorial-elements.de.svg
share/inkscape/tutorials/tutorial-elements.el.svg
share/inkscape/tutorials/tutorial-elements.es.svg
share/inkscape/tutorials/tutorial-elements.eu.svg
share/inkscape/tutorials/tutorial-elements.fa.svg
@ -703,11 +802,13 @@ share/inkscape/tutorials/tutorial-elements.svg
share/inkscape/tutorials/tutorial-elements.zh_TW.svg
share/inkscape/tutorials/tutorial-interpolate.be.svg
share/inkscape/tutorials/tutorial-interpolate.de.svg
share/inkscape/tutorials/tutorial-interpolate.el.svg
share/inkscape/tutorials/tutorial-interpolate.fr.svg
share/inkscape/tutorials/tutorial-interpolate.hu.svg
share/inkscape/tutorials/tutorial-interpolate.ja.svg
share/inkscape/tutorials/tutorial-interpolate.nl.svg
share/inkscape/tutorials/tutorial-interpolate.pl.svg
share/inkscape/tutorials/tutorial-interpolate.pt_BR.svg
share/inkscape/tutorials/tutorial-interpolate.sk.svg
share/inkscape/tutorials/tutorial-interpolate.sl.svg
share/inkscape/tutorials/tutorial-interpolate.svg
@ -717,10 +818,12 @@ share/inkscape/tutorials/tutorial-shapes.be.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.el.svg
share/inkscape/tutorials/tutorial-shapes.es.svg
share/inkscape/tutorials/tutorial-shapes.eu.svg
share/inkscape/tutorials/tutorial-shapes.fa.svg
share/inkscape/tutorials/tutorial-shapes.fr.svg
share/inkscape/tutorials/tutorial-shapes.gl.svg
share/inkscape/tutorials/tutorial-shapes.hu.svg
share/inkscape/tutorials/tutorial-shapes.id.svg
share/inkscape/tutorials/tutorial-shapes.it.svg
@ -738,6 +841,7 @@ share/inkscape/tutorials/tutorial-shapes.zh_TW.svg
share/inkscape/tutorials/tutorial-tips.be.svg
share/inkscape/tutorials/tutorial-tips.ca.svg
share/inkscape/tutorials/tutorial-tips.de.svg
share/inkscape/tutorials/tutorial-tips.el.svg
share/inkscape/tutorials/tutorial-tips.es.svg
share/inkscape/tutorials/tutorial-tips.eu.svg
share/inkscape/tutorials/tutorial-tips.fa.svg
@ -755,13 +859,20 @@ 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-pixelart.el.svg
share/inkscape/tutorials/tutorial-tracing-pixelart.fr.svg
share/inkscape/tutorials/tutorial-tracing-pixelart.nl.svg
share/inkscape/tutorials/tutorial-tracing-pixelart.svg
share/inkscape/tutorials/tutorial-tracing-pixelart.zh_TW.svg
share/inkscape/tutorials/tutorial-tracing.be.svg
share/inkscape/tutorials/tutorial-tracing.ca.svg
share/inkscape/tutorials/tutorial-tracing.de.svg
share/inkscape/tutorials/tutorial-tracing.el.svg
share/inkscape/tutorials/tutorial-tracing.es.svg
share/inkscape/tutorials/tutorial-tracing.eu.svg
share/inkscape/tutorials/tutorial-tracing.fa.svg
share/inkscape/tutorials/tutorial-tracing.fr.svg
share/inkscape/tutorials/tutorial-tracing.gl.svg
share/inkscape/tutorials/tutorial-tracing.hu.svg
share/inkscape/tutorials/tutorial-tracing.id.svg
share/inkscape/tutorials/tutorial-tracing.ja.svg
@ -778,7 +889,6 @@ share/inkscape/tutorials/tux.png
share/inkscape/ui/keybindings.rc
share/inkscape/ui/menus-bars.xml
share/inkscape/ui/toolbox.xml
share/inkscape/ui/units.txt
share/inkscape/ui/units.xml
share/locale/am/LC_MESSAGES/inkscape.mo
share/locale/ar/LC_MESSAGES/inkscape.mo
@ -786,6 +896,7 @@ share/locale/az/LC_MESSAGES/inkscape.mo
share/locale/be/LC_MESSAGES/inkscape.mo
share/locale/bg/LC_MESSAGES/inkscape.mo
share/locale/bn/LC_MESSAGES/inkscape.mo
share/locale/bn_BD/LC_MESSAGES/inkscape.mo
share/locale/br/LC_MESSAGES/inkscape.mo
share/locale/ca/LC_MESSAGES/inkscape.mo
share/locale/ca@valencia/LC_MESSAGES/inkscape.mo
@ -805,6 +916,7 @@ share/locale/et/LC_MESSAGES/inkscape.mo
share/locale/eu/LC_MESSAGES/inkscape.mo
share/locale/fa/LC_MESSAGES/inkscape.mo
share/locale/fi/LC_MESSAGES/inkscape.mo
share/locale/fr/LC_MESSAGES/inkscape.mo
share/locale/ga/LC_MESSAGES/inkscape.mo
share/locale/gl/LC_MESSAGES/inkscape.mo
share/locale/he/LC_MESSAGES/inkscape.mo
@ -817,6 +929,7 @@ share/locale/ja/LC_MESSAGES/inkscape.mo
share/locale/km/LC_MESSAGES/inkscape.mo
share/locale/ko/LC_MESSAGES/inkscape.mo
share/locale/lt/LC_MESSAGES/inkscape.mo
share/locale/lv/LC_MESSAGES/inkscape.mo
share/locale/mk/LC_MESSAGES/inkscape.mo
share/locale/mn/LC_MESSAGES/inkscape.mo
share/locale/nb/LC_MESSAGES/inkscape.mo
@ -836,7 +949,7 @@ share/locale/sq/LC_MESSAGES/inkscape.mo
share/locale/sr/LC_MESSAGES/inkscape.mo
share/locale/sr@latin/LC_MESSAGES/inkscape.mo
share/locale/sv/LC_MESSAGES/inkscape.mo
share/locale/te_IN/LC_MESSAGES/inkscape.mo
share/locale/te/LC_MESSAGES/inkscape.mo
share/locale/th/LC_MESSAGES/inkscape.mo
share/locale/tr/LC_MESSAGES/inkscape.mo
share/locale/uk/LC_MESSAGES/inkscape.mo

View file

@ -1,24 +1,15 @@
$NetBSD: distinfo,v 1.54 2015/01/08 16:34:29 wiz Exp $
$NetBSD: distinfo,v 1.55 2015/02/03 13:55:12 adam Exp $
SHA1 (inkscape-0.48.5.tar.bz2) = 83ddb0c96069638f712a869039989bfd7d79c6a8
RMD160 (inkscape-0.48.5.tar.bz2) = c05e861dd458245193373f40790035339aac3e01
Size (inkscape-0.48.5.tar.bz2) = 19719332 bytes
SHA1 (patch-aa) = d946236902fc6cf0d2ddcbb9dd667b4d9c6f99d4
SHA1 (patch-ab) = b70ffa613c054c26185d4728da4133aed6d88e63
SHA1 (patch-ac) = e6877bb4698c74622f0302328ad959b75b070ff9
SHA1 (patch-ad) = 3136850b7d34370feb951fc8fdde8cda78d54d60
SHA1 (patch-ae) = 2b3f06a545d3cf27f59d41619528c59ac142c758
SHA1 (patch-af) = 5f9317fcb7a798afc569aada9683fb1c7f6ba4c7
SHA1 (inkscape-0.91.tar.bz2) = 9941ee467af570ac71a70f965cd9c48d4993b8f3
RMD160 (inkscape-0.91.tar.bz2) = 77421bcb96c6ad4fe17e775e86b77d576b90cf32
Size (inkscape-0.91.tar.bz2) = 25858909 bytes
SHA1 (patch-ag) = 6b6000f3940ec6db9404a206f9757928c1d5740b
SHA1 (patch-ah) = 6da5e0651b583f925debed97faaf6800f88463da
SHA1 (patch-ai) = 1cd8e744848d6b52ffb4f07922e09689b5e43f61
SHA1 (patch-aj) = 8564ee2d4e884dc31e4ad4232267f6fad09f71ee
SHA1 (patch-ap) = 134a47053020547703906140ff744e875ca1284f
SHA1 (patch-aq) = dd307f598741cd5f0ff35eb06dff7c685752a979
SHA1 (patch-src_dom_io_domstream.cpp) = 6b525b8e730e4497afdf1da0ae27f0dc69bfad40
SHA1 (patch-src_dom_io_domstream.h) = 9325fc9d211eb3349628a736283ed0c475399a8b
SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.cpp) = 92e7ddbade362f768a8ecc8e082b4e666643ba86
SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.h) = 9e9e76049b9fdcc5192e225b4b477a104902894b
SHA1 (patch-aj) = 31d6cc8bb179629023bd04bcac0fd935b2c9636d
SHA1 (patch-ap) = 412509a03d26e925548e3371529a1273db958611
SHA1 (patch-aq) = fb7de44d33fdc5895ce84ca8d44ff6a6c328c402
SHA1 (patch-configure) = bda42cbbe460ab19ee3dfa6dcdf212300b1f7694
SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.cpp) = 7a1aab18cc36756fad1cddbb18cab1ef1431f590
SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.h) = ba408f45544853f9323f8bd879bd55604072bb7a
SHA1 (patch-src_io_inkjar.cpp) = 060d59225cfe7b66db5e9f41e76860df9ce12d01
SHA1 (patch-src_trace_siox.cpp) = daeff4626dace6997f64ab9c96b0bfb304e724c8
SHA1 (patch-src_ui_tool_node.h) = 6ca23dddadcef8318bc81b7a67c69580db4a7b9f
SHA1 (patch-src_ui_tool_node.h) = 2900ab737d6b9245aabefee5e79564bdbaec57bc

View file

@ -1,19 +0,0 @@
$NetBSD: patch-aa,v 1.11 2012/06/01 20:23:11 drochner Exp $
--- src/inkview.cpp.orig 2012-02-14 03:22:17.000000000 +0000
+++ src/inkview.cpp
@@ -31,13 +31,10 @@
# include "config.h"
#endif
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#endif
-
#include <string.h>
#include <sys/stat.h>
#include <locale.h>
+#include <unistd.h>
#include <glib.h>
#include <libnr/nr-macros.h>

View file

@ -1,13 +0,0 @@
$NetBSD: patch-ab,v 1.9 2009/11/29 20:51:51 tnn Exp $
--- src/ui/dialog/print.cpp.orig 2009-11-16 18:29:40.000000000 +0100
+++ src/ui/dialog/print.cpp
@@ -16,6 +16,8 @@
#include <windows.h>
#endif
+#include <unistd.h> // close() and unlink()
+
#include <gtkmm/stock.h>
#include "print.h"

View file

@ -1,67 +0,0 @@
$NetBSD: patch-ac,v 1.10 2014/07/29 07:03:27 adam Exp $
--- configure.orig 2014-06-20 22:05:43.000000000 +0000
+++ configure
@@ -7483,7 +7483,6 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking compiler support for -Werror=format-security" >&5
$as_echo_n "checking compiler support for -Werror=format-security... " >&6; }
ink_svd_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="-Werror=format-security $CPPFLAGS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -7686,7 +7685,7 @@ cat >>confdefs.h <<_ACEOF
#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
_ACEOF
-ALL_LINGUAS="am ar az be bg bn br ca ca@valencia cs da de dz el en_AU en_CA en_GB en_US@piglatin eo es_MX es et eu fa fi fr ga gl he hr hu hy id it ja km ko lt mk mn nb ne nl nn pa pl pt_BR pt ro ru rw sk sl sq sr@latin sr sv te_IN th tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="am ar az be bg bn br ca ca@valencia cs da de dz el en_AU en_CA en_GB en_US@piglatin eo es_MX es et eu fa fi ga gl he hr hu hy id it ja km ko lt mk mn nb ne nl nn pa pl pt_BR pt ro ru rw sk sl sq sr@latin sr sv te_IN th tr uk vi zh_CN zh_TW"
for ac_header in locale.h
do :
@@ -8553,11 +8552,11 @@ for ax_openmp_flag in $ax_openmp_flags;
#ifdef __cplusplus
extern "C"
#endif
-char omp_set_num_threads ();
+#include <omp.h>
int
main ()
{
-return omp_set_num_threads ();
+return omp_get_num_threads ();
;
return 0;
}
@@ -9731,11 +9730,11 @@ fi
if test "x$with_python" = "xyes"; then
- checkPYTHON_CFLAGS=`python -c "import distutils.sysconfig ; print '-I%s' % distutils.sysconfig.get_config_var('INCLUDEPY')" 2>/dev/null`
+ checkPYTHON_CFLAGS=`${PYTHON} -c "import distutils.sysconfig ; print '-I%s' % distutils.sysconfig.get_config_var('INCLUDEPY')" 2>/dev/null`
if test "$?" -gt "0"; then
with_python="no"
else
- checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
+ checkPYTHON_LIBS=`${PYTHON} -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
if test "$?" -gt "0"; then
with_python="no"
else
@@ -9795,7 +9794,7 @@ if test "x$enable_lcms" = "xno"; then
have_lcms2=no
else
# Have to test LittleCms presence
- if test "x${platform_osx}" != "xyes"; then
+ if test "x" != "xyes"; then
# lcms 2.2 & 2.3 have problems on OSX
pkg_failed=no
@@ -11356,7 +11355,7 @@ $as_echo "#define HAVE_CAIRO_PDF 1" >>co
fi
-INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lxml2 -ldl"
+INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lxml2"
if test "x$openmp_ok" = "xyes"; then
INKSCAPE_LIBS="$INKSCAPE_LIBS -lgomp"
fi

View file

@ -1,21 +0,0 @@
$NetBSD: patch-ad,v 1.4 2008/06/05 10:17:28 drochner Exp $
--- ./src/trace/potrace/inkscape-potrace.cpp.orig 2008-03-11 06:20:37 +0200
+++ ./src/trace/potrace/inkscape-potrace.cpp 2008-06-03 00:11:41 +0300
@@ -31,7 +31,16 @@
#include "curve.h"
#include "bitmap.h"
+#if defined(__NetBSD__) || defined(__DragonFly__)
+#include <sys/param.h>
+#endif
+#if (defined(__DragonFly__) && __DragonFly_version < 190000) || (defined(__NetBSD__) && __NetBSD_Version__ < 399000800)
+static double log2(double val)
+{
+ return log(val) / M_LN2;
+}
+#endif
static void updateGui()
{

View file

@ -1,13 +0,0 @@
$NetBSD: patch-ae,v 1.1 2006/10/19 06:19:18 rillig Exp $
--- packaging/macosx/Resources/bin/getdisplay.sh.orig 2006-09-06 07:41:47.000000000 +0200
+++ packaging/macosx/Resources/bin/getdisplay.sh 2006-10-19 08:13:34.000000000 +0200
@@ -2,7 +2,7 @@
#
# Author: Aaron Voisine <aaron@voisine.org>
-if [ "$DISPLAY"x == "x" ]; then
+if [ "$DISPLAY"x = "x" ]; then
echo :0 > /tmp/display.$UID
else
echo $DISPLAY > /tmp/display.$UID

View file

@ -1,13 +0,0 @@
$NetBSD: patch-af,v 1.4 2009/11/29 20:51:51 tnn Exp $
--- packaging/macosx/Resources/script.orig 2009-11-16 18:29:06.000000000 +0100
+++ packaging/macosx/Resources/script
@@ -31,7 +31,7 @@ if [[ $VERSION -le 4 ]]; then
open -a XDarwin /tmp/getdisplay.sh || \
echo ":0" > /tmp/display.$UID
- while [ "$?" == "0" -a ! -f /tmp/display.$UID ]; do
+ while [ "$?" = "0" -a ! -f /tmp/display.$UID ]; do
sleep 1
done
export DISPLAY=`cat /tmp/display.$UID`

View file

@ -1,31 +0,0 @@
$NetBSD: patch-ah,v 1.6 2012/12/18 14:01:06 drochner Exp $
--- packaging/macosx/Resources/bin/inkscape.orig 2012-12-13 17:00:46.000000000 +0000
+++ packaging/macosx/Resources/bin/inkscape
@@ -114,7 +114,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" -o "x$LANGSTR" == "xroot" ]
+if [ "x$LANGSTR" = "x" -o "x$LANGSTR" = "xroot" ]
then
echo "Warning: AppleCollationOrder setting not found, using AppleLocale." 1>&2
LANGSTR=`defaults read .GlobalPreferences AppleLocale 2>/dev/null | \
@@ -126,7 +126,7 @@ fi
# NOTE: Have to add ".UTF-8" to the LANG since omitting causes Inkscape
# to crash on startup in locale_from_utf8().
-if [ "x$LANGSTR" == "x" ]
+if [ "x$LANGSTR" = "x" ]
then
# override broken script
echo "Overriding empty LANGSTR" 1>&2
@@ -134,7 +134,7 @@ then
else
tmpLANG="`grep \"\`echo $LANGSTR\`_\" /usr/share/locale/locale.alias | \
tail -n1 | sed 's/\./ /' | awk '{print $2}'`"
- if [ "x$tmpLANG" == "x" ]
+ if [ "x$tmpLANG" = "x" ]
then
# override broken script
echo "Overriding empty LANG from /usr/share/locale/locale.alias" 1>&2

View file

@ -1,12 +0,0 @@
$NetBSD: patch-ai,v 1.5 2010/09/22 11:39:14 adam Exp $
--- src/display/nr-arena-shape.cpp.orig 2010-07-13 03:48:40.000000000 +0000
+++ src/display/nr-arena-shape.cpp
@@ -39,7 +39,6 @@
#include <glib.h>
#include "svg/svg.h"
-#include <fenv.h>
//int showRuns=0;
void nr_pixblock_render_shape_mask_or(NRPixBlock &m,Shape* theS);

View file

@ -1,8 +1,8 @@
$NetBSD: patch-aj,v 1.2 2009/11/29 20:51:51 tnn Exp $
$NetBSD: patch-aj,v 1.3 2015/02/03 13:55:12 adam Exp $
--- src/live_effects/lpe-dynastroke.cpp.orig 2009-11-16 18:29:33.000000000 +0100
--- src/live_effects/lpe-dynastroke.cpp.orig 2014-11-30 18:45:32.000000000 +0000
+++ src/live_effects/lpe-dynastroke.cpp
@@ -25,6 +25,10 @@
@@ -24,6 +24,10 @@
#include <2geom/sbasis-math.h>
#include <2geom/piecewise.h>
@ -12,4 +12,4 @@ $NetBSD: patch-aj,v 1.2 2009/11/29 20:51:51 tnn Exp $
+
namespace Inkscape {
namespace LivePathEffect {
//TODO: growfor/fadefor can be expressed in unit of width.

View file

@ -1,8 +1,8 @@
$NetBSD: patch-ap,v 1.2 2014/01/11 17:48:15 wiz Exp $
$NetBSD: patch-ap,v 1.3 2015/02/03 13:55:12 adam Exp $
gcc44 fixes
GCC 4.4 fix.
--- src/io/uristream.cpp.orig 2011-07-08 18:25:09.000000000 +0000
--- src/io/uristream.cpp.orig 2014-11-30 18:45:32.000000000 +0000
+++ src/io/uristream.cpp
@@ -15,6 +15,7 @@
#include "sys.h"
@ -10,5 +10,5 @@ gcc44 fixes
#include <cstring>
+#include <cstdio>
#ifdef WIN32
// For now to get at is_os_wide().
namespace Inkscape

View file

@ -1,8 +1,8 @@
$NetBSD: patch-aq,v 1.1 2011/05/06 09:32:50 drochner Exp $
$NetBSD: patch-aq,v 1.2 2015/02/03 13:55:12 adam Exp $
--- src/extension/implementation/script.cpp.orig 2010-07-13 03:48:40.000000000 +0000
+++ src/extension/implementation/script.cpp
@@ -89,7 +89,7 @@ Script::interpreter_t const Script::inte
@@ -83,7 +83,7 @@ Script::interpreter_t const Script::inte
#ifdef WIN32
{"python", "python-interpreter", "pythonw" },
#else

View file

@ -0,0 +1,15 @@
$NetBSD: patch-configure,v 1.1 2015/02/03 13:55:12 adam Exp $
Portability fix.
--- configure.orig 2015-02-02 08:52:21.000000000 +0000
+++ configure
@@ -23483,7 +23483,7 @@ $as_echo "$have_x11" >&6; }
# Optionally enable strict build options that are known to cause build
# failure in many/most systems
- if test "x$enable_strict_build" == "xhigh"; then
+ if test "x$enable_strict_build" = "xhigh"; then
# FIXME: This causes build failure because our internal
# copy of GDL uses deprecated GDK symbols.
#

View file

@ -1,37 +0,0 @@
$NetBSD: patch-src_dom_io_domstream.cpp,v 1.1 2012/11/16 00:54:04 joerg Exp $
--- src/dom/io/domstream.cpp.orig 2012-11-15 18:28:52.000000000 +0000
+++ src/dom/io/domstream.cpp
@@ -35,6 +35,7 @@
*/
#include <cstdio>
+#include <cstring>
#include <math.h>
#include <stdarg.h>
@@ -285,12 +286,11 @@ static int getint(const DOMString &buf,
-static int dprintf(Writer &outs, const DOMString &fmt, va_list ap)
+static int dprintf(Writer &outs, const char *fmt, va_list ap)
{
+ size_t len = strlen(fmt);
- int len = fmt.size();
-
- for (int pos=0 ; pos < len ; pos++)
+ for (size_t pos = 0 ; pos < len ; pos++)
{
XMLCh ch = fmt[pos];
@@ -909,7 +909,7 @@ Writer &BasicWriter::printf(char const *
return *this;
}
*/
-Writer &BasicWriter::printf(const DOMString &fmt, ...)
+Writer &BasicWriter::printf(const char *fmt, ...)
{
va_list args;
va_start(args, fmt);

View file

@ -1,22 +0,0 @@
$NetBSD: patch-src_dom_io_domstream.h,v 1.1 2012/11/16 00:54:05 joerg Exp $
--- src/dom/io/domstream.h.orig 2012-11-15 18:28:31.000000000 +0000
+++ src/dom/io/domstream.h
@@ -492,7 +492,7 @@ public:
virtual int put(XMLCh ch) = 0;
/* Formatted output */
- virtual Writer& printf(const DOMString &fmt, ...) = 0;
+ virtual Writer& printf(const char *fmt, ...) = 0;
virtual Writer& writeChar(char val) = 0;
@@ -544,7 +544,7 @@ public:
/* Formatted output */
- virtual Writer &printf(const DOMString &fmt, ...);
+ virtual Writer &printf(const char *fmt, ...);
virtual Writer& writeChar(char val);

View file

@ -1,9 +1,7 @@
$NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.cpp,v 1.4 2015/01/08 16:34:29 wiz Exp $
$NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.cpp,v 1.5 2015/02/03 13:55:12 adam Exp $
Object.h is included in pdf-parser.h -- see patch for pdf-parser.h.
Fix build with poppler-0.29+ based on https://bugs.launchpad.net/inkscape/+bug/1399811
--- src/extension/internal/pdfinput/pdf-parser.cpp.orig 2014-06-09 13:24:41.000000000 +0000
+++ src/extension/internal/pdfinput/pdf-parser.cpp
@@ -38,7 +38,7 @@ extern "C" {
@ -15,81 +13,3 @@ Fix build with poppler-0.29+ based on https://bugs.launchpad.net/inkscape/+bug/1
#include "Array.h"
#include "Dict.h"
#include "Stream.h"
@@ -860,7 +859,9 @@ void PdfParser::opSetExtGState(Object ar
blendingColorSpace = NULL;
isolated = knockout = gFalse;
if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
+ blendingColorSpace = GfxColorSpace::parse(NULL, &obj5, NULL, NULL);
+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL);
#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
@@ -1085,7 +1086,13 @@ void PdfParser::opSetFillColorSpace(Obje
state->setFillPattern(NULL);
res->lookupColorSpace(args[0].getName(), &obj);
-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
+ if (obj.isNull()) {
+ colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL);
+ } else {
+ colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL);
+ }
+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
if (obj.isNull()) {
colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
} else {
@@ -1126,7 +1133,13 @@ void PdfParser::opSetStrokeColorSpace(Ob
state->setStrokePattern(NULL);
res->lookupColorSpace(args[0].getName(), &obj);
-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
+ if (obj.isNull()) {
+ colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL);
+ } else {
+ colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL);
+ }
+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
if (obj.isNull()) {
colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
} else {
@@ -2756,8 +2769,10 @@ void PdfParser::doImage(Object *ref, Str
}
}
if (!obj1.isNull()) {
-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
- colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
+ colorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL);
+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+ colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
colorSpace = GfxColorSpace::parse(&obj1, NULL);
#else
@@ -2847,8 +2862,10 @@ void PdfParser::doImage(Object *ref, Str
obj2.free();
}
}
-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
- GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
+ GfxColorSpace *maskColorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL);
+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+ GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
#else
@@ -3040,7 +3057,9 @@ void PdfParser::doForm(Object *str) {
if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
transpGroup = gTrue;
if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
+ blendingColorSpace = GfxColorSpace::parse(NULL, &obj3, NULL, NULL);
+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL);
#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);

View file

@ -1,10 +1,10 @@
$NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.h,v 1.1 2012/11/18 15:40:55 adam Exp $
$NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.h,v 1.2 2015/02/03 13:55:12 adam Exp $
Explicitly include poppler/Object.h; otherwise Python's Object.h gets included.
--- src/extension/internal/pdfinput/pdf-parser.h.orig 2012-11-18 14:42:04.000000000 +0000
+++ src/extension/internal/pdfinput/pdf-parser.h
@@ -27,7 +27,7 @@ namespace Inkscape {
@@ -26,7 +26,7 @@ namespace Inkscape {
using Inkscape::Extension::Internal::SvgBuilder;
#include "goo/gtypes.h"

View file

@ -1,8 +1,8 @@
$NetBSD: patch-src_ui_tool_node.h,v 1.2 2014/07/29 07:03:27 adam Exp $
$NetBSD: patch-src_ui_tool_node.h,v 1.3 2015/02/03 13:55:12 adam Exp $
--- src/ui/tool/node.h.orig 2014-07-29 04:46:51.000000000 +0000
--- src/ui/tool/node.h.orig 2014-11-30 18:45:32.000000000 +0000
+++ src/ui/tool/node.h
@@ -17,11 +17,7 @@
@@ -21,11 +21,7 @@
#include <stdexcept>
#include <cstddef>
@ -12,19 +12,5 @@ $NetBSD: patch-src_ui_tool_node.h,v 1.2 2014/07/29 07:03:27 adam Exp $
-#include <tr1/functional>
-#endif
#include <boost/utility.hpp>
#include <boost/enable_shared_from_this.hpp>
#include <boost/shared_ptr.hpp>
@@ -38,13 +34,6 @@ template <typename> class NodeIterator;
}
}
-#if __cplusplus < 201103L
-namespace std {
-namespace tr1 {
-template <typename N> struct hash< Inkscape::UI::NodeIterator<N> >;
-}
-}
-#endif
namespace Inkscape {
namespace UI {