shotwell: Update to 0.30.8

Updated to GNOME 3 / gtk3 version.

7 files changed, 485 insertions, 561 deletions

diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile
index ab1fc778e42..46a381701dd 100644
--- a/graphics/shotwell/Makefile
+++ b/graphics/shotwell/Makefile
@@ -1,53 +1,38 @@
-# $NetBSD: Makefile,v 1.104 2019/11/06 14:34:31 wiz Exp $
+# $NetBSD: Makefile,v 1.105 2020/01/21 16:15:05 nia Exp $
 
-DISTNAME=		shotwell-0.22.0
-PKGREVISION=		33
-CATEGORIES=		graphics
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/shotwell/0.22/}
-EXTRACT_SUFX=		.tar.xz
+DISTNAME=	shotwell-0.30.8
+CATEGORIES=	graphics gnome
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/shotwell/0.30/}
+EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=		pkgrsc-users@NetBSD.org
-HOMEPAGE=		https://wiki.gnome.org/Apps/Shotwell
-COMMENT=		Shotwell is a photo organizer for the GNOME desktop
-LICENSE=		gnu-lgpl-v2.1
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	https://wiki.gnome.org/Apps/Shotwell
+COMMENT=	Photo organizer for the GNOME desktop
+LICENSE=	gnu-lgpl-v2.1
 
-BUILD_DEPENDS+=		gnome-doc-utils-[0-9]*:../../textproc/gnome-doc-utils
+USE_TOOLS+=	pkg-config msgfmt xgettext
 
-HAS_CONFIGURE=		yes
-USE_TOOLS+=		gmake bash pkg-config m4 msgfmt
+MESON_ARGS+=	-Dudev=false
 
-CONFIG_SHELL=		bash
-CONFIGURE_ARGS+=	--prefix=${PREFIX}
-CONFIGURE_ARGS+=	--assume-pkgs
-CONFIGURE_ENV+=		--define=NO_CAMERA
-MAKE_ENV+=		VALAC=${VALAC}
+# uses python3
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
-REPLACE_SH+=		configure
+# XXX msgfmt: unknown option -- desktop
+_TOOLS_USE_PKGSRC.msgfmt=	yes
 
-.include "../../multimedia/gstreamer1/buildlink3.mk"
-.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
-.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/meson/build.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/libgee/buildlink3.mk"
 .include "../../devel/libgphoto2/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/gexiv2/buildlink3.mk"
-# 0.13.2 added shared libs
-BUILDLINK_ABI_DEPENDS.libraw+= libraw>=0.13.2
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/libraw/buildlink3.mk"
-# Required for dealing with .svg icons. Spotted on a clean box
-.include "../../graphics/librsvg/buildlink3.mk"
-BUILDLINK_DEPMETHOD.vala= build
+.include "../../lang/python/tool.mk"
 .include "../../lang/vala/buildlink3.mk"
-.include "../../net/libsoup/buildlink3.mk"
+.include "../../net/libgdata/buildlink3.mk"
+.include "../../security/gcr/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/json-glib/buildlink3.mk"
-.include "../../www/webkit24-gtk3/buildlink3.mk"
-.include "../../www/librest07/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtk3+=	gtk3+>=3.12.2
+.include "../../www/webkit-gtk/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
-.include "../../x11/libunique3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/shotwell/PLIST b/graphics/shotwell/PLIST
index 2573b9afb6e..f24090b26e9 100644
--- a/graphics/shotwell/PLIST
+++ b/graphics/shotwell/PLIST
@@ -1,276 +1,452 @@
-@comment $NetBSD: PLIST,v 1.7 2015/08/23 14:04:32 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2020/01/21 16:15:05 nia Exp $
 bin/shotwell
-lib/shotwell/plugins/builtin/f-spot-24.png
-lib/shotwell/plugins/builtin/facebook.png
-lib/shotwell/plugins/builtin/facebook_publishing_options_pane.glade
-lib/shotwell/plugins/builtin/flickr.png
-lib/shotwell/plugins/builtin/flickr_pin_entry_pane.glade
-lib/shotwell/plugins/builtin/flickr_publishing_options_pane.glade
-lib/shotwell/plugins/builtin/gallery3.png
-lib/shotwell/plugins/builtin/gallery3_authentication_pane.glade
-lib/shotwell/plugins/builtin/gallery3_publishing_options_pane.glade
-lib/shotwell/plugins/builtin/picasa.png
-lib/shotwell/plugins/builtin/picasa_publishing_options_pane.glade
-lib/shotwell/plugins/builtin/piwigo.png
-lib/shotwell/plugins/builtin/piwigo_authentication_pane.glade
-lib/shotwell/plugins/builtin/piwigo_publishing_options_pane.glade
-lib/shotwell/plugins/builtin/rajce.png
-lib/shotwell/plugins/builtin/rajce_authentication_pane.glade
-lib/shotwell/plugins/builtin/rajce_publishing_options_pane.glade
-lib/shotwell/plugins/builtin/shotwell-data-imports.so
-lib/shotwell/plugins/builtin/shotwell-publishing-extras.so
-lib/shotwell/plugins/builtin/shotwell-publishing.so
-lib/shotwell/plugins/builtin/shotwell-transitions.so
-lib/shotwell/plugins/builtin/slideshow-plugin.png
-lib/shotwell/plugins/builtin/tumblr.png
-lib/shotwell/plugins/builtin/tumblr_authentication_pane.glade
-lib/shotwell/plugins/builtin/tumblr_publishing_options_pane.glade
-lib/shotwell/plugins/builtin/yandex_publish_model.glade
-lib/shotwell/plugins/builtin/youtube.png
-lib/shotwell/plugins/builtin/youtube_publishing_options_pane.glade
+lib/libshotwell-authenticator.so
+lib/libshotwell-authenticator.so.0
+lib/libshotwell-authenticator.so.${PKGVERSION}
+lib/libshotwell-plugin-common.so
+lib/libshotwell-plugin-common.so.0
+lib/libshotwell-plugin-common.so.${PKGVERSION}
+lib/libshotwell-plugin-dev-1.0.so
+lib/libshotwell-plugin-dev-1.0.so.0
+lib/libshotwell-plugin-dev-1.0.so.${PKGVERSION}
+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-settings-migrator
 libexec/shotwell/shotwell-video-thumbnailer
-share/appdata/shotwell.appdata.xml
+man/man1/shotwell.1
 share/applications/shotwell-viewer.desktop
 share/applications/shotwell.desktop
