update to 0.15.1

changes:
Copy and paste color adjustments between photos
Highlights detail adjustment
YouTube plugin now uses OAuth / OpenID
Videos in Missing Files now re-import properly
Improvements when thumbnailing videos
Numerous bug fixes

5 files changed, 68 insertions, 42 deletions

diff --git a/graphics/shotwell-gtk3/Makefile b/graphics/shotwell-gtk3/Makefile
index 312bb55ba66..3f5b11ee7f2 100644
--- a/graphics/shotwell-gtk3/Makefile
+++ b/graphics/shotwell-gtk3/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2013/10/19 09:07:05 adam Exp $
+# $NetBSD: Makefile,v 1.25 2013/12/04 12:57:47 drochner Exp $
 #
 
-DISTNAME=		shotwell-0.14.1
-PKGREVISION=		8
+DISTNAME=		shotwell-0.15.1
 CATEGORIES=		graphics
-MASTER_SITES=		http://yorba.org/download/shotwell/0.14/
+MASTER_SITES=		http://yorba.org/download/shotwell/0.15/
 EXTRACT_SUFX=		.tar.xz
 
 MAINTAINER=		pkgrsc-users@NetBSD.org
@@ -27,7 +26,7 @@ REPLACE_SH+=		configure
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/glib2/schemas.mk"
-.include "../../devel/libgee/buildlink3.mk"
+.include "../../devel/libgee0.8/buildlink3.mk"
 .include "../../devel/libgphoto2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
diff --git a/graphics/shotwell-gtk3/PLIST b/graphics/shotwell-gtk3/PLIST
index 769491f25a4..7f43fc71b53 100644
--- a/graphics/shotwell-gtk3/PLIST
+++ b/graphics/shotwell-gtk3/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2013/04/08 16:51:59 drochner Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/12/04 12:57:47 drochner Exp $
 bin/shotwell
-bin/shotwell-video-thumbnailer
 lib/shotwell/plugins/builtin/f-spot-24.png
 lib/shotwell/plugins/builtin/facebook.png
 lib/shotwell/plugins/builtin/facebook_publishing_options_pane.glade
@@ -8,8 +7,6 @@ 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/picasa.png
-lib/shotwell/plugins/builtin/picasa_auth_code_entry_pane.glade
-lib/shotwell/plugins/builtin/picasa_not_set_up_pane.glade
 lib/shotwell/plugins/builtin/picasa_publishing_options_pane.glade
 lib/shotwell/plugins/builtin/piwigo.png
 lib/shotwell/plugins/builtin/piwigo_authentication_pane.glade
@@ -20,10 +17,14 @@ 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
 libexec/shotwell/shotwell-settings-migrator
+libexec/shotwell/shotwell-video-thumbnailer
+share/appdata/shotwell.appdata.xml
 share/applications/shotwell-viewer.desktop
 share/applications/shotwell.desktop
 share/glib-2.0/schemas/org.yorba.shotwell-extras.gschema.xml
@@ -75,6 +76,7 @@ share/icons/hicolor/16x16/apps/shotwell.svg
 share/icons/hicolor/24x24/apps/shotwell.svg
 share/icons/hicolor/scalable/apps/shotwell.svg
 share/locale/af/LC_MESSAGES/shotwell.mo
+share/locale/af_ZA/LC_MESSAGES/shotwell.mo
 share/locale/ar/LC_MESSAGES/shotwell-extras.mo
 share/locale/ar/LC_MESSAGES/shotwell.mo
 share/locale/as/LC_MESSAGES/shotwell-extras.mo
@@ -85,6 +87,8 @@ share/locale/bg/LC_MESSAGES/shotwell-extras.mo
 share/locale/bg/LC_MESSAGES/shotwell.mo
 share/locale/bn/LC_MESSAGES/shotwell-extras.mo
 share/locale/bn/LC_MESSAGES/shotwell.mo
+share/locale/bn_IN/LC_MESSAGES/shotwell-extras.mo
+share/locale/bn_IN/LC_MESSAGES/shotwell.mo
 share/locale/ca/LC_MESSAGES/shotwell-extras.mo
 share/locale/ca/LC_MESSAGES/shotwell.mo
 share/locale/cs/LC_MESSAGES/shotwell-extras.mo
@@ -110,6 +114,7 @@ share/locale/fr/LC_MESSAGES/shotwell-extras.mo
 share/locale/fr/LC_MESSAGES/shotwell.mo
 share/locale/gl/LC_MESSAGES/shotwell-extras.mo
 share/locale/gl/LC_MESSAGES/shotwell.mo
+share/locale/gu/LC_MESSAGES/shotwell-extras.mo
 share/locale/gu/LC_MESSAGES/shotwell.mo
 share/locale/he/LC_MESSAGES/shotwell-extras.mo
 share/locale/he/LC_MESSAGES/shotwell.mo
@@ -122,6 +127,8 @@ share/locale/hu/LC_MESSAGES/shotwell.mo
 share/locale/ia/LC_MESSAGES/shotwell.mo
 share/locale/id/LC_MESSAGES/shotwell-extras.mo
 share/locale/id/LC_MESSAGES/shotwell.mo
