Update drawpile to 2.3.0

graphics/drawpile/Makefile

@@ -1,43 +1,41 @@
 COMMENT =	collaborative drawing program
-DISTNAME =	drawpile-2.1.20
+
+V =		2.3.0
+DISTNAME =	drawpile-${V}
+
 CATEGORIES =	graphics x11
-REVISION =	2
+
+DIST_TUPLE +=	github drawpile Drawpile ${V} .
 
 HOMEPAGE =	https://drawpile.net/
 
-# Override kf5.port.mk
-EXTRACT_SUFX =	.tar.gz
-
 # GPLv3+
 PERMIT_PACKAGE =	Yes
 
-WANTLIB += ${COMPILER_LIBCXX} KF5Archive KF5DNSSD Qt5Core Qt5DBus
-WANTLIB += Qt5Gui Qt5Multimedia Qt5Network Qt5Sql Qt5Svg Qt5Widgets
-WANTLIB += c gif m microhttpd miniupnpc qt5keychain sodium vpx
+WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6DBus Qt6Gui Qt6Network
+WANTLIB += Qt6OpenGL Qt6OpenGLWidgets Qt6Svg Qt6WebSockets Qt6Widgets
+WANTLIB += Qt6Xml avcodec avfilter avformat avutil c m qt6keychain
+WANTLIB += sharpyuv sodium swscale webp webpdemux webpmux z zip
+WANTLIB += zstd
 
-SITES =		https://drawpile.net/files/src/
+MODULES =	devel/kf6
 
-MODULES =	devel/kf5
-
-LIB_DEPENDS =	devel/kf5/karchive \
-		devel/kf5/kdnssd \
-		graphics/giflib \
-		multimedia/libvpx \
-		net/miniupnp/miniupnpc \
+LIB_DEPENDS =	archivers/libzip \
+		archivers/zstd \
+		graphics/ffmpeg \
+		graphics/libwebp \
 		security/libsodium \
-		security/qtkeychain \
-		www/libmicrohttpd \
-		x11/qt5/qtmultimedia \
-		x11/qt5/qtsvg
+		security/qtkeychain,qt6 \
+		x11/qt6/qtsvg \
+		x11/qt6/qtwebsockets
 
 RUN_DEPENDS =	devel/desktop-file-utils \
 		misc/shared-mime-info \
 		x11/gtk+4,-guic
 
+WRKDIST =	${WRKDIR}/Drawpile-${V}
 CXXFLAGS +=	-I${LOCALBASE}/include
 
-MODCMAKE_POLICY_VERSION_OVERRIDE = Yes
-
 NO_TEST =	Yes
 
 .include <bsd.port.mk>

graphics/drawpile/distinfo

@@ -1,2 +1,2 @@
-SHA256 (drawpile-2.1.20.tar.gz) = ovRei3SChUKI63t/nbCWHHnwEpq5IhYoD9uURX4ND6k=
-SIZE (drawpile-2.1.20.tar.gz) = 2631090
+SHA256 (drawpile-Drawpile-2.3.0.tar.gz) = 0J0+7wCxUAQYRwCBfRtmIKzEz9BzitiXdoDB4FvC6n0=
+SIZE (drawpile-Drawpile-2.3.0.tar.gz) = 10842390

graphics/drawpile/patches/patch-CMakeLists_txt

@@ -1,9 +0,0 @@
-Index: CMakeLists.txt
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required( VERSION 2.8.12 )
-+cmake_minimum_required( VERSION 3.16 )
- 
- project ( drawpile C CXX )
- 

graphics/drawpile/patches/patch-cmake_DrawdanceCompilerOptions_cmake

@@ -0,0 +1,11 @@
+Index: cmake/DrawdanceCompilerOptions.cmake
+--- cmake/DrawdanceCompilerOptions.cmake.orig
++++ cmake/DrawdanceCompilerOptions.cmake
+@@ -44,7 +44,4 @@ else()
+         $<$<COMPILE_LANGUAGE:CXX>:-fno-exceptions>
+         $<$<COMPILE_LANGUAGE:C>:-Wstrict-prototypes>
+     )
+-	if(UNIX AND NOT APPLE)
+-		add_compile_definitions(_XOPEN_SOURCE=600)
+-	endif()
+ endif()

graphics/drawpile/patches/patch-doc_CMakeLists_txt

@@ -1,13 +0,0 @@
-Install manual page to the correct location.
-
-Index: doc/CMakeLists.txt
---- doc/CMakeLists.txt.orig
-+++ doc/CMakeLists.txt
-@@ -20,6 +20,6 @@ if (UNIX AND NOT APPLE)
- 		)
- 	INSTALL (
- 		FILES ${man1}
--		DESTINATION "share/man/man1"
-+		DESTINATION "man/man1"
- 		)
- endif ()

graphics/drawpile/patches/patch-src_cmake-config_config_h_in

@@ -0,0 +1,14 @@
+Index: src/cmake-config/config.h.in
+--- src/cmake-config/config.h.in.orig
++++ src/cmake-config/config.h.in
+@@ -33,8 +33,8 @@ namespace file_group {
+ 
+ namespace proto {
+ constexpr int server() { return @DRAWPILE_PROTO_SERVER_VERSION@; }
+-constexpr int major() { return @DRAWPILE_PROTO_MAJOR_VERSION@; }
+-constexpr int minor() { return @DRAWPILE_PROTO_MINOR_VERSION@; }
++constexpr int _major() { return @DRAWPILE_PROTO_MAJOR_VERSION@; }
++constexpr int _minor() { return @DRAWPILE_PROTO_MINOR_VERSION@; }
+ constexpr int port() { return @DRAWPILE_PROTO_DEFAULT_PORT@; }
+ } // namespace proto
+ 

graphics/drawpile/patches/patch-src_desktop_bundled_miniaudio_CMakeLists_txt

@@ -0,0 +1,10 @@
+Index: src/desktop/bundled/miniaudio/CMakeLists.txt
+--- src/desktop/bundled/miniaudio/CMakeLists.txt.orig
++++ src/desktop/bundled/miniaudio/CMakeLists.txt
+@@ -16,5 +16,5 @@ target_compile_definitions(miniaudio PUBLIC
+ if(APPLE)
+     target_link_options(miniaudio PUBLIC -lpthread -lm)
+ elseif(UNIX AND NOT ANDROID AND NOT HAIKU AND NOT EMSCRIPTEN)
+-    target_link_libraries(miniaudio PUBLIC -latomic -ldl -lpthread -lm)
++    target_link_libraries(miniaudio PUBLIC -pthread -lm)
+ endif()

graphics/drawpile/patches/patch-src_desktop_widgets_tablettest_cpp

@@ -0,0 +1,21 @@
+Index: src/desktop/widgets/tablettest.cpp
+--- src/desktop/widgets/tablettest.cpp.orig
++++ src/desktop/widgets/tablettest.cpp
+@@ -66,7 +66,7 @@ void TabletTester::mouseMoveEvent(QMouseEvent *e)
+ 	emit eventReport(QString("Mouse move X=%1 Y=%2 B=%3")
+ 						 .arg(mousePos.x())
+ 						 .arg(mousePos.y())
+-						 .arg(e->buttons()));
++						 .arg(static_cast<int>(e->buttons())));
+ 	m_mousePath << e->pos();
+ 	update();
+ }
+@@ -118,7 +118,7 @@ void TabletTester::tabletEvent(QTabletEvent *e)
+ 	msg += QString(" X=%1 Y=%2 B=%3 P=%4% XT=%5° YT=%6° R=%7° T=%8 %9")
+ 			   .arg(posF.x(), 0, 'f', 2)
+ 			   .arg(posF.y(), 0, 'f', 2)
+-			   .arg(e->buttons())
++			   .arg(static_cast<int>(e->buttons()))
+ 			   .arg(e->pressure() * 100, 0, 'f', 1)
+ 			   .arg(e->xTilt())
+ 			   .arg(e->yTilt())

