git: 9eb722422a1f - main - graphics/krita: Update to 5.0.2

From: Max Brazhnikov <makc_at_FreeBSD.org>
Date: Sat, 26 Feb 2022 14:04:15 UTC
The branch main has been updated by makc:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9eb722422a1f5ca85f421f139eb85aac7cf89016

commit 9eb722422a1f5ca85f421f139eb85aac7cf89016
Author:     Max Brazhnikov <makc@FreeBSD.org>
AuthorDate: 2022-02-26 13:54:08 +0000
Commit:     Max Brazhnikov <makc@FreeBSD.org>
CommitDate: 2022-02-26 14:02:59 +0000

    graphics/krita: Update to 5.0.2
    
    - Drop stale patches
    - Remove conflict with Calligra from KDE 4 epoch
    - Make love, not war
    
    Release notes:
            https://krita.org/en/krita-5-0-release-notes/
    
    PR:     262188
---
 graphics/krita/Makefile                            |  29 ++---
 graphics/krita/distinfo                            |   6 +-
 .../krita/files/patch-cmake_modules_FindOCIO.cmake |  16 ---
 .../files/patch-cmake_modules_FindOpenEXR.cmake    |  33 -----
 .../files/patch-libs_image_kis__image__config.cpp  |  14 --
 .../patch-plugins_impex_exr_exr__converter.cc      |  11 --
 .../patch-plugins_paintops_mypaint_CMakeLists.txt  |  11 ++
 graphics/krita/pkg-plist                           | 145 +++++++++++++--------
 8 files changed, 112 insertions(+), 153 deletions(-)

diff --git a/graphics/krita/Makefile b/graphics/krita/Makefile
index a08673fb5d5c..36bd36dfc9ac 100644
--- a/graphics/krita/Makefile
+++ b/graphics/krita/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	krita
-DISTVERSION=	4.4.8
-PORTREVISION=	7
+DISTVERSION=	5.0.2
 CATEGORIES=	graphics kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${DISTVERSION}
 DIST_SUBDIR=	KDE/${PORTNAME}
@@ -11,8 +10,10 @@ COMMENT=	Sketching and painting program
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS=	vc>=1.1.0:devel/vc \
+		libheif>=1.12.0:graphics/libheif
 LIB_DEPENDS=	libImath.so:math/Imath \
-		libOpenColorIOv1.so:graphics/opencoloriov1 \
+		libOpenColorIO.so:graphics/opencolorio \
 		libX11.so:x11/libX11 \
 		libboost_system.so:devel/boost-libs \
 		libfftw3.so:math/fftw3 \
@@ -22,12 +23,14 @@ LIB_DEPENDS=	libImath.so:math/Imath \
 		libgsl.so:math/gsl \
 		libheif.so:graphics/libheif \
 		liblcms2.so:graphics/lcms2 \
+		libmypaint.so:graphics/libmypaint \
 		libpng.so:graphics/png \
 		libpoppler.so:graphics/poppler \
 		libpoppler-qt5.so:graphics/poppler-qt5 \
 		libquazip1-qt5.so:archivers/quazip \
 		libraw.so:graphics/libraw \
 		libtiff.so:graphics/tiff \
+		libwebp.so:graphics/webp \
 		libxcb.so:x11/libxcb \
 		libxcb-util.so:x11/xcb-util
 
@@ -38,7 +41,7 @@ USES=		cmake:noninja gmake compiler:c++11-lib desktop-file-utils \
 USE_KDE=	archive completion config coreaddons crash guiaddons i18n \
 		itemmodels itemviews kio service widgetsaddons windowsystem
 USE_QT=		concurrent core dbus declarative gui multimedia network printsupport \
-		svg testlib widgets x11extras xml \
+		sql svg testlib widgets x11extras xml \
 		buildtools_build qmake_build
 USE_XORG=	ice sm xcb xext xi
 
@@ -52,22 +55,10 @@ GMIC_DESC=		Depend on the G'Mic plugin #'
 GMIC_RUN_DEPENDS=	gmic_krita_qt:graphics/gmic-qt@krita
 
 OPENEXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr \
-			libSeExpr2.so:graphics/seexpr
+			libKSeExpr.so:graphics/kseexpr
 OPENEXR_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_OpenEXR
 
-CONFLICTS_INSTALL=	calligra-2*
-
-PLIST_SUB=	SHLIB_VER=20.0.0 \
-		SHLIB_SHVER=20
-
-CFLAGS+=	-I${LOCALBASE}/include/Imath
-LDFLAGS+=	-lpthread
-
-post-patch:
-	${REINPLACE_CMD} -e 's|<OpenColorIO/|<OpenColorIOv1/|g' \
-		${WRKSRC}/libs/ui/canvas/kis_image_pyramid.cpp \
-		${WRKSRC}/plugins/dockers/lut/lutdocker_dock.h \
-		${WRKSRC}/plugins/dockers/lut/ocio_display_filter.h \
-		${WRKSRC}/plugins/dockers/lut/lutdocker.cpp
+PLIST_SUB=	SHLIB_VER=17.0.0 \
+		SHLIB_SHVER=17
 
 .include <bsd.port.mk>
