update to 0.13.1

new major release, many fixes and improvements

4 files changed, 42 insertions, 53 deletions

diff --git a/graphics/shotwell-gtk3/Makefile b/graphics/shotwell-gtk3/Makefile
index 1ec7c5e33c1..24869833b47 100644
--- a/graphics/shotwell-gtk3/Makefile
+++ b/graphics/shotwell-gtk3/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2012/10/08 23:01:49 adam Exp $
+# $NetBSD: Makefile,v 1.12 2012/10/10 11:41:12 drochner Exp $
 #
 
-DISTNAME=		shotwell-0.12.3
-PKGREVISION=		5
+DISTNAME=		shotwell-0.13.1
 CATEGORIES=		graphics
-MASTER_SITES=		http://yorba.org/download/shotwell/0.12/
-EXTRACT_SUFX=		.tar.bz2
+MASTER_SITES=		http://yorba.org/download/shotwell/0.13/
+EXTRACT_SUFX=		.tar.xz
 
 MAINTAINER=		pkgrsc-users@NetBSD.org
 HOMEPAGE=		http://yorba.org/shotwell/
@@ -37,7 +36,7 @@ BUILDLINK_ABI_DEPENDS.libraw+= libraw>=0.13.2
 # Required for dealing with .svg icons. Spotted on a clean box
 .include "../../graphics/librsvg/buildlink3.mk"
 BUILDLINK_DEPMETHOD.vala= build
-.include "../../lang/vala016/buildlink3.mk"
+.include "../../lang/vala018/buildlink3.mk"
 .include "../../net/libsoup24/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
diff --git a/graphics/shotwell-gtk3/PLIST b/graphics/shotwell-gtk3/PLIST
index dfec60ad0cb..1614d7dea43 100644
--- a/graphics/shotwell-gtk3/PLIST
+++ b/graphics/shotwell-gtk3/PLIST
@@ -1,10 +1,16 @@
-@comment $NetBSD: PLIST,v 1.2 2012/04/14 21:56:51 gls Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/10/10 11:41:12 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
 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
 lib/shotwell/plugins/builtin/piwigo_publishing_options_pane.glade
@@ -15,6 +21,8 @@ lib/shotwell/plugins/builtin/shotwell-transitions.so
 lib/shotwell/plugins/builtin/slideshow-plugin.png
 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
 share/applications/shotwell-viewer.desktop
 share/applications/shotwell.desktop
 share/glib-2.0/schemas/org.yorba.shotwell-extras.gschema.xml
@@ -85,6 +93,7 @@ share/locale/el/LC_MESSAGES/shotwell-extras.mo
 share/locale/el/LC_MESSAGES/shotwell.mo
 share/locale/en_GB/LC_MESSAGES/shotwell-extras.mo
 share/locale/en_GB/LC_MESSAGES/shotwell.mo
+share/locale/eo/LC_MESSAGES/shotwell-extras.mo
 share/locale/es/LC_MESSAGES/shotwell-extras.mo
 share/locale/es/LC_MESSAGES/shotwell.mo
 share/locale/et/LC_MESSAGES/shotwell-extras.mo
@@ -113,6 +122,7 @@ share/locale/ja/LC_MESSAGES/shotwell-extras.mo
 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/ko/LC_MESSAGES/shotwell-extras.mo
 share/locale/ko/LC_MESSAGES/shotwell.mo
 share/locale/lt/LC_MESSAGES/shotwell-extras.mo
@@ -125,6 +135,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/or/LC_MESSAGES/shotwell-extras.mo
+share/locale/or/LC_MESSAGES/shotwell.mo
 share/locale/pa/LC_MESSAGES/shotwell-extras.mo
 share/locale/pa/LC_MESSAGES/shotwell.mo
 share/locale/pl/LC_MESSAGES/shotwell-extras.mo
@@ -157,7 +169,6 @@ share/locale/tr/LC_MESSAGES/shotwell-extras.mo
 share/locale/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
diff --git a/graphics/shotwell-gtk3/distinfo b/graphics/shotwell-gtk3/distinfo
index 2c96f5dd9e7..120b07c691b 100644
--- a/graphics/shotwell-gtk3/distinfo
+++ b/graphics/shotwell-gtk3/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2012/08/04 14:38:24 drochner Exp $
+$NetBSD: distinfo,v 1.4 2012/10/10 11:41:12 drochner Exp $
 
