Attachment #213604 for bug #243615




# $FreeBSD: head/graphics/inkscape/Makefile 530258 2020-04-02 04:41:02Z tcberner $

PORTNAME=	inkscape
PORTVERSION=	0.92.5
PORTREVISION=	16
CATEGORIES=	graphics gnome
MASTER_SITES=	https://media.inkscape.org/dl/resources/file/


LIB_DEPENDS=	libpopt.so:devel/popt \
		libgc.so:devel/boehm-gc \
		libgsl.so:math/gsl \
		libgtkspell3-3.so:textproc/gtkspell3 \
		liblcms2.so:graphics/lcms2 \
		libfribidi.so:converters/fribidi \
		libaspell.so:textproc/aspell \
		libfontconfig.so:x11-fonts/fontconfig \
		libfreetype.so:print/freetype2 \
		libGraphicsMagick.so:graphics/GraphicsMagick \
		libpotrace.so:graphics/libpotrace \
		libpng.so:graphics/png
		libMagick++-6.so:graphics/ImageMagick6
RUN_DEPENDS=	${PYNUMPY} \
		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}scour>0:textproc/py-scour@${PY_FLAVOR}

USES=		compiler:c++11-lib cmake cpe desktop-file-utils gnome \
		iconv:wchar_t jpeg pathfix pkgconfig python \
		shebangfix tar:bzip2
USE_GNOME=	gtkmm24 libxml2 libxslt
USE_LDCONFIG=	yes
INSTALLS_ICONS=	yes
# CMake: Allow to build with GraphicsMagick instead of ImageMagick
# https://gitlab.com/inkscape/inkscape/-/commit/e4c44f8b4674b88c0174270f27d61db808f66bc6
CMAKE_ARGS+=	-DWITH_GNOME_VFS:BOOL=NO \
		-DWITH_IMAGE_MAGICK=OFF \
		-DWITH_GRAPHICS_MAGICK=ON

