diff --git a/graphics/rapid-photo-downloader/Makefile b/graphics/rapid-photo-downloader/Makefile index 8228ffa13f7b..4f9a63a39eb6 100644 --- a/graphics/rapid-photo-downloader/Makefile +++ b/graphics/rapid-photo-downloader/Makefile @@ -1,54 +1,54 @@ PORTNAME= rapid-photo-downloader DISTVERSION= 0.9.26 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= graphics MASTER_SITES= https://launchpad.net/rapid/pyqt/${PORTVERSION}/+download/ MAINTAINER= m.ne@gmx.net COMMENT= Import photos and videos efficiently and reliably WWW= https://www.damonlynch.net/rapid/ LICENSE= GPLv3 BUILD_DEPENDS= intltool-update:textproc/intltool LIB_DEPENDS= libgexiv2.so:graphics/gexiv2 \ libgudev-1.0.so:devel/libgudev RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}arrow>0:devel/py-arrow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}colour>0:graphics/py-colour@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-dateutil>2.2:devel/py-python-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}easygui>=0:x11-toolkits/py-easygui@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gphoto2>=1.4.0:graphics/py-gphoto2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gstreamer1>=1.0:multimedia/py-gstreamer1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}notify2>0:devel/py-notify2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=3.4.2:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pymediainfo>=1.0:multimedia/py-pymediainfo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyzmq>0:net/py-pyzmq@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rawkit>0:graphics/py-rawkit@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sortedcontainers>0:devel/py-sortedcontainers@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tenacity>0:devel/py-tenacity@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tornado>=4.1:www/py-tornado@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyxdg>0:devel/py-pyxdg@${PY_FLAVOR} \ exiftool:graphics/p5-Image-ExifTool USES= desktop-file-utils gettext gnome pyqt:5 python qt:5 USE_GNOME= pygobject3:run USE_PYTHON= autoplist distutils noflavors USE_QT= imageformats:run USE_PYQT= pyqt5 BINARY_ALIAS= python3=${PYTHON_VERSION} NO_ARCH= yes OPTIONS_DEFINE= COLOUR PROGRESS OPTIONS_DEFAULT= COLOUR PROGRESS COLOUR_DESC= generates coloured program output PROGRESS_DESC= shows a progress bar on the command line COLOUR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorlog>0:devel/py-colorlog@${PY_FLAVOR} PROGRESS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyprind>=1.4.0:misc/py-pyprind@${PY_FLAVOR} .include diff --git a/graphics/rapid-photo-downloader/files/patch-raphodo_rapid.py b/graphics/rapid-photo-downloader/files/patch-raphodo_rapid.py index 86b085ca3387..9890b6b3254d 100644 --- a/graphics/rapid-photo-downloader/files/patch-raphodo_rapid.py +++ b/graphics/rapid-photo-downloader/files/patch-raphodo_rapid.py @@ -1,39 +1,39 @@ ---- 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 raphodo.storage import ( import sip from raphodo.storage import ( - ValidMounts, CameraHotplug, UDisks2Monitor, GVolumeMonitor, have_gio, + ValidMounts, CameraHotplug, GVolumeMonitor, have_gio, 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) - # Monitor when the user adds or removes a partition - self.udisks2Monitor = UDisks2Monitor(self.validMounts) - self.udisks2MonitorThread = QThread() - self.udisks2MonitorThread.started.connect(self.udisks2Monitor.startMonitor) - self.udisks2Unmount.connect(self.udisks2Monitor.unmount_volume) - self.udisks2Monitor.moveToThread(self.udisks2MonitorThread) - self.udisks2Monitor.partitionMounted.connect(self.partitionMounted) - self.udisks2Monitor.partitionUnmounted.connect(self.partitionUmounted) - # Start the monitor only on the thread it will be running on - logging.debug("Starting UDisks2 monitor...") - QTimer.singleShot(0, self.udisks2MonitorThread.start) - 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: - self.udisks2MonitorThread.quit() - self.udisks2MonitorThread.wait() self.cameraHotplugThread.quit() self.cameraHotplugThread.wait() else: diff --git a/graphics/rapid-photo-downloader/files/patch-raphodo_utilities.py b/graphics/rapid-photo-downloader/files/patch-raphodo_utilities.py index dbc96fdd6b45..2fbab62d82f7 100644 --- a/graphics/rapid-photo-downloader/files/patch-raphodo_utilities.py +++ b/graphics/rapid-photo-downloader/files/patch-raphodo_utilities.py @@ -1,16 +1,16 @@ ---- 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/ -libc = ctypes.CDLL("libc.so.6") +libc = ctypes.CDLL("libc.so.7") def set_pdeathsig(sig = signal.SIGTERM): def callable(): - return libc.prctl(1, sig) + return 0 + #return libc.procctl(0, 0, 11, sig) return callable diff --git a/graphics/rapid-photo-downloader/files/patch-setup.py b/graphics/rapid-photo-downloader/files/patch-setup.py index 3e788e0dadc0..3eb819766d15 100644 --- a/graphics/rapid-photo-downloader/files/patch-setup.py +++ b/graphics/rapid-photo-downloader/files/patch-setup.py @@ -1,10 +1,19 @@ ---- 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"', 'typing;python_version<"3.5"', 'PyGObject', - 'PyQt5', 'babel', ], extras_require={ +@@ -302,7 +301,7 @@ setup( + ) + ], + packages=['raphodo'], +- python_requires='>=3.4.*, <4', ++ python_requires='>=3.4, <4', + entry_points={ + 'gui_scripts': ['rapid-photo-downloader=raphodo.rapid:main'], + 'console_scripts': ['analyze-pv-structure=raphodo.analyzephotos:main']