-SHA1 (shotwell-0.12.3.tar.bz2) = 7232ebb3e7592993b4b1cf835974e3725a1eda70
-RMD160 (shotwell-0.12.3.tar.bz2) = ba8339b41f9a10ee41f317c4911a3d8135e62039
-Size (shotwell-0.12.3.tar.bz2) = 1649746 bytes
-SHA1 (patch-aa) = 91759c3ac9541e22e48d21e20bf906acf526c5ce
+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 (patch-ab) = e4951475348523f407fe4960fcee861e8cbc29ed
diff --git a/graphics/shotwell-gtk3/patches/patch-aa b/graphics/shotwell-gtk3/patches/patch-aa
index 8eda524ff3b..c8da214c4b0 100644
--- a/graphics/shotwell-gtk3/patches/patch-aa
+++ b/graphics/shotwell-gtk3/patches/patch-aa
@@ -1,54 +1,42 @@
-$NetBSD: patch-aa,v 1.1.1.1 2012/04/11 11:48:30 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2012/10/10 11:41:12 drochner Exp $
 
---- Makefile.orig	2012-03-28 22:35:57.000000000 +0000
+--- Makefile.orig	2012-09-19 23:24:26.000000000 +0000
 +++ Makefile
-@@ -280,7 +280,6 @@ EXT_PKGS = \
+@@ -297,7 +297,6 @@ EXT_PKGS = \
  	gstreamer-base-0.10 \
  	gstreamer-pbutils-0.10 \
  	gtk+-3.0 \
 -	gudev-1.0 \
  	libexif \
  	libgphoto2 \
- 	libsoup-2.4 \
-@@ -316,7 +315,6 @@ EXT_PKG_VERSIONS = \
+ 	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 \
  	gtk+-3.0 >= 3.0.11 \
 -	gudev-1.0 >= 145 \
  	libexif >= 0.6.16 \
  	libgphoto2 >= 2.4.2 \
- 	libsoup-2.4 >= 2.26.0 \
-@@ -440,7 +438,7 @@ CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHA
- # if not available.
- LIBRAW_CONFIG=./libraw-config
+ 	libraw >= 0.13.2 \
+@@ -412,7 +410,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)
+-	
++
+ 
+ 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
  
 -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 ),)
-@@ -666,7 +664,6 @@ $(UNITIZE_INITS) $(UNITIZE_ENTRIES): $(U
- 
- # EXPANDED_SRC_FILES includes UNITIZE_INITS and UNITIZE_ENTRY
- $(VALA_STAMP): $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) $(EXPANDED_SRC_HEADER_FILES)
--	$(call check_valac_version)
- 	@echo Compiling Vala code...
- 	@mkdir -p $(BUILD_DIR)
- 	@$(VALAC) --ccode --directory=$(BUILD_DIR) --basedir=src \
-@@ -683,10 +680,10 @@ $(EXPANDED_C_FILES): $(VALA_STAMP)
- 	@
- 
- $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
--	$(CC) -c $(VALA_CFLAGS) `$(LIBRAW_CONFIG) --cflags` $(CFLAGS) -o $@ $<
-+	$(CC) -c $(VALA_CFLAGS) $(CFLAGS) `pkg-config --cflags libraw` -o $@ $<
- 
- $(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) $(THUMBNAILER_BIN)
--	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@
-+	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `pkg-config --libs libraw` $(EXPORT_FLAGS) -o $@
- 	glib-compile-schemas misc
- 
- $(THUMBNAILER_BIN): $(EXPANDED_THUMBNAILER_SRC_FILES)
-@@ -697,7 +694,6 @@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU
+@@ -710,7 +708,6 @@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU
  
  .PHONY: $(PLUGINS_DIR)
  $(PLUGINS_DIR): $(PLUGIN_VAPI) $(PLUGIN_HEADER) $(PLUGIN_DEPS)
@@ -56,12 +44,3 @@ $NetBSD: patch-aa,v 1.1.1.1 2012/04/11 11:48:30 drochner Exp $
  	@$(MAKE) --directory=$@ PLUGINS_VERSION="$(VERSION)" USER_VALAFLAGS="$(USER_VALAFLAGS)" \
  		PLUGIN_CFLAGS="$(PLUGIN_CFLAGS)"
  
-@@ -715,7 +711,7 @@ docs:
- glade: lib$(PROGRAM).so
- 
- lib$(PROGRAM).so: $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)
--	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -shared -o $@
-+	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(LDFLAGS) `pkg-config --libs libraw` $(EXPORT_FLAGS) -shared -o $@
- 
- .PHONY: pkgcheck
- pkgcheck: