From 1ecf82450354c1fc01e91cce054ba894d6750e08 Mon Sep 17 00:00:00 2001 From: "Jason E. Hale" Date: Sun, 31 Jan 2021 22:55:36 +0000 Subject: [PATCH] graphics/rapid-photo-downloader: Update to 0.9.26 PR: 252238 Submitted by: Martin Neubauer (maintainer) --- graphics/rapid-photo-downloader/Makefile | 5 ++--- graphics/rapid-photo-downloader/distinfo | 6 +++--- .../files/patch-raphodo_storage.py | 17 +++++++++++------ 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/graphics/rapid-photo-downloader/Makefile b/graphics/rapid-photo-downloader/Makefile index 2de5772bac56..0e9ca681db49 100644 --- a/graphics/rapid-photo-downloader/Makefile +++ b/graphics/rapid-photo-downloader/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= rapid-photo-downloader -DISTVERSION= 0.9.24 -PORTREVISION= 2 +DISTVERSION= 0.9.26 CATEGORIES= graphics MASTER_SITES= https://launchpad.net/rapid/pyqt/${PORTVERSION}/+download/ @@ -35,7 +34,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}arrow>0:devel/py-arrow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR} \ exiftool:graphics/p5-Image-ExifTool -USES= desktop-file-utils gettext pyqt:5 python:3.4+ qt:5 +USES= desktop-file-utils gettext pyqt:5 python:3.6+ qt:5 USE_PYTHON= autoplist distutils noflavors USE_QT= imageformats_run USE_PYQT= core gui network sip widgets diff --git a/graphics/rapid-photo-downloader/distinfo b/graphics/rapid-photo-downloader/distinfo index bb968d5ced0d..d303b4c9698a 100644 --- a/graphics/rapid-photo-downloader/distinfo +++ b/graphics/rapid-photo-downloader/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1588794721 -SHA256 (rapid-photo-downloader-0.9.24.tar.gz) = 66b9482c9212043b519416982dacd734f8d05c285eb8d7e3ee3f0d7a29068590 -SIZE (rapid-photo-downloader-0.9.24.tar.gz) = 8150727 +TIMESTAMP = 1609176016 +SHA256 (rapid-photo-downloader-0.9.26.tar.gz) = 6dc87531581b2090e3836fb3d77f43f35e06bb5c029d1ec19f0e917fb6acff94 +SIZE (rapid-photo-downloader-0.9.26.tar.gz) = 8213203 diff --git a/graphics/rapid-photo-downloader/files/patch-raphodo_storage.py b/graphics/rapid-photo-downloader/files/patch-raphodo_storage.py index 6ad9912996fc..297a77232a70 100644 --- a/graphics/rapid-photo-downloader/files/patch-raphodo_storage.py +++ b/graphics/rapid-photo-downloader/files/patch-raphodo_storage.py @@ -1,4 +1,4 @@ ---- raphodo/storage.py.orig 2020-05-03 17:31:45 UTC +--- raphodo/storage.py.orig 2020-12-24 23:41:26 UTC +++ raphodo/storage.py @@ -69,10 +69,9 @@ import xdg import gi @@ -39,7 +39,7 @@ cmd = shlex.split('xdg-mime query default inode/directory') try: desktop_file = subprocess.check_output(cmd, universal_newlines=True) # type: str -@@ -1064,259 +1063,6 @@ class CameraHotplug(QObject): +@@ -1075,264 +1074,6 @@ class CameraHotplug(QObject): if emit_remove: logging.info("Hotplug: %s has been removed", name) self.cameraRemoved.emit() @@ -219,11 +219,16 @@ - """ - - object_path = '/org/freedesktop/UDisks2/block_devices/{}'.format( -- os.path.split(device_path)[1]) +- os.path.split(device_path)[1] +- ) - obj = self.udisks.get_object(object_path) -- icon_names = self.get_icon_names(obj) -- can_eject = self.get_can_eject(obj) -- return (icon_names, can_eject) +- if obj is None: +- icon_names = [] +- can_eject = False +- else: +- icon_names = self.get_icon_names(obj) +- can_eject = self.get_can_eject(obj) +- return icon_names, can_eject - - @pyqtSlot(str) - def unmount_volume(self, mount_point: str) -> None: