update to 0.10.1

changes:
-Fixes "Hide Photos Already Imported"
-Multiple editing bugs fixed
-Resolves crash when two or more cameras have the same name
-Documentation now includes saved searches
-Piwigo bugs fixed
-Translation updates

5 files changed, 102 insertions, 47 deletions

diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile
index d354480ecd4..beb98a8ea05 100644
--- a/graphics/shotwell/Makefile
+++ b/graphics/shotwell/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2011/06/10 09:39:55 obache Exp $
+# $NetBSD: Makefile,v 1.20 2011/07/12 19:00:57 drochner Exp $
 #
 
-DISTNAME=		shotwell-0.9.3
-PKGREVISION=		2
+DISTNAME=		shotwell-0.10.1
 CATEGORIES=		graphics
-MASTER_SITES=		http://yorba.org/download/shotwell/0.9/
+MASTER_SITES=		http://yorba.org/download/shotwell/0.10/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgrsc-users@NetBSD.org
@@ -48,7 +47,6 @@ BUILDLINK_API_DEPENDS.vala+= vala>=0.11.7
 .include "../../net/libsoup24/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/json-glib/buildlink3.mk"
 .include "../../www/webkit-gtk/buildlink3.mk"
diff --git a/graphics/shotwell/PLIST b/graphics/shotwell/PLIST
index a21232582d3..c51b9ffc806 100644
--- a/graphics/shotwell/PLIST
+++ b/graphics/shotwell/PLIST
@@ -1,8 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2011/04/05 18:34:20 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/07/12 19:00:57 drochner Exp $
 bin/shotwell
+bin/shotwell-video-thumbnailer
 lib/shotwell/plugins/builtin/facebook.png
 lib/shotwell/plugins/builtin/flickr.png
 lib/shotwell/plugins/builtin/picasa.png
+lib/shotwell/plugins/builtin/piwigo.png
+lib/shotwell/plugins/builtin/piwigo_authentication_pane.glade
 lib/shotwell/plugins/builtin/shotwell-publishing-extras.so
 lib/shotwell/plugins/builtin/shotwell-publishing.so
 lib/shotwell/plugins/builtin/shotwell-transitions.so
@@ -55,51 +58,97 @@ 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/ar/LC_MESSAGES/shotwell-extras.mo
 share/locale/ar/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
 share/locale/bg/LC_MESSAGES/shotwell.mo
+share/locale/bn/LC_MESSAGES/shotwell-extras.mo
 share/locale/bn/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
 share/locale/cs/LC_MESSAGES/shotwell.mo
+share/locale/da/LC_MESSAGES/shotwell-extras.mo
 share/locale/da/LC_MESSAGES/shotwell.mo
+share/locale/de/LC_MESSAGES/shotwell-extras.mo
 share/locale/de/LC_MESSAGES/shotwell.mo
+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/es/LC_MESSAGES/shotwell-extras.mo
 share/locale/es/LC_MESSAGES/shotwell.mo
+share/locale/et/LC_MESSAGES/shotwell-extras.mo
 share/locale/et/LC_MESSAGES/shotwell.mo
+share/locale/eu/LC_MESSAGES/shotwell-extras.mo
 share/locale/eu/LC_MESSAGES/shotwell.mo
+share/locale/fi/LC_MESSAGES/shotwell-extras.mo
 share/locale/fi/LC_MESSAGES/shotwell.mo
+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/he/LC_MESSAGES/shotwell-extras.mo
 share/locale/he/LC_MESSAGES/shotwell.mo
+share/locale/hr/LC_MESSAGES/shotwell-extras.mo
 share/locale/hr/LC_MESSAGES/shotwell.mo
+share/locale/hu/LC_MESSAGES/shotwell-extras.mo
 share/locale/hu/LC_MESSAGES/shotwell.mo
+share/locale/id/LC_MESSAGES/shotwell-extras.mo
 share/locale/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
 share/locale/ja/LC_MESSAGES/shotwell.mo
+share/locale/kk/LC_MESSAGES/shotwell-extras.mo
 share/locale/kk/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
 share/locale/lt/LC_MESSAGES/shotwell.mo
+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/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/pa/LC_MESSAGES/shotwell-extras.mo
 share/locale/pa/LC_MESSAGES/shotwell.mo
+share/locale/pl/LC_MESSAGES/shotwell-extras.mo
 share/locale/pl/LC_MESSAGES/shotwell.mo
+share/locale/pt/LC_MESSAGES/shotwell-extras.mo
 share/locale/pt/LC_MESSAGES/shotwell.mo
+share/locale/pt_BR/LC_MESSAGES/shotwell-extras.mo
 share/locale/pt_BR/LC_MESSAGES/shotwell.mo
+share/locale/ro/LC_MESSAGES/shotwell-extras.mo
 share/locale/ro/LC_MESSAGES/shotwell.mo
+share/locale/ru/LC_MESSAGES/shotwell-extras.mo
 share/locale/ru/LC_MESSAGES/shotwell.mo
