krita: Update to 4.3.0

* Fix build with Qt 5.15.0 (PR pkg/55394).
* Do not remove -Werror=implicit-function-declaration.
* Require c++14.

Changelog:
* Improve animation.
* Add watercolor effect brushes.
* More filters.
* Improve layer performance.
* Improve RGBA brushes.
* Multi-dimension export for GIH.
* Add magnetic selection tool.
* Improve Magic Wand.

4 files changed, 215 insertions, 587 deletions

diff --git a/graphics/krita/Makefile b/graphics/krita/Makefile
index 19d7c5a4f18..9043eecc1a3 100644
--- a/graphics/krita/Makefile
+++ b/graphics/krita/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2020/06/05 12:49:08 jperkin Exp $
+# $NetBSD: Makefile,v 1.49 2020/06/19 15:11:29 ryoon Exp $
 
-DISTNAME=		krita-4.2.9
-PKGREVISION=		2
+DISTNAME=		krita-4.3.0
 CATEGORIES=		graphics misc kde
 MASTER_SITES=		${MASTER_SITE_KDE:=krita/${PKGVERSION_NOREV}/}
 
@@ -13,11 +12,12 @@ LICENSE=		gnu-gpl-v2 AND gnu-lgpl-v2.1
 #BUILD_DEPENDS+=	automoc4>=0.9.87:../../devel/automoc4
 
 USE_TOOLS+=		msgfmt pkg-config perl gmake
-USE_LANGUAGES=		c c++
+USE_LANGUAGES=		c c++14 # as of 4.3.0 boost 1.75 geometry requires c++14
 USE_CMAKE=		yes
 CMAKE_ARG_PATH=		..
 CONFIGURE_DIRS=		_KDE_build
 CMAKE_ARGS+=		-DCMAKE_INSTALL_PREFIX=${PREFIX}
+CMAKE_ARGS+=		-DCMAKE_DISABLE_FIND_PACKAGE_PyQt5:BOOL=true
 
 pre-configure:
 	${MKDIR} ${WRKSRC}/_KDE_build
@@ -28,7 +28,7 @@ DEPENDS+=	kitemmodels-[0-9]*:../../devel/kitemmodels
 # librpcsvc.so deprecation warnings
 BUILDLINK_TRANSFORM.NetBSD+=	rm:-Wl,--fatal-warnings
 
-BUILDLINK_TRANSFORM+=		rm:-Werror=implicit-function-declaration
+#BUILDLINK_TRANSFORM+=		rm:-Werror=implicit-function-declaration
 
 CONF_FILES+=	${PREFIX}/share/examples/kde-xdg/kritarc \
 		${PKG_SYSCONFDIR}/xdg/kritarc
@@ -48,6 +48,7 @@ PYTHON_VERSIONS_INCOMPATIBLE=	27
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../math/eigen3/buildlink3.mk"
 .include "../../archivers/karchive/buildlink3.mk"
+BUILDLINK_API_DEPENDS.boost-header+=	boost-headers>=1.73.0nb1
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/ki18n/buildlink3.mk"
diff --git a/graphics/krita/PLIST b/graphics/krita/PLIST
index fdab47fdedc..54c371347d1 100644
--- a/graphics/krita/PLIST
+++ b/graphics/krita/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2020/05/25 10:31:17 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.6 2020/06/19 15:11:29 ryoon Exp $
 bin/krita
 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
@@ -63,6 +65,7 @@ lib/kritaplugins/kritaimageenhancement.so
 lib/kritaplugins/kritaimagesize.so
 lib/kritaplugins/kritaimagesplit.so
 lib/kritaplugins/kritaindexcolors.so
+lib/kritaplugins/kritajp2import.so
 lib/kritaplugins/kritajpegexport.so
 lib/kritaplugins/kritajpegimport.so
 lib/kritaplugins/kritakraexport.so
@@ -84,6 +87,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 +118,7 @@ lib/kritaplugins/kritasimplexnoisegenerator.so
 lib/kritaplugins/kritasketchpaintop.so
 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,80 +144,80 @@ lib/kritaplugins/kritawavefilter.so
 lib/kritaplugins/kritawaveletdecompose.so
 lib/kritaplugins/kritaxcfimport.so
 lib/libkritabasicflakes.so
-lib/libkritabasicflakes.so.18
-lib/libkritabasicflakes.so.18.0.0
+lib/libkritabasicflakes.so.19
+lib/libkritabasicflakes.so.19.0.0
 lib/libkritacolor.so
-lib/libkritacolor.so.18
-lib/libkritacolor.so.18.0.0
+lib/libkritacolor.so.19
+lib/libkritacolor.so.19.0.0
 lib/libkritacolord.so
-lib/libkritacolord.so.18
-lib/libkritacolord.so.18.0.0
+lib/libkritacolord.so.19
+lib/libkritacolord.so.19.0.0
 lib/libkritacommand.so
-lib/libkritacommand.so.18
-lib/libkritacommand.so.18.0.0
+lib/libkritacommand.so.19
+lib/libkritacommand.so.19.0.0
 lib/libkritaflake.so
-lib/libkritaflake.so.18
-lib/libkritaflake.so.18.0.0
+lib/libkritaflake.so.19
+lib/libkritaflake.so.19.0.0
 lib/libkritaglobal.so
-lib/libkritaglobal.so.18
-lib/libkritaglobal.so.18.0.0
+lib/libkritaglobal.so.19
+lib/libkritaglobal.so.19.0.0
 lib/libkritaimage.so
-lib/libkritaimage.so.18
-lib/libkritaimage.so.18.0.0
+lib/libkritaimage.so.19
+lib/libkritaimage.so.19.0.0
 lib/libkritaimpex.so
-lib/libkritaimpex.so.18
-lib/libkritaimpex.so.18.0.0
+lib/libkritaimpex.so.19
+lib/libkritaimpex.so.19.0.0
 lib/libkritalibbrush.so
-lib/libkritalibbrush.so.18
-lib/libkritalibbrush.so.18.0.0
+lib/libkritalibbrush.so.19
+lib/libkritalibbrush.so.19.0.0
 lib/libkritalibkis.so
-lib/libkritalibkis.so.18
-lib/libkritalibkis.so.18.0.0
+lib/libkritalibkis.so.19
+lib/libkritalibkis.so.19.0.0
 lib/libkritalibkra.so
-lib/libkritalibkra.so.18
-lib/libkritalibkra.so.18.0.0
+lib/libkritalibkra.so.19
+lib/libkritalibkra.so.19.0.0
 lib/libkritalibpaintop.so
-lib/libkritalibpaintop.so.18
-lib/libkritalibpaintop.so.18.0.0
+lib/libkritalibpaintop.so.19
+lib/libkritalibpaintop.so.19.0.0
 lib/libkritametadata.so
-lib/libkritametadata.so.18
-lib/libkritametadata.so.18.0.0
+lib/libkritametadata.so.19
+lib/libkritametadata.so.19.0.0
 lib/libkritaodf.so
-lib/libkritaodf.so.18
-lib/libkritaodf.so.18.0.0
+lib/libkritaodf.so.19
+lib/libkritaodf.so.19.0.0
 lib/libkritapigment.so
-lib/libkritapigment.so.18
-lib/libkritapigment.so.18.0.0
+lib/libkritapigment.so.19
+lib/libkritapigment.so.19.0.0
 lib/libkritaplugin.so