+share/apport/package-hooks/shotwell.py
 share/glib-2.0/schemas/org.yorba.shotwell-extras.gschema.xml
 share/glib-2.0/schemas/org.yorba.shotwell.gschema.xml
-share/gnome/help/shotwell/C/edit-adjustments.page
-share/gnome/help/shotwell/C/edit-crop.page
-share/gnome/help/shotwell/C/edit-enhance.page
-share/gnome/help/shotwell/C/edit-external.page
-share/gnome/help/shotwell/C/edit-nondestructive.page
-share/gnome/help/shotwell/C/edit-redeye.page
-share/gnome/help/shotwell/C/edit-rotate.page
-share/gnome/help/shotwell/C/edit-straighten.page
-share/gnome/help/shotwell/C/edit-time-date.page
-share/gnome/help/shotwell/C/edit-undo.page
-share/gnome/help/shotwell/C/figures/crop_thirds.jpg
-share/gnome/help/shotwell/C/figures/edit_toolbar.png
-share/gnome/help/shotwell/C/figures/editing_overview.png
-share/gnome/help/shotwell/C/figures/shotwell_logo.png
-share/gnome/help/shotwell/C/figures/trash_process.png
-share/gnome/help/shotwell/C/formats.page
-share/gnome/help/shotwell/C/import-camera.page
-share/gnome/help/shotwell/C/import-f-spot.page
-share/gnome/help/shotwell/C/import-file.page
-share/gnome/help/shotwell/C/import-memorycard.page
-share/gnome/help/shotwell/C/index.page
-share/gnome/help/shotwell/C/organize-event.page
-share/gnome/help/shotwell/C/organize-flag.page
-share/gnome/help/shotwell/C/organize-rating.page
-share/gnome/help/shotwell/C/organize-remove.page
-share/gnome/help/shotwell/C/organize-search.page
-share/gnome/help/shotwell/C/organize-tag.page
-share/gnome/help/shotwell/C/organize-title.page
-share/gnome/help/shotwell/C/other-files.page
-share/gnome/help/shotwell/C/other-missing.page
-share/gnome/help/shotwell/C/other-multiple.page
-share/gnome/help/shotwell/C/other-plugins.page
-share/gnome/help/shotwell/C/raw.page
-share/gnome/help/shotwell/C/running.page
-share/gnome/help/shotwell/C/share-background.page
-share/gnome/help/shotwell/C/share-export.page
-share/gnome/help/shotwell/C/share-print.page
-share/gnome/help/shotwell/C/share-send.page
-share/gnome/help/shotwell/C/share-slideshow.page
-share/gnome/help/shotwell/C/share-upload.page
-share/gnome/help/shotwell/C/view-displaying.page
-share/gnome/help/shotwell/C/view-information.page
-share/gnome/help/shotwell/C/view-sidebar.page
-share/gnome/help/shotwell/cs/edit-adjustments.page
-share/gnome/help/shotwell/cs/edit-crop.page
-share/gnome/help/shotwell/cs/edit-enhance.page
-share/gnome/help/shotwell/cs/edit-external.page
-share/gnome/help/shotwell/cs/edit-nondestructive.page
-share/gnome/help/shotwell/cs/edit-redeye.page
-share/gnome/help/shotwell/cs/edit-rotate.page
-share/gnome/help/shotwell/cs/edit-straighten.page
-share/gnome/help/shotwell/cs/edit-time-date.page
-share/gnome/help/shotwell/cs/edit-undo.page
-share/gnome/help/shotwell/cs/formats.page
-share/gnome/help/shotwell/cs/import-camera.page
-share/gnome/help/shotwell/cs/import-f-spot.page
-share/gnome/help/shotwell/cs/import-file.page
-share/gnome/help/shotwell/cs/import-memorycard.page
-share/gnome/help/shotwell/cs/index.page
-share/gnome/help/shotwell/cs/organize-event.page
-share/gnome/help/shotwell/cs/organize-flag.page
-share/gnome/help/shotwell/cs/organize-rating.page
-share/gnome/help/shotwell/cs/organize-remove.page
-share/gnome/help/shotwell/cs/organize-search.page
-share/gnome/help/shotwell/cs/organize-tag.page
-share/gnome/help/shotwell/cs/organize-title.page
-share/gnome/help/shotwell/cs/other-files.page
-share/gnome/help/shotwell/cs/other-missing.page
-share/gnome/help/shotwell/cs/other-multiple.page
-share/gnome/help/shotwell/cs/other-plugins.page
-share/gnome/help/shotwell/cs/raw.page
-share/gnome/help/shotwell/cs/running.page
-share/gnome/help/shotwell/cs/share-background.page
-share/gnome/help/shotwell/cs/share-export.page
-share/gnome/help/shotwell/cs/share-print.page
-share/gnome/help/shotwell/cs/share-send.page
-share/gnome/help/shotwell/cs/share-slideshow.page
-share/gnome/help/shotwell/cs/share-upload.page
-share/gnome/help/shotwell/cs/view-displaying.page
-share/gnome/help/shotwell/cs/view-information.page
-share/gnome/help/shotwell/cs/view-sidebar.page
-share/gnome/help/shotwell/de/edit-adjustments.page
-share/gnome/help/shotwell/de/edit-crop.page
-share/gnome/help/shotwell/de/edit-enhance.page
-share/gnome/help/shotwell/de/edit-external.page
-share/gnome/help/shotwell/de/edit-nondestructive.page
-share/gnome/help/shotwell/de/edit-redeye.page
-share/gnome/help/shotwell/de/edit-rotate.page
-share/gnome/help/shotwell/de/edit-straighten.page
-share/gnome/help/shotwell/de/edit-time-date.page
-share/gnome/help/shotwell/de/edit-undo.page
-share/gnome/help/shotwell/de/formats.page
-share/gnome/help/shotwell/de/import-camera.page
-share/gnome/help/shotwell/de/import-f-spot.page
-share/gnome/help/shotwell/de/import-file.page
-share/gnome/help/shotwell/de/import-memorycard.page
-share/gnome/help/shotwell/de/index.page
-share/gnome/help/shotwell/de/organize-event.page
-share/gnome/help/shotwell/de/organize-flag.page
-share/gnome/help/shotwell/de/organize-rating.page
-share/gnome/help/shotwell/de/organize-remove.page
-share/gnome/help/shotwell/de/organize-search.page
-share/gnome/help/shotwell/de/organize-tag.page
-share/gnome/help/shotwell/de/organize-title.page
-share/gnome/help/shotwell/de/other-files.page
-share/gnome/help/shotwell/de/other-missing.page
-share/gnome/help/shotwell/de/other-multiple.page
-share/gnome/help/shotwell/de/other-plugins.page
-share/gnome/help/shotwell/de/raw.page
-share/gnome/help/shotwell/de/running.page
-share/gnome/help/shotwell/de/share-background.page
-share/gnome/help/shotwell/de/share-export.page
-share/gnome/help/shotwell/de/share-print.page
-share/gnome/help/shotwell/de/share-send.page
-share/gnome/help/shotwell/de/share-slideshow.page
-share/gnome/help/shotwell/de/share-upload.page
-share/gnome/help/shotwell/de/view-displaying.page
-share/gnome/help/shotwell/de/view-information.page
-share/gnome/help/shotwell/de/view-sidebar.page
-share/gnome/help/shotwell/el/edit-adjustments.page
-share/gnome/help/shotwell/el/edit-crop.page
-share/gnome/help/shotwell/el/edit-enhance.page
-share/gnome/help/shotwell/el/edit-external.page
-share/gnome/help/shotwell/el/edit-nondestructive.page
-share/gnome/help/shotwell/el/edit-redeye.page
-share/gnome/help/shotwell/el/edit-rotate.page
-share/gnome/help/shotwell/el/edit-straighten.page
-share/gnome/help/shotwell/el/edit-time-date.page
-share/gnome/help/shotwell/el/edit-undo.page
-share/gnome/help/shotwell/el/formats.page
-share/gnome/help/shotwell/el/import-camera.page
-share/gnome/help/shotwell/el/import-f-spot.page
-share/gnome/help/shotwell/el/import-file.page
-share/gnome/help/shotwell/el/import-memorycard.page
-share/gnome/help/shotwell/el/index.page
-share/gnome/help/shotwell/el/organize-event.page
-share/gnome/help/shotwell/el/organize-flag.page
-share/gnome/help/shotwell/el/organize-rating.page
-share/gnome/help/shotwell/el/organize-remove.page
-share/gnome/help/shotwell/el/organize-search.page
-share/gnome/help/shotwell/el/organize-tag.page
-share/gnome/help/shotwell/el/organize-title.page
-share/gnome/help/shotwell/el/other-files.page
-share/gnome/help/shotwell/el/other-missing.page
-share/gnome/help/shotwell/el/other-multiple.page
-share/gnome/help/shotwell/el/other-plugins.page
-share/gnome/help/shotwell/el/raw.page
-share/gnome/help/shotwell/el/running.page
-share/gnome/help/shotwell/el/share-background.page
-share/gnome/help/shotwell/el/share-export.page
-share/gnome/help/shotwell/el/share-print.page
-share/gnome/help/shotwell/el/share-send.page
-share/gnome/help/shotwell/el/share-slideshow.page
-share/gnome/help/shotwell/el/share-upload.page
-share/gnome/help/shotwell/el/view-displaying.page
-share/gnome/help/shotwell/el/view-information.page
-share/gnome/help/shotwell/el/view-sidebar.page
-share/gnome/help/shotwell/es/edit-adjustments.page
-share/gnome/help/shotwell/es/edit-crop.page
-share/gnome/help/shotwell/es/edit-enhance.page
-share/gnome/help/shotwell/es/edit-external.page
-share/gnome/help/shotwell/es/edit-nondestructive.page
-share/gnome/help/shotwell/es/edit-redeye.page
-share/gnome/help/shotwell/es/edit-rotate.page
-share/gnome/help/shotwell/es/edit-straighten.page
-share/gnome/help/shotwell/es/edit-time-date.page
-share/gnome/help/shotwell/es/edit-undo.page
-share/gnome/help/shotwell/es/formats.page
-share/gnome/help/shotwell/es/import-camera.page
-share/gnome/help/shotwell/es/import-f-spot.page
-share/gnome/help/shotwell/es/import-file.page
-share/gnome/help/shotwell/es/import-memorycard.page
-share/gnome/help/shotwell/es/index.page
-share/gnome/help/shotwell/es/organize-event.page
-share/gnome/help/shotwell/es/organize-flag.page
-share/gnome/help/shotwell/es/organize-rating.page
-share/gnome/help/shotwell/es/organize-remove.page
-share/gnome/help/shotwell/es/organize-search.page
-share/gnome/help/shotwell/es/organize-tag.page
-share/gnome/help/shotwell/es/organize-title.page
-share/gnome/help/shotwell/es/other-files.page
-share/gnome/help/shotwell/es/other-missing.page
-share/gnome/help/shotwell/es/other-multiple.page
-share/gnome/help/shotwell/es/other-plugins.page
-share/gnome/help/shotwell/es/raw.page
-share/gnome/help/shotwell/es/running.page
-share/gnome/help/shotwell/es/share-background.page
-share/gnome/help/shotwell/es/share-export.page
-share/gnome/help/shotwell/es/share-print.page
-share/gnome/help/shotwell/es/share-send.page
-share/gnome/help/shotwell/es/share-slideshow.page
-share/gnome/help/shotwell/es/share-upload.page
-share/gnome/help/shotwell/es/view-displaying.page
-share/gnome/help/shotwell/es/view-information.page
-share/gnome/help/shotwell/es/view-sidebar.page
-share/gnome/help/shotwell/hu/edit-adjustments.page
-share/gnome/help/shotwell/hu/edit-crop.page
-share/gnome/help/shotwell/hu/edit-enhance.page
-share/gnome/help/shotwell/hu/edit-external.page
-share/gnome/help/shotwell/hu/edit-nondestructive.page
-share/gnome/help/shotwell/hu/edit-redeye.page
-share/gnome/help/shotwell/hu/edit-rotate.page
-share/gnome/help/shotwell/hu/edit-straighten.page
-share/gnome/help/shotwell/hu/edit-time-date.page
-share/gnome/help/shotwell/hu/edit-undo.page
-share/gnome/help/shotwell/hu/formats.page
-share/gnome/help/shotwell/hu/import-camera.page
-share/gnome/help/shotwell/hu/import-f-spot.page
-share/gnome/help/shotwell/hu/import-file.page
-share/gnome/help/shotwell/hu/import-memorycard.page
-share/gnome/help/shotwell/hu/index.page
-share/gnome/help/shotwell/hu/organize-event.page
-share/gnome/help/shotwell/hu/organize-flag.page
-share/gnome/help/shotwell/hu/organize-rating.page
-share/gnome/help/shotwell/hu/organize-remove.page
-share/gnome/help/shotwell/hu/organize-search.page
-share/gnome/help/shotwell/hu/organize-tag.page
-share/gnome/help/shotwell/hu/organize-title.page
-share/gnome/help/shotwell/hu/other-files.page
-share/gnome/help/shotwell/hu/other-missing.page
-share/gnome/help/shotwell/hu/other-multiple.page
-share/gnome/help/shotwell/hu/other-plugins.page
-share/gnome/help/shotwell/hu/raw.page
-share/gnome/help/shotwell/hu/running.page
-share/gnome/help/shotwell/hu/share-background.page
-share/gnome/help/shotwell/hu/share-export.page
-share/gnome/help/shotwell/hu/share-print.page
-share/gnome/help/shotwell/hu/share-send.page
-share/gnome/help/shotwell/hu/share-slideshow.page
-share/gnome/help/shotwell/hu/share-upload.page
-share/gnome/help/shotwell/hu/view-displaying.page
-share/gnome/help/shotwell/hu/view-information.page
-share/gnome/help/shotwell/hu/view-sidebar.page
-share/icons/hicolor/16x16/apps/shotwell.svg
-share/icons/hicolor/24x24/apps/shotwell.svg
-share/icons/hicolor/scalable/apps/shotwell.svg
+share/help/C/shotwell/edit-adjustments.page
+share/help/C/shotwell/edit-crop.page
+share/help/C/shotwell/edit-date-time.page
+share/help/C/shotwell/edit-enhance.page
+share/help/C/shotwell/edit-external.page
+share/help/C/shotwell/edit-nondestructive.page
+share/help/C/shotwell/edit-redeye.page
+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
+share/help/C/shotwell/import-file.page
+share/help/C/shotwell/import-memorycard.page
+share/help/C/shotwell/index.page
+share/help/C/shotwell/organize-event.page
+share/help/C/shotwell/organize-flag.page
+share/help/C/shotwell/organize-rating.page
+share/help/C/shotwell/organize-remove.page
+share/help/C/shotwell/organize-search.page
+share/help/C/shotwell/organize-tag.page
+share/help/C/shotwell/organize-title.page
+share/help/C/shotwell/other-files.page
+share/help/C/shotwell/other-missing.page
+share/help/C/shotwell/other-multiple.page
+share/help/C/shotwell/other-plugins.page
+share/help/C/shotwell/raw.page
+share/help/C/shotwell/running.page
+share/help/C/shotwell/share-background.page
+share/help/C/shotwell/share-export.page
+share/help/C/shotwell/share-print.page
+share/help/C/shotwell/share-send.page
+share/help/C/shotwell/share-slideshow.page
+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/cs/shotwell/edit-adjustments.page
+share/help/cs/shotwell/edit-crop.page
+share/help/cs/shotwell/edit-date-time.page
+share/help/cs/shotwell/edit-enhance.page
+share/help/cs/shotwell/edit-external.page
+share/help/cs/shotwell/edit-nondestructive.page
+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/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/formats.page
+share/help/cs/shotwell/import-camera.page
+share/help/cs/shotwell/import-file.page
+share/help/cs/shotwell/import-memorycard.page
+share/help/cs/shotwell/index.page
+share/help/cs/shotwell/organize-event.page
+share/help/cs/shotwell/organize-flag.page
+share/help/cs/shotwell/organize-rating.page
+share/help/cs/shotwell/organize-remove.page
+share/help/cs/shotwell/organize-search.page
+share/help/cs/shotwell/organize-tag.page
+share/help/cs/shotwell/organize-title.page
+share/help/cs/shotwell/other-files.page
+share/help/cs/shotwell/other-missing.page
+share/help/cs/shotwell/other-multiple.page
+share/help/cs/shotwell/other-plugins.page
+share/help/cs/shotwell/raw.page
+share/help/cs/shotwell/running.page
+share/help/cs/shotwell/share-background.page
+share/help/cs/shotwell/share-export.page
+share/help/cs/shotwell/share-print.page
+share/help/cs/shotwell/share-send.page
+share/help/cs/shotwell/share-slideshow.page
+share/help/cs/shotwell/share-upload.page
+share/help/cs/shotwell/view-displaying.page
+share/help/cs/shotwell/view-information.page
+share/help/cs/shotwell/view-sidebar.page
+share/help/de/shotwell/edit-adjustments.page
+share/help/de/shotwell/edit-crop.page
+share/help/de/shotwell/edit-date-time.page
+share/help/de/shotwell/edit-enhance.page
+share/help/de/shotwell/edit-external.page
+share/help/de/shotwell/edit-nondestructive.page
+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/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/formats.page
+share/help/de/shotwell/import-camera.page
+share/help/de/shotwell/import-file.page
+share/help/de/shotwell/import-memorycard.page
+share/help/de/shotwell/index.page
+share/help/de/shotwell/organize-event.page
+share/help/de/shotwell/organize-flag.page
+share/help/de/shotwell/organize-rating.page
+share/help/de/shotwell/organize-remove.page
+share/help/de/shotwell/organize-search.page
+share/help/de/shotwell/organize-tag.page
+share/help/de/shotwell/organize-title.page
+share/help/de/shotwell/other-files.page
+share/help/de/shotwell/other-missing.page
+share/help/de/shotwell/other-multiple.page
+share/help/de/shotwell/other-plugins.page
+share/help/de/shotwell/raw.page
+share/help/de/shotwell/running.page
+share/help/de/shotwell/share-background.page
+share/help/de/shotwell/share-export.page
+share/help/de/shotwell/share-print.page
+share/help/de/shotwell/share-send.page
+share/help/de/shotwell/share-slideshow.page
+share/help/de/shotwell/share-upload.page
+share/help/de/shotwell/view-displaying.page
+share/help/de/shotwell/view-information.page
+share/help/de/shotwell/view-sidebar.page
+share/help/el/shotwell/edit-adjustments.page
+share/help/el/shotwell/edit-crop.page
+share/help/el/shotwell/edit-date-time.page
+share/help/el/shotwell/edit-enhance.page
+share/help/el/shotwell/edit-external.page
+share/help/el/shotwell/edit-nondestructive.page
+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/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
+share/help/el/shotwell/import-file.page
+share/help/el/shotwell/import-memorycard.page
+share/help/el/shotwell/index.page
+share/help/el/shotwell/organize-event.page
+share/help/el/shotwell/organize-flag.page
+share/help/el/shotwell/organize-rating.page
+share/help/el/shotwell/organize-remove.page
+share/help/el/shotwell/organize-search.page
+share/help/el/shotwell/organize-tag.page
+share/help/el/shotwell/organize-title.page
+share/help/el/shotwell/other-files.page
+share/help/el/shotwell/other-missing.page
+share/help/el/shotwell/other-multiple.page
+share/help/el/shotwell/other-plugins.page
+share/help/el/shotwell/raw.page
+share/help/el/shotwell/running.page
+share/help/el/shotwell/share-background.page
+share/help/el/shotwell/share-export.page
+share/help/el/shotwell/share-print.page
+share/help/el/shotwell/share-send.page
+share/help/el/shotwell/share-slideshow.page
+share/help/el/shotwell/share-upload.page
+share/help/el/shotwell/view-displaying.page
+share/help/el/shotwell/view-information.page
+share/help/el/shotwell/view-sidebar.page
+share/help/es/shotwell/edit-adjustments.page
+share/help/es/shotwell/edit-crop.page
+share/help/es/shotwell/edit-date-time.page
+share/help/es/shotwell/edit-enhance.page
+share/help/es/shotwell/edit-external.page
+share/help/es/shotwell/edit-nondestructive.page
+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/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/formats.page
+share/help/es/shotwell/import-camera.page
+share/help/es/shotwell/import-file.page
+share/help/es/shotwell/import-memorycard.page
+share/help/es/shotwell/index.page
+share/help/es/shotwell/organize-event.page
+share/help/es/shotwell/organize-flag.page
+share/help/es/shotwell/organize-rating.page
+share/help/es/shotwell/organize-remove.page
+share/help/es/shotwell/organize-search.page
+share/help/es/shotwell/organize-tag.page
+share/help/es/shotwell/organize-title.page
+share/help/es/shotwell/other-files.page
+share/help/es/shotwell/other-missing.page
+share/help/es/shotwell/other-multiple.page
+share/help/es/shotwell/other-plugins.page
+share/help/es/shotwell/raw.page
+share/help/es/shotwell/running.page
+share/help/es/shotwell/share-background.page
+share/help/es/shotwell/share-export.page
+share/help/es/shotwell/share-print.page
+share/help/es/shotwell/share-send.page
+share/help/es/shotwell/share-slideshow.page
+share/help/es/shotwell/share-upload.page
+share/help/es/shotwell/view-displaying.page
+share/help/es/shotwell/view-information.page
+share/help/es/shotwell/view-sidebar.page
+share/help/fr/shotwell/edit-adjustments.page
+share/help/fr/shotwell/edit-crop.page
+share/help/fr/shotwell/edit-date-time.page
+share/help/fr/shotwell/edit-enhance.page
+share/help/fr/shotwell/edit-external.page
+share/help/fr/shotwell/edit-nondestructive.page
+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/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/formats.page
+share/help/fr/shotwell/import-camera.page
+share/help/fr/shotwell/import-file.page
+share/help/fr/shotwell/import-memorycard.page
+share/help/fr/shotwell/index.page
+share/help/fr/shotwell/organize-event.page
+share/help/fr/shotwell/organize-flag.page
+share/help/fr/shotwell/organize-rating.page
+share/help/fr/shotwell/organize-remove.page
+share/help/fr/shotwell/organize-search.page
+share/help/fr/shotwell/organize-tag.page
+share/help/fr/shotwell/organize-title.page
+share/help/fr/shotwell/other-files.page
+share/help/fr/shotwell/other-missing.page
+share/help/fr/shotwell/other-multiple.page
+share/help/fr/shotwell/other-plugins.page
+share/help/fr/shotwell/raw.page
+share/help/fr/shotwell/running.page
+share/help/fr/shotwell/share-background.page
+share/help/fr/shotwell/share-export.page
+share/help/fr/shotwell/share-print.page
+share/help/fr/shotwell/share-send.page
+share/help/fr/shotwell/share-slideshow.page
+share/help/fr/shotwell/share-upload.page
+share/help/fr/shotwell/view-displaying.page
+share/help/fr/shotwell/view-information.page
+share/help/fr/shotwell/view-sidebar.page
+share/help/hu/shotwell/edit-adjustments.page
+share/help/hu/shotwell/edit-crop.page
+share/help/hu/shotwell/edit-date-time.page
+share/help/hu/shotwell/edit-enhance.page
+share/help/hu/shotwell/edit-external.page
+share/help/hu/shotwell/edit-nondestructive.page
+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/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/formats.page
+share/help/hu/shotwell/import-camera.page
+share/help/hu/shotwell/import-file.page
+share/help/hu/shotwell/import-memorycard.page
+share/help/hu/shotwell/index.page
+share/help/hu/shotwell/organize-event.page
+share/help/hu/shotwell/organize-flag.page
+share/help/hu/shotwell/organize-rating.page
+share/help/hu/shotwell/organize-remove.page
+share/help/hu/shotwell/organize-search.page
+share/help/hu/shotwell/organize-tag.page
+share/help/hu/shotwell/organize-title.page
+share/help/hu/shotwell/other-files.page
+share/help/hu/shotwell/other-missing.page
+share/help/hu/shotwell/other-multiple.page
+share/help/hu/shotwell/other-plugins.page
+share/help/hu/shotwell/raw.page
+share/help/hu/shotwell/running.page
+share/help/hu/shotwell/share-background.page
+share/help/hu/shotwell/share-export.page
+share/help/hu/shotwell/share-print.page
+share/help/hu/shotwell/share-send.page
+share/help/hu/shotwell/share-slideshow.page
+share/help/hu/shotwell/share-upload.page
+share/help/hu/shotwell/view-displaying.page
+share/help/hu/shotwell/view-information.page
+share/help/hu/shotwell/view-sidebar.page
+share/help/lv/shotwell/edit-adjustments.page
+share/help/lv/shotwell/edit-crop.page
+share/help/lv/shotwell/edit-date-time.page
+share/help/lv/shotwell/edit-enhance.page
+share/help/lv/shotwell/edit-external.page
+share/help/lv/shotwell/edit-nondestructive.page
+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/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/formats.page
+share/help/lv/shotwell/import-camera.page
+share/help/lv/shotwell/import-file.page
+share/help/lv/shotwell/import-memorycard.page
+share/help/lv/shotwell/index.page
+share/help/lv/shotwell/organize-event.page
+share/help/lv/shotwell/organize-flag.page
+share/help/lv/shotwell/organize-rating.page
+share/help/lv/shotwell/organize-remove.page
+share/help/lv/shotwell/organize-search.page
+share/help/lv/shotwell/organize-tag.page
+share/help/lv/shotwell/organize-title.page
+share/help/lv/shotwell/other-files.page
+share/help/lv/shotwell/other-missing.page
+share/help/lv/shotwell/other-multiple.page
+share/help/lv/shotwell/other-plugins.page
+share/help/lv/shotwell/raw.page
+share/help/lv/shotwell/running.page
+share/help/lv/shotwell/share-background.page
+share/help/lv/shotwell/share-export.page
+share/help/lv/shotwell/share-print.page
+share/help/lv/shotwell/share-send.page
+share/help/lv/shotwell/share-slideshow.page
+share/help/lv/shotwell/share-upload.page
+share/help/lv/shotwell/view-displaying.page
+share/help/lv/shotwell/view-information.page
+share/help/lv/shotwell/view-sidebar.page
+share/help/pt_BR/shotwell/edit-adjustments.page
+share/help/pt_BR/shotwell/edit-crop.page
+share/help/pt_BR/shotwell/edit-date-time.page
+share/help/pt_BR/shotwell/edit-enhance.page
+share/help/pt_BR/shotwell/edit-external.page
+share/help/pt_BR/shotwell/edit-nondestructive.page
+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/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/formats.page
+share/help/pt_BR/shotwell/import-camera.page
+share/help/pt_BR/shotwell/import-file.page
+share/help/pt_BR/shotwell/import-memorycard.page
+share/help/pt_BR/shotwell/index.page
+share/help/pt_BR/shotwell/organize-event.page
+share/help/pt_BR/shotwell/organize-flag.page
+share/help/pt_BR/shotwell/organize-rating.page
+share/help/pt_BR/shotwell/organize-remove.page
+share/help/pt_BR/shotwell/organize-search.page
+share/help/pt_BR/shotwell/organize-tag.page
+share/help/pt_BR/shotwell/organize-title.page
+share/help/pt_BR/shotwell/other-files.page
+share/help/pt_BR/shotwell/other-missing.page
+share/help/pt_BR/shotwell/other-multiple.page
+share/help/pt_BR/shotwell/other-plugins.page
+share/help/pt_BR/shotwell/raw.page
+share/help/pt_BR/shotwell/running.page
+share/help/pt_BR/shotwell/share-background.page
+share/help/pt_BR/shotwell/share-export.page
+share/help/pt_BR/shotwell/share-print.page
+share/help/pt_BR/shotwell/share-send.page
+share/help/pt_BR/shotwell/share-slideshow.page
+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/sv/shotwell/edit-adjustments.page
+share/help/sv/shotwell/edit-crop.page
+share/help/sv/shotwell/edit-date-time.page
+share/help/sv/shotwell/edit-enhance.page
+share/help/sv/shotwell/edit-external.page
+share/help/sv/shotwell/edit-nondestructive.page
+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/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/formats.page
+share/help/sv/shotwell/import-camera.page
+share/help/sv/shotwell/import-file.page
+share/help/sv/shotwell/import-memorycard.page
+share/help/sv/shotwell/index.page
+share/help/sv/shotwell/organize-event.page
+share/help/sv/shotwell/organize-flag.page
+share/help/sv/shotwell/organize-rating.page
+share/help/sv/shotwell/organize-remove.page
+share/help/sv/shotwell/organize-search.page
+share/help/sv/shotwell/organize-tag.page
+share/help/sv/shotwell/organize-title.page
+share/help/sv/shotwell/other-files.page
+share/help/sv/shotwell/other-missing.page
+share/help/sv/shotwell/other-multiple.page
+share/help/sv/shotwell/other-plugins.page
+share/help/sv/shotwell/raw.page
+share/help/sv/shotwell/running.page
+share/help/sv/shotwell/share-background.page
+share/help/sv/shotwell/share-export.page
+share/help/sv/shotwell/share-print.page
+share/help/sv/shotwell/share-send.page
+share/help/sv/shotwell/share-slideshow.page
+share/help/sv/shotwell/share-upload.page
+share/help/sv/shotwell/view-displaying.page
+share/help/sv/shotwell/view-information.page
+share/help/sv/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/locale/af/LC_MESSAGES/shotwell.mo
 share/locale/ar/LC_MESSAGES/shotwell.mo
 share/locale/as/LC_MESSAGES/shotwell.mo
