diff options
| author | madpilot <madpilot@FreeBSD.org> | 2016-03-29 19:01:36 +0800 |
|---|---|---|
| committer | madpilot <madpilot@FreeBSD.org> | 2016-03-29 19:01:36 +0800 |
| commit | 29a83405f064ea5ad3b1086064785359c3f01e5e (patch) | |
| tree | 9b0e445646f39610c1654f78be68620d144c91e8 /deskutils | |
| parent | c48243abb720d9974e3c9c582825c3cbbb7e4ec3 (diff) | |
| download | freebsd-ports-gnome-29a83405f064ea5ad3b1086064785359c3f01e5e.tar.gz freebsd-ports-gnome-29a83405f064ea5ad3b1086064785359c3f01e5e.tar.zst freebsd-ports-gnome-29a83405f064ea5ad3b1086064785359c3f01e5e.zip | |
Update patch to match the code accepted by upstream for merging.
Diffstat (limited to 'deskutils')
| -rw-r--r-- | deskutils/calibre/Makefile | 2 | ||||
| -rw-r--r-- | deskutils/calibre/files/patch-src_calibre_devices_usbms_device.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile index a96c888d6612..d2fe90dea73b 100644 --- a/deskutils/calibre/Makefile +++ b/deskutils/calibre/Makefile @@ -3,7 +3,7 @@ PORTNAME= calibre PORTVERSION= 2.53.0 -PORTREVISION= 1 +PORTREVISION= 2 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 index ea963ad2cff7..567d1afa7b92 100644 --- a/deskutils/calibre/files/patch-src_calibre_devices_usbms_device.py +++ b/deskutils/calibre/files/patch-src_calibre_devices_usbms_device.py @@ -6,7 +6,7 @@ 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]) ++ dpaths = manager.FindDeviceStringMatch('storage.originating_device', path) + 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: |