graphics/krita: update to 4.3.0

4 files changed, 182 insertions, 998 deletions

diff --git a/graphics/krita/Makefile b/graphics/krita/Makefile
index 724c901a4fc4..595bea008efc 100644
--- a/graphics/krita/Makefile
+++ b/graphics/krita/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	krita
-DISTVERSION=	4.2.9
-PORTREVISION=	4
+DISTVERSION=	4.3.0
 CATEGORIES=	graphics kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${DISTVERSION}
 DIST_SUBDIR=	KDE/${PORTNAME}
@@ -57,8 +56,8 @@ OPENEXR_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_OpenEXR
 
 CONFLICTS_INSTALL=	calligra-2*
 
-PLIST_SUB=	SHLIB_VER=18.0.0 \
-		SHLIB_SHVER=18
+PLIST_SUB=	SHLIB_VER=19.0.0 \
+		SHLIB_SHVER=19
 
 LDFLAGS=	-lpthread
 
diff --git a/graphics/krita/distinfo b/graphics/krita/distinfo
index 8734a175e152..9b506ee07722 100644
--- a/graphics/krita/distinfo
+++ b/graphics/krita/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1585380947
-SHA256 (KDE/krita/krita-4.2.9.tar.xz) = 4ef711887dd3ec5f2a1c42a80f2fd0fec1de0d4f3d0147b0efd418ac6e4d7567
-SIZE (KDE/krita/krita-4.2.9.tar.xz) = 170082028
+TIMESTAMP = 1592404903
+SHA256 (KDE/krita/krita-4.3.0.tar.xz) = 4d537709ab681019b2843dcfc6a0b09fd81f702326f23bce520b18ddd2bd14a7
+SIZE (KDE/krita/krita-4.3.0.tar.xz) = 166246720
diff --git a/graphics/krita/files/patch-krita-4.2.9-qt5.15 b/graphics/krita/files/patch-krita-4.2.9-qt5.15
deleted file mode 100644
index 2b7465c1cbbc..000000000000
--- a/graphics/krita/files/patch-krita-4.2.9-qt5.15
+++ /dev/null
@@ -1,880 +0,0 @@
-From d5bb12ac894ab8684d647bdf1559f745092dc741 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Mon, 23 Mar 2020 21:53:24 +0100
-Subject: Fix build with Qt 5.15
-
-QPainterPath is no longer included via qtransform.h (since
-5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git).
----
- benchmarks/kis_stroke_benchmark.cpp                                     | 1 +
- libs/basicflakes/tools/KoCreatePathTool_p.h                             | 2 ++
- libs/brush/kis_auto_brush.cpp                                           | 1 +
- libs/brush/kis_boundary.cc                                              | 1 +
- libs/brush/kis_brush.cpp                                                | 1 +
- libs/flake/KoClipMask.cpp                                               | 1 +
- libs/flake/KoClipMaskPainter.cpp                                        | 1 +
- libs/flake/KoConnectionShape.cpp                                        | 1 +
- libs/flake/KoGradientBackground.cpp                                     | 1 +
- libs/flake/KoHatchBackground.cpp                                        | 1 +
- libs/flake/KoOdfGradientBackground.cpp                                  | 1 +
- libs/flake/KoPathShape.cpp                                              | 1 +
- libs/flake/KoPatternBackground.cpp                                      | 1 +
- libs/flake/KoShapeManager.cpp                                           | 1 +
- libs/flake/KoShapeShadow.cpp                                            | 1 +
- libs/flake/KoSnapGuide.cpp                                              | 1 +
- libs/flake/KoSnapStrategy.cpp                                           | 1 +
- libs/flake/svg/SvgParser.cpp                                            | 1 +
- libs/flake/tests/TestKoMarkerCollection.cpp                             | 1 +
- libs/flake/tests/TestPointMergeCommand.cpp                              | 1 +
- libs/flake/tests/TestShapeBackgroundCommand.cpp                         | 1 +
- libs/flake/tests/TestSnapStrategy.cpp                                   | 1 +
- libs/flake/tests/TestSvgParser.cpp                                      | 1 +
- libs/flake/tests/TestSvgText.cpp                                        | 1 +
- libs/flake/text/KoSvgTextChunkShape_p.h                                 | 1 +
- libs/flake/text/KoSvgTextShape.cpp                                      | 1 +
- libs/flake/tools/KoPathTool.cpp                                         | 1 +
- libs/global/KisHandlePainterHelper.cpp                                  | 1 +
- libs/image/brushengine/kis_paintop_settings.cpp                         | 1 +
- libs/ui/flake/kis_shape_selection.h                                     | 2 ++
- libs/ui/kis_painting_assistants_decoration.cpp                          | 1 +
- libs/ui/kis_selection_decoration.h                                      | 1 +
- libs/ui/tool/kis_shape_tool_helper.cpp                                  | 2 ++
- libs/ui/tool/kis_tool_paint.h                                           | 1 +
- libs/ui/widgets/kis_cie_tongue_widget.cpp                               | 1 +
- libs/ui/widgets/kis_curve_widget.cpp                                    | 1 +
- libs/ui/widgets/kis_tone_curve_widget.cpp                               | 1 +
- plugins/assistants/Assistants/ConcentricEllipseAssistant.cc             | 1 +
- plugins/assistants/Assistants/EllipseAssistant.cc                       | 1 +
- plugins/assistants/Assistants/FisheyePointAssistant.cc                  | 1 +
- plugins/assistants/Assistants/InfiniteRulerAssistant.cc                 | 1 +
- plugins/assistants/Assistants/ParallelRulerAssistant.cc                 | 1 +
- plugins/assistants/Assistants/PerspectiveAssistant.cc                   | 1 +
- plugins/assistants/Assistants/RulerAssistant.cc                         | 1 +
- plugins/assistants/Assistants/SplineAssistant.cc                        | 1 +
- plugins/assistants/Assistants/VanishingPointAssistant.cc                | 1 +
- plugins/assistants/Assistants/kis_assistant_tool.cc                     | 1 +
- plugins/dockers/histogram/histogramdockerwidget.cpp                     | 1 +
- plugins/flake/pathshapes/enhancedpath/EnhancedPathShape.cpp             | 2 ++
- plugins/flake/textshape/TextShape.cpp                                   | 1 +
- plugins/paintops/curvebrush/curve_brush.cpp                             | 2 ++
- plugins/paintops/curvebrush/kis_curve_paintop.cpp                       | 1 +
- plugins/paintops/experiment/kis_experiment_paintop.cpp                  | 2 ++
- plugins/paintops/experiment/kis_experiment_paintop.h                    | 2 ++
- plugins/tools/defaulttool/defaulttool/DefaultTool.cpp                   | 1 +
- plugins/tools/defaulttool/defaulttool/SelectionDecorator.cpp            | 2 ++
- .../karbonplugins/tools/CalligraphyTool/KarbonCalligraphicShape.cpp     | 1 +
- .../tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyTool.h   | 1 +
- plugins/tools/svgtexttool/SvgTextTool.cpp                               | 1 +
- plugins/tools/tool_transform2/kis_free_transform_strategy.cpp           | 1 +
- plugins/tools/tool_transform2/kis_liquify_paint_helper.cpp              | 2 ++
- plugins/tools/tool_transform2/kis_liquify_transform_strategy.cpp        | 1 +
- plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp    | 1 +
- plugins/tools/tool_transform2/kis_transform_strategy_base.cpp           | 1 +
- plugins/tools/tool_transform2/kis_transform_utils.cpp                   | 1 +
- plugins/tools/tool_transform2/kis_warp_transform_strategy.cpp           | 1 +
- 66 files changed, 75 insertions(+)
-
-diff --git a/benchmarks/kis_stroke_benchmark.cpp b/benchmarks/kis_stroke_benchmark.cpp
-index 93296b2..1a2a4cc 100644
---- benchmarks/kis_stroke_benchmark.cpp
-+++ benchmarks/kis_stroke_benchmark.cpp
-@@ -26,6 +26,7 @@ inline double drand48()
- }
- #endif
- 
-+#include <QPainterPath>
- #include <QTest>
- 
- #include "kis_stroke_benchmark.h"
-diff --git a/libs/basicflakes/tools/KoCreatePathTool_p.h b/libs/basicflakes/tools/KoCreatePathTool_p.h
-index 3864604..48f8a0c 100644
---- libs/basicflakes/tools/KoCreatePathTool_p.h
-+++ libs/basicflakes/tools/KoCreatePathTool_p.h
-@@ -22,6 +22,8 @@
- #ifndef KOCREATEPATHTOOL_P_H
- #define KOCREATEPATHTOOL_P_H
- 
-+#include <QPainterPath>
-+
- #include "KoCreatePathTool.h"
- #include "KoPathPoint.h"
- #include "KoPathPointData.h"
-diff --git a/libs/brush/kis_auto_brush.cpp b/libs/brush/kis_auto_brush.cpp
-index 67289b4..a0c59ac 100644
---- libs/brush/kis_auto_brush.cpp
-+++ libs/brush/kis_auto_brush.cpp
-@@ -24,6 +24,7 @@
- #include <kis_debug.h>
- #include <math.h>
- 
-+#include <QPainterPath>
- #include <QRect>
- #include <QDomElement>
- #include <QtConcurrentMap>
-diff --git a/libs/brush/kis_boundary.cc b/libs/brush/kis_boundary.cc
-index a599d8e..5695428 100644
---- libs/brush/kis_boundary.cc
-+++ libs/brush/kis_boundary.cc
-@@ -18,6 +18,7 @@
- 
- #include "kis_boundary.h"
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPen>
- 
- #include "KoColorSpace.h"
-diff --git a/libs/brush/kis_brush.cpp b/libs/brush/kis_brush.cpp
-index 8a0f787..956635d 100644
---- libs/brush/kis_brush.cpp
-+++ libs/brush/kis_brush.cpp
-@@ -25,6 +25,7 @@
- 
- #include <QDomElement>
- #include <QFile>
-+#include <QPainterPath>
- #include <QPoint>
- #include <QFileInfo>
- #include <QBuffer>
-diff --git a/libs/flake/KoClipMask.cpp b/libs/flake/KoClipMask.cpp
-index 8a21648..364d731 100644
---- libs/flake/KoClipMask.cpp
-+++ libs/flake/KoClipMask.cpp
-@@ -21,6 +21,7 @@
- #include <QRectF>
- #include <QTransform>
- #include <QPainter>
-+#include <QPainterPath>
- #include <KoShape.h>
- #include "kis_algebra_2d.h"
- 
-diff --git a/libs/flake/KoClipMaskPainter.cpp b/libs/flake/KoClipMaskPainter.cpp
-index 4fa456c..e7ea496 100644
---- libs/flake/KoClipMaskPainter.cpp
-+++ libs/flake/KoClipMaskPainter.cpp
-@@ -19,6 +19,7 @@
- #include "KoClipMaskPainter.h"
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QRectF>
- 
- #include "kis_assert.h"
-diff --git a/libs/flake/KoConnectionShape.cpp b/libs/flake/KoConnectionShape.cpp
-index e8b5c80..d8dfee3 100644
---- libs/flake/KoConnectionShape.cpp
-+++ libs/flake/KoConnectionShape.cpp
-@@ -34,6 +34,7 @@
- #include <KoXmlNS.h>
- #include <KoUnit.h>
- #include <QPainter>
-+#include <QPainterPath>
- 
- #include <FlakeDebug.h>
- 
-diff --git a/libs/flake/KoGradientBackground.cpp b/libs/flake/KoGradientBackground.cpp
-index 3f69791..0630d68 100644
---- libs/flake/KoGradientBackground.cpp
-+++ libs/flake/KoGradientBackground.cpp
-@@ -31,6 +31,7 @@
- #include <QSharedPointer>
- #include <QBrush>
- #include <QPainter>
-+#include <QPainterPath>
- 
- class KoGradientBackgroundPrivate : public KoShapeBackgroundPrivate
- {
-diff --git a/libs/flake/KoHatchBackground.cpp b/libs/flake/KoHatchBackground.cpp
-index f556f12..23a0b48 100644
---- libs/flake/KoHatchBackground.cpp
-+++ libs/flake/KoHatchBackground.cpp
-@@ -36,6 +36,7 @@
- #include <QColor>
- #include <QString>
- #include <QPainter>
-+#include <QPainterPath>
- 
- class KoHatchBackgroundPrivate : public KoColorBackgroundPrivate
- {
-diff --git a/libs/flake/KoOdfGradientBackground.cpp b/libs/flake/KoOdfGradientBackground.cpp
-index 20f7aa7..3a90a8a 100644
---- libs/flake/KoOdfGradientBackground.cpp
-+++ libs/flake/KoOdfGradientBackground.cpp
-@@ -32,6 +32,7 @@
- #include <KoOdfStylesReader.h>
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QColor>
- #include <QImage>
- #include <qmath.h>
-diff --git a/libs/flake/KoPathShape.cpp b/libs/flake/KoPathShape.cpp
-index 2768a0e..9069877 100644
---- libs/flake/KoPathShape.cpp
-+++ libs/flake/KoPathShape.cpp
-@@ -50,6 +50,7 @@
- 
- #include <FlakeDebug.h>
- #include <QPainter>
-+#include <QPainterPath>
- 
- #include "kis_global.h"
- 
-diff --git a/libs/flake/KoPatternBackground.cpp b/libs/flake/KoPatternBackground.cpp
-index d98ecf8..46e3f80 100644
---- libs/flake/KoPatternBackground.cpp
-+++ libs/flake/KoPatternBackground.cpp
-@@ -37,6 +37,7 @@
- 
- #include <QBrush>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPointer>
- 
- class KoPatternBackgroundPrivate : public KoShapeBackgroundPrivate
-diff --git a/libs/flake/KoShapeManager.cpp b/libs/flake/KoShapeManager.cpp
-index 43bacd5..845c0bb 100644
---- libs/flake/KoShapeManager.cpp
-+++ libs/flake/KoShapeManager.cpp
-@@ -49,6 +49,7 @@
- #include <QApplication>
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QTimer>
- #include <FlakeDebug.h>
- 
-diff --git a/libs/flake/KoShapeShadow.cpp b/libs/flake/KoShapeShadow.cpp
-index 2997590..df346d7 100644
---- libs/flake/KoShapeShadow.cpp
-+++ libs/flake/KoShapeShadow.cpp
-@@ -32,6 +32,7 @@
- #include <KoViewConverter.h>
- #include <FlakeDebug.h>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QAtomicInt>
- #include <QImage>
- #include <QRectF>
-diff --git a/libs/flake/KoSnapGuide.cpp b/libs/flake/KoSnapGuide.cpp
-index da7f770..0d8e5a9 100644
---- libs/flake/KoSnapGuide.cpp
-+++ libs/flake/KoSnapGuide.cpp
-@@ -27,6 +27,7 @@
- #include <KoCanvasBase.h>
- 
- #include <QPainter>
-+#include <QPainterPath>
- 
- #include <math.h>
- 
-diff --git a/libs/flake/KoSnapStrategy.cpp b/libs/flake/KoSnapStrategy.cpp
-index cab1d09..8b09b10 100644
---- libs/flake/KoSnapStrategy.cpp
-+++ libs/flake/KoSnapStrategy.cpp
-@@ -27,6 +27,7 @@
- #include <KoViewConverter.h>
- 
- #include <QPainter>
-+#include <QPainterPath>
- 
- #include <cmath>
- 
-diff --git a/libs/flake/svg/SvgParser.cpp b/libs/flake/svg/SvgParser.cpp
-index 4f29f6f..44a90aa 100644
---- libs/flake/svg/SvgParser.cpp
-+++ libs/flake/svg/SvgParser.cpp
-@@ -31,6 +31,7 @@
- 
- #include <QColor>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QDir>
- 
- #include <KoShape.h>
-diff --git a/libs/flake/tests/TestKoMarkerCollection.cpp b/libs/flake/tests/TestKoMarkerCollection.cpp
-index de05a13..ac9f570 100644
---- libs/flake/tests/TestKoMarkerCollection.cpp
-+++ libs/flake/tests/TestKoMarkerCollection.cpp
-@@ -21,6 +21,7 @@
- #include <QTest>
- #include <QFileInfo>
- #include <QPainter>
-+#include <QPainterPath>
- #include <KoMarker.h>
- #include <KoMarkerCollection.h>
- #include <KoPathShape.h>
-diff --git a/libs/flake/tests/TestPointMergeCommand.cpp b/libs/flake/tests/TestPointMergeCommand.cpp
-index ee6c647..c6b078e 100644
---- libs/flake/tests/TestPointMergeCommand.cpp
-+++ libs/flake/tests/TestPointMergeCommand.cpp
-@@ -23,6 +23,7 @@
- #include "KoPathPoint.h"
- #include "KoPathPointData.h"
- #include <sdk/tests/kistest.h>
-+#include <QPainterPath>
- #include <QTest>
- #include <FlakeDebug.h>
- 
-diff --git a/libs/flake/tests/TestShapeBackgroundCommand.cpp b/libs/flake/tests/TestShapeBackgroundCommand.cpp
-index a3a44cd..a8a8c16 100644
---- libs/flake/tests/TestShapeBackgroundCommand.cpp
-+++ libs/flake/tests/TestShapeBackgroundCommand.cpp
-@@ -24,6 +24,7 @@
- #include "KoShapePaintingContext.h"
- #include "KoViewConverter.h"
- 
-+#include <QPainterPath>
- #include <QTest>
- 
- void TestShapeBackgroundCommand::refCounting()
-diff --git a/libs/flake/tests/TestSnapStrategy.cpp b/libs/flake/tests/TestSnapStrategy.cpp
-index 8df1995..70342dc 100644
---- libs/flake/tests/TestSnapStrategy.cpp
-+++ libs/flake/tests/TestSnapStrategy.cpp
-@@ -18,6 +18,7 @@
- */
- 
- #include "TestSnapStrategy.h"
-+#include <QPainterPath>
- #include <QTest>
- #include "KoSnapStrategy.h"
- #include "KoPathShape.h"
-diff --git a/libs/flake/tests/TestSvgParser.cpp b/libs/flake/tests/TestSvgParser.cpp
-index b03ac84..f8e748b 100644
---- libs/flake/tests/TestSvgParser.cpp
-+++ libs/flake/tests/TestSvgParser.cpp
-@@ -19,6 +19,7 @@
- #include "TestSvgParser.h"
- 
- 
-+#include <QPainterPath>
- #include <QTest>
- #include <svg/SvgUtil.h>
- #include <KoShapeStrokeModel.h>
-diff --git a/libs/flake/tests/TestSvgText.cpp b/libs/flake/tests/TestSvgText.cpp
-index d2bb6bd..da81be0 100644
---- libs/flake/tests/TestSvgText.cpp
-+++ libs/flake/tests/TestSvgText.cpp
-@@ -768,6 +768,7 @@ void TestSvgText::testRightToLeft()
- 
- #include <QTextLayout>
- #include <QPainter>
-+#include <QPainterPath>
- 
- void TestSvgText::testQtBidi()
- {
-diff --git a/libs/flake/text/KoSvgTextChunkShape_p.h b/libs/flake/text/KoSvgTextChunkShape_p.h
-index 8c59d96..a9fd5c5 100644
---- libs/flake/text/KoSvgTextChunkShape_p.h
-+++ libs/flake/text/KoSvgTextChunkShape_p.h
-@@ -21,6 +21,7 @@
- #include "KoSvgText.h"
- #include "KoSvgTextProperties.h"
- #include <KoShapeContainer_p.h>
-+#include <QPainterPath>
- #include <QTextCharFormat>
- 
- class SvgGraphicsContext;
-diff --git a/libs/flake/text/KoSvgTextShape.cpp b/libs/flake/text/KoSvgTextShape.cpp
-index 45b9459..8fd5774 100644
---- libs/flake/text/KoSvgTextShape.cpp
-+++ libs/flake/text/KoSvgTextShape.cpp
-@@ -48,6 +48,7 @@
- #include <vector>
- #include <memory>
- #include <QPainter>
-+#include <QPainterPath>
- #include <boost/optional.hpp>
- 
- #include <text/KoSvgTextChunkShapeLayoutInterface.h>
-diff --git a/libs/flake/tools/KoPathTool.cpp b/libs/flake/tools/KoPathTool.cpp
-index dae2d08..ce043a4 100644
---- libs/flake/tools/KoPathTool.cpp
-+++ libs/flake/tools/KoPathTool.cpp
-@@ -66,6 +66,7 @@
- #include <FlakeDebug.h>
- #include <klocalizedstring.h>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QBitmap>
- #include <QTabWidget>
- 
-diff --git a/libs/global/KisHandlePainterHelper.cpp b/libs/global/KisHandlePainterHelper.cpp
-index 7d66629..24b8137 100644
---- libs/global/KisHandlePainterHelper.cpp
-+++ libs/global/KisHandlePainterHelper.cpp
-@@ -19,6 +19,7 @@
- #include "KisHandlePainterHelper.h"
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include "kis_algebra_2d.h"
- #include "kis_painting_tweaks.h"
- 
-diff --git a/libs/image/brushengine/kis_paintop_settings.cpp b/libs/image/brushengine/kis_paintop_settings.cpp
-index 87f5c53..0e43fc9 100644
---- libs/image/brushengine/kis_paintop_settings.cpp
-+++ libs/image/brushengine/kis_paintop_settings.cpp
-@@ -21,6 +21,7 @@
- 
- #include <QImage>
- #include <QColor>
-+#include <QPainterPath>
- #include <QPointer>
- 
- #include <KoPointerEvent.h>
-diff --git a/libs/ui/flake/kis_shape_selection.h b/libs/ui/flake/kis_shape_selection.h
-index 3b2e853..805d5c6 100644
---- libs/ui/flake/kis_shape_selection.h
-+++ libs/ui/flake/kis_shape_selection.h
-@@ -18,6 +18,8 @@
- #ifndef KIS_SHAPE_SELECTION_H
- #define KIS_SHAPE_SELECTION_H
- 
-+#include <QPainterPath>
-+
- #include <KoShapeLayer.h>
- #include <KoShapeFactoryBase.h>
- #include <KoShapeUserData.h>
-diff --git a/libs/ui/kis_painting_assistants_decoration.cpp b/libs/ui/kis_painting_assistants_decoration.cpp
-index 11838e6..a0a684c 100644
---- libs/ui/kis_painting_assistants_decoration.cpp
-+++ libs/ui/kis_painting_assistants_decoration.cpp
-@@ -33,6 +33,7 @@
- #include "KisViewManager.h"
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QApplication>
- 
- struct KisPaintingAssistantsDecoration::Private {
-diff --git a/libs/ui/kis_selection_decoration.h b/libs/ui/kis_selection_decoration.h
-index ea90ebb..557328d 100644
---- libs/ui/kis_selection_decoration.h
-+++ libs/ui/kis_selection_decoration.h
-@@ -19,6 +19,7 @@
- #ifndef _KIS_SELECTION_DECORATION_H_
- #define _KIS_SELECTION_DECORATION_H_
- 
-+#include <QPainterPath>
- #include <QTimer>
- #include <QPolygon>
- #include <QPen>
-diff --git a/libs/ui/tool/kis_shape_tool_helper.cpp b/libs/ui/tool/kis_shape_tool_helper.cpp
-index 4edab2a..d914ff9 100644
---- libs/ui/tool/kis_shape_tool_helper.cpp
-+++ libs/ui/tool/kis_shape_tool_helper.cpp
-@@ -18,6 +18,8 @@
- 
- #include "kis_shape_tool_helper.h"
- 
-+#include <QPainterPath>
-+
- #include <KoPathShape.h>
- #include <KoShapeRegistry.h>
- #include <KoShapeFactoryBase.h>
-diff --git a/libs/ui/tool/kis_tool_paint.h b/libs/ui/tool/kis_tool_paint.h
-index d3ea6f6..084fd10 100644
---- libs/ui/tool/kis_tool_paint.h
-+++ libs/ui/tool/kis_tool_paint.h
-@@ -22,6 +22,7 @@
- #include "kis_tool.h"
- 
- #include <QGridLayout>
-+#include <QPainterPath>
- #include <QTimer>
- #include <QCheckBox>
- 
-diff --git a/libs/ui/widgets/kis_cie_tongue_widget.cpp b/libs/ui/widgets/kis_cie_tongue_widget.cpp
-index 79a8bfc..bbec19d 100644
---- libs/ui/widgets/kis_cie_tongue_widget.cpp
-+++ libs/ui/widgets/kis_cie_tongue_widget.cpp
-@@ -40,6 +40,7 @@ wavelength, and thus define the outline of the CIE "tongue" diagram.
- 
- #include <QPointF>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QFile>
- #include <QTimer>
- #include <QPaintEvent>
-diff --git a/libs/ui/widgets/kis_curve_widget.cpp b/libs/ui/widgets/kis_curve_widget.cpp
-index 1c5292d..09de36e 100644
---- libs/ui/widgets/kis_curve_widget.cpp
-+++ libs/ui/widgets/kis_curve_widget.cpp
-@@ -27,6 +27,7 @@
- 
- #include <QPixmap>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPoint>
- #include <QPen>
- #include <QEvent>
-diff --git a/libs/ui/widgets/kis_tone_curve_widget.cpp b/libs/ui/widgets/kis_tone_curve_widget.cpp
-index 679fed4..6eaca4b 100644
---- libs/ui/widgets/kis_tone_curve_widget.cpp
-+++ libs/ui/widgets/kis_tone_curve_widget.cpp
-@@ -25,6 +25,7 @@
- #include <QPointF>
- #include <QPolygonF>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPaintEvent>
- #include <QImage>
- #include <cmath>
-diff --git a/plugins/assistants/Assistants/ConcentricEllipseAssistant.cc b/plugins/assistants/Assistants/ConcentricEllipseAssistant.cc
-index 8c14b96..44078f3 100644
---- plugins/assistants/Assistants/ConcentricEllipseAssistant.cc
-+++ plugins/assistants/Assistants/ConcentricEllipseAssistant.cc
-@@ -23,6 +23,7 @@
- #include <klocalizedstring.h>
- #include "kis_debug.h"
- #include <QPainter>
-+#include <QPainterPath>
- #include <QLinearGradient>
- #include <QTransform>
- #include <kis_canvas2.h>
-diff --git a/plugins/assistants/Assistants/EllipseAssistant.cc b/plugins/assistants/Assistants/EllipseAssistant.cc
-index 8b3b16c..09d48fd 100644
---- plugins/assistants/Assistants/EllipseAssistant.cc
-+++ plugins/assistants/Assistants/EllipseAssistant.cc
-@@ -23,6 +23,7 @@
- #include <klocalizedstring.h>
- #include "kis_debug.h"
- #include <QPainter>
-+#include <QPainterPath>
- #include <QLinearGradient>
- #include <QTransform>
- 
-diff --git a/plugins/assistants/Assistants/FisheyePointAssistant.cc b/plugins/assistants/Assistants/FisheyePointAssistant.cc
-index 8338f4b..a5c0510 100644
---- plugins/assistants/Assistants/FisheyePointAssistant.cc
-+++ plugins/assistants/Assistants/FisheyePointAssistant.cc
-@@ -25,6 +25,7 @@
- #include <klocalizedstring.h>
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QLinearGradient>
- #include <QTransform>
- 
-diff --git a/plugins/assistants/Assistants/InfiniteRulerAssistant.cc b/plugins/assistants/Assistants/InfiniteRulerAssistant.cc
-index 4fe1907..03da329 100644
---- plugins/assistants/Assistants/InfiniteRulerAssistant.cc
-+++ plugins/assistants/Assistants/InfiniteRulerAssistant.cc
-@@ -25,6 +25,7 @@
- #include <klocalizedstring.h>
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QLinearGradient>
- #include <QTransform>
- 
-diff --git a/plugins/assistants/Assistants/ParallelRulerAssistant.cc b/plugins/assistants/Assistants/ParallelRulerAssistant.cc
-index 2deb3d3..405a172 100644
---- plugins/assistants/Assistants/ParallelRulerAssistant.cc
-+++ plugins/assistants/Assistants/ParallelRulerAssistant.cc
-@@ -25,6 +25,7 @@
- #include <klocalizedstring.h>
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QLinearGradient>
- #include <QTransform>
- 
-diff --git a/plugins/assistants/Assistants/PerspectiveAssistant.cc b/plugins/assistants/Assistants/PerspectiveAssistant.cc
-index 46007b5..bcb2669 100644
---- plugins/assistants/Assistants/PerspectiveAssistant.cc
-+++ plugins/assistants/Assistants/PerspectiveAssistant.cc
-@@ -24,6 +24,7 @@
- #include <klocalizedstring.h>
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QLinearGradient>
- #include <QTransform>
- 
-diff --git a/plugins/assistants/Assistants/RulerAssistant.cc b/plugins/assistants/Assistants/RulerAssistant.cc
-index 48cc15e..64f1772 100644
---- plugins/assistants/Assistants/RulerAssistant.cc
-+++ plugins/assistants/Assistants/RulerAssistant.cc
-@@ -23,6 +23,7 @@
- #include <klocalizedstring.h>
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QLinearGradient>
- #include <QTransform>
- 
-diff --git a/plugins/assistants/Assistants/SplineAssistant.cc b/plugins/assistants/Assistants/SplineAssistant.cc
-index 20b19dd..dfbd872 100644
---- plugins/assistants/Assistants/SplineAssistant.cc
-+++ plugins/assistants/Assistants/SplineAssistant.cc
-@@ -23,6 +23,7 @@
- #include <klocalizedstring.h>
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QLinearGradient>
- #include <QTransform>
- 
-diff --git a/plugins/assistants/Assistants/VanishingPointAssistant.cc b/plugins/assistants/Assistants/VanishingPointAssistant.cc
-index 3cae70d..dbc66be 100644
---- plugins/assistants/Assistants/VanishingPointAssistant.cc
-+++ plugins/assistants/Assistants/VanishingPointAssistant.cc
-@@ -25,6 +25,7 @@
- #include <klocalizedstring.h>
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QLinearGradient>
- #include <QTransform>
- 
-diff --git a/plugins/assistants/Assistants/kis_assistant_tool.cc b/plugins/assistants/Assistants/kis_assistant_tool.cc
-index 4cff446..37ac8ee 100644
---- plugins/assistants/Assistants/kis_assistant_tool.cc
-+++ plugins/assistants/Assistants/kis_assistant_tool.cc
-@@ -21,6 +21,7 @@
- #include <kis_assistant_tool.h>
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QXmlStreamReader>
- #include <QXmlStreamWriter>
- #include <QStandardPaths>
-diff --git a/plugins/dockers/histogram/histogramdockerwidget.cpp b/plugins/dockers/histogram/histogramdockerwidget.cpp
-index 5c8e29d..83aa432 100644
---- plugins/dockers/histogram/histogramdockerwidget.cpp
-+++ plugins/dockers/histogram/histogramdockerwidget.cpp
-@@ -24,6 +24,7 @@
- #include <algorithm>
- #include <QTime>
- #include <QPainter>
-+#include <QPainterPath>
- #include <functional>
- 
- #include "KoChannelInfo.h"
-diff --git a/plugins/flake/pathshapes/enhancedpath/EnhancedPathShape.cpp b/plugins/flake/pathshapes/enhancedpath/EnhancedPathShape.cpp
-index 3c246c9..96d1892 100644
---- plugins/flake/pathshapes/enhancedpath/EnhancedPathShape.cpp
-+++ plugins/flake/pathshapes/enhancedpath/EnhancedPathShape.cpp
-@@ -30,6 +30,8 @@
- #include "EnhancedPathHandle.h"
- #include "EnhancedPathFormula.h"
- 
-+#include <QPainterPath>
-+
- #include <KoXmlNS.h>
- #include <KoXmlWriter.h>
- #include <KoXmlReader.h>
-diff --git a/plugins/flake/textshape/TextShape.cpp b/plugins/flake/textshape/TextShape.cpp
-index c06c799..5b2fd12 100644
---- plugins/flake/textshape/TextShape.cpp
-+++ plugins/flake/textshape/TextShape.cpp
-@@ -57,6 +57,7 @@
- #include <QApplication>
- #include <QFont>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPen>
- #include <QTextLayout>
- 
-diff --git a/plugins/paintops/curvebrush/curve_brush.cpp b/plugins/paintops/curvebrush/curve_brush.cpp
-index 347cc31..82bc86b 100644
---- plugins/paintops/curvebrush/curve_brush.cpp
-+++ plugins/paintops/curvebrush/curve_brush.cpp
-@@ -18,6 +18,8 @@
- 
- #include "curve_brush.h"
- 
-+#include <QPainterPath>
-+
- #include <KoColor.h>
- #include <KoColorSpace.h>
- 
-diff --git a/plugins/paintops/curvebrush/kis_curve_paintop.cpp b/plugins/paintops/curvebrush/kis_curve_paintop.cpp
-index 295ee55..ed68e3f 100644
---- plugins/paintops/curvebrush/kis_curve_paintop.cpp
-+++ plugins/paintops/curvebrush/kis_curve_paintop.cpp
-@@ -20,6 +20,7 @@
- 
- #include <cmath>
- 
-+#include <QPainterPath>
- #include <QRect>
- 
- #include <kis_image.h>
-diff --git a/plugins/paintops/experiment/kis_experiment_paintop.cpp b/plugins/paintops/experiment/kis_experiment_paintop.cpp
-index 54764d8..7c429b4 100644
---- plugins/paintops/experiment/kis_experiment_paintop.cpp
-+++ plugins/paintops/experiment/kis_experiment_paintop.cpp
-@@ -22,6 +22,8 @@
- 
- #include <cmath>
- 
-+#include <QPainterPath>
-+
- #include <KoCompositeOpRegistry.h>
- 
- #include <kis_debug.h>
-diff --git a/plugins/paintops/experiment/kis_experiment_paintop.h b/plugins/paintops/experiment/kis_experiment_paintop.h
-index 19dec9b..27f4fe3 100644
---- plugins/paintops/experiment/kis_experiment_paintop.h
-+++ plugins/paintops/experiment/kis_experiment_paintop.h
-@@ -19,6 +19,8 @@
- #ifndef KIS_EXPERIMENT_PAINTOP_H_
- #define KIS_EXPERIMENT_PAINTOP_H_
- 
-+#include <QPainterPath>
-+
- #include <klocalizedstring.h>
- #include <brushengine/kis_paintop.h>
- #include <kis_types.h>
-diff --git a/plugins/tools/defaulttool/defaulttool/DefaultTool.cpp b/plugins/tools/defaulttool/defaulttool/DefaultTool.cpp
-index de2787f..363025e 100644
---- plugins/tools/defaulttool/defaulttool/DefaultTool.cpp
-+++ plugins/tools/defaulttool/defaulttool/DefaultTool.cpp
-@@ -67,6 +67,7 @@
- 
- #include <KoIcon.h>
- 
-+#include <QPainterPath>
- #include <QPointer>
- #include <QAction>
- #include <QKeyEvent>
-diff --git a/plugins/tools/defaulttool/defaulttool/SelectionDecorator.cpp b/plugins/tools/defaulttool/defaulttool/SelectionDecorator.cpp
-index 2c8c7db..ab560d6 100644
---- plugins/tools/defaulttool/defaulttool/SelectionDecorator.cpp
-+++ plugins/tools/defaulttool/defaulttool/SelectionDecorator.cpp
-@@ -21,6 +21,8 @@
- 
- #include "SelectionDecorator.h"
- 
-+#include <QPainterPath>
-+
- #include <KoShape.h>
- #include <KoSelection.h>
- #include <KoResourcePaths.h>
-diff --git a/plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphicShape.cpp b/plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphicShape.cpp
-index 2a461cb..1b9d81b 100644
---- plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphicShape.cpp
-+++ plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphicShape.cpp
-@@ -28,6 +28,7 @@
- 
- #include <QDebug>
- #include <QColor>
-+#include <QPainterPath>
- 
- #include <cmath>
- #include <cstdlib>
-diff --git a/plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyTool.h b/plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyTool.h
-index 5bf3a8d..e2329d1 100644
---- plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyTool.h
-+++ plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyTool.h
-@@ -22,6 +22,7 @@
- 
- #include <KoToolBase.h>
- #include <KoPathShape.h>
-+#include <QPainterPath>
- #include <QPointer>
- 
- #include "KarbonCalligraphyOptionWidget.h"
-diff --git a/plugins/tools/svgtexttool/SvgTextTool.cpp b/plugins/tools/svgtexttool/SvgTextTool.cpp
-index b735ea7..91325f5 100644
---- plugins/tools/svgtexttool/SvgTextTool.cpp
-+++ plugins/tools/svgtexttool/SvgTextTool.cpp
-@@ -23,6 +23,7 @@
- #include "SvgTextChangeCommand.h"
- 
- #include <QLabel>
-+#include <QPainterPath>
- #include <QToolButton>
- #include <QGridLayout>
- #include <QVBoxLayout>
-diff --git a/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp b/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
-index 9fd5578..6f5c298 100644
---- plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
-+++ plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
-@@ -20,6 +20,7 @@
- 
- #include <QPointF>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QMatrix4x4>
- 
- #include <KoResourcePaths.h>
-diff --git a/plugins/tools/tool_transform2/kis_liquify_paint_helper.cpp b/plugins/tools/tool_transform2/kis_liquify_paint_helper.cpp
-index 93b0067..83b79d4 100644
---- plugins/tools/tool_transform2/kis_liquify_paint_helper.cpp
-+++ plugins/tools/tool_transform2/kis_liquify_paint_helper.cpp
-@@ -18,6 +18,8 @@
- 
- #include "kis_liquify_paint_helper.h"
- 
-+#include <QPainterPath>
-+
- #include "kis_algebra_2d.h"
- #include "KoPointerEvent.h"
- #include <brushengine/kis_paint_information.h>
-diff --git a/plugins/tools/tool_transform2/kis_liquify_transform_strategy.cpp b/plugins/tools/tool_transform2/kis_liquify_transform_strategy.cpp
-index 9662880..12d569b 100644
---- plugins/tools/tool_transform2/kis_liquify_transform_strategy.cpp
-+++ plugins/tools/tool_transform2/kis_liquify_transform_strategy.cpp
-@@ -22,6 +22,7 @@
- 
- #include <QPointF>
- #include <QPainter>
-+#include <QPainterPath>
- 
- #include "KoPointerEvent.h"
- 
-diff --git a/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp b/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
-index 0cff5ed..b74d986 100644
---- plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
-+++ plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
-@@ -20,6 +20,7 @@
- 
- #include <QPointF>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QMatrix4x4>
- #include <QVector2D>
- 
-diff --git a/plugins/tools/tool_transform2/kis_transform_strategy_base.cpp b/plugins/tools/tool_transform2/kis_transform_strategy_base.cpp
-index 1e7603e..0671ed5 100644
---- plugins/tools/tool_transform2/kis_transform_strategy_base.cpp
-+++ plugins/tools/tool_transform2/kis_transform_strategy_base.cpp
-@@ -19,6 +19,7 @@
- #include "kis_transform_strategy_base.h"
- 
- #include <QImage>
-+#include <QPainterPath>
- #include <QTransform>
- #include "KoPointerEvent.h"
- 
-diff --git a/plugins/tools/tool_transform2/kis_transform_utils.cpp b/plugins/tools/tool_transform2/kis_transform_utils.cpp
-index 1fbbd52..c7792f3 100644
---- plugins/tools/tool_transform2/kis_transform_utils.cpp
-+++ plugins/tools/tool_transform2/kis_transform_utils.cpp
-@@ -19,6 +19,7 @@
- #include "kis_transform_utils.h"
- 
- #include <cmath>
-+#include <QPainterPath>
- #include <QTransform>
- #include <KoUnit.h>
- #include "tool_transform_args.h"
-diff --git a/plugins/tools/tool_transform2/kis_warp_transform_strategy.cpp b/plugins/tools/tool_transform2/kis_warp_transform_strategy.cpp
-index fdad9f3..9a2dd4d 100644
---- plugins/tools/tool_transform2/kis_warp_transform_strategy.cpp
-+++ plugins/tools/tool_transform2/kis_warp_transform_strategy.cpp
-@@ -22,6 +22,7 @@
- 
- #include <QPointF>
- #include <QPainter>
-+#include <QPainterPath>
- 
- #include "kis_coordinates_converter.h"
- #include "tool_transform_args.h"
--- 
-cgit v1.1
-
diff --git a/graphics/krita/pkg-plist b/graphics/krita/pkg-plist
index 436add2dcc0b..a3dde584003b 100644
--- a/graphics/krita/pkg-plist
+++ b/graphics/krita/pkg-plist
@@ -1,7 +1,6 @@
 bin/krita
 etc/xdg/kritarc
 lib/kritaplugins/krita_colorspaces_extensions.so
-lib/kritaplugins/krita_filtereffects.so
 lib/kritaplugins/krita_flaketools.so
 lib/kritaplugins/krita_karbontools.so
 lib/kritaplugins/krita_raw_import.so
@@ -31,6 +30,8 @@ lib/kritaplugins/kritacolorspaceconversion.so
 lib/kritaplugins/kritacompositiondocker.so
 lib/kritaplugins/kritaconvertheighttonormalmap.so
 lib/kritaplugins/kritaconvolutionfilters.so
+lib/kritaplugins/kritacsvexport.so
+lib/kritaplugins/kritacsvimport.so
 lib/kritaplugins/kritacurvepaintop.so
 lib/kritaplugins/kritadefaultpaintops.so
 lib/kritaplugins/kritadefaulttools.so
@@ -47,6 +48,7 @@ lib/kritaplugins/kritaextensioncolorsfilters.so
 lib/kritaplugins/kritafastcolortransferfilter.so
 lib/kritaplugins/kritafilterop.so
 lib/kritaplugins/kritagamutmask.so
+lib/kritaplugins/kritagaussianhighpassfilter.so
 lib/kritaplugins/kritagifexport.so
 lib/kritaplugins/kritagifimport.so
 lib/kritaplugins/kritagradientmap.so
@@ -84,6 +86,7 @@ lib/kritaplugins/kritaoraexport.so
 lib/kritaplugins/kritaoraimport.so
 lib/kritaplugins/kritaoverviewdocker.so
 lib/kritaplugins/kritapalettedocker.so
+lib/kritaplugins/kritapalettize.so
 lib/kritaplugins/kritaparticlepaintop.so
 lib/kritaplugins/kritapatterndocker.so
 lib/kritaplugins/kritapatterngenerator.so
@@ -114,6 +117,7 @@ lib/kritaplugins/kritasimplexnoisegenerator.so
 lib/kritaplugins/kritasketchpaintop.so
 %%OPENEXR%%lib/kritaplugins/kritasmallcolorselector.so
 lib/kritaplugins/kritasmalltilesfilter.so
+lib/kritaplugins/kritasnapshotdocker.so
 lib/kritaplugins/kritaspecificcolorselector.so
 lib/kritaplugins/kritaspraypaintop.so
 lib/kritaplugins/kritaspriterexport.so
@@ -139,79 +143,79 @@ lib/kritaplugins/kritawavefilter.so
 lib/kritaplugins/kritawaveletdecompose.so
 lib/kritaplugins/kritaxcfimport.so
 lib/libkritabasicflakes.so
-lib/libkritabasicflakes.so.18
+lib/libkritabasicflakes.so.%%SHLIB_SHVER%%
 lib/libkritabasicflakes.so.%%SHLIB_VER%%
 lib/libkritacolor.so
-lib/libkritacolor.so.18
+lib/libkritacolor.so.%%SHLIB_SHVER%%
 lib/libkritacolor.so.%%SHLIB_VER%%
 lib/libkritacolord.so
-lib/libkritacolord.so.18
+lib/libkritacolord.so.%%SHLIB_SHVER%%
 lib/libkritacolord.so.%%SHLIB_VER%%
 lib/libkritacommand.so
-lib/libkritacommand.so.18
+lib/libkritacommand.so.%%SHLIB_SHVER%%
 lib/libkritacommand.so.%%SHLIB_VER%%
 lib/libkritaflake.so
-lib/libkritaflake.so.18
+lib/libkritaflake.so.%%SHLIB_SHVER%%
 lib/libkritaflake.so.%%SHLIB_VER%%
 lib/libkritaglobal.so
-lib/libkritaglobal.so.18
+lib/libkritaglobal.so.%%SHLIB_SHVER%%
 lib/libkritaglobal.so.%%SHLIB_VER%%
 lib/libkritaimage.so
-lib/libkritaimage.so.18
+lib/libkritaimage.so.%%SHLIB_SHVER%%
 lib/libkritaimage.so.%%SHLIB_VER%%
 lib/libkritaimpex.so
-lib/libkritaimpex.so.18
+lib/libkritaimpex.so.%%SHLIB_SHVER%%
 lib/libkritaimpex.so.%%SHLIB_VER%%
 lib/libkritalibbrush.so
-lib/libkritalibbrush.so.18
+lib/libkritalibbrush.so.%%SHLIB_SHVER%%
 lib/libkritalibbrush.so.%%SHLIB_VER%%
 lib/libkritalibkis.so
-lib/libkritalibkis.so.18
+lib/libkritalibkis.so.%%SHLIB_SHVER%%
 lib/libkritalibkis.so.%%SHLIB_VER%%
 lib/libkritalibkra.so
-lib/libkritalibkra.so.18
+lib/libkritalibkra.so.%%SHLIB_SHVER%%
 lib/libkritalibkra.so.%%SHLIB_VER%%
 lib/libkritalibpaintop.so
-lib/libkritalibpaintop.so.18
+lib/libkritalibpaintop.so.%%SHLIB_SHVER%%
 lib/libkritalibpaintop.so.%%SHLIB_VER%%
 lib/libkritametadata.so
-lib/libkritametadata.so.18
+lib/libkritametadata.so.%%SHLIB_SHVER%%
 lib/libkritametadata.so.%%SHLIB_VER%%
 lib/libkritaodf.so
-lib/libkritaodf.so.18
+lib/libkritaodf.so.%%SHLIB_SHVER%%
 lib/libkritaodf.so.%%SHLIB_VER%%
 lib/libkritapigment.so
-lib/libkritapigment.so.18
+lib/libkritapigment.so.%%SHLIB_SHVER%%
 lib/libkritapigment.so.%%SHLIB_VER%%
 lib/libkritaplugin.so
-lib/libkritaplugin.so.18
+lib/libkritaplugin.so.%%SHLIB_SHVER%%
 lib/libkritaplugin.so.%%SHLIB_VER%%
 lib/libkritapsd.so
-lib/libkritapsd.so.18
+lib/libkritapsd.so.%%SHLIB_SHVER%%
 lib/libkritapsd.so.%%SHLIB_VER%%
 lib/libkritaqml.so
-lib/libkritaqml.so.18
+lib/libkritaqml.so.%%SHLIB_SHVER%%
 lib/libkritaqml.so.%%SHLIB_VER%%
 lib/libkritastore.so
-lib/libkritastore.so.18
+lib/libkritastore.so.%%SHLIB_SHVER%%
 lib/libkritastore.so.%%SHLIB_VER%%
 lib/libkritatext.so
-lib/libkritatext.so.18
+lib/libkritatext.so.%%SHLIB_SHVER%%
 lib/libkritatext.so.%%SHLIB_VER%%
 lib/libkritatextlayout.so
-lib/libkritatextlayout.so.18
+lib/libkritatextlayout.so.%%SHLIB_SHVER%%
 lib/libkritatextlayout.so.%%SHLIB_VER%%
 lib/libkritaui.so
-lib/libkritaui.so.18
+lib/libkritaui.so.%%SHLIB_SHVER%%
 lib/libkritaui.so.%%SHLIB_VER%%
 lib/libkritaversion.so
-lib/libkritaversion.so.18
+lib/libkritaversion.so.%%SHLIB_SHVER%%
 lib/libkritaversion.so.%%SHLIB_VER%%
 lib/libkritawidgets.so
-lib/libkritawidgets.so.18
+lib/libkritawidgets.so.%%SHLIB_SHVER%%
 lib/libkritawidgets.so.%%SHLIB_VER%%
 lib/libkritawidgetutils.so
-lib/libkritawidgetutils.so.18
+lib/libkritawidgetutils.so.%%SHLIB_SHVER%%
 lib/libkritawidgetutils.so.%%SHLIB_VER%%
 %%QT_QMLDIR%%/org/krita/draganddrop/libdraganddropplugin.so
 %%QT_QMLDIR%%/org/krita/draganddrop/qmldir
@@ -248,6 +252,7 @@ lib/libkritawidgetutils.so.%%SHLIB_VER%%
 %%QT_QMLDIR%%/org/krita/sketch/libkritasketchplugin.so
 %%QT_QMLDIR%%/org/krita/sketch/qmldir
 share/applications/krita_brush.desktop
+share/applications/krita_csv.desktop
 %%OPENEXR%%share/applications/krita_exr.desktop
 share/applications/krita_gif.desktop
 share/applications/krita_heightmap.desktop
@@ -325,6 +330,7 @@ share/icons/hicolor/scalable/apps/krita.svgz
 %%DATADIR%%/actions/KisToolPolyline.action
 %%DATADIR%%/actions/KisToolSelectContiguous.action
 %%DATADIR%%/actions/KisToolSelectElliptical.action
+%%DATADIR%%/actions/KisToolSelectMagnetic.action
 %%DATADIR%%/actions/KisToolSelectOutline.action
 %%DATADIR%%/actions/KisToolSelectPath.action
 %%DATADIR%%/actions/KisToolSelectPolygonal.action
@@ -360,6 +366,7 @@ share/icons/hicolor/scalable/apps/krita.svgz
 %%DATADIR%%/defaultpresets/smudge.kpp
 %%DATADIR%%/defaultpresets/spraybrush.kpp
 %%DATADIR%%/defaultpresets/tangentnormal.kpp
+%%DATADIR%%/donation/banner.png
 %%DATADIR%%/dtd/krita.dtd
 %%DATADIR%%/gamutmasks/Atmosphere_With_Accent.kgm
 %%DATADIR%%/gamutmasks/Atmospheric_Triad.kgm
@@ -416,6 +423,20 @@ share/icons/hicolor/scalable/apps/krita.svgz
 %%DATADIR%%/metadata/schemas/xmprights.schema
 %%DATADIR%%/paintoppresets/a)_Eraser_Circle.kpp
 %%DATADIR%%/paintoppresets/b)_Basic-5_Size_default.kpp
+%%DATADIR%%/paintoppresets/j)_WaterC_Basic_Lines-Dry.kpp
+%%DATADIR%%/paintoppresets/j)_WaterC_Basic_Lines-Wet-Pattern.kpp
+%%DATADIR%%/paintoppresets/j)_WaterC_Basic_Lines-Wet.kpp
+%%DATADIR%%/paintoppresets/j)_WaterC_Basic_Round-Fringe_02.kpp
+%%DATADIR%%/paintoppresets/j)_WaterC_Basic_Round-Grain.kpp
+%%DATADIR%%/paintoppresets/j)_WaterC_Basic_Round-Grunge.kpp
+%%DATADIR%%/paintoppresets/j)_WaterC_Flat_Big-Grain_Tilt.kpp
+%%DATADIR%%/paintoppresets/j)_WaterC_Flat_Decay_Tilt.kpp
+%%DATADIR%%/paintoppresets/j)_WaterC_Special_Blobs.kpp
+%%DATADIR%%/paintoppresets/j)_WaterC_Special_Splats.kpp
+%%DATADIR%%/paintoppresets/j)_WaterC_Spread-Pattern.kpp
+%%DATADIR%%/paintoppresets/j)_WaterC_Spread.kpp
+%%DATADIR%%/paintoppresets/j)_WaterC_Spread_WideArea.kpp
+%%DATADIR%%/paintoppresets/j)_WaterC_Water-Pattern.kpp
 %%DATADIR%%/palettes/concept-cookie.gpl
 %%DATADIR%%/palettes/default.gpl
 %%DATADIR%%/palettes/gradient.gpl
