svn commit: r412071 - in head/deskutils/calibre: . files
Guido Falsi
madpilot at FreeBSD.org
Mon Mar 28 20:18:51 UTC 2016
Author: madpilot
Date: Mon Mar 28 20:18:50 2016
New Revision: 412071
URL: https://svnweb.freebsd.org/changeset/ports/412071
Log:
Patch calibre to correctly extract device info from the hal through
dbus.
This allows it to correctly mount readers on FreeBSD.
Reported by: avg@ (via email)
Added:
head/deskutils/calibre/files/patch-src_calibre_devices_usbms_device.py (contents, props changed)
Modified:
head/deskutils/calibre/Makefile
Modified: head/deskutils/calibre/Makefile
==============================================================================
--- head/deskutils/calibre/Makefile Mon Mar 28 19:33:12 2016 (r412070)
+++ head/deskutils/calibre/Makefile Mon Mar 28 20:18:50 2016 (r412071)
@@ -3,6 +3,7 @@
PORTNAME= calibre
PORTVERSION= 2.53.0
+PORTREVISION= 1
CATEGORIES= deskutils python
MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/
Added: head/deskutils/calibre/files/patch-src_calibre_devices_usbms_device.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/deskutils/calibre/files/patch-src_calibre_devices_usbms_device.py Mon Mar 28 20:18:50 2016 (r412071)
@@ -0,0 +1,12 @@
+--- src/calibre/devices/usbms/device.py.orig 2016-03-11 03:07:28 UTC
++++ src/calibre/devices/usbms/device.py
+@@ -699,7 +699,8 @@ class Device(DeviceConfig, DevicePlugin)
+ d.manufacturer == objif.GetProperty('usb.vendor') and \
+ d.product == objif.GetProperty('usb.product') and \
+ d.serial == objif.GetProperty('usb.serial'):
+- dpaths = manager.FindDeviceStringMatch('storage.originating_device', path)
++ midpath = manager.FindDeviceStringMatch('info.parent', path)
++ dpaths = manager.FindDeviceStringMatch('storage.originating_device', midpath[0])
+ for dpath in dpaths:
+ # devif = dbus.Interface(bus.get_object('org.freedesktop.Hal', dpath), 'org.freedesktop.Hal.Device')
+ try:
More information about the svn-ports-all
mailing list