graphics/shotwell: update to 0.14.1

- Update to 0.14.1
- Use shebangfix instead of manual replace

PR:		ports/178014
Submitted by:	Christoph Moench-Tegeder <cmt@burggraben.net>
Approved by:	culot / jpaetzel (mentors, implicit), maintainer (timeout)

17 files changed, 106 insertions, 779 deletions

diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile
index d867cd84643c..074938c0e115 100644
--- a/graphics/shotwell/Makefile
+++ b/graphics/shotwell/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	shotwell
-PORTVERSION=	0.11.6
-PORTREVISION=	3
+PORTVERSION=	0.14.1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	http://www.yorba.org/download/shotwell/${PORTVERSION:R}/
 
@@ -12,7 +11,8 @@ COMMENT=	Open source photo manager for GNOME
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	vala>=0.12.0:${PORTSDIR}/lang/vala
+BUILD_DEPENDS=	vala>=0.18.0:${PORTSDIR}/lang/vala \
+		bash:${PORTSDIR}/shells/bash
 LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 		gee:${PORTSDIR}/devel/libgee06 \
 		json-glib-1.0:${PORTSDIR}/devel/json-glib \
@@ -20,35 +20,29 @@ LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 		gexiv2:${PORTSDIR}/graphics/gexiv2 \
 		exif:${PORTSDIR}/graphics/libexif \
 		gphoto2:${PORTSDIR}/graphics/libgphoto2 \
-		webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 \
+		webkitgtk-3.0:${PORTSDIR}/www/webkit-gtk3 \
 		unique-1.0:${PORTSDIR}/x11-toolkits/unique \
-		raw:${PORTSDIR}/graphics/libraw
+		raw:${PORTSDIR}/graphics/libraw \
+		rest:${PORTSDIR}/devel/librest
 
-USE_BZIP2=	yes
-USES=		gettext
-USE_GNOME=	gnomehier gconf2 gtk20 desktopfileutils librsvg2
+USE_XZ=		yes
+USES=		shebangfix gettext desktop-file-utils
+USE_GNOME=	gnomehier gconf2 gtk20 librsvg2
 USE_SQLITE=	3
 USE_GMAKE=	yes
+USE_GSTREAMER1=	yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} \
-		--disable-icon-update \
-		--with-gconf-schema-file-dir=${PREFIX}/etc/gconf/schemas
+CONFIGURE_ARGS=	--prefix=${PREFIX} --disable-icon-update
 CONFIGURE_ENV+=	--define=NO_CAMERA
 INSTALLS_ICONS=	yes
 
-GLIB_SCHEMAS=	org.yorba.shotwell.gschema.xml org.yorba.shotwell-extras.gschema.xml
+SHEBANG_FILES=	${WRKSRC}/${CONFIGURE_SCRIPT} ${WRKSRC}/chkver
 
-post-patch:
-	@${REINPLACE_CMD} -E \
-		-e 's|/bin/bash|${SH}|g ; s|/usr/bin/env.*bash|${SH}|g' \
-		${WRKSRC}/${CONFIGURE_SCRIPT} \
-		${WRKSRC}/libraw-config
+GLIB_SCHEMAS=	org.yorba.shotwell.gschema.xml org.yorba.shotwell-extras.gschema.xml
 
 post-configure:
 	@${REINPLACE_CMD} -E \
-		-e 's|share/shotwell|${DATADIR_REL}|g ; \
-		    s|--fatal-warnings||g ; \
-		    s|%%GCONF_CONFIG_SOURCE%%|${GCONF_CONFIG_SOURCE}|g' \
+		-e 's|share/shotwell|${DATADIR_REL}|g' \
 			${WRKSRC}/${MAKEFILE}
 
 	@${REINPLACE_CMD} -E \
diff --git a/graphics/shotwell/distinfo b/graphics/shotwell/distinfo
index c69a17cdfc8c..e2ed86b4aa28 100644
--- a/graphics/shotwell/distinfo
+++ b/graphics/shotwell/distinfo
@@ -1,2 +1,2 @@
-SHA256 (shotwell-0.11.6.tar.bz2) = fab71137f336536565ea18b94591eb81c4ac696f627fe3d5ff361c9a55397af8
-SIZE (shotwell-0.11.6.tar.bz2) = 1570860
+SHA256 (shotwell-0.14.1.tar.xz) = 045c4833e23374b649e735661cedbbff8368624b6719547013db2c21c8402fef
+SIZE (shotwell-0.14.1.tar.xz) = 1624784
diff --git a/graphics/shotwell/files/patch-Makefile b/graphics/shotwell/files/patch-Makefile
index 5fe47683c05f..5e315b31d822 100644
--- a/graphics/shotwell/files/patch-Makefile
+++ b/graphics/shotwell/files/patch-Makefile
@@ -1,31 +1,32 @@
---- Makefile.orig	2011-11-03 14:39:05.000000000 -0700
-+++ Makefile	2012-03-14 14:07:24.000000000 -0700
-@@ -273,7 +273,6 @@
- 	gstreamer-base-0.10 \
- 	gstreamer-pbutils-0.10 \
- 	gtk+-2.0 \
+--- Makefile.orig	2013-04-03 16:16:24.000000000 -0300
++++ Makefile	2013-06-12 22:39:11.000000000 -0300
+@@ -300,7 +300,6 @@
+ 	gstreamer-base-1.0 \
+ 	gstreamer-pbutils-1.0 \
+ 	gtk+-3.0 \
 -	gudev-1.0 \
  	libexif \
  	libgphoto2 \
