Attachment #117623 for bug #159733

View | Details | Raw Unified | Return to bug 159733
Collapse All | Expand All




#

PORTNAME=	shotwell
PORTVERSION=	0.10.1
PORTREVISION=	2
CATEGORIES=	graphics gnome
MASTER_SITES=	http://www.yorba.org/download/shotwell/${PORTVERSION:R}/


		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
		raw.2:${PORTSDIR}/graphics/libraw

BROKEN=		does not build

USE_BZIP2=	yes
USE_GETTEXT=	yes
USE_GNOME=	gnomehier gconf2 gtk20 desktopfileutils librsvg2

CONFIGURE_ARGS=	--prefix=${PREFIX} \
		--disable-icon-update \
		--with-gconf-schema-file-dir=${PREFIX}/etc/gconf/schemas
CONFIGURE_ENV+=	--define=NO_CAMERA
INSTALLS_ICONS=	yes

GCONF_SCHEMAS=	shotwell.schemas

	@${REINPLACE_CMD} -E \
		-e 's|/bin/bash|${SH}|g ; s|/usr/bin/env.*bash|${SH}|g' \
		${WRKSRC}/${CONFIGURE_SCRIPT} \
		${WRKSRC}/libraw-config
		${WRKSRC}/minver

post-configure:
	@${REINPLACE_CMD} -E \
		-e 's|share/shotwell|${DATADIR_REL}|g ; \
		    s|%%GCONF_CONFIG_SOURCE%%|${GCONF_CONFIG_SOURCE}|g' \
			${WRKSRC}/${MAKEFILE}

	@${REINPLACE_CMD} -E \
		-e 's|\-n ||g' \
			${WRKSRC}/configure.mk
# attempt at a DATADIR safe port
	@${REINPLACE_CMD} -E \
		-e 's|\.get_child\("share")\.get_child\("shotwell")|${SHOTWELL_DATADIR}|' \

Lines 1-3 Link Here

(-)shotwell/distinfo (-3 / +2 lines)
1	SHA256 (shotwell-0.7.2.tar.bz2) = 8b4139407d59badcbe13e23db070e0a0709ecc0f9ad806335888382eebf5dfa3	1	SHA256 (shotwell-0.10.1.tar.bz2) = f6ef4782780af201402afeaf8f9484d5579cedff75fbf07b22587bb7cef69893
2	SIZE (shotwell-0.7.2.tar.bz2) = 1064127	2	SIZE (shotwell-0.10.1.tar.bz2) = 1483679
3




--- Makefile.orig	2011-06-02 12:11:21.000000000 -0700
+++ Makefile	2011-08-12 17:33:51.953748181 -0700
@@ -264,7 +264,6 @@
 	gstreamer-0.10 \
 	gstreamer-base-0.10 \
 	gtk+-2.0 \
-	gudev-1.0 \
 	libexif \
 	libgphoto2 \
 	libsoup-2.4 \
@@ -296,7 +295,6 @@
 	gstreamer-0.10 >= 0.10.28 \
 	gstreamer-base-0.10 >= 0.10.28 \
 	gtk+-2.0 >= 2.18.0 \
-	gudev-1.0 >= 145 \
 	libexif >= 0.6.16 \
 	libgphoto2 >= 2.4.2 \
 	libsoup-2.4 >= 2.26.0 \
@@ -375,7 +373,7 @@
 	$(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 @@
 # if not available.
 ifndef LINUX
+ifndef FreeBSD
 SRC_FILES += \
 	GConf.vala
 endif
+endif
 
 VAPI_FILES = \
 	libexif.vapi \
@@ -288,6 +299,18 @@
 	gdk-x11-2.0
 endif
 
+ifdef FreeBSD
+EXT_PKGS += \
+	gconf-2.0 \
+	libgphoto2 \
+	libsoup-2.4 \
+	libxml-2.0 \
+	unique-1.0 \
+	webkit-1.0 \
+	dbus-glib-1 \
+	gdk-x11-2.0
+endif
+
 # libraw is handled separately (see note below); when libraw-config is no longer needed, the version
 # should be added to this list
 EXT_PKG_VERSIONS = \
@@ -313,6 +336,18 @@
 	dbus-glib-1 >= 0.80
 endif
 
+ifdef LINUX
+EXT_PKG_VERSIONS += \
+	gconf-2.0 >= 2.22.0 \
+	libgphoto2 >= 2.4.2 \
+	libsoup-2.4 >= 2.26.0 \
+	libxml-2.0 >= 2.6.32 \
+	unique-1.0 >= 1.0.0 \
+	webkit-1.0 >= 1.1.5 \
+	dbus-glib-1 >= 0.80
+endif
+
+
 PKGS = $(EXT_PKGS) $(LOCAL_PKGS) $(LIBRAW_PKG)
 
 ifndef BUILD_DIR
@@ -357,6 +392,10 @@
 
 VALA_LDFLAGS = `pkg-config --libs $(EXT_PKGS) gthread-2.0`
 
+ifdef FreeBSD
+  VALA_DEFINES = -D NO_CAMERA
+endif
+
 ifdef WINDOWS
   VALA_DEFINES = -D WINDOWS -D NO_CAMERA -D NO_PRINTING -D NO_PUBLISHING -D NO_LIBUNIQUE -D NO_EXTENDED_POSIX -D NO_SET_BACKGROUND
   EXPANDED_OBJ_FILES += src/windows.o
@@ -393,6 +432,11 @@
 LIBRAW_CONFIG=./libraw-config
 endif
 
-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 ),)
@@ -561,6 +559,11 @@
 	mkdir -p $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C/figures
 endif
@@ -488,9 +532,20 @@
 	$(INSTALL_DATA) $(EXPANDED_HELP_IMAGES) $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C/figures
 endif
 endif
+ifdef FreeBSD
+ifndef DISABLE_SCHEMAS_INSTALL
+	GCONF_CONFIG_SOURCE=xml:merged:/usr/local/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule misc/shotwell.schemas
+	mkdir -p $(DESTDIR)$(SCHEMA_FILE_DIR)
+	$(INSTALL_DATA) misc/shotwell.schemas $(DESTDIR)$(SCHEMA_FILE_DIR)
+endif
 	-$(foreach lang,$(CORE_SUPPORTED_LANGUAGES),`mkdir -p $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES ; \
 		$(INSTALL_DATA) $(LOCAL_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo \
 		$(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo`)
@@ -638,7 +641,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 \
@@ -655,10 +657,10 @@
 	@
 
 $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
-	$(CC) -c $(VALA_CFLAGS) `$(LIBRAW_CONFIG) --cflags` $(CFLAGS) -o $@ $<
+	$(CC) -c $(VALA_CFLAGS) $(CFLAGS) `pkg-config --cflags libraw` -o $@ $<
 
 $(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) $(THUMBNAILER_BIN)
-	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@
+	$(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 +670,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)"
 
@@ -686,7 +687,7 @@
 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:




$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 {
     
     private static CameraTable instance = null;
     
-    private GUdev.Client client = new GUdev.Client(SUBSYSTEMS);
     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 {
             on_update_cameras);
         
         // listen for interesting events on the specified subsystems
-        client.uevent.connect(on_udev_event);
         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");
     }
-    
+
     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();
-            if(
-                // only keep devices that have a non-null device file and that
-                // have both the ID_GPHOTO2 and GPHOTO2_DRIVER properties set
-                (device_file != null) &&
-                (device.has_property("ID_GPHOTO2")) &&
-                (device.has_property("GPHOTO2_DRIVER"))
-            ) {
-                int camera_bus, camera_device;
-                // extract the bus and device IDs from the device file string
-                // TODO: is it safe to parse the absolute path or should we be
-                // smarter and use a regex to only pick up the end of the path?
-                if (device_file.scanf("/dev/bus/usb/%d/%d", out camera_bus, out camera_device) < 2) {
-                    critical("get_all_usb_cameras: Failed to scanf device file %s", device_file);
-                    
-                    continue;
-                }
-                string camera = "usb:%.3d,%.3d".printf(camera_bus, camera_device);
-                debug("USB camera detected at %s", camera);
-                cameras += camera;
-            }
-        }
-        
+
         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;
     }
     
-    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");
-        
+
         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;
             }
             