@@ -465,6 +486,37 @@ share/icons/hicolor/scalable/apps/krita.svgz
 %%DATADIR%%/patterns/Cross06.pat
 %%DATADIR%%/patterns/Cross07.pat
 %%DATADIR%%/patterns/Crumpled_Paper.pat
+%%DATADIR%%/patterns/DITH_0202_CLUS.pat
+%%DATADIR%%/patterns/DITH_0202_GEN_.pat
+%%DATADIR%%/patterns/DITH_0202_HORZ.pat
+%%DATADIR%%/patterns/DITH_0202_VERT.pat
+%%DATADIR%%/patterns/DITH_0404_ALT_.pat
+%%DATADIR%%/patterns/DITH_0404_BL22.pat
+%%DATADIR%%/patterns/DITH_0404_CLUS.pat
+%%DATADIR%%/patterns/DITH_0404_CURL.pat
+%%DATADIR%%/patterns/DITH_0404_DIAG.pat
+%%DATADIR%%/patterns/DITH_0404_ELL2.pat
+%%DATADIR%%/patterns/DITH_0404_ELL3.pat
+%%DATADIR%%/patterns/DITH_0404_ELLS.pat
+%%DATADIR%%/patterns/DITH_0404_GEN_.pat
+%%DATADIR%%/patterns/DITH_0404_HORZ.pat
+%%DATADIR%%/patterns/DITH_0404_SHUR.pat
+%%DATADIR%%/patterns/DITH_0404_SLIC.pat
+%%DATADIR%%/patterns/DITH_0404_VERT.pat
+%%DATADIR%%/patterns/DITH_0404_WAV2.pat
+%%DATADIR%%/patterns/DITH_0404_WAVE.pat
+%%DATADIR%%/patterns/DITH_0404_ZORO.pat
+%%DATADIR%%/patterns/DITH_0808_BL22.pat
+%%DATADIR%%/patterns/DITH_0808_BL22_v.pat
+%%DATADIR%%/patterns/DITH_0808_BUBL.pat
+%%DATADIR%%/patterns/DITH_0808_CIRC.pat
+%%DATADIR%%/patterns/DITH_0808_CLUS.pat
+%%DATADIR%%/patterns/DITH_0808_DIAM.pat
+%%DATADIR%%/patterns/DITH_0808_PANL.pat
+%%DATADIR%%/patterns/DITH_0808_SPOT.pat
+%%DATADIR%%/patterns/DITH_0808_SWRL.pat
+%%DATADIR%%/patterns/DITH_0808_WAVE.pat
+%%DATADIR%%/patterns/DITH_3232_CSTR.pat
 %%DATADIR%%/patterns/Grid01.pat
 %%DATADIR%%/patterns/Grid02.pat
 %%DATADIR%%/patterns/Grid03.pat