+share/locale/sk/LC_MESSAGES/shotwell-extras.mo
 share/locale/sk/LC_MESSAGES/shotwell.mo
+share/locale/sl/LC_MESSAGES/shotwell-extras.mo
 share/locale/sl/LC_MESSAGES/shotwell.mo
+share/locale/sr/LC_MESSAGES/shotwell-extras.mo
 share/locale/sr/LC_MESSAGES/shotwell.mo
+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/te/LC_MESSAGES/shotwell-extras.mo
 share/locale/te/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/uk/LC_MESSAGES/shotwell-extras.mo
 share/locale/uk/LC_MESSAGES/shotwell.mo
+share/locale/zh_CN/LC_MESSAGES/shotwell-extras.mo
 share/locale/zh_CN/LC_MESSAGES/shotwell.mo
+share/locale/zh_TW/LC_MESSAGES/shotwell-extras.mo
 share/locale/zh_TW/LC_MESSAGES/shotwell.mo
 share/shotwell/icons/all-rejected.png
 share/shotwell/icons/crop-pivot-reticle.png
@@ -159,8 +208,11 @@ share/shotwell/ui/import_queue.ui
 share/shotwell/ui/media.ui
 share/shotwell/ui/offline.ui
 share/shotwell/ui/photo.ui
+share/shotwell/ui/savedsearch.ui
 share/shotwell/ui/search_bar.ui
 share/shotwell/ui/set_background_dialog.glade
 share/shotwell/ui/shotwell.glade
+share/shotwell/ui/shotwell.xml
+share/shotwell/ui/sidebar_default.ui
 share/shotwell/ui/tags.ui
 share/shotwell/ui/trash.ui
diff --git a/graphics/shotwell/distinfo b/graphics/shotwell/distinfo
index be2230ecf86..9c6c1732393 100644
--- a/graphics/shotwell/distinfo
+++ b/graphics/shotwell/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2011/05/14 18:55:59 gls Exp $
+$NetBSD: distinfo,v 1.9 2011/07/12 19:00:57 drochner Exp $
 
-SHA1 (shotwell-0.9.3.tar.bz2) = e0bfba6eb408cfb6fa133e1cc929b2f03c710250
-RMD160 (shotwell-0.9.3.tar.bz2) = ec4317999922f2e709e2060c555694255f924cad
-Size (shotwell-0.9.3.tar.bz2) = 1462225 bytes
-SHA1 (patch-aa) = 91a17a63a2ef1000cc02fbacaee77f5d489c5828
-SHA1 (patch-ab) = 5f9699feb50926e449b7c5a51152f7ea58da79e6
+SHA1 (shotwell-0.10.1.tar.bz2) = abd6e771168910943101b62d76f7768a49e69be9
+RMD160 (shotwell-0.10.1.tar.bz2) = 44cccbebf4f1bf024229da9afbcc6d4db510be96
+Size (shotwell-0.10.1.tar.bz2) = 1483679 bytes
+SHA1 (patch-aa) = 8eed6766df5ef9084a47c92fdbd85d3fc0f60827
+SHA1 (patch-ab) = 07503807a44fe20ba33481eb3d8fde9e34c460c0
diff --git a/graphics/shotwell/patches/patch-aa b/graphics/shotwell/patches/patch-aa
index cec1bfa237d..9472700ed12 100644
--- a/graphics/shotwell/patches/patch-aa
+++ b/graphics/shotwell/patches/patch-aa
@@ -1,9 +1,10 @@
-$NetBSD: patch-aa,v 1.6 2011/05/14 18:56:00 gls Exp $
+$NetBSD: patch-aa,v 1.7 2011/07/12 19:00:57 drochner Exp $
 
 Remove gudev requirements. Fix m4 params and libraw configuration.
---- Makefile.orig	2011-04-12 22:04:01.000000000 +0000
+
+--- Makefile.orig	2011-06-02 19:11:21.000000000 +0000
 +++ Makefile
-@@ -261,7 +261,6 @@ EXT_PKGS = \
+@@ -264,7 +264,6 @@ EXT_PKGS = \
  	gstreamer-0.10 \
  	gstreamer-base-0.10 \
  	gtk+-2.0 \
@@ -11,7 +12,7 @@ Remove gudev requirements. Fix m4 params and libraw configuration.
  	libexif \
  	libgphoto2 \
  	libsoup-2.4 \
-@@ -288,7 +287,6 @@ EXT_PKG_VERSIONS = \
+@@ -296,7 +295,6 @@ EXT_PKG_VERSIONS = \
  	gstreamer-0.10 >= 0.10.28 \
  	gstreamer-base-0.10 >= 0.10.28 \
  	gtk+-2.0 >= 2.18.0 \
@@ -19,55 +20,59 @@ Remove gudev requirements. Fix m4 params and libraw configuration.
  	libexif >= 0.6.16 \
  	libgphoto2 >= 2.4.2 \
  	libsoup-2.4 >= 2.26.0 \
