svn commit: r474703 - in head/graphics/shotwell: . files
Christoph Moench-Tegeder
cmt at FreeBSD.org
Sun Jul 15 16:57:56 UTC 2018
Author: cmt
Date: Sun Jul 15 16:57:54 2018
New Revision: 474703
URL: https://svnweb.freebsd.org/changeset/ports/474703
Log:
graphics/shotwell: update to 0.28.4
https://mail.gnome.org/archives/shotwell-list/2018-July/msg00010.html
https://download.gnome.org/sources/shotwell/0.28/shotwell-0.28.4.changes
While here and adapting patches, makepatchify them.
Added:
head/graphics/shotwell/files/patch-src_camera_CameraTable.vala (contents, props changed)
Deleted:
head/graphics/shotwell/files/patch-src-camera-CameraTable.vala
Modified:
head/graphics/shotwell/Makefile
head/graphics/shotwell/distinfo
head/graphics/shotwell/files/patch-configure.ac
Modified: head/graphics/shotwell/Makefile
==============================================================================
--- head/graphics/shotwell/Makefile Sun Jul 15 16:45:41 2018 (r474702)
+++ head/graphics/shotwell/Makefile Sun Jul 15 16:57:54 2018 (r474703)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= shotwell
-PORTVERSION= 0.28.3
+PORTVERSION= 0.28.4
CATEGORIES= graphics gnome
MASTER_SITES= GNOME/sources/shotwell/${PORTVERSION:R}
Modified: head/graphics/shotwell/distinfo
==============================================================================
--- head/graphics/shotwell/distinfo Sun Jul 15 16:45:41 2018 (r474702)
+++ head/graphics/shotwell/distinfo Sun Jul 15 16:57:54 2018 (r474703)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525791684
-SHA256 (shotwell-0.28.3.tar.xz) = d08603f3736f9791c1d7fcfe586ffaaf07b05e18cff370c94c07d8f23e06d403
-SIZE (shotwell-0.28.3.tar.xz) = 5531900
+TIMESTAMP = 1531658607
+SHA256 (shotwell-0.28.4.tar.xz) = a976f5ab972e8448a1509fa0dc132e4b40d94d3d7c8c33dc0cc1e25fa7b0670e
+SIZE (shotwell-0.28.4.tar.xz) = 5529712
Modified: head/graphics/shotwell/files/patch-configure.ac
==============================================================================
--- head/graphics/shotwell/files/patch-configure.ac Sun Jul 15 16:45:41 2018 (r474702)
+++ head/graphics/shotwell/files/patch-configure.ac Sun Jul 15 16:57:54 2018 (r474703)
@@ -1,4 +1,4 @@
---- configure.ac.orig 2018-03-17 13:41:22 UTC
+--- configure.ac.orig 2018-07-15 15:12:12 UTC
+++ configure.ac
@@ -114,7 +114,6 @@ PKG_CHECK_MODULES(SHOTWELL, [
gstreamer-plugins-base-1.0 >= 1.0.0
Added: head/graphics/shotwell/files/patch-src_camera_CameraTable.vala
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/shotwell/files/patch-src_camera_CameraTable.vala Sun Jul 15 16:57:54 2018 (r474703)
@@ -0,0 +1,83 @@
+--- src/camera/CameraTable.vala.orig 2018-07-15 15:10:47 UTC
++++ 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;
+@@ -43,7 +42,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);
+@@ -118,23 +116,7 @@ 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(VolumeIdentifier.UUID) == uuid) {
+- return volume.get_name();
+- }
+- }
+- return null;
+- }
+-
+- private string? get_icon_for_uuid(string uuid) {
+- foreach (Volume volume in volume_monitor.get_volumes()) {
+- if (volume.get_identifier(VolumeIdentifier.UUID) == uuid) {
+- return volume.get_icon().to_string();
+- }
+- }
+- 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)
+@@ -221,23 +203,7 @@ public class CameraTable {
+ }
+
+ // 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");
+- }
+- }
+-
++ // in absence of udev, we fall back to the GPhoto name
+ if (port.has_prefix("disk:")) {
+ try {
+ var mount = File.new_for_path (port.substring(5)).find_enclosing_mount();
+@@ -287,13 +253,7 @@ 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);
+- }
++ // on_udev_event() removed - we do not have udev
+
+ public void on_volume_changed(Volume volume) {
+ camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true);
More information about the svn-ports-head
mailing list