@@ -315,6 +491,7 @@ share/locale/mr/LC_MESSAGES/shotwell.mo
 share/locale/nb/LC_MESSAGES/shotwell.mo
 share/locale/nl/LC_MESSAGES/shotwell.mo
 share/locale/nn/LC_MESSAGES/shotwell.mo
+share/locale/oc/LC_MESSAGES/shotwell.mo
 share/locale/or/LC_MESSAGES/shotwell.mo
 share/locale/pa/LC_MESSAGES/shotwell.mo
 share/locale/pl/LC_MESSAGES/shotwell.mo
@@ -336,75 +513,4 @@ 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/shotwell/icons/all-rejected.png
-share/shotwell/icons/crop-pivot-reticle.png
-share/shotwell/icons/crop.svg
-share/shotwell/icons/drag_nub.png
-share/shotwell/icons/filter-flagged.png
-share/shotwell/icons/filter-photos.png
-share/shotwell/icons/filter-raw.png
-share/shotwell/icons/filter-videos.png
-share/shotwell/icons/five-star-filter.svg
-share/shotwell/icons/five-stars.svg
-share/shotwell/icons/flag-page.png
-share/shotwell/icons/flag-trinket.png
-share/shotwell/icons/four-star-filter-plus.svg
-share/shotwell/icons/four-stars.svg
-share/shotwell/icons/generic-plugin.png
-share/shotwell/icons/image-adjust.svg
-share/shotwell/icons/import-all.png
-share/shotwell/icons/import.svg
-share/shotwell/icons/make-primary.svg
-share/shotwell/icons/merge.svg
-share/shotwell/icons/multiple-events.png
-share/shotwell/icons/multiple-tags.png
-share/shotwell/icons/no-event.png
-share/shotwell/icons/noninterpretable-video.png
-share/shotwell/icons/one-event.png
-share/shotwell/icons/one-star-filter-plus.svg
-share/shotwell/icons/one-star.svg
-share/shotwell/icons/one-tag.png
-share/shotwell/icons/pin-toolbar.svg
-share/shotwell/icons/publish.png
-share/shotwell/icons/redeye.png
-share/shotwell/icons/rejected.svg
-share/shotwell/icons/shotwell-16.svg
-share/shotwell/icons/shotwell-24.svg
-share/shotwell/icons/shotwell-auto-enhance.png
-share/shotwell/icons/shotwell-street.jpg
-share/shotwell/icons/shotwell.ico
-share/shotwell/icons/shotwell.svg
-share/shotwell/icons/slideshow-extension-point.png
-share/shotwell/icons/sprocket.png
-share/shotwell/icons/straighten.svg
-share/shotwell/icons/three-star-filter-plus.svg
-share/shotwell/icons/three-stars.svg
-share/shotwell/icons/two-star-filter-plus.svg
-share/shotwell/icons/two-stars.svg
-share/shotwell/icons/videos-page.png
-share/shotwell/icons/zoom-in.png
-share/shotwell/icons/zoom-out.png
-share/shotwell/ui/collection.ui
-share/shotwell/ui/direct.ui
-share/shotwell/ui/direct_context.ui
-share/shotwell/ui/event.ui
-share/shotwell/ui/events_directory.ui
-share/shotwell/ui/fullscreen.ui
-share/shotwell/ui/import.ui
-share/shotwell/ui/import_queue.ui
-share/shotwell/ui/media.ui
-share/shotwell/ui/offline.ui
-share/shotwell/ui/photo.ui
-share/shotwell/ui/photo_context.ui
-share/shotwell/ui/savedsearch.ui
-share/shotwell/ui/search_bar.ui
-share/shotwell/ui/search_sidebar_context.ui
-share/shotwell/ui/set_background_dialog.glade
-share/shotwell/ui/set_background_slideshow_dialog.glade
-share/shotwell/ui/shotwell.glade
-share/shotwell/ui/shotwell.xml
-share/shotwell/ui/sidebar_default_context.ui
-share/shotwell/ui/tag_sidebar_context.ui
-share/shotwell/ui/tags.ui
-share/shotwell/ui/top.ui
-share/shotwell/ui/trash.ui
+share/metainfo/shotwell.appdata.xml
diff --git a/graphics/shotwell/distinfo b/graphics/shotwell/distinfo
index b9516f79077..ee967f5be17 100644
--- a/graphics/shotwell/distinfo
+++ b/graphics/shotwell/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.17 2015/11/03 21:34:20 agc Exp $
+$NetBSD: distinfo,v 1.18 2020/01/21 16:15:05 nia Exp $
 
