graphics/drawpile: update 2.1.20 → 2.2.0

Reported by:	portscout

7 files changed, 265 insertions, 72 deletions

diff --git a/graphics/drawpile/Makefile b/graphics/drawpile/Makefile
index 67dfcd8d86bd..658a57b6f73b 100644
--- a/graphics/drawpile/Makefile
+++ b/graphics/drawpile/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	Drawpile
-DISTVERSION=	2.1.20
-PORTREVISION=	4
+DISTVERSION=	2.2.0
 CATEGORIES=	graphics python
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -8,20 +7,32 @@ COMMENT=	Collaborative drawing program
 WWW=		https://drawpile.net
 
 LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${LOCALBASE}/share/ECM/cmake/ECMConfig.cmake:devel/kf5-extra-cmake-modules
-LIB_DEPENDS=	libgif.so:graphics/giflib \
-		libmicrohttpd.so:www/libmicrohttpd \
-		libminiupnpc.so:net/miniupnpc \
-		libsodium.so:security/libsodium \
-		libvpx.so:multimedia/libvpx
+LIB_DEPENDS=	libsodium.so:security/libsodium
+
+USES=		cargo cmake compiler:c++17-lang desktop-file-utils kde:5 pkgconfig qt:5 shared-mime-info
+USE_QT=		core gui multimedia network sql svg widgets xml \
+		buildtools:build linguisttools:build qmake:build
+USE_KDE=	archive dnssd
 
-USES=		cmake compiler:c++11-lang desktop-file-utils kde:5 pkgconfig qt:5 shared-mime-info
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME:tl}
-USE_QT=		core gui multimedia network sql svg widgets buildtools:build linguisttools:build qmake:build
-USE_KDE=	archive dnssd
+
+CARGO_BUILD=	no
+CARGO_INSTALL=	no
+CARGO_CRATES=	aho-corasick-1.0.5 \
+		anyhow-1.0.75 \
+		memchr-2.6.1 \
+		once_cell-1.18.0 \
+		regex-1.9.4 \
+		regex-automata-0.3.7 \
+		regex-syntax-0.7.5 \
+		xflags-0.3.1 \
+		xflags-macros-0.3.1
+
+BINARY_ALIAS=	lconvert=${QT_BINDIR}/lconvert
 
 OPTIONS_DEFINE=	DOCS
 