- 	libsoup-2.4 \
-@@ -309,7 +308,6 @@
- 	gstreamer-base-0.10 >= 0.10.28 \
- 	gstreamer-pbutils-0.10 >= 0.10.32 \
- 	gtk+-2.0 >= 2.18.0 \
+ 	json-glib-1.0 \
+@@ -332,7 +331,6 @@
+ 	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 \
- 	libsoup-2.4 >= 2.26.0 \
-@@ -434,7 +432,7 @@
- # 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 ),)
-@@ -556,8 +554,8 @@
+ 	libraw >= 0.13.2 \
+@@ -453,6 +451,9 @@
+ # Required for gudev-1.0
+ CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE
+ 
++# do not forget about libintl
++LDFLAGS += -lintl
++
+ 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
+@@ -570,8 +571,8 @@
  	glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
  endif
  ifndef DISABLE_GSETTINGS_CONVERT_INSTALL
@@ -36,50 +37,3 @@
  endif
  ifndef DISABLE_ICON_UPDATE
  	-gtk-update-icon-cache -t -f $(DESTDIR)$(PREFIX)/share/icons/hicolor || :
-@@ -640,7 +638,7 @@
- 	glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
- endif
- ifndef DISABLE_GSETTINGS_CONVERT_INSTALL
--	rm -f $(DESTDIR)/usr/share/GConf/gsettings/shotwell.convert
-+	rm -f $(DESTDIR)$(PREFIX)/share/GConf/gsettings/shotwell.convert
- endif
- 
- $(PC_FILE): $(PC_INPUT) $(MAKE_FILES)
-@@ -660,7 +658,6 @@
- 
- # 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 \
-@@ -677,10 +674,10 @@
- 	@
- 
- $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
--	$(CC) -c $(VALA_CFLAGS) `$(LIBRAW_CONFIG) --cflags` $(CFLAGS) -o $@ $<
-+	$(CC) -c $(VALA_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) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `pkg-config --libs libraw` $(EXPORT_FLAGS) -o $@
- 	glib-compile-schemas misc
- 
- $(THUMBNAILER_BIN): $(EXPANDED_THUMBNAILER_SRC_FILES)
-@@ -691,7 +688,6 @@
- 
- .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)"
- 
-@@ -709,7 +705,7 @@
- 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) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `pkg-config --libs libraw` $(EXPORT_FLAGS) -shared -o $@
- 
- .PHONY: pkgcheck
- pkgcheck:
diff --git a/graphics/shotwell/files/patch-src-camera-CameraTable.vala b/graphics/shotwell/files/patch-src-camera-CameraTable.vala
index 32e3b88a6eee..764581acca31 100644
--- a/graphics/shotwell/files/patch-src-camera-CameraTable.vala
+++ b/graphics/shotwell/files/patch-src-camera-CameraTable.vala
@@ -1,8 +1,6 @@
-$NetBSD: patch-ab,v 1.4 2011/07/12 19:00:57 drochner Exp $
-
---- src/camera/CameraTable.vala.orig	2011-03-22 20:46:15.000000000 +0000
-+++ src/camera/CameraTable.vala
-@@ -26,7 +26,6 @@ public class CameraTable {
+--- ./src/camera/CameraTable.vala.orig	2013-04-20 21:27:30.000000000 +0200
++++ ./src/camera/CameraTable.vala	2013-04-20 21:31:02.000000000 +0200
+@@ -26,7 +26,6 @@
      
      private static CameraTable instance = null;
      
@@ -10,7 +8,7 @@ $NetBSD: patch-ab,v 1.4 2011/07/12 19:00:57 drochner Exp $
      private OneShotScheduler camera_update_scheduler = null;
      private GPhoto.Context null_context = new GPhoto.Context();
      private GPhoto.CameraAbilitiesList abilities_list;
-@@ -44,7 +43,6 @@ public class CameraTable {
+@@ -44,7 +43,6 @@
              on_update_cameras);
          
          // listen for interesting events on the specified subsystems
@@ -18,18 +16,8 @@ $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");
-     }
--    
-+
+@@ -111,32 +109,7 @@
+     
      private string[] get_all_usb_cameras() {
          string[] cameras = new string[0];
 -        
@@ -58,96 +46,17 @@ $NetBSD: patch-ab,v 1.4 2011/07/12 19:00:57 drochner Exp $
 -            }
 -        }
 -        
