krita: Update to 4.2.9

* Fix freeze during splashscreen with upstream patches.
* Buildlink to devel/libexecinfo for backtrace().

Changelog:
Too long.
Highlight is here:
* Add HR support (disabled in pkgsrc).
* Add Gamut masks.
* Improve performance.
* Many bugfixes.

13 files changed, 527 insertions, 537 deletions

diff --git a/graphics/krita/Makefile b/graphics/krita/Makefile
index 508c5afb608..1d1dfdf81a5 100644
--- a/graphics/krita/Makefile
+++ b/graphics/krita/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2020/05/21 20:53:44 ryoon Exp $
+# $NetBSD: Makefile,v 1.46 2020/05/25 10:31:17 ryoon Exp $
 
-DISTNAME=		krita-4.1.3
-PKGREVISION=		27
-CATEGORIES=		misc kde
+DISTNAME=		krita-4.2.9
+CATEGORIES=		graphics misc kde
 MASTER_SITES=		${MASTER_SITE_KDE:=krita/${PKGVERSION_NOREV}/}
 
 MAINTAINER=		maya@NetBSD.org
@@ -36,6 +35,8 @@ CONF_FILES+=	${PREFIX}/share/examples/kde-xdg/kritarc \
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../lang/python/application.mk"
+.include "../../archivers/quazip/buildlink3.mk"
+.include "../../devel/libexecinfo/buildlink3.mk"
 .include "../../graphics/exiv2/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/graphics/krita/PLIST b/graphics/krita/PLIST
index d8ea6173689..fdab47fdedc 100644
--- a/graphics/krita/PLIST
+++ b/graphics/krita/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2018/10/05 20:11:53 maya Exp $
+@comment $NetBSD: PLIST,v 1.5 2020/05/25 10:31:17 ryoon Exp $
 bin/krita
 lib/kritaplugins/krita_colorspaces_extensions.so
 lib/kritaplugins/krita_filtereffects.so
@@ -9,7 +9,6 @@ lib/kritaplugins/krita_shape_artistictext.so
 lib/kritaplugins/krita_shape_image.so
 lib/kritaplugins/krita_shape_paths.so
 lib/kritaplugins/krita_shape_text.so
-lib/kritaplugins/krita_tool_basicflakes.so
 lib/kritaplugins/krita_tool_svgtext.so
 lib/kritaplugins/kritaanimationdocker.so
 lib/kritaplugins/kritaanimationrenderer.so
@@ -32,10 +31,7 @@ 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/kritadefaultdockers.so
 lib/kritaplugins/kritadefaultpaintops.so
 lib/kritaplugins/kritadefaulttools.so
 lib/kritaplugins/kritadeformpaintop.so
@@ -50,6 +46,7 @@ lib/kritaplugins/kritaexrimport.so
 lib/kritaplugins/kritaextensioncolorsfilters.so
 lib/kritaplugins/kritafastcolortransferfilter.so
 lib/kritaplugins/kritafilterop.so
+lib/kritaplugins/kritagamutmask.so
 lib/kritaplugins/kritagifexport.so
 lib/kritaplugins/kritagifimport.so
 lib/kritaplugins/kritagradientmap.so
@@ -60,7 +57,6 @@ lib/kritaplugins/kritahalftone.so
 lib/kritaplugins/kritahatchingpaintop.so
 lib/kritaplugins/kritaheightmapexport.so
 lib/kritaplugins/kritaheightmapimport.so
-lib/kritaplugins/kritahistogram.so
 lib/kritaplugins/kritahistogramdocker.so
 lib/kritaplugins/kritahistorydocker.so
 lib/kritaplugins/kritaimageenhancement.so
@@ -71,10 +67,12 @@ lib/kritaplugins/kritajpegexport.so
 lib/kritaplugins/kritajpegimport.so
 lib/kritaplugins/kritakraexport.so
 lib/kritaplugins/kritakraimport.so
+lib/kritaplugins/kritalayerdocker.so
 lib/kritaplugins/kritalayergroupswitcher.so
 lib/kritaplugins/kritalayersplit.so
 lib/kritaplugins/kritalcmsengine.so
 lib/kritaplugins/kritalevelfilter.so
+lib/kritaplugins/kritalogdocker.so
 lib/kritaplugins/kritalutdocker.so
 lib/kritaplugins/kritametadataeditor.so
 lib/kritaplugins/kritamodifyselection.so
@@ -95,8 +93,6 @@ lib/kritaplugins/kritapixelizefilter.so
 lib/kritaplugins/kritapngexport.so
 lib/kritaplugins/kritapngimport.so
 lib/kritaplugins/kritaposterize.so
-lib/kritaplugins/kritappmexport.so
-lib/kritaplugins/kritappmimport.so
 lib/kritaplugins/kritapresetdocker.so
 lib/kritaplugins/kritapresethistory.so
 lib/kritaplugins/kritapsdexport.so
@@ -114,6 +110,7 @@ lib/kritaplugins/kritaroundmarkerpaintop.so
 lib/kritaplugins/kritaselectiontools.so
 lib/kritaplugins/kritaseparatechannels.so
 lib/kritaplugins/kritashearimage.so
+lib/kritaplugins/kritasimplexnoisegenerator.so
 lib/kritaplugins/kritasketchpaintop.so
 lib/kritaplugins/kritasmallcolorselector.so
 lib/kritaplugins/kritasmalltilesfilter.so
@@ -138,85 +135,84 @@ lib/kritaplugins/kritatoolpolyline.so
 lib/kritaplugins/kritatooltransform.so
 lib/kritaplugins/kritatouchdocker.so
 lib/kritaplugins/kritaunsharpfilter.so
-lib/kritaplugins/kritavideoexport.so
 lib/kritaplugins/kritawavefilter.so
 lib/kritaplugins/kritawaveletdecompose.so
 lib/kritaplugins/kritaxcfimport.so
 lib/libkritabasicflakes.so