diff --git a/graphics/krita/distinfo b/graphics/krita/distinfo
index 7e21bf863274..293c22e10415 100644
--- a/graphics/krita/distinfo
+++ b/graphics/krita/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1631209868
-SHA256 (KDE/krita/krita-4.4.8.tar.xz) = 45112bf9d59beaf70de1e221699711a66b617a680d07e59d037d3b93ae77f450
-SIZE (KDE/krita/krita-4.4.8.tar.xz) = 172636696
+TIMESTAMP = 1645646435
+SHA256 (KDE/krita/krita-5.0.2.tar.xz) = 634102e0bf0c03c0ec9dc4dd647d5f618c8f136cf79bd50136e6f012be6b4e63
+SIZE (KDE/krita/krita-5.0.2.tar.xz) = 179049488
diff --git a/graphics/krita/files/patch-cmake_modules_FindOCIO.cmake b/graphics/krita/files/patch-cmake_modules_FindOCIO.cmake
deleted file mode 100644
index 968acdbc56c3..000000000000
--- a/graphics/krita/files/patch-cmake_modules_FindOCIO.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
---- cmake/modules/FindOCIO.cmake.orig	2021-08-24 07:56:28 UTC
-+++ cmake/modules/FindOCIO.cmake
-@@ -33,11 +33,11 @@ find_path(OCIO_INCLUDE_DIR OpenColorIO.h
-         /usr/local/include
-         /sw/include
-         /opt/local/include
--        PATH_SUFFIXES OpenColorIO
-+        PATH_SUFFIXES OpenColorIOv1
-         DOC "The directory where OpenColorIO/OpenColorIO.h resides"
- )
- 
--find_library(OCIO_LIBRARIES OpenColorIO
-+find_library(OCIO_LIBRARIES OpenColorIOv1
-         PATHS
-         ${OCIO_LIBRARY_PATH}
-         ${OCIO_PATH}/lib/
diff --git a/graphics/krita/files/patch-cmake_modules_FindOpenEXR.cmake b/graphics/krita/files/patch-cmake_modules_FindOpenEXR.cmake
deleted file mode 100644
index 24d095385c2e..000000000000
--- a/graphics/krita/files/patch-cmake_modules_FindOpenEXR.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
---- cmake/modules/FindOpenEXR.cmake.orig	2020-10-28 11:42:28 UTC
-+++ cmake/modules/FindOpenEXR.cmake
-@@ -23,7 +23,7 @@
- #
- 
- find_path(OPENEXR_INCLUDE_DIR
--    OpenEXR/half.h
-+    OpenEXR/ImfHeader.h
- HINTS
-     "${OPENEXR_LOCATION}"
-     "$ENV{OPENEXR_LOCATION}"
-@@ -57,11 +57,10 @@ if(OPENEXR_INCLUDE_DIR)
- endif()
- 
- foreach(OPENEXR_LIB
--    Half
-     Iex
--    Imath
--    IlmImf
-+    OpenEXR
-     IlmThread
-+    Imath
-     )
- 
-     # OpenEXR libraries may be suffixed with the version number, so we search
-@@ -87,6 +86,7 @@ endforeach(OPENEXR_LIB)
- # So #include <half.h> works
- list(APPEND OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR})
- list(APPEND OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR}/OpenEXR)
-+list(APPEND OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR}/Imath)
- 
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(OpenEXR
diff --git a/graphics/krita/files/patch-libs_image_kis__image__config.cpp b/graphics/krita/files/patch-libs_image_kis__image__config.cpp
deleted file mode 100644
index 8058d1341fe0..000000000000
--- a/graphics/krita/files/patch-libs_image_kis__image__config.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- libs/image/kis_image_config.cpp.orig	2016-09-06 07:12:46 UTC
-+++ libs/image/kis_image_config.cpp
-@@ -39,6 +39,11 @@
- #include <errno.h>
- #endif
- 
-+#ifdef Q_OS_FREEBSD
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#endif
-+
- KisImageConfig::KisImageConfig(bool readOnly)
-     : m_config( KSharedConfig::openConfig()->group("")),
-       m_readOnly(readOnly)
diff --git a/graphics/krita/files/patch-plugins_impex_exr_exr__converter.cc b/graphics/krita/files/patch-plugins_impex_exr_exr__converter.cc
deleted file mode 100644
index 9633eb3962b8..000000000000
--- a/graphics/krita/files/patch-plugins_impex_exr_exr__converter.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/impex/exr/exr_converter.cc.orig	2020-10-28 11:42:28 UTC
-+++ plugins/impex/exr/exr_converter.cc
-@@ -24,6 +24,8 @@
- 
- #include <ImfAttribute.h>
- #include <ImfChannelList.h>
-+#include <ImfFrameBuffer.h>
-+#include <ImfHeader.h>
- #include <ImfInputFile.h>
- #include <ImfOutputFile.h>
- 
diff --git a/graphics/krita/files/patch-plugins_paintops_mypaint_CMakeLists.txt b/graphics/krita/files/patch-plugins_paintops_mypaint_CMakeLists.txt
new file mode 100644
index 000000000000..ab61262e848d
--- /dev/null
+++ b/graphics/krita/files/patch-plugins_paintops_mypaint_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- plugins/paintops/mypaint/CMakeLists.txt.orig	2022-01-05 11:03:09 UTC
++++ plugins/paintops/mypaint/CMakeLists.txt
+@@ -26,7 +26,7 @@ ki18n_wrap_ui(kritamypaintop_SOURCES wdgmypaintoptions
+ 
+ add_library(kritamypaintop MODULE ${kritamypaintop_SOURCES})
+ 
+-target_link_libraries(kritamypaintop kritalibpaintop mypaint kritawidgetutils kritaui kritalibbrush kritaresources)
++target_link_libraries(kritamypaintop kritalibpaintop ${LibMyPaint_LIBRARY} kritawidgetutils kritaui kritalibbrush kritaresources)
+ 
+ 
+ install(TARGETS kritamypaintop  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
diff --git a/graphics/krita/pkg-plist b/graphics/krita/pkg-plist
index 7059a542cb99..33be9856d759 100644
--- a/graphics/krita/pkg-plist
+++ b/graphics/krita/pkg-plist
@@ -1,14 +1,15 @@
 bin/krita
 bin/krita_version
 etc/xdg/kritarc
+include/kis_qmic_interface.h
+include/kis_qmic_plugin_interface.h
+include/kritaqmicinterface_export.h
 lib/kritaplugins/krita_colorspaces_extensions.so
 lib/kritaplugins/krita_flaketools.so
 lib/kritaplugins/krita_karbontools.so
 lib/kritaplugins/krita_raw_import.so
-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_svgtext.so
 lib/kritaplugins/kritaanimationdocker.so
 lib/kritaplugins/kritaarrangedocker.so
@@ -33,6 +34,7 @@ lib/kritaplugins/kritaconvolutionfilters.so
 lib/kritaplugins/kritacsvexport.so
 lib/kritaplugins/kritacsvimport.so
 lib/kritaplugins/kritacurvepaintop.so
+lib/kritaplugins/kritadbexplorer.so
 lib/kritaplugins/kritadefaultpaintops.so
 lib/kritaplugins/kritadefaulttools.so
 lib/kritaplugins/kritadeformpaintop.so
@@ -58,18 +60,20 @@ lib/kritaplugins/kritagridpaintop.so
 lib/kritaplugins/kritahairypaintop.so
 lib/kritaplugins/kritahalftone.so
 lib/kritaplugins/kritahatchingpaintop.so
+lib/kritaplugins/kritaheifexport.so
+lib/kritaplugins/kritaheifimport.so
 lib/kritaplugins/kritaheightmapexport.so
 lib/kritaplugins/kritaheightmapimport.so
 lib/kritaplugins/kritahistogramdocker.so
 lib/kritaplugins/kritahistorydocker.so
 lib/kritaplugins/kritaimageenhancement.so
-lib/kritaplugins/kritaimagesize.so
 lib/kritaplugins/kritaimagesplit.so
 lib/kritaplugins/kritaindexcolors.so
 lib/kritaplugins/kritajpegexport.so
 lib/kritaplugins/kritajpegimport.so
 lib/kritaplugins/kritakraexport.so
 lib/kritaplugins/kritakraimport.so
+lib/kritaplugins/kritakrzexport.so
 lib/kritaplugins/kritalayerdocker.so
 lib/kritaplugins/kritalayergroupswitcher.so
 lib/kritaplugins/kritalayersplit.so
@@ -80,6 +84,7 @@ lib/kritaplugins/kritalutdocker.so
 lib/kritaplugins/kritametadataeditor.so
 lib/kritaplugins/kritamodifyselection.so
 lib/kritaplugins/kritamultigridpatterngenerator.so
+lib/kritaplugins/kritamypaintop.so
 lib/kritaplugins/kritanoisefilter.so
 lib/kritaplugins/kritanormalize.so
 lib/kritaplugins/kritaoffsetimage.so
@@ -108,11 +113,13 @@ lib/kritaplugins/kritaqmic.so
 lib/kritaplugins/kritaqmlexport.so
 lib/kritaplugins/kritaraindropsfilter.so
 lib/kritaplugins/kritarandompickfilter.so
+lib/kritaplugins/kritarecorderdocker.so
 lib/kritaplugins/kritaresourcemanager.so
 lib/kritaplugins/kritarotateimage.so
 lib/kritaplugins/kritaroundcornersfilter.so
 lib/kritaplugins/kritaroundmarkerpaintop.so
 lib/kritaplugins/kritascreentonegenerator.so
+%%OPENEXR%%lib/kritaplugins/kritaseexprgenerator.so
 lib/kritaplugins/kritaselectiontools.so
 lib/kritaplugins/kritaseparatechannels.so
 lib/kritaplugins/kritashearimage.so
@@ -124,6 +131,7 @@ lib/kritaplugins/kritasnapshotdocker.so
 lib/kritaplugins/kritaspecificcolorselector.so
 lib/kritaplugins/kritaspraypaintop.so
 lib/kritaplugins/kritaspriterexport.so
+lib/kritaplugins/kritastoryboarddocker.so
 lib/kritaplugins/kritasvgcollectiondocker.so
 lib/kritaplugins/kritasvgimport.so
 lib/kritaplugins/kritatangentnormalpaintop.so
@@ -144,6 +152,8 @@ lib/kritaplugins/kritatouchdocker.so
 lib/kritaplugins/kritaunsharpfilter.so
 lib/kritaplugins/kritawavefilter.so
 lib/kritaplugins/kritawaveletdecompose.so
+lib/kritaplugins/kritawebpexport.so
+lib/kritaplugins/kritawebpimport.so
 lib/kritaplugins/kritaxcfimport.so
 lib/libkritabasicflakes.so
 lib/libkritabasicflakes.so.%%SHLIB_SHVER%%
@@ -184,9 +194,6 @@ lib/libkritalibpaintop.so.%%SHLIB_VER%%
 lib/libkritametadata.so
 lib/libkritametadata.so.%%SHLIB_SHVER%%
 lib/libkritametadata.so.%%SHLIB_VER%%
-lib/libkritaodf.so
-lib/libkritaodf.so.%%SHLIB_SHVER%%
-lib/libkritaodf.so.%%SHLIB_VER%%
 lib/libkritapigment.so
 lib/libkritapigment.so.%%SHLIB_SHVER%%
 lib/libkritapigment.so.%%SHLIB_VER%%
@@ -196,18 +203,21 @@ lib/libkritaplugin.so.%%SHLIB_VER%%
 lib/libkritapsd.so
 lib/libkritapsd.so.%%SHLIB_SHVER%%
 lib/libkritapsd.so.%%SHLIB_VER%%
+lib/libkritaqmicinterface.so
+lib/libkritaqmicinterface.so.%%SHLIB_SHVER%%
+lib/libkritaqmicinterface.so.%%SHLIB_VER%%
 lib/libkritaqml.so
 lib/libkritaqml.so.%%SHLIB_SHVER%%
 lib/libkritaqml.so.%%SHLIB_VER%%
+lib/libkritaresources.so
+lib/libkritaresources.so.%%SHLIB_SHVER%%
+lib/libkritaresources.so.%%SHLIB_VER%%
+lib/libkritaresourcewidgets.so
+lib/libkritaresourcewidgets.so.%%SHLIB_SHVER%%
+lib/libkritaresourcewidgets.so.%%SHLIB_VER%%
 lib/libkritastore.so
 lib/libkritastore.so.%%SHLIB_SHVER%%
 lib/libkritastore.so.%%SHLIB_VER%%
-lib/libkritatext.so
-lib/libkritatext.so.%%SHLIB_SHVER%%
-lib/libkritatext.so.%%SHLIB_VER%%
-lib/libkritatextlayout.so
-lib/libkritatextlayout.so.%%SHLIB_SHVER%%
-lib/libkritatextlayout.so.%%SHLIB_VER%%
 lib/libkritaui.so
 lib/libkritaui.so.%%SHLIB_SHVER%%
 lib/libkritaui.so.%%SHLIB_VER%%
@@ -224,6 +234,7 @@ lib/libkritawidgetutils.so.%%SHLIB_VER%%
 %%QT_QMLDIR%%/org/krita/draganddrop/qmldir
 %%QT_QMLDIR%%/org/krita/sketch/components/BusyIndicator.qml
 %%QT_QMLDIR%%/org/krita/sketch/components/Button.qml
+%%QT_QMLDIR%%/org/krita/sketch/components/ButtonSquared.qml
 %%QT_QMLDIR%%/org/krita/sketch/components/CategorySwitcher.qml
 %%QT_QMLDIR%%/org/krita/sketch/components/CheckBox.qml
 %%QT_QMLDIR%%/org/krita/sketch/components/ColorSwatch.qml
@@ -258,9 +269,11 @@ share/applications/krita_brush.desktop
 share/applications/krita_csv.desktop
 %%OPENEXR%%share/applications/krita_exr.desktop
 share/applications/krita_gif.desktop
+share/applications/krita_heif.desktop
 share/applications/krita_heightmap.desktop
 share/applications/krita_jpeg.desktop
 share/applications/krita_kra.desktop
+share/applications/krita_krz.desktop
 share/applications/krita_ora.desktop
 share/applications/krita_pdf.desktop
 share/applications/krita_png.desktop
@@ -271,6 +284,7 @@ share/applications/krita_spriter.desktop
 share/applications/krita_svg.desktop
 share/applications/krita_tga.desktop
 share/applications/krita_tiff.desktop
+share/applications/krita_webp.desktop
 share/applications/krita_xcf.desktop
 share/applications/org.kde.krita.desktop
 share/color-schemes/KritaBlender.colors
@@ -345,44 +359,26 @@ share/icons/hicolor/scalable/apps/krita.svgz
 %%DATADIR%%/actions/MoveTool.action
 %%DATADIR%%/actions/PathTool.action
 %%DATADIR%%/actions/SvgTextTool.action
+%%DATADIR%%/actions/dbexplorer.action
 %%DATADIR%%/actions/krita.action
 %%DATADIR%%/actions/kritamenu.action
+%%DATADIR%%/actions/recorder.action
 %%DATADIR%%/actions/threshold.action
+%%DATADIR%%/actions/tools.action
 %%DATADIR%%/brushes/triangle.svg
 %%DATADIR%%/bundles/Krita_3_Default_Resources.bundle
 %%DATADIR%%/bundles/Krita_4_Default_Resources.bundle
 %%OPENEXR%%%%DATADIR%%/bundles/Krita_Artists_SeExpr_examples.bundle
 %%DATADIR%%/bundles/README
 %%DATADIR%%/bundles/RGBA_brushes.bundle
-%%DATADIR%%/defaultpresets/colorsmudge.kpp
-%%DATADIR%%/defaultpresets/complex.kpp
-%%DATADIR%%/defaultpresets/curvebrush.kpp
-%%DATADIR%%/defaultpresets/deformbrush.kpp
-%%DATADIR%%/defaultpresets/duplicate.kpp
-%%DATADIR%%/defaultpresets/dynabrush.kpp
-%%DATADIR%%/defaultpresets/eraser.kpp
-%%DATADIR%%/defaultpresets/experimentbrush.kpp
-%%DATADIR%%/defaultpresets/filter.kpp
-%%DATADIR%%/defaultpresets/gridbrush.kpp
-%%DATADIR%%/defaultpresets/hairybrush.kpp
-%%DATADIR%%/defaultpresets/hatchingbrush.kpp
-%%DATADIR%%/defaultpresets/paintbrush.kpp
-%%DATADIR%%/defaultpresets/particlebrush.kpp
-%%DATADIR%%/defaultpresets/roundmarker.kpp
-%%DATADIR%%/defaultpresets/sketchbrush.kpp
-%%DATADIR%%/defaultpresets/smudge.kpp
-%%DATADIR%%/defaultpresets/spraybrush.kpp
-%%DATADIR%%/defaultpresets/tangentnormal.kpp
 %%DATADIR%%/donation/banner.png
 %%DATADIR%%/dtd/krita.dtd
 %%DATADIR%%/gamutmasks/Atmosphere_With_Accent.kgm
 %%DATADIR%%/gamutmasks/Atmospheric_Triad.kgm
 %%DATADIR%%/gamutmasks/Complementary.kgm
 %%DATADIR%%/gamutmasks/Dominant_Hue_With_Accent.kgm
-%%DATADIR%%/gamutmasks/GamutMaskTemplate.kra
 %%DATADIR%%/gamutmasks/Shifted_Triad.kgm
 %%DATADIR%%/gamutmasks/Split_Complementary.kgm
-%%DATADIR%%/gamutmasks/empty_mask_preview.png
 %%DATADIR%%/gradients/BG-Krita2.ggr
 %%DATADIR%%/gradients/GPS-FG-Glare.ggr
 %%DATADIR%%/gradients/GPS-Fire-Blueish.ggr
@@ -409,6 +405,7 @@ share/icons/hicolor/scalable/apps/krita.svgz
 %%DATADIR%%/images/krita-filterop.png
 %%DATADIR%%/images/krita-grid.png
 %%DATADIR%%/images/krita-hatching.png
+%%DATADIR%%/images/krita-mypaint.png
 %%DATADIR%%/images/krita-paintbrush.png
 %%DATADIR%%/images/krita-particle.png
 %%DATADIR%%/images/krita-sketch.png
@@ -428,8 +425,31 @@ share/icons/hicolor/scalable/apps/krita.svgz
 %%DATADIR%%/metadata/schemas/xmp.schema
 %%DATADIR%%/metadata/schemas/xmpmm.schema
 %%DATADIR%%/metadata/schemas/xmprights.schema
+%%DATADIR%%/paintoppresets/Digital.tag
+%%DATADIR%%/paintoppresets/Erasers.tag
+%%DATADIR%%/paintoppresets/FX.tag
+%%DATADIR%%/paintoppresets/Favorites.tag
+%%DATADIR%%/paintoppresets/Ink.tag
+%%DATADIR%%/paintoppresets/Paint.tag
+%%DATADIR%%/paintoppresets/Pixel_Art.tag
+%%DATADIR%%/paintoppresets/Sketch.tag
+%%DATADIR%%/paintoppresets/Textures.tag
 %%DATADIR%%/paintoppresets/a)_Eraser_Circle.kpp
 %%DATADIR%%/paintoppresets/b)_Basic-5_Size_default.kpp
+%%DATADIR%%/paintoppresets/c)_Pencil_1_Sketch_(mypaint).myb
+%%DATADIR%%/paintoppresets/c)_Pencil_1_Sketch_(mypaint)_prev.png
+%%DATADIR%%/paintoppresets/c)_Pencil_2b_(mypaint).myb
+%%DATADIR%%/paintoppresets/c)_Pencil_2b_(mypaint)_prev.png
+%%DATADIR%%/paintoppresets/d)_Ink_pen_(mypaint).myb
+%%DATADIR%%/paintoppresets/d)_Ink_pen_(mypaint)_prev.png
+%%DATADIR%%/paintoppresets/e)_Marker_Medium_(mypaint).myb
+%%DATADIR%%/paintoppresets/e)_Marker_Medium_(mypaint)_prev.png
+%%DATADIR%%/paintoppresets/e)_Marker_Plain_(mypaint).myb
+%%DATADIR%%/paintoppresets/e)_Marker_Plain_(mypaint)_prev.png
+%%DATADIR%%/paintoppresets/i)_Wet_Knife_Plus_(mypaint).myb
+%%DATADIR%%/paintoppresets/i)_Wet_Knife_Plus_(mypaint)_prev.png
+%%DATADIR%%/paintoppresets/i)_Wet_Paint_Plus_(mypaint).myb
+%%DATADIR%%/paintoppresets/i)_Wet_Paint_Plus_(mypaint)_prev.png
 %%DATADIR%%/paintoppresets/j)_WaterC_Basic_Lines-Dry.kpp
 %%DATADIR%%/paintoppresets/j)_WaterC_Basic_Lines-Wet-Pattern.kpp
 %%DATADIR%%/paintoppresets/j)_WaterC_Basic_Lines-Wet.kpp
