git: 54f51b3981bd - main - graphics/shotwell: update to 0.32.6

From: Christoph Moench-Tegeder <cmt_at_FreeBSD.org>
Date: Wed, 08 May 2024 20:56:06 UTC
The branch main has been updated by cmt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=54f51b3981bd5872f91256d8c6dd4216f106f5f8

commit 54f51b3981bd5872f91256d8c6dd4216f106f5f8
Author:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
AuthorDate: 2024-05-08 20:45:48 +0000
Commit:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
CommitDate: 2024-05-08 20:55:54 +0000

    graphics/shotwell: update to 0.32.6
    
    https://download.gnome.org/sources/shotwell/0.32/shotwell-0.32.0.news
    https://download.gnome.org/sources/shotwell/0.32/shotwell-0.32.1.news
    https://download.gnome.org/sources/shotwell/0.32/shotwell-0.32.2.news
    https://download.gnome.org/sources/shotwell/0.32/shotwell-0.32.3.news
    https://download.gnome.org/sources/shotwell/0.32/shotwell-0.32.4.news
    https://download.gnome.org/sources/shotwell/0.32/shotwell-0.32.6.news
---
 graphics/shotwell/Makefile                         |  32 ++--
 graphics/shotwell/distinfo                         |   8 +-
 ...patch-plugins_common_WebAuthenticationPane.vala |  11 --
 .../files/patch-src_dialogs_ExportDialog.vala      |  12 --
 graphics/shotwell/pkg-plist                        | 181 +++++++++++++++------
 5 files changed, 147 insertions(+), 97 deletions(-)

diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile
index 21c588db91d5..0af626f535f5 100644
--- a/graphics/shotwell/Makefile
+++ b/graphics/shotwell/Makefile
@@ -1,12 +1,8 @@
 PORTNAME=	shotwell
-PORTVERSION=	0.30.18
-PORTREVISION=	3
+PORTVERSION=	0.32.6
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 
-PATCH_SITES=	https://gitlab.gnome.org/GNOME/shotwell/-/commit/
-PATCHFILES=	cd82759231e5ece2fa0dea40397c9051d15fd5c2.diff:-p1
-
 MAINTAINER=	cmt@FreeBSD.org
 COMMENT=	Open source photo manager for GNOME
 WWW=		https://wiki.gnome.org/Apps/Shotwell
@@ -19,32 +15,27 @@ LIB_DEPENDS=	libportal.so:deskutils/libportal \
 		libportal-gtk3.so:deskutils/libportal-gtk3 \
 		libgio-2.0.so:devel/glib20 \
 		libjson-glib-1.0.so:devel/json-glib \
-		libgdata.so:devel/libgdata \
 		libgee-0.8.so:devel/libgee \
-		libsoup-2.4.so:devel/libsoup \
-		libexiv2.so:graphics/exiv2 \
+		libsoup-3.0.so:devel/libsoup3 \
 		libgdk_pixbuf-2.0.so:graphics/gdk-pixbuf2 \
 		libgexiv2.so:graphics/gexiv2 \
 		libexif.so:graphics/libexif \
 		libgphoto2.so:graphics/libgphoto2 \
 		libraw.so:graphics/libraw \
+		libwebp.so:graphics/webp \
 		libgcr-ui-3.so:security/gcr \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+		libsecret-1.so:security/libsecret \
 		libxml2.so:textproc/libxml2
 
 USES=		compiler:c++11-lib cpe desktop-file-utils gettext gnome gstreamer meson \
-		ninja pkgconfig python:build shebangfix sqlite tar:xz vala:build xorg
+		ninja pkgconfig python:build sqlite tar:xz vala:build xorg
 CPE_VENDOR=	gnome
-USE_GNOME=	cairo dconf gtk30
+USE_GNOME=	cairo gtk30
 USE_LDCONFIG=	yes
 USE_XORG=	x11
 
