From owner-svn-ports-head@freebsd.org Mon Mar 28 20:18:51 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C99D0AE00A0; Mon, 28 Mar 2016 20:18:51 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7DEEC1D3A; Mon, 28 Mar 2016 20:18:51 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2SKIopJ003530; Mon, 28 Mar 2016 20:18:50 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2SKIo0o003528; Mon, 28 Mar 2016 20:18:50 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201603282018.u2SKIo0o003528@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Mon, 28 Mar 2016 20:18:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412071 - in head/deskutils/calibre: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Mar 2016 20:18:51 -0000 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: