update to 0.14.1

changes:
-improved raw support, error handling on import, slideshow mode
-bugfixes

5 files changed, 54 insertions, 29 deletions

diff --git a/graphics/shotwell-gtk3/Makefile b/graphics/shotwell-gtk3/Makefile
index 9c2c55f8a1c..40b3211e253 100644
--- a/graphics/shotwell-gtk3/Makefile
+++ b/graphics/shotwell-gtk3/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2013/02/16 11:22:31 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2013/04/08 16:51:59 drochner Exp $
 #
 
-DISTNAME=		shotwell-0.13.1
-PKGREVISION=		2
+DISTNAME=		shotwell-0.14.1
 CATEGORIES=		graphics
-MASTER_SITES=		http://yorba.org/download/shotwell/0.13/
+MASTER_SITES=		http://yorba.org/download/shotwell/0.14/
 EXTRACT_SUFX=		.tar.xz
 
 MAINTAINER=		pkgrsc-users@NetBSD.org
@@ -23,6 +22,8 @@ MAKE_ENV+=		VALAC=${VALAC}
 
 REPLACE_SH+=		configure
 
+.include "../../multimedia/gstreamer1/buildlink3.mk"
+.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../devel/libgee/buildlink3.mk"
diff --git a/graphics/shotwell-gtk3/PLIST b/graphics/shotwell-gtk3/PLIST
index 1614d7dea43..769491f25a4 100644
--- a/graphics/shotwell-gtk3/PLIST
+++ b/graphics/shotwell-gtk3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2012/10/10 11:41:12 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/04/08 16:51:59 drochner Exp $
 bin/shotwell
 bin/shotwell-video-thumbnailer
 lib/shotwell/plugins/builtin/f-spot-24.png
@@ -19,6 +19,7 @@ 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/yandex_publish_model.glade
 lib/shotwell/plugins/builtin/youtube.png
 lib/shotwell/plugins/builtin/youtube_publishing_options_pane.glade
@@ -73,8 +74,11 @@ share/gnome/help/shotwell/C/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/locale/af/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
+share/locale/as/LC_MESSAGES/shotwell.mo
 share/locale/ast/LC_MESSAGES/shotwell-extras.mo
 share/locale/ast/LC_MESSAGES/shotwell.mo
 share/locale/bg/LC_MESSAGES/shotwell-extras.mo
@@ -106,8 +110,10 @@ 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.mo
 share/locale/he/LC_MESSAGES/shotwell-extras.mo
 share/locale/he/LC_MESSAGES/shotwell.mo
+share/locale/hi/LC_MESSAGES/shotwell-extras.mo
 share/locale/hi/LC_MESSAGES/shotwell.mo
 share/locale/hr/LC_MESSAGES/shotwell-extras.mo
 share/locale/hr/LC_MESSAGES/shotwell.mo
@@ -123,6 +129,8 @@ share/locale/ja/LC_MESSAGES/shotwell.mo
 share/locale/kk/LC_MESSAGES/shotwell-extras.mo
 share/locale/kk/LC_MESSAGES/shotwell.mo
 share/locale/km/LC_MESSAGES/shotwell.mo
+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/lt/LC_MESSAGES/shotwell-extras.mo
@@ -131,6 +139,10 @@ share/locale/lv/LC_MESSAGES/shotwell-extras.mo
 share/locale/lv/LC_MESSAGES/shotwell.mo
 share/locale/mk/LC_MESSAGES/shotwell-extras.mo
 share/locale/mk/LC_MESSAGES/shotwell.mo
+share/locale/ml/LC_MESSAGES/shotwell-extras.mo
+share/locale/ml/LC_MESSAGES/shotwell.mo
+share/locale/mr/LC_MESSAGES/shotwell-extras.mo
+share/locale/mr/LC_MESSAGES/shotwell.mo
 share/locale/nb/LC_MESSAGES/shotwell-extras.mo
 share/locale/nb/LC_MESSAGES/shotwell.mo
 share/locale/nl/LC_MESSAGES/shotwell-extras.mo
@@ -159,10 +171,8 @@ 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
diff --git a/graphics/shotwell-gtk3/distinfo b/graphics/shotwell-gtk3/distinfo
index 120b07c691b..5756b2f5f0e 100644
--- a/graphics/shotwell-gtk3/distinfo
+++ b/graphics/shotwell-gtk3/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2012/10/10 11:41:12 drochner Exp $
+$NetBSD: distinfo,v 1.5 2013/04/08 16:51:59 drochner Exp $
 