@@ -444,6 +464,7 @@ share/icons/hicolor/scalable/apps/krita.svgz
 %%DATADIR%%/paintoppresets/j)_WaterC_Spread.kpp
 %%DATADIR%%/paintoppresets/j)_WaterC_Spread_WideArea.kpp
 %%DATADIR%%/paintoppresets/j)_WaterC_Water-Pattern.kpp
+%%DATADIR%%/palettes/animation-color-set.gpl
 %%DATADIR%%/palettes/concept-cookie.gpl
 %%DATADIR%%/palettes/default.gpl
 %%DATADIR%%/palettes/gradient.gpl
@@ -568,14 +589,6 @@ share/icons/hicolor/scalable/apps/krita.svgz
 %%DATADIR%%/patterns/generic_paper1.pat
 %%DATADIR%%/patterns/generic_paper2.pat
 %%DATADIR%%/patterns/hexacolBW__2.pat
-%%DATADIR%%/pics/dark_arrow_east.png
-%%DATADIR%%/pics/dark_arrow_north.png
-%%DATADIR%%/pics/dark_arrow_north_east.png
-%%DATADIR%%/pics/dark_arrow_north_west.png
-%%DATADIR%%/pics/dark_arrow_south.png
-%%DATADIR%%/pics/dark_arrow_south_east.png
-%%DATADIR%%/pics/dark_arrow_south_west.png
-%%DATADIR%%/pics/dark_arrow_west.png
 %%DATADIR%%/pics/dark_krita_tool_assistant.png
 %%DATADIR%%/pics/dark_template_DIN_A3_landscape.png
 %%DATADIR%%/pics/dark_template_DIN_A4_portrait.png
