Hi ports@, update to the last stable version. All patches committed upstream.
Did some tests with old SVGs, works fine here on amd64. Comments? Feedback? Cheers, Rafael Sadowski Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/inkscape/Makefile,v retrieving revision 1.53 diff -u -p -u -p -r1.53 Makefile --- Makefile 17 Dec 2016 19:06:28 -0000 1.53 +++ Makefile 26 Jan 2017 18:35:07 -0000 @@ -1,16 +1,13 @@ # $OpenBSD: Makefile,v 1.53 2016/12/17 19:06:28 zhuk Exp $ -# XXX check if still needed at next update -CXXFLAGS += -std=c++11 - COMMENT = SVG vector drawing application -DISTNAME = inkscape-0.91 +DISTNAME = inkscape-0.92.0 CATEGORIES = graphics -REVISION = 10 -MASTER_SITES = https://inkscape.org/en/gallery/item/3854/ -HOMEPAGE = http://www.inkscape.org/ +MASTER_SITES = https://inkscape.org/gallery/item/10552/ +HOMEPAGE = https://www.inkscape.org/ +EXTRACT_SUFX = .tar.bz2 MAINTAINER = Rafael Sadowski <raf...@sizeofvoid.org> @@ -25,19 +22,18 @@ WANTLIB += fontconfig freetype gc gdk-x1 WANTLIB += gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gmodule-2.0 gobject-2.0 WANTLIB += graphite2 gsl gslcblas gthread-2.0 gtk-x11-2.0 gtkmm-2.4 WANTLIB += gtkspell harfbuzz iconv intl jbig jpeg lcms2 lzma m -WANTLIB += openjp2 pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB += pangomm-1.4 pcre pixman-1 png poppler poppler-glib -WANTLIB += popt pthread pthread-stubs sigc-2.0 stdc++ tiff webp -WANTLIB += xcb xcb-render xcb-shm xml2 xslt z +WANTLIB += openjp2 pango-1.0 pangocairo-1.0 pangoft2-1.0 pangomm-1.4 +WANTLIB += pcre pixman-1 png poppler poppler-glib popt pthread +WANTLIB += pthread-stubs sigc-2.0 stdc++ tiff webp xcb xcb-render +WANTLIB += xcb-shm xml2 xslt z MODULES= textproc/intltool \ lang/python \ - lang/ruby + lang/ruby \ + gcc4 -# c++11 -MODULES += gcc4 -MODGCC4_ARCHS = * -MODGCC4_LANGS = c++ +MODGCC4_ARCHS= * +MODGCC4_LANGS= c++ # We are just substituting paths at build time MODPY_BUILDDEP = No @@ -53,6 +49,7 @@ BUILD_DEPENDS = devel/boost LIB_DEPENDS = devel/boehm-gc \ devel/gsl \ devel/popt \ + devel/pango \ graphics/ImageMagick \ graphics/lcms2 \ graphics/libexif \ @@ -68,24 +65,33 @@ RUN_DEPENDS = devel/desktop-file-utils \ x11/gtk+3,-guic USE_GMAKE = Yes + CONFIGURE_STYLE = gnu -AUTOCONF_VERSION = 2.69 + +AUTOCONF_VERSION = 2.69 +AUTOMAKE_VERSION = 1.11 CONFIGURE_ARGS = -without-gnome-vfs CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include/ImageMagick \ - -I${LOCALBASE}/include -I${X11BASE}/include" \ + -I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +# XXX todo NO_TEST = Yes # As discussed on the ports mailing list, remove internationalised manual # pages, as our mandoc implementation does not yet deal with them properly. RM_MANS = man/el man/fr man/ja man/man1/inkscape.*.1 \ - man/sk man/zh_TW + man/sk man/zh_TW man/de SUBST_VARS += RUBY MODRUBY_REV pre-configure: - ${SUBST_CMD} ${WRKSRC}/src/extension/implementation/script.cpp + find ${WRKDIST} -name i18n.py \ + -exec sed -i 's,python,${MODPY_BIN},' {} +; + ${SUBST_CMD} ${WRKSRC}/src/extension/implementation/script.cpp \ + ${WRKSRC}/src/main.cpp + cd ${WRKSRC} && AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \ + AUTOCONF_VERSION=${AUTOCONF_VERSION} ./autogen.sh post-install: .for i in ${RM_MANS} Index: distinfo =================================================================== RCS file: /cvs/ports/graphics/inkscape/distinfo,v retrieving revision 1.10 diff -u -p -u -p -r1.10 distinfo --- distinfo 24 Mar 2015 18:45:11 -0000 1.10 +++ distinfo 26 Jan 2017 18:35:07 -0000 @@ -1,2 +1,2 @@ -SHA256 (inkscape-0.91.tar.gz) = LKPPvI21PkpPIGUL9Qx85pKojcv0HrwMks0k5GUA2yA= -SIZE (inkscape-0.91.tar.gz) = 34074831 +SHA256 (inkscape-0.92.0.tar.bz2) = uLTBWaAESNRlOEUz5acNPzPl+ca3THbqXWNt3W3XulY= +SIZE (inkscape-0.92.0.tar.bz2) = 30827883 Index: patches/patch-src_2geom_hvlinesegment_h =================================================================== RCS file: patches/patch-src_2geom_hvlinesegment_h diff -N patches/patch-src_2geom_hvlinesegment_h --- patches/patch-src_2geom_hvlinesegment_h 24 Mar 2015 18:45:12 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_2geom_hvlinesegment_h,v 1.1 2015/03/24 18:45:12 landry Exp $ ---- src/2geom/hvlinesegment.h.orig Tue Mar 17 22:36:38 2015 -+++ src/2geom/hvlinesegment.h Tue Mar 17 22:36:46 2015 -@@ -1,10 +1,10 @@ --/** -+/** - * \file - * \brief Horizontal and vertical line segment - *//* - * Authors: - * Marco Cecchetti <mrcekets at gmail.com> -- * Krzysztof Kosiński <tweenk...@gmail.com> -+ * Krzysztof KosiÅski <tweenk...@gmail.com> - * Copyright 2008-2011 Authors - * - * This library is free software; you can redistribute it and/or Index: patches/patch-src_2geom_line_cpp =================================================================== RCS file: patches/patch-src_2geom_line_cpp diff -N patches/patch-src_2geom_line_cpp --- patches/patch-src_2geom_line_cpp 4 Jul 2016 16:57:46 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,92 +0,0 @@ -$OpenBSD: patch-src_2geom_line_cpp,v 1.1 2016/07/04 16:57:46 landry Exp $ - -null check for boost::optional<Geom::Crossing> and return empty OptCrossing - ---- src/2geom/line.cpp.orig Sun Nov 30 19:45:32 2014 -+++ src/2geom/line.cpp Sat Jul 2 18:54:28 2016 -@@ -246,12 +246,16 @@ OptCrossing intersection_impl( LineSegment const& ls1, - if ( are_near(r2.origin(), ls1) ) - { - bool eqvs = (dot(direction, r2.versor()) > 0); -- if ( are_near(ls1.initialPoint(), r2.origin()) && !eqvs ) -+ if ( are_near(ls1.initialPoint(), r2.origin()) -+ && !eqvs -+ && crossing ) - { - crossing->ta = crossing->tb = 0; - return crossing; - } -- else if ( are_near(ls1.finalPoint(), r2.origin()) && eqvs ) -+ else if ( are_near(ls1.finalPoint(), r2.origin()) -+ && eqvs -+ && crossing ) - { - if (i == 0) - { -@@ -300,7 +304,8 @@ OptCrossing intersection(Line const& l1, Line const& l - } - else - { -- return crossing; -+ OptCrossing no_crossing; -+ return no_crossing; - } - } - -@@ -328,7 +333,8 @@ OptCrossing intersection(Ray const& r1, Ray const& r2) - if ( are_near(r1.origin(), r2) || are_near(r2.origin(), r1) ) - { - if ( are_near(r1.origin(), r2.origin()) -- && !are_near(r1.versor(), r2.versor()) ) -+ && !are_near(r1.versor(), r2.versor()) -+ && crossing) - { - crossing->ta = crossing->tb = 0; - return crossing; -@@ -368,19 +374,24 @@ OptCrossing intersection( LineSegment const& ls1, Line - } - else - { -- return crossing; -+ OptCrossing no_crossing; -+ return no_crossing; - } - } - - bool eqvs = (dot(direction1, direction2) > 0); - if ( are_near(ls2.initialPoint(), ls1) ) - { -- if ( are_near(ls1.initialPoint(), ls2.initialPoint()) && !eqvs ) -+ if ( are_near(ls1.initialPoint(), ls2.initialPoint()) -+ && !eqvs -+ && crossing ) - { - crossing->ta = crossing->tb = 0; - return crossing; - } -- else if ( are_near(ls1.finalPoint(), ls2.initialPoint()) && eqvs ) -+ else if ( are_near(ls1.finalPoint(), ls2.initialPoint()) -+ && eqvs -+ && crossing ) - { - crossing->ta = 1; - crossing->tb = 0; -@@ -393,12 +404,16 @@ OptCrossing intersection( LineSegment const& ls1, Line - } - else if ( are_near(ls2.finalPoint(), ls1) ) - { -- if ( are_near(ls1.finalPoint(), ls2.finalPoint()) && !eqvs ) -+ if ( are_near(ls1.finalPoint(), ls2.finalPoint()) -+ && !eqvs -+ && crossing ) - { - crossing->ta = crossing->tb = 1; - return crossing; - } -- else if ( are_near(ls1.initialPoint(), ls2.finalPoint()) && eqvs ) -+ else if ( are_near(ls1.initialPoint(), ls2.finalPoint()) -+ && eqvs -+ && crossing ) - { - crossing->ta = 0; - crossing->tb = 1; Index: patches/patch-src_extension_implementation_script_cpp =================================================================== RCS file: /cvs/ports/graphics/inkscape/patches/patch-src_extension_implementation_script_cpp,v retrieving revision 1.4 diff -u -p -u -p -r1.4 patch-src_extension_implementation_script_cpp --- patches/patch-src_extension_implementation_script_cpp 24 Mar 2015 18:45:12 -0000 1.4 +++ patches/patch-src_extension_implementation_script_cpp 26 Jan 2017 18:35:07 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_extension_implementation_script_cpp,v 1.4 2015/03/24 18:45:12 landry Exp $ ---- src/extension/implementation/script.cpp.orig Tue Mar 17 22:42:05 2015 -+++ src/extension/implementation/script.cpp Tue Mar 17 22:42:58 2015 -@@ -79,14 +79,14 @@ void Script::pump_events (void) { +--- src/extension/implementation/script.cpp.orig Mon Jan 2 10:44:59 2017 ++++ src/extension/implementation/script.cpp Tue Jan 24 22:01:33 2017 +@@ -83,14 +83,14 @@ void Script::pump_events (void) { the given interpreter to a custom one per user. */ Script::interpreter_t const Script::interpreterTab[] = { Index: patches/patch-src_libnrtype_FontFactory_cpp =================================================================== RCS file: patches/patch-src_libnrtype_FontFactory_cpp diff -N patches/patch-src_libnrtype_FontFactory_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_libnrtype_FontFactory_cpp 26 Jan 2017 18:35:07 -0000 @@ -0,0 +1,15 @@ +$OpenBSD$ + +fix compile with pango >= 1.40.3 + +--- src/libnrtype/FontFactory.cpp.orig Wed Jan 25 08:07:37 2017 ++++ src/libnrtype/FontFactory.cpp Wed Jan 25 08:07:03 2017 +@@ -696,7 +696,7 @@ font_instance *font_factory::Face(PangoFontDescription + if( pango_ot_info_find_script( info, PANGO_OT_TABLE_GSUB, scripts[i], &script_index )) { + + PangoOTTag* languages = +- pango_ot_info_list_languages( info, PANGO_OT_TABLE_GSUB, script_index, NULL); ++ pango_ot_info_list_languages( info, PANGO_OT_TABLE_GSUB, script_index, PangoOTTag()); + // if( languages[0] != 0 ) + // std::cout << " languages: " << std::endl; + Index: patches/patch-src_ui_clipboard_cpp =================================================================== RCS file: patches/patch-src_ui_clipboard_cpp diff -N patches/patch-src_ui_clipboard_cpp --- patches/patch-src_ui_clipboard_cpp 18 Apr 2016 07:57:55 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,67 +0,0 @@ -$OpenBSD: patch-src_ui_clipboard_cpp,v 1.1 2016/04/18 07:57:55 ajacoutot Exp $ - -Fix build with glib2 >=2.48.0 -http://pkgs.fedoraproject.org/cgit/rpms/inkscape.git/commit/inkscape-0.91-drop-wait-for-targets.patch?id=eb5340800b563d6b05aa5f11a2f24f2cc0d8c80e - ---- src/ui/clipboard.cpp.orig Wed Jan 28 04:32:28 2015 -+++ src/ui/clipboard.cpp Mon Apr 18 09:00:03 2016 -@@ -145,8 +145,6 @@ class ClipboardManagerImpl : public ClipboardManager { - void _setClipboardColor(guint32); - void _userWarn(SPDesktop *, char const *); - -- void _inkscape_wait_for_targets(std::list<Glib::ustring> &); -- - // private properites - SPDocument *_clipboardSPDoc; ///< Document that stores the clipboard until someone requests it - Inkscape::XML::Node *_defs; ///< Reference to the clipboard document's defs node -@@ -1222,9 +1220,7 @@ Geom::Scale ClipboardManagerImpl::_getScale(SPDesktop - */ - Glib::ustring ClipboardManagerImpl::_getBestTarget() - { -- // GTKmm's wait_for_targets() is broken, see the comment in _inkscape_wait_for_targets() -- std::list<Glib::ustring> targets; // = _clipboard->wait_for_targets(); -- _inkscape_wait_for_targets(targets); -+ std::list<Glib::ustring> targets = _clipboard->wait_for_targets(); - - // clipboard target debugging snippet - /* -@@ -1374,39 +1370,6 @@ void ClipboardManagerImpl::_setClipboardColor(guint32 - void ClipboardManagerImpl::_userWarn(SPDesktop *desktop, char const *msg) - { - desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, msg); --} -- -- --// GTKMM's clipboard::wait_for_targets is buggy and might return bogus, see --// --// https://bugs.launchpad.net/inkscape/+bug/296778 --// http://mail.gnome.org/archives/gtk-devel-list/2009-June/msg00062.html --// --// for details. Until this has been fixed upstream we will use our own implementation --// of this method, as copied from /gtkmm-2.16.0/gtk/gtkmm/clipboard.cc. --void ClipboardManagerImpl::_inkscape_wait_for_targets(std::list<Glib::ustring> &listTargets) --{ -- //Get a newly-allocated array of atoms: -- GdkAtom* targets = NULL; -- gint n_targets = 0; -- gboolean test = gtk_clipboard_wait_for_targets( gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), &targets, &n_targets ); -- if (!test || (targets == NULL)) { -- return; -- } -- -- //Add the targets to the C++ container: -- for (int i = 0; i < n_targets; i++) -- { -- //Convert the atom to a string: -- gchar* const atom_name = gdk_atom_name(targets[i]); -- -- Glib::ustring target; -- if (atom_name) { -- target = Glib::ScopedPtr<char>(atom_name).get(); //This frees the gchar*. -- } -- -- listTargets.push_back(target); -- } - } - - /* ####################################### Index: patches/patch-src_util_expression-evaluator_cpp =================================================================== RCS file: patches/patch-src_util_expression-evaluator_cpp diff -N patches/patch-src_util_expression-evaluator_cpp --- patches/patch-src_util_expression-evaluator_cpp 4 Jun 2016 07:00:28 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,40 +0,0 @@ -$OpenBSD: patch-src_util_expression-evaluator_cpp,v 1.2 2016/06/04 07:00:28 landry Exp $ - -- Fix g_utf8_validate call. get_text() from GtkSpinButton returns an string - with a wrong encoding. -- fix https://bugs.launchpad.net/inkscape/+bug/1587311 - ---- src/util/expression-evaluator.cpp.orig Sun Nov 30 19:45:32 2014 -+++ src/util/expression-evaluator.cpp Sat Jun 4 08:34:35 2016 -@@ -28,6 +28,8 @@ - #include "util/expression-evaluator.h" - #include "util/units.h" - -+#include <glib/gconvert.h> -+ - #include <math.h> - #include <string.h> - -@@ -49,7 +51,7 @@ EvaluatorToken::EvaluatorToken() - } - - ExpressionEvaluator::ExpressionEvaluator(const char *string, Unit const *unit) : -- string(string), -+ string(g_locale_to_utf8(string,-1,0,0,0)), - unit(unit) - { - current_token.type = TOKEN_END; -@@ -206,8 +208,11 @@ EvaluatorQuantity ExpressionEvaluator::evaluateFactor( - { - EvaluatorQuantity evaluated_factor = EvaluatorQuantity(); - EvaluatorToken consumed_token = EvaluatorToken(); -- -- if (acceptToken(TOKEN_NUM, &consumed_token)) { -+ -+ if (acceptToken(TOKEN_END, &consumed_token)) { -+ return evaluated_factor; -+ } -+ else if (acceptToken(TOKEN_NUM, &consumed_token)) { - evaluated_factor.value = consumed_token.value.fl; - } else if (acceptToken('(', NULL)) { - evaluated_factor = evaluateExpression(); Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/inkscape/pkg/PLIST,v retrieving revision 1.11 diff -u -p -u -p -r1.11 PLIST --- pkg/PLIST 24 Mar 2015 18:45:12 -0000 1.11 +++ pkg/PLIST 26 Jan 2017 18:35:07 -0000 @@ -3,6 +3,8 @@ @bin bin/inkview @man man/man1/inkscape.1 @man man/man1/inkview.1 +share/appdata/ +share/appdata/inkscape.appdata.xml share/applications/inkscape.desktop share/doc/pkg-readmes/${FULLPKGNAME} share/icons/hicolor/16x16/apps/inkscape.png @@ -19,8 +21,8 @@ share/inkscape/attributes/cssprops share/inkscape/attributes/svgprops share/inkscape/branding/ share/inkscape/branding/README -share/inkscape/branding/draw-freely.ru.svg -share/inkscape/branding/draw-freely.svg +share/inkscape/branding/inkscape-flat.svg +share/inkscape/branding/inkscape-text.svg share/inkscape/branding/inkscape.svg share/inkscape/branding/sodipodi.svg share/inkscape/branding/tux.svg @@ -66,6 +68,7 @@ share/inkscape/extensions/Barcode/Code39 share/inkscape/extensions/Barcode/Code39Ext.py share/inkscape/extensions/Barcode/Code93.py share/inkscape/extensions/Barcode/Ean13.py +share/inkscape/extensions/Barcode/Ean2.py share/inkscape/extensions/Barcode/Ean5.py share/inkscape/extensions/Barcode/Ean8.py share/inkscape/extensions/Barcode/Rm4scc.py @@ -237,8 +240,12 @@ share/inkscape/extensions/dia2svg.sh share/inkscape/extensions/dimension.inx share/inkscape/extensions/dimension.py share/inkscape/extensions/dm2svg.py +share/inkscape/extensions/docinfo.inx share/inkscape/extensions/dots.inx share/inkscape/extensions/dots.py +share/inkscape/extensions/dpi90to96.inx +share/inkscape/extensions/dpi96to90.inx +share/inkscape/extensions/dpiswitcher.py share/inkscape/extensions/draw_from_triangle.inx share/inkscape/extensions/draw_from_triangle.py share/inkscape/extensions/dxf_input.inx @@ -253,8 +260,20 @@ share/inkscape/extensions/embed_raster_i share/inkscape/extensions/embedimage.inx share/inkscape/extensions/embedimage.py share/inkscape/extensions/embedselectedimages.inx +share/inkscape/extensions/empty_business_card.inx +share/inkscape/extensions/empty_business_card.py +share/inkscape/extensions/empty_desktop.inx +share/inkscape/extensions/empty_desktop.py +share/inkscape/extensions/empty_dvd_cover.inx +share/inkscape/extensions/empty_dvd_cover.py +share/inkscape/extensions/empty_generic.inx +share/inkscape/extensions/empty_generic.py +share/inkscape/extensions/empty_icon.inx +share/inkscape/extensions/empty_icon.py share/inkscape/extensions/empty_page.inx share/inkscape/extensions/empty_page.py +share/inkscape/extensions/empty_video.inx +share/inkscape/extensions/empty_video.py share/inkscape/extensions/eps_input.inx share/inkscape/extensions/eqtexsvg.inx share/inkscape/extensions/eqtexsvg.py @@ -314,6 +333,8 @@ 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/image_attributes.inx +share/inkscape/extensions/image_attributes.py share/inkscape/extensions/ink2canvas/ share/inkscape/extensions/ink2canvas.inx share/inkscape/extensions/ink2canvas.py @@ -366,16 +387,18 @@ share/inkscape/extensions/jessyInk_video share/inkscape/extensions/jessyInk_video.svg share/inkscape/extensions/jessyInk_view.inx share/inkscape/extensions/jessyInk_view.py +share/inkscape/extensions/jitternodes.inx +share/inkscape/extensions/jitternodes.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 @@ -387,6 +410,8 @@ share/inkscape/extensions/new_glyph_laye share/inkscape/extensions/new_glyph_layer.py share/inkscape/extensions/next_glyph_layer.inx share/inkscape/extensions/next_glyph_layer.py +share/inkscape/extensions/nicechart.inx +share/inkscape/extensions/nicechart.py share/inkscape/extensions/param_curves.inx share/inkscape/extensions/param_curves.py share/inkscape/extensions/pathalongpath.inx @@ -417,8 +442,6 @@ share/inkscape/extensions/ps2dxf.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/render_alphabetsoup.inx share/inkscape/extensions/render_alphabetsoup.py share/inkscape/extensions/render_alphabetsoup_config.py @@ -443,7 +466,10 @@ share/inkscape/extensions/rubberstretch. 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/seamless_pattern.inx +share/inkscape/extensions/seamless_pattern.py +share/inkscape/extensions/seamless_pattern.svg +share/inkscape/extensions/seamless_pattern_procedural.inx share/inkscape/extensions/setup_typography_canvas.inx share/inkscape/extensions/setup_typography_canvas.py share/inkscape/extensions/simplepath.py @@ -469,8 +495,6 @@ 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 @@ -481,6 +505,12 @@ share/inkscape/extensions/synfig_output. share/inkscape/extensions/synfig_prepare.py share/inkscape/extensions/tar_layers.inx share/inkscape/extensions/tar_layers.py +share/inkscape/extensions/test/ +share/inkscape/extensions/test/svg/ +share/inkscape/extensions/test/svg/default-inkscape-SVG.svg +share/inkscape/extensions/test/svg/default-plain-SVG.svg +share/inkscape/extensions/test/svg/empty-SVG.svg +share/inkscape/extensions/test/svg/multilayered-test.svg share/inkscape/extensions/text_braille.inx share/inkscape/extensions/text_braille.py share/inkscape/extensions/text_extract.inx @@ -501,6 +531,8 @@ share/inkscape/extensions/text_uppercase share/inkscape/extensions/text_uppercase.py share/inkscape/extensions/triangle.inx share/inkscape/extensions/triangle.py +share/inkscape/extensions/ungroup_deep.inx +share/inkscape/extensions/ungroup_deep.py share/inkscape/extensions/uniconv-ext.py share/inkscape/extensions/uniconv_output.py share/inkscape/extensions/voronoi.py @@ -535,7 +567,6 @@ share/inkscape/extensions/xaml2svg/geome 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/ share/inkscape/filters/README share/inkscape/filters/filters.svg @@ -593,6 +624,7 @@ share/inkscape/keys/ share/inkscape/keys/acd-canvas.xml share/inkscape/keys/adobe-illustrator-cs2.xml share/inkscape/keys/corel-draw-x4.xml +share/inkscape/keys/corel-draw-x8.xml share/inkscape/keys/default.xml share/inkscape/keys/inkscape.xml share/inkscape/keys/macromedia-freehand-mx.xml @@ -639,32 +671,22 @@ share/inkscape/symbols/MapSymbolsNPS.svg share/inkscape/symbols/README share/inkscape/symbols/symbols.h share/inkscape/templates/ -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 -share/inkscape/templates/DVD_cover_ultraslim_300dpi.svg 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 share/inkscape/templates/default.be.svg share/inkscape/templates/default.ca.svg share/inkscape/templates/default.cs.svg share/inkscape/templates/default.de.svg +share/inkscape/templates/default.en_US.svg share/inkscape/templates/default.eo.svg share/inkscape/templates/default.es.svg share/inkscape/templates/default.eu.svg share/inkscape/templates/default.fi.svg share/inkscape/templates/default.fr.svg share/inkscape/templates/default.hu.svg +share/inkscape/templates/default.is.svg share/inkscape/templates/default.it.svg share/inkscape/templates/default.ja.svg share/inkscape/templates/default.lt.svg @@ -673,54 +695,39 @@ share/inkscape/templates/default.pl.svg share/inkscape/templates/default.pt_BR.svg share/inkscape/templates/default.sk.svg share/inkscape/templates/default.svg -share/inkscape/templates/default_mm.svg share/inkscape/templates/default_pt.svg -share/inkscape/templates/desktop_1024x768.svg -share/inkscape/templates/desktop_1600x1200.svg -share/inkscape/templates/desktop_640x480.svg -share/inkscape/templates/desktop_800x600.svg -share/inkscape/templates/fontforge_glyph.svg -share/inkscape/templates/icon_16x16.svg -share/inkscape/templates/icon_32x32.svg -share/inkscape/templates/icon_48x48.svg -share/inkscape/templates/icon_64x64.svg -share/inkscape/templates/no_borders.svg +share/inkscape/templates/default_px.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 -share/inkscape/templates/web_banner_468x60.svg -share/inkscape/templates/web_banner_728x90.svg -share/inkscape/templates/white_opaque.svg share/inkscape/tutorials/ 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-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 -share/inkscape/tutorials/potrace-nl.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.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 +share/inkscape/tutorials/potrace.nl.png +share/inkscape/tutorials/potrace.pl.png share/inkscape/tutorials/potrace.png +share/inkscape/tutorials/potrace.pt.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/tutorial-advanced.be.svg share/inkscape/tutorials/tutorial-advanced.ca.svg share/inkscape/tutorials/tutorial-advanced.cs.svg @@ -736,6 +743,7 @@ share/inkscape/tutorials/tutorial-advanc share/inkscape/tutorials/tutorial-advanced.ja.svg share/inkscape/tutorials/tutorial-advanced.nl.svg share/inkscape/tutorials/tutorial-advanced.pl.svg +share/inkscape/tutorials/tutorial-advanced.pt.svg share/inkscape/tutorials/tutorial-advanced.pt_BR.svg share/inkscape/tutorials/tutorial-advanced.ru.svg share/inkscape/tutorials/tutorial-advanced.sk.svg @@ -764,6 +772,7 @@ share/inkscape/tutorials/tutorial-basic. 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.svg share/inkscape/tutorials/tutorial-basic.pt_BR.svg share/inkscape/tutorials/tutorial-basic.ru.svg share/inkscape/tutorials/tutorial-basic.sk.svg @@ -787,6 +796,7 @@ share/inkscape/tutorials/tutorial-callig share/inkscape/tutorials/tutorial-calligraphy.ja.svg share/inkscape/tutorials/tutorial-calligraphy.nl.svg share/inkscape/tutorials/tutorial-calligraphy.pl.svg +share/inkscape/tutorials/tutorial-calligraphy.pt.svg share/inkscape/tutorials/tutorial-calligraphy.pt_BR.svg share/inkscape/tutorials/tutorial-calligraphy.ru.svg share/inkscape/tutorials/tutorial-calligraphy.sk.svg @@ -804,9 +814,11 @@ share/inkscape/tutorials/tutorial-elemen share/inkscape/tutorials/tutorial-elements.fr.svg share/inkscape/tutorials/tutorial-elements.hu.svg share/inkscape/tutorials/tutorial-elements.id.svg +share/inkscape/tutorials/tutorial-elements.it.svg share/inkscape/tutorials/tutorial-elements.ja.svg share/inkscape/tutorials/tutorial-elements.nl.svg share/inkscape/tutorials/tutorial-elements.pl.svg +share/inkscape/tutorials/tutorial-elements.pt.svg share/inkscape/tutorials/tutorial-elements.pt_BR.svg share/inkscape/tutorials/tutorial-elements.ru.svg share/inkscape/tutorials/tutorial-elements.sk.svg @@ -821,7 +833,9 @@ share/inkscape/tutorials/tutorial-interp 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.svg share/inkscape/tutorials/tutorial-interpolate.pt_BR.svg +share/inkscape/tutorials/tutorial-interpolate.ru.svg share/inkscape/tutorials/tutorial-interpolate.sk.svg share/inkscape/tutorials/tutorial-interpolate.sl.svg share/inkscape/tutorials/tutorial-interpolate.svg @@ -843,6 +857,7 @@ share/inkscape/tutorials/tutorial-shapes share/inkscape/tutorials/tutorial-shapes.ja.svg share/inkscape/tutorials/tutorial-shapes.nl.svg share/inkscape/tutorials/tutorial-shapes.pl.svg +share/inkscape/tutorials/tutorial-shapes.pt.svg share/inkscape/tutorials/tutorial-shapes.pt_BR.svg share/inkscape/tutorials/tutorial-shapes.ru.svg share/inkscape/tutorials/tutorial-shapes.sk.svg @@ -865,6 +880,7 @@ share/inkscape/tutorials/tutorial-tips.i share/inkscape/tutorials/tutorial-tips.ja.svg share/inkscape/tutorials/tutorial-tips.nl.svg share/inkscape/tutorials/tutorial-tips.pl.svg +share/inkscape/tutorials/tutorial-tips.pt.svg share/inkscape/tutorials/tutorial-tips.pt_BR.svg share/inkscape/tutorials/tutorial-tips.ru.svg share/inkscape/tutorials/tutorial-tips.sk.svg @@ -875,6 +891,7 @@ share/inkscape/tutorials/tutorial-tips.z 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.pt.svg share/inkscape/tutorials/tutorial-tracing-pixelart.svg share/inkscape/tutorials/tutorial-tracing-pixelart.zh_TW.svg share/inkscape/tutorials/tutorial-tracing.be.svg @@ -891,6 +908,7 @@ share/inkscape/tutorials/tutorial-tracin share/inkscape/tutorials/tutorial-tracing.ja.svg share/inkscape/tutorials/tutorial-tracing.nl.svg share/inkscape/tutorials/tutorial-tracing.pl.svg +share/inkscape/tutorials/tutorial-tracing.pt.svg share/inkscape/tutorials/tutorial-tracing.pt_BR.svg share/inkscape/tutorials/tutorial-tracing.ru.svg share/inkscape/tutorials/tutorial-tracing.sk.svg @@ -902,10 +920,12 @@ share/inkscape/tutorials/tux.png share/inkscape/ui/ share/inkscape/ui/keybindings.rc share/inkscape/ui/menus-bars.xml +share/inkscape/ui/style.css share/inkscape/ui/toolbox.xml share/inkscape/ui/units.xml share/locale/am/LC_MESSAGES/inkscape.mo share/locale/ar/LC_MESSAGES/inkscape.mo +share/locale/as/LC_MESSAGES/inkscape.mo share/locale/az/LC_MESSAGES/inkscape.mo share/locale/be/LC_MESSAGES/inkscape.mo share/locale/bg/LC_MESSAGES/inkscape.mo @@ -914,11 +934,17 @@ share/locale/bn_BD/ share/locale/bn_BD/LC_MESSAGES/ share/locale/bn_BD/LC_MESSAGES/inkscape.mo share/locale/br/LC_MESSAGES/inkscape.mo +share/locale/brx/ +share/locale/brx/LC_MESSAGES/ +share/locale/brx/LC_MESSAGES/inkscape.mo share/locale/ca/LC_MESSAGES/inkscape.mo share/locale/ca@valencia/LC_MESSAGES/inkscape.mo share/locale/cs/LC_MESSAGES/inkscape.mo share/locale/da/LC_MESSAGES/inkscape.mo share/locale/de/LC_MESSAGES/inkscape.mo +share/locale/doi/ +share/locale/doi/LC_MESSAGES/ +share/locale/doi/LC_MESSAGES/inkscape.mo share/locale/dz/LC_MESSAGES/inkscape.mo share/locale/el/LC_MESSAGES/inkscape.mo share/locale/en_AU/LC_MESSAGES/inkscape.mo @@ -939,23 +965,49 @@ 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/gu/LC_MESSAGES/inkscape.mo share/locale/he/LC_MESSAGES/inkscape.mo +share/locale/hi/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/is/LC_MESSAGES/inkscape.mo share/locale/it/LC_MESSAGES/inkscape.mo share/locale/ja/LC_MESSAGES/inkscape.mo share/locale/km/LC_MESSAGES/inkscape.mo +share/locale/kn/LC_MESSAGES/inkscape.mo share/locale/ko/LC_MESSAGES/inkscape.mo +share/locale/kok/ +share/locale/kok/LC_MESSAGES/ +share/locale/kok/LC_MESSAGES/inkscape.mo +share/locale/kok@latin/ +share/locale/kok@latin/LC_MESSAGES/ +share/locale/kok@latin/LC_MESSAGES/inkscape.mo +share/locale/ks@aran/ +share/locale/ks@aran/LC_MESSAGES/ +share/locale/ks@aran/LC_MESSAGES/inkscape.mo +share/locale/ks@deva/ +share/locale/ks@deva/LC_MESSAGES/ +share/locale/ks@deva/LC_MESSAGES/inkscape.mo share/locale/lt/LC_MESSAGES/inkscape.mo share/locale/lv/LC_MESSAGES/inkscape.mo +share/locale/mai/LC_MESSAGES/inkscape.mo share/locale/mk/LC_MESSAGES/inkscape.mo +share/locale/ml/LC_MESSAGES/inkscape.mo share/locale/mn/LC_MESSAGES/inkscape.mo +share/locale/mni/ +share/locale/mni/LC_MESSAGES/ +share/locale/mni/LC_MESSAGES/inkscape.mo +share/locale/mni@beng/ +share/locale/mni@beng/LC_MESSAGES/ +share/locale/mni@beng/LC_MESSAGES/inkscape.mo +share/locale/mr/LC_MESSAGES/inkscape.mo share/locale/nb/LC_MESSAGES/inkscape.mo share/locale/ne/LC_MESSAGES/inkscape.mo share/locale/nl/LC_MESSAGES/inkscape.mo share/locale/nn/LC_MESSAGES/inkscape.mo +share/locale/or/LC_MESSAGES/inkscape.mo share/locale/pa/LC_MESSAGES/inkscape.mo share/locale/pl/LC_MESSAGES/inkscape.mo share/locale/pt/LC_MESSAGES/inkscape.mo @@ -963,16 +1015,33 @@ share/locale/pt_BR/LC_MESSAGES/inkscape. share/locale/ro/LC_MESSAGES/inkscape.mo share/locale/ru/LC_MESSAGES/inkscape.mo share/locale/rw/LC_MESSAGES/inkscape.mo +share/locale/sa/ +share/locale/sa/LC_MESSAGES/ +share/locale/sa/LC_MESSAGES/inkscape.mo +share/locale/sat/ +share/locale/sat/LC_MESSAGES/ +share/locale/sat/LC_MESSAGES/inkscape.mo +share/locale/sat@deva/ +share/locale/sat@deva/LC_MESSAGES/ +share/locale/sat@deva/LC_MESSAGES/inkscape.mo +share/locale/sd/ +share/locale/sd/LC_MESSAGES/ +share/locale/sd/LC_MESSAGES/inkscape.mo +share/locale/sd@deva/ +share/locale/sd@deva/LC_MESSAGES/ +share/locale/sd@deva/LC_MESSAGES/inkscape.mo share/locale/sk/LC_MESSAGES/inkscape.mo share/locale/sl/LC_MESSAGES/inkscape.mo 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/ta/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 +share/locale/ur/LC_MESSAGES/inkscape.mo share/locale/vi/LC_MESSAGES/inkscape.mo share/locale/zh_CN/LC_MESSAGES/inkscape.mo share/locale/zh_TW/LC_MESSAGES/inkscape.mo