-SHA1 (shotwell-0.13.1.tar.xz) = 2748966e851baa465906c3c9bbfedcd48008432d
-RMD160 (shotwell-0.13.1.tar.xz) = 3c40f5a99993c25936eecab57b0c28898e254ef9
-Size (shotwell-0.13.1.tar.xz) = 1497664 bytes
-SHA1 (patch-aa) = 06e09d59f59a9d09168789725fc370b3616f0d25
+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 (patch-ab) = e4951475348523f407fe4960fcee861e8cbc29ed
+SHA1 (patch-ac) = 72cc9c3cbda9d0f6d7f30b9bb41899d9b57d1cca
diff --git a/graphics/shotwell-gtk3/patches/patch-aa b/graphics/shotwell-gtk3/patches/patch-aa
index c8da214c4b0..5705378b13f 100644
--- a/graphics/shotwell-gtk3/patches/patch-aa
+++ b/graphics/shotwell-gtk3/patches/patch-aa
@@ -1,24 +1,24 @@
-$NetBSD: patch-aa,v 1.2 2012/10/10 11:41:12 drochner Exp $
+$NetBSD: patch-aa,v 1.3 2013/04/08 16:51:59 drochner Exp $
 
---- Makefile.orig	2012-09-19 23:24:26.000000000 +0000
+--- Makefile.orig	2013-03-18 20:32:30.000000000 +0000
 +++ Makefile
-@@ -297,7 +297,6 @@ EXT_PKGS = \
- 	gstreamer-base-0.10 \
- 	gstreamer-pbutils-0.10 \
+@@ -298,7 +298,6 @@ EXT_PKGS = \
+ 	gstreamer-base-1.0 \
+ 	gstreamer-pbutils-1.0 \
  	gtk+-3.0 \
 -	gudev-1.0 \
  	libexif \
  	libgphoto2 \
  	json-glib-1.0 \
 @@ -330,7 +329,6 @@ EXT_PKG_VERSIONS = \
- 	gstreamer-plugins-base-0.10 >= 0.10.32 \
- 	gstreamer-pbutils-0.10 >= 0.10.32 \
+ 	gstreamer-plugins-base-1.0 >= 1.0.0 \
+ 	gstreamer-pbutils-1.0 >= 1.0.0 \
  	gtk+-3.0 >= 3.0.11 \
 -	gudev-1.0 >= 145 \
  	libexif >= 0.6.16 \
  	libgphoto2 >= 2.4.2 \
  	libraw >= 0.13.2 \
-@@ -412,7 +410,7 @@ DIST_FILES = Makefile configure chkver $
+@@ -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)
@@ -27,16 +27,16 @@ $NetBSD: patch-aa,v 1.2 2012/10/10 11:41:12 drochner Exp $
  
  DIST_TAR = $(PROGRAM)-$(VERSION).tar
  DIST_TAR_XZ = $(DIST_TAR).xz
-@@ -452,7 +450,7 @@ PLUGIN_CFLAGS += $(REQUIRED_CFLAGS)
- # Required for gudev-1.0
- CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE
+@@ -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
  
--define check_valac_version
-+define xcheck_valac_version
- 	@ ./chkver min $(VALAC_VERSION) $(MIN_VALAC_VERSION) || ( echo 'Shotwell requires Vala compiler $(MIN_VALAC_VERSION) or greater.  You are running' $(VALAC_VERSION) '\b.'; exit 1 )
- 	$(if $(MAX_VALAC_VERSION),\
- 		@ ./chkver max $(VALAC_VERSION) $(MAX_VALAC_VERSION) || ( echo 'Shotwell cannot be built by Vala compiler $(MAX_VALAC_VERSION) or greater.  You are running' $(VALAC_VERSION) '\b.'; exit 1 ),)
-@@ -710,7 +708,6 @@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU
+-all: pkgcheck valacheck
++all: pkgcheck
+ 
+ ifdef ENABLE_BUILD_FOR_GLADE
+ all: $(PLUGINS_DIR) lib$(PROGRAM).so $(PROGRAM) $(PC_FILE)
+@@ -707,7 +705,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
new file mode 100644
index 00000000000..ec206f7fc1e
--- /dev/null
+++ b/graphics/shotwell-gtk3/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2013/04/08 16:51:59 drochner Exp $
+
+--- configure.orig	2013-04-03 01:53:28.000000000 +0000
++++ configure
+@@ -144,7 +144,7 @@ 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