@@ -587,19 +600,10 @@ share/icons/hicolor/scalable/apps/krita.svgz
 %%DATADIR%%/pics/dark_template_ratio_43.png
 %%DATADIR%%/pics/dark_template_texture.png
 %%DATADIR%%/pics/dark_template_web_design.png
-%%DATADIR%%/pics/extended_color_selector.png
 %%DATADIR%%/pics/kis_colselng_color_patches.png
 %%DATADIR%%/pics/kis_colselng_color_triangle.png
 %%DATADIR%%/pics/kis_colselng_my_paint_shade_selector.png
 %%DATADIR%%/pics/krita_tool_assistant.png
-%%DATADIR%%/pics/light_arrow_east.png
-%%DATADIR%%/pics/light_arrow_north.png
-%%DATADIR%%/pics/light_arrow_north_east.png
-%%DATADIR%%/pics/light_arrow_north_west.png
-%%DATADIR%%/pics/light_arrow_south.png
-%%DATADIR%%/pics/light_arrow_south_east.png
-%%DATADIR%%/pics/light_arrow_south_west.png
-%%DATADIR%%/pics/light_arrow_west.png
 %%DATADIR%%/pics/light_krita_tool_assistant.png
 %%DATADIR%%/pics/light_template_DIN_A3_landscape.png
 %%DATADIR%%/pics/light_template_DIN_A4_portrait.png
