aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2015-02-08 21:58:08 +0000
committerKoop Mast <kwm@FreeBSD.org>2015-02-08 21:58:08 +0000
commit0bebae225ad1901ebffa99412280f31336255319 (patch)
tree46287eb1318308e1c4851beecfda367918c0ecd1
parent3258303b8b543f33784544c852e83d0e50977fe1 (diff)
downloadports-0bebae225ad1901ebffa99412280f31336255319.tar.gz
ports-0bebae225ad1901ebffa99412280f31336255319.zip
Update inkscape to 0.91.
Use option handlers. Add options for dbus and visio, Coral Draw and Word Perfect graphics. Add local hosting as fallback if https isn't possible. Complete changelog: http://wiki.inkscape.org/wiki/index.php/Release_notes/0.91
Notes
Notes: svn path=/head/; revision=378692
-rw-r--r--graphics/inkscape/Makefile68
-rw-r--r--graphics/inkscape/distinfo4
-rw-r--r--graphics/inkscape/files/configure.ac14
-rw-r--r--graphics/inkscape/files/patch-config.h.in12
-rw-r--r--graphics/inkscape/files/patch-configure133
-rw-r--r--graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp83
-rw-r--r--graphics/inkscape/files/patch-src_ui_tool_node.h11
-rw-r--r--graphics/inkscape/pkg-plist173
8 files changed, 190 insertions, 308 deletions
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 5ef3296650d1..8b5f208bbae7 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= inkscape
-PORTVERSION= 0.48.5
-PORTREVISION= 4
+PORTVERSION= 0.91
CATEGORIES= graphics gnome
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION}
+MASTER_SITES= https://inkscape.global.ssl.fastly.net/media/resources/file/ \
+ LOCAL/kwm
MAINTAINER= gnome@FreeBSD.org
COMMENT= Full featured open source SVG editor
@@ -17,14 +16,13 @@ LIB_DEPENDS= libpopt.so:${PORTSDIR}/devel/popt \
libgsl.so:${PORTSDIR}/math/gsl \
libgtkspell.so:${PORTSDIR}/textproc/gtkspell \
liblcms.so:${PORTSDIR}/graphics/lcms \
- libwpg-0.2.so:${PORTSDIR}/graphics/libwpg \
libpng.so:${PORTSDIR}/graphics/png \
libMagick++-6.so:${PORTSDIR}/graphics/ImageMagick
-RUN_DEPENDS= p5-XML-XQL>=0:${PORTSDIR}/textproc/p5-XML-XQL
+#RUN_DEPENDS= p5-XML-XQL>=0:${PORTSDIR}/textproc/p5-XML-XQL
USE_GNOME= gtkmm24 intlhack libxslt
-USES= desktop-file-utils gettext gmake libtool pathfix perl5 \
- pkgconfig shebangfix tar:bzip2
+USES= desktop-file-utils gettext gmake iconv libtool pathfix \
+ perl5 pkgconfig shebangfix tar:bzip2
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
CPPFLAGS+= -I${LOCALBASE}/include
@@ -36,30 +34,48 @@ python_CMD?= ${LOCALBASE}/bin/python2
SHEBANG_FILES= cxxtest/cxxtestgen.pl share/extensions/*.p[lm] \
share/extensions/*.py
-OPTIONS_DEFINE= POPPLER
-OPTIONS_DEFAULT=POPPLER
-POPPLER_DESC= PDF preview rendering
+OPTIONS_DEFINE= POPPLER OPENMP VISIO CDR DBUS WPG
+OPTIONS_DEFAULT=POPPLER VISIO CDR WPG
+OPTIONS_SUB= yes
-.include <bsd.port.options.mk>
+CDR_DESC= Support for CorelDRAW diagrams
+CDR_CONFIGURE_ENABLE= cdr
+CDR_LIB_DEPENDS= librevenge-stream-0.0.so:${PORTSDIR}/textproc/librevenge \
+ libcdr-0.1.so:${PORTSDIR}/graphics/libcdr01
-_CCVERSION!= ${CC} --version
-.if ${_CCVERSION:Mclang}
-CPPFLAGS+= -Wno-mismatched-tags
-.endif
+DBUS_CONFIGURE_ENABLE= dbusapi
+DBUS_LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+
+OPENMP_USES= compiler:openmp
+OPENMP_USES_OFF= compiler:features
+
+POPPLER_DESC= PDF preview rendering
+POPPLER_CONFIGURE_ENABLE= poppler-cairo
+#POPPLER_CONFIGURE_ON= --enable-poppler-cairo
+#POPPLER_CONFIGURE_OFF= --enable-poppler-cairo=no
+POPPLER_LIB_DEPENDS= libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
+
+VISIO_DESC= Support for Microsoft Visio diagrams
+VISIO_CONFIGURE_ENABLE= visio
+VISIO_LIB_DEPENDS= librevenge-stream-0.0.so:${PORTSDIR}/textproc/librevenge \
+ libvisio-0.1.so:${PORTSDIR}/textproc/libvisio01
-.if ${PORT_OPTIONS:MPOPPLER}
-LIB_DEPENDS+= libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
-CONFIGURE_ARGS+= --enable-poppler-cairo
-.else
-CONFIGURE_ARGS+= --enable-poppler-cairo=no
+WPG_DESC= Support for WordPerfect graphics
+WPG_CONFIGURE_ENABLE= wpg
+WPG_LIB_DEPENDS= libwpg-0.2.so:${PORTSDIR}/graphics/libwpg
+
+.include <bsd.port.pre.mk>
+
+.if ${CHOSEN_COMPILER_TYPE} == clang
+CPPFLAGS+= -Wno-mismatched-tags -Wno-unknown-attributes
.endif
post-patch:
@${REINPLACE_CMD} -e 's|-ldl||g' \
${WRKSRC}/configure
-.if ! ${PORT_OPTIONS:MPOPPLER}
- @${REINPLACE_CMD} -e 's|poppler|pdisable|g' \
- ${WRKSRC}/configure
-.endif
+#.if ! ${PORT_OPTIONS:MPOPPLER}
+# @${REINPLACE_CMD} -e 's|poppler|pdisable|g' \
+# ${WRKSRC}/configure
+#.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo
index 4a502aa4240e..640dbfbc015b 100644
--- a/graphics/inkscape/distinfo
+++ b/graphics/inkscape/distinfo
@@ -1,2 +1,2 @@
-SHA256 (inkscape-0.48.5.tar.bz2) = 2b6ce684f9f2a0691ab454656424555cbda131db78e13973360684bc833ad969
-SIZE (inkscape-0.48.5.tar.bz2) = 19719332
+SHA256 (inkscape-0.91.tar.bz2) = 4d901f8a9e1924404e797ad23b8b0c495a9d155448816d95a55974314e1f141b
+SIZE (inkscape-0.91.tar.bz2) = 25858909
diff --git a/graphics/inkscape/files/configure.ac b/graphics/inkscape/files/configure.ac
deleted file mode 100644
index c19d64e60866..000000000000
--- a/graphics/inkscape/files/configure.ac
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.ac.orig 2015-01-29 19:58:01.271153231 +0100
-+++ configure.ac 2015-01-29 19:58:25.237151226 +0100
-@@ -593,6 +593,11 @@
- AC_DEFINE(POPPLER_EVEN_NEWER_COLOR_SPACE_API, 1, [Use even newer color space API from Poppler >= 0.26.0])
- fi
-
-+PKG_CHECK_MODULES(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, poppler >= 0.29.0, popplernewernewcolorspaceapi=yes, popplernewernewcolorspaceapi=no)
-+if test "x$popplernewernewcolorspaceapi" = "xyes"; then
-+ AC_DEFINE(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, 1, [Use even newer new color space API from Poppler >= 0.29.0])
-+fi
-+
- # Poppler's b604a008 commit changes this
- AC_MSG_CHECKING([whether Poppler's GfxPatch no longer uses GfxColor])
- popplergfxcolor="no"
diff --git a/graphics/inkscape/files/patch-config.h.in b/graphics/inkscape/files/patch-config.h.in
deleted file mode 100644
index 436063801eec..000000000000
--- a/graphics/inkscape/files/patch-config.h.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- config.h.in.orig 2015-01-29 20:28:40.068026139 +0100
-+++ config.h.in 2015-01-29 20:31:07.000000000 +0100
-@@ -246,6 +246,9 @@
- /* Use even newer color space API from Poppler >= 0.26.0 */
- #undef POPPLER_EVEN_NEWER_COLOR_SPACE_API
-
-+/* Use even newer new color space API from Poppler >= 0.29.0 */
-+#undef POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API
-+
- /* Use color space API from Poppler >= 0.12.2 */
- #undef POPPLER_NEW_COLOR_SPACE_API
-
diff --git a/graphics/inkscape/files/patch-configure b/graphics/inkscape/files/patch-configure
deleted file mode 100644
index 7de3fd19b0cd..000000000000
--- a/graphics/inkscape/files/patch-configure
+++ /dev/null
@@ -1,133 +0,0 @@
---- configure.orig 2015-01-29 19:57:54.424153129 +0100
-+++ configure 2015-01-29 20:00:37.112141976 +0100
-@@ -657,6 +657,8 @@
- LIBWPG01_CFLAGS
- INKBOARD_CFLAGS
- INKBOARD_LIBS
-+POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS
-+POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS
- POPPLER_EVEN_NEWER_COLOR_SPACE_API_LIBS
- POPPLER_EVEN_NEWER_COLOR_SPACE_API_CFLAGS
- POPPLER_NEWERRORAPI_LIBS
-@@ -914,6 +916,8 @@
- POPPLER_NEWERRORAPI_LIBS
- POPPLER_EVEN_NEWER_COLOR_SPACE_API_CFLAGS
- POPPLER_EVEN_NEWER_COLOR_SPACE_API_LIBS
-+POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS
-+POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS
- LIBWPG01_CFLAGS
- LIBWPG01_LIBS
- LIBWPG02_CFLAGS
-@@ -1630,6 +1634,12 @@
- POPPLER_EVEN_NEWER_COLOR_SPACE_API_LIBS
- linker flags for POPPLER_EVEN_NEWER_COLOR_SPACE_API, overriding
- pkg-config
-+ POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS
-+ C compiler flags for POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API,
-+ overriding pkg-config
-+ POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS
-+ linker flags for POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API,
-+ overriding pkg-config
- LIBWPG01_CFLAGS
- C compiler flags for LIBWPG01, overriding pkg-config
- LIBWPG01_LIBS
-@@ -9047,10 +9057,11 @@
- #include <stdio.h>
- extern unsigned GC_version;
- int main(void){
-- unsigned min = ((6 << 16) | (4 << 8) | 0);
-- printf("%d.%d.%d ",GC_version >> 16, (GC_version >> 8) & 0xFF, GC_version & 0xFF);
-- if (GC_version>=min) return 0;
-- return 1;
-+ printf("%d.%d.%d ", GC_VERSION_MAJOR, GC_VERSION_MINOR, GC_VERSION_MICRO);
-+ if (GC_VERSION_MAJOR >= 6 && GC_VERSION_MINOR >= 4)
-+ return 0;
-+ else
-+ return 1;
- }
- _ACEOF
- if ac_fn_cxx_try_run "$LINENO"; then :
-@@ -10561,6 +10572,83 @@
-
- fi
-
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API" >&5
-+$as_echo_n "checking for POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API... " >&6; }
-+
-+if test -n "$POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS"; then
-+ pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS="$POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"poppler >= 0.29.0\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "poppler >= 0.29.0") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS=`$PKG_CONFIG --cflags "poppler >= 0.29.0" 2>/dev/null`
-+ test "x$?" != "x0" && pkg_failed=yes
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS"; then
-+ pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS="$POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"poppler >= 0.29.0\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "poppler >= 0.29.0") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS=`$PKG_CONFIG --libs "poppler >= 0.29.0" 2>/dev/null`
-+ test "x$?" != "x0" && pkg_failed=yes
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "poppler >= 0.29.0" 2>&1`
-+ else
-+ POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "poppler >= 0.29.0" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_PKG_ERRORS" >&5
-+
-+ popplernewernewcolorspaceapi=no
-+elif test $pkg_failed = untried; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ popplernewernewcolorspaceapi=no
-+else
-+ POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS=$pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_CFLAGS
-+ POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS=$pkg_cv_POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API_LIBS
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ popplernewernewcolorspaceapi=yes
-+fi
-+if test "x$popplernewernewcolorspaceapi" = "xyes"; then
-+
-+$as_echo "#define POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API 1" >>confdefs.h
-+
-+fi
-+
- # Poppler's b604a008 commit changes this
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Poppler's GfxPatch no longer uses GfxColor" >&5
- $as_echo_n "checking whether Poppler's GfxPatch no longer uses GfxColor... " >&6; }
diff --git a/graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp b/graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp
deleted file mode 100644
index ab74fc0e68e2..000000000000
--- a/graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-=== modified file 'src/extension/internal/pdfinput/pdf-parser.cpp'
---- src/extension/internal/pdfinput/pdf-parser.cpp 2014-06-03 15:44:09 +0000
-+++ src/extension/internal/pdfinput/pdf-parser.cpp 2014-12-10 20:32:30 +0000
-@@ -860,7 +860,9 @@
- 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 +1087,13 @@
-
- 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 +1134,13 @@
-
- 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 +2770,10 @@
- }
- }
- 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 +2863,10 @@
- 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 +3058,9 @@
- 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);
-
-
diff --git a/graphics/inkscape/files/patch-src_ui_tool_node.h b/graphics/inkscape/files/patch-src_ui_tool_node.h
deleted file mode 100644
index 63287944d1c1..000000000000
--- a/graphics/inkscape/files/patch-src_ui_tool_node.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ui/tool/node.h.orig 2014-10-20 01:38:50.972399465 +0200
-+++ src/ui/tool/node.h 2014-10-20 01:37:10.561420788 +0200
-@@ -38,7 +38,7 @@
- }
- }
-
--#if __cplusplus < 201103L
-+#if __cplusplus < 201103L && !defined(_LIBCPP_VERSION)
- namespace std {
- namespace tr1 {
- template <typename N> struct hash< Inkscape::UI::NodeIterator<N> >;
diff --git a/graphics/inkscape/pkg-plist b/graphics/inkscape/pkg-plist
index cbd1dedb7f27..f216f3886e6c 100644
--- a/graphics/inkscape/pkg-plist
+++ b/graphics/inkscape/pkg-plist
@@ -1,5 +1,11 @@
bin/inkscape
bin/inkview
+%%DBUS%%include/libinkdbus-0.48/libinkdbus/inkscape-dbus-wrapper.h
+%%DBUS%%lib/libinkdbus.a
+%%DBUS%%lib/libinkdbus.so
+%%DBUS%%lib/libinkdbus.so.0
+%%DBUS%%lib/libinkdbus.so.0.0.0
+%%DBUS%%libdata/pkgconfig/inkdbus.pc
man/el/man1/inkscape.el.1.gz
man/fr/man1/inkscape.fr.1.gz
man/ja/man1/inkscape.ja.1.gz
@@ -13,17 +19,23 @@ man/man1/inkview.1.gz
man/sk/man1/inkscape.ja.1.gz
man/zh_TW/man1/inkscape.zh_TW.1.gz
share/applications/inkscape.desktop
+%%DBUS%%share/dbus-1/services/org.inkscape.service
share/icons/hicolor/16x16/apps/inkscape.png
share/icons/hicolor/22x22/apps/inkscape.png
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
-%%DATADIR%%/clipart/README
-%%DATADIR%%/clipart/draw-freely.ru.svg
-%%DATADIR%%/clipart/draw-freely.svg
-%%DATADIR%%/clipart/orav.svg
-%%DATADIR%%/clipart/tux.svg
+%%DATADIR%%/attributes/README
+%%DATADIR%%/attributes/css_defaults
+%%DATADIR%%/attributes/cssprops
+%%DATADIR%%/attributes/svgprops
+%%DATADIR%%/branding/README
+%%DATADIR%%/branding/draw-freely.ru.svg
+%%DATADIR%%/branding/draw-freely.svg
+%%DATADIR%%/branding/inkscape.svg
+%%DATADIR%%/branding/sodipodi.svg
+%%DATADIR%%/branding/tux.svg
%%DATADIR%%/examples/README
%%DATADIR%%/examples/animated-clock.svg
%%DATADIR%%/examples/art-nouveau-P3.svg
@@ -56,18 +68,19 @@ share/icons/hicolor/48x48/apps/inkscape.png
%%DATADIR%%/examples/tref.svg
%%DATADIR%%/examples/turbulence_filters.svg
%%DATADIR%%/extensions/Barcode/Base.py
+%%DATADIR%%/extensions/Barcode/BaseEan.py
%%DATADIR%%/extensions/Barcode/Code128.py
+%%DATADIR%%/extensions/Barcode/Code25i.py
%%DATADIR%%/extensions/Barcode/Code39.py
%%DATADIR%%/extensions/Barcode/Code39Ext.py
%%DATADIR%%/extensions/Barcode/Code93.py
-%%DATADIR%%/extensions/Barcode/EAN13.py
-%%DATADIR%%/extensions/Barcode/EAN5.py
-%%DATADIR%%/extensions/Barcode/EAN8.py
-%%DATADIR%%/extensions/Barcode/RM4CC.py
-%%DATADIR%%/extensions/Barcode/UPCA.py
-%%DATADIR%%/extensions/Barcode/UPCE.py
+%%DATADIR%%/extensions/Barcode/Ean13.py
+%%DATADIR%%/extensions/Barcode/Ean5.py
+%%DATADIR%%/extensions/Barcode/Ean8.py
+%%DATADIR%%/extensions/Barcode/Rm4scc.py
+%%DATADIR%%/extensions/Barcode/Upca.py
+%%DATADIR%%/extensions/Barcode/Upce.py
%%DATADIR%%/extensions/Barcode/__init__.py
-%%DATADIR%%/extensions/Inkscape.pm
%%DATADIR%%/extensions/Poly3DObjects/cube.obj
%%DATADIR%%/extensions/Poly3DObjects/cuboct.obj
%%DATADIR%%/extensions/Poly3DObjects/dodec.obj
@@ -95,7 +108,6 @@ share/icons/hicolor/48x48/apps/inkscape.png
%%DATADIR%%/extensions/Poly3DObjects/trunc_icos.obj
%%DATADIR%%/extensions/Poly3DObjects/trunc_oct.obj
%%DATADIR%%/extensions/Poly3DObjects/trunc_tet.obj
-%%DATADIR%%/extensions/SpSVG.pm
%%DATADIR%%/extensions/addnodes.inx
%%DATADIR%%/extensions/addnodes.py
%%DATADIR%%/extensions/ai_input.inx
@@ -180,6 +192,8 @@ share/icons/hicolor/48x48/apps/inkscape.png
%%DATADIR%%/extensions/cgm_input.inx
%%DATADIR%%/extensions/chardataeffect.py
%%DATADIR%%/extensions/cmx_input.inx
+%%DATADIR%%/extensions/color_HSL_adjust.inx
+%%DATADIR%%/extensions/color_HSL_adjust.py
%%DATADIR%%/extensions/color_blackandwhite.inx
%%DATADIR%%/extensions/color_blackandwhite.py
%%DATADIR%%/extensions/color_brighter.inx
@@ -224,10 +238,12 @@ share/icons/hicolor/48x48/apps/inkscape.png
%%DATADIR%%/extensions/convert2dashes.py
%%DATADIR%%/extensions/cspsubdiv.py
%%DATADIR%%/extensions/cubicsuperpath.py
+%%DATADIR%%/extensions/dhw_input.inx
%%DATADIR%%/extensions/dia.inx
%%DATADIR%%/extensions/dia2svg.sh
%%DATADIR%%/extensions/dimension.inx
%%DATADIR%%/extensions/dimension.py
+%%DATADIR%%/extensions/dm2svg.py
%%DATADIR%%/extensions/dots.inx
%%DATADIR%%/extensions/dots.py
%%DATADIR%%/extensions/draw_from_triangle.inx
@@ -243,6 +259,9 @@ share/icons/hicolor/48x48/apps/inkscape.png
%%DATADIR%%/extensions/embed_raster_in_svg.pl
%%DATADIR%%/extensions/embedimage.inx
%%DATADIR%%/extensions/embedimage.py
+%%DATADIR%%/extensions/embedselectedimages.inx
+%%DATADIR%%/extensions/empty_page.inx
+%%DATADIR%%/extensions/empty_page.py
%%DATADIR%%/extensions/eps_input.inx
%%DATADIR%%/extensions/eqtexsvg.inx
%%DATADIR%%/extensions/eqtexsvg.py
@@ -259,28 +278,58 @@ share/icons/hicolor/48x48/apps/inkscape.png
%%DATADIR%%/extensions/flatten.py
%%DATADIR%%/extensions/foldablebox.inx
%%DATADIR%%/extensions/foldablebox.py
+%%DATADIR%%/extensions/fontfix.conf
%%DATADIR%%/extensions/fractalize.inx
%%DATADIR%%/extensions/fractalize.py
%%DATADIR%%/extensions/funcplot.inx
%%DATADIR%%/extensions/funcplot.py
-%%DATADIR%%/extensions/gears.inx
-%%DATADIR%%/extensions/gears.py
+%%DATADIR%%/extensions/gcodetools.py
+%%DATADIR%%/extensions/gcodetools_about.inx
+%%DATADIR%%/extensions/gcodetools_area.inx
+%%DATADIR%%/extensions/gcodetools_check_for_updates.inx
+%%DATADIR%%/extensions/gcodetools_dxf_points.inx
+%%DATADIR%%/extensions/gcodetools_engraving.inx
+%%DATADIR%%/extensions/gcodetools_graffiti.inx
+%%DATADIR%%/extensions/gcodetools_lathe.inx
+%%DATADIR%%/extensions/gcodetools_orientation_points.inx
+%%DATADIR%%/extensions/gcodetools_path_to_gcode.inx
+%%DATADIR%%/extensions/gcodetools_prepare_path_for_plasma.inx
+%%DATADIR%%/extensions/gcodetools_tools_library.inx
%%DATADIR%%/extensions/generate_voronoi.inx
%%DATADIR%%/extensions/generate_voronoi.py
+%%DATADIR%%/extensions/genpofiles.sh
%%DATADIR%%/extensions/gimp_xcf.inx
%%DATADIR%%/extensions/gimp_xcf.py
%%DATADIR%%/extensions/grid_cartesian.inx
%%DATADIR%%/extensions/grid_cartesian.py
+%%DATADIR%%/extensions/grid_isometric.inx
+%%DATADIR%%/extensions/grid_isometric.py
%%DATADIR%%/extensions/grid_polar.inx
%%DATADIR%%/extensions/grid_polar.py
%%DATADIR%%/extensions/guides_creator.inx
%%DATADIR%%/extensions/guides_creator.py
+%%DATADIR%%/extensions/guillotine.inx
+%%DATADIR%%/extensions/guillotine.py
%%DATADIR%%/extensions/handles.inx
%%DATADIR%%/extensions/handles.py
+%%DATADIR%%/extensions/hershey.inx
+%%DATADIR%%/extensions/hershey.py
+%%DATADIR%%/extensions/hersheydata.py
+%%DATADIR%%/extensions/hpgl_decoder.py
+%%DATADIR%%/extensions/hpgl_encoder.py
+%%DATADIR%%/extensions/hpgl_input.inx
+%%DATADIR%%/extensions/hpgl_input.py
%%DATADIR%%/extensions/hpgl_output.inx
%%DATADIR%%/extensions/hpgl_output.py
-%%DATADIR%%/extensions/ill2svg.pl
+%%DATADIR%%/extensions/ink2canvas.inx
+%%DATADIR%%/extensions/ink2canvas.py
+%%DATADIR%%/extensions/ink2canvas/__init__.py
+%%DATADIR%%/extensions/ink2canvas/canvas.py
+%%DATADIR%%/extensions/ink2canvas/svg.py
%%DATADIR%%/extensions/inkex.py
+%%DATADIR%%/extensions/inkscape.extension.rng
+%%DATADIR%%/extensions/inkscape_follow_link.inx
+%%DATADIR%%/extensions/inkscape_follow_link.py
%%DATADIR%%/extensions/inkscape_help_askaquestion.inx
%%DATADIR%%/extensions/inkscape_help_commandline.inx
%%DATADIR%%/extensions/inkscape_help_faq.inx
@@ -324,18 +373,26 @@ share/icons/hicolor/48x48/apps/inkscape.png
%%DATADIR%%/extensions/jessyInk_view.inx
%%DATADIR%%/extensions/jessyInk_view.py
%%DATADIR%%/extensions/launch_webbrowser.py
+%%DATADIR%%/extensions/layers2svgfont.inx
+%%DATADIR%%/extensions/layers2svgfont.py
+%%DATADIR%%/extensions/layout_nup.inx
+%%DATADIR%%/extensions/layout_nup.py
+%%DATADIR%%/extensions/layout_nup_pageframe.py
%%DATADIR%%/extensions/lindenmayer.inx
%%DATADIR%%/extensions/lindenmayer.py
%%DATADIR%%/extensions/lorem_ipsum.inx
%%DATADIR%%/extensions/lorem_ipsum.py
-%%DATADIR%%/extensions/markers_strokepaint.inx
%%DATADIR%%/extensions/markers_strokepaint.py
%%DATADIR%%/extensions/measure.inx
%%DATADIR%%/extensions/measure.py
+%%DATADIR%%/extensions/merge_styles.inx
+%%DATADIR%%/extensions/merge_styles.py
%%DATADIR%%/extensions/motion.inx
%%DATADIR%%/extensions/motion.py
-%%DATADIR%%/extensions/outline2svg.inx
-%%DATADIR%%/extensions/outline2svg.pl
+%%DATADIR%%/extensions/new_glyph_layer.inx
+%%DATADIR%%/extensions/new_glyph_layer.py
+%%DATADIR%%/extensions/next_glyph_layer.inx
+%%DATADIR%%/extensions/next_glyph_layer.py
%%DATADIR%%/extensions/param_curves.inx
%%DATADIR%%/extensions/param_curves.py
%%DATADIR%%/extensions/pathalongpath.inx
@@ -349,13 +406,19 @@ share/icons/hicolor/48x48/apps/inkscape.png
%%DATADIR%%/extensions/perspective.py
%%DATADIR%%/extensions/pixelsnap.inx
%%DATADIR%%/extensions/pixelsnap.py
+%%DATADIR%%/extensions/plotter.inx
+%%DATADIR%%/extensions/plotter.py
%%DATADIR%%/extensions/plt_input.inx
%%DATADIR%%/extensions/plt_output.inx
%%DATADIR%%/extensions/plt_output.py
%%DATADIR%%/extensions/polyhedron_3d.inx
%%DATADIR%%/extensions/polyhedron_3d.py
-%%DATADIR%%/extensions/printing-marks.inx
-%%DATADIR%%/extensions/printing-marks.py
+%%DATADIR%%/extensions/previous_glyph_layer.inx
+%%DATADIR%%/extensions/previous_glyph_layer.py
+%%DATADIR%%/extensions/print_win32_vector.inx
+%%DATADIR%%/extensions/print_win32_vector.py
+%%DATADIR%%/extensions/printing_marks.inx
+%%DATADIR%%/extensions/printing_marks.py
%%DATADIR%%/extensions/ps2dxf.sh
%%DATADIR%%/extensions/ps2pdf-ext.py
%%DATADIR%%/extensions/ps_input.inx
@@ -369,6 +432,14 @@ share/icons/hicolor/48x48/apps/inkscape.png
%%DATADIR%%/extensions/render_barcode.py
%%DATADIR%%/extensions/render_barcode_datamatrix.inx
%%DATADIR%%/extensions/render_barcode_datamatrix.py
+%%DATADIR%%/extensions/render_barcode_qrcode.inx
+%%DATADIR%%/extensions/render_barcode_qrcode.py
+%%DATADIR%%/extensions/render_gear_rack.inx
+%%DATADIR%%/extensions/render_gear_rack.py
+%%DATADIR%%/extensions/render_gears.inx
+%%DATADIR%%/extensions/render_gears.py
+%%DATADIR%%/extensions/replace_font.inx
+%%DATADIR%%/extensions/replace_font.py
%%DATADIR%%/extensions/restack.inx
%%DATADIR%%/extensions/restack.py
%%DATADIR%%/extensions/rtree.inx
@@ -379,6 +450,8 @@ share/icons/hicolor/48x48/apps/inkscape.png
%%DATADIR%%/extensions/scour.inkscape.py
%%DATADIR%%/extensions/scour.inx
%%DATADIR%%/extensions/scour.py
+%%DATADIR%%/extensions/setup_typography_canvas.inx
+%%DATADIR%%/extensions/setup_typography_canvas.py
%%DATADIR%%/extensions/simplepath.py
%%DATADIR%%/extensions/simplepath.rb
%%DATADIR%%/extensions/simplestyle.py
@@ -396,23 +469,36 @@ share/icons/hicolor/48x48/apps/inkscape.png
%%DATADIR%%/extensions/straightseg.py
%%DATADIR%%/extensions/summersnight.inx
%%DATADIR%%/extensions/summersnight.py
+%%DATADIR%%/extensions/svg2fxg.inx
+%%DATADIR%%/extensions/svg2fxg.xsl
%%DATADIR%%/extensions/svg2xaml.inx
%%DATADIR%%/extensions/svg2xaml.xsl
%%DATADIR%%/extensions/svg_and_media_zip_output.inx
%%DATADIR%%/extensions/svg_and_media_zip_output.py
%%DATADIR%%/extensions/svg_regex.py
+%%DATADIR%%/extensions/svg_transform.py
%%DATADIR%%/extensions/svgcalendar.inx
%%DATADIR%%/extensions/svgcalendar.py
+%%DATADIR%%/extensions/svgfont2layers.inx
+%%DATADIR%%/extensions/svgfont2layers.py
+%%DATADIR%%/extensions/synfig_fileformat.py
+%%DATADIR%%/extensions/synfig_output.inx
+%%DATADIR%%/extensions/synfig_output.py
+%%DATADIR%%/extensions/synfig_prepare.py
+%%DATADIR%%/extensions/tar_layers.inx
+%%DATADIR%%/extensions/tar_layers.py
%%DATADIR%%/extensions/text_braille.inx
%%DATADIR%%/extensions/text_braille.py
+%%DATADIR%%/extensions/text_extract.inx
+%%DATADIR%%/extensions/text_extract.py
%%DATADIR%%/extensions/text_flipcase.inx
%%DATADIR%%/extensions/text_flipcase.py
%%DATADIR%%/extensions/text_lowercase.inx
%%DATADIR%%/extensions/text_lowercase.py
+%%DATADIR%%/extensions/text_merge.inx
+%%DATADIR%%/extensions/text_merge.py
%%DATADIR%%/extensions/text_randomcase.inx
%%DATADIR%%/extensions/text_randomcase.py
-%%DATADIR%%/extensions/text_replace.inx
-%%DATADIR%%/extensions/text_replace.py
%%DATADIR%%/extensions/text_sentencecase.inx
%%DATADIR%%/extensions/text_sentencecase.py
%%DATADIR%%/extensions/text_titlecase.inx
@@ -421,11 +507,10 @@ share/icons/hicolor/48x48/apps/inkscape.png
%%DATADIR%%/extensions/text_uppercase.py
%%DATADIR%%/extensions/triangle.inx
%%DATADIR%%/extensions/triangle.py
-%%DATADIR%%/extensions/txt2svg.inx
-%%DATADIR%%/extensions/txt2svg.pl
%%DATADIR%%/extensions/uniconv-ext.py
%%DATADIR%%/extensions/uniconv_output.py
%%DATADIR%%/extensions/voronoi.py
+%%DATADIR%%/extensions/voronoi2svg.inx
%%DATADIR%%/extensions/voronoi2svg.py
%%DATADIR%%/extensions/web-set-att.inx
%%DATADIR%%/extensions/web-set-att.py
@@ -461,6 +546,7 @@ share/icons/hicolor/48x48/apps/inkscape.png
%%DATADIR%%/filters/filters.svg.h
%%DATADIR%%/fonts/README
%%DATADIR%%/gradients/README
+%%DATADIR%%/icons/OCAL.png
%%DATADIR%%/icons/README
%%DATADIR%%/icons/color-management-icon.png
%%DATADIR%%/icons/feBlend-icon.png
@@ -499,6 +585,7 @@ share/icons/hicolor/48x48/apps/inkscape.png
%%DATADIR%%/icons/out-of-gamut-icon.svg
%%DATADIR%%/icons/remove-color.png
%%DATADIR%%/icons/remove-color.svg
+%%DATADIR%%/icons/symbolic_icons.svg
%%DATADIR%%/icons/tango_icons.svg
%%DATADIR%%/icons/ticotico.jpg
%%DATADIR%%/icons/too-much-ink-icon.png
@@ -513,6 +600,7 @@ share/icons/hicolor/48x48/apps/inkscape.png
%%DATADIR%%/keys/xara.xml
%%DATADIR%%/keys/zoner-draw.xml
%%DATADIR%%/markers/markers.svg
+%%DATADIR%%/palettes/Android-icon-palette.gpl
%%DATADIR%%/palettes/Blues.gpl
%%DATADIR%%/palettes/Gold.gpl
%%DATADIR%%/palettes/Gray.gpl
@@ -529,6 +617,7 @@ share/icons/hicolor/48x48/apps/inkscape.png
%%DATADIR%%/palettes/Ubuntu.gpl
%%DATADIR%%/palettes/echo-palette.gpl
%%DATADIR%%/palettes/inkscape.gpl
+%%DATADIR%%/palettes/palettes.h
%%DATADIR%%/palettes/svg.gpl
%%DATADIR%%/palettes/webhex.gpl
%%DATADIR%%/palettes/websafe22.gpl
@@ -537,9 +626,17 @@ share/icons/hicolor/48x48/apps/inkscape.png
%%DATADIR%%/patterns/patterns.svg
%%DATADIR%%/patterns/patterns.svg.h
%%DATADIR%%/screens/about.svg
+%%DATADIR%%/symbols/AigaSymbols.svg
+%%DATADIR%%/symbols/BalloonSymbols.svg
+%%DATADIR%%/symbols/FlowSymbols.svg
+%%DATADIR%%/symbols/LogicSymbols.svg
+%%DATADIR%%/symbols/MapSymbolsNPS.svg
+%%DATADIR%%/symbols/README
+%%DATADIR%%/symbols/symbols.h
%%DATADIR%%/templates/A4.svg
%%DATADIR%%/templates/A4_landscape.svg
%%DATADIR%%/templates/CD_cover_300dpi.svg
+%%DATADIR%%/templates/CD_label_120x120.svg
%%DATADIR%%/templates/DVD_cover_regular_300dpi.svg
%%DATADIR%%/templates/DVD_cover_slim_300dpi.svg
%%DATADIR%%/templates/DVD_cover_superslim_300dpi.svg
@@ -548,6 +645,7 @@ share/icons/hicolor/48x48/apps/inkscape.png
%%DATADIR%%/templates/Letter.svg
%%DATADIR%%/templates/Letter_landscape.svg
%%DATADIR%%/templates/README
+%%DATADIR%%/templates/Typography_Canvas.svg
%%DATADIR%%/templates/black_opaque.svg
%%DATADIR%%/templates/business_card_85x54mm.svg
%%DATADIR%%/templates/business_card_90x50mm.svg
@@ -582,6 +680,7 @@ share/icons/hicolor/48x48/apps/inkscape.png
%%DATADIR%%/templates/icon_64x64.svg
%%DATADIR%%/templates/no_borders.svg
%%DATADIR%%/templates/no_layers.svg
+%%DATADIR%%/templates/templates.h
%%DATADIR%%/templates/video_HDTV_1920x1080.svg
%%DATADIR%%/templates/video_NTSC_720x486.svg
%%DATADIR%%/templates/video_PAL_720x576.svg
@@ -596,10 +695,12 @@ share/icons/hicolor/48x48/apps/inkscape.png
%%DATADIR%%/tutorials/potrace-be.png
%%DATADIR%%/tutorials/potrace-ca.png
%%DATADIR%%/tutorials/potrace-de.png
+%%DATADIR%%/tutorials/potrace-el.png
%%DATADIR%%/tutorials/potrace-en.png
%%DATADIR%%/tutorials/potrace-es.png
%%DATADIR%%/tutorials/potrace-eu.png
%%DATADIR%%/tutorials/potrace-fr.png
+%%DATADIR%%/tutorials/potrace-gl.png
%%DATADIR%%/tutorials/potrace-hu.png
%%DATADIR%%/tutorials/potrace-id.png
%%DATADIR%%/tutorials/potrace-ja.png
@@ -617,6 +718,7 @@ share/icons/hicolor/48x48/apps/inkscape.png
%%DATADIR%%/tutorials/tutorial-advanced.ca.svg
%%DATADIR%%/tutorials/tutorial-advanced.cs.svg
%%DATADIR%%/tutorials/tutorial-advanced.de.svg
+%%DATADIR%%/tutorials/tutorial-advanced.el.svg
%%DATADIR%%/tutorials/tutorial-advanced.es.svg
%%DATADIR%%/tutorials/tutorial-advanced.eu.svg
%%DATADIR%%/tutorials/tutorial-advanced.fa.svg
@@ -641,11 +743,13 @@ share/icons/hicolor/48x48/apps/inkscape.png
%%DATADIR%%/tutorials/tutorial-basic.cs.svg
%%DATADIR%%/tutorials/tutorial-basic.da.svg
%%DATADIR%%/tutorials/tutorial-basic.de.svg
+%%DATADIR%%/tutorials/tutorial-basic.el.svg
%%DATADIR%%/tutorials/tutorial-basic.eo.svg
%%DATADIR%%/tutorials/tutorial-basic.es.svg
%%DATADIR%%/tutorials/tutorial-basic.eu.svg
%%DATADIR%%/tutorials/tutorial-basic.fa.svg
%%DATADIR%%/tutorials/tutorial-basic.fr.svg
+%%DATADIR%%/tutorials/tutorial-basic.gl.svg
%%DATADIR%%/tutorials/tutorial-basic.hu.svg
%%DATADIR%%/tutorials/tutorial-basic.id.svg
%%DATADIR%%/tutorials/tutorial-basic.it.svg
@@ -666,6 +770,7 @@ share/icons/hicolor/48x48/apps/inkscape.png
%%DATADIR%%/tutorials/tutorial-calligraphy.ca.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.cs.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.de.svg
+%%DATADIR%%/tutorials/tutorial-calligraphy.el.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.es.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.eu.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.fa.svg
@@ -685,6 +790,7 @@ share/icons/hicolor/48x48/apps/inkscape.png
%%DATADIR%%/tutorials/tutorial-elements.be.svg
%%DATADIR%%/tutorials/tutorial-elements.ca.svg
%%DATADIR%%/tutorials/tutorial-elements.de.svg
+%%DATADIR%%/tutorials/tutorial-elements.el.svg
%%DATADIR%%/tutorials/tutorial-elements.es.svg
%%DATADIR%%/tutorials/tutorial-elements.eu.svg
%%DATADIR%%/tutorials/tutorial-elements.fa.svg
@@ -702,11 +808,13 @@ share/icons/hicolor/48x48/apps/inkscape.png
%%DATADIR%%/tutorials/tutorial-elements.zh_TW.svg
%%DATADIR%%/tutorials/tutorial-interpolate.be.svg
%%DATADIR%%/tutorials/tutorial-interpolate.de.svg
+%%DATADIR%%/tutorials/tutorial-interpolate.el.svg
%%DATADIR%%/tutorials/tutorial-interpolate.fr.svg
%%DATADIR%%/tutorials/tutorial-interpolate.hu.svg
%%DATADIR%%/tutorials/tutorial-interpolate.ja.svg
%%DATADIR%%/tutorials/tutorial-interpolate.nl.svg
%%DATADIR%%/tutorials/tutorial-interpolate.pl.svg
+%%DATADIR%%/tutorials/tutorial-interpolate.pt_BR.svg
%%DATADIR%%/tutorials/tutorial-interpolate.sk.svg
%%DATADIR%%/tutorials/tutorial-interpolate.sl.svg
%%DATADIR%%/tutorials/tutorial-interpolate.svg
@@ -716,10 +824,12 @@ share/icons/hicolor/48x48/apps/inkscape.png
%%DATADIR%%/tutorials/tutorial-shapes.ca.svg
%%DATADIR%%/tutorials/tutorial-shapes.cs.svg
%%DATADIR%%/tutorials/tutorial-shapes.de.svg
+%%DATADIR%%/tutorials/tutorial-shapes.el.svg
%%DATADIR%%/tutorials/tutorial-shapes.es.svg
%%DATADIR%%/tutorials/tutorial-shapes.eu.svg
%%DATADIR%%/tutorials/tutorial-shapes.fa.svg
%%DATADIR%%/tutorials/tutorial-shapes.fr.svg
+%%DATADIR%%/tutorials/tutorial-shapes.gl.svg
%%DATADIR%%/tutorials/tutorial-shapes.hu.svg
%%DATADIR%%/tutorials/tutorial-shapes.id.svg
%%DATADIR%%/tutorials/tutorial-shapes.it.svg
@@ -737,6 +847,7 @@ share/icons/hicolor/48x48/apps/inkscape.png
%%DATADIR%%/tutorials/tutorial-tips.be.svg
%%DATADIR%%/tutorials/tutorial-tips.ca.svg
%%DATADIR%%/tutorials/tutorial-tips.de.svg
+%%DATADIR%%/tutorials/tutorial-tips.el.svg
%%DATADIR%%/tutorials/tutorial-tips.es.svg
%%DATADIR%%/tutorials/tutorial-tips.eu.svg
%%DATADIR%%/tutorials/tutorial-tips.fa.svg
@@ -754,13 +865,20 @@ share/icons/hicolor/48x48/apps/inkscape.png
%%DATADIR%%/tutorials/tutorial-tips.svg
%%DATADIR%%/tutorials/tutorial-tips.vi.svg
%%DATADIR%%/tutorials/tutorial-tips.zh_TW.svg
+%%DATADIR%%/tutorials/tutorial-tracing-pixelart.el.svg
+%%DATADIR%%/tutorials/tutorial-tracing-pixelart.fr.svg
+%%DATADIR%%/tutorials/tutorial-tracing-pixelart.nl.svg
+%%DATADIR%%/tutorials/tutorial-tracing-pixelart.svg
+%%DATADIR%%/tutorials/tutorial-tracing-pixelart.zh_TW.svg
%%DATADIR%%/tutorials/tutorial-tracing.be.svg
%%DATADIR%%/tutorials/tutorial-tracing.ca.svg
%%DATADIR%%/tutorials/tutorial-tracing.de.svg
+%%DATADIR%%/tutorials/tutorial-tracing.el.svg
%%DATADIR%%/tutorials/tutorial-tracing.es.svg
%%DATADIR%%/tutorials/tutorial-tracing.eu.svg
%%DATADIR%%/tutorials/tutorial-tracing.fa.svg
%%DATADIR%%/tutorials/tutorial-tracing.fr.svg
+%%DATADIR%%/tutorials/tutorial-tracing.gl.svg
%%DATADIR%%/tutorials/tutorial-tracing.hu.svg
%%DATADIR%%/tutorials/tutorial-tracing.id.svg
%%DATADIR%%/tutorials/tutorial-tracing.ja.svg
@@ -777,7 +895,6 @@ share/icons/hicolor/48x48/apps/inkscape.png
%%DATADIR%%/ui/keybindings.rc
%%DATADIR%%/ui/menus-bars.xml
%%DATADIR%%/ui/toolbox.xml
-%%DATADIR%%/ui/units.txt
%%DATADIR%%/ui/units.xml
share/locale/am/LC_MESSAGES/inkscape.mo
share/locale/ar/LC_MESSAGES/inkscape.mo
@@ -785,6 +902,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
@@ -817,6 +935,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 +955,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