-+
++		// this would require udev, so we'll just return an empty array
          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 {
+     
+@@ -213,23 +186,7 @@
              "/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) {
+-            if (volume.get_identifier(VolumeIdentifier.UUID) == uuid) {
 -                return volume.get_name();
 -            }
 -        }
@@ -156,107 +65,20 @@ $NetBSD: patch-ab,v 1.4 2011/07/12 19:00:57 drochner Exp $
 -    
 -    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) {
+-            if (volume.get_identifier(VolumeIdentifier.UUID) == uuid) {
 -                return volume.get_icon();
 -            }
 -        }
 -        return null;
 -    }
--
++	// get_name_for_uuid() and get_icon_for_uuid() are not used (udev removal)
+ 
      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;
+@@ -336,22 +293,7 @@
              }
              
--            // Get display name for camera.
+             // Get display name for camera.
 -            string path = get_port_path(port);
 -            if (null != path) {
 -                GUdev.Device device = client.query_by_device_file(path);
@@ -273,10 +95,11 @@ $NetBSD: patch-ab,v 1.4 2011/07/12 19:00:57 drochner Exp $
 -                    display_name = device.get_property("ID_MODEL");
 -                }
 -            }
++			// we use a default name, as everything else requires udev
              if (null == display_name) {
                  // Default to GPhoto detected name.
                  display_name = name;
-@@ -365,13 +303,6 @@ public class CameraTable {
+@@ -396,13 +338,7 @@
          }
      }
      
@@ -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);
 -    }
++	// on_udev_event() removed as "udev related"
      
      public void on_volume_changed(Volume volume) {
          camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true);