SHEBANG_FILES=	cxxtest/cxxtestgen.pl share/extensions/*.p[lm] \
		share/extensions/*.py share/extensions/genpofiles.sh \

DBUS_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
			libdbus-1.so:devel/dbus

CMAKE_ARGS+=		-DCMAKE_POLICY_DEFAULT_CMP0075:STRING=NEW \
			-DWITH_OPENMP:BOOL=true
#OPENMP_CMAKE_BOOL=	WITH_OPENMP
CMAKE_ARGS+=		-DWITH_OPENMP:BOOL=NO

POPPLER_DESC=		PDF preview rendering
POPPLER_CMAKE_BOOL=	ENABLE_POPPLER ENABLE_POPPLER_CAIRO

Lines 1-3 Link Here

(-)inkscape/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1557601550	1	TIMESTAMP = 1587240754
2	SHA256 (inkscape-0.92.4.tar.bz2) = 57ec2da8177b36614a513e2822efd73af721e690f7ddc6bd0a5fbb1525b4515e	2	SHA256 (inkscape-0.92.5.tar.bz2) = 81ee7f69e2bd64a97343d8395a4a7a7905b21b861566ed5e5d9179178d519a0b
3	SIZE (inkscape-0.92.4.tar.bz2) = 31929728	3	SIZE (inkscape-0.92.5.tar.bz2) = 32175410




--- src/extension/internal/pdfinput/pdf-input.cpp.orig	2020-04-09 21:37:16 UTC
+++ src/extension/internal/pdfinput/pdf-input.cpp
@@ -689,12 +689,12 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/,
         //
         gchar const *poppler_datadir = g_getenv("POPPLER_DATADIR");
         if (poppler_datadir != NULL) {
-            globalParams = _POPPLER_NEW_GLOBAL_PARAMS(poppler_datadir);
+            globalParams = std::unique_ptr<GlobalParams>(new GlobalParams(poppler_datadir));
         } else {
-            globalParams = _POPPLER_NEW_GLOBAL_PARAMS();
+        globalParams = std::unique_ptr<GlobalParams>(new GlobalParams());
         }
 #else
-        globalParams = _POPPLER_NEW_GLOBAL_PARAMS();
+        globalParams = std::unique_ptr<GlobalParams>(new GlobalParams());
 #endif // ENABLE_OSX_APP_LOCATIONS
     }




--- src/extension/internal/pdfinput/pdf-parser.cpp.orig	2020-04-09 21:37:16 UTC
+++ src/extension/internal/pdfinput/pdf-parser.cpp
@@ -265,14 +265,14 @@ GfxPatch blankPatch()
 class ClipHistoryEntry {

     ClipHistoryEntry *save();
     ClipHistoryEntry *restore();
-    GBool hasSaves() { return saved != NULL; }
-    void setClip(_POPPLER_CONST_83 GfxPath *newClipPath, GfxClipType newClipType = clipNormal);
+    bool hasSaves() { return saved != NULL; }
+    void setClip(const GfxPath *newClipPath, GfxClipType newClipType = clipNormal);
     GfxPath *getClipPath() { return clipPath; }

   Object obj2;
 
   if (obj->isArray()) {
@@ -432,7 +432,7 @@ void PdfParser::parse(Object *obj, GBool topLevel) {
 	error(errInternal, -1, "Weird page contents");
     	return;
   }
-  parser = new Parser(xref, new Lexer(xref, obj), gFalse);
+  parser = new _POPPLER_NEW_PARSER(xref, obj);
   go(topLevel);
   delete parser;
   parser = NULL;
 }
 

   GfxColor backdropColor;
-  GBool haveBackdropColor = gFalse;
-  GBool alpha = gFalse;
+  GBool haveBackdropColor = false;
+  GBool alpha = false;
 
   _POPPLER_CALL_ARGS(obj1, res->lookupGState, args[0].getName());
   if (obj1.isNull()) {

 	  GfxColorSpace *blendingColorSpace = 0;
-	  GBool isolated = gFalse;
-	  GBool knockout = gFalse;
+	  GBool isolated = false;
+	  GBool knockout = false;
 	  if (!_POPPLER_CALL_ARGS_DEREF(obj5, obj4.dictLookup, "CS").isNull()) {
 #if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
 	    blendingColorSpace = GfxColorSpace::parse(NULL, &obj5, NULL, NULL);

-void PdfParser::doFillAndStroke(GBool eoFill) {
-    GBool fillOk = gTrue, strokeOk = gTrue;
+void PdfParser::doFillAndStroke(bool eoFill) {
+    GBool fillOk = true, strokeOk = true;
     if (state->getFillColorSpace()->getMode() == csPattern &&
         !builder->isPatternTypeSupported(state->getFillPattern())) {
-        fillOk = gFalse;

   double gradientTransform[6];
   double *matrix = NULL;
-  GBool savedState = gFalse;
+  GBool savedState = false;
 
 #if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
   if (!(shading = res->lookupShading(args[0].getName(), NULL, NULL))) {

   }
   wMode = state->getFont()->getWMode();
   a = args[0].getArray();
@@ -2414,7 +2414,7 @@ void PdfParser::doShowText(GooString *s) {
   int wMode;
   double riseX, riseY;
   CharCode code;
-  Unicode *u = NULL;
+  const Unicode *u = NULL;
   double x, y, dx, dy, tdx, tdy;
   double originX, originY, tOriginX, tOriginY;
   double oldCTM[6], newCTM[6];
@@ -2487,7 +2487,7 @@ void PdfParser::doShowText(GooString *s) {
 	  pushResources(resDict);
 	}

 
 void PdfParser::doForm1(Object *str, Dict *resDict, double *matrix, double *bbox,
-		  GBool transpGroup, GBool softMask,
+		  bool transpGroup, GBool softMask,
 		  GfxColorSpace *blendingColorSpace,
-		  GBool isolated, GBool knockout,
-		  GBool alpha, Function *transferFunc,
+		  bool isolated, GBool knockout,
+		  bool alpha, Function *transferFunc,
 		  GfxColor *backdropColor) {
   Parser *oldParser;

   saved(NULL),
   clipPath((clipPathA) ? clipPathA->copy() : NULL),
   clipType(clipTypeA)
@@ -3394,7 +3394,7 @@ ClipHistoryEntry::~ClipHistoryEntry()
     }
 }
 
-void ClipHistoryEntry::setClip(GfxPath *clipPathA, GfxClipType clipTypeA) {
+void ClipHistoryEntry::setClip(const GfxPath *clipPathA, GfxClipType clipTypeA) {
     // Free previous clip path
     if (clipPath) {
         delete clipPath;




--- src/extension/internal/pdfinput/svg-builder.cpp.orig	2020-01-25 21:47:43 UTC
+++ src/extension/internal/pdfinput/svg-builder.cpp
@@ -264,10 +264,10 @@ static void svgSetTransform(Inkscape::XML::Node *node,
 /**
  * \brief Generates a SVG path string from poppler's data structure
  */