@@ -619,6 +623,10 @@ share/icons/hicolor/scalable/apps/krita.svgz
 %%DATADIR%%/predefined_image_sizes/A5__600_ppi_.predefinedimage
 %%DATADIR%%/predefined_image_sizes/A6__300_ppi_.predefinedimage
 %%DATADIR%%/predefined_image_sizes/A6__600_ppi_.predefinedimage
+%%DATADIR%%/predefined_image_sizes/Film_16_9_4K.predefinedimage
+%%DATADIR%%/predefined_image_sizes/Film_4_3_4K.predefinedimage
+%%DATADIR%%/predefined_image_sizes/Film_64_27_4K_Wide.predefinedimage
+%%DATADIR%%/predefined_image_sizes/Pixel_240x256.predefinedimage
 %%DATADIR%%/predefined_image_sizes/Texture_1024x1024.predefinedimage
 %%DATADIR%%/predefined_image_sizes/Texture_2048x2048.predefinedimage
 %%DATADIR%%/predefined_image_sizes/Texture_256x256.predefinedimage
@@ -767,22 +775,29 @@ share/icons/hicolor/scalable/apps/krita.svgz
 %%DATADIR%%/qmlthemes/default/icons/add.svg
 %%DATADIR%%/qmlthemes/default/icons/apply-black.svg
 %%DATADIR%%/qmlthemes/default/icons/apply.svg
