update to 0.9.1

changes:
-new search bar
-TIFF support
-plugin framework, mostly for exporting
-many more improvements and bugfixes

6 files changed, 122 insertions, 77 deletions

diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile
index 854d6bfe24a..b79b2291e22 100644
--- a/graphics/shotwell/Makefile
+++ b/graphics/shotwell/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2011/03/18 18:58:29 drochner Exp $
+# $NetBSD: Makefile,v 1.14 2011/04/05 18:34:20 drochner Exp $
 #
 
-DISTNAME=		shotwell-0.8.1
-PKGREVISION=		2
+DISTNAME=		shotwell-0.9.1
 CATEGORIES=		graphics
-MASTER_SITES=		http://yorba.org/download/shotwell/0.8/
+MASTER_SITES=		http://yorba.org/download/shotwell/0.9/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgrsc-users@NetBSD.org
@@ -41,11 +40,12 @@ post-install:
 # 0.13.2 added shared libs
 BUILDLINK_ABI_DEPENDS.libraw+= libraw>=0.13.2
 .include "../../graphics/libraw/buildlink3.mk"
-BUILDLINK_API_DEPENDS.vala+= vala>=0.10.4
+BUILDLINK_API_DEPENDS.vala+= vala>=0.11.7
 .include "../../lang/vala/buildlink3.mk"
 .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 6c0b098329a..a21232582d3 100644
--- a/graphics/shotwell/PLIST
+++ b/graphics/shotwell/PLIST
@@ -1,5 +1,14 @@
-@comment $NetBSD: PLIST,v 1.2 2011/01/11 20:46:16 gls Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/04/05 18:34:20 drochner Exp $
 bin/shotwell
+lib/shotwell/plugins/builtin/facebook.png
+lib/shotwell/plugins/builtin/flickr.png
+lib/shotwell/plugins/builtin/picasa.png
+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/yandex_publish_model.glade
+lib/shotwell/plugins/builtin/youtube.png
 share/applications/shotwell-viewer.desktop
 share/applications/shotwell.desktop
 share/gconf/schemas/shotwell.schemas
@@ -27,6 +36,7 @@ share/gnome/help/shotwell/C/organize-event.page
 share/gnome/help/shotwell/C/organize-flag.page
 share/gnome/help/shotwell/C/organize-rating.page
 share/gnome/help/shotwell/C/organize-remove.page
+share/gnome/help/shotwell/C/organize-search.page
 share/gnome/help/shotwell/C/organize-tag.page
 share/gnome/help/shotwell/C/organize-title.page
 share/gnome/help/shotwell/C/other-files.page
@@ -84,6 +94,8 @@ share/locale/sk/LC_MESSAGES/shotwell.mo
 share/locale/sl/LC_MESSAGES/shotwell.mo
 share/locale/sr/LC_MESSAGES/shotwell.mo
 share/locale/sv/LC_MESSAGES/shotwell.mo
+share/locale/ta/LC_MESSAGES/shotwell.mo
+share/locale/te/LC_MESSAGES/shotwell.mo
 share/locale/th/LC_MESSAGES/shotwell.mo
 share/locale/tr/LC_MESSAGES/shotwell.mo
 share/locale/uk/LC_MESSAGES/shotwell.mo
@@ -94,12 +106,17 @@ 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
+share/shotwell/icons/filter-videos.png
 share/shotwell/icons/five-star-filter.svg
 share/shotwell/icons/five-stars.svg
 share/shotwell/icons/flag-page.png
 share/shotwell/icons/flag-trinket.png
 share/shotwell/icons/four-star-filter-plus.svg
 share/shotwell/icons/four-stars.svg
+share/shotwell/icons/generic-plugin.png
 share/shotwell/icons/image-adjust.svg
 share/shotwell/icons/import-all.png
 share/shotwell/icons/import.svg
@@ -116,11 +133,14 @@ share/shotwell/icons/pin-toolbar.svg
 share/shotwell/icons/publish.png
 share/shotwell/icons/redeye.png
 share/shotwell/icons/rejected.svg
+share/shotwell/icons/searchbox-clear.svg
+share/shotwell/icons/searchbox-find.svg
 share/shotwell/icons/shotwell-16.svg
 share/shotwell/icons/shotwell-24.svg
 share/shotwell/icons/shotwell-street.jpg
 share/shotwell/icons/shotwell.ico
 share/shotwell/icons/shotwell.svg
+share/shotwell/icons/slideshow-extension-point.png
 share/shotwell/icons/sprocket.png
 share/shotwell/icons/three-star-filter-plus.svg
 share/shotwell/icons/three-stars.svg