-            // Get display name for camera.
-            string path = get_port_path(port);
-            if (null != path) {
-                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");
-                } 
-                if (null == display_name) {
-                    display_name = device.get_property("ID_MODEL");
-                }
-            }
             if (null == display_name) {
                 // Default to GPhoto detected name.
                 display_name = name;
@@ -365,13 +303,6 @@ public class CameraTable {
         }
     }
     
-    private void on_udev_event(string action, GUdev.Device device) {
-        debug("udev event: %s on %s", action, device.get_name());
-        
-        // Device add/removes often arrive in pairs; this allows for a single
-        // 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);

Lines 1-11 Link Here

(-)shotwell/files/patch-src_Dialogs.vala (-11 lines)
1	--- src/Dialogs.vala.orig 2011-03-17 22:13:24.000000000 -0500
2	+++ src/Dialogs.vala 2011-03-17 22:14:45.000000000 -0500
3	@@ -1449,7 +1449,7 @@
4	((FileIcon) app_icon).get_file().get_path()), Resources.DEFAULT_ICON_SCALE,
5	Gdk.InterpType.BILINEAR, false));
6	} else if (app_icon is ThemedIcon) {
7	- unowned Gdk.Pixbuf icon_pixbuf =
8	+ Gdk.Pixbuf icon_pixbuf =
9	Gtk.IconTheme.get_default().load_icon(((ThemedIcon) app_icon).get_names()[0],
10	Resources.DEFAULT_ICON_SCALE, Gtk.IconLookupFlags.FORCE_SIZE);
11




$NetBSD: patch-src_photos_GRaw.vala,v 1.1 2011/07/31 17:37:01 gls Exp $

Fix importing with libraw 0.13.6 & 0.13.7
Taken from upstream: http://redmine.yorba.org/issues/3868

--- src/photos/GRaw.vala.orig	2011-05-26 23:43:17.000000000 +0000
+++ src/photos/GRaw.vala
@@ -110,8 +110,8 @@ public class ProcessedImage {
     }
     
     public ProcessedImage(LibRaw.Processor proc) throws Exception {
-        LibRaw.Result result;
-        image = proc.make_mem_image(out result);
+        LibRaw.Result result = LibRaw.Result.SUCCESS;
+        image = proc.make_mem_image(ref result);
         throw_exception("ProcessedImage", result);
         assert(image != null);
         
@@ -122,8 +122,8 @@ public class ProcessedImage {
     }
     
     public ProcessedImage.from_thumb(LibRaw.Processor proc) throws Exception {
-        LibRaw.Result result;
-        image = proc.make_mem_thumb(out result);
+        LibRaw.Result result = LibRaw.Result.SUCCESS;
+        image = proc.make_mem_thumb(ref result);
         throw_exception("ProcessedImage.from_thumb", result);
         assert(image != null);
         
@@ -280,7 +280,7 @@ private void throw_exception(string call
     if (result == LibRaw.Result.SUCCESS)
         return;
     else if (result > 0)
-        throw new Exception.SYSTEM_ERROR("System error %d: %s", (int) result, strerror(result));
+        throw new Exception.SYSTEM_ERROR("%s: System error %d: %s", caller, (int) result, strerror(result));
     
     string msg = "%s: %s".printf(caller, result.to_string());
     




$NetBSD: patch-vapi_libraw.vapi,v 1.1 2011/07/31 17:37:01 gls Exp $

Fix importing with libraw 0.13.6 & 0.13.7
Taken from upstream: http://redmine.yorba.org/issues/3868

--- vapi/libraw.vapi.orig	2011-05-26 23:43:17.000000000 +0000
+++ vapi/libraw.vapi
@@ -182,9 +182,9 @@ public class Processor {
     public unowned ImageSizes get_sizes() { return sizes; }
     public unowned Thumbnail get_thumbnail() { return thumbnail; }
     [CCode (cname="libraw_dcraw_make_mem_image")]
-    public ProcessedImage make_mem_image(out Result result);
+    public ProcessedImage make_mem_image(ref Result result);
     [CCode (cname="libraw_dcraw_make_mem_thumb")]
-    public ProcessedImage make_mem_thumb(out Result result);
+    public ProcessedImage make_mem_thumb(ref Result result);
     public Result open_buffer(uint8[] buffer);
     public Result open_file(string filename);
     [CCode (cname="libraw_dcraw_process")]




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
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/gnome/help/shotwell/C/edit-adjustments.page
share/gnome/help/shotwell/C/edit-crop.page
share/gnome/help/shotwell/C/edit-enhance.page
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-time-date.page
share/gnome/help/shotwell/C/edit-undo.page
share/gnome/help/shotwell/C/figures/crop_thirds.jpg
share/gnome/help/shotwell/C/figures/edit_toolbar.png
share/gnome/help/shotwell/C/figures/editing_overview.png
share/gnome/help/shotwell/C/figures/shotwell_logo.png
share/gnome/help/shotwell/C/figures/trash_process.png
share/gnome/help/shotwell/C/formats.page
share/gnome/help/shotwell/C/import-camera.page
share/gnome/help/shotwell/C/import-f-spot.page
share/gnome/help/shotwell/C/import-file.page
share/gnome/help/shotwell/C/import-memorycard.page
share/gnome/help/shotwell/C/index.page
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
share/gnome/help/shotwell/C/other-missing.page
share/gnome/help/shotwell/C/other-multiple.page
share/gnome/help/shotwell/C/running.page
share/gnome/help/shotwell/C/share-background.page
share/gnome/help/shotwell/C/share-export.page
share/gnome/help/shotwell/C/share-print.page
share/gnome/help/shotwell/C/share-send.page
share/gnome/help/shotwell/C/share-slideshow.page
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/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
%%DATADIR%%/icons/all-rejected.png
%%DATADIR%%/icons/crop-pivot-reticle.png
%%DATADIR%%/icons/crop.svg
%%DATADIR%%/icons/drag_nub.png
%%DATADIR%%/icons/enhance.png
%%DATADIR%%/icons/filter-flagged.png
%%DATADIR%%/icons/filter-photos.png
%%DATADIR%%/icons/filter-raw.png
%%DATADIR%%/icons/filter-videos.png
%%DATADIR%%/icons/five-star-filter.svg
%%DATADIR%%/icons/five-stars.svg
%%DATADIR%%/icons/flag-page.png
%%DATADIR%%/icons/flag-trinket.png
%%DATADIR%%/icons/four-star-filter-plus.svg
%%DATADIR%%/icons/four-stars.svg
%%DATADIR%%/icons/generic-plugin.png
%%DATADIR%%/icons/image-adjust.svg
%%DATADIR%%/icons/import-all.png
%%DATADIR%%/icons/import.svg
%%DATADIR%%/icons/last-import-roll.png
%%DATADIR%%/icons/make-primary.svg
%%DATADIR%%/icons/merge.svg
%%DATADIR%%/icons/multiple-events.png
%%DATADIR%%/icons/multiple-tags.png
%%DATADIR%%/icons/noninterpretable-video.png
%%DATADIR%%/icons/one-event.png
%%DATADIR%%/icons/one-star-filter-plus.svg
%%DATADIR%%/icons/one-star.svg

%%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
%%DATADIR%%/icons/shotwell.ico
%%DATADIR%%/icons/shotwell.svg
%%DATADIR%%/icons/slideshow-extension-point.png
%%DATADIR%%/icons/sprocket.png
%%DATADIR%%/icons/three-star-filter-plus.svg
%%DATADIR%%/icons/three-stars.svg
%%DATADIR%%/icons/two-star-filter-plus.svg
%%DATADIR%%/icons/two-stars.svg
%%DATADIR%%/icons/videos-page.png
%%DATADIR%%/icons/zoom-in.png
%%DATADIR%%/icons/zoom-out.png
%%DATADIR%%/ui/collection.ui

%%DATADIR%%/ui/fullscreen.ui
%%DATADIR%%/ui/import.ui
%%DATADIR%%/ui/import_queue.ui
%%DATADIR%%/ui/media.ui
%%DATADIR%%/ui/offline.ui
%%DATADIR%%/ui/photo.ui
%%DATADIR%%/ui/savedsearch.ui
%%DATADIR%%/ui/search_bar.ui
%%DATADIR%%/ui/set_background_dialog.glade
%%DATADIR%%/ui/shotwell.glade
%%DATADIR%%/ui/shotwell.xml
%%DATADIR%%/ui/sidebar_default.ui
%%DATADIR%%/ui/tags.ui
%%DATADIR%%/ui/trash.ui
@dirrm %%DATADIR%%/ui
@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%/ui
@dirrm %%DATADIR%%
@dirrmtry share/locale/kk/LC_MESSAGES
@dirrmtry share/locale/kk
@dirrmtry share/locale/ast/LC_MESSAGES
@dirrmtry share/locale/ast
@dirrmtry share/applications
@dirrmtry share/locale/ast
@dirrmtry share/locale/ast/LC_MESSAGES
@dirrmtry share/locale/kk
@dirrmtry share/locale/kk/LC_MESSAGES
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true

Return to bug 159733

Lines 6-13 Link Here

(-)shotwell/Makefile (-6 / +7 lines)
6	#	6	#
7		7
8	PORTNAME= shotwell	8	PORTNAME= shotwell
9	PORTVERSION= 0.7.2	9	PORTVERSION= 0.10.1
10	PORTREVISION= 2
11	CATEGORIES= graphics gnome	10	CATEGORIES= graphics gnome
12	MASTER_SITES= http://www.yorba.org/download/shotwell/${PORTVERSION:R}/	11	MASTER_SITES= http://www.yorba.org/download/shotwell/${PORTVERSION:R}/
13		12
Lines 26-33 Link Here
26	unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \	25	unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
27	raw.2:${PORTSDIR}/graphics/libraw	26	raw.2:${PORTSDIR}/graphics/libraw
28		27
29	BROKEN= does not build
30
31	USE_BZIP2= yes	28	USE_BZIP2= yes
32	USE_GETTEXT= yes	29	USE_GETTEXT= yes
33	USE_GNOME= gnomehier gconf2 gtk20 desktopfileutils librsvg2	30	USE_GNOME= gnomehier gconf2 gtk20 desktopfileutils librsvg2
Lines 36-41 Link Here
36	CONFIGURE_ARGS= --prefix=${PREFIX} \	33	CONFIGURE_ARGS= --prefix=${PREFIX} \
37	--disable-icon-update \	34	--disable-icon-update \
38	--with-gconf-schema-file-dir=${PREFIX}/etc/gconf/schemas	35	--with-gconf-schema-file-dir=${PREFIX}/etc/gconf/schemas
		36	CONFIGURE_ENV+= --define=NO_CAMERA
39	INSTALLS_ICONS= yes	37	INSTALLS_ICONS= yes
40		38
41	GCONF_SCHEMAS= shotwell.schemas	39	GCONF_SCHEMAS= shotwell.schemas
Lines 44-57 Link Here
44	@${REINPLACE_CMD} -E \	42	@${REINPLACE_CMD} -E \
45	-e 's\|/bin/bash\|${SH}\|g ; s\|/usr/bin/env.*bash\|${SH}\|g' \	43	-e 's\|/bin/bash\|${SH}\|g ; s\|/usr/bin/env.*bash\|${SH}\|g' \
46	${WRKSRC}/${CONFIGURE_SCRIPT} \	44	${WRKSRC}/${CONFIGURE_SCRIPT} \
47	${WRKSRC}/libraw-config \	45	${WRKSRC}/libraw-config
48	${WRKSRC}/minver
49		46
50	post-configure:	47	post-configure:
51	@${REINPLACE_CMD} -E \	48	@${REINPLACE_CMD} -E \
52	-e 's\|share/shotwell\|${DATADIR_REL}\|g ; \	49	-e 's\|share/shotwell\|${DATADIR_REL}\|g ; \
53	s\|%%GCONF_CONFIG_SOURCE%%\|${GCONF_CONFIG_SOURCE}\|g' \	50	s\|%%GCONF_CONFIG_SOURCE%%\|${GCONF_CONFIG_SOURCE}\|g' \
54	${WRKSRC}/${MAKEFILE}	51	${WRKSRC}/${MAKEFILE}
		52
		53	@${REINPLACE_CMD} -E \
		54	-e 's\|\-n \|\|g' \
		55	${WRKSRC}/configure.mk
55	# attempt at a DATADIR safe port	56	# attempt at a DATADIR safe port
56	@${REINPLACE_CMD} -E \	57	@${REINPLACE_CMD} -E \
57	-e 's\|\.get_child\("share")\.get_child\("shotwell")\|${SHOTWELL_DATADIR}\|' \	58	-e 's\|\.get_child\("share")\.get_child\("shotwell")\|${SHOTWELL_DATADIR}\|' \

Lines 1-139 Link Here

(-)shotwell/files/patch-Makefile (-130 / +77 lines)
1	--- Makefile.orig 2010-09-10 17:55:54.000000000 -0500	1	--- Makefile.orig 2011-06-02 12:11:21.000000000 -0700
2	+++ Makefile 2010-12-28 16:15:44.000000000 -0600	2	+++ Makefile 2011-08-12 17:33:51.953748181 -0700
3	@@ -21,6 +21,10 @@	3	@@ -264,7 +264,6 @@
4	LINUX = 1	4	gstreamer-0.10 \
5	endif	5	gstreamer-base-0.10 \
6		6	gtk+-2.0 \
7	+ifeq "$(SYSTEM)" "FreeBSD"	7	- gudev-1.0 \
8	+ FreeBSD = 1	8	libexif \
9	+endif	9	libgphoto2 \
10	+	10	libsoup-2.4 \
11	ifeq "$(SYSTEM)" "MinGW"	11	@@ -296,7 +295,6 @@
12	WINDOWS = 1	12	gstreamer-0.10 >= 0.10.28 \
13	endif	13	gstreamer-base-0.10 >= 0.10.28 \
14	@@ -41,6 +45,10 @@	14	gtk+-2.0 >= 2.18.0 \
15	EXPORT_FLAGS = -export-dynamic	15	- gudev-1.0 >= 145 \
16	endif	16	libexif >= 0.6.16 \
17		17	libgphoto2 >= 2.4.2 \
18	+ifdef FreeBSD	18	libsoup-2.4 >= 2.26.0 \
19	+ EXPORT_FLAGS = -export-dynamic	19	@@ -375,7 +373,7 @@
20	+endif	20	$(EXPANDED_HELP_FILES) $(EXPANDED_HELP_IMAGES) apport/shotwell.py $(UNIT_RESOURCES) $(UNIT_MKS) \
21	+	21	unitize.mk units.mk $(PC_INPUT) $(PLUGINS_DIST_FILES) \
22	ifdef WINDOWS	22	$(EXPANDED_THUMBNAILER_SRC_FILES)
23	EXPORT_FLAGS = -export-all-symbols	23	-
24	endif	24	+
25	@@ -124,10 +132,13 @@	25
26	FSpotDatabaseDriver.vala \	26	DIST_TAR = $(PROGRAM)-$(VERSION).tar
27	FSpotDatabaseTables.vala	27	DIST_TAR_BZ2 = $(DIST_TAR).bz2
28		28	@@ -420,7 +418,7 @@
29	+# this should be ifndef LINUX && ifndef FreeBSD	29	# if not available.
30	ifndef LINUX
31	+ifndef FreeBSD
32	SRC_FILES += \
33	GConf.vala
34	endif
35	+endif
36
37	VAPI_FILES = \
38	libexif.vapi \
39	@@ -288,6 +299,18 @@
40	gdk-x11-2.0
41	endif
42
43	+ifdef FreeBSD
44	+EXT_PKGS += \
45	+ gconf-2.0 \
46	+ libgphoto2 \
47	+ libsoup-2.4 \
48	+ libxml-2.0 \
49	+ unique-1.0 \
50	+ webkit-1.0 \
51	+ dbus-glib-1 \
52	+ gdk-x11-2.0
53	+endif
54	+
55	# libraw is handled separately (see note below); when libraw-config is no longer needed, the version
56	# should be added to this list
57	EXT_PKG_VERSIONS = \
58	@@ -313,6 +336,18 @@
59	dbus-glib-1 >= 0.80
60	endif
61
62	+ifdef LINUX
63	+EXT_PKG_VERSIONS += \
64	+ gconf-2.0 >= 2.22.0 \
65	+ libgphoto2 >= 2.4.2 \
66	+ libsoup-2.4 >= 2.26.0 \
67	+ libxml-2.0 >= 2.6.32 \
68	+ unique-1.0 >= 1.0.0 \
69	+ webkit-1.0 >= 1.1.5 \
70	+ dbus-glib-1 >= 0.80
71	+endif
72	+
73	+
74	PKGS = $(EXT_PKGS) $(LOCAL_PKGS) $(LIBRAW_PKG)
75
76	ifndef BUILD_DIR
77	@@ -357,6 +392,10 @@
78
79	VALA_LDFLAGS = `pkg-config --libs $(EXT_PKGS) gthread-2.0`
80
81	+ifdef FreeBSD
82	+ VALA_DEFINES = -D NO_CAMERA
83	+endif
84	+
85	ifdef WINDOWS
86	VALA_DEFINES = -D WINDOWS -D NO_CAMERA -D NO_PRINTING -D NO_PUBLISHING -D NO_LIBUNIQUE -D NO_EXTENDED_POSIX -D NO_SET_BACKGROUND
87	EXPANDED_OBJ_FILES += src/windows.o
88	@@ -393,6 +432,11 @@
89	LIBRAW_CONFIG=./libraw-config	30	LIBRAW_CONFIG=./libraw-config
90	endif
91		31
92	+ifdef FreeBSD	32	-define check_valac_version
93	+LIBRAW_CONFIG=./libraw-config	33	+define xcheck_valac_version
94	+endif	34	@ ./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 )
95	+	35	$(if $(MAX_VALAC_VERSION),\
96	+	36	@ ./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 ),)
97	ifdef WINDOWS	37	@@ -561,6 +559,11 @@
98	LIBRAW_CONFIG=./libraw-config --windows	38	mkdir -p $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C/figures
99	endif
100	@@ -488,9 +532,20 @@
101	$(INSTALL_DATA) $(EXPANDED_HELP_IMAGES) $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C/figures	39	$(INSTALL_DATA) $(EXPANDED_HELP_IMAGES) $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C/figures
102	endif	40	endif
103	endif
104	+ifdef FreeBSD
105	+ifndef DISABLE_SCHEMAS_INSTALL	41	+ifndef DISABLE_SCHEMAS_INSTALL
106	+ GCONF_CONFIG_SOURCE=%%GCONF_CONFIG_SOURCE%% gconftool-2 --makefile-install-rule misc/shotwell.schemas	42	+ GCONF_CONFIG_SOURCE=xml:merged:/usr/local/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule misc/shotwell.schemas
107	+ mkdir -p $(DESTDIR)$(SCHEMA_FILE_DIR)	43	+ mkdir -p $(DESTDIR)$(SCHEMA_FILE_DIR)
108	+ $(INSTALL_DATA) misc/shotwell.schemas $(DESTDIR)$(SCHEMA_FILE_DIR)	44	+ $(INSTALL_DATA) misc/shotwell.schemas $(DESTDIR)$(SCHEMA_FILE_DIR)
109	+endif	45	+endif
110	+ifdef ENABLE_APPORT_HOOK_INSTALL	46	-$(foreach lang,$(CORE_SUPPORTED_LANGUAGES),`mkdir -p $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES ; \
111	+ mkdir -p $(DESTDIR)$(PREFIX)/share/apport/package-hooks	47	$(INSTALL_DATA) $(LOCAL_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo \
112	+ $(INSTALL_DATA) apport/shotwell.py $(DESTDIR)$(PREFIX)/share/apport/package-hooks	48	$(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo`)
113	+endif	49	@@ -638,7 +641,6 @@
114	+endif	50
115	-$(foreach lang,$(SUPPORTED_LANGUAGES),`mkdir -p $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES ; \	51	# EXPANDED_SRC_FILES includes UNITIZE_INITS and UNITIZE_ENTRY
116	- $(INSTALL_DATA) $(LOCAL_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo \	52	$(VALA_STAMP): $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) $(EXPANDED_SRC_HEADER_FILES)
117	- $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo`)	53	- $(call check_valac_version)
118	+ $(INSTALL_DATA) $(LOCAL_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo \	54	@echo Compiling Vala code...
119	+ $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo`)	55	@mkdir -p $(BUILD_DIR)
120		56	@$(VALAC) --ccode --directory=$(BUILD_DIR) --basedir=src \
121	uninstall:	57	@@ -655,10 +657,10 @@
122	rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM)	58	@
123	@@ -514,6 +569,16 @@	59
124	rm -f $(DESTDIR)$(PREFIX)/share/apport/package-hooks/shotwell.py	60	$(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
125	endif	61	- $(CC) -c $(VALA_CFLAGS) `$(LIBRAW_CONFIG) --cflags` $(CFLAGS) -o $@ $<
126	endif	62	+ $(CC) -c $(VALA_CFLAGS) $(CFLAGS) `pkg-config --cflags libraw` -o $@ $<
127	+ifdef FreeBSD	63
128	+ifndef DISABLE_SCHEMAS_INSTALL	64	$(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) $(THUMBNAILER_BIN)
129	+ GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule misc/shotwell.schemas	65	- $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@
130	+else	66	+ $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `pkg-config --libs libraw` $(EXPORT_FLAGS) -o $@
131	+ rm -f $(DESTDIR)$(SCHEMA_FILE_DIR)/shotwell.schemas	67
132	+endif	68	$(THUMBNAILER_BIN): $(EXPANDED_THUMBNAILER_SRC_FILES)
133	+ifdef ENABLE_APPORT_HOOK_INSTALL	69	$(VALAC) $(EXPANDED_THUMBNAILER_SRC_FILES) $(VALAFLAGS) -o $@ $(foreach pkg,$(THUMBNAILER_PKGS),--pkg=$(pkg))
134	+ rm -f $(DESTDIR)$(PREFIX)/share/apport/package-hooks/shotwell.py	70	@@ -668,7 +670,6 @@
135	+endif	71
136	+endif	72	.PHONY: $(PLUGINS_DIR)
137	$(foreach lang,$(SUPPORTED_LANGUAGES),`rm -f $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo`)	73	$(PLUGINS_DIR): $(PLUGIN_VAPI) $(PLUGIN_HEADER) $(PLUGIN_DEPS)
		74	- $(call check_valac_version)
		75	@$(MAKE) --directory=$@ PLUGINS_VERSION="$(VERSION)" USER_VALAFLAGS="$(USER_VALAFLAGS)" \
		76	PLUGIN_CFLAGS="$(PLUGIN_CFLAGS)"
		77
		78	@@ -686,7 +687,7 @@
		79	glade: lib$(PROGRAM).so
		80
		81	lib$(PROGRAM).so: $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)
		82	- $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -shared -o $@
		83	+ $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(LDFLAGS) `pkg-config --libs libraw` $(EXPORT_FLAGS) -shared -o $@
138		84
139	$(VALA_STAMP): $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) $(EXPANDED_SRC_HEADER_FILES) Makefile \	85	.PHONY: pkgcheck
		86	pkgcheck:

Line 0 Link Here

(-)shotwell/files/patch-src-camera-CameraTable.vala (+292 lines)
		1	$NetBSD: patch-ab,v 1.4 2011/07/12 19:00:57 drochner Exp $
		2
		3	--- src/camera/CameraTable.vala.orig 2011-03-22 20:46:15.000000000 +0000
		4	+++ src/camera/CameraTable.vala
		5	@@ -26,7 +26,6 @@ public class CameraTable {
		6
		7	private static CameraTable instance = null;
		8
		9	- private GUdev.Client client = new GUdev.Client(SUBSYSTEMS);
		10	private OneShotScheduler camera_update_scheduler = null;
		11	private GPhoto.Context null_context = new GPhoto.Context();
		12	private GPhoto.CameraAbilitiesList abilities_list;
		13	@@ -44,7 +43,6 @@ public class CameraTable {
		14	on_update_cameras);
		15
		16	// listen for interesting events on the specified subsystems
		17	- client.uevent.connect(on_udev_event);
		18	volume_monitor = VolumeMonitor.get();
		19	volume_monitor.volume_changed.connect(on_volume_changed);
		20	volume_monitor.volume_added.connect(on_volume_changed);
		21	@@ -96,43 +94,18 @@ public class CameraTable {
		22	if (res != GPhoto.Result.OK)
		23	throw new GPhotoError.LIBRARY("[%d] Unable to %s: %s", (int) res, op, res.as_string());
		24	}
		25	-
		26	+
		27	private void init_camera_table() throws GPhotoError {
		28	do_op(GPhoto.CameraAbilitiesList.create(out abilities_list), "create camera abilities list");
		29	do_op(abilities_list.load(null_context), "load camera abilities list");
		30	}
		31	-
		32	+
		33	private string[] get_all_usb_cameras() {
		34	string[] cameras = new string[0];
		35	-
		36	- GLib.List<GUdev.Device> device_list = client.query_by_subsystem(null);
		37	- foreach (GUdev.Device device in device_list) {
		38	- string device_file = device.get_device_file();
		39	- if(
		40	- // only keep devices that have a non-null device file and that
		41	- // have both the ID_GPHOTO2 and GPHOTO2_DRIVER properties set
		42	- (device_file != null) &&
		43	- (device.has_property("ID_GPHOTO2")) &&
		44	- (device.has_property("GPHOTO2_DRIVER"))
		45	- ) {
		46	- int camera_bus, camera_device;
		47	- // extract the bus and device IDs from the device file string
		48	- // TODO: is it safe to parse the absolute path or should we be
		49	- // smarter and use a regex to only pick up the end of the path?
		50	- if (device_file.scanf("/dev/bus/usb/%d/%d", out camera_bus, out camera_device) < 2) {
		51	- critical("get_all_usb_cameras: Failed to scanf device file %s", device_file);
		52	-
		53	- continue;
		54	- }
		55	- string camera = "usb:%.3d,%.3d".printf(camera_bus, camera_device);
		56	- debug("USB camera detected at %s", camera);
		57	- cameras += camera;
		58	- }
		59	- }
		60	-
		61	+
		62	return cameras;
		63	}
		64	-
65	+
66	// USB (or libusb) is a funny beast; if only one USB device is present (i.e. the camera),
67	// then a single camera is detected at port usb:. However, if multiple USB devices are
68	// present (including non-cameras), then the first attached camera will be listed twice,
69	@@ -141,59 +114,59 @@ public class CameraTable {
70	//
71	// This function gleans the full port name of a particular port, even if it's the unadorned
72	// "usb:", by using GUdev.
73	- private bool usb_esp(int current_camera_count, string[] usb_cameras, string port,
74	+ private bool usb_esp(int current_camera_count, string[] usb_cameras, string port,
75	out string full_port) {
76	// sanity
77	assert(current_camera_count > 0);
78	-
79	+
80	debug("USB ESP: current_camera_count=%d port=%s", current_camera_count, port);
81	-
82	+
83	// if GPhoto detects one camera, and USB reports one camera, all is swell
84	if (current_camera_count == 1 && usb_cameras.length == 1) {
85	full_port = usb_cameras[0];
86	-
87	+
88	debug("USB ESP: port=%s full_port=%s", port, full_port);
89	-
90	+
91	return true;
92	}
93
94	// with more than one camera, skip the mirrored "usb:" port
95	if (port == "usb:") {
96	debug("USB ESP: Skipping %s", port);
97	-
98	+
99	return false;
100	}
101	-
102	+
103	// parse out the bus and device ID
104	int bus, device;
105	if (port.scanf("usb:%d,%d", out bus, out device) < 2) {
106	critical("USB ESP: Failed to scanf %s", port);
107	-
108	+
109	return false;
110	}
111	-
112	+
113	foreach (string usb_camera in usb_cameras) {
114	int camera_bus, camera_device;
115	if (usb_camera.scanf("usb:%d,%d", out camera_bus, out camera_device) < 2) {
116	critical("USB ESP: Failed to scanf %s", usb_camera);
117	-
118	+
119	continue;
120	}
121	-
122	+
123	if ((bus == camera_bus) && (device == camera_device)) {
124	full_port = port;
125	-
126	+
127	debug("USB ESP: port=%s full_port=%s", port, full_port);
128
129	return true;
130	}
131	}
132	-
133	+
134	debug("USB ESP: No matching bus/device found for port=%s", port);
135	-
136	+
137	return false;
138	}
139	-
140	+
141	public static string get_port_uri(string port) {
142	return "gphoto2://[%s]/".printf(port);
143	}
144	@@ -204,24 +177,6 @@ public class CameraTable {
145	"/dev/bus/usb/%s".printf(port.substring(4).replace(",", "/")) : null;
146	}
147
148	- private string? get_name_for_uuid(string uuid) {
149	- foreach (Volume volume in volume_monitor.get_volumes()) {
150	- if (volume.get_identifier(VOLUME_IDENTIFIER_KIND_UUID) == uuid) {
151	- return volume.get_name();
152	- }
153	- }
154	- return null;
155	- }
156	-
157	- private GLib.Icon? get_icon_for_uuid(string uuid) {
158	- foreach (Volume volume in volume_monitor.get_volumes()) {
159	- if (volume.get_identifier(VOLUME_IDENTIFIER_KIND_UUID) == uuid) {
160	- return volume.get_icon();
161	- }
162	- }
163	- return null;
164	- }
165	-
166	private void update_camera_table() throws GPhotoError {
167	// need to do this because virtual ports come and go in the USB world (and probably others)
168	GPhoto.PortInfoList port_info_list;
169	@@ -231,13 +186,13 @@ public class CameraTable {
170	GPhoto.CameraList camera_list;
171	do_op(GPhoto.CameraList.create(out camera_list), "create camera list");
172	do_op(abilities_list.detect(port_info_list, camera_list, null_context), "detect cameras");
173	-
174	+
175	Gee.HashMap<string, string> detected_map = new Gee.HashMap<string, string>(str_hash, str_equal,
176	str_equal);
177	-
178	+
179	// walk the USB chain and find all PTP cameras; this is necessary for usb_esp
180	string[] usb_cameras = get_all_usb_cameras();
181	-
182	+
183	// go through the detected camera list and glean their ports
184	for (int ctr = 0; ctr < camera_list.count(); ctr++) {
185	string name;
186	@@ -245,55 +200,55 @@ public class CameraTable {
187
188	string port;
189	do_op(camera_list.get_value(ctr, out port), "get detected camera port");
190	-
191	+
192	debug("Detected %d/%d %s @ %s", ctr + 1, camera_list.count(), name, port);
193	-
194	+
195	// do some USB ESP, skipping ports that cannot be deduced
196	if (port.has_prefix("usb:")) {
197	string full_port;
198	if (!usb_esp(camera_list.count(), usb_cameras, port, out full_port))
199	continue;
200	-
201	+
202	port = full_port;
203	}
204
205	detected_map.set(port, name);
206	}
207	-
208	+
209	// find cameras that have disappeared
210	DiscoveredCamera[] missing = new DiscoveredCamera[0];
211	foreach (DiscoveredCamera camera in camera_map.values) {
212	GPhoto.PortInfo port_info;
213	- do_op(camera.gcamera.get_port_info(out port_info),
214	+ do_op(camera.gcamera.get_port_info(out port_info),
215	"retrieve missing camera port information");
216	-
217	+
218	GPhoto.CameraAbilities abilities;
219	do_op(camera.gcamera.get_abilities(out abilities), "retrieve camera abilities");
220	-
221	+
222	if (detected_map.has_key(port_info.path)) {
223	debug("Found camera for %s @ %s in detected map", abilities.model, port_info.path);
224	-
225	+
226	continue;
227	}
228	-
229	+
230	debug("%s @ %s missing", abilities.model, port_info.path);
231	-
232	+
233	missing += camera;
234	}
235	-
236	+
237	// have to remove from hash map outside of iterator
238	foreach (DiscoveredCamera camera in missing) {
239	GPhoto.PortInfo port_info;
240	do_op(camera.gcamera.get_port_info(out port_info),
241	"retrieve missing camera port information");
242	-
243	+
244	GPhoto.CameraAbilities abilities;
245	do_op(camera.gcamera.get_abilities(out abilities), "retrieve missing camera abilities");
246
247	debug("Removing from camera table: %s @ %s", abilities.model, port_info.path);
248
249	camera_map.unset(get_port_uri(port_info.path));
250	-
251	+
252	camera_removed(camera);
253	}
254
255	@@ -311,23 +266,6 @@ public class CameraTable {
256	continue;
257	}
258
259	- // Get display name for camera.
260	- string path = get_port_path(port);
261	- if (null != path) {
262	- GUdev.Device device = client.query_by_device_file(path);
263	- string serial = device.get_property("ID_SERIAL_SHORT");
264	- if (null != serial) {
265	- // Try to get the name and icon.
266	- display_name = get_name_for_uuid(serial);
267	- icon = get_icon_for_uuid(serial);
268	- }
269	- if (null == display_name) {
270	- display_name = device.get_sysfs_attr("product");
271	- }
272	- if (null == display_name) {
273	- display_name = device.get_property("ID_MODEL");
274	- }
275	- }
276	if (null == display_name) {
277	// Default to GPhoto detected name.
278	display_name = name;
279	@@ -365,13 +303,6 @@ public class CameraTable {
280	}
281	}
282
283	- private void on_udev_event(string action, GUdev.Device device) {
284	- debug("udev event: %s on %s", action, device.get_name());
285	-
286	- // Device add/removes often arrive in pairs; this allows for a single
287	- // update to occur when they come in all at once
288	- camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true);
289	- }
290
291	public void on_volume_changed(Volume volume) {
292	camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true);

Line 0 Link Here

(-)shotwell/files/patch-src_photos_GRaw.vala (+38 lines)
	1	$NetBSD: patch-src_photos_GRaw.vala,v 1.1 2011/07/31 17:37:01 gls Exp $
	2
	3	Fix importing with libraw 0.13.6 & 0.13.7
	4	Taken from upstream: http://redmine.yorba.org/issues/3868
	5
	6	--- src/photos/GRaw.vala.orig 2011-05-26 23:43:17.000000000 +0000
	7	+++ src/photos/GRaw.vala
	8	@@ -110,8 +110,8 @@ public class ProcessedImage {
	9	}
	10
	11	public ProcessedImage(LibRaw.Processor proc) throws Exception {
	12	- LibRaw.Result result;
	13	- image = proc.make_mem_image(out result);
	14	+ LibRaw.Result result = LibRaw.Result.SUCCESS;
	15	+ image = proc.make_mem_image(ref result);
	16	throw_exception("ProcessedImage", result);
	17	assert(image != null);
	18
	19	@@ -122,8 +122,8 @@ public class ProcessedImage {
	20	}
	21
	22	public ProcessedImage.from_thumb(LibRaw.Processor proc) throws Exception {
	23	- LibRaw.Result result;
	24	- image = proc.make_mem_thumb(out result);
	25	+ LibRaw.Result result = LibRaw.Result.SUCCESS;
	26	+ image = proc.make_mem_thumb(ref result);
	27	throw_exception("ProcessedImage.from_thumb", result);
	28	assert(image != null);
	29
	30	@@ -280,7 +280,7 @@ private void throw_exception(string call
	31	if (result == LibRaw.Result.SUCCESS)
	32	return;
	33	else if (result > 0)
	34	- throw new Exception.SYSTEM_ERROR("System error %d: %s", (int) result, strerror(result));
	35	+ throw new Exception.SYSTEM_ERROR("%s: System error %d: %s", caller, (int) result, strerror(result));
	36
	37	string msg = "%s: %s".printf(caller, result.to_string());
	38

Line 0 Link Here

(-)shotwell/files/patch-vapi_libraw.vapi (+19 lines)
	1	$NetBSD: patch-vapi_libraw.vapi,v 1.1 2011/07/31 17:37:01 gls Exp $
	2
	3	Fix importing with libraw 0.13.6 & 0.13.7
	4	Taken from upstream: http://redmine.yorba.org/issues/3868
	5
	6	--- vapi/libraw.vapi.orig 2011-05-26 23:43:17.000000000 +0000
	7	+++ vapi/libraw.vapi
	8	@@ -182,9 +182,9 @@ public class Processor {
	9	public unowned ImageSizes get_sizes() { return sizes; }
	10	public unowned Thumbnail get_thumbnail() { return thumbnail; }
	11	[CCode (cname="libraw_dcraw_make_mem_image")]
	12	- public ProcessedImage make_mem_image(out Result result);
	13	+ public ProcessedImage make_mem_image(ref Result result);
	14	[CCode (cname="libraw_dcraw_make_mem_thumb")]
	15	- public ProcessedImage make_mem_thumb(out Result result);
	16	+ public ProcessedImage make_mem_thumb(ref Result result);
	17	public Result open_buffer(uint8[] buffer);
	18	public Result open_file(string filename);
	19	[CCode (cname="libraw_dcraw_process")]

Lines 1-64 Link Here

(-)shotwell/pkg-plist (-6 / +130 lines)
1	bin/shotwell	1	bin/shotwell
		2	bin/shotwell-video-thumbnailer
		3	lib/shotwell/plugins/builtin/facebook.png
		4	lib/shotwell/plugins/builtin/flickr.png
		5	lib/shotwell/plugins/builtin/picasa.png
		6	lib/shotwell/plugins/builtin/piwigo.png
		7	lib/shotwell/plugins/builtin/piwigo_authentication_pane.glade
		8	lib/shotwell/plugins/builtin/shotwell-publishing-extras.so
		9	lib/shotwell/plugins/builtin/shotwell-publishing.so
		10	lib/shotwell/plugins/builtin/shotwell-transitions.so
		11	lib/shotwell/plugins/builtin/slideshow-plugin.png
		12	lib/shotwell/plugins/builtin/yandex_publish_model.glade
		13	lib/shotwell/plugins/builtin/youtube.png
2	share/applications/shotwell-viewer.desktop	14	share/applications/shotwell-viewer.desktop
3	share/applications/shotwell.desktop	15	share/applications/shotwell.desktop
		16	share/gnome/help/shotwell/C/edit-adjustments.page
		17	share/gnome/help/shotwell/C/edit-crop.page
		18	share/gnome/help/shotwell/C/edit-enhance.page
		19	share/gnome/help/shotwell/C/edit-external.page
		20	share/gnome/help/shotwell/C/edit-nondestructive.page
		21	share/gnome/help/shotwell/C/edit-redeye.page
		22	share/gnome/help/shotwell/C/edit-rotate.page
		23	share/gnome/help/shotwell/C/edit-time-date.page
		24	share/gnome/help/shotwell/C/edit-undo.page
		25	share/gnome/help/shotwell/C/figures/crop_thirds.jpg
		26	share/gnome/help/shotwell/C/figures/edit_toolbar.png
		27	share/gnome/help/shotwell/C/figures/editing_overview.png
		28	share/gnome/help/shotwell/C/figures/shotwell_logo.png
		29	share/gnome/help/shotwell/C/figures/trash_process.png
		30	share/gnome/help/shotwell/C/formats.page
		31	share/gnome/help/shotwell/C/import-camera.page
		32	share/gnome/help/shotwell/C/import-f-spot.page
		33	share/gnome/help/shotwell/C/import-file.page
		34	share/gnome/help/shotwell/C/import-memorycard.page
		35	share/gnome/help/shotwell/C/index.page
		36	share/gnome/help/shotwell/C/organize-event.page
		37	share/gnome/help/shotwell/C/organize-flag.page
		38	share/gnome/help/shotwell/C/organize-rating.page
		39	share/gnome/help/shotwell/C/organize-remove.page
		40	share/gnome/help/shotwell/C/organize-search.page
		41	share/gnome/help/shotwell/C/organize-tag.page
		42	share/gnome/help/shotwell/C/organize-title.page
		43	share/gnome/help/shotwell/C/other-files.page
		44	share/gnome/help/shotwell/C/other-missing.page
		45	share/gnome/help/shotwell/C/other-multiple.page
		46	share/gnome/help/shotwell/C/running.page
		47	share/gnome/help/shotwell/C/share-background.page
		48	share/gnome/help/shotwell/C/share-export.page
		49	share/gnome/help/shotwell/C/share-print.page
		50	share/gnome/help/shotwell/C/share-send.page
		51	share/gnome/help/shotwell/C/share-slideshow.page
		52	share/gnome/help/shotwell/C/share-upload.page
		53	share/gnome/help/shotwell/C/view-displaying.page
		54	share/gnome/help/shotwell/C/view-information.page
		55	share/gnome/help/shotwell/C/view-sidebar.page
		56	share/icons/hicolor/16x16/apps/shotwell.svg
		57	share/icons/hicolor/24x24/apps/shotwell.svg
4	share/icons/hicolor/scalable/apps/shotwell.svg	58	share/icons/hicolor/scalable/apps/shotwell.svg
		59	share/locale/ar/LC_MESSAGES/shotwell-extras.mo
5	share/locale/ar/LC_MESSAGES/shotwell.mo	60	share/locale/ar/LC_MESSAGES/shotwell.mo
		61	share/locale/ast/LC_MESSAGES/shotwell-extras.mo
6	share/locale/ast/LC_MESSAGES/shotwell.mo	62	share/locale/ast/LC_MESSAGES/shotwell.mo
		63	share/locale/bg/LC_MESSAGES/shotwell-extras.mo
7	share/locale/bg/LC_MESSAGES/shotwell.mo	64	share/locale/bg/LC_MESSAGES/shotwell.mo
		65	share/locale/bn/LC_MESSAGES/shotwell-extras.mo
8	share/locale/bn/LC_MESSAGES/shotwell.mo	66	share/locale/bn/LC_MESSAGES/shotwell.mo
		67	share/locale/ca/LC_MESSAGES/shotwell-extras.mo
9	share/locale/ca/LC_MESSAGES/shotwell.mo	68	share/locale/ca/LC_MESSAGES/shotwell.mo
		69	share/locale/cs/LC_MESSAGES/shotwell-extras.mo
10	share/locale/cs/LC_MESSAGES/shotwell.mo	70	share/locale/cs/LC_MESSAGES/shotwell.mo
		71	share/locale/da/LC_MESSAGES/shotwell-extras.mo
11	share/locale/da/LC_MESSAGES/shotwell.mo	72	share/locale/da/LC_MESSAGES/shotwell.mo
		73	share/locale/de/LC_MESSAGES/shotwell-extras.mo
12	share/locale/de/LC_MESSAGES/shotwell.mo	74	share/locale/de/LC_MESSAGES/shotwell.mo
		75	share/locale/el/LC_MESSAGES/shotwell-extras.mo
13	share/locale/el/LC_MESSAGES/shotwell.mo	76	share/locale/el/LC_MESSAGES/shotwell.mo
		77	share/locale/en_GB/LC_MESSAGES/shotwell-extras.mo
14	share/locale/en_GB/LC_MESSAGES/shotwell.mo	78	share/locale/en_GB/LC_MESSAGES/shotwell.mo
		79	share/locale/es/LC_MESSAGES/shotwell-extras.mo
15	share/locale/es/LC_MESSAGES/shotwell.mo	80	share/locale/es/LC_MESSAGES/shotwell.mo
		81	share/locale/et/LC_MESSAGES/shotwell-extras.mo
16	share/locale/et/LC_MESSAGES/shotwell.mo	82	share/locale/et/LC_MESSAGES/shotwell.mo
		83	share/locale/eu/LC_MESSAGES/shotwell-extras.mo
		84	share/locale/eu/LC_MESSAGES/shotwell.mo
		85	share/locale/fi/LC_MESSAGES/shotwell-extras.mo
17	share/locale/fi/LC_MESSAGES/shotwell.mo	86	share/locale/fi/LC_MESSAGES/shotwell.mo
		87	share/locale/fr/LC_MESSAGES/shotwell-extras.mo
18	share/locale/fr/LC_MESSAGES/shotwell.mo	88	share/locale/fr/LC_MESSAGES/shotwell.mo
		89	share/locale/gl/LC_MESSAGES/shotwell-extras.mo
19	share/locale/gl/LC_MESSAGES/shotwell.mo	90	share/locale/gl/LC_MESSAGES/shotwell.mo
		91	share/locale/he/LC_MESSAGES/shotwell-extras.mo
		92	share/locale/he/LC_MESSAGES/shotwell.mo
		93	share/locale/hr/LC_MESSAGES/shotwell-extras.mo
20	share/locale/hr/LC_MESSAGES/shotwell.mo	94	share/locale/hr/LC_MESSAGES/shotwell.mo
		95	share/locale/hu/LC_MESSAGES/shotwell-extras.mo
21	share/locale/hu/LC_MESSAGES/shotwell.mo	96	share/locale/hu/LC_MESSAGES/shotwell.mo
		97	share/locale/id/LC_MESSAGES/shotwell-extras.mo
22	share/locale/id/LC_MESSAGES/shotwell.mo	98	share/locale/id/LC_MESSAGES/shotwell.mo
		99	share/locale/it/LC_MESSAGES/shotwell-extras.mo
23	share/locale/it/LC_MESSAGES/shotwell.mo	100	share/locale/it/LC_MESSAGES/shotwell.mo
		101	share/locale/ja/LC_MESSAGES/shotwell-extras.mo
24	share/locale/ja/LC_MESSAGES/shotwell.mo	102	share/locale/ja/LC_MESSAGES/shotwell.mo
		103	share/locale/kk/LC_MESSAGES/shotwell-extras.mo
25	share/locale/kk/LC_MESSAGES/shotwell.mo	104	share/locale/kk/LC_MESSAGES/shotwell.mo
		105	share/locale/ko/LC_MESSAGES/shotwell-extras.mo
26	share/locale/ko/LC_MESSAGES/shotwell.mo	106	share/locale/ko/LC_MESSAGES/shotwell.mo
		107	share/locale/lt/LC_MESSAGES/shotwell-extras.mo
27	share/locale/lt/LC_MESSAGES/shotwell.mo	108	share/locale/lt/LC_MESSAGES/shotwell.mo
		109	share/locale/lv/LC_MESSAGES/shotwell-extras.mo
28	share/locale/lv/LC_MESSAGES/shotwell.mo	110	share/locale/lv/LC_MESSAGES/shotwell.mo
		111	share/locale/mk/LC_MESSAGES/shotwell-extras.mo
		112	share/locale/mk/LC_MESSAGES/shotwell.mo
		113	share/locale/nb/LC_MESSAGES/shotwell-extras.mo
29	share/locale/nb/LC_MESSAGES/shotwell.mo	114	share/locale/nb/LC_MESSAGES/shotwell.mo
		115	share/locale/nl/LC_MESSAGES/shotwell-extras.mo
30	share/locale/nl/LC_MESSAGES/shotwell.mo	116	share/locale/nl/LC_MESSAGES/shotwell.mo
		117	share/locale/pa/LC_MESSAGES/shotwell-extras.mo
31	share/locale/pa/LC_MESSAGES/shotwell.mo	118	share/locale/pa/LC_MESSAGES/shotwell.mo
		119	share/locale/pl/LC_MESSAGES/shotwell-extras.mo
32	share/locale/pl/LC_MESSAGES/shotwell.mo	120	share/locale/pl/LC_MESSAGES/shotwell.mo
		121	share/locale/pt/LC_MESSAGES/shotwell-extras.mo
33	share/locale/pt/LC_MESSAGES/shotwell.mo	122	share/locale/pt/LC_MESSAGES/shotwell.mo
		123	share/locale/pt_BR/LC_MESSAGES/shotwell-extras.mo
		124	share/locale/pt_BR/LC_MESSAGES/shotwell.mo
		125	share/locale/ro/LC_MESSAGES/shotwell-extras.mo
34	share/locale/ro/LC_MESSAGES/shotwell.mo	126	share/locale/ro/LC_MESSAGES/shotwell.mo
		127	share/locale/ru/LC_MESSAGES/shotwell-extras.mo
35	share/locale/ru/LC_MESSAGES/shotwell.mo	128	share/locale/ru/LC_MESSAGES/shotwell.mo
		129	share/locale/sk/LC_MESSAGES/shotwell-extras.mo
36	share/locale/sk/LC_MESSAGES/shotwell.mo	130	share/locale/sk/LC_MESSAGES/shotwell.mo
		131	share/locale/sl/LC_MESSAGES/shotwell-extras.mo
37	share/locale/sl/LC_MESSAGES/shotwell.mo	132	share/locale/sl/LC_MESSAGES/shotwell.mo
		133	share/locale/sr/LC_MESSAGES/shotwell-extras.mo
38	share/locale/sr/LC_MESSAGES/shotwell.mo	134	share/locale/sr/LC_MESSAGES/shotwell.mo
		135	share/locale/sv/LC_MESSAGES/shotwell-extras.mo
39	share/locale/sv/LC_MESSAGES/shotwell.mo	136	share/locale/sv/LC_MESSAGES/shotwell.mo
		137	share/locale/ta/LC_MESSAGES/shotwell-extras.mo
		138	share/locale/ta/LC_MESSAGES/shotwell.mo
		139	share/locale/te/LC_MESSAGES/shotwell-extras.mo
		140	share/locale/te/LC_MESSAGES/shotwell.mo
		141	share/locale/th/LC_MESSAGES/shotwell-extras.mo
40	share/locale/th/LC_MESSAGES/shotwell.mo	142	share/locale/th/LC_MESSAGES/shotwell.mo
		143	share/locale/tr/LC_MESSAGES/shotwell-extras.mo
41	share/locale/tr/LC_MESSAGES/shotwell.mo	144	share/locale/tr/LC_MESSAGES/shotwell.mo
		145	share/locale/uk/LC_MESSAGES/shotwell-extras.mo
42	share/locale/uk/LC_MESSAGES/shotwell.mo	146	share/locale/uk/LC_MESSAGES/shotwell.mo
		147	share/locale/zh_CN/LC_MESSAGES/shotwell-extras.mo
43	share/locale/zh_CN/LC_MESSAGES/shotwell.mo	148	share/locale/zh_CN/LC_MESSAGES/shotwell.mo
		149	share/locale/zh_TW/LC_MESSAGES/shotwell-extras.mo
44	share/locale/zh_TW/LC_MESSAGES/shotwell.mo	150	share/locale/zh_TW/LC_MESSAGES/shotwell.mo
45	%%DATADIR%%/icons/all-rejected.png	151	%%DATADIR%%/icons/all-rejected.png
46	%%DATADIR%%/icons/crop-pivot-reticle.png	152	%%DATADIR%%/icons/crop-pivot-reticle.png
47	%%DATADIR%%/icons/crop.svg	153	%%DATADIR%%/icons/crop.svg
48	%%DATADIR%%/icons/drag_nub.png	154	%%DATADIR%%/icons/drag_nub.png
49	%%DATADIR%%/icons/enhance.png	155	%%DATADIR%%/icons/enhance.png
		156	%%DATADIR%%/icons/filter-flagged.png
		157	%%DATADIR%%/icons/filter-photos.png
		158	%%DATADIR%%/icons/filter-raw.png
		159	%%DATADIR%%/icons/filter-videos.png
50	%%DATADIR%%/icons/five-star-filter.svg	160	%%DATADIR%%/icons/five-star-filter.svg
51	%%DATADIR%%/icons/five-stars.svg	161	%%DATADIR%%/icons/five-stars.svg
		162	%%DATADIR%%/icons/flag-page.png
		163	%%DATADIR%%/icons/flag-trinket.png
52	%%DATADIR%%/icons/four-star-filter-plus.svg	164	%%DATADIR%%/icons/four-star-filter-plus.svg
53	%%DATADIR%%/icons/four-stars.svg	165	%%DATADIR%%/icons/four-stars.svg
		166	%%DATADIR%%/icons/generic-plugin.png
54	%%DATADIR%%/icons/image-adjust.svg	167	%%DATADIR%%/icons/image-adjust.svg
55	%%DATADIR%%/icons/import-all.png	168	%%DATADIR%%/icons/import-all.png
56	%%DATADIR%%/icons/import.svg	169	%%DATADIR%%/icons/import.svg
57	%%DATADIR%%/icons/last-import-roll.png
58	%%DATADIR%%/icons/make-primary.svg	170	%%DATADIR%%/icons/make-primary.svg
59	%%DATADIR%%/icons/merge.svg	171	%%DATADIR%%/icons/merge.svg
60	%%DATADIR%%/icons/multiple-events.png	172	%%DATADIR%%/icons/multiple-events.png
61	%%DATADIR%%/icons/multiple-tags.png	173	%%DATADIR%%/icons/multiple-tags.png
		174	%%DATADIR%%/icons/noninterpretable-video.png
62	%%DATADIR%%/icons/one-event.png	175	%%DATADIR%%/icons/one-event.png
63	%%DATADIR%%/icons/one-star-filter-plus.svg	176	%%DATADIR%%/icons/one-star-filter-plus.svg
64	%%DATADIR%%/icons/one-star.svg	177	%%DATADIR%%/icons/one-star.svg
Lines 67-81 Link Here
67	%%DATADIR%%/icons/publish.png	180	%%DATADIR%%/icons/publish.png
68	%%DATADIR%%/icons/redeye.png	181	%%DATADIR%%/icons/redeye.png
69	%%DATADIR%%/icons/rejected.svg	182	%%DATADIR%%/icons/rejected.svg
		183	%%DATADIR%%/icons/searchbox-clear.svg
		184	%%DATADIR%%/icons/searchbox-find.svg
70	%%DATADIR%%/icons/shotwell-16.svg	185	%%DATADIR%%/icons/shotwell-16.svg
71	%%DATADIR%%/icons/shotwell-24.svg	186	%%DATADIR%%/icons/shotwell-24.svg
72	%%DATADIR%%/icons/shotwell-street.jpg	187	%%DATADIR%%/icons/shotwell-street.jpg
73	%%DATADIR%%/icons/shotwell.ico	188	%%DATADIR%%/icons/shotwell.ico
74	%%DATADIR%%/icons/shotwell.svg	189	%%DATADIR%%/icons/shotwell.svg
		190	%%DATADIR%%/icons/slideshow-extension-point.png
		191	%%DATADIR%%/icons/sprocket.png
75	%%DATADIR%%/icons/three-star-filter-plus.svg	192	%%DATADIR%%/icons/three-star-filter-plus.svg
76	%%DATADIR%%/icons/three-stars.svg	193	%%DATADIR%%/icons/three-stars.svg
77	%%DATADIR%%/icons/two-star-filter-plus.svg	194	%%DATADIR%%/icons/two-star-filter-plus.svg
78	%%DATADIR%%/icons/two-stars.svg	195	%%DATADIR%%/icons/two-stars.svg
		196	%%DATADIR%%/icons/videos-page.png
79	%%DATADIR%%/icons/zoom-in.png	197	%%DATADIR%%/icons/zoom-in.png
80	%%DATADIR%%/icons/zoom-out.png	198	%%DATADIR%%/icons/zoom-out.png
81	%%DATADIR%%/ui/collection.ui	199	%%DATADIR%%/ui/collection.ui
Lines 85-102 Link Here
85	%%DATADIR%%/ui/fullscreen.ui	203	%%DATADIR%%/ui/fullscreen.ui
86	%%DATADIR%%/ui/import.ui	204	%%DATADIR%%/ui/import.ui
87	%%DATADIR%%/ui/import_queue.ui	205	%%DATADIR%%/ui/import_queue.ui
		206	%%DATADIR%%/ui/media.ui
88	%%DATADIR%%/ui/offline.ui	207	%%DATADIR%%/ui/offline.ui
89	%%DATADIR%%/ui/photo.ui	208	%%DATADIR%%/ui/photo.ui
		209	%%DATADIR%%/ui/savedsearch.ui
		210	%%DATADIR%%/ui/search_bar.ui
		211	%%DATADIR%%/ui/set_background_dialog.glade
90	%%DATADIR%%/ui/shotwell.glade	212	%%DATADIR%%/ui/shotwell.glade
		213	%%DATADIR%%/ui/shotwell.xml
		214	%%DATADIR%%/ui/sidebar_default.ui
91	%%DATADIR%%/ui/tags.ui	215	%%DATADIR%%/ui/tags.ui
92	%%DATADIR%%/ui/trash.ui	216	%%DATADIR%%/ui/trash.ui
93	@dirrm %%DATADIR%%/ui
94	@dirrm %%DATADIR%%/icons	217	@dirrm %%DATADIR%%/icons
		218	@dirrm %%DATADIR%%/ui
95	@dirrm %%DATADIR%%	219	@dirrm %%DATADIR%%
96	@dirrmtry share/locale/kk/LC_MESSAGES
97	@dirrmtry share/locale/kk
98	@dirrmtry share/locale/ast/LC_MESSAGES
99	@dirrmtry share/locale/ast
100	@dirrmtry share/applications	220	@dirrmtry share/applications
		221	@dirrmtry share/locale/ast
		222	@dirrmtry share/locale/ast/LC_MESSAGES
		223	@dirrmtry share/locale/kk
		224	@dirrmtry share/locale/kk/LC_MESSAGES
101	@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null \|\| /usr/bin/true	225	@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null \|\| /usr/bin/true
102	@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null \|\| /usr/bin/true	226	@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null \|\| /usr/bin/true