+share/locale/id_ID/LC_MESSAGES/shotwell-extras.mo
+share/locale/id_ID/LC_MESSAGES/shotwell.mo
 share/locale/it/LC_MESSAGES/shotwell-extras.mo
 share/locale/it/LC_MESSAGES/shotwell.mo
 share/locale/ja/LC_MESSAGES/shotwell-extras.mo
@@ -133,6 +140,7 @@ share/locale/kn/LC_MESSAGES/shotwell-extras.mo
 share/locale/kn/LC_MESSAGES/shotwell.mo
 share/locale/ko/LC_MESSAGES/shotwell-extras.mo
 share/locale/ko/LC_MESSAGES/shotwell.mo
+share/locale/ky/LC_MESSAGES/shotwell.mo
 share/locale/lt/LC_MESSAGES/shotwell-extras.mo
 share/locale/lt/LC_MESSAGES/shotwell.mo
 share/locale/lv/LC_MESSAGES/shotwell-extras.mo
@@ -147,6 +155,8 @@ share/locale/nb/LC_MESSAGES/shotwell-extras.mo
 share/locale/nb/LC_MESSAGES/shotwell.mo
 share/locale/nl/LC_MESSAGES/shotwell-extras.mo
 share/locale/nl/LC_MESSAGES/shotwell.mo
+share/locale/nn_NO/LC_MESSAGES/shotwell-extras.mo
+share/locale/nn_NO/LC_MESSAGES/shotwell.mo
 share/locale/or/LC_MESSAGES/shotwell-extras.mo
 share/locale/or/LC_MESSAGES/shotwell.mo
 share/locale/pa/LC_MESSAGES/shotwell-extras.mo
@@ -171,14 +181,19 @@ share/locale/sv/LC_MESSAGES/shotwell-extras.mo
 share/locale/sv/LC_MESSAGES/shotwell.mo
 share/locale/ta/LC_MESSAGES/shotwell-extras.mo
 share/locale/ta/LC_MESSAGES/shotwell.mo
+share/locale/ta_IN/LC_MESSAGES/shotwell.mo
 share/locale/te/LC_MESSAGES/shotwell-extras.mo
 share/locale/te/LC_MESSAGES/shotwell.mo
+share/locale/te_IN/LC_MESSAGES/shotwell.mo
 share/locale/th/LC_MESSAGES/shotwell-extras.mo
 share/locale/th/LC_MESSAGES/shotwell.mo
 share/locale/tr/LC_MESSAGES/shotwell-extras.mo
 share/locale/tr/LC_MESSAGES/shotwell.mo
+share/locale/tr_TR/LC_MESSAGES/shotwell-extras.mo
+share/locale/tr_TR/LC_MESSAGES/shotwell.mo
 share/locale/uk/LC_MESSAGES/shotwell-extras.mo
 share/locale/uk/LC_MESSAGES/shotwell.mo
+share/locale/vi/LC_MESSAGES/shotwell-extras.mo
 share/locale/vi/LC_MESSAGES/shotwell.mo
 share/locale/zh_CN/LC_MESSAGES/shotwell-extras.mo
 share/locale/zh_CN/LC_MESSAGES/shotwell.mo
@@ -207,6 +222,7 @@ 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
diff --git a/graphics/shotwell-gtk3/distinfo b/graphics/shotwell-gtk3/distinfo
index a05630a1db4..493765027f0 100644
--- a/graphics/shotwell-gtk3/distinfo
+++ b/graphics/shotwell-gtk3/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.6 2013/07/22 16:22:01 drochner Exp $
+$NetBSD: distinfo,v 1.7 2013/12/04 12:57:47 drochner Exp $
 
-SHA1 (shotwell-0.14.1.tar.xz) = 7fa0fc21938b7627411d6d6c6c78c262bd6b756c
-RMD160 (shotwell-0.14.1.tar.xz) = f7aac98f1c6cdf56dd8f4c7e6902c242e7ca4028
-Size (shotwell-0.14.1.tar.xz) = 1624784 bytes
-SHA1 (patch-aa) = 555213fdc75b78dbc76f35d17f90c8526c087337
+SHA1 (shotwell-0.15.1.tar.xz) = 73cace6b81eb273edff13ce0aeeeeba85edfad7f
+RMD160 (shotwell-0.15.1.tar.xz) = 3d16687fdb2bcc39c61b680f9497d586de0860f9
+Size (shotwell-0.15.1.tar.xz) = 1676428 bytes
+SHA1 (patch-aa) = 3651a0b2f426440ee2cedf030ad90cf383eeadef
 SHA1 (patch-ab) = e4951475348523f407fe4960fcee861e8cbc29ed
