Index: Makefile =================================================================== --- Makefile (revision 559510) +++ Makefile (working copy) @@ -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 @@ ${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.5+ qt:5 USE_PYTHON= autoplist distutils noflavors USE_QT= imageformats_run USE_PYQT= core gui network sip widgets Index: distinfo =================================================================== --- distinfo (revision 559510) +++ distinfo (working copy) @@ -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 Index: files/patch-raphodo_rapid.py =================================================================== --- files/patch-raphodo_rapid.py (revision 559510) +++ files/patch-raphodo_rapid.py (working copy) @@ -1,6 +1,6 @@ ---- raphodo/rapid.py.orig 2020-05-03 17:31:45 UTC +--- raphodo/rapid.py.orig 2020-12-24 23:41:26 UTC +++ raphodo/rapid.py -@@ -97,7 +97,7 @@ from PyQt5.QtNetwork import QLocalSocket, QLocalServer +@@ -101,7 +101,7 @@ from PyQt5.QtNetwork import QLocalSocket, QLocalServer import sip from raphodo.storage import ( @@ -9,7 +9,7 @@ has_one_or_more_folders, mountPaths, get_desktop_environment, get_desktop, gvfs_controls_mounts, get_default_file_manager, validate_download_folder, validate_source_folder, get_fdo_cache_thumb_base_directory, WatchDownloadDirs, get_media_dir, -@@ -945,18 +945,6 @@ class RapidWindow(QMainWindow): +@@ -949,18 +949,6 @@ class RapidWindow(QMainWindow): logging.debug("Starting camera hotplug monitor...") QTimer.singleShot(0, self.cameraHotplugThread.start) @@ -28,7 +28,7 @@ if self.gvfsControlsMounts: # Gio.VolumeMonitor must be in the main thread, according to # Gnome documentation -@@ -4748,8 +4736,6 @@ Do you want to proceed with the download? +@@ -4752,8 +4740,6 @@ Do you want to proceed with the download? self.sendTerminateToThread(self.backup_controller) if not self.gvfsControlsMounts: Index: files/patch-raphodo_storage.py =================================================================== --- files/patch-raphodo_storage.py (revision 559510) +++ files/patch-raphodo_storage.py (working copy) @@ -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: Index: files/patch-raphodo_utilities.py =================================================================== --- files/patch-raphodo_utilities.py (revision 559510) +++ files/patch-raphodo_utilities.py (working copy) @@ -1,6 +1,6 @@ ---- raphodo/utilities.py.orig 2020-05-03 17:31:45 UTC +--- raphodo/utilities.py.orig 2020-12-24 23:41:26 UTC +++ raphodo/utilities.py -@@ -83,10 +83,11 @@ if arrow_version >= parse_version('0.14.3') and arrow_ +@@ -84,10 +84,11 @@ if arrow_version >= parse_version('0.14.3') and arrow_ # Linux specific code to ensure child processes exit when parent dies # See http://stackoverflow.com/questions/19447603/ # how-to-kill-a-python-child-process-created-with-subprocess-check-output-when-t/ Index: files/patch-setup.py =================================================================== --- files/patch-setup.py (revision 559510) +++ files/patch-setup.py (working copy) @@ -1,4 +1,4 @@ ---- setup.py.orig 2020-05-03 17:31:45 UTC +--- setup.py.orig 2020-12-24 23:41:26 UTC +++ setup.py @@ -271,7 +271,6 @@ setup( 'scandir;python_version<"3.5"',