@@ -34,8 +45,8 @@ PORTSCOUT=	limit:^\d+\. # prevent tags like 'continuous'
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == armv7
-BROKEN_FreeBSD_15=	clang crashes, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=276269
-.endif
+#.if ${ARCH} == armv7
+#BROKEN_FreeBSD_15=	clang crashes, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=276269
+#.endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/drawpile/distinfo b/graphics/drawpile/distinfo
index 621712be42cb..b2387a23439c 100644
--- a/graphics/drawpile/distinfo
+++ b/graphics/drawpile/distinfo
@@ -1,3 +1,21 @@
-TIMESTAMP = 1631775747
-SHA256 (drawpile-Drawpile-2.1.20_GH0.tar.gz) = 93b3195ce9ac3425a8e135e14583d7cd43c4d221411b87f638f5e1de30503c85
-SIZE (drawpile-Drawpile-2.1.20_GH0.tar.gz) = 2631098
+TIMESTAMP = 1705254930
+SHA256 (rust/crates/aho-corasick-1.0.5.crate) = 0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783
+SIZE (rust/crates/aho-corasick-1.0.5.crate) = 172064
+SHA256 (rust/crates/anyhow-1.0.75.crate) = a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6
+SIZE (rust/crates/anyhow-1.0.75.crate) = 43901
+SHA256 (rust/crates/memchr-2.6.1.crate) = f478948fd84d9f8e86967bf432640e46adfb5a4bd4f14ef7e864ab38220534ae
+SIZE (rust/crates/memchr-2.6.1.crate) = 93821
+SHA256 (rust/crates/once_cell-1.18.0.crate) = dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d
+SIZE (rust/crates/once_cell-1.18.0.crate) = 32969
+SHA256 (rust/crates/regex-1.9.4.crate) = 12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29
+SIZE (rust/crates/regex-1.9.4.crate) = 253112
+SHA256 (rust/crates/regex-automata-0.3.7.crate) = 49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629
+SIZE (rust/crates/regex-automata-0.3.7.crate) = 607421
+SHA256 (rust/crates/regex-syntax-0.7.5.crate) = dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da
+SIZE (rust/crates/regex-syntax-0.7.5.crate) = 343366
+SHA256 (rust/crates/xflags-0.3.1.crate) = c4554b580522d0ca238369c16b8f6ce34524d61dafe7244993754bbd05f2c2ea
+SIZE (rust/crates/xflags-0.3.1.crate) = 6642
+SHA256 (rust/crates/xflags-macros-0.3.1.crate) = f58e7b3ca8977093aae6b87b6a7730216fc4c53a6530bab5c43a783cd810c1a8
+SIZE (rust/crates/xflags-macros-0.3.1.crate) = 12229
+SHA256 (drawpile-Drawpile-2.2.0_GH0.tar.gz) = 41122fef2d590f621226570aa62cc7bae8bd0b1cf758c3f001f37cc8c9199683
+SIZE (drawpile-Drawpile-2.2.0_GH0.tar.gz) = 5288561
diff --git a/graphics/drawpile/files/patch-cmake_DrawdanceCompilerOptions.cmake b/graphics/drawpile/files/patch-cmake_DrawdanceCompilerOptions.cmake
new file mode 100644
index 000000000000..4ff47235e567
--- /dev/null
+++ b/graphics/drawpile/files/patch-cmake_DrawdanceCompilerOptions.cmake
@@ -0,0 +1,13 @@
+--- cmake/DrawdanceCompilerOptions.cmake.orig	2024-01-14 11:12:43 UTC
++++ cmake/DrawdanceCompilerOptions.cmake
+@@ -32,7 +32,7 @@ else()
+         $<$<COMPILE_LANGUAGE:CXX>:-fno-exceptions>
+         $<$<COMPILE_LANGUAGE:C>:-Wstrict-prototypes>
+     )
+-	if(UNIX AND NOT APPLE)
+-		add_compile_definitions(_XOPEN_SOURCE=600)
+-	endif()
++	#if(UNIX AND NOT APPLE)
++	#	add_compile_definitions(_XOPEN_SOURCE=600)
++	#endif()
+ endif()
diff --git a/graphics/drawpile/files/patch-doc_CMakeLists.txt b/graphics/drawpile/files/patch-doc_CMakeLists.txt
deleted file mode 100644
index d6cf3818fc80..000000000000
--- a/graphics/drawpile/files/patch-doc_CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
---- doc/CMakeLists.txt.orig	2019-02-18 10:23:08 UTC
-+++ doc/CMakeLists.txt
-@@ -1,6 +1,5 @@
- SET(base_files
- 	../ChangeLog
--	../COPYING
- 	../README.md
- 	openraster.txt
- 	textloader.md
-@@ -20,6 +20,6 @@ if (UNIX AND NOT APPLE)
- 		)
- 	INSTALL (
- 		FILES ${man1}
--		DESTINATION "share/man/man1"
-+		DESTINATION man/man1
- 		)
- endif ()
diff --git a/graphics/drawpile/files/patch-src_drawdance_libcommon_dpcommon_common.h b/graphics/drawpile/files/patch-src_drawdance_libcommon_dpcommon_common.h
new file mode 100644
index 000000000000..1c10693e31fa
--- /dev/null
+++ b/graphics/drawpile/files/patch-src_drawdance_libcommon_dpcommon_common.h
@@ -0,0 +1,11 @@
+--- src/drawdance/libcommon/dpcommon/common.h.orig	2024-01-14 11:11:04 UTC
++++ src/drawdance/libcommon/dpcommon/common.h
+@@ -40,6 +40,8 @@
+ #        define DP_PLATFORM "darwin"
+ #    elif defined(__linux__)
+ #        define DP_PLATFORM "linux"
++#    elif defined(__FreeBSD__)
++#        define DP_PLATFORM "freebsd"
+ #    else
+ #        error "unknown platform"
+ #    endif
diff --git a/graphics/drawpile/files/patch-src_drawdance_libengine_dpengine_save.c b/graphics/drawpile/files/patch-src_drawdance_libengine_dpengine_save.c
new file mode 100644
index 000000000000..e6d12d2866d1
--- /dev/null
+++ b/graphics/drawpile/files/patch-src_drawdance_libengine_dpengine_save.c
@@ -0,0 +1,11 @@
+--- src/drawdance/libengine/dpengine/save.c.orig	2024-01-14 11:13:49 UTC
++++ src/drawdance/libengine/dpengine/save.c
+@@ -832,7 +832,7 @@ DP_SaveResult DP_save(DP_CanvasState *cs, DP_DrawConte
+ #if defined(_WIN32)
+ #    define PREFERRED_PATH_SEPARATOR "\\"
+ #    define POSSIBLE_PATH_SEPARATORS "\\/"
+-#elif defined(__EMSCRIPTEN__) || defined(__APPLE__) || defined(__linux__)
++#elif defined(__EMSCRIPTEN__) || defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__)
+ #    define PREFERRED_PATH_SEPARATOR "/"
+ #    define POSSIBLE_PATH_SEPARATORS "/"
+ #else
diff --git a/graphics/drawpile/pkg-plist b/graphics/drawpile/pkg-plist
index cf29b4bfcb57..aa417554ae6c 100644
--- a/graphics/drawpile/pkg-plist
+++ b/graphics/drawpile/pkg-plist
@@ -1,40 +1,67 @@
 bin/drawpile
-bin/drawpile-%%PORTVERSION%%
-bin/drawpile-srv
-man/man1/drawpile-srv.1.gz
 share/applications/net.drawpile.drawpile.desktop
-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/hotdogstand.colors
+share/drawpile/drawpile/i18n/all_ar_EG.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_es_CO.qm
+share/drawpile/drawpile/i18n/all_fi_FI.qm
+share/drawpile/drawpile/i18n/all_fr_FR.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_nb_NO.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_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/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/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/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/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-input-devices.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-as.svg
 share/drawpile/drawpile/theme/dark/document-save.svg
@@ -47,24 +74,39 @@ 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_brusherase.svg
+share/drawpile/drawpile/theme/dark/drawpile_brushlock.svg
 share/drawpile/drawpile/theme/dark/drawpile_chat.svg
+share/drawpile/drawpile/theme/dark/drawpile_folderhidden.svg
 share/drawpile/drawpile/theme/dark/drawpile_incremental_mode.svg
 share/drawpile/drawpile/theme/dark/drawpile_pixelround.svg
 share/drawpile/drawpile/theme/dark/drawpile_round.svg
 share/drawpile/drawpile/theme/dark/drawpile_square.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-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-lasso.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
@@ -73,34 +115,76 @@ 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/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/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/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/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/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/object-flip-horizontal.svg
 share/drawpile/drawpile/theme/dark/object-flip-vertical.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/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-ok.svg
+share/drawpile/drawpile/theme/dark/state-warning.svg
+share/drawpile/drawpile/theme/dark/tools.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-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
@@ -108,11 +192,23 @@ share/drawpile/drawpile/theme/dark/zoom-select.svg
 share/drawpile/drawpile/theme/icons.txt
 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-input-devices.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-as.svg
 share/drawpile/drawpile/theme/light/document-save.svg
@@ -125,24 +221,39 @@ 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_brusherase.svg
+share/drawpile/drawpile/theme/light/drawpile_brushlock.svg
 share/drawpile/drawpile/theme/light/drawpile_chat.svg
+share/drawpile/drawpile/theme/light/drawpile_folderhidden.svg
 share/drawpile/drawpile/theme/light/drawpile_incremental_mode.svg
 share/drawpile/drawpile/theme/light/drawpile_pixelround.svg
 share/drawpile/drawpile/theme/light/drawpile_round.svg
 share/drawpile/drawpile/theme/light/drawpile_square.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-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-lasso.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
@@ -151,51 +262,86 @@ 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/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/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/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/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/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/object-flip-horizontal.svg
 share/drawpile/drawpile/theme/light/object-flip-vertical.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/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-ok.svg
+share/drawpile/drawpile/theme/light/state-warning.svg
+share/drawpile/drawpile/theme/light/tools.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-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/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/net.drawpile.drawpile.appdata.xml
-share/mime/packages/x-drawpile.xml
+share/mime/application/vnd.drawpile.recording.xml
+share/mime/text/vnd.drawpile.recording.xml