@@ -139,9 +159,8 @@ share/shotwell/ui/import_queue.ui
 share/shotwell/ui/media.ui
 share/shotwell/ui/offline.ui
 share/shotwell/ui/photo.ui
+share/shotwell/ui/search_bar.ui
 share/shotwell/ui/set_background_dialog.glade
 share/shotwell/ui/shotwell.glade
 share/shotwell/ui/tags.ui
 share/shotwell/ui/trash.ui
-share/shotwell/ui/video.ui
-share/shotwell/ui/yandex_publish_model.glade
diff --git a/graphics/shotwell/distinfo b/graphics/shotwell/distinfo
index 149784f39ba..91cfb411655 100644
--- a/graphics/shotwell/distinfo
+++ b/graphics/shotwell/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.5 2011/03/18 18:58:29 drochner Exp $
+$NetBSD: distinfo,v 1.6 2011/04/05 18:34:20 drochner Exp $
 
-SHA1 (shotwell-0.8.1.tar.bz2) = b26b222e35a16d2ccbe9590853d66f2e99e9c9f6
-RMD160 (shotwell-0.8.1.tar.bz2) = 56f1ad906a42ac6ae945a3cbd75a1d769452c718
-Size (shotwell-0.8.1.tar.bz2) = 1317586 bytes
-SHA1 (patch-aa) = b6e1e8da2dd4370073d70a786ff7cf8aca06d868
-SHA1 (patch-ab) = 390a2e725e10de42ce6d3617f4c093d3a63374e6
-SHA1 (patch-ac) = 3a9dc52b5770950ba99bc146652f37b49514cde6
+SHA1 (shotwell-0.9.1.tar.bz2) = e3d1b4e175352184a2c46da08f7a6ce53939b534
+RMD160 (shotwell-0.9.1.tar.bz2) = 801a1714246b51d76d0c432e7aa6b1838103d0c1
+Size (shotwell-0.9.1.tar.bz2) = 1456462 bytes
+SHA1 (patch-aa) = 1e4590acde5832f13f2390abdcb9e80904616208
+SHA1 (patch-ab) = 5f9699feb50926e449b7c5a51152f7ea58da79e6
diff --git a/graphics/shotwell/patches/patch-aa b/graphics/shotwell/patches/patch-aa
index a9b8431b884..aa23dad4e50 100644
--- a/graphics/shotwell/patches/patch-aa
+++ b/graphics/shotwell/patches/patch-aa
@@ -1,33 +1,61 @@
-$NetBSD: patch-aa,v 1.3 2011/01/11 20:46:16 gls Exp $
+$NetBSD: patch-aa,v 1.4 2011/04/05 18:34:20 drochner Exp $
 
---- Makefile.orig	2010-12-23 23:01:46.000000000 +0000
+--- Makefile.orig	2011-04-05 00:35:38.000000000 +0000
 +++ Makefile
-@@ -280,7 +280,7 @@ EXT_PKGS = \
+@@ -261,7 +261,6 @@ EXT_PKGS = \
+ 	gstreamer-0.10 \
  	gstreamer-base-0.10 \
  	gtk+-2.0 \
- 	glib-2.0 \
 -	gudev-1.0 \
-+	gmodule-2.0 \
- 	json-glib-1.0 \
  	libexif \
  	libgphoto2 \
-@@ -306,7 +306,6 @@ EXT_PKG_VERSIONS = \
- 	glib-2.0 >= 2.24.0 \
+ 	libsoup-2.4 \
+@@ -288,7 +287,6 @@ EXT_PKG_VERSIONS = \
  	gstreamer-0.10 >= 0.10.28 \
  	gstreamer-base-0.10 >= 0.10.28 \
+ 	gtk+-2.0 >= 2.18.0 \
 -	gudev-1.0 >= 145 \
- 	json-glib-1.0 >= 0.7.6 \
  	libexif >= 0.6.16 \
  	libgphoto2 >= 2.4.2 \
-@@ -504,7 +503,6 @@ endif
+ 	libsoup-2.4 >= 2.26.0 \
+@@ -394,7 +392,7 @@ CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHA
+ # if not available.
+ LIBRAW_CONFIG=./libraw-config
  