+%%DATADIR%%/qmlthemes/default/icons/back-black.svg
 %%DATADIR%%/qmlthemes/default/icons/back.svg
 %%DATADIR%%/qmlthemes/default/icons/camera-black.svg
 %%DATADIR%%/qmlthemes/default/icons/cancel-black.svg
 %%DATADIR%%/qmlthemes/default/icons/checkbox-checked.svg
 %%DATADIR%%/qmlthemes/default/icons/checkbox-unchecked.svg
 %%DATADIR%%/qmlthemes/default/icons/checker-small.svg
+%%DATADIR%%/qmlthemes/default/icons/close-black.svg
 %%DATADIR%%/qmlthemes/default/icons/close.svg
+%%DATADIR%%/qmlthemes/default/icons/color_wheel-black.svg
 %%DATADIR%%/qmlthemes/default/icons/color_wheel.svg
-%%DATADIR%%/qmlthemes/default/icons/colorpicker.svg
+%%DATADIR%%/qmlthemes/default/icons/colorsampler-black.svg
+%%DATADIR%%/qmlthemes/default/icons/colorsampler.svg
 %%DATADIR%%/qmlthemes/default/icons/combo-arrows-white.svg
 %%DATADIR%%/qmlthemes/default/icons/crop-black.svg
 %%DATADIR%%/qmlthemes/default/icons/crop.svg
 %%DATADIR%%/qmlthemes/default/icons/delete-black.svg
 %%DATADIR%%/qmlthemes/default/icons/delete.svg