-SHA1 (shotwell-0.22.0.tar.xz) = 8ed803a5da8c61dd16a629f42946cc586197e392
-RMD160 (shotwell-0.22.0.tar.xz) = eb46f018b1022e22ff6d5198f2e341928b6ac4cb
-SHA512 (shotwell-0.22.0.tar.xz) = 486f27a1fa06512a925ecae60504f3cbc487d44834f635efd0897dd20cb304a731c08133ab4b04b32a754235fc8c63dc9b05787b1a0c72a98c89ca91c64f452c
-Size (shotwell-0.22.0.tar.xz) = 1872952 bytes
-SHA1 (patch-aa) = 3baaeceac9a1d652cd4f1ef14ee8fa96691ce598
-SHA1 (patch-ab) = 83e9ece301dc4264ecd64e85b6547471bf514ce7
-SHA1 (patch-ac) = 0183761f3ab30788703e54aecba72b194e0d770a
+SHA1 (shotwell-0.30.8.tar.xz) = f2631d380e64b6d8ff9a81c3b545cd26452c0f6f
+RMD160 (shotwell-0.30.8.tar.xz) = 7700ce9e22432c1789c4c8c79d56b0a3fdb17887
+SHA512 (shotwell-0.30.8.tar.xz) = dccd496a083145283c79250329f88fdfe526a98ce84b6d1c52a9c48c9e52a4749bdf2449f3102474c994ef1e687e06767b9bcda03ea97d1168d3417743a6e866
+Size (shotwell-0.30.8.tar.xz) = 6460512 bytes
+SHA1 (patch-meson.build) = 0f80191bc1eb2e05db1c2ce10f7b554bd9921b54
diff --git a/graphics/shotwell/patches/patch-aa b/graphics/shotwell/patches/patch-aa
deleted file mode 100644
index b0668beead2..00000000000
--- a/graphics/shotwell/patches/patch-aa
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2015/08/23 14:04:32 wiz Exp $
-
---- Makefile.orig	2015-03-24 00:38:31.000000000 +0000
-+++ Makefile
-@@ -263,7 +263,6 @@ EXT_PKGS = \
- 	gstreamer-base-1.0 \
- 	gstreamer-pbutils-1.0 \
- 	gtk+-3.0 \
--	gudev-1.0 \
- 	libexif \
- 	libgphoto2 \
- 	json-glib-1.0 \
-@@ -295,7 +294,6 @@ EXT_PKG_VERSIONS = \
- 	gstreamer-plugins-base-1.0 >= 1.0.0 \
- 	gstreamer-pbutils-1.0 >= 1.0.0 \
- 	gtk+-3.0 >= 3.12.2 \
--	gudev-1.0 >= 145 \
- 	libexif >= 0.6.16 \
- 	libgphoto2 >= 2.4.2 \
- 	libraw >= 0.13.2 \
-@@ -417,7 +415,7 @@ PLUGIN_CFLAGS += $(PROFILE_FLAGS) $(REQU
- # Required for gudev-1.0
- CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE
- 
--all: pkgcheck valacheck desktop
-+all: pkgcheck desktop
- 
- ifdef ENABLE_BUILD_FOR_GLADE
- all: $(PLUGINS_DIR) lib$(PROGRAM).so $(PROGRAM) $(PC_FILE)
-@@ -489,7 +487,7 @@ ifndef DISABLE_DESKTOP_VALIDATE
- 	else rm -f misc/shotwell.desktop.errors; \
- 	fi
- endif
--	
-+
- misc/shotwell-viewer.desktop: misc/shotwell-viewer.desktop.head $(EXPANDED_CORE_PO_FILES)
- 	cp misc/shotwell-viewer.desktop.head misc/shotwell-viewer.desktop
- 	$(foreach lang,$(CORE_SUPPORTED_LANGUAGES), echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack \
-@@ -694,7 +692,6 @@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU
- 
- .PHONY: $(PLUGINS_DIR)
- $(PLUGINS_DIR): $(PLUGIN_VAPI) $(PLUGIN_HEADER) $(PLUGIN_DEPS)
--	$(call check_valac_version)
- 	@$(MAKE) --directory=$@ PLUGINS_VERSION="$(VERSION)" USER_VALAFLAGS="$(USER_VALAFLAGS)" \
- 		PLUGIN_CFLAGS="$(PLUGIN_CFLAGS)"
- 
diff --git a/graphics/shotwell/patches/patch-ab b/graphics/shotwell/patches/patch-ab
deleted file mode 100644
index 6c27c62cd8c..00000000000
--- a/graphics/shotwell/patches/patch-ab
+++ /dev/null
@@ -1,116 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2015/08/23 14:04:32 wiz Exp $
-
---- src/camera/CameraTable.vala.orig	2015-02-14 00:50:15.000000000 +0000
-+++ src/camera/CameraTable.vala
-@@ -26,7 +26,6 @@ public class CameraTable {
-     
-     private static CameraTable instance = null;
-     
--    private GUdev.Client client = new GUdev.Client(SUBSYSTEMS);
-     private OneShotScheduler camera_update_scheduler = null;
-     private GPhoto.Context null_context = new GPhoto.Context();
-     private GPhoto.CameraAbilitiesList abilities_list;
-@@ -43,7 +42,6 @@ public class CameraTable {
-             on_update_cameras);
-         
-         // listen for interesting events on the specified subsystems
--        client.uevent.connect(on_udev_event);
-         volume_monitor = VolumeMonitor.get();
-         volume_monitor.volume_changed.connect(on_volume_changed);
-         volume_monitor.volume_added.connect(on_volume_changed);
-@@ -111,31 +109,6 @@ public class CameraTable {
-     private string[] get_all_usb_cameras() {
-         string[] cameras = new string[0];
-         
--        GLib.List<GUdev.Device> device_list = client.query_by_subsystem(null);
--        foreach (GUdev.Device device in device_list) {
--            string device_file = device.get_device_file();
--            if(
--                // only keep devices that have a non-null device file and that
--                // have both the ID_GPHOTO2 and GPHOTO2_DRIVER properties set
--                (device_file != null) &&
--                (device.has_property("ID_GPHOTO2")) &&
--                (device.has_property("GPHOTO2_DRIVER"))
--            ) {
--                int camera_bus, camera_device;
--                // extract the bus and device IDs from the device file string
--                // TODO: is it safe to parse the absolute path or should we be
--                // smarter and use a regex to only pick up the end of the path?
--                if (device_file.scanf("/dev/bus/usb/%d/%d", out camera_bus, out camera_device) < 2) {
--                    critical("get_all_usb_cameras: Failed to scanf device file %s", device_file);
--                    
--                    continue;
--                }
--                string camera = "usb:%.3d,%.3d".printf(camera_bus, camera_device);
--                debug("USB camera detected at %s", camera);
--                cameras += camera;
--            }
--        }
--        
-         return cameras;
-     }
-     
-@@ -212,24 +185,6 @@ public class CameraTable {
-             "/dev/bus/usb/%s".printf(port.substring(4).replace(",", "/")) : null;
-     }
-     
--    private string? get_name_for_uuid(string uuid) {
--        foreach (Volume volume in volume_monitor.get_volumes()) {
--            if (volume.get_identifier(VolumeIdentifier.UUID) == uuid) {
--                return volume.get_name();
--            }
--        }
--        return null;
--    }
--    
--    private string? get_icon_for_uuid(string uuid) {
--        foreach (Volume volume in volume_monitor.get_volumes()) {
--            if (volume.get_identifier(VolumeIdentifier.UUID) == uuid) {
--                return volume.get_icon().to_string();
--            }
--        }
--        return null;
--    }
--
-     private void update_camera_table() throws GPhotoError {
-         // need to do this because virtual ports come and go in the USB world (and probably others)
-         GPhoto.PortInfoList port_info_list;
-@@ -333,23 +288,6 @@ public class CameraTable {
-                 continue;
-             }
-             
--            // Get display name for camera.
--            string path = get_port_path(port);
--            if (null != path) {
--                GUdev.Device device = client.query_by_device_file(path);
--                string serial = device.get_property("ID_SERIAL_SHORT");
--                if (null != serial) {
--                    // Try to get the name and icon.
--                    display_name = get_name_for_uuid(serial);
--                    icon = get_icon_for_uuid(serial);
--                }
--                if (null == display_name) {
--                    display_name = device.get_sysfs_attr("product");
--                } 
--                if (null == display_name) {
--                    display_name = device.get_property("ID_MODEL");
--                }
--            }
-             if (null == display_name) {
-                 // Default to GPhoto detected name.
-                 display_name = name;
-@@ -394,14 +332,6 @@ public class CameraTable {
-         }
-     }
-     
--    private void on_udev_event(string action, GUdev.Device device) {
--        debug("udev event: %s on %s", action, device.get_name());
--        
--        // Device add/removes often arrive in pairs; this allows for a single
--        // update to occur when they come in all at once
--        camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true);
--    }
--    
-     public void on_volume_changed(Volume volume) {
-         camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true);
-     }
diff --git a/graphics/shotwell/patches/patch-ac b/graphics/shotwell/patches/patch-ac
deleted file mode 100644
index bd58bc3035e..00000000000
--- a/graphics/shotwell/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2014/11/25 10:07:18 wiz Exp $
-
---- configure.orig	2013-11-19 02:02:29.000000000 +0000
-+++ configure
-@@ -176,10 +176,10 @@ done
- 
- # detect version of libgphoto2 the compilation host has installed
- pkg-config --atleast-version 2.5 libgphoto2
--if [ $? == 1 ]
-+if [ $? = 1 ]
- then 
-     pkg-config --atleast-version 2.4 libgphoto2
--    if [ $? == 1 ]
-+    if [ $? = 1 ]
-     then
-         printf "No compatible libGPhoto installation found. Configuration cannot continue.\n";
-         exit 1
diff --git a/graphics/shotwell/patches/patch-meson.build b/graphics/shotwell/patches/patch-meson.build
new file mode 100644
index 00000000000..eacbf7b6a56
--- /dev/null
+++ b/graphics/shotwell/patches/patch-meson.build
@@ -0,0 +1,14 @@
+$NetBSD: patch-meson.build,v 1.1 2020/01/21 16:15:05 nia Exp $
+
+Don't force fatal warnings...
+
+--- meson.build.orig	2020-01-03 18:21:58.000000000 +0000
++++ meson.build
+@@ -25,7 +25,6 @@ add_global_arguments(['--target-glib=2.4
+                       '--vapidir=@0@'.format(join_paths(meson.current_source_dir(),
+                         'vapi')),
+                       '--enable-checking',
+-                      '--fatal-warnings',
+                       '--enable-experimental',
+                       '--enable-deprecated'], language : 'vala')
+