-lib/libkritaplugin.so.18
-lib/libkritaplugin.so.18.0.0
+lib/libkritaplugin.so.19
+lib/libkritaplugin.so.19.0.0
 lib/libkritapsd.so
-lib/libkritapsd.so.18
-lib/libkritapsd.so.18.0.0
+lib/libkritapsd.so.19
+lib/libkritapsd.so.19.0.0
 lib/libkritaqml.so
-lib/libkritaqml.so.18
-lib/libkritaqml.so.18.0.0
+lib/libkritaqml.so.19
+lib/libkritaqml.so.19.0.0
 lib/libkritastore.so
-lib/libkritastore.so.18
-lib/libkritastore.so.18.0.0
+lib/libkritastore.so.19
+lib/libkritastore.so.19.0.0
 lib/libkritatext.so
-lib/libkritatext.so.18
-lib/libkritatext.so.18.0.0
+lib/libkritatext.so.19
+lib/libkritatext.so.19.0.0
 lib/libkritatextlayout.so
-lib/libkritatextlayout.so.18
-lib/libkritatextlayout.so.18.0.0
+lib/libkritatextlayout.so.19
+lib/libkritatextlayout.so.19.0.0
 lib/libkritaui.so
-lib/libkritaui.so.18
-lib/libkritaui.so.18.0.0
+lib/libkritaui.so.19
+lib/libkritaui.so.19.0.0
 lib/libkritaversion.so
-lib/libkritaversion.so.18
-lib/libkritaversion.so.18.0.0
+lib/libkritaversion.so.19
+lib/libkritaversion.so.19.0.0
 lib/libkritawidgets.so
-lib/libkritawidgets.so.18
-lib/libkritawidgets.so.18.0.0
+lib/libkritawidgets.so.19
+lib/libkritawidgets.so.19.0.0
 lib/libkritawidgetutils.so
-lib/libkritawidgetutils.so.18
-lib/libkritawidgetutils.so.18.0.0
+lib/libkritawidgetutils.so.19
+lib/libkritawidgetutils.so.19.0.0
 lib/qml/org/krita/draganddrop/libdraganddropplugin.so
 lib/qml/org/krita/draganddrop/qmldir
 lib/qml/org/krita/sketch/components/BusyIndicator.qml
@@ -248,9 +253,11 @@ lib/qml/org/krita/sketch/components/qmldir
 lib/qml/org/krita/sketch/libkritasketchplugin.so
 lib/qml/org/krita/sketch/qmldir
 share/applications/krita_brush.desktop
+share/applications/krita_csv.desktop
 share/applications/krita_exr.desktop
 share/applications/krita_gif.desktop
 share/applications/krita_heightmap.desktop
+share/applications/krita_jp2.desktop
 share/applications/krita_jpeg.desktop
 share/applications/krita_kra.desktop
 share/applications/krita_ora.desktop
@@ -326,6 +333,7 @@ share/krita/actions/KisToolPolygon.action
 share/krita/actions/KisToolPolyline.action
 share/krita/actions/KisToolSelectContiguous.action
 share/krita/actions/KisToolSelectElliptical.action
+share/krita/actions/KisToolSelectMagnetic.action
 share/krita/actions/KisToolSelectOutline.action
 share/krita/actions/KisToolSelectPath.action
 share/krita/actions/KisToolSelectPolygonal.action
@@ -361,6 +369,7 @@ share/krita/defaultpresets/sketchbrush.kpp
 share/krita/defaultpresets/smudge.kpp
 share/krita/defaultpresets/spraybrush.kpp
 share/krita/defaultpresets/tangentnormal.kpp
+share/krita/donation/banner.png
 share/krita/dtd/krita.dtd
 share/krita/gamutmasks/Atmosphere_With_Accent.kgm
 share/krita/gamutmasks/Atmospheric_Triad.kgm
@@ -417,6 +426,20 @@ share/krita/metadata/schemas/xmpmm.schema
 share/krita/metadata/schemas/xmprights.schema
 share/krita/paintoppresets/a)_Eraser_Circle.kpp
 share/krita/paintoppresets/b)_Basic-5_Size_default.kpp
+share/krita/paintoppresets/j)_WaterC_Basic_Lines-Dry.kpp
+share/krita/paintoppresets/j)_WaterC_Basic_Lines-Wet-Pattern.kpp
+share/krita/paintoppresets/j)_WaterC_Basic_Lines-Wet.kpp
+share/krita/paintoppresets/j)_WaterC_Basic_Round-Fringe_02.kpp
+share/krita/paintoppresets/j)_WaterC_Basic_Round-Grain.kpp
+share/krita/paintoppresets/j)_WaterC_Basic_Round-Grunge.kpp
+share/krita/paintoppresets/j)_WaterC_Flat_Big-Grain_Tilt.kpp
+share/krita/paintoppresets/j)_WaterC_Flat_Decay_Tilt.kpp
+share/krita/paintoppresets/j)_WaterC_Special_Blobs.kpp
+share/krita/paintoppresets/j)_WaterC_Special_Splats.kpp
+share/krita/paintoppresets/j)_WaterC_Spread-Pattern.kpp
+share/krita/paintoppresets/j)_WaterC_Spread.kpp
+share/krita/paintoppresets/j)_WaterC_Spread_WideArea.kpp
+share/krita/paintoppresets/j)_WaterC_Water-Pattern.kpp
 share/krita/palettes/concept-cookie.gpl
 share/krita/palettes/default.gpl
 share/krita/palettes/gradient.gpl
@@ -466,6 +489,37 @@ share/krita/patterns/Cross05.pat
 share/krita/patterns/Cross06.pat
 share/krita/patterns/Cross07.pat
 share/krita/patterns/Crumpled_Paper.pat
+share/krita/patterns/DITH_0202_CLUS.pat
+share/krita/patterns/DITH_0202_GEN_.pat
+share/krita/patterns/DITH_0202_HORZ.pat
+share/krita/patterns/DITH_0202_VERT.pat
+share/krita/patterns/DITH_0404_ALT_.pat
+share/krita/patterns/DITH_0404_BL22.pat
+share/krita/patterns/DITH_0404_CLUS.pat
+share/krita/patterns/DITH_0404_CURL.pat
+share/krita/patterns/DITH_0404_DIAG.pat
+share/krita/patterns/DITH_0404_ELL2.pat
+share/krita/patterns/DITH_0404_ELL3.pat
+share/krita/patterns/DITH_0404_ELLS.pat
+share/krita/patterns/DITH_0404_GEN_.pat
+share/krita/patterns/DITH_0404_HORZ.pat
+share/krita/patterns/DITH_0404_SHUR.pat
+share/krita/patterns/DITH_0404_SLIC.pat
+share/krita/patterns/DITH_0404_VERT.pat
+share/krita/patterns/DITH_0404_WAV2.pat
+share/krita/patterns/DITH_0404_WAVE.pat
+share/krita/patterns/DITH_0404_ZORO.pat
+share/krita/patterns/DITH_0808_BL22.pat
+share/krita/patterns/DITH_0808_BL22_v.pat
+share/krita/patterns/DITH_0808_BUBL.pat
+share/krita/patterns/DITH_0808_CIRC.pat
+share/krita/patterns/DITH_0808_CLUS.pat
+share/krita/patterns/DITH_0808_DIAM.pat
+share/krita/patterns/DITH_0808_PANL.pat
+share/krita/patterns/DITH_0808_SPOT.pat
+share/krita/patterns/DITH_0808_SWRL.pat
+share/krita/patterns/DITH_0808_WAVE.pat
+share/krita/patterns/DITH_3232_CSTR.pat
 share/krita/patterns/Grid01.pat
 share/krita/patterns/Grid02.pat
 share/krita/patterns/Grid03.pat