-static gchar *svgInterpretPath(GfxPath *path) {
+static gchar *svgInterpretPath(const GfxPath *path) {
     Inkscape::SVG::PathString pathString;
     for (int i = 0 ; i < path->getNumSubpaths() ; ++i ) {
-        GfxSubpath *subpath = path->getSubpath(i);
+        const GfxSubpath *subpath = path->getSubpath(i);
         if (subpath->getNumPoints() > 0) {
             pathString.moveTo(subpath->getX(0), subpath->getY(0));
             int j = 1;




%%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%%/tutorials/oldguitar.jpg
%%DATADIR%%/tutorials/pixelart-dialog.de.png
%%DATADIR%%/tutorials/pixelart-dialog.el.png
%%DATADIR%%/tutorials/pixelart-dialog.en.png
%%DATADIR%%/tutorials/pixelart-dialog.fr.png
%%DATADIR%%/tutorials/pixelart-dialog.nl.png
%%DATADIR%%/tutorials/pixelart-dialog.png

%%DATADIR%%/tutorials/pixelart-dialog.zh_TW.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/tutorial-advanced.id.svg
%%DATADIR%%/tutorials/tutorial-advanced.it.svg
%%DATADIR%%/tutorials/tutorial-advanced.ja.svg
%%DATADIR%%/tutorials/tutorial-advanced.ko.svg
%%DATADIR%%/tutorials/tutorial-advanced.nl.svg
%%DATADIR%%/tutorials/tutorial-advanced.pl.svg
%%DATADIR%%/tutorials/tutorial-advanced.pt.svg

%%DATADIR%%/tutorials/tutorial-basic.id.svg
%%DATADIR%%/tutorials/tutorial-basic.it.svg
%%DATADIR%%/tutorials/tutorial-basic.ja.svg
%%DATADIR%%/tutorials/tutorial-basic.ko.svg
%%DATADIR%%/tutorials/tutorial-basic.nl.svg
%%DATADIR%%/tutorials/tutorial-basic.nn.svg
%%DATADIR%%/tutorials/tutorial-basic.pl.svg

%%DATADIR%%/tutorials/tutorial-calligraphy.hu.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.id.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.ja.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.ko.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.nl.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.pl.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.pt.svg

%%DATADIR%%/tutorials/tutorial-elements.id.svg
%%DATADIR%%/tutorials/tutorial-elements.it.svg
%%DATADIR%%/tutorials/tutorial-elements.ja.svg
%%DATADIR%%/tutorials/tutorial-elements.ko.svg
%%DATADIR%%/tutorials/tutorial-elements.nl.svg
%%DATADIR%%/tutorials/tutorial-elements.pl.svg
%%DATADIR%%/tutorials/tutorial-elements.pt.svg

%%DATADIR%%/tutorials/tutorial-shapes.id.svg
%%DATADIR%%/tutorials/tutorial-shapes.it.svg
%%DATADIR%%/tutorials/tutorial-shapes.ja.svg
%%DATADIR%%/tutorials/tutorial-shapes.ko.svg
%%DATADIR%%/tutorials/tutorial-shapes.nl.svg
%%DATADIR%%/tutorials/tutorial-shapes.pl.svg
%%DATADIR%%/tutorials/tutorial-shapes.pt.svg

%%DATADIR%%/tutorials/tutorial-tips.id.svg
%%DATADIR%%/tutorials/tutorial-tips.it.svg
%%DATADIR%%/tutorials/tutorial-tips.ja.svg
%%DATADIR%%/tutorials/tutorial-tips.ko.svg
%%DATADIR%%/tutorials/tutorial-tips.nl.svg
%%DATADIR%%/tutorials/tutorial-tips.pl.svg
%%DATADIR%%/tutorials/tutorial-tips.pt.svg

%%DATADIR%%/tutorials/tutorial-tracing-pixelart.el.svg
%%DATADIR%%/tutorials/tutorial-tracing-pixelart.fr.svg
%%DATADIR%%/tutorials/tutorial-tracing-pixelart.hu.svg
%%DATADIR%%/tutorials/tutorial-tracing-pixelart.ko.svg
%%DATADIR%%/tutorials/tutorial-tracing-pixelart.nl.svg
%%DATADIR%%/tutorials/tutorial-tracing-pixelart.pt.svg
%%DATADIR%%/tutorials/tutorial-tracing-pixelart.ru.svg

%%DATADIR%%/tutorials/tutorial-tracing.hu.svg
%%DATADIR%%/tutorials/tutorial-tracing.id.svg
%%DATADIR%%/tutorials/tutorial-tracing.ja.svg
%%DATADIR%%/tutorials/tutorial-tracing.ko.svg
%%DATADIR%%/tutorials/tutorial-tracing.nl.svg
%%DATADIR%%/tutorials/tutorial-tracing.pl.svg
%%DATADIR%%/tutorials/tutorial-tracing.pt.svg

Return to bug 243615

Lines 2-9 Link Here

(-)inkscape/Makefile (-13 / +14 lines)
2	# $FreeBSD: head/graphics/inkscape/Makefile 530258 2020-04-02 04:41:02Z tcberner $	2	# $FreeBSD: head/graphics/inkscape/Makefile 530258 2020-04-02 04:41:02Z tcberner $
3		3
4	PORTNAME= inkscape	4	PORTNAME= inkscape
5	PORTVERSION= 0.92.4	5	PORTVERSION= 0.92.5
6	PORTREVISION= 16
7	CATEGORIES= graphics gnome	6	CATEGORIES= graphics gnome
8	MASTER_SITES= https://media.inkscape.org/dl/resources/file/	7	MASTER_SITES= https://media.inkscape.org/dl/resources/file/
9		8
Lines 20-45 Link Here
20	LIB_DEPENDS= libpopt.so:devel/popt \	19	LIB_DEPENDS= libpopt.so:devel/popt \
21	libgc.so:devel/boehm-gc \	20	libgc.so:devel/boehm-gc \
22	libgsl.so:math/gsl \	21	libgsl.so:math/gsl \
23	libgtkspell.so:textproc/gtkspell \	22	libgtkspell3-3.so:textproc/gtkspell3 \
24	liblcms2.so:graphics/lcms2 \	23	liblcms2.so:graphics/lcms2 \
25	libfribidi.so:converters/fribidi \	24	libfribidi.so:converters/fribidi \
26	libaspell.so:textproc/aspell \	25	libaspell.so:textproc/aspell \
27	libfontconfig.so:x11-fonts/fontconfig \	26	libfontconfig.so:x11-fonts/fontconfig \
28	libfreetype.so:print/freetype2 \	27	libfreetype.so:print/freetype2 \
		28	libGraphicsMagick.so:graphics/GraphicsMagick \
29	libpotrace.so:graphics/libpotrace \	29	libpotrace.so:graphics/libpotrace \
30	libpng.so:graphics/png \	30	libpng.so:graphics/png
31	libMagick++-6.so:graphics/ImageMagick6
32	RUN_DEPENDS= ${PYNUMPY} \	31	RUN_DEPENDS= ${PYNUMPY} \
33	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \	32	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
34	${PYTHON_PKGNAMEPREFIX}scour>0:textproc/py-scour@${PY_FLAVOR}	33	${PYTHON_PKGNAMEPREFIX}scour>0:textproc/py-scour@${PY_FLAVOR}
35		34
36	USES= compiler:c++11-lib cmake cpe desktop-file-utils gnome \	35	USES= compiler:c++11-lib cmake cpe desktop-file-utils gnome \
37	iconv:wchar_t jpeg pathfix pkgconfig python:2.7 \	36	iconv:wchar_t jpeg pathfix pkgconfig python \
38	shebangfix tar:bzip2 xorg	37	shebangfix tar:bzip2
39	USE_GNOME= gtkmm24 libxml2 libxslt	38	USE_GNOME= gtkmm24 libxml2 libxslt
40	USE_XORG= x11	39	USE_LDCONFIG= yes
41	INSTALLS_ICONS= yes	40	INSTALLS_ICONS= yes
42	CMAKE_ARGS+= -DWITH_GNOME_VFS:BOOL=NO	41	# CMake: Allow to build with GraphicsMagick instead of ImageMagick
		42	# https://gitlab.com/inkscape/inkscape/-/commit/e4c44f8b4674b88c0174270f27d61db808f66bc6
		43	CMAKE_ARGS+= -DWITH_GNOME_VFS:BOOL=NO \
		44	-DWITH_IMAGE_MAGICK=OFF \
		45	-DWITH_GRAPHICS_MAGICK=ON
43		46
44	SHEBANG_FILES= cxxtest/cxxtestgen.pl share/extensions/*.p[lm] \	47	SHEBANG_FILES= cxxtest/cxxtestgen.pl share/extensions/*.p[lm] \
45	share/extensions/*.py share/extensions/genpofiles.sh \	48	share/extensions/*.py share/extensions/genpofiles.sh \
Lines 58-67 Link Here
58	DBUS_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \	61	DBUS_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
59	libdbus-1.so:devel/dbus	62	libdbus-1.so:devel/dbus
60		63
61	#OPENMP_USES= compiler:openmp	64	CMAKE_ARGS+= -DCMAKE_POLICY_DEFAULT_CMP0075:STRING=NEW \
62	#OPENMP_USES_OFF= compiler:c++11-lib	65	-DWITH_OPENMP:BOOL=true
63	#OPENMP_CMAKE_BOOL= WITH_OPENMP
64	CMAKE_ARGS+= -DWITH_OPENMP:BOOL=NO
65		66
66	POPPLER_DESC= PDF preview rendering	67	POPPLER_DESC= PDF preview rendering
67	POPPLER_CMAKE_BOOL= ENABLE_POPPLER ENABLE_POPPLER_CAIRO	68	POPPLER_CMAKE_BOOL= ENABLE_POPPLER ENABLE_POPPLER_CAIRO

Lines 1-17 Link Here

(-)inkscape/files/patch-src_extension_internal_pdfinput_pdf-input.cpp (-5 / +5 lines)
1	--- src/extension/internal/pdfinput/pdf-input.cpp.orig 2020-01-25 21:47:43 UTC	1	--- src/extension/internal/pdfinput/pdf-input.cpp.orig 2020-04-09 21:37:16 UTC
2	+++ src/extension/internal/pdfinput/pdf-input.cpp	2	+++ src/extension/internal/pdfinput/pdf-input.cpp
3	@@ -689,12 +689,12 @@ PdfInput::open(::Inkscape::Extension::Input * /mod/,	3	@@ -689,12 +689,12 @@ PdfInput::open(::Inkscape::Extension::Input * /mod/,
4	//	4	//
5	gchar const *poppler_datadir = g_getenv("POPPLER_DATADIR");	5	gchar const *poppler_datadir = g_getenv("POPPLER_DATADIR");
6	if (poppler_datadir != NULL) {	6	if (poppler_datadir != NULL) {
7	- globalParams = new GlobalParams(poppler_datadir);	7	- globalParams = _POPPLER_NEW_GLOBAL_PARAMS(poppler_datadir);
8	+ globalParams = std::unique_ptr<GlobalParams>(new GlobalParams(poppler_datadir));	8	+ globalParams = std::unique_ptr<GlobalParams>(new GlobalParams(poppler_datadir));
9	} else {	9	} else {
10	- globalParams = new GlobalParams();	10	- globalParams = _POPPLER_NEW_GLOBAL_PARAMS();
11	+ globalParams = std::unique_ptr<GlobalParams>(new GlobalParams());	11	+ globalParams = std::unique_ptr<GlobalParams>(new GlobalParams());
12	}	12	}
13	#else	13	#else
14	- globalParams = new GlobalParams();	14	- globalParams = _POPPLER_NEW_GLOBAL_PARAMS();
15	+ globalParams = std::unique_ptr<GlobalParams>(new GlobalParams());	15	+ globalParams = std::unique_ptr<GlobalParams>(new GlobalParams());
16	#endif // ENABLE_OSX_APP_LOCATIONS	16	#endif // ENABLE_OSX_APP_LOCATIONS
17	}	17	}

Lines 1-15 Link Here

(-)inkscape/files/patch-src_extension_internal_pdfinput_svg-builder.cpp (-15 lines)
1	--- src/extension/internal/pdfinput/svg-builder.cpp.orig 2020-01-25 21:47:43 UTC
2	+++ src/extension/internal/pdfinput/svg-builder.cpp
3	@@ -264,10 +264,10 @@ static void svgSetTransform(Inkscape::XML::Node *node,
4	/**
5	* \brief Generates a SVG path string from poppler's data structure
6	*/
7	-static gchar svgInterpretPath(GfxPath path) {
8	+static gchar svgInterpretPath(const GfxPath path) {
9	Inkscape::SVG::PathString pathString;
10	for (int i = 0 ; i < path->getNumSubpaths() ; ++i ) {
11	- GfxSubpath *subpath = path->getSubpath(i);
12	+ const GfxSubpath *subpath = path->getSubpath(i);
13	if (subpath->getNumPoints() > 0) {
14	pathString.moveTo(subpath->getX(0), subpath->getY(0));
15	int j = 1;

Lines 307-313 Link Here

(-)inkscape/pkg-plist (-3 / +8 lines)
307	%%DATADIR%%/extensions/gcodetools.py	307	%%DATADIR%%/extensions/gcodetools.py
308	%%DATADIR%%/extensions/gcodetools_about.inx	308	%%DATADIR%%/extensions/gcodetools_about.inx
309	%%DATADIR%%/extensions/gcodetools_area.inx	309	%%DATADIR%%/extensions/gcodetools_area.inx
310	%%DATADIR%%/extensions/gcodetools_check_for_updates.inx
311	%%DATADIR%%/extensions/gcodetools_dxf_points.inx	310	%%DATADIR%%/extensions/gcodetools_dxf_points.inx
312	%%DATADIR%%/extensions/gcodetools_engraving.inx	311	%%DATADIR%%/extensions/gcodetools_engraving.inx
313	%%DATADIR%%/extensions/gcodetools_graffiti.inx	312	%%DATADIR%%/extensions/gcodetools_graffiti.inx
Lines 694-700 Link Here
694	%%DATADIR%%/tutorials/oldguitar.jpg	693	%%DATADIR%%/tutorials/oldguitar.jpg
695	%%DATADIR%%/tutorials/pixelart-dialog.de.png	694	%%DATADIR%%/tutorials/pixelart-dialog.de.png
696	%%DATADIR%%/tutorials/pixelart-dialog.el.png	695	%%DATADIR%%/tutorials/pixelart-dialog.el.png
697	%%DATADIR%%/tutorials/pixelart-dialog.en.png
698	%%DATADIR%%/tutorials/pixelart-dialog.fr.png	696	%%DATADIR%%/tutorials/pixelart-dialog.fr.png
699	%%DATADIR%%/tutorials/pixelart-dialog.nl.png	697	%%DATADIR%%/tutorials/pixelart-dialog.nl.png
700	%%DATADIR%%/tutorials/pixelart-dialog.png	698	%%DATADIR%%/tutorials/pixelart-dialog.png
Lines 704-710 Link Here
704	%%DATADIR%%/tutorials/pixelart-dialog.zh_TW.png	702	%%DATADIR%%/tutorials/pixelart-dialog.zh_TW.png
705	%%DATADIR%%/tutorials/potrace.de.png	703	%%DATADIR%%/tutorials/potrace.de.png
706	%%DATADIR%%/tutorials/potrace.el.png	704	%%DATADIR%%/tutorials/potrace.el.png
707	%%DATADIR%%/tutorials/potrace.en.png
708	%%DATADIR%%/tutorials/potrace.es.png	705	%%DATADIR%%/tutorials/potrace.es.png
709	%%DATADIR%%/tutorials/potrace.eu.png	706	%%DATADIR%%/tutorials/potrace.eu.png
710	%%DATADIR%%/tutorials/potrace.fr.png	707	%%DATADIR%%/tutorials/potrace.fr.png
Lines 736-741 Link Here
736	%%DATADIR%%/tutorials/tutorial-advanced.id.svg	733	%%DATADIR%%/tutorials/tutorial-advanced.id.svg
737	%%DATADIR%%/tutorials/tutorial-advanced.it.svg	734	%%DATADIR%%/tutorials/tutorial-advanced.it.svg
738	%%DATADIR%%/tutorials/tutorial-advanced.ja.svg	735	%%DATADIR%%/tutorials/tutorial-advanced.ja.svg
		736	%%DATADIR%%/tutorials/tutorial-advanced.ko.svg
739	%%DATADIR%%/tutorials/tutorial-advanced.nl.svg	737	%%DATADIR%%/tutorials/tutorial-advanced.nl.svg
740	%%DATADIR%%/tutorials/tutorial-advanced.pl.svg	738	%%DATADIR%%/tutorials/tutorial-advanced.pl.svg
741	%%DATADIR%%/tutorials/tutorial-advanced.pt.svg	739	%%DATADIR%%/tutorials/tutorial-advanced.pt.svg
Lines 765-770 Link Here
765	%%DATADIR%%/tutorials/tutorial-basic.id.svg	763	%%DATADIR%%/tutorials/tutorial-basic.id.svg
766	%%DATADIR%%/tutorials/tutorial-basic.it.svg	764	%%DATADIR%%/tutorials/tutorial-basic.it.svg
767	%%DATADIR%%/tutorials/tutorial-basic.ja.svg	765	%%DATADIR%%/tutorials/tutorial-basic.ja.svg
		766	%%DATADIR%%/tutorials/tutorial-basic.ko.svg
768	%%DATADIR%%/tutorials/tutorial-basic.nl.svg	767	%%DATADIR%%/tutorials/tutorial-basic.nl.svg
769	%%DATADIR%%/tutorials/tutorial-basic.nn.svg	768	%%DATADIR%%/tutorials/tutorial-basic.nn.svg
770	%%DATADIR%%/tutorials/tutorial-basic.pl.svg	769	%%DATADIR%%/tutorials/tutorial-basic.pl.svg
Lines 792-797 Link Here
792	%%DATADIR%%/tutorials/tutorial-calligraphy.hu.svg	791	%%DATADIR%%/tutorials/tutorial-calligraphy.hu.svg
793	%%DATADIR%%/tutorials/tutorial-calligraphy.id.svg	792	%%DATADIR%%/tutorials/tutorial-calligraphy.id.svg
794	%%DATADIR%%/tutorials/tutorial-calligraphy.ja.svg	793	%%DATADIR%%/tutorials/tutorial-calligraphy.ja.svg
		794	%%DATADIR%%/tutorials/tutorial-calligraphy.ko.svg
795	%%DATADIR%%/tutorials/tutorial-calligraphy.nl.svg	795	%%DATADIR%%/tutorials/tutorial-calligraphy.nl.svg
796	%%DATADIR%%/tutorials/tutorial-calligraphy.pl.svg	796	%%DATADIR%%/tutorials/tutorial-calligraphy.pl.svg
797	%%DATADIR%%/tutorials/tutorial-calligraphy.pt.svg	797	%%DATADIR%%/tutorials/tutorial-calligraphy.pt.svg
Lines 816-821 Link Here
816	%%DATADIR%%/tutorials/tutorial-elements.id.svg	816	%%DATADIR%%/tutorials/tutorial-elements.id.svg
817	%%DATADIR%%/tutorials/tutorial-elements.it.svg	817	%%DATADIR%%/tutorials/tutorial-elements.it.svg
818	%%DATADIR%%/tutorials/tutorial-elements.ja.svg	818	%%DATADIR%%/tutorials/tutorial-elements.ja.svg
		819	%%DATADIR%%/tutorials/tutorial-elements.ko.svg
819	%%DATADIR%%/tutorials/tutorial-elements.nl.svg	820	%%DATADIR%%/tutorials/tutorial-elements.nl.svg
820	%%DATADIR%%/tutorials/tutorial-elements.pl.svg	821	%%DATADIR%%/tutorials/tutorial-elements.pl.svg
821	%%DATADIR%%/tutorials/tutorial-elements.pt.svg	822	%%DATADIR%%/tutorials/tutorial-elements.pt.svg
Lines 858-863 Link Here
858	%%DATADIR%%/tutorials/tutorial-shapes.id.svg	859	%%DATADIR%%/tutorials/tutorial-shapes.id.svg
859	%%DATADIR%%/tutorials/tutorial-shapes.it.svg	860	%%DATADIR%%/tutorials/tutorial-shapes.it.svg
860	%%DATADIR%%/tutorials/tutorial-shapes.ja.svg	861	%%DATADIR%%/tutorials/tutorial-shapes.ja.svg
		862	%%DATADIR%%/tutorials/tutorial-shapes.ko.svg
861	%%DATADIR%%/tutorials/tutorial-shapes.nl.svg	863	%%DATADIR%%/tutorials/tutorial-shapes.nl.svg
862	%%DATADIR%%/tutorials/tutorial-shapes.pl.svg	864	%%DATADIR%%/tutorials/tutorial-shapes.pl.svg
863	%%DATADIR%%/tutorials/tutorial-shapes.pt.svg	865	%%DATADIR%%/tutorials/tutorial-shapes.pt.svg
Lines 883-888 Link Here
883	%%DATADIR%%/tutorials/tutorial-tips.id.svg	885	%%DATADIR%%/tutorials/tutorial-tips.id.svg
884	%%DATADIR%%/tutorials/tutorial-tips.it.svg	886	%%DATADIR%%/tutorials/tutorial-tips.it.svg
885	%%DATADIR%%/tutorials/tutorial-tips.ja.svg	887	%%DATADIR%%/tutorials/tutorial-tips.ja.svg
		888	%%DATADIR%%/tutorials/tutorial-tips.ko.svg
886	%%DATADIR%%/tutorials/tutorial-tips.nl.svg	889	%%DATADIR%%/tutorials/tutorial-tips.nl.svg
887	%%DATADIR%%/tutorials/tutorial-tips.pl.svg	890	%%DATADIR%%/tutorials/tutorial-tips.pl.svg
888	%%DATADIR%%/tutorials/tutorial-tips.pt.svg	891	%%DATADIR%%/tutorials/tutorial-tips.pt.svg
Lines 898-903 Link Here
898	%%DATADIR%%/tutorials/tutorial-tracing-pixelart.el.svg	901	%%DATADIR%%/tutorials/tutorial-tracing-pixelart.el.svg
899	%%DATADIR%%/tutorials/tutorial-tracing-pixelart.fr.svg	902	%%DATADIR%%/tutorials/tutorial-tracing-pixelart.fr.svg
900	%%DATADIR%%/tutorials/tutorial-tracing-pixelart.hu.svg	903	%%DATADIR%%/tutorials/tutorial-tracing-pixelart.hu.svg
		904	%%DATADIR%%/tutorials/tutorial-tracing-pixelart.ko.svg
901	%%DATADIR%%/tutorials/tutorial-tracing-pixelart.nl.svg	905	%%DATADIR%%/tutorials/tutorial-tracing-pixelart.nl.svg
902	%%DATADIR%%/tutorials/tutorial-tracing-pixelart.pt.svg	906	%%DATADIR%%/tutorials/tutorial-tracing-pixelart.pt.svg
903	%%DATADIR%%/tutorials/tutorial-tracing-pixelart.ru.svg	907	%%DATADIR%%/tutorials/tutorial-tracing-pixelart.ru.svg
Lines 917-922 Link Here
917	%%DATADIR%%/tutorials/tutorial-tracing.hu.svg	921	%%DATADIR%%/tutorials/tutorial-tracing.hu.svg
918	%%DATADIR%%/tutorials/tutorial-tracing.id.svg	922	%%DATADIR%%/tutorials/tutorial-tracing.id.svg
919	%%DATADIR%%/tutorials/tutorial-tracing.ja.svg	923	%%DATADIR%%/tutorials/tutorial-tracing.ja.svg
		924	%%DATADIR%%/tutorials/tutorial-tracing.ko.svg
920	%%DATADIR%%/tutorials/tutorial-tracing.nl.svg	925	%%DATADIR%%/tutorials/tutorial-tracing.nl.svg
921	%%DATADIR%%/tutorials/tutorial-tracing.pl.svg	926	%%DATADIR%%/tutorials/tutorial-tracing.pl.svg
922	%%DATADIR%%/tutorials/tutorial-tracing.pt.svg	927	%%DATADIR%%/tutorials/tutorial-tracing.pt.svg