graphics/drawpile/patches/patch-src_drawdance_bundled_psd_sdk_PsdMallocAllocator_cpp

@@ -0,0 +1,30 @@
+Index: src/drawdance/bundled/psd_sdk/PsdMallocAllocator.cpp
+--- src/drawdance/bundled/psd_sdk/PsdMallocAllocator.cpp.orig
++++ src/drawdance/bundled/psd_sdk/PsdMallocAllocator.cpp
+@@ -4,7 +4,7 @@
+ #include "PsdPch.h"
+ #include "PsdMallocAllocator.h"
+ 
+-#if defined(__APPLE__)
++#if defined(__APPLE__) || defined(__OpenBSD__)
+ #include <stdlib.h>
+ #include <errno.h>
+ #else
+@@ -18,7 +18,7 @@ PSD_NAMESPACE_BEGIN
+ // ---------------------------------------------------------------------------------------------------------------------
+ void* MallocAllocator::DoAllocate(size_t size, size_t alignment)
+ {
+-#if defined(__APPLE__)
++#if defined(__APPLE__) || defined(__OpenBSD__)
+     void *m = 0;
+     size_t minAlignment = sizeof(void *);
+     while (alignment > minAlignment) {
+@@ -38,7 +38,7 @@ void* MallocAllocator::DoAllocate(size_t size, size_t 
+ // ---------------------------------------------------------------------------------------------------------------------
+ void MallocAllocator::DoFree(void* ptr)
+ {
+-#if defined(__APPLE__) || defined(__GNUG__)
++#if defined(__APPLE__) || defined(__GNUG__) || defined(__OpenBSD__)
+ 	free(ptr);
+ #else
+ 	_aligned_free(ptr);

graphics/drawpile/patches/patch-src_drawdance_libcommon_dpcommon_common_h

@@ -0,0 +1,12 @@
+Index: src/drawdance/libcommon/dpcommon/common.h
+--- src/drawdance/libcommon/dpcommon/common.h.orig
++++ src/drawdance/libcommon/dpcommon/common.h
+@@ -42,6 +42,8 @@
+ #        define DP_PLATFORM "windows"
+ #    elif defined(__APPLE__)
+ #        define DP_PLATFORM "darwin"
++#    elif defined(__OpenBSD__)
++#        define DP_PLATFORM "openbsd"
+ #    elif defined(__linux__)
+ #        define DP_PLATFORM "linux"
+ #    elif defined(__HAIKU__)

graphics/drawpile/patches/patch-src_drawdance_libimpex_dpimpex_save_c

@@ -0,0 +1,12 @@
+Index: src/drawdance/libimpex/dpimpex/save.c
+--- src/drawdance/libimpex/dpimpex/save.c.orig
++++ src/drawdance/libimpex/dpimpex/save.c
+@@ -1124,7 +1124,7 @@ DP_SaveResult DP_save(DP_CanvasState *cs, DP_DrawConte
+ #    define PREFERRED_PATH_SEPARATOR "\\"
+ #    define POSSIBLE_PATH_SEPARATORS "\\/"
+ #elif defined(__EMSCRIPTEN__) || defined(__APPLE__) || defined(__linux__) \
+-    || defined(__HAIKU__)
++    || defined(__HAIKU__) || defined(__OpenBSD__)
+ #    define PREFERRED_PATH_SEPARATOR "/"
+ #    define POSSIBLE_PATH_SEPARATORS "/"
+ #else

graphics/drawpile/patches/patch-src_thinsrv_headless_headless_cpp

@@ -0,0 +1,14 @@
+Index: src/thinsrv/headless/headless.cpp
+--- src/thinsrv/headless/headless.cpp.orig
++++ src/thinsrv/headless/headless.cpp
+@@ -31,8 +31,8 @@ void printVersion()
+ {
+ 	printf("drawpile-srv %s\n", cmake_config::version());
+ 	printf(
+-		"Protocol version: %d.%d\n", cmake_config::proto::major(),
+-		cmake_config::proto::minor());
++		"Protocol version: %d.%d\n", cmake_config::proto::_major(),
++		cmake_config::proto::_minor());
+ 	printf(
+ 		"Qt version: %s (compiled against %s)\n", qVersion(), QT_VERSION_STR);
+ 	printf(

graphics/drawpile/pkg/PLIST

@@ -1,57 +1,96 @@
 @bin bin/drawpile
-@comment @bin bin/drawpile-2.1.20
-@bin bin/drawpile-srv
-@man man/man1/drawpile-srv.1
 share/applications/net.drawpile.drawpile.desktop
-share/doc/drawpile/
-share/doc/drawpile/COPYING
-share/doc/drawpile/ChangeLog
-share/doc/drawpile/README.md
-share/doc/drawpile/logins.md
-share/doc/drawpile/messages.md
-share/doc/drawpile/openraster.txt
-share/doc/drawpile/protocol.md
-share/doc/drawpile/textloader.md
 share/drawpile/
 share/drawpile/drawpile/
+share/drawpile/drawpile/blueapatite.colors
+share/drawpile/drawpile/brushes/
+share/drawpile/drawpile/brushes/0001-2_3_0.zpresets
+share/drawpile/drawpile/gamutmasks/
+share/drawpile/drawpile/gamutmasks/atmospherewithaccent.svg
+share/drawpile/drawpile/gamutmasks/atmospherictriad.svg
+share/drawpile/drawpile/gamutmasks/complementary.svg
+share/drawpile/drawpile/gamutmasks/dominanthuewithaccent.svg
+share/drawpile/drawpile/gamutmasks/shiftedtriad.svg
+share/drawpile/drawpile/gamutmasks/split.svg
+share/drawpile/drawpile/gamutmasks/splitcomplementary.svg
+share/drawpile/drawpile/gamutmasks/tetradic.svg
+share/drawpile/drawpile/hotdogstand.colors
 share/drawpile/drawpile/i18n/
-share/drawpile/drawpile/i18n/drawpile_cs.qm
-share/drawpile/drawpile/i18n/drawpile_de.qm
-share/drawpile/drawpile/i18n/drawpile_fi.qm
-share/drawpile/drawpile/i18n/drawpile_fr.qm
-share/drawpile/drawpile/i18n/drawpile_it.qm
-share/drawpile/drawpile/i18n/drawpile_ja.qm
-share/drawpile/drawpile/i18n/drawpile_pt.qm
-share/drawpile/drawpile/i18n/drawpile_ru.qm
-share/drawpile/drawpile/i18n/drawpile_uk.qm
-share/drawpile/drawpile/i18n/drawpile_vi.qm
-share/drawpile/drawpile/i18n/drawpile_zh.qm
+share/drawpile/drawpile/i18n/all_ar_EG.qm
+share/drawpile/drawpile/i18n/all_ca_ES.qm
+share/drawpile/drawpile/i18n/all_cs_CZ.qm
+share/drawpile/drawpile/i18n/all_de_DE.qm
+share/drawpile/drawpile/i18n/all_en_US.qm
+share/drawpile/drawpile/i18n/all_eo_XZ.qm
+share/drawpile/drawpile/i18n/all_es_CO.qm
+share/drawpile/drawpile/i18n/all_fi_FI.qm
+share/drawpile/drawpile/i18n/all_fr_FR.qm
+share/drawpile/drawpile/i18n/all_id_ID.qm
+share/drawpile/drawpile/i18n/all_it_IT.qm
+share/drawpile/drawpile/i18n/all_ja_JP.qm
+share/drawpile/drawpile/i18n/all_ko_KR.qm
+share/drawpile/drawpile/i18n/all_pl_PL.qm
+share/drawpile/drawpile/i18n/all_pt_BR.qm
+share/drawpile/drawpile/i18n/all_pt_PT.qm
+share/drawpile/drawpile/i18n/all_ru_RU.qm
+share/drawpile/drawpile/i18n/all_th_TH.qm
+share/drawpile/drawpile/i18n/all_tr_TR.qm
+share/drawpile/drawpile/i18n/all_uk_UA.qm
+share/drawpile/drawpile/i18n/all_vi_VN.qm
+share/drawpile/drawpile/i18n/all_zh_CN.qm
+share/drawpile/drawpile/indigo.colors
+share/drawpile/drawpile/initialbrushpresets.db
+share/drawpile/drawpile/kritabright.colors
+share/drawpile/drawpile/kritadark.colors
+share/drawpile/drawpile/kritadarker.colors
 share/drawpile/drawpile/nightmode.colors
+share/drawpile/drawpile/oceandeep.colors
 share/drawpile/drawpile/palettes/
 share/drawpile/drawpile/palettes/Breeze.gpl
 share/drawpile/drawpile/palettes/DB32.gpl
-share/drawpile/drawpile/palettes/Grayscale.gpl
-share/drawpile/drawpile/palettes/Ponies.gpl
 share/drawpile/drawpile/palettes/Sketching.gpl
 share/drawpile/drawpile/palettes/Tango.gpl
+share/drawpile/drawpile/pooltable.colors
+share/drawpile/drawpile/rosequartz.colors
+share/drawpile/drawpile/rust.colors
 share/drawpile/drawpile/sounds/
-share/drawpile/drawpile/sounds/chat.wav
-share/drawpile/drawpile/sounds/lock.wav
-share/drawpile/drawpile/sounds/login.wav
-share/drawpile/drawpile/sounds/logout.wav
-share/drawpile/drawpile/sounds/marker.wav
+share/drawpile/drawpile/sounds/notif-chat.wav
+share/drawpile/drawpile/sounds/notif-chat.wav.license
+share/drawpile/drawpile/sounds/notif-disconnect.wav
+share/drawpile/drawpile/sounds/notif-disconnect.wav.license
+share/drawpile/drawpile/sounds/notif-lock.wav
+share/drawpile/drawpile/sounds/notif-lock.wav.license
+share/drawpile/drawpile/sounds/notif-login.wav
+share/drawpile/drawpile/sounds/notif-login.wav.license
+share/drawpile/drawpile/sounds/notif-logout.wav
+share/drawpile/drawpile/sounds/notif-logout.wav.license
+share/drawpile/drawpile/sounds/notif-private-chat.wav
+share/drawpile/drawpile/sounds/notif-private-chat.wav.license
+share/drawpile/drawpile/sounds/notif-unlock.wav
+share/drawpile/drawpile/sounds/notif-unlock.wav.license
 share/drawpile/drawpile/sounds/sounds.txt
-share/drawpile/drawpile/sounds/unlock.wav
 share/drawpile/drawpile/theme/
 share/drawpile/drawpile/theme/dark/
 share/drawpile/drawpile/theme/dark/application-exit.svg
 share/drawpile/drawpile/theme/dark/application-menu.svg
+share/drawpile/drawpile/theme/dark/arrow-down-double.svg
+share/drawpile/drawpile/theme/dark/arrow-down.svg
+share/drawpile/drawpile/theme/dark/arrow-up.svg
+share/drawpile/drawpile/theme/dark/audio-volume-high.svg
+share/drawpile/drawpile/theme/dark/cards-block.svg
+share/drawpile/drawpile/theme/dark/checkbox.svg
 share/drawpile/drawpile/theme/dark/color-picker.svg
 share/drawpile/drawpile/theme/dark/configure.svg
 share/drawpile/drawpile/theme/dark/cursor-arrow.svg
+share/drawpile/drawpile/theme/dark/dialog-information.svg
+share/drawpile/drawpile/theme/dark/dialog-warning.svg
+share/drawpile/drawpile/theme/dark/document-edit.svg
 share/drawpile/drawpile/theme/dark/document-export.svg
+share/drawpile/drawpile/theme/dark/document-import.svg
 share/drawpile/drawpile/theme/dark/document-new.svg
+share/drawpile/drawpile/theme/dark/document-open-recent.svg
 share/drawpile/drawpile/theme/dark/document-open.svg
+share/drawpile/drawpile/theme/dark/document-save-all.svg
 share/drawpile/drawpile/theme/dark/document-save-as.svg
 share/drawpile/drawpile/theme/dark/document-save.svg
 share/drawpile/drawpile/theme/dark/dontknow.svg
@@ -63,24 +102,91 @@ share/drawpile/drawpile/theme/dark/draw-freehand.svg
 share/drawpile/drawpile/theme/dark/draw-line.svg
 share/drawpile/drawpile/theme/dark/draw-rectangle.svg
 share/drawpile/drawpile/theme/dark/draw-text.svg
+share/drawpile/drawpile/theme/dark/drawpile_alpha_disabled.svg
+share/drawpile/drawpile/theme/dark/drawpile_alpha_locked.svg
+share/drawpile/drawpile/theme/dark/drawpile_alpha_off.svg
+share/drawpile/drawpile/theme/dark/drawpile_alpha_on.svg
+share/drawpile/drawpile/theme/dark/drawpile_alpha_unlocked.svg
+share/drawpile/drawpile/theme/dark/drawpile_antioverflow.svg
+share/drawpile/drawpile/theme/dark/drawpile_ban.svg
+share/drawpile/drawpile/theme/dark/drawpile_brusherase.svg
+share/drawpile/drawpile/theme/dark/drawpile_brushlock.svg
+share/drawpile/drawpile/theme/dark/drawpile_center.svg
 share/drawpile/drawpile/theme/dark/drawpile_chat.svg
+share/drawpile/drawpile/theme/dark/drawpile_chat_send.svg
+share/drawpile/drawpile/theme/dark/drawpile_close.svg
+share/drawpile/drawpile/theme/dark/drawpile_colorcircle.svg
+share/drawpile/drawpile/theme/dark/drawpile_colorpalette.svg
+share/drawpile/drawpile/theme/dark/drawpile_colorsliders.svg
+share/drawpile/drawpile/theme/dark/drawpile_colorwheel.svg
+share/drawpile/drawpile/theme/dark/drawpile_crop.svg
+share/drawpile/drawpile/theme/dark/drawpile_ellipsis_vertical.svg
+share/drawpile/drawpile/theme/dark/drawpile_expanddown.svg
+share/drawpile/drawpile/theme/dark/drawpile_expandleft.svg
+share/drawpile/drawpile/theme/dark/drawpile_expandright.svg
+share/drawpile/drawpile/theme/dark/drawpile_expandup.svg
+share/drawpile/drawpile/theme/dark/drawpile_flip.svg
+share/drawpile/drawpile/theme/dark/drawpile_folder_alpha_off.svg
+share/drawpile/drawpile/theme/dark/drawpile_folder_alpha_on.svg
+share/drawpile/drawpile/theme/dark/drawpile_folderhidden.svg
+share/drawpile/drawpile/theme/dark/drawpile_gradient.svg
+share/drawpile/drawpile/theme/dark/drawpile_gradientalphatofg.svg
+share/drawpile/drawpile/theme/dark/drawpile_gradientbgtofg.svg
+share/drawpile/drawpile/theme/dark/drawpile_gradientfgtoalpha.svg
+share/drawpile/drawpile/theme/dark/drawpile_gradientfgtobg.svg
 share/drawpile/drawpile/theme/dark/drawpile_incremental_mode.svg
+share/drawpile/drawpile/theme/dark/drawpile_indirect_mode.svg
+share/drawpile/drawpile/theme/dark/drawpile_lassofill.svg
+share/drawpile/drawpile/theme/dark/drawpile_layer_alpha_off.svg
+share/drawpile/drawpile/theme/dark/drawpile_layer_alpha_on.svg
+share/drawpile/drawpile/theme/dark/drawpile_layeralpha_on.svg
+share/drawpile/drawpile/theme/dark/drawpile_magicwand.svg
+share/drawpile/drawpile/theme/dark/drawpile_mirror.svg
+share/drawpile/drawpile/theme/dark/drawpile_mypaint.svg
+share/drawpile/drawpile/theme/dark/drawpile_pixelperfect.svg
 share/drawpile/drawpile/theme/dark/drawpile_pixelround.svg
+share/drawpile/drawpile/theme/dark/drawpile_presetchanged.svg
+share/drawpile/drawpile/theme/dark/drawpile_rotate_left.svg
+share/drawpile/drawpile/theme/dark/drawpile_rotate_right.svg
 share/drawpile/drawpile/theme/dark/drawpile_round.svg
+share/drawpile/drawpile/theme/dark/drawpile_security.svg
+share/drawpile/drawpile/theme/dark/drawpile_selection_exclude.svg
+share/drawpile/drawpile/theme/dark/drawpile_selection_intersect.svg
+share/drawpile/drawpile/theme/dark/drawpile_selection_replace.svg
+share/drawpile/drawpile/theme/dark/drawpile_selection_unite.svg
+share/drawpile/drawpile/theme/dark/drawpile_soft_mode.svg
 share/drawpile/drawpile/theme/dark/drawpile_square.svg
+share/drawpile/drawpile/theme/dark/drawpile_transform.svg
+share/drawpile/drawpile/theme/dark/drawpile_wash_mode.svg
+share/drawpile/drawpile/theme/dark/edit-comment.svg
 share/drawpile/drawpile/theme/dark/edit-copy.svg
 share/drawpile/drawpile/theme/dark/edit-cut.svg
 share/drawpile/drawpile/theme/dark/edit-delete.svg
+share/drawpile/drawpile/theme/dark/edit-download.svg
+share/drawpile/drawpile/theme/dark/edit-find.svg
+share/drawpile/drawpile/theme/dark/edit-image.svg
 share/drawpile/drawpile/theme/dark/edit-paste.svg
 share/drawpile/drawpile/theme/dark/edit-redo.svg
+share/drawpile/drawpile/theme/dark/edit-rename.svg
+share/drawpile/drawpile/theme/dark/edit-select-all.svg
+share/drawpile/drawpile/theme/dark/edit-select-invert.svg
 share/drawpile/drawpile/theme/dark/edit-select-lasso.svg
+share/drawpile/drawpile/theme/dark/edit-select-none.svg
+share/drawpile/drawpile/theme/dark/edit-table-delete-column.svg
+share/drawpile/drawpile/theme/dark/edit-table-insert-column-right.svg
 share/drawpile/drawpile/theme/dark/edit-undo.svg
+share/drawpile/drawpile/theme/dark/fa_discord.svg
+share/drawpile/drawpile/theme/dark/fa_github.svg
 share/drawpile/drawpile/theme/dark/fill-color.svg
 share/drawpile/drawpile/theme/dark/flag-blue.svg
 share/drawpile/drawpile/theme/dark/flag-red.svg
+share/drawpile/drawpile/theme/dark/flag.svg
+share/drawpile/drawpile/theme/dark/folder-new.svg
+share/drawpile/drawpile/theme/dark/folder.svg
 share/drawpile/drawpile/theme/dark/format-align-vertical-bottom.svg
 share/drawpile/drawpile/theme/dark/format-align-vertical-center.svg
 share/drawpile/drawpile/theme/dark/format-align-vertical-top.svg
+share/drawpile/drawpile/theme/dark/format-fill-color.svg
 share/drawpile/drawpile/theme/dark/format-justify-center.svg
 share/drawpile/drawpile/theme/dark/format-justify-fill.svg
 share/drawpile/drawpile/theme/dark/format-justify-left.svg
@@ -89,34 +195,90 @@ share/drawpile/drawpile/theme/dark/format-text-bold.svg
 share/drawpile/drawpile/theme/dark/format-text-italic.svg
 share/drawpile/drawpile/theme/dark/format-text-strikethrough.svg
 share/drawpile/drawpile/theme/dark/format-text-underline.svg
+share/drawpile/drawpile/theme/dark/globe.svg
+share/drawpile/drawpile/theme/dark/go-first.svg
 share/drawpile/drawpile/theme/dark/go-jump.svg
+share/drawpile/drawpile/theme/dark/go-next-skip.svg
+share/drawpile/drawpile/theme/dark/go-next.svg
+share/drawpile/drawpile/theme/dark/go-previous-skip.svg
+share/drawpile/drawpile/theme/dark/hand.svg
+share/drawpile/drawpile/theme/dark/help-contents.svg
 share/drawpile/drawpile/theme/dark/help-whatsthis.svg
+share/drawpile/drawpile/theme/dark/im-ban-kick-user.svg
 share/drawpile/drawpile/theme/dark/im-ban-user.svg
 share/drawpile/drawpile/theme/dark/im-kick-user.svg
 share/drawpile/drawpile/theme/dark/im-user.svg
+share/drawpile/drawpile/theme/dark/index.theme
+share/drawpile/drawpile/theme/dark/input-keyboard.svg
+share/drawpile/drawpile/theme/dark/input-mouse.svg
+share/drawpile/drawpile/theme/dark/input-tablet.svg
+share/drawpile/drawpile/theme/dark/input-touchscreen.svg
+share/drawpile/drawpile/theme/dark/insert-math-expression.svg
 share/drawpile/drawpile/theme/dark/irc-operator.svg
 share/drawpile/drawpile/theme/dark/irc-unvoice.svg
+share/drawpile/drawpile/theme/dark/kdenlive-show-video.svg
+share/drawpile/drawpile/theme/dark/keyframe-add.svg
+share/drawpile/drawpile/theme/dark/keyframe-disable.svg
+share/drawpile/drawpile/theme/dark/keyframe-next.svg
+share/drawpile/drawpile/theme/dark/keyframe-previous.svg
+share/drawpile/drawpile/theme/dark/keyframe-remove.svg
+share/drawpile/drawpile/theme/dark/keyframe.svg
 share/drawpile/drawpile/theme/dark/layer-visible-off.svg
 share/drawpile/drawpile/theme/dark/layer-visible-on.svg
 share/drawpile/drawpile/theme/dark/list-add.svg
 share/drawpile/drawpile/theme/dark/list-remove.svg
+share/drawpile/drawpile/theme/dark/love.svg
 share/drawpile/drawpile/theme/dark/media-playback-pause.svg
 share/drawpile/drawpile/theme/dark/media-playback-start.svg
+share/drawpile/drawpile/theme/dark/media-playback-stop.svg
 share/drawpile/drawpile/theme/dark/media-record.svg
 share/drawpile/drawpile/theme/dark/media-seek-backward.svg
 share/drawpile/drawpile/theme/dark/media-seek-forward.svg
 share/drawpile/drawpile/theme/dark/media-skip-backward.svg
 share/drawpile/drawpile/theme/dark/media-skip-forward.svg
-share/drawpile/drawpile/theme/dark/object-flip-horizontal.svg
-share/drawpile/drawpile/theme/dark/object-flip-vertical.svg
+share/drawpile/drawpile/theme/dark/monitor.svg
+share/drawpile/drawpile/theme/dark/network-connect.svg
+share/drawpile/drawpile/theme/dark/network-disconnect.svg
+share/drawpile/drawpile/theme/dark/network-modem.svg
+share/drawpile/drawpile/theme/dark/network-server-database.svg
+share/drawpile/drawpile/theme/dark/network-server.svg
+share/drawpile/drawpile/theme/dark/news-subscribe.svg
 share/drawpile/drawpile/theme/dark/object-locked.svg
-share/drawpile/drawpile/theme/dark/object-rotate-left.svg
-share/drawpile/drawpile/theme/dark/object-rotate-right.svg
+share/drawpile/drawpile/theme/dark/object-unlocked.svg
+share/drawpile/drawpile/theme/dark/onion-off.svg
+share/drawpile/drawpile/theme/dark/onion-on.svg
+share/drawpile/drawpile/theme/dark/pathshape.svg
+share/drawpile/drawpile/theme/dark/resource-group-new.svg
 share/drawpile/drawpile/theme/dark/security-high.svg
 share/drawpile/drawpile/theme/dark/security-medium.svg
 share/drawpile/drawpile/theme/dark/select-rectangular.svg
+share/drawpile/drawpile/theme/dark/sidebar-collapse-left.svg
+share/drawpile/drawpile/theme/dark/sidebar-expand-left.svg
+share/drawpile/drawpile/theme/dark/state-error.svg
+share/drawpile/drawpile/theme/dark/state-offline.svg
+share/drawpile/drawpile/theme/dark/state-ok.svg
+share/drawpile/drawpile/theme/dark/state-warning.svg
+share/drawpile/drawpile/theme/dark/tag-delete.svg
+share/drawpile/drawpile/theme/dark/tag.svg
+share/drawpile/drawpile/theme/dark/timeline-use-zone-off.svg
+share/drawpile/drawpile/theme/dark/timeline-use-zone-on.svg
+share/drawpile/drawpile/theme/dark/toolbar-ext-h-drawpile.svg
+share/drawpile/drawpile/theme/dark/toolbar-ext-h-rtl-drawpile.svg
+share/drawpile/drawpile/theme/dark/toolbar-ext-v-drawpile.svg
+share/drawpile/drawpile/theme/dark/tools.svg
+share/drawpile/drawpile/theme/dark/transform-crop-and-resize.svg
 share/drawpile/drawpile/theme/dark/transform-rotate.svg
-share/drawpile/drawpile/theme/dark/window-pin.svg
+share/drawpile/drawpile/theme/dark/trash-empty.svg
+share/drawpile/drawpile/theme/dark/update-none.svg
+share/drawpile/drawpile/theme/dark/user-group-new.svg
+share/drawpile/drawpile/theme/dark/view-hidden.svg
+share/drawpile/drawpile/theme/dark/view-refresh.svg
+share/drawpile/drawpile/theme/dark/view-sort.svg
+share/drawpile/drawpile/theme/dark/view-visible.svg
+share/drawpile/drawpile/theme/dark/window_.svg
+share/drawpile/drawpile/theme/dark/zoom-fit-height.svg
+share/drawpile/drawpile/theme/dark/zoom-fit-none.svg
+share/drawpile/drawpile/theme/dark/zoom-fit-width.svg
 share/drawpile/drawpile/theme/dark/zoom-in.svg
 share/drawpile/drawpile/theme/dark/zoom-original.svg
 share/drawpile/drawpile/theme/dark/zoom-out.svg
@@ -125,12 +287,24 @@ share/drawpile/drawpile/theme/icons.txt
 share/drawpile/drawpile/theme/light/
 share/drawpile/drawpile/theme/light/application-exit.svg
 share/drawpile/drawpile/theme/light/application-menu.svg
+share/drawpile/drawpile/theme/light/arrow-down-double.svg
+share/drawpile/drawpile/theme/light/arrow-down.svg
+share/drawpile/drawpile/theme/light/arrow-up.svg
+share/drawpile/drawpile/theme/light/audio-volume-high.svg
+share/drawpile/drawpile/theme/light/cards-block.svg
+share/drawpile/drawpile/theme/light/checkbox.svg
 share/drawpile/drawpile/theme/light/color-picker.svg
 share/drawpile/drawpile/theme/light/configure.svg
 share/drawpile/drawpile/theme/light/cursor-arrow.svg
+share/drawpile/drawpile/theme/light/dialog-information.svg
+share/drawpile/drawpile/theme/light/dialog-warning.svg
+share/drawpile/drawpile/theme/light/document-edit.svg
 share/drawpile/drawpile/theme/light/document-export.svg
+share/drawpile/drawpile/theme/light/document-import.svg
 share/drawpile/drawpile/theme/light/document-new.svg
+share/drawpile/drawpile/theme/light/document-open-recent.svg
 share/drawpile/drawpile/theme/light/document-open.svg
+share/drawpile/drawpile/theme/light/document-save-all.svg
 share/drawpile/drawpile/theme/light/document-save-as.svg
 share/drawpile/drawpile/theme/light/document-save.svg
 share/drawpile/drawpile/theme/light/dontknow.svg
@@ -142,24 +316,91 @@ share/drawpile/drawpile/theme/light/draw-freehand.svg
 share/drawpile/drawpile/theme/light/draw-line.svg
 share/drawpile/drawpile/theme/light/draw-rectangle.svg
 share/drawpile/drawpile/theme/light/draw-text.svg
+share/drawpile/drawpile/theme/light/drawpile_alpha_disabled.svg
+share/drawpile/drawpile/theme/light/drawpile_alpha_locked.svg
+share/drawpile/drawpile/theme/light/drawpile_alpha_off.svg
+share/drawpile/drawpile/theme/light/drawpile_alpha_on.svg
+share/drawpile/drawpile/theme/light/drawpile_alpha_unlocked.svg
+share/drawpile/drawpile/theme/light/drawpile_antioverflow.svg
+share/drawpile/drawpile/theme/light/drawpile_ban.svg
+share/drawpile/drawpile/theme/light/drawpile_brusherase.svg
+share/drawpile/drawpile/theme/light/drawpile_brushlock.svg
+share/drawpile/drawpile/theme/light/drawpile_center.svg
 share/drawpile/drawpile/theme/light/drawpile_chat.svg
+share/drawpile/drawpile/theme/light/drawpile_chat_send.svg
+share/drawpile/drawpile/theme/light/drawpile_close.svg
+share/drawpile/drawpile/theme/light/drawpile_colorcircle.svg
+share/drawpile/drawpile/theme/light/drawpile_colorpalette.svg
+share/drawpile/drawpile/theme/light/drawpile_colorsliders.svg
+share/drawpile/drawpile/theme/light/drawpile_colorwheel.svg
+share/drawpile/drawpile/theme/light/drawpile_crop.svg
+share/drawpile/drawpile/theme/light/drawpile_ellipsis_vertical.svg
+share/drawpile/drawpile/theme/light/drawpile_expanddown.svg
+share/drawpile/drawpile/theme/light/drawpile_expandleft.svg
+share/drawpile/drawpile/theme/light/drawpile_expandright.svg
+share/drawpile/drawpile/theme/light/drawpile_expandup.svg
+share/drawpile/drawpile/theme/light/drawpile_flip.svg
+share/drawpile/drawpile/theme/light/drawpile_folder_alpha_off.svg
+share/drawpile/drawpile/theme/light/drawpile_folder_alpha_on
+share/drawpile/drawpile/theme/light/drawpile_folder_alpha_on.svg
+share/drawpile/drawpile/theme/light/drawpile_folderhidden.svg
+share/drawpile/drawpile/theme/light/drawpile_gradient.svg
+share/drawpile/drawpile/theme/light/drawpile_gradientalphatofg.svg
+share/drawpile/drawpile/theme/light/drawpile_gradientbgtofg.svg
+share/drawpile/drawpile/theme/light/drawpile_gradientfgtoalpha.svg
+share/drawpile/drawpile/theme/light/drawpile_gradientfgtobg.svg
 share/drawpile/drawpile/theme/light/drawpile_incremental_mode.svg
+share/drawpile/drawpile/theme/light/drawpile_indirect_mode.svg
+share/drawpile/drawpile/theme/light/drawpile_lassofill.svg
+share/drawpile/drawpile/theme/light/drawpile_layer_alpha_off.svg
+share/drawpile/drawpile/theme/light/drawpile_layer_alpha_on.svg
+share/drawpile/drawpile/theme/light/drawpile_magicwand.svg
+share/drawpile/drawpile/theme/light/drawpile_mirror.svg
+share/drawpile/drawpile/theme/light/drawpile_mypaint.svg
+share/drawpile/drawpile/theme/light/drawpile_pixelperfect.svg
 share/drawpile/drawpile/theme/light/drawpile_pixelround.svg
+share/drawpile/drawpile/theme/light/drawpile_presetchanged.svg
+share/drawpile/drawpile/theme/light/drawpile_rotate_left.svg
+share/drawpile/drawpile/theme/light/drawpile_rotate_right.svg
 share/drawpile/drawpile/theme/light/drawpile_round.svg
+share/drawpile/drawpile/theme/light/drawpile_security.svg
+share/drawpile/drawpile/theme/light/drawpile_selection_exclude.svg
+share/drawpile/drawpile/theme/light/drawpile_selection_intersect.svg
+share/drawpile/drawpile/theme/light/drawpile_selection_replace.svg
+share/drawpile/drawpile/theme/light/drawpile_selection_unite.svg
+share/drawpile/drawpile/theme/light/drawpile_soft_mode.svg
 share/drawpile/drawpile/theme/light/drawpile_square.svg
+share/drawpile/drawpile/theme/light/drawpile_transform.svg
+share/drawpile/drawpile/theme/light/drawpile_wash_mode.svg
+share/drawpile/drawpile/theme/light/edit-comment.svg
 share/drawpile/drawpile/theme/light/edit-copy.svg
 share/drawpile/drawpile/theme/light/edit-cut.svg
 share/drawpile/drawpile/theme/light/edit-delete.svg
+share/drawpile/drawpile/theme/light/edit-download.svg
+share/drawpile/drawpile/theme/light/edit-find.svg
+share/drawpile/drawpile/theme/light/edit-image.svg
 share/drawpile/drawpile/theme/light/edit-paste.svg
 share/drawpile/drawpile/theme/light/edit-redo.svg
+share/drawpile/drawpile/theme/light/edit-rename.svg
+share/drawpile/drawpile/theme/light/edit-select-all.svg
+share/drawpile/drawpile/theme/light/edit-select-invert.svg
 share/drawpile/drawpile/theme/light/edit-select-lasso.svg
+share/drawpile/drawpile/theme/light/edit-select-none.svg
+share/drawpile/drawpile/theme/light/edit-table-delete-column.svg
+share/drawpile/drawpile/theme/light/edit-table-insert-column-right.svg
 share/drawpile/drawpile/theme/light/edit-undo.svg
+share/drawpile/drawpile/theme/light/fa_discord.svg
+share/drawpile/drawpile/theme/light/fa_github.svg
 share/drawpile/drawpile/theme/light/fill-color.svg
 share/drawpile/drawpile/theme/light/flag-blue.svg
 share/drawpile/drawpile/theme/light/flag-red.svg
+share/drawpile/drawpile/theme/light/flag.svg
+share/drawpile/drawpile/theme/light/folder-new.svg
+share/drawpile/drawpile/theme/light/folder.svg
 share/drawpile/drawpile/theme/light/format-align-vertical-bottom.svg
 share/drawpile/drawpile/theme/light/format-align-vertical-center.svg
 share/drawpile/drawpile/theme/light/format-align-vertical-top.svg
+share/drawpile/drawpile/theme/light/format-fill-color.svg
 share/drawpile/drawpile/theme/light/format-justify-center.svg
 share/drawpile/drawpile/theme/light/format-justify-fill.svg
 share/drawpile/drawpile/theme/light/format-justify-left.svg
@@ -168,55 +409,107 @@ share/drawpile/drawpile/theme/light/format-text-bold.svg
 share/drawpile/drawpile/theme/light/format-text-italic.svg
 share/drawpile/drawpile/theme/light/format-text-strikethrough.svg
 share/drawpile/drawpile/theme/light/format-text-underline.svg
+share/drawpile/drawpile/theme/light/globe.svg
+share/drawpile/drawpile/theme/light/go-first.svg
 share/drawpile/drawpile/theme/light/go-jump.svg
+share/drawpile/drawpile/theme/light/go-next-skip.svg
+share/drawpile/drawpile/theme/light/go-next.svg
+share/drawpile/drawpile/theme/light/go-previous-skip.svg
+share/drawpile/drawpile/theme/light/hand.svg
+share/drawpile/drawpile/theme/light/help-contents.svg
 share/drawpile/drawpile/theme/light/help-whatsthis.svg
+share/drawpile/drawpile/theme/light/im-ban-kick-user.svg
 share/drawpile/drawpile/theme/light/im-ban-user.svg
 share/drawpile/drawpile/theme/light/im-kick-user.svg
 share/drawpile/drawpile/theme/light/im-user.svg
+share/drawpile/drawpile/theme/light/index.theme
+share/drawpile/drawpile/theme/light/input-keyboard.svg
+share/drawpile/drawpile/theme/light/input-mouse.svg
+share/drawpile/drawpile/theme/light/input-tablet.svg
+share/drawpile/drawpile/theme/light/input-touchscreen.svg
+share/drawpile/drawpile/theme/light/insert-math-expression.svg
 share/drawpile/drawpile/theme/light/irc-operator.svg
 share/drawpile/drawpile/theme/light/irc-unvoice.svg
+share/drawpile/drawpile/theme/light/kdenlive-show-video.svg
+share/drawpile/drawpile/theme/light/keyframe-add.svg
+share/drawpile/drawpile/theme/light/keyframe-disable.svg
+share/drawpile/drawpile/theme/light/keyframe-next.svg
+share/drawpile/drawpile/theme/light/keyframe-previous.svg
+share/drawpile/drawpile/theme/light/keyframe-remove.svg
+share/drawpile/drawpile/theme/light/keyframe.svg
 share/drawpile/drawpile/theme/light/layer-visible-off.svg
 share/drawpile/drawpile/theme/light/layer-visible-on.svg
 share/drawpile/drawpile/theme/light/list-add.svg
 share/drawpile/drawpile/theme/light/list-remove.svg
+share/drawpile/drawpile/theme/light/love.svg
 share/drawpile/drawpile/theme/light/media-playback-pause.svg
 share/drawpile/drawpile/theme/light/media-playback-start.svg
+share/drawpile/drawpile/theme/light/media-playback-stop.svg
 share/drawpile/drawpile/theme/light/media-record.svg
 share/drawpile/drawpile/theme/light/media-seek-backward.svg
 share/drawpile/drawpile/theme/light/media-seek-forward.svg
 share/drawpile/drawpile/theme/light/media-skip-backward.svg
 share/drawpile/drawpile/theme/light/media-skip-forward.svg
-share/drawpile/drawpile/theme/light/object-flip-horizontal.svg
-share/drawpile/drawpile/theme/light/object-flip-vertical.svg
+share/drawpile/drawpile/theme/light/monitor.svg
+share/drawpile/drawpile/theme/light/network-connect.svg
+share/drawpile/drawpile/theme/light/network-disconnect.svg
+share/drawpile/drawpile/theme/light/network-modem.svg
+share/drawpile/drawpile/theme/light/network-server-database.svg
+share/drawpile/drawpile/theme/light/network-server.svg
+share/drawpile/drawpile/theme/light/news-subscribe.svg
 share/drawpile/drawpile/theme/light/object-locked.svg
-share/drawpile/drawpile/theme/light/object-rotate-left.svg
-share/drawpile/drawpile/theme/light/object-rotate-right.svg
+share/drawpile/drawpile/theme/light/object-unlocked.svg
+share/drawpile/drawpile/theme/light/onion-off.svg
+share/drawpile/drawpile/theme/light/onion-on.svg
+share/drawpile/drawpile/theme/light/pathshape.svg
+share/drawpile/drawpile/theme/light/resource-group-new.svg
 share/drawpile/drawpile/theme/light/security-high.svg
 share/drawpile/drawpile/theme/light/security-medium.svg
 share/drawpile/drawpile/theme/light/select-rectangular.svg
+share/drawpile/drawpile/theme/light/sidebar-collapse-left.svg
+share/drawpile/drawpile/theme/light/sidebar-expand-left.svg
+share/drawpile/drawpile/theme/light/state-error.svg
+share/drawpile/drawpile/theme/light/state-offline.svg
+share/drawpile/drawpile/theme/light/state-ok.svg
+share/drawpile/drawpile/theme/light/state-warning.svg
+share/drawpile/drawpile/theme/light/tag-delete.svg
+share/drawpile/drawpile/theme/light/tag.svg
+share/drawpile/drawpile/theme/light/timeline-use-zone-off.svg
+share/drawpile/drawpile/theme/light/timeline-use-zone-on.svg
+share/drawpile/drawpile/theme/light/toolbar-ext-h-drawpile.svg
+share/drawpile/drawpile/theme/light/toolbar-ext-h-rtl-drawpile.svg
+share/drawpile/drawpile/theme/light/toolbar-ext-v-drawpile.svg
+share/drawpile/drawpile/theme/light/tools.svg
+share/drawpile/drawpile/theme/light/transform-crop-and-resize.svg
 share/drawpile/drawpile/theme/light/transform-rotate.svg
-share/drawpile/drawpile/theme/light/window-pin.svg
+share/drawpile/drawpile/theme/light/trash-empty.svg
+share/drawpile/drawpile/theme/light/update-none.svg
+share/drawpile/drawpile/theme/light/user-group-new.svg
+share/drawpile/drawpile/theme/light/view-hidden.svg
+share/drawpile/drawpile/theme/light/view-refresh.svg
+share/drawpile/drawpile/theme/light/view-sort.svg
+share/drawpile/drawpile/theme/light/view-visible.svg
+share/drawpile/drawpile/theme/light/window_.svg
+share/drawpile/drawpile/theme/light/zoom-fit-height.svg
+share/drawpile/drawpile/theme/light/zoom-fit-none.svg
+share/drawpile/drawpile/theme/light/zoom-fit-width.svg
 share/drawpile/drawpile/theme/light/zoom-in.svg
 share/drawpile/drawpile/theme/light/zoom-original.svg
 share/drawpile/drawpile/theme/light/zoom-out.svg
 share/drawpile/drawpile/theme/light/zoom-select.svg
-share/icons/hicolor/128x128/apps/drawpile.png
-share/icons/hicolor/128x128/mimetypes/application-x-drawpile-recording.png
-share/icons/hicolor/16x16/apps/drawpile.png
-share/icons/hicolor/16x16/mimetypes/application-x-drawpile-recording.png
+share/drawpile/drawpile/watermelon.colors
 share/icons/hicolor/256x256/apps/drawpile.png
-share/icons/hicolor/256x256/mimetypes/application-x-drawpile-recording.png
-share/icons/hicolor/32x32/apps/drawpile.png
-share/icons/hicolor/32x32/mimetypes/application-x-drawpile-recording.png
-share/icons/hicolor/48x48/apps/drawpile.png
-share/icons/hicolor/48x48/mimetypes/application-x-drawpile-recording.png
-share/icons/hicolor/64x64/apps/drawpile.png
-share/icons/hicolor/64x64/mimetypes/application-x-drawpile-recording.png
-share/icons/hicolor/scalable/apps/drawpile.svgz
-share/icons/hicolor/scalable/mimetypes/application-x-drawpile-recording.svgz
+share/icons/hicolor/256x256/mimetypes/application-vnd.drawpile.recording.png
+share/icons/hicolor/256x256/mimetypes/text-vnd.drawpile.recording.png
+share/icons/hicolor/scalable/apps/drawpile.svg
+share/icons/hicolor/scalable/mimetypes/application-vnd.drawpile.recording.svg
+share/icons/hicolor/scalable/mimetypes/text-vnd.drawpile.recording.svg
 share/metainfo/
 share/metainfo/net.drawpile.drawpile.appdata.xml
-share/mime/packages/x-drawpile.xml
-@tag update-mime-database
-@tag gtk-update-icon-cache %D/share/icons/hicolor
+share/mime/application/
+share/mime/application/vnd.drawpile.canvas.xml
+share/mime/application/vnd.drawpile.recording.xml
+share/mime/text/
+share/mime/text/vnd.drawpile.recording.xml
 @tag update-desktop-database
+@tag gtk-update-icon-cache %D/share/icons/hicolor