-lib/libkritabasicflakes.so.17
-lib/libkritabasicflakes.so.17.0.0
+lib/libkritabasicflakes.so.18
+lib/libkritabasicflakes.so.18.0.0
 lib/libkritacolor.so
-lib/libkritacolor.so.17
-lib/libkritacolor.so.17.0.0
+lib/libkritacolor.so.18
+lib/libkritacolor.so.18.0.0
 lib/libkritacolord.so
-lib/libkritacolord.so.17
-lib/libkritacolord.so.17.0.0
+lib/libkritacolord.so.18
+lib/libkritacolord.so.18.0.0
 lib/libkritacommand.so
-lib/libkritacommand.so.17
-lib/libkritacommand.so.17.0.0
+lib/libkritacommand.so.18
+lib/libkritacommand.so.18.0.0
 lib/libkritaflake.so
-lib/libkritaflake.so.17
-lib/libkritaflake.so.17.0.0
+lib/libkritaflake.so.18
+lib/libkritaflake.so.18.0.0
 lib/libkritaglobal.so
-lib/libkritaglobal.so.17
-lib/libkritaglobal.so.17.0.0
+lib/libkritaglobal.so.18
+lib/libkritaglobal.so.18.0.0
 lib/libkritaimage.so
-lib/libkritaimage.so.17
-lib/libkritaimage.so.17.0.0
+lib/libkritaimage.so.18
+lib/libkritaimage.so.18.0.0
 lib/libkritaimpex.so
-lib/libkritaimpex.so.17
-lib/libkritaimpex.so.17.0.0
+lib/libkritaimpex.so.18
+lib/libkritaimpex.so.18.0.0
 lib/libkritalibbrush.so
-lib/libkritalibbrush.so.17
-lib/libkritalibbrush.so.17.0.0
+lib/libkritalibbrush.so.18
+lib/libkritalibbrush.so.18.0.0
 lib/libkritalibkis.so
-lib/libkritalibkis.so.17
-lib/libkritalibkis.so.17.0.0
+lib/libkritalibkis.so.18
+lib/libkritalibkis.so.18.0.0
 lib/libkritalibkra.so
-lib/libkritalibkra.so.17
-lib/libkritalibkra.so.17.0.0
+lib/libkritalibkra.so.18
+lib/libkritalibkra.so.18.0.0
 lib/libkritalibpaintop.so
-lib/libkritalibpaintop.so.17
-lib/libkritalibpaintop.so.17.0.0
+lib/libkritalibpaintop.so.18
+lib/libkritalibpaintop.so.18.0.0
+lib/libkritametadata.so
+lib/libkritametadata.so.18
+lib/libkritametadata.so.18.0.0
 lib/libkritaodf.so
-lib/libkritaodf.so.17
-lib/libkritaodf.so.17.0.0
+lib/libkritaodf.so.18
+lib/libkritaodf.so.18.0.0
 lib/libkritapigment.so
-lib/libkritapigment.so.17
-lib/libkritapigment.so.17.0.0
+lib/libkritapigment.so.18
+lib/libkritapigment.so.18.0.0
 lib/libkritaplugin.so
-lib/libkritaplugin.so.17
-lib/libkritaplugin.so.17.0.0
+lib/libkritaplugin.so.18
+lib/libkritaplugin.so.18.0.0
 lib/libkritapsd.so
-lib/libkritapsd.so.17
-lib/libkritapsd.so.17.0.0
+lib/libkritapsd.so.18
+lib/libkritapsd.so.18.0.0
 lib/libkritaqml.so
-lib/libkritaqml.so.17
-lib/libkritaqml.so.17.0.0
+lib/libkritaqml.so.18
+lib/libkritaqml.so.18.0.0
 lib/libkritastore.so
-lib/libkritastore.so.17
-lib/libkritastore.so.17.0.0
+lib/libkritastore.so.18
+lib/libkritastore.so.18.0.0
 lib/libkritatext.so
-lib/libkritatext.so.17
-lib/libkritatext.so.17.0.0
+lib/libkritatext.so.18
+lib/libkritatext.so.18.0.0
 lib/libkritatextlayout.so
-lib/libkritatextlayout.so.17
-lib/libkritatextlayout.so.17.0.0
+lib/libkritatextlayout.so.18
+lib/libkritatextlayout.so.18.0.0
 lib/libkritaui.so
-lib/libkritaui.so.17
-lib/libkritaui.so.17.0.0
-lib/libkritavectorimage.so
-lib/libkritavectorimage.so.17
-lib/libkritavectorimage.so.17.0.0
+lib/libkritaui.so.18
+lib/libkritaui.so.18.0.0
 lib/libkritaversion.so
-lib/libkritaversion.so.17
-lib/libkritaversion.so.17.0.0
+lib/libkritaversion.so.18
+lib/libkritaversion.so.18.0.0
 lib/libkritawidgets.so
-lib/libkritawidgets.so.17
-lib/libkritawidgets.so.17.0.0
+lib/libkritawidgets.so.18
+lib/libkritawidgets.so.18.0.0
 lib/libkritawidgetutils.so
-lib/libkritawidgetutils.so.17
-lib/libkritawidgetutils.so.17.0.0
+lib/libkritawidgetutils.so.18
+lib/libkritawidgetutils.so.18.0.0
 lib/qml/org/krita/draganddrop/libdraganddropplugin.so
 lib/qml/org/krita/draganddrop/qmldir
 lib/qml/org/krita/sketch/components/BusyIndicator.qml
@@ -252,7 +248,6 @@ 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
@@ -261,7 +256,6 @@ share/applications/krita_kra.desktop
 share/applications/krita_ora.desktop
 share/applications/krita_pdf.desktop
 share/applications/krita_png.desktop