+%%DATADIR%%/qmlthemes/default/icons/down-black.svg
 %%DATADIR%%/qmlthemes/default/icons/down.svg
+%%DATADIR%%/qmlthemes/default/icons/edit-black.svg
 %%DATADIR%%/qmlthemes/default/icons/edit.svg
+%%DATADIR%%/qmlthemes/default/icons/erase-black.svg
 %%DATADIR%%/qmlthemes/default/icons/erase.svg
 %%DATADIR%%/qmlthemes/default/icons/expansionmarker.svg
 %%DATADIR%%/qmlthemes/default/icons/fileclip-black.svg
@@ -791,17 +806,22 @@ share/icons/hicolor/scalable/apps/krita.svgz
 %%DATADIR%%/qmlthemes/default/icons/filenew.svg
 %%DATADIR%%/qmlthemes/default/icons/fileopen-black.svg
 %%DATADIR%%/qmlthemes/default/icons/fileopen.svg
+%%DATADIR%%/qmlthemes/default/icons/filesave-black.svg
 %%DATADIR%%/qmlthemes/default/icons/filesave.svg
+%%DATADIR%%/qmlthemes/default/icons/filesaveas-black.svg
 %%DATADIR%%/qmlthemes/default/icons/filesaveas.svg
+%%DATADIR%%/qmlthemes/default/icons/fileshare-black.svg
 %%DATADIR%%/qmlthemes/default/icons/fileshare.svg
 %%DATADIR%%/qmlthemes/default/icons/fill-black.svg
 %%DATADIR%%/qmlthemes/default/icons/fill.svg
 %%DATADIR%%/qmlthemes/default/icons/filter_delete-black.svg
 %%DATADIR%%/qmlthemes/default/icons/filter_load-black.svg
 %%DATADIR%%/qmlthemes/default/icons/filter_save-black.svg
+%%DATADIR%%/qmlthemes/default/icons/forward-black.svg
 %%DATADIR%%/qmlthemes/default/icons/forward.svg
 %%DATADIR%%/qmlthemes/default/icons/gradient-black.svg
 %%DATADIR%%/qmlthemes/default/icons/gradient.svg
+%%DATADIR%%/qmlthemes/default/icons/help-black.svg
 %%DATADIR%%/qmlthemes/default/icons/help.svg
 %%DATADIR%%/qmlthemes/default/icons/krita_sketch.svg
 %%DATADIR%%/qmlthemes/default/icons/layer_clear.svg
@@ -817,6 +837,7 @@ share/icons/hicolor/scalable/apps/krita.svgz
 %%DATADIR%%/qmlthemes/default/icons/locked_off-small.svg
 %%DATADIR%%/qmlthemes/default/icons/locked_on-black.svg
 %%DATADIR%%/qmlthemes/default/icons/locked_on-small.svg
+%%DATADIR%%/qmlthemes/default/icons/minimize-black.svg
 %%DATADIR%%/qmlthemes/default/icons/minimize.svg
 %%DATADIR%%/qmlthemes/default/icons/mirror_c-black.svg
 %%DATADIR%%/qmlthemes/default/icons/mirror_h-black.svg
@@ -829,25 +850,36 @@ share/icons/hicolor/scalable/apps/krita.svgz
 %%DATADIR%%/qmlthemes/default/icons/palette-black.svg
 %%DATADIR%%/qmlthemes/default/icons/palette-delete-black.svg
 %%DATADIR%%/qmlthemes/default/icons/palette.svg
+%%DATADIR%%/qmlthemes/default/icons/redo-black.svg
 %%DATADIR%%/qmlthemes/default/icons/redo.svg
 %%DATADIR%%/qmlthemes/default/icons/select-add.svg
 %%DATADIR%%/qmlthemes/default/icons/select-apply.svg
 %%DATADIR%%/qmlthemes/default/icons/select-area.svg
 %%DATADIR%%/qmlthemes/default/icons/select-color.svg
+%%DATADIR%%/qmlthemes/default/icons/select-deselect-black.svg
 %%DATADIR%%/qmlthemes/default/icons/select-deselect.svg