@@ -593,91 +647,102 @@ share/krita/preset_icons/emblem_icons/question.png
 share/krita/preset_icons/emblem_icons/sketch.png
 share/krita/preset_icons/emblem_icons/wet.png
 share/krita/preset_icons/emblem_icons/whirlpool.png
-share/krita/preset_icons/tool_icons/acrylic-angled.png
-share/krita/preset_icons/tool_icons/acrylic-fan-used.png
-share/krita/preset_icons/tool_icons/acrylic-flat-old.png
-share/krita/preset_icons/tool_icons/acrylic-flat.png
-share/krita/preset_icons/tool_icons/acrylic-mop.png
-share/krita/preset_icons/tool_icons/acrylic-rounded-used.png
-share/krita/preset_icons/tool_icons/adjustement-contrast.png
-share/krita/preset_icons/tool_icons/adjustement-dark.png
-share/krita/preset_icons/tool_icons/airbrush.png
-share/krita/preset_icons/tool_icons/blending-stump.png
-share/krita/preset_icons/tool_icons/blur_soft.png
-share/krita/preset_icons/tool_icons/chalk-square.png
-share/krita/preset_icons/tool_icons/charcoal-block.png
-share/krita/preset_icons/tool_icons/charcoal-pencil-large.png
-share/krita/preset_icons/tool_icons/charcoal-pencil-medium.png
-share/krita/preset_icons/tool_icons/charcoal-pencil-thin.png
-share/krita/preset_icons/tool_icons/clone.png
-share/krita/preset_icons/tool_icons/color-effect.png
-share/krita/preset_icons/tool_icons/colored-pencil.png
-share/krita/preset_icons/tool_icons/deform.png
-share/krita/preset_icons/tool_icons/eraser-hard.png
-share/krita/preset_icons/tool_icons/eraser-kneaded.png
-share/krita/preset_icons/tool_icons/eraser-large.png
-share/krita/preset_icons/tool_icons/eraser-mechanical.png
-share/krita/preset_icons/tool_icons/experimental.png
-share/krita/preset_icons/tool_icons/filter.png
-share/krita/preset_icons/tool_icons/gel-pen.png
-share/krita/preset_icons/tool_icons/graphite.png
-share/krita/preset_icons/tool_icons/grid.png
-share/krita/preset_icons/tool_icons/ink-G-pen.png
-share/krita/preset_icons/tool_icons/ink-brush.png
-share/krita/preset_icons/tool_icons/ink-pen-atom.png
-share/krita/preset_icons/tool_icons/ink-pen-glass.png
-share/krita/preset_icons/tool_icons/inking_brush.png
-share/krita/preset_icons/tool_icons/inking_brush_blurry.png
-share/krita/preset_icons/tool_icons/inking_dynamic_pen.png
-share/krita/preset_icons/tool_icons/inking_dynamic_pen_though.png
-share/krita/preset_icons/tool_icons/inking_fine-line_medium.png
-share/krita/preset_icons/tool_icons/inking_fine-line_tiny.png
-share/krita/preset_icons/tool_icons/inking_pen_bumpy.png
-share/krita/preset_icons/tool_icons/inking_pen_bumpy_though.png
-share/krita/preset_icons/tool_icons/inking_pen_calligraphic.png
-share/krita/preset_icons/tool_icons/knife-rake.png
-share/krita/preset_icons/tool_icons/knife.png
-share/krita/preset_icons/tool_icons/large-rounded-cut.png
-share/krita/preset_icons/tool_icons/marker-large.png
-share/krita/preset_icons/tool_icons/marker-old.png
-share/krita/preset_icons/tool_icons/marker.png
-share/krita/preset_icons/tool_icons/mechanical-pencil.png
-share/krita/preset_icons/tool_icons/oil-filbert.png
-share/krita/preset_icons/tool_icons/oil-flat-large.png
-share/krita/preset_icons/tool_icons/oil-round-hard.png
-share/krita/preset_icons/tool_icons/paint-roller.png
-share/krita/preset_icons/tool_icons/pastel.png
-share/krita/preset_icons/tool_icons/pencil-black-stone.png
-share/krita/preset_icons/tool_icons/pencil-double-ring.png
-share/krita/preset_icons/tool_icons/rigger-brush.png
-share/krita/preset_icons/tool_icons/round_marker_detail.png
-share/krita/preset_icons/tool_icons/screentone-indicator.png
-share/krita/preset_icons/tool_icons/shape.png
-share/krita/preset_icons/tool_icons/sketching_wide_47.png
-share/krita/preset_icons/tool_icons/sketching_wide_bristles.png
-share/krita/preset_icons/tool_icons/special-effect-used-brush.png
-share/krita/preset_icons/tool_icons/stamp.png
-share/krita/preset_icons/tool_icons/stylus-colored-ring.png
-share/krita/preset_icons/tool_icons/stylus-colored.png
-share/krita/preset_icons/tool_icons/stylus-experimental.png
-share/krita/preset_icons/tool_icons/stylus-white.png
-share/krita/preset_icons/tool_icons/stylus.png
-share/krita/preset_icons/tool_icons/sumi-e.png
-share/krita/preset_icons/tool_icons/synthetic-filbert.png
-share/krita/preset_icons/tool_icons/synthetic-large-bright-used.png
-share/krita/preset_icons/tool_icons/synthetic-large-bright.png
-share/krita/preset_icons/tool_icons/synthetic-medium.png
-share/krita/preset_icons/tool_icons/synthetic-thin.png
-share/krita/preset_icons/tool_icons/synthetic-very-old.png
-share/krita/preset_icons/tool_icons/technical-pen.png
-share/krita/preset_icons/tool_icons/texture-indicator.png
-share/krita/preset_icons/tool_icons/thin-stylus-tablet.png
-share/krita/preset_icons/tool_icons/wand.png
-share/krita/preset_icons/tool_icons/watercolor-brush-medium.png
-share/krita/preset_icons/tool_icons/watercolor-flat.png
-share/krita/preset_icons/tool_icons/wide_brush_big.png
-share/krita/preset_icons/tool_icons/wide_brush_blurry.png
-share/krita/preset_icons/tool_icons/wide_dull_round.png
+share/krita/preset_icons/tool_icons/00_01_eraser-mechanical.png
+share/krita/preset_icons/tool_icons/00_02_eraser-large.png
+share/krita/preset_icons/tool_icons/00_03_eraser-hard.png
+share/krita/preset_icons/tool_icons/00_04_eraser-kneaded.png
+share/krita/preset_icons/tool_icons/01_01_mechanical-pencil.png
+share/krita/preset_icons/tool_icons/01_01_pencil-black-stone.png
+share/krita/preset_icons/tool_icons/01_02_pencil-double-ring.png
+share/krita/preset_icons/tool_icons/01_04_graphite.png
+share/krita/preset_icons/tool_icons/02_01_charcoal-pencil-thin.png
+share/krita/preset_icons/tool_icons/02_02_charcoal-pencil-medium.png
+share/krita/preset_icons/tool_icons/02_03_charcoal-pencil-large.png
+share/krita/preset_icons/tool_icons/02_04_charcoal-block.png
+share/krita/preset_icons/tool_icons/03_01colored-pencil.png
+share/krita/preset_icons/tool_icons/03_02_chalk-square.png
+share/krita/preset_icons/tool_icons/03_03_pastel.png
+share/krita/preset_icons/tool_icons/04_01_technical-pen.png
+share/krita/preset_icons/tool_icons/04_02_gel-pen.png
+share/krita/preset_icons/tool_icons/04_03_inking_fine-line_tiny.png
+share/krita/preset_icons/tool_icons/04_04_inking_fine-line_medium.png
+share/krita/preset_icons/tool_icons/04_05_ink-pen-atom.png
+share/krita/preset_icons/tool_icons/04_06_ink-G-pen.png
+share/krita/preset_icons/tool_icons/04_07_inking_dynamic_pen.png
+share/krita/preset_icons/tool_icons/04_08_inking_dynamic_pen_though.png
+share/krita/preset_icons/tool_icons/04_09_inking_pen_bumpy.png
+share/krita/preset_icons/tool_icons/04_10_inking_pen_bumpy_though.png
+share/krita/preset_icons/tool_icons/04_11_inking_pen_calligraphic.png
+share/krita/preset_icons/tool_icons/04_12_rigger-brush.png
+share/krita/preset_icons/tool_icons/04_13_inking_brush.png
+share/krita/preset_icons/tool_icons/04_14_inking_brush_blurry.png
+share/krita/preset_icons/tool_icons/04_15_ink-brush.png
+share/krita/preset_icons/tool_icons/04_16_large-rounded-cut.png
+share/krita/preset_icons/tool_icons/04_17_ink-pen-glass.png
+share/krita/preset_icons/tool_icons/05_01_airbrush.png
+share/krita/preset_icons/tool_icons/05_02_thin-stylus-tablet.png
+share/krita/preset_icons/tool_icons/05_03_stylus-white.png
+share/krita/preset_icons/tool_icons/05_04_stylus.png
+share/krita/preset_icons/tool_icons/05_05_stylus-colored-ring.png
+share/krita/preset_icons/tool_icons/05_06_stylus-colored.png
+share/krita/preset_icons/tool_icons/05_07_stylus-experimental.png
+share/krita/preset_icons/tool_icons/06_01_marker.png
+share/krita/preset_icons/tool_icons/06_02_marker-old.png
+share/krita/preset_icons/tool_icons/06_03_marker-large.png
+share/krita/preset_icons/tool_icons/06_04_round_marker_detail.png
+share/krita/preset_icons/tool_icons/06_05_sketching_wide_47.png
+share/krita/preset_icons/tool_icons/06_06_sketching_wide_bristles.png
+share/krita/preset_icons/tool_icons/07_01_synthetic-thin.png
+share/krita/preset_icons/tool_icons/07_02_synthetic-medium.png
+share/krita/preset_icons/tool_icons/07_03_synthetic-filbert.png
+share/krita/preset_icons/tool_icons/07_04_synthetic-large-bright.png
+share/krita/preset_icons/tool_icons/07_05_synthetic-large-bright-used.png
+share/krita/preset_icons/tool_icons/07_06_oil-filbert.png
+share/krita/preset_icons/tool_icons/07_07_oil-flat-large.png
+share/krita/preset_icons/tool_icons/07_08_acrylic-rounded-used.png
+share/krita/preset_icons/tool_icons/07_09_acrylic-angled.png
+share/krita/preset_icons/tool_icons/07_10_acrylic-flat.png
+share/krita/preset_icons/tool_icons/07_11_acrylic-mop.png
+share/krita/preset_icons/tool_icons/07_12_wide_dull_round.png
+share/krita/preset_icons/tool_icons/07_13_wide_brush_blurry.png
+share/krita/preset_icons/tool_icons/07_14_watercolor-flat.png
+share/krita/preset_icons/tool_icons/07_15_acrylic-fan-used.png
+share/krita/preset_icons/tool_icons/07_16_acrylic-flat-old.png
+share/krita/preset_icons/tool_icons/07_17_synthetic-very-old.png
+share/krita/preset_icons/tool_icons/07_18_special-effect-used-brush.png
+share/krita/preset_icons/tool_icons/08_01_watercolor-brush-medium.png
+share/krita/preset_icons/tool_icons/08_02_oil-round-hard.png
+share/krita/preset_icons/tool_icons/08_03_sumi-e.png
+share/krita/preset_icons/tool_icons/08_04_wide_brush_big.png
+share/krita/preset_icons/tool_icons/09_01_blending-stump.png
+share/krita/preset_icons/tool_icons/09_02_blur_soft.png
+share/krita/preset_icons/tool_icons/09_03_knife.png
+share/krita/preset_icons/tool_icons/09_04_knife-rake.png
+share/krita/preset_icons/tool_icons/09_05_paint-roller.png
+share/krita/preset_icons/tool_icons/10_01_color-effect.png
+share/krita/preset_icons/tool_icons/10_02_adjustement-contrast.png
+share/krita/preset_icons/tool_icons/10_03_adjustement-dark.png
+share/krita/preset_icons/tool_icons/10_04_filter.png
+share/krita/preset_icons/tool_icons/10_05_deform.png
+share/krita/preset_icons/tool_icons/10_06_clone.png
+share/krita/preset_icons/tool_icons/11_01_wand.png
+share/krita/preset_icons/tool_icons/11_02_shape.png
+share/krita/preset_icons/tool_icons/11_03_experimental.png
+share/krita/preset_icons/tool_icons/11_03stamp.png
+share/krita/preset_icons/tool_icons/11_04_texture-indicator.png
+share/krita/preset_icons/tool_icons/11_05_screentone-indicator.png
+share/krita/preset_icons/tool_icons/11_06_grid.png
+share/krita/preset_icons/tool_icons/12_01_Mechanical_Pencil.png
+share/krita/preset_icons/tool_icons/12_02_Fineliner.png
+share/krita/preset_icons/tool_icons/12_03_Marker_Permanent.png
+share/krita/preset_icons/tool_icons/12_04_PenBrush_01.png
+share/krita/preset_icons/tool_icons/12_05_Pen_01.png
+share/krita/preset_icons/tool_icons/12_06_Pen_02.png
+share/krita/preset_icons/tool_icons/12_07_Pen_03.png
+share/krita/preset_icons/tool_icons/12_08_Graphite_stick.png
+share/krita/preset_icons/tool_icons/12_09_Pastel_Bar_01.png
+share/krita/preset_icons/tool_icons/12_10_Pastel_Bar_04.png
+share/krita/preset_icons/tool_icons/12_11_Pastel_Bar_02.png
 share/krita/qmlthemes/default/colors.js
 share/krita/qmlthemes/default/fonts.js
 share/krita/qmlthemes/default/fonts/SourceSansPro-Black.otf
