Updated graphics/shotwell to 0.11.5

Upstream changes:

0.11.5:
-------
This release fixes an issue in
which Shotwell could crash when using the "Import from F-Spot" feature
for the subset of users who continued to experience this problem after
the 0.11.4 upgrade. We recommend that all users upgrade.

0.11.4;
-------
This release fixes two critical
issues present in all previous versions of Shotwell 0.11.x that could
cause Shotwell to crash when using the Import from F-Spot feature.
We recommend that all users upgrade.

0.11.3:
-------
This releases fixes two critical bugs, including:
   * Shotwell could crash at the end of photo imports where one or
more files failed to import correctly
   * Showell crashed when a new tag containing a slash (/) character
was created by context-clicking on the Tags item in the sidebar and
choosing  New
and improves error reporting in the publishing system.

0.11.2:
-------
  * Improved stability working with hierarchical tags
  * Importing hierarchical tags from F-Spot doesn't generate duplicate
top-level tags
  * Fixed "server redirect contained no session key" errors in the
Facebook Connector
  * Corrected problems with item counts over mixed media

4 files changed, 27 insertions, 213 deletions

diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile
index da9bea924d8..2c951f83c2b 100644
--- a/graphics/shotwell/Makefile
+++ b/graphics/shotwell/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2011/10/19 06:50:03 obache Exp $
+# $NetBSD: Makefile,v 1.24 2011/10/22 13:51:02 gls Exp $
 #
 
-DISTNAME=		shotwell-0.11.1
-PKGREVISION=		1
+DISTNAME=		shotwell-0.11.5
 CATEGORIES=		graphics
 MASTER_SITES=		http://yorba.org/download/shotwell/0.11/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/graphics/shotwell/distinfo b/graphics/shotwell/distinfo
index b64bf813b43..e28ff207424 100644
--- a/graphics/shotwell/distinfo
+++ b/graphics/shotwell/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2011/09/12 18:15:03 drochner Exp $
+$NetBSD: distinfo,v 1.12 2011/10/22 13:51:02 gls Exp $
 
-SHA1 (shotwell-0.11.1.tar.bz2) = 84c85291a22bf7a95f51cf0341d12ea0355f1415
-RMD160 (shotwell-0.11.1.tar.bz2) = 51b96dccfe8665551fb416d7a444c5f94b0358a1
-Size (shotwell-0.11.1.tar.bz2) = 1545164 bytes
-SHA1 (patch-aa) = a13a2a1e9da42c3293c95e21d14e8b503bc35805
-SHA1 (patch-ab) = 07503807a44fe20ba33481eb3d8fde9e34c460c0
+SHA1 (shotwell-0.11.5.tar.bz2) = 7ca5bd82b0c39ba6f47e40c24b4a521c0729db1b
+RMD160 (shotwell-0.11.5.tar.bz2) = 00bc024d323bf4285972f67f157fbce8709dbe94
+Size (shotwell-0.11.5.tar.bz2) = 1570803 bytes
+SHA1 (patch-aa) = 9df29602ba465d2ad401fd9ca7ca55b1d6e3c788
+SHA1 (patch-ab) = 59c223fd7f8a9cb3136b7db2c882834c8d79f363
diff --git a/graphics/shotwell/patches/patch-aa b/graphics/shotwell/patches/patch-aa
index 8c66b9cb1d9..92061cefe6d 100644
--- a/graphics/shotwell/patches/patch-aa
+++ b/graphics/shotwell/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2011/09/12 18:15:03 drochner Exp $
+$NetBSD: patch-aa,v 1.9 2011/10/22 13:51:02 gls Exp $
 
---- Makefile.orig	2011-08-23 18:53:10.000000000 +0000
+--- Makefile.orig	2011-10-13 19:26:06.000000000 +0000
 +++ Makefile
-@@ -269,7 +269,6 @@ EXT_PKGS = \
+@@ -273,7 +273,6 @@ EXT_PKGS = \
  	gstreamer-base-0.10 \
  	gstreamer-pbutils-0.10 \
  	gtk+-2.0 \
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.8 2011/09/12 18:15:03 drochner Exp $
  	libexif \
  	libgphoto2 \
  	libsoup-2.4 \
-@@ -302,7 +301,6 @@ EXT_PKG_VERSIONS = \
+@@ -309,7 +308,6 @@ EXT_PKG_VERSIONS = \
  	gstreamer-base-0.10 >= 0.10.28 \
  	gstreamer-pbutils-0.10 >= 0.10.32 \
  	gtk+-2.0 >= 2.18.0 \
@@ -18,16 +18,7 @@ $NetBSD: patch-aa,v 1.8 2011/09/12 18:15:03 drochner Exp $
  	libexif >= 0.6.16 \
  	libgphoto2 >= 2.4.2 \
  	libsoup-2.4 >= 2.26.0 \