- $(VALA_STAMP): $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) $(EXPANDED_SRC_HEADER_FILES) Makefile \
- 	$(CONFIG_IN)
--	@ ./minver `$(VALAC) --version | awk '{print $$2}'` $(MIN_VALAC_VERSION) || ( echo 'Shotwell requires Vala compiler $(MIN_VALAC_VERSION) or greater.  You are running' `$(VALAC) --version` '\b.'; exit 1 )
+-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 ),)
+@@ -568,15 +566,15 @@ ifdef INSTALL_HEADERS
+ endif
+ 
+ $(PC_FILE): $(PC_INPUT) $(MAKE_FILES)
+-	m4 '--define=_VERSION_=$(VERSION)' '--define=_PREFIX_=$(PREFIX)' '--define=_REQUIREMENTS_=$(PLUGIN_PKG_REQS)' \
+-		'--define=_LIB_=$(LIB)' $< > $@
++	m4 '-D_VERSION_=$(VERSION)' '-D_PREFIX_=$(PREFIX)' '-D_REQUIREMENTS_=$(PLUGIN_PKG_REQS)' \
++		'-D_LIB_=$(LIB)' $< > $@
+ 
+ $(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 '--define=_UNIT_NAME_=$(nm)' '--define=_UNIT_USES_INITS_=$($(nm)_USES_INITS)' '--define=_UNIT_USES_TERMINATORS_=$($(nm)_USES_TERMINATORS)' src/unit/rc/UnitInternals.m4 > $(UNITIZE_DIR)/_$(nm)Internals.vala`)
++		`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 $@
+ 
+ $(UNITIZE_INITS) $(UNITIZE_ENTRIES): $(UNITIZE_STAMP)
+@@ -584,7 +582,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)'
-@@ -530,13 +528,13 @@ $(EXPANDED_C_FILES): $(VALA_STAMP)
+@@ -611,17 +608,16 @@ $(EXPANDED_C_FILES): $(VALA_STAMP)
  	@
  
  $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
@@ -38,6 +66,16 @@ $NetBSD: patch-aa,v 1.3 2011/01/11 20:46:16 gls Exp $
 -	$(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)
+ 	@
+ 
+ .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:
  glade: lib$(PROGRAM).so
  
  lib$(PROGRAM).so: $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)
diff --git a/graphics/shotwell/patches/patch-ab b/graphics/shotwell/patches/patch-ab
index 665f09890d7..8be67a678de 100644
--- a/graphics/shotwell/patches/patch-ab
+++ b/graphics/shotwell/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2011/01/11 20:46:16 gls Exp $
+$NetBSD: patch-ab,v 1.3 2011/04/05 18:34:20 drochner Exp $
 
---- src/CameraTable.vala.orig	2010-12-23 23:01:46.000000000 +0000
+--- src/CameraTable.vala.orig	2011-03-22 20:46:15.000000000 +0000
 +++ src/CameraTable.vala