-@@ -394,7 +392,7 @@ CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHA
+@@ -375,7 +373,7 @@ DIST_FILES = Makefile configure chkver $
+ 	$(EXPANDED_HELP_FILES) $(EXPANDED_HELP_IMAGES) apport/shotwell.py $(UNIT_RESOURCES) $(UNIT_MKS) \
+ 	unitize.mk units.mk $(PC_INPUT) $(PLUGINS_DIST_FILES) \
+ 	$(EXPANDED_THUMBNAILER_SRC_FILES)
+-	
++
+ 
+ DIST_TAR = $(PROGRAM)-$(VERSION).tar
+ DIST_TAR_BZ2 = $(DIST_TAR).bz2
+@@ -420,7 +418,7 @@ CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHA
  # if not available.
  LIBRAW_CONFIG=./libraw-config
-
+ 
 -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 ),)
-@@ -574,7 +572,7 @@ $(PC_FILE): $(PC_INPUT) $(MAKE_FILES)
- $(UNITIZE_STAMP): $(MAKE_FILES) src/unit/rc/UnitInternals.m4 src/unit/rc/unitize_entry.m4
- 	@mkdir -p $(UNITIZE_DIR)
- 	@$(foreach group,$(APP_GROUPS),\
--		`m4 '--define=_APP_GROUP_=$(group)' '--define=_UNIT_ENTRY_POINTS_=$(foreach nm,$($(group)_UNITS),$(nm).init_entry,)' '--define=_UNIT_TERMINATE_POINTS_=$(foreach nm,$($(group)_UNITS),$(nm).terminate_entry,)' src/unit/rc/unitize_entry.m4 > $(UNITIZE_DIR)/_$(group)_unitize_entry.vala`)
-+		`m4 '-D_APP_GROUP_=$(group)' '-D_UNIT_ENTRY_POINTS_=$(foreach nm,$($(group)_UNITS),$(nm).init_entry,)' '-D_UNIT_TERMINATE_POINTS_=$(foreach nm,$($(group)_UNITS),$(nm).terminate_entry,)' src/unit/rc/unitize_entry.m4 > $(UNITIZE_DIR)/_$(group)_unitize_entry.vala`)
- 	@$(foreach nm,$(UNIT_NAMESPACES),\
- 		`m4 '-D_UNIT_NAME_=$(nm)' '-D_UNIT_USES_INITS_=$($(nm)_USES_INITS)' '-D_UNIT_USES_TERMINATORS_=$($(nm)_USES_TERMINATORS)' src/unit/rc/UnitInternals.m4 > $(UNITIZE_DIR)/_$(nm)Internals.vala`)
- 	@touch $@
-@@ -584,7 +582,6 @@ $(UNITIZE_INITS) $(UNITIZE_ENTRIES): $(U
-
+@@ -638,7 +636,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)
- ifndef ASSUME_PKGS
- ifdef EXT_PKG_VERSIONS
- 	@pkg-config --print-errors --exists '$(EXT_PKG_VERSIONS) $(DIRECT_LIBS_VERSIONS)'
-@@ -611,17 +608,16 @@ $(EXPANDED_C_FILES): $(VALA_STAMP)
+ 	@echo Compiling Vala code...
+ 	@mkdir -p $(BUILD_DIR)
+ 	@$(VALAC) --ccode --directory=$(BUILD_DIR) --basedir=src \
+@@ -655,10 +652,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)
+ 
+ $(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) $(THUMBNAILER_BIN)
 -	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@
-+	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(LDFLAGS) `pkg-config --libs libraw` $(EXPORT_FLAGS) -o $@
-
- $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLUGINS_DIR)
- 	@
-
++	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `pkg-config --libs libraw` $(EXPORT_FLAGS) -o $@
+ 
+ $(THUMBNAILER_BIN): $(EXPANDED_THUMBNAILER_SRC_FILES)
+ 	$(VALAC) $(EXPANDED_THUMBNAILER_SRC_FILES) $(VALAFLAGS) -o $@ $(foreach pkg,$(THUMBNAILER_PKGS),--pkg=$(pkg))
+@@ -668,7 +665,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)"
-
-@@ -639,5 +635,5 @@ docs:
+ 
+@@ -686,7 +682,7 @@ docs:
  glade: lib$(PROGRAM).so
-
+ 
  lib$(PROGRAM).so: $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)
 -	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(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:
diff --git a/graphics/shotwell/patches/patch-ab b/graphics/shotwell/patches/patch-ab
index 8be67a678de..32e3b88a6ee 100644
--- a/graphics/shotwell/patches/patch-ab
+++ b/graphics/shotwell/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.3 2011/04/05 18:34:20 drochner Exp $
+$NetBSD: patch-ab,v 1.4 2011/07/12 19:00:57 drochner Exp $
 
---- src/CameraTable.vala.orig	2011-03-22 20:46:15.000000000 +0000
-+++ src/CameraTable.vala
+--- src/camera/CameraTable.vala.orig	2011-03-22 20:46:15.000000000 +0000
++++ src/camera/CameraTable.vala
 @@ -26,7 +26,6 @@ public class CameraTable {
      
      private static CameraTable instance = null;