diff options
| author | Guido Falsi <madpilot@FreeBSD.org> | 2016-03-28 20:18:50 +0000 |
|---|---|---|
| committer | Guido Falsi <madpilot@FreeBSD.org> | 2016-03-28 20:18:50 +0000 |
| commit | b6f669d6a388dc04a39632408ad939b2bb7d85a4 (patch) | |
| tree | f3fdd80b44eb5739ef57b13a0a7e58d732d89728 /deskutils | |
| parent | Remove expired ports. (diff) | |
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)
Notes
Notes:
svn path=/head/; revision=412071
Diffstat (limited to 'deskutils')
| -rw-r--r-- | deskutils/calibre/Makefile | 1 | ||||
| -rw-r--r-- | deskutils/calibre/files/patch-src_calibre_devices_usbms_device.py | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile index 7cde8b500299..a96c888d6612 100644 --- a/deskutils/calibre/Makefile +++ b/deskutils/calibre/Makefile @@ -3,6 +3,7 @@ PORTNAME= calibre PORTVERSION= 2.53.0 +PORTREVISION= 1 CATEGORIES= deskutils python MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/ diff --git a/deskutils/calibre/files/patch-src_calibre_devices_usbms_device.py b/deskutils/calibre/files/patch-src_calibre_devices_usbms_device.py new file mode 100644 index 000000000000..ea963ad2cff7 --- /dev/null +++ b/deskutils/calibre/files/patch-src_calibre_devices_usbms_device.py @@ -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: |