-share/applications/krita_ppm.desktop
 share/applications/krita_psd.desktop
 share/applications/krita_qimageio.desktop
 share/applications/krita_raw.desktop
@@ -290,9 +284,11 @@ share/color/icc/krita/Gray-D50-elle-V4-g22.icc
 share/color/icc/krita/Gray-D50-elle-V4-labl.icc
 share/color/icc/krita/Gray-D50-elle-V4-rec709.icc
 share/color/icc/krita/Gray-D50-elle-V4-srgbtrc.icc
+share/color/icc/krita/ITUR_2100_PQ_FULL.ICC
 share/color/icc/krita/Lab-D50-Identity-elle-V2.icc
 share/color/icc/krita/Lab-D50-Identity-elle-V4.icc
 share/color/icc/krita/README
+share/color/icc/krita/Rec2020-elle-V4-g10.icc
 share/color/icc/krita/XYZ-D50-Identity-elle-V4.icc
 share/color/icc/krita/cmyk.icm
 share/color/icc/krita/krita25_lcms-builtin-sRGB_g100-truegamma.icc
@@ -300,27 +296,28 @@ share/color/icc/krita/sRGB-elle-V2-g10.icc
 share/color/icc/krita/sRGB-elle-V2-srgbtrc.icc
 share/color/icc/krita/scRGB.icm
 share/examples/kde-xdg/kritarc
-share/icons/hicolor/1024x1024/apps/calligrakrita.png
+share/icons/hicolor/1024x1024/apps/krita.png
 share/icons/hicolor/1024x1024/mimetypes/application-x-krita.png
-share/icons/hicolor/128x128/apps/calligrakrita.png
+share/icons/hicolor/128x128/apps/krita.png
 share/icons/hicolor/128x128/mimetypes/application-x-krita.png
-share/icons/hicolor/16x16/apps/calligrakrita.png
+share/icons/hicolor/16x16/apps/krita.png
 share/icons/hicolor/16x16/mimetypes/application-x-krita.png
-share/icons/hicolor/22x22/apps/calligrakrita.png
+share/icons/hicolor/22x22/apps/krita.png
 share/icons/hicolor/22x22/mimetypes/application-x-krita.png
-share/icons/hicolor/256x256/apps/calligrakrita.png
+share/icons/hicolor/256x256/apps/krita.png
 share/icons/hicolor/256x256/mimetypes/application-x-krita.png
-share/icons/hicolor/32x32/apps/calligrakrita.png
+share/icons/hicolor/32x32/apps/krita.png
 share/icons/hicolor/32x32/mimetypes/application-x-krita.png
-share/icons/hicolor/48x48/apps/calligrakrita.png
+share/icons/hicolor/48x48/apps/krita.png
 share/icons/hicolor/48x48/mimetypes/application-x-krita.png
-share/icons/hicolor/512x512/apps/calligrakrita.png
+share/icons/hicolor/512x512/apps/krita.png
 share/icons/hicolor/512x512/mimetypes/application-x-krita.png
-share/icons/hicolor/64x64/apps/calligrakrita.png
+share/icons/hicolor/64x64/apps/krita.png
 share/icons/hicolor/64x64/mimetypes/application-x-krita.png
-share/icons/hicolor/scalable/apps/calligrakrita.svgz
+share/icons/hicolor/scalable/apps/krita.svgz
 share/krita/actions/ConnectionTool.action
 share/krita/actions/InteractionTool.action
+share/krita/actions/KarbonCalligraphyTool.action
 share/krita/actions/KisAssistantTool.action
 share/krita/actions/KisToolCrop.action
 share/krita/actions/KisToolPath.action
@@ -365,6 +362,14 @@ share/krita/defaultpresets/smudge.kpp
 share/krita/defaultpresets/spraybrush.kpp
 share/krita/defaultpresets/tangentnormal.kpp
 share/krita/dtd/krita.dtd
+share/krita/gamutmasks/Atmosphere_With_Accent.kgm
+share/krita/gamutmasks/Atmospheric_Triad.kgm
+share/krita/gamutmasks/Complementary.kgm
+share/krita/gamutmasks/Dominant_Hue_With_Accent.kgm
+share/krita/gamutmasks/GamutMaskTemplate.kra
+share/krita/gamutmasks/Shifted_Triad.kgm
+share/krita/gamutmasks/Split_Complementary.kgm
+share/krita/gamutmasks/empty_mask_preview.png
 share/krita/gradients/BG-Krita2.ggr
 share/krita/gradients/GPS-FG-Glare.ggr
 share/krita/gradients/GPS-Fire-Blueish.ggr
@@ -798,7 +803,6 @@ share/krita/styles/markers.svg
 share/krita/symbols/BalloonSymbols.svg
 share/krita/symbols/pepper_carrot_speech_bubbles.svg
 share/krita/symbols/preset_icons.svg
-share/krita/tags/kis_paintoppresets_tags.xml
 share/krita/templates/animation/.directory
 share/krita/templates/animation/.source/Anim-Jp-EN.kra
 share/krita/templates/animation/.source/Anim-Jp-JP.kra
@@ -876,7 +880,6 @@ share/kritaplugins/buginfo.xmlgui
 share/kritaplugins/clonesarray.xmlgui
 share/kritaplugins/colorrange.xmlgui
 share/kritaplugins/colorspaceconversion.xmlgui
-share/kritaplugins/histogram.xmlgui
 share/kritaplugins/imageseparate.xmlgui
 share/kritaplugins/imagesize.xmlgui
 share/kritaplugins/imagesplit.xmlgui
@@ -892,7 +895,6 @@ share/kritaplugins/shearimage.xmlgui
 share/kritaplugins/waveletdecompose.xmlgui
 share/locale/af/LC_MESSAGES/krita.mo
 share/locale/ar/LC_MESSAGES/krita.mo