@@ -592,91 +644,102 @@ share/icons/hicolor/scalable/apps/krita.svgz
 %%DATADIR%%/preset_icons/emblem_icons/sketch.png
 %%DATADIR%%/preset_icons/emblem_icons/wet.png
 %%DATADIR%%/preset_icons/emblem_icons/whirlpool.png
-%%DATADIR%%/preset_icons/tool_icons/acrylic-angled.png
-%%DATADIR%%/preset_icons/tool_icons/acrylic-fan-used.png
-%%DATADIR%%/preset_icons/tool_icons/acrylic-flat-old.png
-%%DATADIR%%/preset_icons/tool_icons/acrylic-flat.png
-%%DATADIR%%/preset_icons/tool_icons/acrylic-mop.png
-%%DATADIR%%/preset_icons/tool_icons/acrylic-rounded-used.png
-%%DATADIR%%/preset_icons/tool_icons/adjustement-contrast.png
-%%DATADIR%%/preset_icons/tool_icons/adjustement-dark.png
-%%DATADIR%%/preset_icons/tool_icons/airbrush.png
-%%DATADIR%%/preset_icons/tool_icons/blending-stump.png
-%%DATADIR%%/preset_icons/tool_icons/blur_soft.png
-%%DATADIR%%/preset_icons/tool_icons/chalk-square.png
-%%DATADIR%%/preset_icons/tool_icons/charcoal-block.png
-%%DATADIR%%/preset_icons/tool_icons/charcoal-pencil-large.png
-%%DATADIR%%/preset_icons/tool_icons/charcoal-pencil-medium.png
-%%DATADIR%%/preset_icons/tool_icons/charcoal-pencil-thin.png
-%%DATADIR%%/preset_icons/tool_icons/clone.png
-%%DATADIR%%/preset_icons/tool_icons/color-effect.png
-%%DATADIR%%/preset_icons/tool_icons/colored-pencil.png
-%%DATADIR%%/preset_icons/tool_icons/deform.png
-%%DATADIR%%/preset_icons/tool_icons/eraser-hard.png
-%%DATADIR%%/preset_icons/tool_icons/eraser-kneaded.png
-%%DATADIR%%/preset_icons/tool_icons/eraser-large.png
-%%DATADIR%%/preset_icons/tool_icons/eraser-mechanical.png
-%%DATADIR%%/preset_icons/tool_icons/experimental.png
-%%DATADIR%%/preset_icons/tool_icons/filter.png
-%%DATADIR%%/preset_icons/tool_icons/gel-pen.png
-%%DATADIR%%/preset_icons/tool_icons/graphite.png
-%%DATADIR%%/preset_icons/tool_icons/grid.png
-%%DATADIR%%/preset_icons/tool_icons/ink-G-pen.png
-%%DATADIR%%/preset_icons/tool_icons/ink-brush.png
-%%DATADIR%%/preset_icons/tool_icons/ink-pen-atom.png
-%%DATADIR%%/preset_icons/tool_icons/ink-pen-glass.png
-%%DATADIR%%/preset_icons/tool_icons/inking_brush.png
-%%DATADIR%%/preset_icons/tool_icons/inking_brush_blurry.png
-%%DATADIR%%/preset_icons/tool_icons/inking_dynamic_pen.png
-%%DATADIR%%/preset_icons/tool_icons/inking_dynamic_pen_though.png
-%%DATADIR%%/preset_icons/tool_icons/inking_fine-line_medium.png
-%%DATADIR%%/preset_icons/tool_icons/inking_fine-line_tiny.png
-%%DATADIR%%/preset_icons/tool_icons/inking_pen_bumpy.png
-%%DATADIR%%/preset_icons/tool_icons/inking_pen_bumpy_though.png
-%%DATADIR%%/preset_icons/tool_icons/inking_pen_calligraphic.png
-%%DATADIR%%/preset_icons/tool_icons/knife-rake.png
-%%DATADIR%%/preset_icons/tool_icons/knife.png
-%%DATADIR%%/preset_icons/tool_icons/large-rounded-cut.png
-%%DATADIR%%/preset_icons/tool_icons/marker-large.png
-%%DATADIR%%/preset_icons/tool_icons/marker-old.png
-%%DATADIR%%/preset_icons/tool_icons/marker.png
-%%DATADIR%%/preset_icons/tool_icons/mechanical-pencil.png
-%%DATADIR%%/preset_icons/tool_icons/oil-filbert.png
-%%DATADIR%%/preset_icons/tool_icons/oil-flat-large.png
-%%DATADIR%%/preset_icons/tool_icons/oil-round-hard.png
-%%DATADIR%%/preset_icons/tool_icons/paint-roller.png
-%%DATADIR%%/preset_icons/tool_icons/pastel.png
-%%DATADIR%%/preset_icons/tool_icons/pencil-black-stone.png
-%%DATADIR%%/preset_icons/tool_icons/pencil-double-ring.png
-%%DATADIR%%/preset_icons/tool_icons/rigger-brush.png
-%%DATADIR%%/preset_icons/tool_icons/round_marker_detail.png
-%%DATADIR%%/preset_icons/tool_icons/screentone-indicator.png
-%%DATADIR%%/preset_icons/tool_icons/shape.png
-%%DATADIR%%/preset_icons/tool_icons/sketching_wide_47.png
-%%DATADIR%%/preset_icons/tool_icons/sketching_wide_bristles.png
-%%DATADIR%%/preset_icons/tool_icons/special-effect-used-brush.png
-%%DATADIR%%/preset_icons/tool_icons/stamp.png
-%%DATADIR%%/preset_icons/tool_icons/stylus-colored-ring.png
-%%DATADIR%%/preset_icons/tool_icons/stylus-colored.png
-%%DATADIR%%/preset_icons/tool_icons/stylus-experimental.png
-%%DATADIR%%/preset_icons/tool_icons/stylus-white.png
-%%DATADIR%%/preset_icons/tool_icons/stylus.png
-%%DATADIR%%/preset_icons/tool_icons/sumi-e.png
-%%DATADIR%%/preset_icons/tool_icons/synthetic-filbert.png
-%%DATADIR%%/preset_icons/tool_icons/synthetic-large-bright-used.png
-%%DATADIR%%/preset_icons/tool_icons/synthetic-large-bright.png
-%%DATADIR%%/preset_icons/tool_icons/synthetic-medium.png
-%%DATADIR%%/preset_icons/tool_icons/synthetic-thin.png
-%%DATADIR%%/preset_icons/tool_icons/synthetic-very-old.png
-%%DATADIR%%/preset_icons/tool_icons/technical-pen.png
-%%DATADIR%%/preset_icons/tool_icons/texture-indicator.png
-%%DATADIR%%/preset_icons/tool_icons/thin-stylus-tablet.png
-%%DATADIR%%/preset_icons/tool_icons/wand.png
-%%DATADIR%%/preset_icons/tool_icons/watercolor-brush-medium.png
-%%DATADIR%%/preset_icons/tool_icons/watercolor-flat.png
-%%DATADIR%%/preset_icons/tool_icons/wide_brush_big.png
-%%DATADIR%%/preset_icons/tool_icons/wide_brush_blurry.png
-%%DATADIR%%/preset_icons/tool_icons/wide_dull_round.png
+%%DATADIR%%/preset_icons/tool_icons/00_01_eraser-mechanical.png
+%%DATADIR%%/preset_icons/tool_icons/00_02_eraser-large.png
+%%DATADIR%%/preset_icons/tool_icons/00_03_eraser-hard.png
+%%DATADIR%%/preset_icons/tool_icons/00_04_eraser-kneaded.png
+%%DATADIR%%/preset_icons/tool_icons/01_01_mechanical-pencil.png
+%%DATADIR%%/preset_icons/tool_icons/01_01_pencil-black-stone.png
+%%DATADIR%%/preset_icons/tool_icons/01_02_pencil-double-ring.png
+%%DATADIR%%/preset_icons/tool_icons/01_04_graphite.png
+%%DATADIR%%/preset_icons/tool_icons/02_01_charcoal-pencil-thin.png
+%%DATADIR%%/preset_icons/tool_icons/02_02_charcoal-pencil-medium.png
+%%DATADIR%%/preset_icons/tool_icons/02_03_charcoal-pencil-large.png
+%%DATADIR%%/preset_icons/tool_icons/02_04_charcoal-block.png
+%%DATADIR%%/preset_icons/tool_icons/03_01colored-pencil.png
+%%DATADIR%%/preset_icons/tool_icons/03_02_chalk-square.png
+%%DATADIR%%/preset_icons/tool_icons/03_03_pastel.png
+%%DATADIR%%/preset_icons/tool_icons/04_01_technical-pen.png
+%%DATADIR%%/preset_icons/tool_icons/04_02_gel-pen.png
+%%DATADIR%%/preset_icons/tool_icons/04_03_inking_fine-line_tiny.png
+%%DATADIR%%/preset_icons/tool_icons/04_04_inking_fine-line_medium.png
+%%DATADIR%%/preset_icons/tool_icons/04_05_ink-pen-atom.png
+%%DATADIR%%/preset_icons/tool_icons/04_06_ink-G-pen.png
+%%DATADIR%%/preset_icons/tool_icons/04_07_inking_dynamic_pen.png
+%%DATADIR%%/preset_icons/tool_icons/04_08_inking_dynamic_pen_though.png
+%%DATADIR%%/preset_icons/tool_icons/04_09_inking_pen_bumpy.png
+%%DATADIR%%/preset_icons/tool_icons/04_10_inking_pen_bumpy_though.png
+%%DATADIR%%/preset_icons/tool_icons/04_11_inking_pen_calligraphic.png
+%%DATADIR%%/preset_icons/tool_icons/04_12_rigger-brush.png
+%%DATADIR%%/preset_icons/tool_icons/04_13_inking_brush.png
+%%DATADIR%%/preset_icons/tool_icons/04_14_inking_brush_blurry.png
+%%DATADIR%%/preset_icons/tool_icons/04_15_ink-brush.png
+%%DATADIR%%/preset_icons/tool_icons/04_16_large-rounded-cut.png
+%%DATADIR%%/preset_icons/tool_icons/04_17_ink-pen-glass.png
+%%DATADIR%%/preset_icons/tool_icons/05_01_airbrush.png
+%%DATADIR%%/preset_icons/tool_icons/05_02_thin-stylus-tablet.png
+%%DATADIR%%/preset_icons/tool_icons/05_03_stylus-white.png
+%%DATADIR%%/preset_icons/tool_icons/05_04_stylus.png
+%%DATADIR%%/preset_icons/tool_icons/05_05_stylus-colored-ring.png
+%%DATADIR%%/preset_icons/tool_icons/05_06_stylus-colored.png
+%%DATADIR%%/preset_icons/tool_icons/05_07_stylus-experimental.png
+%%DATADIR%%/preset_icons/tool_icons/06_01_marker.png
+%%DATADIR%%/preset_icons/tool_icons/06_02_marker-old.png
+%%DATADIR%%/preset_icons/tool_icons/06_03_marker-large.png
+%%DATADIR%%/preset_icons/tool_icons/06_04_round_marker_detail.png
+%%DATADIR%%/preset_icons/tool_icons/06_05_sketching_wide_47.png
+%%DATADIR%%/preset_icons/tool_icons/06_06_sketching_wide_bristles.png
+%%DATADIR%%/preset_icons/tool_icons/07_01_synthetic-thin.png
+%%DATADIR%%/preset_icons/tool_icons/07_02_synthetic-medium.png
+%%DATADIR%%/preset_icons/tool_icons/07_03_synthetic-filbert.png
+%%DATADIR%%/preset_icons/tool_icons/07_04_synthetic-large-bright.png
+%%DATADIR%%/preset_icons/tool_icons/07_05_synthetic-large-bright-used.png
+%%DATADIR%%/preset_icons/tool_icons/07_06_oil-filbert.png
+%%DATADIR%%/preset_icons/tool_icons/07_07_oil-flat-large.png
+%%DATADIR%%/preset_icons/tool_icons/07_08_acrylic-rounded-used.png
+%%DATADIR%%/preset_icons/tool_icons/07_09_acrylic-angled.png
+%%DATADIR%%/preset_icons/tool_icons/07_10_acrylic-flat.png
+%%DATADIR%%/preset_icons/tool_icons/07_11_acrylic-mop.png
+%%DATADIR%%/preset_icons/tool_icons/07_12_wide_dull_round.png
+%%DATADIR%%/preset_icons/tool_icons/07_13_wide_brush_blurry.png
+%%DATADIR%%/preset_icons/tool_icons/07_14_watercolor-flat.png
+%%DATADIR%%/preset_icons/tool_icons/07_15_acrylic-fan-used.png
+%%DATADIR%%/preset_icons/tool_icons/07_16_acrylic-flat-old.png
+%%DATADIR%%/preset_icons/tool_icons/07_17_synthetic-very-old.png
+%%DATADIR%%/preset_icons/tool_icons/07_18_special-effect-used-brush.png
+%%DATADIR%%/preset_icons/tool_icons/08_01_watercolor-brush-medium.png
+%%DATADIR%%/preset_icons/tool_icons/08_02_oil-round-hard.png
+%%DATADIR%%/preset_icons/tool_icons/08_03_sumi-e.png
+%%DATADIR%%/preset_icons/tool_icons/08_04_wide_brush_big.png
+%%DATADIR%%/preset_icons/tool_icons/09_01_blending-stump.png
+%%DATADIR%%/preset_icons/tool_icons/09_02_blur_soft.png
+%%DATADIR%%/preset_icons/tool_icons/09_03_knife.png
+%%DATADIR%%/preset_icons/tool_icons/09_04_knife-rake.png
+%%DATADIR%%/preset_icons/tool_icons/09_05_paint-roller.png
+%%DATADIR%%/preset_icons/tool_icons/10_01_color-effect.png
+%%DATADIR%%/preset_icons/tool_icons/10_02_adjustement-contrast.png
+%%DATADIR%%/preset_icons/tool_icons/10_03_adjustement-dark.png
+%%DATADIR%%/preset_icons/tool_icons/10_04_filter.png
+%%DATADIR%%/preset_icons/tool_icons/10_05_deform.png
+%%DATADIR%%/preset_icons/tool_icons/10_06_clone.png
+%%DATADIR%%/preset_icons/tool_icons/11_01_wand.png
+%%DATADIR%%/preset_icons/tool_icons/11_02_shape.png
+%%DATADIR%%/preset_icons/tool_icons/11_03_experimental.png
+%%DATADIR%%/preset_icons/tool_icons/11_03stamp.png
+%%DATADIR%%/preset_icons/tool_icons/11_04_texture-indicator.png
+%%DATADIR%%/preset_icons/tool_icons/11_05_screentone-indicator.png
+%%DATADIR%%/preset_icons/tool_icons/11_06_grid.png
+%%DATADIR%%/preset_icons/tool_icons/12_01_Mechanical_Pencil.png
+%%DATADIR%%/preset_icons/tool_icons/12_02_Fineliner.png
+%%DATADIR%%/preset_icons/tool_icons/12_03_Marker_Permanent.png
+%%DATADIR%%/preset_icons/tool_icons/12_04_PenBrush_01.png
+%%DATADIR%%/preset_icons/tool_icons/12_05_Pen_01.png
+%%DATADIR%%/preset_icons/tool_icons/12_06_Pen_02.png
+%%DATADIR%%/preset_icons/tool_icons/12_07_Pen_03.png
+%%DATADIR%%/preset_icons/tool_icons/12_08_Graphite_stick.png
+%%DATADIR%%/preset_icons/tool_icons/12_09_Pastel_Bar_01.png
+%%DATADIR%%/preset_icons/tool_icons/12_10_Pastel_Bar_04.png
+%%DATADIR%%/preset_icons/tool_icons/12_11_Pastel_Bar_02.png
 %%DATADIR%%/qmlthemes/default/colors.js
 %%DATADIR%%/qmlthemes/default/fonts.js
 %%DATADIR%%/qmlthemes/default/fonts/SourceSansPro-Black.otf
@@ -867,6 +930,8 @@ share/icons/hicolor/scalable/apps/krita.svgz
 %%DATADIR%%/templates/texture/Texture512x5128bitsrgb.desktop
 %%DATADIR%%/templates/texture/Texture8k32bitscalar.desktop
 %%DATADIR%%/templates/texture/Texture8k8bitsrgb.desktop
+%%DATADIR%%/windowlayouts/Cockpit (laptop mode).kwl
+%%DATADIR%%/windowlayouts/Dual screen editing.kwl
 %%DATADIR%%/workspaces/Animation.kws
 %%DATADIR%%/workspaces/Big_Paint.kws
 %%DATADIR%%/workspaces/Big_Paint_2.kws