-SHA1 (patch-ac) = 72cc9c3cbda9d0f6d7f30b9bb41899d9b57d1cca
-SHA1 (patch-ba) = 8361490f058cd9da6791ba10e14615fa47c28758
-SHA1 (patch-bb) = 27a391a559b16767e1106df3c8ede8cb9c83ce34
+SHA1 (patch-ac) = 0183761f3ab30788703e54aecba72b194e0d770a
diff --git a/graphics/shotwell-gtk3/patches/patch-aa b/graphics/shotwell-gtk3/patches/patch-aa
index 5705378b13f..4d4120c6d5b 100644
--- a/graphics/shotwell-gtk3/patches/patch-aa
+++ b/graphics/shotwell-gtk3/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.3 2013/04/08 16:51:59 drochner Exp $
+$NetBSD: patch-aa,v 1.4 2013/12/04 12:57:47 drochner Exp $
 
---- Makefile.orig	2013-03-18 20:32:30.000000000 +0000
+--- Makefile.orig	2013-11-19 02:16:36.000000000 +0000
 +++ Makefile
-@@ -298,7 +298,6 @@ EXT_PKGS = \
+@@ -10,7 +10,7 @@ BUILD_ROOT = 1
+ ifndef VALAC
+ VALAC := $(shell which valac)
+ else
+-VALAC := $(shell which $VALAC)
++#VALAC := $(shell which $VALAC)
+ endif
+ 
+ VALAC_VERSION := `$(VALAC) --version | awk '{print $$2}'`
+@@ -315,7 +315,6 @@ EXT_PKGS = \
  	gstreamer-base-1.0 \
  	gstreamer-pbutils-1.0 \
  	gtk+-3.0 \
@@ -10,33 +19,33 @@ $NetBSD: patch-aa,v 1.3 2013/04/08 16:51:59 drochner Exp $
  	libexif \
  	libgphoto2 \
  	json-glib-1.0 \
-@@ -330,7 +329,6 @@ EXT_PKG_VERSIONS = \
+@@ -347,7 +346,6 @@ EXT_PKG_VERSIONS = \
  	gstreamer-plugins-base-1.0 >= 1.0.0 \
  	gstreamer-pbutils-1.0 >= 1.0.0 \
- 	gtk+-3.0 >= 3.0.11 \
+ 	gtk+-3.0 >= 3.6.0 \
 -	gudev-1.0 >= 145 \
  	libexif >= 0.6.16 \
  	libgphoto2 >= 2.4.2 \
  	libraw >= 0.13.2 \
-@@ -411,7 +409,7 @@ DIST_FILES = Makefile configure chkver $
- 	unitize.mk units.mk $(PC_INPUT) $(PLUGINS_DIST_FILES) \
- 	vapi/gphoto-2.5/libgphoto2.vapi vapi/gphoto-2.4/libgphoto2.vapi \
- 	$(EXPANDED_THUMBNAILER_SRC_FILES) $(MIGRATOR_BIN)
--	
-+
+@@ -461,7 +459,7 @@ PLUGIN_CFLAGS += $(PROFILE_FLAGS) $(REQU
+ # Required for gudev-1.0
+ CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE
  
- DIST_TAR = $(PROGRAM)-$(VERSION).tar
- DIST_TAR_XZ = $(DIST_TAR).xz
-@@ -455,7 +453,7 @@ define check_valadate_version
- 	@ pkg-config $(VALADATE_PKG_NAME) --atleast-version=$(MIN_VALADATE_VERSION) || ( echo 'Shotwell testing requires Valadate $(MIN_VALADATE_VERSION) or greater.  You are running' `pkg-config --modversion $(VALADATE_PKG_NAME)` '\b.'; exit 1 )
- endef
- 
--all: pkgcheck valacheck
-+all: pkgcheck
+-all: pkgcheck valacheck desktop
++all: pkgcheck desktop
  
  ifdef ENABLE_BUILD_FOR_GLADE
  all: $(PLUGINS_DIR) lib$(PROGRAM).so $(PROGRAM) $(PC_FILE)
-@@ -707,7 +705,6 @@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU
+@@ -535,7 +533,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 \
+@@ -736,7 +734,6 @@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU
  
  .PHONY: $(PLUGINS_DIR)
  $(PLUGINS_DIR): $(PLUGIN_VAPI) $(PLUGIN_HEADER) $(PLUGIN_DEPS)
diff --git a/graphics/shotwell-gtk3/patches/patch-ac b/graphics/shotwell-gtk3/patches/patch-ac
index ec206f7fc1e..b4204a2cbb2 100644
--- a/graphics/shotwell-gtk3/patches/patch-ac
+++ b/graphics/shotwell-gtk3/patches/patch-ac
@@ -1,13 +1,17 @@
-$NetBSD: patch-ac,v 1.1 2013/04/08 16:51:59 drochner Exp $
+$NetBSD: patch-ac,v 1.2 2013/12/04 12:57:47 drochner Exp $
 
---- configure.orig	2013-04-03 01:53:28.000000000 +0000
+--- configure.orig	2013-11-19 02:02:29.000000000 +0000
 +++ configure
-@@ -144,7 +144,7 @@ done
+@@ -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 
-     printf "Detected libGPhoto 2.4.x - using default code path.\n";
- else
+     pkg-config --atleast-version 2.4 libgphoto2
+-    if [ $? == 1 ]
++    if [ $? = 1 ]
+     then
+         printf "No compatible libGPhoto installation found. Configuration cannot continue.\n";
+         exit 1