-SHEBANG_FILES=	build-aux/meson/postinstall.py
-python_OLD_CMD=	"/usr/bin/env python3"
-python_CMD=	${SETENV} ${PYTHON_VERSION}
-
-MESON_ARGS=	-Dudev=false -Dextra-plugins=true -Dinstall-apport-hook=false \
-		-Dpublishers=facebook,flickr,gallery3,picasa,piwigo,rajce,tumblr,yandex,youtube
+MESON_ARGS=	-Dudev=false \
+		-Dpublishers=flickr,gallery3,googlephotos,piwigo,tumblr,youtube
 PORTSCOUT=	limitw:1,even
 MAKE_JOBS_UNSAFE=	yes
 
@@ -53,10 +44,9 @@ OPTIONS_SUB=	yes
 
 FACED_DESC=	Face Detection
 
-FACED_CONFIGURE_ON=	-Dface-detection=true
-FACED_CONFIGURE_OFF=	-Dface-detection=false
-FACED_LIB_DEPENDS=	libopencv_core.so:graphics/opencv \
-			libopencv_photo.so:graphics/opencv
+FACED_CONFIGURE_ON=	-Dface_detection=true
+FACED_CONFIGURE_OFF=	-Dface_detection=false -Dface_detection_helper=true
+FACED_LIB_DEPENDS=	libopencv_core.so:graphics/opencv
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
diff --git a/graphics/shotwell/distinfo b/graphics/shotwell/distinfo
index 44dae94a8a42..1a79c2954f74 100644
--- a/graphics/shotwell/distinfo
+++ b/graphics/shotwell/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1680351062
-SHA256 (shotwell-0.30.18.tar.xz) = a8c04a3c5cee0506fa103dde58ced15f03c6478f59958419d2a5f80761f14135
-SIZE (shotwell-0.30.18.tar.xz) = 6542864
-SHA256 (cd82759231e5ece2fa0dea40397c9051d15fd5c2.diff) = bbbfcf2d2d9f11dd4254d8eafa1cf5591ba78c3ce46f0655d2c3da2b47474895
-SIZE (cd82759231e5ece2fa0dea40397c9051d15fd5c2.diff) = 1569
+TIMESTAMP = 1715196920
+SHA256 (shotwell-0.32.6.tar.xz) = 7597a4ffac91e18cd8144b12f2d08313a3f405bb368243a7326826f7d92a70b6
+SIZE (shotwell-0.32.6.tar.xz) = 35324512
diff --git a/graphics/shotwell/files/patch-plugins_common_WebAuthenticationPane.vala b/graphics/shotwell/files/patch-plugins_common_WebAuthenticationPane.vala
deleted file mode 100644
index 71e97bcc3d17..000000000000
--- a/graphics/shotwell/files/patch-plugins_common_WebAuthenticationPane.vala
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/common/WebAuthenticationPane.vala.orig	2020-05-22 13:32:52 UTC
-+++ plugins/common/WebAuthenticationPane.vala
-@@ -21,7 +21,7 @@ namespace Shotwell.Plugins.Common {
-         public void clear() {
-             try {
-                 debug("Clearing the data of WebKit...");
--                this.webview.get_website_data_manager().clear.begin(WebKit.WebsiteDataTypes.ALL, (GLib.TimeSpan)0);
-+                this.webview.get_website_data_manager().clear.begin(WebKit.WebsiteDataTypes.ALL, (GLib.TimeSpan)0, null);
-             } catch (Error e) {
-                 // Do nothing
-                 message("Failed to clear data: %s", e.message);
diff --git a/graphics/shotwell/files/patch-src_dialogs_ExportDialog.vala b/graphics/shotwell/files/patch-src_dialogs_ExportDialog.vala
deleted file mode 100644
index 8963137ef12d..000000000000
--- a/graphics/shotwell/files/patch-src_dialogs_ExportDialog.vala
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/dialogs/ExportDialog.vala.orig	2022-03-24 11:17:17.231343000 +0100
-+++ src/dialogs/ExportDialog.vala	2022-03-24 11:34:07.028552000 +0100
-@@ -23,7 +23,8 @@
- 
-     private static ScaleConstraint current_constraint = ScaleConstraint.ORIGINAL;
-     private static ExportFormatParameters current_parameters = ExportFormatParameters.current();
--    private static int current_scale = DEFAULT_SCALE;
-+    // DEFAULT_SCALE, but vala misorders the definitions
-+    private static int current_scale = 1200;
- 
-     private Gtk.Grid table = new Gtk.Grid();
-     private Gtk.ComboBoxText quality_combo;
diff --git a/graphics/shotwell/pkg-plist b/graphics/shotwell/pkg-plist
index f0ddfc23ea11..4f381e3ad9e6 100644
--- a/graphics/shotwell/pkg-plist
+++ b/graphics/shotwell/pkg-plist
@@ -8,15 +8,23 @@ lib/libshotwell-plugin-common.so.%%DISTVERSION%%
 lib/libshotwell-plugin-dev-1.0.so
 lib/libshotwell-plugin-dev-1.0.so.0
 lib/libshotwell-plugin-dev-1.0.so.%%DISTVERSION%%
-lib/shotwell/plugins/builtin/libshotwell-publishing-extras.so
 lib/shotwell/plugins/builtin/libshotwell-publishing.so
 lib/shotwell/plugins/builtin/libshotwell-transitions.so
+libexec/shotwell/shotwell-authenticator
 %%FACED%%libexec/shotwell/shotwell-facedetect
 libexec/shotwell/shotwell-settings-migrator
+libexec/shotwell/shotwell-video-metadata-handler
 libexec/shotwell/shotwell-video-thumbnailer
 share/man/man1/shotwell.1.gz
-share/applications/shotwell-viewer.desktop
-share/applications/shotwell.desktop
+share/applications/org.gnome.Shotwell-Viewer.desktop
+share/applications/org.gnome.Shotwell.Auth.desktop
+share/applications/org.gnome.Shotwell.desktop
+share/apport/package-hooks/shotwell.py
+share/dbus-1/services/org.gnome.Shotwell.Faces1.service
+share/glib-2.0/schemas/org.gnome.shotwell-extras.gschema.xml
+share/glib-2.0/schemas/org.gnome.shotwell.gschema.xml
+share/help/C/shotwell/figures/Shotwell.svg
+share/help/C/shotwell/figures/trash_process.svg
 share/help/C/shotwell/edit-adjustments.page
 share/help/C/shotwell/edit-crop.page
 share/help/C/shotwell/edit-date-time.page
@@ -28,9 +36,6 @@ share/help/C/shotwell/edit-rotate.page
 share/help/C/shotwell/edit-straighten.page
 share/help/C/shotwell/edit-undo.page
 share/help/C/shotwell/figures/crop_thirds.jpg
-share/help/C/shotwell/figures/edit_toolbar.png
-share/help/C/shotwell/figures/editing_overview.png
-share/help/C/shotwell/figures/shotwell_logo.png
 share/help/C/shotwell/figures/trash_process.png
 share/help/C/shotwell/formats.page
 share/help/C/shotwell/import-camera.page
@@ -60,6 +65,48 @@ share/help/C/shotwell/share-upload.page
 share/help/C/shotwell/view-displaying.page
 share/help/C/shotwell/view-information.page
 share/help/C/shotwell/view-sidebar.page
+share/help/ca/shotwell/edit-adjustments.page
+share/help/ca/shotwell/edit-crop.page
+share/help/ca/shotwell/edit-date-time.page
+share/help/ca/shotwell/edit-enhance.page
+share/help/ca/shotwell/edit-external.page
+share/help/ca/shotwell/edit-nondestructive.page
+share/help/ca/shotwell/edit-redeye.page
+share/help/ca/shotwell/edit-rotate.page
+share/help/ca/shotwell/edit-straighten.page
+share/help/ca/shotwell/edit-undo.page
+share/help/ca/shotwell/figures/Shotwell.svg
+share/help/ca/shotwell/figures/crop_thirds.jpg
+share/help/ca/shotwell/figures/trash_process.png
+share/help/ca/shotwell/figures/trash_process.svg
+share/help/ca/shotwell/formats.page
+share/help/ca/shotwell/import-camera.page
+share/help/ca/shotwell/import-file.page
+share/help/ca/shotwell/import-memorycard.page
+share/help/ca/shotwell/index.page
+share/help/ca/shotwell/organize-event.page
+share/help/ca/shotwell/organize-flag.page
+share/help/ca/shotwell/organize-rating.page
+share/help/ca/shotwell/organize-remove.page
+share/help/ca/shotwell/organize-search.page
+share/help/ca/shotwell/organize-tag.page
+share/help/ca/shotwell/organize-title.page
+share/help/ca/shotwell/other-files.page
+share/help/ca/shotwell/other-missing.page
+share/help/ca/shotwell/other-multiple.page
+share/help/ca/shotwell/other-plugins.page
+share/help/ca/shotwell/privacy-policy.page
+share/help/ca/shotwell/raw.page
+share/help/ca/shotwell/running.page
+share/help/ca/shotwell/share-background.page
+share/help/ca/shotwell/share-export.page
+share/help/ca/shotwell/share-print.page
+share/help/ca/shotwell/share-send.page
+share/help/ca/shotwell/share-slideshow.page
+share/help/ca/shotwell/share-upload.page
+share/help/ca/shotwell/view-displaying.page
+share/help/ca/shotwell/view-information.page
+share/help/ca/shotwell/view-sidebar.page
 share/help/cs/shotwell/edit-adjustments.page
 share/help/cs/shotwell/edit-crop.page
 share/help/cs/shotwell/edit-date-time.page
@@ -70,11 +117,10 @@ share/help/cs/shotwell/edit-redeye.page
 share/help/cs/shotwell/edit-rotate.page
 share/help/cs/shotwell/edit-straighten.page
 share/help/cs/shotwell/edit-undo.page
+share/help/cs/shotwell/figures/Shotwell.svg
 share/help/cs/shotwell/figures/crop_thirds.jpg
-share/help/cs/shotwell/figures/edit_toolbar.png
-share/help/cs/shotwell/figures/editing_overview.png
-share/help/cs/shotwell/figures/shotwell_logo.png
 share/help/cs/shotwell/figures/trash_process.png
+share/help/cs/shotwell/figures/trash_process.svg
 share/help/cs/shotwell/formats.page
 share/help/cs/shotwell/import-camera.page
 share/help/cs/shotwell/import-file.page
@@ -113,11 +159,10 @@ share/help/de/shotwell/edit-redeye.page
 share/help/de/shotwell/edit-rotate.page
 share/help/de/shotwell/edit-straighten.page
 share/help/de/shotwell/edit-undo.page
+share/help/de/shotwell/figures/Shotwell.svg
 share/help/de/shotwell/figures/crop_thirds.jpg
-share/help/de/shotwell/figures/edit_toolbar.png
-share/help/de/shotwell/figures/editing_overview.png
-share/help/de/shotwell/figures/shotwell_logo.png
 share/help/de/shotwell/figures/trash_process.png
+share/help/de/shotwell/figures/trash_process.svg
 share/help/de/shotwell/formats.page
 share/help/de/shotwell/import-camera.page
 share/help/de/shotwell/import-file.page
@@ -156,10 +201,9 @@ share/help/el/shotwell/edit-redeye.page
 share/help/el/shotwell/edit-rotate.page
 share/help/el/shotwell/edit-straighten.page
 share/help/el/shotwell/edit-undo.page
+share/help/el/shotwell/figures/Shotwell.svg
+share/help/el/shotwell/figures/trash_process.svg
 share/help/el/shotwell/figures/crop_thirds.jpg
-share/help/el/shotwell/figures/edit_toolbar.png
-share/help/el/shotwell/figures/editing_overview.png
-share/help/el/shotwell/figures/shotwell_logo.png
 share/help/el/shotwell/figures/trash_process.png
 share/help/el/shotwell/formats.page
 share/help/el/shotwell/import-camera.page
@@ -199,11 +243,10 @@ share/help/es/shotwell/edit-redeye.page
 share/help/es/shotwell/edit-rotate.page
 share/help/es/shotwell/edit-straighten.page
 share/help/es/shotwell/edit-undo.page
+share/help/es/shotwell/figures/Shotwell.svg
 share/help/es/shotwell/figures/crop_thirds.jpg
-share/help/es/shotwell/figures/edit_toolbar.png
-share/help/es/shotwell/figures/editing_overview.png
-share/help/es/shotwell/figures/shotwell_logo.png
 share/help/es/shotwell/figures/trash_process.png
+share/help/es/shotwell/figures/trash_process.svg
 share/help/es/shotwell/formats.page
 share/help/es/shotwell/import-camera.page
 share/help/es/shotwell/import-file.page
@@ -242,11 +285,10 @@ share/help/fr/shotwell/edit-redeye.page
 share/help/fr/shotwell/edit-rotate.page
 share/help/fr/shotwell/edit-straighten.page
 share/help/fr/shotwell/edit-undo.page
+share/help/fr/shotwell/figures/Shotwell.svg
 share/help/fr/shotwell/figures/crop_thirds.jpg
-share/help/fr/shotwell/figures/edit_toolbar.png
-share/help/fr/shotwell/figures/editing_overview.png
-share/help/fr/shotwell/figures/shotwell_logo.png
 share/help/fr/shotwell/figures/trash_process.png
+share/help/fr/shotwell/figures/trash_process.svg
 share/help/fr/shotwell/formats.page
 share/help/fr/shotwell/import-camera.page
 share/help/fr/shotwell/import-file.page
@@ -285,11 +327,10 @@ share/help/hu/shotwell/edit-redeye.page
 share/help/hu/shotwell/edit-rotate.page
 share/help/hu/shotwell/edit-straighten.page
 share/help/hu/shotwell/edit-undo.page
+share/help/hu/shotwell/figures/Shotwell.svg
 share/help/hu/shotwell/figures/crop_thirds.jpg
-share/help/hu/shotwell/figures/edit_toolbar.png
-share/help/hu/shotwell/figures/editing_overview.png
-share/help/hu/shotwell/figures/shotwell_logo.png
 share/help/hu/shotwell/figures/trash_process.png
+share/help/hu/shotwell/figures/trash_process.svg
 share/help/hu/shotwell/formats.page
 share/help/hu/shotwell/import-camera.page
 share/help/hu/shotwell/import-file.page
@@ -328,11 +369,10 @@ share/help/id/shotwell/edit-redeye.page
 share/help/id/shotwell/edit-rotate.page
 share/help/id/shotwell/edit-straighten.page
 share/help/id/shotwell/edit-undo.page
+share/help/id/shotwell/figures/Shotwell.svg
 share/help/id/shotwell/figures/crop_thirds.jpg
-share/help/id/shotwell/figures/edit_toolbar.png
-share/help/id/shotwell/figures/editing_overview.png
-share/help/id/shotwell/figures/shotwell_logo.png
 share/help/id/shotwell/figures/trash_process.png
+share/help/id/shotwell/figures/trash_process.svg
 share/help/id/shotwell/formats.page
 share/help/id/shotwell/import-camera.page
 share/help/id/shotwell/import-file.page
@@ -371,11 +411,10 @@ share/help/lv/shotwell/edit-redeye.page
 share/help/lv/shotwell/edit-rotate.page
 share/help/lv/shotwell/edit-straighten.page
 share/help/lv/shotwell/edit-undo.page
+share/help/lv/shotwell/figures/Shotwell.svg
 share/help/lv/shotwell/figures/crop_thirds.jpg
-share/help/lv/shotwell/figures/edit_toolbar.png
-share/help/lv/shotwell/figures/editing_overview.png
-share/help/lv/shotwell/figures/shotwell_logo.png
 share/help/lv/shotwell/figures/trash_process.png
+share/help/lv/shotwell/figures/trash_process.svg
 share/help/lv/shotwell/formats.page
 share/help/lv/shotwell/import-camera.page
 share/help/lv/shotwell/import-file.page
@@ -414,11 +453,10 @@ share/help/pt_BR/shotwell/edit-redeye.page
 share/help/pt_BR/shotwell/edit-rotate.page
 share/help/pt_BR/shotwell/edit-straighten.page
 share/help/pt_BR/shotwell/edit-undo.page
+share/help/pt_BR/shotwell/figures/Shotwell.svg
 share/help/pt_BR/shotwell/figures/crop_thirds.jpg
-share/help/pt_BR/shotwell/figures/edit_toolbar.png
-share/help/pt_BR/shotwell/figures/editing_overview.png
-share/help/pt_BR/shotwell/figures/shotwell_logo.png
 share/help/pt_BR/shotwell/figures/trash_process.png
+share/help/pt_BR/shotwell/figures/trash_process.svg
 share/help/pt_BR/shotwell/formats.page
 share/help/pt_BR/shotwell/import-camera.page
 share/help/pt_BR/shotwell/import-file.page
@@ -447,6 +485,48 @@ share/help/pt_BR/shotwell/share-upload.page
 share/help/pt_BR/shotwell/view-displaying.page
 share/help/pt_BR/shotwell/view-information.page
 share/help/pt_BR/shotwell/view-sidebar.page
+share/help/ru/shotwell/edit-adjustments.page
+share/help/ru/shotwell/edit-crop.page
+share/help/ru/shotwell/edit-date-time.page
+share/help/ru/shotwell/edit-enhance.page
+share/help/ru/shotwell/edit-external.page
+share/help/ru/shotwell/edit-nondestructive.page
+share/help/ru/shotwell/edit-redeye.page
+share/help/ru/shotwell/edit-rotate.page
+share/help/ru/shotwell/edit-straighten.page
+share/help/ru/shotwell/edit-undo.page
+share/help/ru/shotwell/figures/Shotwell.svg
+share/help/ru/shotwell/figures/crop_thirds.jpg
+share/help/ru/shotwell/figures/trash_process.png
+share/help/ru/shotwell/figures/trash_process.svg
+share/help/ru/shotwell/formats.page
+share/help/ru/shotwell/import-camera.page
+share/help/ru/shotwell/import-file.page
+share/help/ru/shotwell/import-memorycard.page
+share/help/ru/shotwell/index.page
+share/help/ru/shotwell/organize-event.page
+share/help/ru/shotwell/organize-flag.page
+share/help/ru/shotwell/organize-rating.page
+share/help/ru/shotwell/organize-remove.page
+share/help/ru/shotwell/organize-search.page
+share/help/ru/shotwell/organize-tag.page
+share/help/ru/shotwell/organize-title.page
+share/help/ru/shotwell/other-files.page
+share/help/ru/shotwell/other-missing.page
+share/help/ru/shotwell/other-multiple.page
+share/help/ru/shotwell/other-plugins.page
+share/help/ru/shotwell/privacy-policy.page
+share/help/ru/shotwell/raw.page
+share/help/ru/shotwell/running.page
+share/help/ru/shotwell/share-background.page
+share/help/ru/shotwell/share-export.page
+share/help/ru/shotwell/share-print.page
+share/help/ru/shotwell/share-send.page
+share/help/ru/shotwell/share-slideshow.page
+share/help/ru/shotwell/share-upload.page
+share/help/ru/shotwell/view-displaying.page
+share/help/ru/shotwell/view-information.page
+share/help/ru/shotwell/view-sidebar.page
 share/help/sv/shotwell/edit-adjustments.page
 share/help/sv/shotwell/edit-crop.page
 share/help/sv/shotwell/edit-date-time.page
@@ -457,11 +537,10 @@ share/help/sv/shotwell/edit-redeye.page
 share/help/sv/shotwell/edit-rotate.page
 share/help/sv/shotwell/edit-straighten.page
 share/help/sv/shotwell/edit-undo.page
+share/help/sv/shotwell/figures/Shotwell.svg
 share/help/sv/shotwell/figures/crop_thirds.jpg
-share/help/sv/shotwell/figures/edit_toolbar.png
-share/help/sv/shotwell/figures/editing_overview.png
-share/help/sv/shotwell/figures/shotwell_logo.png
 share/help/sv/shotwell/figures/trash_process.png
+share/help/sv/shotwell/figures/trash_process.svg
 share/help/sv/shotwell/formats.page
 share/help/sv/shotwell/import-camera.page
 share/help/sv/shotwell/import-file.page
@@ -500,11 +579,10 @@ share/help/uk/shotwell/edit-redeye.page
 share/help/uk/shotwell/edit-rotate.page
 share/help/uk/shotwell/edit-straighten.page
 share/help/uk/shotwell/edit-undo.page
+share/help/uk/shotwell/figures/Shotwell.svg
 share/help/uk/shotwell/figures/crop_thirds.jpg
-share/help/uk/shotwell/figures/edit_toolbar.png
-share/help/uk/shotwell/figures/editing_overview.png
-share/help/uk/shotwell/figures/shotwell_logo.png
 share/help/uk/shotwell/figures/trash_process.png
+share/help/uk/shotwell/figures/trash_process.svg
 share/help/uk/shotwell/formats.page
 share/help/uk/shotwell/import-camera.page
 share/help/uk/shotwell/import-file.page
@@ -533,13 +611,14 @@ share/help/uk/shotwell/share-upload.page
 share/help/uk/shotwell/view-displaying.page
 share/help/uk/shotwell/view-information.page
 share/help/uk/shotwell/view-sidebar.page
-share/icons/hicolor/16x16/apps/shotwell.png
-share/icons/hicolor/22x22/apps/shotwell.png
-share/icons/hicolor/24x24/apps/shotwell.png
-share/icons/hicolor/256x256/apps/shotwell.png
-share/icons/hicolor/32x32/apps/shotwell.png
-share/icons/hicolor/48x48/apps/shotwell.png
-share/icons/hicolor/symbolic/apps/shotwell-symbolic.svg
+share/icons/hicolor/16x16/apps/org.gnome.Shotwell.png
+share/icons/hicolor/22x22/apps/org.gnome.Shotwell.png
+share/icons/hicolor/24x24/apps/org.gnome.Shotwell.png
+share/icons/hicolor/256x256/apps/org.gnome.Shotwell.png
+share/icons/hicolor/32x32/apps/org.gnome.Shotwell.png
+share/icons/hicolor/48x48/apps/org.gnome.Shotwell.png
+share/icons/hicolor/scalable/apps/org.gnome.Shotwell.svg
+share/icons/hicolor/symbolic/apps/org.gnome.Shotwell-symbolic.svg
 share/locale/af/LC_MESSAGES/shotwell.mo
 share/locale/ar/LC_MESSAGES/shotwell.mo
 share/locale/as/LC_MESSAGES/shotwell.mo
@@ -569,8 +648,10 @@ share/locale/hr/LC_MESSAGES/shotwell.mo
 share/locale/hu/LC_MESSAGES/shotwell.mo
 share/locale/ia/LC_MESSAGES/shotwell.mo
 share/locale/id/LC_MESSAGES/shotwell.mo
+share/locale/ie/LC_MESSAGES/shotwell.mo
 share/locale/it/LC_MESSAGES/shotwell.mo
 share/locale/ja/LC_MESSAGES/shotwell.mo
+share/locale/ka/LC_MESSAGES/shotwell.mo
 share/locale/kk/LC_MESSAGES/shotwell.mo
 share/locale/km/LC_MESSAGES/shotwell.mo
 share/locale/kn/LC_MESSAGES/shotwell.mo
@@ -578,6 +659,7 @@ share/locale/ko/LC_MESSAGES/shotwell.mo
 share/locale/ky/LC_MESSAGES/shotwell.mo
 share/locale/lt/LC_MESSAGES/shotwell.mo
 share/locale/lv/LC_MESSAGES/shotwell.mo
+share/locale/mjw/LC_MESSAGES/shotwell.mo
 share/locale/mk/LC_MESSAGES/shotwell.mo
 share/locale/ml/LC_MESSAGES/shotwell.mo
 share/locale/mr/LC_MESSAGES/shotwell.mo
@@ -606,5 +688,8 @@ share/locale/vi/LC_MESSAGES/shotwell.mo
 share/locale/zh_CN/LC_MESSAGES/shotwell.mo
 share/locale/zh_HK/LC_MESSAGES/shotwell.mo
 share/locale/zh_TW/LC_MESSAGES/shotwell.mo
-share/metainfo/shotwell.appdata.xml
-%%FACED%%%%DATADIR%%/facedetect-haarcascade.xml
+share/metainfo/org.gnome.Shotwell.appdata.xml
+%%DATADIR%%/facedetect/deploy.prototxt
+%%FACED%%%%DATADIR%%/facedetect/haarcascade_frontalface_alt.xml
+%%FACED%%%%DATADIR%%/facedetect/haarcascade_profileface.xml
+%%FACED%%%%DATADIR%%/facedetect/openface.nn4.small2.v1.t7