-@@ -382,7 +380,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
-@@ -427,7 +425,7 @@ CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHA
+@@ -434,7 +432,7 @@ CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHA
  # if not available.
  LIBRAW_CONFIG=./libraw-config
  
@@ -36,7 +27,7 @@ $NetBSD: patch-aa,v 1.8 2011/09/12 18:15:03 drochner Exp $
  	@ ./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 ),)
-@@ -656,7 +654,6 @@ $(UNITIZE_INITS) $(UNITIZE_ENTRIES): $(U
+@@ -660,7 +658,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)
@@ -44,7 +35,7 @@ $NetBSD: patch-aa,v 1.8 2011/09/12 18:15:03 drochner Exp $
  	@echo Compiling Vala code...
  	@mkdir -p $(BUILD_DIR)
  	@$(VALAC) --ccode --directory=$(BUILD_DIR) --basedir=src \
-@@ -673,10 +670,10 @@ $(EXPANDED_C_FILES): $(VALA_STAMP)
+@@ -677,10 +674,10 @@ $(EXPANDED_C_FILES): $(VALA_STAMP)
  	@
  
  $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
@@ -52,12 +43,12 @@ $NetBSD: patch-aa,v 1.8 2011/09/12 18:15:03 drochner Exp $
 +	$(CC) -c $(VALA_CFLAGS) $(CFLAGS) `pkg-config --cflags libraw` -o $@ $<
  
  $(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) $(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)
-@@ -687,7 +684,6 @@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU
+@@ -691,7 +688,6 @@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU
  
  .PHONY: $(PLUGINS_DIR)
  $(PLUGINS_DIR): $(PLUGIN_VAPI) $(PLUGIN_HEADER) $(PLUGIN_DEPS)
@@ -65,11 +56,11 @@ $NetBSD: patch-aa,v 1.8 2011/09/12 18:15:03 drochner Exp $
  	@$(MAKE) --directory=$@ PLUGINS_VERSION="$(VERSION)" USER_VALAFLAGS="$(USER_VALAFLAGS)" \
  		PLUGIN_CFLAGS="$(PLUGIN_CFLAGS)"
  
-@@ -705,7 +701,7 @@ docs:
+@@ -709,7 +705,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) $(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
diff --git a/graphics/shotwell/patches/patch-ab b/graphics/shotwell/patches/patch-ab
index 32e3b88a6ee..0a8ffca7639 100644
--- a/graphics/shotwell/patches/patch-ab
+++ b/graphics/shotwell/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.4 2011/07/12 19:00:57 drochner Exp $
+$NetBSD: patch-ab,v 1.5 2011/10/22 13:51:02 gls Exp $
 
---- src/camera/CameraTable.vala.orig	2011-03-22 20:46:15.000000000 +0000
+--- src/camera/CameraTable.vala.orig	2011-10-13 19:22:54.000000000 +0000
 +++ src/camera/CameraTable.vala
 @@ -26,7 +26,6 @@ public class CameraTable {
      
@@ -18,21 +18,10 @@ $NetBSD: patch-ab,v 1.4 2011/07/12 19:00:57 drochner Exp $
          volume_monitor = VolumeMonitor.get();
          volume_monitor.volume_changed.connect(on_volume_changed);
          volume_monitor.volume_added.connect(on_volume_changed);
-@@ -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());
-     }
--    
-+
-     private void init_camera_table() throws GPhotoError {
-         do_op(GPhoto.CameraAbilitiesList.create(out abilities_list), "create camera abilities list");
-         do_op(abilities_list.load(null_context), "load camera abilities list");
-     }
--    
-+
+@@ -105,31 +103,6 @@ public class CameraTable {
      private string[] get_all_usb_cameras() {
          string[] cameras = new string[0];
--        
+         
 -        GLib.List<GUdev.Device> device_list = client.query_by_subsystem(null);
 -        foreach (GUdev.Device device in device_list) {
 -            string device_file = device.get_device_file();
@@ -58,89 +47,9 @@ $NetBSD: patch-ab,v 1.4 2011/07/12 19:00:57 drochner Exp $
 -            }
 -        }
 -        
-+
          return cameras;
      }