@@ -868,6 +933,8 @@ share/krita/templates/texture/Texture4k8bitsrgb.desktop
 share/krita/templates/texture/Texture512x5128bitsrgb.desktop
 share/krita/templates/texture/Texture8k32bitscalar.desktop
 share/krita/templates/texture/Texture8k8bitsrgb.desktop
+share/krita/windowlayouts/Cockpit (laptop mode).kwl
+share/krita/windowlayouts/Dual screen editing.kwl
 share/krita/workspaces/Animation.kws
 share/krita/workspaces/Big_Paint.kws
 share/krita/workspaces/Big_Paint_2.kws
diff --git a/graphics/krita/distinfo b/graphics/krita/distinfo
index 4b2041e86d7..a4e6d0151bc 100644
--- a/graphics/krita/distinfo
+++ b/graphics/krita/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.6 2020/05/25 10:31:17 ryoon Exp $
+$NetBSD: distinfo,v 1.7 2020/06/19 15:11:29 ryoon Exp $
 
-SHA1 (krita-4.2.9.tar.gz) = a6baf46bd6d22627254ded080826cde97e0df419
-RMD160 (krita-4.2.9.tar.gz) = 976576e2e511b985fa138f385441094315aa4953
-SHA512 (krita-4.2.9.tar.gz) = 39152d3cd5d2155b67a7fc79b0a80328aa4756d3b0b0fc32d549ad30041dc8d1106e0578accabd4e5a2b6ad67d06710598672bd6592887e80983b29cfb7ec7c8
-Size (krita-4.2.9.tar.gz) = 246341028 bytes
+SHA1 (krita-4.3.0.tar.gz) = 9b18ef34194bf7e7b65242bcfef8139769282f51
+RMD160 (krita-4.3.0.tar.gz) = cd0a542f61a8bb6c27ce09ae3729d99492fc45e5
+SHA512 (krita-4.3.0.tar.gz) = 2f60d407a9e143aac289b16ba442619660d3ec56492c5a85095004d724378a682661d4594a0c3aec9b10cc225c45058d7890be3d05ce4460fa807eca59020509
+Size (krita-4.3.0.tar.gz) = 248996139 bytes
 SHA1 (patch-krita_data_CMakeLists.txt) = bc0a37c1a60a2e0702c4a87b70ae0abf8359cc45