diff --git a/graphics/shotwell/files/patch-src-photos-GRaw.vala b/graphics/shotwell/files/patch-src-photos-GRaw.vala
deleted file mode 100644
index cc72b6ce5c31..000000000000
--- a/graphics/shotwell/files/patch-src-photos-GRaw.vala
+++ /dev/null
@@ -1,65 +0,0 @@
---- src/photos/GRaw.vala.orig	2012-02-15 17:13:51.000000000 -0800
-+++ src/photos/GRaw.vala	2012-02-15 17:15:48.000000000 -0800
-@@ -34,11 +34,11 @@
-     OUT_OF_ORDER_CALL,
-     NO_THUMBNAIL,
-     UNSUPPORTED_THUMBNAIL,
--    CANNOT_ADDMASK,
-     OUT_OF_MEMORY,
-     DATA_ERROR,
-     IO_ERROR,
-     CANCELLED_BY_CALLBACK,
-+    BAD_CROP,
-     SYSTEM_ERROR
- }
- 
-@@ -163,10 +163,6 @@
-         proc = new LibRaw.Processor(options);
-     }
-     
--    public void add_masked_borders_to_bitmap() {
--        proc.add_masked_borders_to_bitmap();
--    }
--    
-     public void adjust_sizes_info_only() throws Exception {
-         throw_exception("adjust_sizes_info_only", proc.adjust_sizes_info_only());
-     }
-@@ -215,10 +211,6 @@
-         throw_exception("ppm_tiff_writer", proc.ppm_tiff_writer(filename));
-     }
-     
--    public void rotate_fuji_raw() throws Exception {
--        throw_exception("rotate_fuji_raw", proc.rotate_fuji_raw());
--    }
--    
-     public void thumb_writer(string filename) throws Exception {
-         throw_exception("thumb_writer", proc.thumb_writer(filename));
-     }
-@@ -262,7 +254,6 @@
-         // camera_profile
-         // bad_pixels
-         // dark_frame
--        output_params->filtering_mode = LibRaw.Filtering.AUTOMATIC;
-         output_params->output_bps = 8;
-         // output_tiff
-         output_params->user_flip = GRaw.Flip.FROM_SOURCE;
-@@ -303,9 +294,6 @@
-         case LibRaw.Result.UNSUPPORTED_THUMBNAIL:
-             throw new Exception.UNSUPPORTED_THUMBNAIL(msg);
-         
--        case LibRaw.Result.CANNOT_ADDMASK:
--            throw new Exception.CANNOT_ADDMASK(msg);
--        
-         case LibRaw.Result.UNSUFFICIENT_MEMORY:
-             throw new Exception.OUT_OF_MEMORY(msg);
-         
-@@ -317,6 +305,9 @@
-         
-         case LibRaw.Result.CANCELLED_BY_CALLBACK:
-             throw new Exception.CANCELLED_BY_CALLBACK(msg);
-+
-+        case LibRaw.Result.BAD_CROP:
-+            throw new Exception.BAD_CROP(msg);
-         
-         default:
-             return;
diff --git a/graphics/shotwell/files/patch-src__Dialogs.vala b/graphics/shotwell/files/patch-src__Dialogs.vala
deleted file mode 100644
index bc6caede23ea..000000000000
--- a/graphics/shotwell/files/patch-src__Dialogs.vala
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/Dialogs.vala.orig
-+++ src/Dialogs.vala
-@@ -419,7 +419,7 @@
-         ok_button.sensitive = (pixels_entry.get_text_length() > 0) && (int.parse(pixels_entry.get_text()) > 0);
-     }
-     
--    private void on_pixels_insert_text(string text, int length, void *position) {
-+    private void on_pixels_insert_text(string text, int length, ref int position) {
-         // This is necessary because SignalHandler.block_by_func() is not properly bound
-         if (in_insert)
-             return;
-@@ -438,7 +438,7 @@
-         }
-         
-         if (new_text.length > 0)
--            pixels_entry.insert_text(new_text, (int) new_text.length, position);
-+            pixels_entry.insert_text(new_text, (int) new_text.length, ref position);
-         
-         Signal.stop_emission_by_name(pixels_entry, "insert-text");
-         
diff --git a/graphics/shotwell/files/patch-src__DirectoryMonitor.vala b/graphics/shotwell/files/patch-src__DirectoryMonitor.vala
deleted file mode 100644
index aadc50c2fde3..000000000000
--- a/graphics/shotwell/files/patch-src__DirectoryMonitor.vala
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/DirectoryMonitor.vala.orig
-+++ src/DirectoryMonitor.vala
-@@ -276,8 +276,7 @@
-             
-             // get all the interesting matchable items from the supplied FileInfo
-             int64 match_size = match.get_size();
--            TimeVal match_time;
--            match.get_modification_time(out match_time);
-+            TimeVal match_time = match.get_modification_time();
-             
-             foreach (File file in map.keys) {
-                 FileInfo info = map.get(file);
-@@ -290,8 +289,7 @@
-                 if (match_size != info.get_size())
-                     continue;
-                 
--                TimeVal time;
--                info.get_modification_time(out time);
-+                TimeVal time = info.get_modification_time();
-                 
-                 if (time.tv_sec != match_time.tv_sec)
-                     continue;
diff --git a/graphics/shotwell/files/patch-src__EditingTools.vala b/graphics/shotwell/files/patch-src__EditingTools.vala
deleted file mode 100644
index 4c2dc2e5a7ff..000000000000
--- a/graphics/shotwell/files/patch-src__EditingTools.vala
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/EditingTools.vala.orig
-+++ src/EditingTools.vala
-@@ -773,15 +773,15 @@
-         return false;
-     }
- 
--    private void on_width_insert_text(string text, int length, void *position) {
--        on_entry_insert_text(crop_tool_window.custom_width_entry, text, length, position);
-+    private void on_width_insert_text(string text, int length, ref int position) {
-+        on_entry_insert_text(crop_tool_window.custom_width_entry, text, length, ref position);
-     }
- 
--    private void on_height_insert_text(string text, int length, void *position) {
--        on_entry_insert_text(crop_tool_window.custom_height_entry, text, length, position);
-+    private void on_height_insert_text(string text, int length, ref int position) {
-+        on_entry_insert_text(crop_tool_window.custom_height_entry, text, length, ref position);
-     }
- 
--    private void on_entry_insert_text(Gtk.Entry sender, string text, int length, void *position) {
-+    private void on_entry_insert_text(Gtk.Entry sender, string text, int length, ref int position) {
-         if (entry_insert_in_progress)
-             return;
-             
-@@ -799,7 +799,7 @@
-         }
-         
-         if (new_text.length > 0)
--            sender.insert_text(new_text, (int) new_text.length, position);
-+            sender.insert_text(new_text, (int) new_text.length, ref position);
- 
-         Signal.stop_emission_by_name(sender, "insert-text");
-         
diff --git a/graphics/shotwell/files/patch-src__Photo.vala b/graphics/shotwell/files/patch-src__Photo.vala
deleted file mode 100644
index a02f96da22d0..000000000000
--- a/graphics/shotwell/files/patch-src__Photo.vala
+++ /dev/null
@@ -1,129 +0,0 @@
---- src/Photo.vala.orig
-+++ src/Photo.vala
-@@ -273,7 +273,7 @@
-         }
-     }
-     
--    private struct BackingReaders {
-+    private class BackingReaders {
-         public PhotoFileReader master;
-         public PhotoFileReader developer;
-         public PhotoFileReader editable;
-@@ -281,9 +281,9 @@
-     
-     // because fetching individual items from the database is high-overhead, store all of
-     // the photo row in memory
--    private PhotoRow row;
-+    protected PhotoRow row;
-     private BackingPhotoRow editable = new BackingPhotoRow();
--    private BackingReaders readers = BackingReaders();
-+    private BackingReaders readers = new BackingReaders();
-     private PixelTransformer transformer = null;
-     private PixelTransformationBundle adjustments = null;
-     // because file_title is determined by data in row, it should only be accessed when row is locked
-@@ -301,7 +301,7 @@
-     
-     // This pointer is used to determine which BackingPhotoRow in the PhotoRow to be using at
-     // any time.  It should only be accessed -- read or write -- when row is locked.
--    private BackingPhotoRow? backing_photo_row = null;
-+    protected BackingPhotoRow? backing_photo_row = null;
-     
-     // This is fired when the photo's editable file is replaced.  The image it generates may or
-     // may not be the same; the altered signal is best for that.  null is passed if the editable
-@@ -553,8 +553,7 @@
-         File file = File.new_for_path(bpr.filepath);
-         FileInfo info = file.query_info(DirectoryMonitor.SUPPLIED_ATTRIBUTES,
-             FileQueryInfoFlags.NOFOLLOW_SYMLINKS, null);
--        TimeVal timestamp;
--        info.get_modification_time(out timestamp);
-+        TimeVal timestamp = info.get_modification_time();
-         
-         PhotoFileInterrogator interrogator = new PhotoFileInterrogator(
-             file, PhotoFileSniffer.Options.GET_ALL);
-@@ -992,8 +991,7 @@
-             return ImportResult.UNSUPPORTED_FORMAT;
-         }
-         
--        TimeVal timestamp;
--        info.get_modification_time(out timestamp);
-+        TimeVal timestamp = info.get_modification_time();
-         
-         // if all MD5s supplied, don't sniff for them
-         if (params.exif_md5 != null && params.thumbnail_md5 != null && params.full_md5 != null)
-@@ -1148,8 +1146,7 @@
-             return null;
-         }
-         
--        TimeVal modification_time = TimeVal();
--        info.get_modification_time(out modification_time);
-+        TimeVal modification_time = info.get_modification_time();
-         
-         backing.filepath = file.get_path();
-         backing.timestamp = modification_time.tv_sec;
-@@ -1196,7 +1193,7 @@
-     }
-     
-     private class ReimportRawDevelopmentStateImpl : ReimportRawDevelopmentState {
--        class DevToReimport {
-+        public class DevToReimport {
-             public BackingPhotoRow backing = new BackingPhotoRow();
-             public PhotoMetadata? metadata;
-             
-@@ -1483,8 +1480,7 @@
-     
-     // Use this only if the master file's modification time has been changed (i.e. touched)
-     public void set_master_timestamp(FileInfo info) {
--        TimeVal modification;
--        info.get_modification_time(out modification);
-+        TimeVal modification = info.get_modification_time();
-         
-         try {
-             lock (row) {
-@@ -1508,8 +1504,7 @@
-     
-     // Use this only if the editable file's modification time has been changed (i.e. touched)
-     public void update_editable_modification_time(FileInfo info) throws DatabaseError {
--        TimeVal modification;
--        info.get_modification_time(out modification);
-+        TimeVal modification = info.get_modification_time();
-         
-         bool altered = false;
-         lock (row) {
-@@ -2067,8 +2062,7 @@
-             error("Unable to read file information for %s: %s", to_string(), err.message);
-         }
-         
--        TimeVal timestamp = TimeVal();
--        info.get_modification_time(out timestamp);
-+        TimeVal timestamp = info.get_modification_time();
-         
-         // interrogate file for photo information
-         PhotoFileInterrogator interrogator = new PhotoFileInterrogator(file);
-@@ -2679,7 +2673,7 @@
-     }
- 
-     // All instances are against the coordinate system of the unrotated photo.
--    private void add_raw_redeye_instance(RedeyeInstance redeye) {
-+    public void add_raw_redeye_instance(RedeyeInstance redeye) {
-         KeyValueMap map = get_transformation("redeye");
-         if (map == null) {
-             map = new KeyValueMap("redeye");
-@@ -3443,8 +3437,7 @@
-                 return;
-             }
-             
--            TimeVal timestamp;
--            info.get_modification_time(out timestamp);
-+            TimeVal timestamp = info.get_modification_time();
-         
-             BackingPhotoTable.get_instance().update_attributes(editable_id, timestamp.tv_sec,
-                 info.get_size());
-@@ -4567,7 +4560,7 @@
-         import_keywords = null;
-     }
-     
--    protected override void notify_altered(Alteration alteration) {
-+    public override void notify_altered(Alteration alteration) {
-         // generate new thumbnails in the background
-         if (!block_thumbnail_generation && alteration.has_subject("image"))
-             thumbnail_scheduler.at_priority_idle(Priority.LOW);
diff --git a/graphics/shotwell/files/patch-src__Printing.vala b/graphics/shotwell/files/patch-src__Printing.vala
deleted file mode 100644
index a39971d3a3de..000000000000
--- a/graphics/shotwell/files/patch-src__Printing.vala
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/Printing.vala.orig
-+++ src/Printing.vala
-@@ -536,7 +536,7 @@
-     }
- 
-     private void on_ppi_entry_insert_text(Gtk.Editable editable, string text, int length,
--        void *position) {
-+        ref int position) {
-         Gtk.Entry sender = (Gtk.Entry) editable;
-         
-         if (is_text_insertion_in_progress)
-@@ -554,7 +554,7 @@
-         }
- 
-         if (new_text.length > 0)
--            sender.insert_text(new_text, (int) new_text.length, position);
-+            sender.insert_text(new_text, (int) new_text.length, ref position);
- 
-         Signal.stop_emission_by_name(sender, "insert-text");
- 
-@@ -616,7 +616,7 @@
-         return Measurement(double.parse(custom_height_entry.get_text()), get_user_unit_choice());
-     }
- 
--    private void on_entry_insert_text(Gtk.Editable editable, string text, int length, void *position) {
-+    private void on_entry_insert_text(Gtk.Editable editable, string text, int length, ref int position) {
-         Gtk.Entry sender = (Gtk.Entry) editable;
-         
-         if (is_text_insertion_in_progress)
-@@ -640,7 +640,7 @@
-         }
- 
-         if (new_text.length > 0)
--            sender.insert_text(new_text, (int) new_text.length, position);
-+            sender.insert_text(new_text, (int) new_text.length, ref position);
- 
-         Signal.stop_emission_by_name(sender, "insert-text");
- 
diff --git a/graphics/shotwell/files/patch-src__VideoSupport.vala b/graphics/shotwell/files/patch-src__VideoSupport.vala
deleted file mode 100644
index d8a070f6b7b6..000000000000
--- a/graphics/shotwell/files/patch-src__VideoSupport.vala
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/VideoSupport.vala.orig
-+++ src/VideoSupport.vala
-@@ -83,8 +83,7 @@
-             return ImportResult.UNSUPPORTED_FORMAT;
-         }
-         
--        TimeVal timestamp;
--        info.get_modification_time(out timestamp);
-+        TimeVal timestamp = info.get_modification_time();
-         
-         // make sure params has a valid md5
-         assert(params.md5 != null);
-@@ -720,8 +719,7 @@
-     }
-     
-     public void set_master_timestamp(FileInfo info) {
--        TimeVal time_val;
--        info.get_modification_time(out time_val);
-+        TimeVal time_val = info.get_modification_time();
-         
-         try {
-             lock (backing_row) {
-@@ -1068,8 +1066,7 @@
-         if (video.get_filesize() != info.get_size())
-             return;
-         
--        TimeVal modification;
--        info.get_modification_time(out modification);
-+        TimeVal modification = info.get_modification_time();
-         
-         if (video.get_timestamp() == modification.tv_sec)
-             matching_master.add(video);
diff --git a/graphics/shotwell/files/patch-src__db__PhotoTable.vala b/graphics/shotwell/files/patch-src__db__PhotoTable.vala
deleted file mode 100644
index 6ab92dd9c6c1..000000000000
--- a/graphics/shotwell/files/patch-src__db__PhotoTable.vala
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/db/PhotoTable.vala.orig
-+++ src/db/PhotoTable.vala
-@@ -1034,8 +1034,7 @@
-         if (filesize != info.get_size())
-             return false;
-         
--        TimeVal modification;
--        info.get_modification_time(out modification);
-+        TimeVal modification = info.get_modification_time();
-         
-         return timestamp == modification.tv_sec;
-     }
-@@ -1044,8 +1043,7 @@
-         if (filesize != info.get_size())
-             return false;
-         
--        TimeVal modification;
--        info.get_modification_time(out modification);
-+        TimeVal modification = info.get_modification_time();
-         
-         return timestamp != modification.tv_sec;
-     }
diff --git a/graphics/shotwell/files/patch-src__main.vala b/graphics/shotwell/files/patch-src__main.vala
deleted file mode 100644
index 099b9e726b83..000000000000
--- a/graphics/shotwell/files/patch-src__main.vala
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/main.vala.orig	2010-09-07 10:48:53.000000000 -0300
-+++ src/main.vala	2010-09-07 10:49:28.000000000 -0300
-@@ -16,9 +16,11 @@
-     Unique.Response response = Unique.Response.OK;
-     
-     switch (command) {
-+#if !NO_CAMERA    
-         case ShotwellCommand.MOUNTED_CAMERA:
-             LibraryWindow.get_app().mounted_camera_shell_notification(data.get_text(), false);
-         break;
-+#endif
-         
-         case Unique.Command.ACTIVATE:
-             LibraryWindow.get_app().present_with_time(timestamp);
diff --git a/graphics/shotwell/files/patch-src__sidebar__Tree.vala b/graphics/shotwell/files/patch-src__sidebar__Tree.vala
deleted file mode 100644
index 93103a3d81cc..000000000000
--- a/graphics/shotwell/files/patch-src__sidebar__Tree.vala
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/sidebar/Tree.vala.orig
-+++ src/sidebar/Tree.vala
-@@ -545,7 +545,8 @@
-         if (only_children)
-             return;
-         
--        store.remove(wrapper.get_iter());
-+        Gtk.TreeIter iter = wrapper.get_iter();
-+        store.remove(ref iter);
-         
-         if (selected_wrapper == wrapper)
-             selected_wrapper = null;
-@@ -637,7 +638,8 @@
-         bool selected = (get_current_path().compare(wrapper.get_path()) == 0);
-         
-         // remove from current position in tree
--        store.remove(wrapper.get_iter());
-+        Gtk.TreeIter iter = wrapper.get_iter();
-+        store.remove(ref iter);
-         
-         Sidebar.Entry? parent = branch.get_parent(entry);
-         assert(parent != null);
diff --git a/graphics/shotwell/files/patch-src__util__file.vala b/graphics/shotwell/files/patch-src__util__file.vala
deleted file mode 100644
index 180d44ba78ce..000000000000
--- a/graphics/shotwell/files/patch-src__util__file.vala
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/util/file.vala.orig
-+++ src/util/file.vala
-@@ -155,8 +155,7 @@
-     FileInfo info = file.query_info(FILE_ATTRIBUTE_TIME_MODIFIED, FileQueryInfoFlags.NOFOLLOW_SYMLINKS, 
-         null);
- 
--    TimeVal timestamp = TimeVal();
--    info.get_modification_time(out timestamp);
-+    TimeVal timestamp = info.get_modification_time();
-     
-     return timestamp.tv_sec;
- }
diff --git a/graphics/shotwell/files/patch-vapi-libraw.vapi b/graphics/shotwell/files/patch-vapi-libraw.vapi
deleted file mode 100644
index 712cafc219da..000000000000
--- a/graphics/shotwell/files/patch-vapi-libraw.vapi
+++ /dev/null
@@ -1,81 +0,0 @@
---- vapi/libraw.vapi.orig	2012-02-15 17:16:39.000000000 -0800
-+++ vapi/libraw.vapi	2012-02-15 17:18:38.000000000 -0800
-@@ -14,17 +14,6 @@
- 
- public unowned string versionNumber();
- 
--[CCode (cname="enum libraw_Filtering", cprefix="LIBRAW_FILTERING_")]
--public enum Filtering {
--    DEFAULT,
--    NOZEROES,
--    NOBLACK,
--    NORAWCURVE,
--    NONE,
--    LIBRAWOWN,
--    AUTOMATIC
--}
--
- [SimpleType]
- [CCode (cname="libraw_imgother_t")]
- public struct ImageOther {
-@@ -121,7 +110,6 @@
-     public bool use_camera_wb;
-     public bool use_camera_matrix;
-     public int output_color;
--    public Filtering filtering_mode;
-     public int output_bps;
-     public bool output_tiff;
-     public int user_flip;
-@@ -132,6 +120,30 @@
-     public bool no_auto_bright;
-     public float auto_bright_thr;
-     public int use_fuji_rotate;
-+    public int green_matching;
-+    
-+    /* DCB parameters */
-+    public int dcb_iterations;
-+    public int dcb_enhance_fl;
-+    public int fbdd_noiserd;
-+    
-+    /* VCD parameters */
-+    public int eeci_refine;
-+    public int es_med_passes;
-+    /* AMaZE*/
-+    public int ca_correc;
-+    public float cared;
-+    public float cablue;
-+    public int cfaline;
-+    public float linenoise;
-+    public int cfa_clean;
-+    public float lclean;
-+    public float cclean;
-+    public int cfa_green;
-+    public float green_thresh;
-+    public int exp_correc;
-+    public float exp_shift;
-+    public float exp_preser;
-     
-     public void set_chromatic_aberrations(double red_multiplier, double green_multiplier) {
-         aber[0] = red_multiplier;
-@@ -171,7 +183,6 @@
-     [CCode (cname="libraw_init")]
-     public Processor(Options flags = Options.NONE);
-     
--    public void add_masked_borders_to_bitmap();
-     public Result adjust_sizes_info_only();
-     [CCode (cname="libraw_dcraw_document_mode_processing")]
-     public Result document_mode_processing();
-@@ -216,11 +227,11 @@
-     OUT_OF_ORDER_CALL,
-     NO_THUMBNAIL,
-     UNSUPPORTED_THUMBNAIL,
--    CANNOT_ADDMASK,
-     UNSUFFICIENT_MEMORY,
-     DATA_ERROR,
-     IO_ERROR,
--    CANCELLED_BY_CALLBACK;
-+    CANCELLED_BY_CALLBACK,
-+    BAD_CROP;
-     
-     [CCode (cname="LIBRAW_FATAL_ERROR")]
-     public bool is_fatal_error();
diff --git a/graphics/shotwell/pkg-plist b/graphics/shotwell/pkg-plist
index 05103be1c208..7468a64a78b3 100644
--- a/graphics/shotwell/pkg-plist
+++ b/graphics/shotwell/pkg-plist
@@ -1,17 +1,28 @@
 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
+lib/shotwell/plugins/builtin/shotwell-data-imports.so
 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
+libexec/shotwell/shotwell-settings-migrator
 share/applications/shotwell-viewer.desktop
 share/applications/shotwell.desktop
 share/gnome/help/shotwell/C/edit-adjustments.page
@@ -21,6 +32,7 @@ share/gnome/help/shotwell/C/edit-external.page
 share/gnome/help/shotwell/C/edit-nondestructive.page
 share/gnome/help/shotwell/C/edit-redeye.page
 share/gnome/help/shotwell/C/edit-rotate.page
+share/gnome/help/shotwell/C/edit-straighten.page
 share/gnome/help/shotwell/C/edit-time-date.page
 share/gnome/help/shotwell/C/edit-undo.page
 share/gnome/help/shotwell/C/figures/crop_thirds.jpg
@@ -44,6 +56,8 @@ share/gnome/help/shotwell/C/organize-title.page
 share/gnome/help/shotwell/C/other-files.page
 share/gnome/help/shotwell/C/other-missing.page
 share/gnome/help/shotwell/C/other-multiple.page
+share/gnome/help/shotwell/C/other-plugins.page
+share/gnome/help/shotwell/C/raw.page
 share/gnome/help/shotwell/C/running.page
 share/gnome/help/shotwell/C/share-background.page
 share/gnome/help/shotwell/C/share-export.page
@@ -54,12 +68,14 @@ share/gnome/help/shotwell/C/share-upload.page
 share/gnome/help/shotwell/C/view-displaying.page
 share/gnome/help/shotwell/C/view-information.page
 share/gnome/help/shotwell/C/view-sidebar.page
-share/GConf/gsettings/shotwell.convert
 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
@@ -78,6 +94,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
@@ -90,12 +107,16 @@ 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
 share/locale/hu/LC_MESSAGES/shotwell-extras.mo
 share/locale/hu/LC_MESSAGES/shotwell.mo
+share/locale/ia/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
@@ -104,6 +125,9 @@ 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/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
@@ -112,10 +136,16 @@ 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
 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
@@ -146,10 +176,12 @@ 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.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/GConf/gsettings/shotwell.convert
 %%DATADIR%%/icons/all-rejected.png
 %%DATADIR%%/icons/crop-pivot-reticle.png
 %%DATADIR%%/icons/crop.svg
@@ -182,8 +214,6 @@ share/locale/zh_TW/LC_MESSAGES/shotwell.mo
 %%DATADIR%%/icons/publish.png
 %%DATADIR%%/icons/redeye.png
 %%DATADIR%%/icons/rejected.svg
-%%DATADIR%%/icons/searchbox-clear.svg
-%%DATADIR%%/icons/searchbox-find.svg
 %%DATADIR%%/icons/shotwell-16.svg
 %%DATADIR%%/icons/shotwell-24.svg
 %%DATADIR%%/icons/shotwell-street.jpg
@@ -191,6 +221,7 @@ share/locale/zh_TW/LC_MESSAGES/shotwell.mo
 %%DATADIR%%/icons/shotwell.svg
 %%DATADIR%%/icons/slideshow-extension-point.png
 %%DATADIR%%/icons/sprocket.png
+%%DATADIR%%/icons/straighten.svg
 %%DATADIR%%/icons/three-star-filter-plus.svg
 %%DATADIR%%/icons/three-stars.svg
 %%DATADIR%%/icons/two-star-filter-plus.svg
@@ -200,6 +231,7 @@ share/locale/zh_TW/LC_MESSAGES/shotwell.mo
 %%DATADIR%%/icons/zoom-out.png
 %%DATADIR%%/ui/collection.ui
 %%DATADIR%%/ui/direct.ui
+%%DATADIR%%/ui/direct_context.ui
 %%DATADIR%%/ui/event.ui
 %%DATADIR%%/ui/events_directory.ui
 %%DATADIR%%/ui/fullscreen.ui
@@ -208,27 +240,39 @@ share/locale/zh_TW/LC_MESSAGES/shotwell.mo
 %%DATADIR%%/ui/media.ui
 %%DATADIR%%/ui/offline.ui
 %%DATADIR%%/ui/photo.ui
+%%DATADIR%%/ui/photo_context.ui
 %%DATADIR%%/ui/savedsearch.ui
 %%DATADIR%%/ui/search_bar.ui
-%%DATADIR%%/ui/set_background_dialog.glade
 %%DATADIR%%/ui/search_sidebar_context.ui
+%%DATADIR%%/ui/set_background_dialog.glade
 %%DATADIR%%/ui/shotwell.glade
 %%DATADIR%%/ui/shotwell.xml
 %%DATADIR%%/ui/sidebar_default_context.ui
 %%DATADIR%%/ui/tag_sidebar_context.ui
 %%DATADIR%%/ui/tags.ui
+%%DATADIR%%/ui/top.ui
 %%DATADIR%%/ui/trash.ui
 @dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/km/LC_MESSAGES
+@dirrmtry share/locale/km
 @dirrmtry share/locale/kk/LC_MESSAGES
 @dirrmtry share/locale/kk
+@dirrmtry share/locale/ia/LC_MESSAGES
+@dirrmtry share/locale/ia
 @dirrmtry share/locale/ast/LC_MESSAGES
 @dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
 @dirrm share/gnome/help/shotwell/C/figures
 @dirrm share/gnome/help/shotwell/C
 @dirrm share/gnome/help/shotwell
-@dirrmtry share/applications
+@dirrm libexec/shotwell
 @dirrm lib/shotwell/plugins/builtin
 @dirrm lib/shotwell/plugins
 @dirrm lib/shotwell