--    
-+
-     // 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,
-@@ -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.
--    private bool usb_esp(int current_camera_count, string[] usb_cameras, string port, 
-+    private bool usb_esp(int current_camera_count, string[] usb_cameras, string port,
-         out string full_port) {
-         // sanity
-         assert(current_camera_count > 0);
--        
-+
-         debug("USB ESP: current_camera_count=%d port=%s", current_camera_count, port);
--        
-+
-         // if GPhoto detects one camera, and USB reports one camera, all is swell
-         if (current_camera_count == 1 && usb_cameras.length == 1) {
-             full_port = usb_cameras[0];
--            
-+
-             debug("USB ESP: port=%s full_port=%s", port, full_port);
--            
-+
-             return true;
-         }
- 
-         // with more than one camera, skip the mirrored "usb:" port
-         if (port == "usb:") {
-             debug("USB ESP: Skipping %s", port);
--            
-+
-             return false;
-         }
--        
-+
-         // parse out the bus and device ID
-         int bus, device;
-         if (port.scanf("usb:%d,%d", out bus, out device) < 2) {
-             critical("USB ESP: Failed to scanf %s", port);
--            
-+
-             return false;
-         }
--        
-+
-         foreach (string usb_camera in usb_cameras) {
-             int camera_bus, camera_device;
-             if (usb_camera.scanf("usb:%d,%d", out camera_bus, out camera_device) < 2) {
-                 critical("USB ESP: Failed to scanf %s", usb_camera);
--                
-+
-                 continue;
-             }
--            
-+
-             if ((bus == camera_bus) && (device == camera_device)) {
-                 full_port = port;
--                
-+
-                 debug("USB ESP: port=%s full_port=%s", port, full_port);
- 
-                 return true;
-             }
-         }
--        
-+
-         debug("USB ESP: No matching bus/device found for port=%s", port);
--        
-+
-         return false;
-     }
--    
-+
-     public static string get_port_uri(string port) {
-         return "gphoto2://[%s]/".printf(port);
-     }
+     
 @@ -204,24 +177,6 @@ public class CameraTable {
              "/dev/bus/usb/%s".printf(port.substring(4).replace(",", "/")) : null;
      }
@@ -166,92 +75,6 @@ $NetBSD: patch-ab,v 1.4 2011/07/12 19:00:57 drochner Exp $
      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");
--        
-+
-         Gee.HashMap<string, string> detected_map = new Gee.HashMap<string, string>(str_hash, str_equal,
-             str_equal);
--        
-+
-         // walk the USB chain and find all PTP cameras; this is necessary for usb_esp
-         string[] usb_cameras = get_all_usb_cameras();
--        
-+
-         // go through the detected camera list and glean their ports
-         for (int ctr = 0; ctr < camera_list.count(); ctr++) {
-             string name;
-@@ -245,55 +200,55 @@ public class CameraTable {
- 
-             string port;
-             do_op(camera_list.get_value(ctr, out port), "get detected camera port");
--            
-+
-             debug("Detected %d/%d %s @ %s", ctr + 1, camera_list.count(), name, port);
--            
-+
-             // do some USB ESP, skipping ports that cannot be deduced
-             if (port.has_prefix("usb:")) {
-                 string full_port;
-                 if (!usb_esp(camera_list.count(), usb_cameras, port, out full_port))
-                     continue;
--                
-+
-                 port = full_port;
-             }
- 
-             detected_map.set(port, name);
-         }
--        
-+
-         // find cameras that have disappeared
-         DiscoveredCamera[] missing = new DiscoveredCamera[0];
-         foreach (DiscoveredCamera camera in camera_map.values) {
-             GPhoto.PortInfo port_info;
--            do_op(camera.gcamera.get_port_info(out port_info), 
-+            do_op(camera.gcamera.get_port_info(out port_info),
-                 "retrieve missing camera port information");
--            
-+
-             GPhoto.CameraAbilities abilities;
-             do_op(camera.gcamera.get_abilities(out abilities), "retrieve camera abilities");
--            
-+
-             if (detected_map.has_key(port_info.path)) {
-                 debug("Found camera for %s @ %s in detected map", abilities.model, port_info.path);
--                
-+
-                 continue;
-             }
--            
-+
-             debug("%s @ %s missing", abilities.model, port_info.path);
--            
-+
-             missing += camera;
-         }
--        
-+
-         // have to remove from hash map outside of iterator
-         foreach (DiscoveredCamera camera in missing) {
-             GPhoto.PortInfo port_info;
-             do_op(camera.gcamera.get_port_info(out port_info),
-                 "retrieve missing camera port information");
--            
-+
-             GPhoto.CameraAbilities abilities;
-             do_op(camera.gcamera.get_abilities(out abilities), "retrieve missing camera abilities");
- 
-             debug("Removing from camera table: %s @ %s", abilities.model, port_info.path);
- 
-             camera_map.unset(get_port_uri(port_info.path));
--            
-+
-             camera_removed(camera);
-         }
- 
 @@ -311,23 +266,6 @@ public class CameraTable {
                  continue;
              }
@@ -276,7 +99,7 @@ $NetBSD: patch-ab,v 1.4 2011/07/12 19:00:57 drochner Exp $
              if (null == display_name) {
                  // Default to GPhoto detected name.
                  display_name = name;
-@@ -365,13 +303,6 @@ public class CameraTable {
+@@ -365,14 +303,6 @@ public class CameraTable {
          }
      }
      
@@ -287,6 +110,7 @@ $NetBSD: patch-ab,v 1.4 2011/07/12 19:00:57 drochner Exp $
 -        // update to occur when they come in all at once
 -        camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true);
 -    }
-     
+-    
      public void on_volume_changed(Volume volume) {
          camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true);
+     }