Update to 0.22.0:

Shotwell 0.22.0 - 23 March 2015
-------------------------------

  * Improved metadata support for Facebook upload (#742163)
  * Saved search now properly supports text is-set, not-set (#743924, #743923)
  * Import title, exposure time when available
  * User interface improvements (#744291, #719284, more)
  * Sort photos by filename (#717878)
  * Updated translations


Shotwell 0.21.0 - 2 February 2015
---------------------------------

  * User interface refresh (#742326, #742443)
  * Fix Shotwell Viewer .desktop file (#743799)
  * Natural sorting of photo titles (#717960)
  * Improved video thumbnailer (#739396, #741821)
  * Updated translations

5 files changed, 106 insertions, 29 deletions

diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile
index d3ff3949234..863ca1d1999 100644
--- a/graphics/shotwell/Makefile
+++ b/graphics/shotwell/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.70 2015/08/23 13:56:34 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2015/08/23 14:04:32 wiz Exp $
 
-DISTNAME=		shotwell-0.20.2
-PKGREVISION=		5
+DISTNAME=		shotwell-0.22.0
 CATEGORIES=		graphics
-MASTER_SITES=		https://download.gnome.org/sources/shotwell/0.20/
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/shotwell/0.22/}
 EXTRACT_SUFX=		.tar.xz
 
 MAINTAINER=		pkgrsc-users@NetBSD.org
@@ -47,6 +46,7 @@ BUILDLINK_DEPMETHOD.vala= build
 .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 "../../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 3584e303cad..2573b9afb6e 100644
--- a/graphics/shotwell/PLIST
+++ b/graphics/shotwell/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2014/11/25 10:07:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2015/08/23 14:04:32 wiz Exp $
 bin/shotwell
 lib/shotwell/plugins/builtin/f-spot-24.png
 lib/shotwell/plugins/builtin/facebook.png
@@ -78,6 +78,82 @@ 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
@@ -202,6 +278,7 @@ share/locale/ast/LC_MESSAGES/shotwell.mo
 share/locale/bg/LC_MESSAGES/shotwell.mo
 share/locale/bn/LC_MESSAGES/shotwell.mo
 share/locale/bn_IN/LC_MESSAGES/shotwell.mo
+share/locale/bs/LC_MESSAGES/shotwell.mo
 share/locale/ca/LC_MESSAGES/shotwell.mo
 share/locale/cs/LC_MESSAGES/shotwell.mo
 share/locale/da/LC_MESSAGES/shotwell.mo
@@ -263,7 +340,6 @@ 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/enhance.png
 share/shotwell/icons/filter-flagged.png
 share/shotwell/icons/filter-photos.png
 share/shotwell/icons/filter-raw.png
@@ -294,6 +370,7 @@ 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
diff --git a/graphics/shotwell/distinfo b/graphics/shotwell/distinfo
index 1e518c0eeea..5ff48d0a1cc 100644
--- a/graphics/shotwell/distinfo
+++ b/graphics/shotwell/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.15 2014/11/25 10:07:18 wiz Exp $
+$NetBSD: distinfo,v 1.16 2015/08/23 14:04:32 wiz Exp $
 
-SHA1 (shotwell-0.20.2.tar.xz) = f69ea2a2fc6ae1dad0f56bf85d1a3275dd8a6f1e
-RMD160 (shotwell-0.20.2.tar.xz) = 25c282de74f5dd35f0f44f05067eec4db6f4d33e
-Size (shotwell-0.20.2.tar.xz) = 1815580 bytes
-SHA1 (patch-aa) = 23f6982e1ba135c706afc6983c48602f6060dfad
-SHA1 (patch-ab) = e4951475348523f407fe4960fcee861e8cbc29ed
+SHA1 (shotwell-0.22.0.tar.xz) = 8ed803a5da8c61dd16a629f42946cc586197e392
+RMD160 (shotwell-0.22.0.tar.xz) = eb46f018b1022e22ff6d5198f2e341928b6ac4cb
+Size (shotwell-0.22.0.tar.xz) = 1872952 bytes
+SHA1 (patch-aa) = 3baaeceac9a1d652cd4f1ef14ee8fa96691ce598
+SHA1 (patch-ab) = 83e9ece301dc4264ecd64e85b6547471bf514ce7
 SHA1 (patch-ac) = 0183761f3ab30788703e54aecba72b194e0d770a
diff --git a/graphics/shotwell/patches/patch-aa b/graphics/shotwell/patches/patch-aa
index 73630f3e204..b0668beead2 100644
--- a/graphics/shotwell/patches/patch-aa
+++ b/graphics/shotwell/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2014/11/25 10:07:18 wiz Exp $
+$NetBSD: patch-aa,v 1.11 2015/08/23 14:04:32 wiz Exp $
 
---- Makefile.orig	2013-11-19 02:16:36.000000000 +0000
+--- Makefile.orig	2015-03-24 00:38:31.000000000 +0000
 +++ Makefile
-@@ -315,7 +315,6 @@ EXT_PKGS = \
+@@ -263,7 +263,6 @@ EXT_PKGS = \
  	gstreamer-base-1.0 \
  	gstreamer-pbutils-1.0 \
  	gtk+-3.0 \
@@ -10,15 +10,15 @@ $NetBSD: patch-aa,v 1.10 2014/11/25 10:07:18 wiz Exp $
  	libexif \
  	libgphoto2 \
  	json-glib-1.0 \
-@@ -347,7 +346,6 @@ EXT_PKG_VERSIONS = \
+@@ -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.6.0 \
+ 	gtk+-3.0 >= 3.12.2 \
 -	gudev-1.0 >= 145 \
  	libexif >= 0.6.16 \
  	libgphoto2 >= 2.4.2 \
  	libraw >= 0.13.2 \
-@@ -461,7 +459,7 @@ PLUGIN_CFLAGS += $(PROFILE_FLAGS) $(REQU
+@@ -417,7 +415,7 @@ PLUGIN_CFLAGS += $(PROFILE_FLAGS) $(REQU
  # Required for gudev-1.0
  CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE
  
@@ -27,7 +27,7 @@ $NetBSD: patch-aa,v 1.10 2014/11/25 10:07:18 wiz Exp $
  
  ifdef ENABLE_BUILD_FOR_GLADE
  all: $(PLUGINS_DIR) lib$(PROGRAM).so $(PROGRAM) $(PC_FILE)
-@@ -535,7 +533,7 @@ ifndef DISABLE_DESKTOP_VALIDATE
+@@ -489,7 +487,7 @@ ifndef DISABLE_DESKTOP_VALIDATE
  	else rm -f misc/shotwell.desktop.errors; \
  	fi
  endif
@@ -36,7 +36,7 @@ $NetBSD: patch-aa,v 1.10 2014/11/25 10:07:18 wiz Exp $
  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 \
-@@ -736,7 +732,6 @@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU
+@@ -694,7 +692,6 @@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU
  
  .PHONY: $(PLUGINS_DIR)
  $(PLUGINS_DIR): $(PLUGIN_VAPI) $(PLUGIN_HEADER) $(PLUGIN_DEPS)
diff --git a/graphics/shotwell/patches/patch-ab b/graphics/shotwell/patches/patch-ab
index 60a50b9d429..6c27c62cd8c 100644
--- a/graphics/shotwell/patches/patch-ab
+++ b/graphics/shotwell/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.6 2014/11/25 10:07:18 wiz Exp $
+$NetBSD: patch-ab,v 1.7 2015/08/23 14:04:32 wiz Exp $
 
---- src/camera/CameraTable.vala.orig	2012-03-28 22:35:57.000000000 +0000
+--- src/camera/CameraTable.vala.orig	2015-02-14 00:50:15.000000000 +0000
 +++ src/camera/CameraTable.vala
 @@ -26,7 +26,6 @@ public class CameraTable {
      
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.6 2014/11/25 10:07:18 wiz Exp $
      private OneShotScheduler camera_update_scheduler = null;
      private GPhoto.Context null_context = new GPhoto.Context();
      private GPhoto.CameraAbilitiesList abilities_list;
-@@ -44,7 +43,6 @@ public class CameraTable {
+@@ -43,7 +42,6 @@ public class CameraTable {
              on_update_cameras);
          
          // listen for interesting events on the specified subsystems
@@ -18,7 +18,7 @@ $NetBSD: patch-ab,v 1.6 2014/11/25 10:07:18 wiz Exp $
          volume_monitor = VolumeMonitor.get();
          volume_monitor.volume_changed.connect(on_volume_changed);
          volume_monitor.volume_added.connect(on_volume_changed);
-@@ -105,31 +103,6 @@ public class CameraTable {
+@@ -111,31 +109,6 @@ public class CameraTable {
      private string[] get_all_usb_cameras() {
          string[] cameras = new string[0];
          
@@ -50,7 +50,7 @@ $NetBSD: patch-ab,v 1.6 2014/11/25 10:07:18 wiz Exp $
          return cameras;
      }
      
-@@ -206,24 +179,6 @@ public class CameraTable {
+@@ -212,24 +185,6 @@ public class CameraTable {
              "/dev/bus/usb/%s".printf(port.substring(4).replace(",", "/")) : null;
      }
      
@@ -63,10 +63,10 @@ $NetBSD: patch-ab,v 1.6 2014/11/25 10:07:18 wiz Exp $
 -        return null;
 -    }
 -    
--    private GLib.Icon? get_icon_for_uuid(string uuid) {
+-    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();
+-                return volume.get_icon().to_string();
 -            }
 -        }
 -        return null;
@@ -75,7 +75,7 @@ $NetBSD: patch-ab,v 1.6 2014/11/25 10:07:18 wiz Exp $
      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;
-@@ -313,23 +268,6 @@ public class CameraTable {
+@@ -333,23 +288,6 @@ public class CameraTable {
                  continue;
              }
              
@@ -99,7 +99,7 @@ $NetBSD: patch-ab,v 1.6 2014/11/25 10:07:18 wiz Exp $
              if (null == display_name) {
                  // Default to GPhoto detected name.
                  display_name = name;
-@@ -367,14 +305,6 @@ public class CameraTable {
+@@ -394,14 +332,6 @@ public class CameraTable {
          }
      }