Bug 178014 - graphics/shotwell : upgrade (and unbreak)
Summary: graphics/shotwell : upgrade (and unbreak)
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: William Grzybowski
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-04-20 22:10 UTC by Christoph Moench-Tegeder
Modified: 2013-06-13 12:30 UTC (History)
0 users

See Also:


Attachments
shotwell.diff.gz (13.73 KB, text/plain)
2013-04-20 22:10 UTC, Christoph Moench-Tegeder
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Christoph Moench-Tegeder freebsd_committer freebsd_triage 2013-04-20 22:10:00 UTC
	graphics/shotwell is currently broken, as vala refuses to use gtk2 when
	gtk3 is installed (amongt other things).
	Upgrading shotwell requires:
	  - an update of graphics/exiv2, see ports/178012
	  - librest from Gnome, see ports/178013

	As shotwell-0.14.1 would require gstreamer-1.0 (which we don't have yet)
	and I felt upgrading all the gstreamer-related ports would be overly
	intrusive, I did some patching to make shotwell build with the "old"
	gstreamer-0.10 in the ports collection; but I do not have videos in
	my collection to do real testing of those changes.

	The current maintainer David Thiel <lx@freebsd.org> indicated he
	wanted to orphan this port, with his permission I'll take over
	maintainership.

Fix: Patch via HTTP: http://burggraben.net/hacks/shotwell.diff.gz

	Modified/deleted/added files (svn status):
	M       Makefile
	M       distinfo
	M       files/patch-Makefile
	A       files/patch-src-VideoSupport.vala
	M       files/patch-src-camera-CameraTable.vala
	D       files/patch-src-photos-GRaw.vala
	D       files/patch-src__main.vala
	A       files/patch-thumbnailer-shotwell-video-thumbnailer.vala
	D       files/patch-vapi-libraw.vapi
	M       pkg-plist

	UUEncoded patch:
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-04-20 22:10:09 UTC
Responsible Changed
From-To: freebsd-ports-bugs->lx

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Christoph Moench-Tegeder freebsd_committer freebsd_triage 2013-04-29 20:39:55 UTC
Hi,

now that kwm@ has imported gstreamer-1.0, we can drop the gstreamer-
related patches from the port and use gstreamer-1.0 as intended by the
shotwell team.

For patching the original port, I got the following modified/deleted
files from svn status:
M       Makefile
M       distinfo
M       files/patch-Makefile
M       files/patch-src-camera-CameraTable.vala
D       files/patch-src-photos-GRaw.vala
D       files/patch-src__main.vala
D       files/patch-vapi-libraw.vapi
M       pkg-plist

Patch via HTTP: http://burggraben.net/hacks/shotwell-2nd.diff.gz

or uuencoded:

begin 644 shotwell-2nd.diff.gz
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
KS%_C'+7=/+"'88ZE.#'AVKY'*HG?3_`1[[M9L1<HM?/X?P!XNT)J;'8`````
`
end


Regards,
Christoph
Comment 3 William Grzybowski freebsd_committer freebsd_triage 2013-06-08 16:06:44 UTC
Responsible Changed
From-To: lx->wg

I'll take it.
Comment 4 William Grzybowski 2013-06-11 23:47:34 UTC
This patch doesn't build because it seems there were some updates to
the port meanwhile.

Could you please take a look? The other two ports were commited.

Thanks

--
William Grzybowski
------------------------------------------
Curitiba/PR - Brasil
Comment 5 Christoph Moench-Tegeder freebsd_committer freebsd_triage 2013-06-12 20:49:14 UTC
Hi,

Of course, here we go.
Changes from my last patch:
- more USES
- librest got committed as devel/librest instead of www/rest
- add bash to BUILD_DEPENDS

Build seems to be ok here ("works for me").

Modified/deleted files:
cmt@elch:shotwell$ svn status
M       Makefile
M       distinfo
M       files/patch-Makefile
M       files/patch-src-camera-CameraTable.vala
D       files/patch-src-photos-GRaw.vala
D       files/patch-src__Dialogs.vala
D       files/patch-src__DirectoryMonitor.vala
D       files/patch-src__EditingTools.vala
D       files/patch-src__Photo.vala
D       files/patch-src__Printing.vala
D       files/patch-src__VideoSupport.vala
D       files/patch-src__db__PhotoTable.vala
D       files/patch-src__main.vala
D       files/patch-src__sidebar__Tree.vala
D       files/patch-src__util__file.vala
D       files/patch-vapi-libraw.vapi
M       pkg-plist

Patch via HTTP: http://burggraben.net/hacks/shotwell-3rd.diff.gz

or uuencoded:

begin 644 shotwell-3rd.diff.gz
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
GQ':+P&Z'V5'3Q,1C^P&I2GH_(42\:;-B(Y"T<.=_`=<;P4ANL@``
`
end

Regards,
Christoph

-- 
Spare Space
Comment 6 dfilter service freebsd_committer freebsd_triage 2013-06-13 12:25:24 UTC
Author: wg
Date: Thu Jun 13 11:25:14 2013
New Revision: 320757
URL: http://svnweb.freebsd.org/changeset/ports/320757

Log:
  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)

Deleted:
  head/graphics/shotwell/files/patch-src-photos-GRaw.vala
  head/graphics/shotwell/files/patch-src__Dialogs.vala
  head/graphics/shotwell/files/patch-src__DirectoryMonitor.vala
  head/graphics/shotwell/files/patch-src__EditingTools.vala
  head/graphics/shotwell/files/patch-src__Photo.vala
  head/graphics/shotwell/files/patch-src__Printing.vala
  head/graphics/shotwell/files/patch-src__VideoSupport.vala
  head/graphics/shotwell/files/patch-src__db__PhotoTable.vala
  head/graphics/shotwell/files/patch-src__main.vala
  head/graphics/shotwell/files/patch-src__sidebar__Tree.vala
  head/graphics/shotwell/files/patch-src__util__file.vala
  head/graphics/shotwell/files/patch-vapi-libraw.vapi
Modified:
  head/graphics/shotwell/Makefile
  head/graphics/shotwell/distinfo
  head/graphics/shotwell/files/patch-Makefile
  head/graphics/shotwell/files/patch-src-camera-CameraTable.vala
  head/graphics/shotwell/pkg-plist

Modified: head/graphics/shotwell/Makefile
==============================================================================
--- head/graphics/shotwell/Makefile	Thu Jun 13 11:19:10 2013	(r320756)
+++ head/graphics/shotwell/Makefile	Thu Jun 13 11:25:14 2013	(r320757)
@@ -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 G
 
 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}/dev
 		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 \

Modified: head/graphics/shotwell/distinfo
==============================================================================
--- head/graphics/shotwell/distinfo	Thu Jun 13 11:19:10 2013	(r320756)
+++ head/graphics/shotwell/distinfo	Thu Jun 13 11:25:14 2013	(r320757)
@@ -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

Modified: head/graphics/shotwell/files/patch-Makefile
==============================================================================
--- head/graphics/shotwell/files/patch-Makefile	Thu Jun 13 11:19:10 2013	(r320756)
+++ head/graphics/shotwell/files/patch-Makefile	Thu Jun 13 11:25:14 2013	(r320757)
@@ -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:

Modified: head/graphics/shotwell/files/patch-src-camera-CameraTable.vala
==============================================================================
--- head/graphics/shotwell/files/patch-src-camera-CameraTable.vala	Thu Jun 13 11:19:10 2013	(r320756)
+++ head/graphics/shotwell/files/patch-src-camera-CameraTable.vala	Thu Jun 13 11:25:14 2013	(r320757)
@@ -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
      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
          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
 -            }
 -        }
 -        
-+
++		// 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
 -    
 -    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
 -                    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
 -        // 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);

Modified: head/graphics/shotwell/pkg-plist
==============================================================================
--- head/graphics/shotwell/pkg-plist	Thu Jun 13 11:19:10 2013	(r320756)
+++ head/graphics/shotwell/pkg-plist	Thu Jun 13 11:25:14 2013	(r320757)
@@ -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-externa
 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-tit
 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
 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-ext
 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-ext
 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-ext
 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-ext
 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-ext
 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.
 %%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.
 %%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.
 %%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.
 %%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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 7 William Grzybowski freebsd_committer freebsd_triage 2013-06-13 12:25:42 UTC
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!