-share/locale/ast/LC_MESSAGES/krita.mo
 share/locale/be/LC_MESSAGES/krita.mo
 share/locale/bg/LC_MESSAGES/krita.mo
 share/locale/br/LC_MESSAGES/krita.mo
diff --git a/graphics/krita/distinfo b/graphics/krita/distinfo
index ec44cccdfc0..4b2041e86d7 100644
--- a/graphics/krita/distinfo
+++ b/graphics/krita/distinfo
@@ -1,17 +1,9 @@
-$NetBSD: distinfo,v 1.5 2019/07/17 00:39:57 nia Exp $
+$NetBSD: distinfo,v 1.6 2020/05/25 10:31:17 ryoon Exp $
 
-SHA1 (krita-4.1.3.tar.gz) = 7be35bdfa1163d5c718622d1dbe121153201a7d4
-RMD160 (krita-4.1.3.tar.gz) = e48ebf62845913ca85c965b0a51d7f82cc91ce72
-SHA512 (krita-4.1.3.tar.gz) = b0d9d8fecdf9f49e6431d0e31fdd6df2f53e654f64e93a05c73afbbdff0625c072a00347e667f1ba87c6d145185fe98d0518df3a4c0c56ccb944216a42d53d5c
-Size (krita-4.1.3.tar.gz) = 243979838 bytes
-SHA1 (patch-CMakeLists.txt) = 92dee70269c2e9d5c22ef73aeacdeb1c50f21836
-SHA1 (patch-cmake_modules_FindExiv2.cmake) = 2ef3712de4acf89e685e63666212408497b3de53
-SHA1 (patch-cmake_modules_FindLibExiv2.cmake) = 2dd9d73a7f45297c6d697ff3da181dd5c14a4880
+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 (patch-krita_data_CMakeLists.txt) = bc0a37c1a60a2e0702c4a87b70ae0abf8359cc45
-SHA1 (patch-libs_ui_CMakeLists.txt) = bbdcb9eb9aeb7ce4c4c3a55c1d82a7c47117741f
-SHA1 (patch-libs_ui_kisexiv2_kis__exif__io.cpp) = 6b982fcd4a8b5fadf0efff6caaa769ccae3c10aa
-SHA1 (patch-libs_ui_kisexiv2_kis__exiv2.h) = 9be33078755584485a1653ec2998a5fce6e32b90
-SHA1 (patch-libs_ui_kisexiv2_kis__iptc__io.cpp) = 088167d6be1b82a0c6618dd26a11b7e1cf2f0c64
-SHA1 (patch-libs_ui_kisexiv2_kis__xmp__io.cpp) = 981e8494d19706da5efdf4b24904161b9a74a425
-SHA1 (patch-plugins_impex_jpeg_CMakeLists.txt) = ed99d0d7e4f116c0d4f780b61bca38884773762c
+SHA1 (patch-qt5.14.2) = e5eee4bfce5c5287f0558f86244db7ff87c9b787
 SHA1 (patch-xcftools.h) = eeeed207e9b1995999a16efbbae91ed8f6255f48