-@@ -24,7 +24,6 @@ public class CameraTable {
+@@ -26,7 +26,6 @@ public class CameraTable {
      
      private static CameraTable instance = null;
      
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.2 2011/01/11 20:46:16 gls Exp $
      private OneShotScheduler camera_update_scheduler = null;
      private GPhoto.Context null_context = new GPhoto.Context();
      private GPhoto.CameraAbilitiesList abilities_list;
-@@ -42,7 +41,6 @@ public class CameraTable {
+@@ -44,7 +43,6 @@ public class CameraTable {
              on_update_cameras);
          
          // listen for interesting events on the specified subsystems
@@ -18,7 +18,7 @@ $NetBSD: patch-ab,v 1.2 2011/01/11 20:46:16 gls Exp $
          volume_monitor = VolumeMonitor.get();
          volume_monitor.volume_changed.connect(on_volume_changed);
          volume_monitor.volume_added.connect(on_volume_changed);
-@@ -94,43 +92,18 @@ public class CameraTable {
+@@ -96,43 +94,18 @@ public class CameraTable {
          if (res != GPhoto.Result.OK)
              throw new GPhotoError.LIBRARY("[%d] Unable to %s: %s", (int) res, op, res.as_string());
      }
@@ -66,7 +66,7 @@ $NetBSD: patch-ab,v 1.2 2011/01/11 20:46:16 gls Exp $
      // USB (or libusb) is a funny beast; if only one USB device is present (i.e. the camera),
      // then a single camera is detected at port usb:.  However, if multiple USB devices are
      // present (including non-cameras), then the first attached camera will be listed twice,
-@@ -139,59 +112,59 @@ public class CameraTable {
+@@ -141,59 +114,59 @@ public class CameraTable {
      //
      // This function gleans the full port name of a particular port, even if it's the unadorned
      // "usb:", by using GUdev.
@@ -141,7 +141,32 @@ $NetBSD: patch-ab,v 1.2 2011/01/11 20:46:16 gls Exp $
      public static string get_port_uri(string port) {
          return "gphoto2://[%s]/".printf(port);
      }
-@@ -220,13 +193,13 @@ public class CameraTable {
+@@ -204,24 +177,6 @@ public class CameraTable {
+             "/dev/bus/usb/%s".printf(port.substring(4).replace(",", "/")) : null;
+     }
+     
+-    private string? get_name_for_uuid(string uuid) {
+-        foreach (Volume volume in volume_monitor.get_volumes()) {
+-            if (volume.get_identifier(VOLUME_IDENTIFIER_KIND_UUID) == uuid) {
+-                return volume.get_name();
+-            }
+-        }
+-        return null;
+-    }
+-    
+-    private GLib.Icon? get_icon_for_uuid(string uuid) {
+-        foreach (Volume volume in volume_monitor.get_volumes()) {
+-            if (volume.get_identifier(VOLUME_IDENTIFIER_KIND_UUID) == uuid) {
+-                return volume.get_icon();
+-            }
+-        }
+-        return null;
+-    }
+-
+     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;
+@@ -231,13 +186,13 @@ public class CameraTable {
          GPhoto.CameraList camera_list;
          do_op(GPhoto.CameraList.create(out camera_list), "create camera list");
          do_op(abilities_list.detect(port_info_list, camera_list, null_context), "detect cameras");
@@ -158,7 +183,7 @@ $NetBSD: patch-ab,v 1.2 2011/01/11 20:46:16 gls Exp $
          // go through the detected camera list and glean their ports
          for (int ctr = 0; ctr < camera_list.count(); ctr++) {
              string name;
-@@ -234,55 +207,55 @@ public class CameraTable {
+@@ -245,55 +200,55 @@ public class CameraTable {
  
              string port;
              do_op(camera_list.get_value(ctr, out port), "get detected camera port");
@@ -227,7 +252,7 @@ $NetBSD: patch-ab,v 1.2 2011/01/11 20:46:16 gls Exp $
              camera_removed(camera);
          }
  
-@@ -299,21 +272,6 @@ public class CameraTable {
+@@ -311,23 +266,6 @@ public class CameraTable {
                  continue;
              }
              
@@ -237,7 +262,9 @@ $NetBSD: patch-ab,v 1.2 2011/01/11 20:46:16 gls Exp $
 -                GUdev.Device device = client.query_by_device_file(path);
 -                string serial = device.get_property("ID_SERIAL_SHORT");
 -                if (null != serial) {
+-                    // Try to get the name and icon.
 -                    display_name = get_name_for_uuid(serial);
+-                    icon = get_icon_for_uuid(serial);
 -                }
 -                if (null == display_name) {
 -                    display_name = device.get_sysfs_attr("product");
@@ -249,7 +276,7 @@ $NetBSD: patch-ab,v 1.2 2011/01/11 20:46:16 gls Exp $
              if (null == display_name) {
                  // Default to GPhoto detected name.
                  display_name = name;
-@@ -351,13 +309,6 @@ public class CameraTable {
+@@ -365,13 +303,6 @@ public class CameraTable {
          }
      }
      
diff --git a/graphics/shotwell/patches/patch-ac b/graphics/shotwell/patches/patch-ac
deleted file mode 100644
index a57a5a5b361..00000000000
--- a/graphics/shotwell/patches/patch-ac
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2011/03/18 18:58:29 drochner Exp $
-
---- src/CheckerboardLayout.vala.orig	2011-01-10 23:13:03.000000000 +0000
-+++ src/CheckerboardLayout.vala
-@@ -971,13 +971,13 @@ public class CheckerboardLayout : Gtk.Dr
-             row_rect.width = allocation.width;
-             row_rect.height = row.height;
-             
--            if (area.intersect(row_rect, bitbucket)) {
-+            if (area.intersect(row_rect, out bitbucket)) {
-                 // see what elements, if any, intersect the area
-                 foreach (CheckerboardItem item in row.items) {
-                     if (item == null)
-                         continue;
-                     
--                    if (area.intersect(item.allocation, bitbucket))
-+                    if (area.intersect(item.allocation, out bitbucket))
-                         intersects.add(item);
-                 }
-             }
-@@ -1504,7 +1504,7 @@ public class CheckerboardLayout : Gtk.Dr
-             
-             // only mark area as dirty if visible in viewport
-             Gdk.Rectangle intersection = Gdk.Rectangle();
--            if (!visible_page.intersect(item.allocation, intersection))
-+            if (!visible_page.intersect(item.allocation, out intersection))
-                 continue;
-             
-             // grow the dirty area
-@@ -1642,7 +1642,7 @@ public class CheckerboardLayout : Gtk.Dr
-         // find the visible intersection of the viewport and the selection band
-         Gdk.Rectangle visible_page = get_adjustment_page(hadjustment, vadjustment);
-         Gdk.Rectangle visible_band = Gdk.Rectangle();
--        visible_page.intersect(selection_band, visible_band);
-+        visible_page.intersect(selection_band, out visible_band);
-         
-         // pixelate selection rectangle interior
-         if (visible_band.width > 1 && visible_band.height > 1) {