-SHA1 (patch-qt5.14.2) = e5eee4bfce5c5287f0558f86244db7ff87c9b787
 SHA1 (patch-xcftools.h) = eeeed207e9b1995999a16efbbae91ed8f6255f48
diff --git a/graphics/krita/patches/patch-qt5.14.2 b/graphics/krita/patches/patch-qt5.14.2
deleted file mode 100644
index 8db9977847e..00000000000
--- a/graphics/krita/patches/patch-qt5.14.2
+++ /dev/null
@@ -1,439 +0,0 @@
-$NetBSD: patch-qt5.14.2,v 1.1 2020/05/25 10:31:17 ryoon Exp $
-
-* From: https://invent.kde.org/graphics/krita/-/commit/afed6a9e53f79710e7df4c9e42b28ab5a794ad6c
-  to fix freeze during splash screen with Qt 5.14.2.
-
-diff --git a/libs/flake/KoDockRegistry.cpp b/libs/flake/KoDockRegistry.cpp
-index 1cba940727e2e0184ff1decec2001dcef5244aa6..6693b163b703b28610577e7f10c573d866f9fb30 100644
---- libs/flake/KoDockRegistry.cpp
-+++ libs/flake/KoDockRegistry.cpp
-@@ -40,8 +40,8 @@ void KoDockRegistry::init()
-     KoPluginLoader::PluginsConfig config;
-     config.whiteList = "DockerPlugins";
-     config.blacklist = "DockerPluginsDisabled";
--    config.group = "calligra";
--    KoPluginLoader::instance()->load(QString::fromLatin1("Calligra/Dock"),
-+    config.group = "krita";
-+    KoPluginLoader::instance()->load(QString::fromLatin1("Krita/Dock"),
-                                      QString::fromLatin1("[X-Flake-PluginVersion] == 28"),
-                                      config);
- }
-diff --git a/libs/flake/KoFilterEffectRegistry.cpp b/libs/flake/KoFilterEffectRegistry.cpp
-index 2f8346bbdca18fd628d2ac9699cb19bfa5d08376..2ff63e269807b3320344139cd0284913f1deea97 100644
---- libs/flake/KoFilterEffectRegistry.cpp
-+++ libs/flake/KoFilterEffectRegistry.cpp
-@@ -40,7 +40,7 @@ void KoFilterEffectRegistry::init()
-     KoPluginLoader::PluginsConfig config;
-     config.whiteList = "FilterEffectPlugins";
-     config.blacklist = "FilterEffectPluginsDisabled";
--    KoPluginLoader::instance()->load(QString::fromLatin1("Calligra/FilterEffect"),
-+    KoPluginLoader::instance()->load(QString::fromLatin1("Krita/FilterEffect"),
-                                      QString::fromLatin1("[X-Flake-PluginVersion] == 28"),
-                                      config);
- }
-diff --git a/libs/flake/KoInputDeviceHandlerRegistry.cpp b/libs/flake/KoInputDeviceHandlerRegistry.cpp
-index 17def3b2d57434a8cba7faf78409bf0aa9c34d1f..31c83ccfc9c70b07a1a63cc8c3585411e23baba4 100644
---- libs/flake/KoInputDeviceHandlerRegistry.cpp
-+++ libs/flake/KoInputDeviceHandlerRegistry.cpp
-@@ -35,8 +35,8 @@ void KoInputDeviceHandlerRegistry::init()
-     KoPluginLoader::PluginsConfig config;
-     config.whiteList = "DevicePlugins";
-     config.blacklist = "DevicePluginsDisabled";
--    config.group = "calligra";
--    KoPluginLoader::instance()->load(QString::fromLatin1("Calligra/Device"),
-+    config.group = "krita";
-+    KoPluginLoader::instance()->load(QString::fromLatin1("Krita/Device"),
-                                      QString::fromLatin1("[X-Flake-PluginVersion] == 28"), config);
- 
-     Q_FOREACH (const QString & id, keys()) {
-diff --git a/libs/flake/KoShapeFactoryBase.cpp b/libs/flake/KoShapeFactoryBase.cpp
-index dd36cb2504889998db0f8f885d32cc0804e45dc4..476817a5e5a4fdf27486a7e5e007d654a0de5d4e 100644
---- libs/flake/KoShapeFactoryBase.cpp
-+++ libs/flake/KoShapeFactoryBase.cpp
-@@ -233,7 +233,7 @@ void KoShapeFactoryBase::getDeferredPlugin()
-     QMutexLocker(&d->pluginLoadingMutex);
-     if (d->deferredFactory) return;
- 
--    const QList<QPluginLoader *> offers = KoJsonTrader::instance()->query("Calligra/Deferred", QString());
-+    const QList<QPluginLoader *> offers = KoJsonTrader::instance()->query("Krita/Deferred", QString());
-     Q_ASSERT(offers.size() > 0);
- 
-     Q_FOREACH (QPluginLoader *pluginLoader, offers) {
-diff --git a/libs/flake/KoShapeRegistry.cpp b/libs/flake/KoShapeRegistry.cpp
-index d70d1017266e5cc9151f3a64c0355f8479625523..468294f1a0b394a709b6030d981ad19301b0d3cf 100644
---- libs/flake/KoShapeRegistry.cpp
-+++ libs/flake/KoShapeRegistry.cpp
-@@ -78,13 +78,13 @@ void KoShapeRegistry::Private::init(KoShapeRegistry *q)
-     KoPluginLoader::PluginsConfig config;
-     config.whiteList = "FlakePlugins";
-     config.blacklist = "FlakePluginsDisabled";
--    config.group = "calligra";
--    KoPluginLoader::instance()->load(QString::fromLatin1("Calligra/Flake"),
-+    config.group = "krita";
-+    KoPluginLoader::instance()->load(QString::fromLatin1("Krita/Flake"),
-                                      QString::fromLatin1("[X-Flake-PluginVersion] == 28"),
-                                      config);
-     config.whiteList = "ShapePlugins";
-     config.blacklist = "ShapePluginsDisabled";
--    KoPluginLoader::instance()->load(QString::fromLatin1("Calligra/Shape"),
-+    KoPluginLoader::instance()->load(QString::fromLatin1("Krita/Shape"),
-                                      QString::fromLatin1("[X-Flake-PluginVersion] == 28"),
-                                      config);
- 
-diff --git a/libs/flake/KoToolRegistry.cpp b/libs/flake/KoToolRegistry.cpp
-index f893b339be8482c6fed9db3ecf0604a0be668e86..175bef1cc25cd8196a27227ec3f323e6991908c3 100644
---- libs/flake/KoToolRegistry.cpp
-+++ libs/flake/KoToolRegistry.cpp
-@@ -42,10 +42,10 @@ KoToolRegistry::KoToolRegistry()
- void KoToolRegistry::init()
- {
-     KoPluginLoader::PluginsConfig config;
--    config.group = "calligra";
-+    config.group = "krita";
-     config.whiteList = "ToolPlugins";
-     config.blacklist = "ToolPluginsDisabled";
--    KoPluginLoader::instance()->load(QString::fromLatin1("Calligra/Tool"),
-+    KoPluginLoader::instance()->load(QString::fromLatin1("Krita/Tool"),
-                                      QString::fromLatin1("[X-Flake-PluginVersion] == 28"),
-                                      config);
- 
-@@ -53,7 +53,7 @@ void KoToolRegistry::init()
-     add(new KoPathToolFactory());
-     add(new KoZoomToolFactory());
- 
--    KConfigGroup cfg =  KSharedConfig::openConfig()->group("calligra");
-+    KConfigGroup cfg =  KSharedConfig::openConfig()->group("krita");
-     QStringList toolsBlacklist = cfg.readEntry("ToolsBlacklist", QStringList());
-     foreach (const QString& toolID, toolsBlacklist) {
-         delete value(toolID);
-diff --git a/libs/flake/Mainpage.dox b/libs/flake/Mainpage.dox
-index 8c05a437d14a796e3c633c0ae04267a098b0f7a5..2927ad62b40a9e358fd26a29fa349881bd2f6567 100644
---- libs/flake/Mainpage.dox
-+++ libs/flake/Mainpage.dox
-@@ -2,7 +2,7 @@
-  * \mainpage Flake
-  *
-  * The Flake library is a low level library for all kinds of graphical content
-- * to be placed on any Calligra canvas. This includes a line to text-areas or
-+ * to be placed on any Krita canvas. This includes a line to text-areas or
-  * even movies.  Just as important, this library will include tools to manipulate
-  * the graphical content. At least at the level of Flake objects.  This goes from
-  * moving/rotating the object to a basis for complex brushes for a paint program.
-@@ -59,7 +59,7 @@
- [Desktop Entry]
- Encoding=UTF-8
- Name=My Flake Shapes Plugin
--ServiceTypes=Calligra/Shape
-+ServiceTypes=Krita/Shape
- Type=Service
- X-KDE-PluginInfo-Name=myflakeshapes
- X-KDE-Library=myflakeshapesplugin
-diff --git a/libs/koplugin/CMakeLists.txt b/libs/koplugin/CMakeLists.txt
-index fc048721a7313c6fe34b11ed48c164ab559b5bb2..34a7db4cf8faf87e4a5fe37c9ddbaf411dea3351 100644
---- libs/koplugin/CMakeLists.txt
-+++ libs/koplugin/CMakeLists.txt
-@@ -18,6 +18,7 @@ target_link_libraries(kritaplugin
-     PUBLIC
-         Qt5::Core
-     PRIVATE
-+        kritaglobal
-         KF5::ConfigCore
-         KF5::CoreAddons
-         KF5::I18n
-diff --git a/libs/koplugin/KoPluginLoader.cpp b/libs/koplugin/KoPluginLoader.cpp
-index cba012e190effc669d51fa7e1eaa57bc4a775c88..647d664cd83fc2ee4e6a9b2ad2fd91506d08a12e 100644
---- libs/koplugin/KoPluginLoader.cpp
-+++ libs/koplugin/KoPluginLoader.cpp
-@@ -26,6 +26,8 @@
- 
- #include "KritaPluginDebug.h"
- 
-+#include <kis_debug.h>
-+
- #include <KConfig>
- #include <KSharedConfig>
- #include <KConfigGroup>
-@@ -56,6 +58,7 @@ KoPluginLoader* KoPluginLoader::instance()
- 
- void KoPluginLoader::load(const QString & serviceType, const QString & versionString, const PluginsConfig &config, QObject* owner, bool cache)
- {
-+
-     // Don't load the same plugins again
-     if (cache && d->loadedServiceTypes.contains(serviceType)) {
-         return;
-@@ -94,6 +97,7 @@ void KoPluginLoader::load(const QString & serviceType, const QString & versionSt
-                 qWarning() << "Loading plugin" << loader->fileName() << "failed, has no X-KDE-PluginInfo-Name.";
-                 continue;
-             }
-+
-             if (whiteList.contains(pluginName)) {
-                 plugins.append(loader);
-             }
-@@ -141,7 +145,7 @@ void KoPluginLoader::load(const QString & serviceType, const QString & versionSt
-             json = json.value("KPlugin").toObject();
-             const QString pluginName = json.value("Id").toString();
-             whiteList << pluginName;
--            debugPlugin << "Loaded plugin" << loader->fileName() << owner;
-+            debugPlugin << "\tLoaded plugin" << loader->fileName() << owner;
-             if (!owner) {
-                 delete plugin;
-             }
-diff --git a/libs/koplugin/KoPluginLoader.h b/libs/koplugin/KoPluginLoader.h
-index 82aa0079ec9179efd6625793d268cf466fa6c523..e21f8a4e4e62af67065416dfb4b6aa936fc16f38 100644
---- libs/koplugin/KoPluginLoader.h
-+++ libs/koplugin/KoPluginLoader.h
-@@ -77,7 +77,7 @@ public:
-          * /code
-          *  KConfigGroup configGroup =  KSharedConfig::openConfig()->group(config.group);
-          * /endcode
--         * For most cases you can pass the string "calligra" into this variable.
-+         * For most cases you can pass the string "krita" into this variable.
-          */
-         const char * group;
-         /// This contains the variable name for the list of plugins (by library name) the user wants to load
-@@ -100,7 +100,7 @@ public:
-     /**
-      * Load all plugins that conform to the versiontype and versionstring,
-      * for instance:
--     * KoPluginLoader::instance()->load("Calligra/Flake", "([X-Flake-PluginVersion] == 28)");
-+     * KoPluginLoader::instance()->load("Krita/Flake", "([X-Flake-PluginVersion] == 28)");
-      * This method allows you to optionally limit the plugins that are loaded by version, but also
-      * using a user configurable set of config options.
-      * If you pass a PluginsConfig struct only those plugins are loaded that are specified in the
-diff --git a/libs/pigment/KoColorSpaceRegistry.cpp b/libs/pigment/KoColorSpaceRegistry.cpp
-index b3843fdabb945f1bd1606024f432378b820fd57e..f3b0a435389ab08fbe3a10068e66804981aa202c 100644
---- libs/pigment/KoColorSpaceRegistry.cpp
-+++ libs/pigment/KoColorSpaceRegistry.cpp
-@@ -196,14 +196,14 @@ void KoColorSpaceRegistry::init()
-     KoPluginLoader::PluginsConfig config;
-     config.whiteList = "ColorSpacePlugins";
-     config.blacklist = "ColorSpacePluginsDisabled";
--    config.group = "calligra";
--    KoPluginLoader::instance()->load("Calligra/ColorSpace", "[X-Pigment-PluginVersion] == 28", config);
-+    config.group = "krita";
-+    KoPluginLoader::instance()->load("Krita/ColorSpace", "[X-Pigment-PluginVersion] == 28", config);
- 
-     KoPluginLoader::PluginsConfig configExtensions;
-     configExtensions.whiteList = "ColorSpaceExtensionsPlugins";
-     configExtensions.blacklist = "ColorSpaceExtensionsPluginsDisabled";
--    configExtensions.group = "calligra";
--    KoPluginLoader::instance()->load("Calligra/ColorSpaceExtension", "[X-Pigment-PluginVersion] == 28", configExtensions);
-+    configExtensions.group = "krita";
-+    KoPluginLoader::instance()->load("Krita/ColorSpaceExtension", "[X-Pigment-PluginVersion] == 28", configExtensions);
- 
- 
-     dbgPigment << "Loaded the following colorspaces:";
-diff --git a/libs/ui/KisApplication.cpp b/libs/ui/KisApplication.cpp
-index 26918298464a878e4958405a00f666856d162c90..80eac2a1e432dc356bbf51a49f42b45682a6fe26 100644
---- libs/ui/KisApplication.cpp
-+++ libs/ui/KisApplication.cpp
-@@ -49,6 +49,8 @@
- #include <kconfig.h>
- #include <kconfiggroup.h>
- 
-+#include <KoDockRegistry.h>
-+#include <KoToolRegistry.h>
- #include <KoColorSpaceRegistry.h>
- #include <KoPluginLoader.h>
- #include <KoShapeRegistry.h>
-@@ -323,32 +325,17 @@ void KisApplication::loadPlugins()
- 
-     KoShapeRegistry* r = KoShapeRegistry::instance();
-     r->add(new KisShapeSelectionFactory());
--
-+    KoColorSpaceRegistry::instance();
-     KisActionRegistry::instance();
-     KisFilterRegistry::instance();
-     KisGeneratorRegistry::instance();
-     KisPaintOpRegistry::instance();
--    KoColorSpaceRegistry::instance();
-+    KoToolRegistry::instance();
-+    KoDockRegistry::instance();
- }
- 
- void KisApplication::loadGuiPlugins()
- {
--    //    qDebug() << "loadGuiPlugins();";
--    // Load the krita-specific tools
--    setSplashScreenLoadingText(i18n("Loading Plugins for Krita/Tool..."));
--    processEvents();
--    //    qDebug() << "loading tools";
--    KoPluginLoader::instance()->load(QString::fromLatin1("Krita/Tool"),
--                                     QString::fromLatin1("[X-Krita-Version] == 28"));
--
--
--    // Load dockers
--    setSplashScreenLoadingText(i18n("Loading Plugins for Krita/Dock..."));
--    processEvents();
--    //    qDebug() << "loading dockers";
--    KoPluginLoader::instance()->load(QString::fromLatin1("Krita/Dock"),
--                                     QString::fromLatin1("[X-Krita-Version] == 28"));
--
-     // XXX_EXIV: make the exiv io backends real plugins
-     setSplashScreenLoadingText(i18n("Loading Plugins Exiv/IO..."));
-     processEvents();
-diff --git a/plugins/color/colorspaceextensions/krita_colorspaces_extensions_plugin.json b/plugins/color/colorspaceextensions/krita_colorspaces_extensions_plugin.json
-index 6218963921259585f2547a79d24d5c778d9c8be6..9a0df9466188b554e438ab2e501cc3ec6f4d24ce 100644
---- plugins/color/colorspaceextensions/krita_colorspaces_extensions_plugin.json
-+++ plugins/color/colorspaceextensions/krita_colorspaces_extensions_plugin.json
-@@ -4,7 +4,7 @@
-     "X-KDE-Library": "krita_colorspaces_extensions",
-     "X-KDE-PluginInfo-Name": "krita_colorspaces_extensions",
-     "X-KDE-ServiceTypes": [
--        "Calligra/ColorSpaceExtension"
-+        "Krita/ColorSpaceExtension"
-     ],
-     "X-Pigment-MinVersion": "28",
-     "X-Pigment-PluginVersion": "28"
-diff --git a/plugins/color/lcms2engine/kolcmsengine.json b/plugins/color/lcms2engine/kolcmsengine.json
-index 2311c3f54c136e1a4f190d0fc2373c7547c14bd9..05bbf640a648437cbc6edfb26a5a9402aecea746 100644
---- plugins/color/lcms2engine/kolcmsengine.json
-+++ plugins/color/lcms2engine/kolcmsengine.json
-@@ -4,7 +4,7 @@
-     "X-KDE-Library": "kritalcmsengine",
-     "X-KDE-PluginInfo-Name": "kritalcmsengine",
-     "X-KDE-ServiceTypes": [
--        "Calligra/ColorSpace"
-+        "Krita/ColorSpace"
-     ],
-     "X-Pigment-MinVersion": "28",
-     "X-Pigment-PluginVersion": "28"
-diff --git a/plugins/dockers/svgcollectiondocker/svgcollectiondocker.json b/plugins/dockers/svgcollectiondocker/svgcollectiondocker.json
-index f7ee406724850ace95a5a13d6986ac439f1672e8..57758ed686171b06b1b270269279b865c095da6d 100644
---- plugins/dockers/svgcollectiondocker/svgcollectiondocker.json
-+++ plugins/dockers/svgcollectiondocker/svgcollectiondocker.json
-@@ -5,6 +5,6 @@
-     "X-Flake-PluginVersion": "28",
-     "X-KDE-Library": "kritasvgcollectiondocker",
-     "X-KDE-ServiceTypes": [
--        "Calligra/Dock"
-+        "Krita/Dock"
-     ]
- }
-diff --git a/plugins/flake/artistictextshape/calligra_shape_artistictext.json b/plugins/flake/artistictextshape/calligra_shape_artistictext.json
-index c28b6d85388dc196fedc20dc78d3090481239595..b6737df41ce1ff37e25ea6534272b47299dffdf5 100644
---- plugins/flake/artistictextshape/calligra_shape_artistictext.json
-+++ plugins/flake/artistictextshape/calligra_shape_artistictext.json
-@@ -6,6 +6,6 @@
-     "X-KDE-Library": "krita_shape_artistictext",
-     "X-KDE-PluginInfo-Name": "krita_artistictextshape",
-     "X-KDE-ServiceTypes": [
--        "Calligra/Shape"
-+        "Krita/Shape"
-     ]
- }
-diff --git a/plugins/flake/imageshape/calligra_shape_image.json b/plugins/flake/imageshape/calligra_shape_image.json
-index 9c60a2aad729bfcf089366b4bb21c0a3f67fb69d..25c14f2abf0d162d51448a03690c0f210da4e4b3 100644
---- plugins/flake/imageshape/calligra_shape_image.json
-+++ plugins/flake/imageshape/calligra_shape_image.json
-@@ -6,6 +6,6 @@
-     "X-KDE-Library": "krita_shape_image",
-     "X-KDE-PluginInfo-Name": "imageshape",
-     "X-KDE-ServiceTypes": [
--        "Calligra/Flake"
-+        "Krita/Flake"
-     ]
- }
-diff --git a/plugins/flake/pathshapes/calligra_shape_paths.json b/plugins/flake/pathshapes/calligra_shape_paths.json
-index 030a60b4ad369d68c1afd8f92fd80afe2ca95331..3cf7f4a7eeb4f176161ab013792a0cb48aebcee3 100644
---- plugins/flake/pathshapes/calligra_shape_paths.json
-+++ plugins/flake/pathshapes/calligra_shape_paths.json
-@@ -7,6 +7,6 @@
-     "X-KDE-Library": "krita_shape_paths",
-     "X-KDE-PluginInfo-Name": "pathshapes",
-     "X-KDE-ServiceTypes": [
--        "Calligra/Shape"
-+        "Krita/Shape"
-     ]
- }
-diff --git a/plugins/flake/textshape/calligra_shape_text.json b/plugins/flake/textshape/calligra_shape_text.json
-index 1272665c51927185ea4eff754771ec975aefbe33..8a2cb2f9d174c2ce28a5ad9fbaa87418f7bd93b9 100644
---- plugins/flake/textshape/calligra_shape_text.json
-+++ plugins/flake/textshape/calligra_shape_text.json
-@@ -6,6 +6,6 @@
-     "X-KDE-Library": "krita_shape_text",
-     "X-KDE-PluginInfo-Name": "textshape",
-     "X-KDE-ServiceTypes": [
--        "Calligra/Flake"
-+        "Krita/Flake"
-     ]
- }
-diff --git a/plugins/flake/textshape/kotext/KoInlineObjectRegistry.cpp b/plugins/flake/textshape/kotext/KoInlineObjectRegistry.cpp
-index 664bfedcc8659522e2f966eafae8f482f501e91e..f1db33e7b18ab97ef2696ab6307d502dc66e2af4 100644
---- plugins/flake/textshape/kotext/KoInlineObjectRegistry.cpp
-+++ plugins/flake/textshape/kotext/KoInlineObjectRegistry.cpp
-@@ -47,8 +47,8 @@ void KoInlineObjectRegistry::Private::init(KoInlineObjectRegistry *q)
-     KoPluginLoader::PluginsConfig config;
-     config.whiteList = "TextInlinePlugins";
-     config.blacklist = "TextInlinePluginsDisabled";
--    config.group = "calligra";
--    KoPluginLoader::instance()->load(QString::fromLatin1("Calligra/Text-InlineObject"),
-+    config.group = "krita";
-+    KoPluginLoader::instance()->load(QString::fromLatin1("Krita/Text-InlineObject"),
-                                      QString::fromLatin1("[X-KoText-PluginVersion] == 28"), config);
- 
-     foreach (KoInlineObjectFactoryBase *factory, q->values()) {
-diff --git a/plugins/flake/textshape/kotext/KoTextEditingRegistry.cpp b/plugins/flake/textshape/kotext/KoTextEditingRegistry.cpp
-index a8be81e4c112a545ce03b406989bf5b95d7f765b..ab29cd92991986342c7568827a10a56348053c7f 100644
---- plugins/flake/textshape/kotext/KoTextEditingRegistry.cpp
-+++ plugins/flake/textshape/kotext/KoTextEditingRegistry.cpp
-@@ -29,8 +29,8 @@ void KoTextEditingRegistry::init()
-     KoPluginLoader::PluginsConfig config;
-     config.whiteList = "TextEditingPlugins";
-     config.blacklist = "TextEditingPluginsDisabled";
--    config.group = "calligra";
--    KoPluginLoader::instance()->load(QString::fromLatin1("Calligra/Text-EditingPlugin"),
-+    config.group = "krita";
-+    KoPluginLoader::instance()->load(QString::fromLatin1("Krita/Text-EditingPlugin"),
-                                      QString::fromLatin1("[X-KoText-PluginVersion] == 28"), config);
- }
- 
-diff --git a/plugins/flake/textshape/kotext/texteditingplugin.json b/plugins/flake/textshape/kotext/texteditingplugin.json
-index 8687613f1143e66df5c66e2ff3d5d654094e1a70..0c0c34ddfb90f4c64d798f5fc3eb4423f1a67f6e 100644
---- plugins/flake/textshape/kotext/texteditingplugin.json
-+++ plugins/flake/textshape/kotext/texteditingplugin.json
-@@ -1,6 +1,6 @@
- {
-     "Comment": "Definition of a text-editing plugin",
--    "Id": "Text Editing plugin for the Calligra text tool",
-+    "Id": "Text Editing plugin for the Krita text tool",
-     "Type": "ServiceType",
--    "X-KDE-ServiceType": "Calligra/Text-EditingPlugin"
-+    "X-KDE-ServiceType": "Krita/Text-EditingPlugin"
- }
-diff --git a/plugins/tools/defaulttool/calligra_tool_defaults.json b/plugins/tools/defaulttool/calligra_tool_defaults.json
-index 0bb9c8ade2b54a0f6e42880b5c057059cc9b597f..c29908d46329086d889c4b13781371fb4ab6a0fc 100644
---- plugins/tools/defaulttool/calligra_tool_defaults.json
-+++ plugins/tools/defaulttool/calligra_tool_defaults.json
-@@ -6,6 +6,6 @@
-     "X-KDE-Library": "krita_flaketools",
-     "X-KDE-PluginInfo-Name": "defaulttools",
-     "X-KDE-ServiceTypes": [
--        "Calligra/Tool"
-+        "Krita/Tool"
-     ]
- }
-diff --git a/plugins/tools/karbonplugins/tools/karbon_tools.json b/plugins/tools/karbonplugins/tools/karbon_tools.json
-index 8564532c91f0fa7c9682bc3ced47c3ceb6a14b1d..391d90e5b3373ec76add26a60318aae5b962cfb4 100644
---- plugins/tools/karbonplugins/tools/karbon_tools.json
-+++ plugins/tools/karbonplugins/tools/karbon_tools.json
-@@ -6,6 +6,6 @@
-     "X-KDE-Library": "krita_karbon_tools",
-     "X-KDE-PluginInfo-Name": "krita_karbontools",
-     "X-KDE-ServiceTypes": [
--        "Calligra/Tool"
-+        "Krita/Tool"
-     ]
- }
-diff --git a/plugins/tools/svgtexttool/krita_tool_svgtext.json b/plugins/tools/svgtexttool/krita_tool_svgtext.json
-index e788be7e4d798bf8a8a78b7deddef585de9663e8..205c28fa72c0a0d276a0309a473ef138469ed181 100644
---- plugins/tools/svgtexttool/krita_tool_svgtext.json
-+++ plugins/tools/svgtexttool/krita_tool_svgtext.json
-@@ -6,6 +6,6 @@
-     "X-KDE-Library": "krita_tool_svgtext",
-     "X-KDE-PluginInfo-Name": "svgtexttool",
-     "X-KDE-ServiceTypes": [
--        "Calligra/Tool"
-+        "Krita/Tool"
-     ]
- }