diff --git a/graphics/krita/patches/patch-CMakeLists.txt b/graphics/krita/patches/patch-CMakeLists.txt
deleted file mode 100644
index 591e3bf78be..00000000000
--- a/graphics/krita/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2019/07/17 00:39:57 nia Exp $
-
-Fix building against exiv2-0.27
-
-Upstream commit:
-https://github.com/KDE/krita/commit/6b6758bb37da4997be36a7e2a839b07278160559.patch
-
---- CMakeLists.txt.orig	2018-09-26 12:23:39.000000000 +0000
-+++ CMakeLists.txt
-@@ -600,11 +600,7 @@ set_package_properties(Eigen3 PROPERTIES
- ##
- ## Test for exiv2
- ##
--find_package(Exiv2 0.16 REQUIRED)
--set_package_properties(Exiv2 PROPERTIES
--    DESCRIPTION "Image metadata library and tools"
--    URL "http://www.exiv2.org"
--    PURPOSE "Required by Krita")
-+find_package(LibExiv2 0.16 REQUIRED)
- 
- ##
- ## Test for lcms
diff --git a/graphics/krita/patches/patch-cmake_modules_FindExiv2.cmake b/graphics/krita/patches/patch-cmake_modules_FindExiv2.cmake
deleted file mode 100644
index e16ffcad52c..00000000000
--- a/graphics/krita/patches/patch-cmake_modules_FindExiv2.cmake
+++ /dev/null
@@ -1,90 +0,0 @@
-$NetBSD: patch-cmake_modules_FindExiv2.cmake,v 1.1 2019/07/17 00:39:57 nia Exp $
-
-Fix building against exiv2-0.27
-
-Upstream commit:
-https://github.com/KDE/krita/commit/6b6758bb37da4997be36a7e2a839b07278160559.patch
-
---- cmake/modules/FindExiv2.cmake.orig	2018-09-26 12:18:03.000000000 +0000
-+++ cmake/modules/FindExiv2.cmake
-@@ -1,80 +0,0 @@
--# - Try to find the Exiv2 library
--#
--#  EXIV2_MIN_VERSION - You can set this variable to the minimum version you need
--#                      before doing FIND_PACKAGE(Exiv2). The default is 0.12.
--#
--# Once done this will define
--#
--#  EXIV2_FOUND - system has libexiv2
--#  EXIV2_INCLUDE_DIR - the libexiv2 include directory
--#  EXIV2_LIBRARIES - Link these to use libexiv2
--#  EXIV2_DEFINITIONS - Compiler switches required for using libexiv2
--#
--# The minimum required version of Exiv2 can be specified using the
--# standard syntax, e.g. find_package(Exiv2 0.17)
--#
--# For compatibility, also the variable EXIV2_MIN_VERSION can be set to the minimum version
--# you need before doing FIND_PACKAGE(Exiv2). The default is 0.12.
--
--# Copyright (c) 2010, Alexander Neundorf, <neundorf@kde.org>
--# Copyright (c) 2008, Gilles Caulier, <caulier.gilles@gmail.com>
--#
--# Redistribution and use is allowed according to the terms of the BSD license.
--# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
--
--# Support EXIV2_MIN_VERSION for compatibility:
--if(NOT Exiv2_FIND_VERSION)
--  set(Exiv2_FIND_VERSION "${EXIV2_MIN_VERSION}")
--endif(NOT Exiv2_FIND_VERSION)
--
--# the minimum version of exiv2 we require
--if(NOT Exiv2_FIND_VERSION)
--  set(Exiv2_FIND_VERSION "0.12")
--endif(NOT Exiv2_FIND_VERSION)
--
--
--if (NOT WIN32)
--   # use pkg-config to get the directories and then use these values
--   # in the FIND_PATH() and FIND_LIBRARY() calls
--   find_package(PkgConfig)
--   pkg_check_modules(PC_EXIV2 QUIET exiv2)
--   set(EXIV2_DEFINITIONS ${PC_EXIV2_CFLAGS_OTHER})
--endif (NOT WIN32)
--
--
--find_path(EXIV2_INCLUDE_DIR NAMES exiv2/exif.hpp
--          HINTS
--          ${PC_EXIV2_INCLUDEDIR}
--          ${PC_EXIV2_INCLUDE_DIRS}
--        )
--
--find_library(EXIV2_LIBRARY NAMES exiv2 libexiv2
--             HINTS
--             ${PC_EXIV2_LIBDIR}
--             ${PC_EXIV2_LIBRARY_DIRS}
--            )
--
--
--# Get the version number from exiv2/version.hpp and store it in the cache:
--if(EXIV2_INCLUDE_DIR  AND NOT  EXIV2_VERSION)
--  file(READ ${EXIV2_INCLUDE_DIR}/exiv2/version.hpp EXIV2_VERSION_CONTENT)
--  string(REGEX MATCH "#define EXIV2_MAJOR_VERSION +\\( *([0-9]+) *\\)"  _dummy "${EXIV2_VERSION_CONTENT}")
--  set(EXIV2_VERSION_MAJOR "${CMAKE_MATCH_1}")
--
--  string(REGEX MATCH "#define EXIV2_MINOR_VERSION +\\( *([0-9]+) *\\)"  _dummy "${EXIV2_VERSION_CONTENT}")
--  set(EXIV2_VERSION_MINOR "${CMAKE_MATCH_1}")
--
--  string(REGEX MATCH "#define EXIV2_PATCH_VERSION +\\( *([0-9]+) *\\)"  _dummy "${EXIV2_VERSION_CONTENT}")
--  set(EXIV2_VERSION_PATCH "${CMAKE_MATCH_1}")
--
--  set(EXIV2_VERSION "${EXIV2_VERSION_MAJOR}.${EXIV2_VERSION_MINOR}.${EXIV2_VERSION_PATCH}" CACHE STRING "Version number of Exiv2" FORCE)
--endif(EXIV2_INCLUDE_DIR  AND NOT  EXIV2_VERSION)
--
--set(EXIV2_LIBRARIES "${EXIV2_LIBRARY}")
--
--include(FindPackageHandleStandardArgs)
--find_package_handle_standard_args(Exiv2  REQUIRED_VARS  EXIV2_LIBRARY EXIV2_INCLUDE_DIR
--                                         VERSION_VAR  EXIV2_VERSION)
--
--mark_as_advanced(EXIV2_INCLUDE_DIR EXIV2_LIBRARY)
--
diff --git a/graphics/krita/patches/patch-cmake_modules_FindLibExiv2.cmake b/graphics/krita/patches/patch-cmake_modules_FindLibExiv2.cmake
deleted file mode 100644
index 8fb1c338e7e..00000000000
--- a/graphics/krita/patches/patch-cmake_modules_FindLibExiv2.cmake
+++ /dev/null
@@ -1,125 +0,0 @@
-$NetBSD: patch-cmake_modules_FindLibExiv2.cmake,v 1.1 2019/07/17 00:39:57 nia Exp $
-
-Fix building against exiv2-0.27
-
-Upstream commit:
-https://github.com/KDE/krita/commit/6b6758bb37da4997be36a7e2a839b07278160559.patch
-
---- cmake/modules/FindLibExiv2.cmake.orig	2019-07-16 21:53:46.613301975 +0000
-+++ cmake/modules/FindLibExiv2.cmake
-@@ -0,0 +1,115 @@
-+#.rst:
-+# FindLibExiv2
-+# ------------
-+#
-+# Try to find the Exiv2 library.
-+#
-+# This will define the following variables:
-+#
-+# ``LibExiv2_FOUND``
-+#     System has LibExiv2.
-+#
-+# ``LibExiv2_VERSION``
-+#     The version of LibExiv2.
-+#
-+# ``LibExiv2_INCLUDE_DIRS``
-+#     This should be passed to target_include_directories() if
-+#     the target is not used for linking.
-+#
-+# ``LibExiv2_LIBRARIES``
-+#     The LibExiv2 library.
-+#     This can be passed to target_link_libraries() instead of
-+#     the ``LibExiv2::LibExiv2`` target
-+#
-+# If ``LibExiv2_FOUND`` is TRUE, the following imported target
-+# will be available:
-+#
-+# ``LibExiv2::LibExiv2``
-+#     The Exiv2 library
-+#
-+# Since 5.53.0.
-+#
-+#=============================================================================
-+# Copyright (c) 2018, Christophe Giboudeaux, <christophe@krop.fr>
-+# Copyright (c) 2010, Alexander Neundorf, <neundorf@kde.org>
-+# Copyright (c) 2008, Gilles Caulier, <caulier.gilles@gmail.com>
-+#
-+#
-+# Redistribution and use in source and binary forms, with or without
-+# modification, are permitted provided that the following conditions
-+# are met:
-+#
-+# 1. Redistributions of source code must retain the copyright
-+#    notice, this list of conditions and the following disclaimer.
-+# 2. Redistributions in binary form must reproduce the copyright
-+#    notice, this list of conditions and the following disclaimer in the
-+#    documentation and/or other materials provided with the distribution.
-+# 3. The name of the author may not be used to endorse or promote products
-+#    derived from this software without specific prior written permission.
-+#
-+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+#=============================================================================
-+
-+find_package(PkgConfig QUIET)
-+pkg_check_modules(PC_EXIV2 QUIET exiv2)
-+
-+find_path(LibExiv2_INCLUDE_DIRS NAMES exiv2/exif.hpp
-+    HINTS ${PC_EXIV2_INCLUDEDIR}
-+)
-+
-+find_library(LibExiv2_LIBRARIES NAMES exiv2 libexiv2
-+    HINTS ${PC_EXIV2_LIBRARY_DIRS}
-+)
-+
-+set(LibExiv2_VERSION ${PC_EXIV2_VERSION})
-+
-+if(NOT LibExiv2_VERSION AND DEFINED LibExiv2_INCLUDE_DIRS)
-+    # With exiv >= 0.27, the version #defines are in exv_conf.h instead of version.hpp
-+    foreach(_exiv2_version_file "version.hpp" "exv_conf.h")
-+        if(EXISTS "${LibExiv2_INCLUDE_DIRS}/exiv2/${_exiv2_version_file}")
-+            file(READ "${LibExiv2_INCLUDE_DIRS}/exiv2/${_exiv2_version_file}" _exiv_version_file_content)
-+            string(REGEX MATCH "#define EXIV2_MAJOR_VERSION[ ]+\\([0-9]+\\)" EXIV2_MAJOR_VERSION_MATCH ${_exiv_version_file_content})
-+            string(REGEX MATCH "#define EXIV2_MINOR_VERSION[ ]+\\([0-9]+\\)" EXIV2_MINOR_VERSION_MATCH ${_exiv_version_file_content})
-+            string(REGEX MATCH "#define EXIV2_PATCH_VERSION[ ]+\\([0-9]+\\)" EXIV2_PATCH_VERSION_MATCH ${_exiv_version_file_content})
-+            if(EXIV2_MAJOR_VERSION_MATCH)
-+                string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+\\((.*)\\)" "\\1" EXIV2_MAJOR_VERSION ${EXIV2_MAJOR_VERSION_MATCH})
-+                string(REGEX REPLACE ".*_MINOR_VERSION[ ]+\\((.*)\\)" "\\1" EXIV2_MINOR_VERSION ${EXIV2_MINOR_VERSION_MATCH})
-+                string(REGEX REPLACE ".*_PATCH_VERSION[ ]+\\((.*)\\)" "\\1"  EXIV2_PATCH_VERSION  ${EXIV2_PATCH_VERSION_MATCH})
-+            endif()
-+        endif()
-+    endforeach()
-+
-+    set(LibExiv2_VERSION "${EXIV2_MAJOR_VERSION}.${EXIV2_MINOR_VERSION}.${EXIV2_PATCH_VERSION}")
-+endif()
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(LibExiv2
-+    FOUND_VAR LibExiv2_FOUND
-+    REQUIRED_VARS  LibExiv2_LIBRARIES LibExiv2_INCLUDE_DIRS
-+    VERSION_VAR  LibExiv2_VERSION
-+)
-+
-+mark_as_advanced(LibExiv2_INCLUDE_DIRS LibExiv2_LIBRARIES)
-+
-+if(LibExiv2_FOUND AND NOT TARGET LibExiv2::LibExiv2)
-+    add_library(LibExiv2::LibExiv2 UNKNOWN IMPORTED)
-+    set_target_properties(LibExiv2::LibExiv2 PROPERTIES
-+        IMPORTED_LOCATION "${LibExiv2_LIBRARIES}"
-+        INTERFACE_INCLUDE_DIRECTORIES "${LibExiv2_INCLUDE_DIRS}"
-+    )
-+endif()
-+
-+include(FeatureSummary)
-+set_package_properties(LibExiv2 PROPERTIES
-+    URL "http://www.exiv2.org"
-+    DESCRIPTION "Image metadata support"
-+)
diff --git a/graphics/krita/patches/patch-libs_ui_CMakeLists.txt b/graphics/krita/patches/patch-libs_ui_CMakeLists.txt
deleted file mode 100644
index bbf4c861f86..00000000000
--- a/graphics/krita/patches/patch-libs_ui_CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-libs_ui_CMakeLists.txt,v 1.1 2019/07/17 00:39:57 nia Exp $
-
-Fix building against exiv2-0.27
-
-Upstream commit:
-https://github.com/KDE/krita/commit/6b6758bb37da4997be36a7e2a839b07278160559.patch
-
---- libs/ui/CMakeLists.txt.orig	2018-09-26 12:18:03.000000000 +0000
-+++ libs/ui/CMakeLists.txt
-@@ -1,6 +1,5 @@
- include_directories(
-     ${CMAKE_CURRENT_SOURCE_DIR}/qtlockedfile
--    ${EXIV2_INCLUDE_DIR}
- )
- 
- include_directories(SYSTEM
-@@ -541,7 +540,7 @@ add_library(kritaui SHARED ${kritaui_HEA
- generate_export_header(kritaui BASE_NAME kritaui)
- 
- target_link_libraries(kritaui KF5::CoreAddons KF5::Completion KF5::I18n KF5::ItemViews Qt5::Network
--                      kritaimpex kritacolor kritaimage kritalibbrush kritawidgets kritawidgetutils ${PNG_LIBRARIES} ${EXIV2_LIBRARIES}
-+                      kritaimpex kritacolor kritaimage kritalibbrush kritawidgets kritawidgetutils ${PNG_LIBRARIES} LibExiv2::LibExiv2
- )
- 
- if (HAVE_QT_MULTIMEDIA)
diff --git a/graphics/krita/patches/patch-libs_ui_kisexiv2_kis__exif__io.cpp b/graphics/krita/patches/patch-libs_ui_kisexiv2_kis__exif__io.cpp
deleted file mode 100644
index 07b9979d9b8..00000000000
--- a/graphics/krita/patches/patch-libs_ui_kisexiv2_kis__exif__io.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-$NetBSD: patch-libs_ui_kisexiv2_kis__exif__io.cpp,v 1.1 2019/07/17 00:39:57 nia Exp $
-
-Fix building against exiv2-0.27
-
-Upstream commit:
-https://github.com/KDE/krita/commit/6b6758bb37da4997be36a7e2a839b07278160559.patch
-
---- libs/ui/kisexiv2/kis_exif_io.cpp.orig	2018-09-26 12:18:03.000000000 +0000
-+++ libs/ui/kisexiv2/kis_exif_io.cpp
-@@ -438,11 +438,10 @@ bool KisExifIO::saveTo(KisMetaData::Stor
-                     if (entry.value().asArray().size() > 0) {
-                         creator = entry.value().asArray()[0];
-                     }
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
-+#if !EXIV2_TEST_VERSION(0,21,0)
-                     v = kmdValueToExivValue(creator, Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
- #else
-                     v = kmdValueToExivValue(creator, exifKey.defaultTypeId());
--
- #endif
-                 } else if (exivKey == "Exif.Photo.OECF") {
-                     v = kmdOECFStructureToExifOECF(entry.value());
-@@ -456,13 +455,13 @@ bool KisExifIO::saveTo(KisMetaData::Stor
-                     Q_ASSERT(entry.value().type() == KisMetaData::Value::LangArray);
-                     QMap<QString, KisMetaData::Value> langArr = entry.value().asLangArray();
-                     if (langArr.contains("x-default")) {
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
-+#if !EXIV2_TEST_VERSION(0,21,0)
-                         v = kmdValueToExivValue(langArr.value("x-default"), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
- #else
-                         v = kmdValueToExivValue(langArr.value("x-default"), exifKey.defaultTypeId());
- #endif
-                     } else if (langArr.size() > 0) {
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
-+#if !EXIV2_TEST_VERSION(0,21,0)
-                         v = kmdValueToExivValue(langArr.begin().value(), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
- #else
-                         v = kmdValueToExivValue(langArr.begin().value(), exifKey.defaultTypeId());
-@@ -470,7 +469,7 @@ bool KisExifIO::saveTo(KisMetaData::Stor
-                     }
-                 } else {
-                     dbgMetaData << exifKey.tag();
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
-+#if !EXIV2_TEST_VERSION(0,21,0)
-                     v = kmdValueToExivValue(entry.value(), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
- #else
-                     v = kmdValueToExivValue(entry.value(), exifKey.defaultTypeId());
-@@ -487,7 +486,7 @@ bool KisExifIO::saveTo(KisMetaData::Stor
-             dbgMetaData << "exiv error " << e.what();
-         }
-     }
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 17
-+#if !EXIV2_TEST_VERSION(0,18,0)
-     Exiv2::DataBuf rawData = exifData.copy();
-     ioDevice->write((const char*) rawData.pData_, rawData.size_);
- #else
-@@ -514,7 +513,7 @@ bool KisExifIO::loadFrom(KisMetaData::St
-     QByteArray arr = ioDevice->readAll();
-     Exiv2::ExifData exifData;
-     Exiv2::ByteOrder byteOrder;
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 17
-+#if !EXIV2_TEST_VERSION(0,18,0)
-     exifData.load((const Exiv2::byte*)arr.data(), arr.size());
-     byteOrder = exifData.byteOrder();
- #else
-@@ -529,7 +528,6 @@ bool KisExifIO::loadFrom(KisMetaData::St
-         dbgKrita << "Received unknown exception trying to parse exiv data";
-         return false;
-     }
--
- #endif
-     dbgMetaData << "Byte order = " << byteOrder << ppVar(Exiv2::bigEndian) << ppVar(Exiv2::littleEndian);
-     dbgMetaData << "There are" << exifData.count() << " entries in the exif section";
diff --git a/graphics/krita/patches/patch-libs_ui_kisexiv2_kis__exiv2.h b/graphics/krita/patches/patch-libs_ui_kisexiv2_kis__exiv2.h
deleted file mode 100644
index f1fe5e64f03..00000000000
--- a/graphics/krita/patches/patch-libs_ui_kisexiv2_kis__exiv2.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-libs_ui_kisexiv2_kis__exiv2.h,v 1.1 2019/07/17 00:39:57 nia Exp $
-
-Fix building against exiv2-0.27
-
-Upstream commit:
-https://github.com/KDE/krita/commit/6b6758bb37da4997be36a7e2a839b07278160559.patch
-
---- libs/ui/kisexiv2/kis_exiv2.h.orig	2018-09-26 12:18:03.000000000 +0000
-+++ libs/ui/kisexiv2/kis_exiv2.h
-@@ -21,7 +21,7 @@
- 
- 
- #include <metadata/kis_meta_data_value.h>
--#include <exiv2/value.hpp>
-+#include <exiv2/exiv2.hpp>
- #include "kritaui_export.h"
- 
- /// Convert an exiv value to a KisMetaData value
diff --git a/graphics/krita/patches/patch-libs_ui_kisexiv2_kis__iptc__io.cpp b/graphics/krita/patches/patch-libs_ui_kisexiv2_kis__iptc__io.cpp
deleted file mode 100644
index 7ddf380f0f7..00000000000
--- a/graphics/krita/patches/patch-libs_ui_kisexiv2_kis__iptc__io.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-libs_ui_kisexiv2_kis__iptc__io.cpp,v 1.1 2019/07/17 00:39:57 nia Exp $
-
-Fix building against exiv2-0.27
-
-Upstream commit:
-https://github.com/KDE/krita/commit/6b6758bb37da4997be36a7e2a839b07278160559.patch
-
---- libs/ui/kisexiv2/kis_iptc_io.cpp.orig	2018-09-26 12:18:03.000000000 +0000
-+++ libs/ui/kisexiv2/kis_iptc_io.cpp
-@@ -126,7 +126,7 @@ bool KisIptcIO::saveTo(KisMetaData::Stor
-             }
-         }
-     }
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 17
-+#if !EXIV2_TEST_VERSION(0,18,0)
-     Exiv2::DataBuf rawData = iptcData.copy();
- #else
-     Exiv2::DataBuf rawData = Exiv2::IptcParser::encode(iptcData);
-@@ -167,7 +167,7 @@ bool KisIptcIO::loadFrom(KisMetaData::St
-     ioDevice->open(QIODevice::ReadOnly);
-     QByteArray arr = ioDevice->readAll();
-     Exiv2::IptcData iptcData;
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 17
-+#if !EXIV2_TEST_VERSION(0,18,0)
-     iptcData.load((const Exiv2::byte*)arr.data(), arr.size());
- #else
-     Exiv2::IptcParser::decode(iptcData, (const Exiv2::byte*)arr.data(), arr.size());
diff --git a/graphics/krita/patches/patch-libs_ui_kisexiv2_kis__xmp__io.cpp b/graphics/krita/patches/patch-libs_ui_kisexiv2_kis__xmp__io.cpp
deleted file mode 100644
index a86c42b46ec..00000000000
--- a/graphics/krita/patches/patch-libs_ui_kisexiv2_kis__xmp__io.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-libs_ui_kisexiv2_kis__xmp__io.cpp,v 1.1 2019/07/17 00:39:57 nia Exp $
-
-Fix building against exiv2-0.27
-
-Upstream commit:
-https://github.com/KDE/krita/commit/6b6758bb37da4997be36a7e2a839b07278160559.patch
-
---- libs/ui/kisexiv2/kis_xmp_io.cpp.orig	2018-09-26 12:18:03.000000000 +0000
-+++ libs/ui/kisexiv2/kis_xmp_io.cpp
-@@ -17,7 +17,6 @@
- #include "kis_xmp_io.h"
- 
- #include <string>
--#include <exiv2/xmp.hpp>
- 
- #include "kis_exiv2.h"
- 
-@@ -277,9 +276,8 @@ bool KisXMPIO::loadFrom(KisMetaData::Sto
-                 const Exiv2::XmpArrayValue* xav = dynamic_cast<const Exiv2::XmpArrayValue*>(value.get());
-                 Q_ASSERT(xav);
-                 QList<KisMetaData::Value> array;
--                for (std::vector< std::string >::const_iterator it = xav->value_.begin();
--                        it != xav->value_.end(); ++it) {
--                    QString value = it->c_str();
-+                for (int i = 0; i < xav->size(); ++i) {
-+                    QString value = QString::fromStdString(xav->toString(i));
-                     if (parser) {
-                         array.push_back(parser->parse(value));
-                     } else {
diff --git a/graphics/krita/patches/patch-plugins_impex_jpeg_CMakeLists.txt b/graphics/krita/patches/patch-plugins_impex_jpeg_CMakeLists.txt
deleted file mode 100644
index 30c7bc44dea..00000000000
--- a/graphics/krita/patches/patch-plugins_impex_jpeg_CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-plugins_impex_jpeg_CMakeLists.txt,v 1.1 2019/07/17 00:39:57 nia Exp $
-
-Fix building against exiv2-0.27
-
-Upstream commit:
-https://github.com/KDE/krita/commit/6b6758bb37da4997be36a7e2a839b07278160559.patch
-
---- plugins/impex/jpeg/CMakeLists.txt.orig	2018-09-26 12:18:03.000000000 +0000
-+++ plugins/impex/jpeg/CMakeLists.txt
-@@ -4,7 +4,6 @@ set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_
- 
- include_directories(
-     ${ICCJPEG_SOURCE_DIR}
--    ${EXIV2_INCLUDE_DIR}
- )
- 
- include_directories(SYSTEM
-@@ -25,7 +24,7 @@ set(kritajpegimport_SOURCES
- 
- add_library(kritajpegimport MODULE ${kritajpegimport_SOURCES})
- 
--target_link_libraries(kritajpegimport kritaui  ${JPEG_LIBRARIES} ${LCMS2_LIBRARIES} ${EXIV2_LIBRARIES} )
-+target_link_libraries(kritajpegimport kritaui  ${JPEG_LIBRARIES} ${LCMS2_LIBRARIES} LibExiv2::LibExiv2 )
- 
- install(TARGETS kritajpegimport  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
- 
-@@ -38,7 +37,7 @@ ki18n_wrap_ui(kritajpegexport_SOURCES ki
- 
- add_library(kritajpegexport MODULE ${kritajpegexport_SOURCES})
- 
--target_link_libraries(kritajpegexport kritaui kritaimpex ${JPEG_LIBRARIES} ${LCMS2_LIBRARIES} ${EXIV2_LIBRARIES} )
-+target_link_libraries(kritajpegexport kritaui kritaimpex ${JPEG_LIBRARIES} ${LCMS2_LIBRARIES} LibExiv2::LibExiv2 )
- 
- install(TARGETS kritajpegexport  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
- install( PROGRAMS  krita_jpeg.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR})
diff --git a/graphics/krita/patches/patch-qt5.14.2 b/graphics/krita/patches/patch-qt5.14.2
new file mode 100644
index 00000000000..8db9977847e
--- /dev/null
+++ b/graphics/krita/patches/patch-qt5.14.2
@@ -0,0 +1,439 @@
+$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"
+     ]
+ }