+%%DATADIR%%/qmlthemes/default/icons/select-hide-black.svg
 %%DATADIR%%/qmlthemes/default/icons/select-hide.svg
 %%DATADIR%%/qmlthemes/default/icons/select-intersect.svg
 %%DATADIR%%/qmlthemes/default/icons/select-polygon.svg
 %%DATADIR%%/qmlthemes/default/icons/select-rectangle.svg
 %%DATADIR%%/qmlthemes/default/icons/select-replace.svg
+%%DATADIR%%/qmlthemes/default/icons/select-reselect-black.svg
 %%DATADIR%%/qmlthemes/default/icons/select-reselect.svg
+%%DATADIR%%/qmlthemes/default/icons/select-show-black.svg
 %%DATADIR%%/qmlthemes/default/icons/select-show.svg
 %%DATADIR%%/qmlthemes/default/icons/select-sub.svg
+%%DATADIR%%/qmlthemes/default/icons/settings-black.svg
 %%DATADIR%%/qmlthemes/default/icons/settings.svg
+%%DATADIR%%/qmlthemes/default/icons/square-black.svg
+%%DATADIR%%/qmlthemes/default/icons/square.svg
+%%DATADIR%%/qmlthemes/default/icons/switch-black.svg
 %%DATADIR%%/qmlthemes/default/icons/switch.svg
 %%DATADIR%%/qmlthemes/default/icons/transform-black.svg
 %%DATADIR%%/qmlthemes/default/icons/transform.svg
+%%DATADIR%%/qmlthemes/default/icons/undo-black.svg
 %%DATADIR%%/qmlthemes/default/icons/undo.svg
+%%DATADIR%%/qmlthemes/default/icons/up-black.svg
 %%DATADIR%%/qmlthemes/default/icons/up.svg
 %%DATADIR%%/qmlthemes/default/icons/visible_off-black.svg
 %%DATADIR%%/qmlthemes/default/icons/visible_off-small.svg
@@ -855,6 +887,7 @@ share/icons/hicolor/scalable/apps/krita.svgz
 %%DATADIR%%/qmlthemes/default/icons/visible_on-black.svg
 %%DATADIR%%/qmlthemes/default/icons/visible_on-small.svg
 %%DATADIR%%/qmlthemes/default/icons/visible_on.svg
+%%DATADIR%%/qmlthemes/default/icons/web-black.svg
 %%DATADIR%%/qmlthemes/default/icons/web.svg
 %%DATADIR%%/qmlthemes/default/images/busyindicator.png
 %%DATADIR%%/qmlthemes/default/images/divider.png
@@ -864,6 +897,7 @@ share/icons/hicolor/scalable/apps/krita.svgz
 %%DATADIR%%/qmlthemes/default/images/shadow.png
 %%DATADIR%%/qmlthemes/default/sizes.js
 %%DATADIR%%/qmlthemes/default/theme.qml
+%%OPENEXR%%%%DATADIR%%/seexpr_scripts/Disney_noisecolor2.kse
 %%DATADIR%%/shortcuts/krita_default.shortcuts
 %%DATADIR%%/shortcuts/paint_tool_sai_compatible.shortcuts
 %%DATADIR%%/shortcuts/photoshop_compatible.shortcuts
@@ -946,18 +980,17 @@ share/icons/hicolor/scalable/apps/krita.svgz
 %%DATADIR%%/workspaces/Default.kws
 %%DATADIR%%/workspaces/Minimal.kws
 %%DATADIR%%/workspaces/Small_Vector.kws
+%%DATADIR%%/workspaces/Storyboarding.kws
 %%DATADIR%%/workspaces/VFX_Paint.kws
 share/kritaplugins/buginfo.xmlgui
 share/kritaplugins/clonesarray.xmlgui
 share/kritaplugins/colorrange.xmlgui
 share/kritaplugins/colorspaceconversion.xmlgui
+share/kritaplugins/dbexplorer.xmlgui
 share/kritaplugins/imageseparate.xmlgui
-share/kritaplugins/imagesize.xmlgui
 share/kritaplugins/imagesplit.xmlgui
 share/kritaplugins/layersplit.xmlgui
 share/kritaplugins/metadataeditor.xmlgui
-share/kritaplugins/metadataeditor/dublincore.xmlgui
-share/kritaplugins/metadataeditor/exif.xmlgui
 share/kritaplugins/modify_selection.xmlgui
 share/kritaplugins/offsetimage.xmlgui
 share/kritaplugins/resourcemanager.xmlgui
@@ -1034,10 +1067,8 @@ share/locale/uz/LC_MESSAGES/krita.mo
 share/locale/uz@cyrillic/LC_MESSAGES/krita.mo
 share/locale/vi/LC_MESSAGES/krita.mo
 share/locale/wa/LC_MESSAGES/krita.mo
+share/locale/x-test/LC_MESSAGES/krita.mo
 share/locale/xh/LC_MESSAGES/krita.mo
 share/locale/zh_CN/LC_MESSAGES/krita.mo
 share/locale/zh_TW/LC_MESSAGES/krita.mo
 share/metainfo/org.kde.krita.appdata.xml
-lib/kritaplugins/kritaheifexport.so
-lib/kritaplugins/kritaheifimport.so
-share/applications/krita_heif.desktop