Attachment #221058 for bug #252238

View | Details | Raw Unified | Return to bug 252238
Collapse All | Expand All

Lines 1-8 Link Here

(-)Makefile (-3 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= rapid-photo-downloader	3	PORTNAME= rapid-photo-downloader
4	DISTVERSION= 0.9.24	4	DISTVERSION= 0.9.26
5	PORTREVISION= 2
6	CATEGORIES= graphics	5	CATEGORIES= graphics
7	MASTER_SITES= https://launchpad.net/rapid/pyqt/${PORTVERSION}/+download/	6	MASTER_SITES= https://launchpad.net/rapid/pyqt/${PORTVERSION}/+download/
8		7
Lines 35-41 Link Here
35	${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR} \	34	${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR} \
36	exiftool:graphics/p5-Image-ExifTool	35	exiftool:graphics/p5-Image-ExifTool
37		36
38	USES= desktop-file-utils gettext pyqt:5 python:3.4+ qt:5	37	USES= desktop-file-utils gettext pyqt:5 python:3.5+ qt:5
39	USE_PYTHON= autoplist distutils noflavors	38	USE_PYTHON= autoplist distutils noflavors
40	USE_QT= imageformats_run	39	USE_QT= imageformats_run
41	USE_PYQT= core gui network sip widgets	40	USE_PYQT= core gui network sip widgets

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1588794721	1	TIMESTAMP = 1609176016
2	SHA256 (rapid-photo-downloader-0.9.24.tar.gz) = 66b9482c9212043b519416982dacd734f8d05c285eb8d7e3ee3f0d7a29068590	2	SHA256 (rapid-photo-downloader-0.9.26.tar.gz) = 6dc87531581b2090e3836fb3d77f43f35e06bb5c029d1ec19f0e917fb6acff94
3	SIZE (rapid-photo-downloader-0.9.24.tar.gz) = 8150727	3	SIZE (rapid-photo-downloader-0.9.26.tar.gz) = 8213203




--- raphodo/rapid.py.orig	2020-12-24 23:41:26 UTC
+++ raphodo/rapid.py
@@ -101,7 +101,7 @@ from PyQt5.QtNetwork import QLocalSocket, QLocalServer
 import sip
 
 from raphodo.storage import (

     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,
@@ -949,18 +949,6 @@ class RapidWindow(QMainWindow):
             logging.debug("Starting camera hotplug monitor...")
             QTimer.singleShot(0, self.cameraHotplugThread.start)
 

         if self.gvfsControlsMounts:
             # Gio.VolumeMonitor must be in the main thread, according to
             # Gnome documentation
@@ -4752,8 +4740,6 @@ Do you want to proceed with the download?
             self.sendTerminateToThread(self.backup_controller)
 
         if not self.gvfsControlsMounts:

Lines 1-4 Link Here

(-)files/patch-raphodo_storage.py (-6 / +11 lines)
1	--- raphodo/storage.py.orig 2020-05-03 17:31:45 UTC	1	--- raphodo/storage.py.orig 2020-12-24 23:41:26 UTC
2	+++ raphodo/storage.py	2	+++ raphodo/storage.py
3	@@ -69,10 +69,9 @@ import xdg	3	@@ -69,10 +69,9 @@ import xdg
4	import gi	4	import gi
Lines 39-45 Link Here
39	cmd = shlex.split('xdg-mime query default inode/directory')	39	cmd = shlex.split('xdg-mime query default inode/directory')
40	try:	40	try:
41	desktop_file = subprocess.check_output(cmd, universal_newlines=True) # type: str	41	desktop_file = subprocess.check_output(cmd, universal_newlines=True) # type: str
42	@@ -1064,259 +1063,6 @@ class CameraHotplug(QObject):	42	@@ -1075,264 +1074,6 @@ class CameraHotplug(QObject):
43	if emit_remove:	43	if emit_remove:
44	logging.info("Hotplug: %s has been removed", name)	44	logging.info("Hotplug: %s has been removed", name)
45	self.cameraRemoved.emit()	45	self.cameraRemoved.emit()
Lines 219-229 Link Here
219	- """	219	- """
220	-	220	-
221	- object_path = '/org/freedesktop/UDisks2/block_devices/{}'.format(	221	- object_path = '/org/freedesktop/UDisks2/block_devices/{}'.format(
222	- os.path.split(device_path)[1])	222	- os.path.split(device_path)[1]
		223	- )
223	- obj = self.udisks.get_object(object_path)	224	- obj = self.udisks.get_object(object_path)
224	- icon_names = self.get_icon_names(obj)	225	- if obj is None:
225	- can_eject = self.get_can_eject(obj)	226	- icon_names = []
226	- return (icon_names, can_eject)	227	- can_eject = False
		228	- else:
		229	- icon_names = self.get_icon_names(obj)
		230	- can_eject = self.get_can_eject(obj)
		231	- return icon_names, can_eject
227	-	232	-
228	- @pyqtSlot(str)	233	- @pyqtSlot(str)
229	- def unmount_volume(self, mount_point: str) -> None:	234	- def unmount_volume(self, mount_point: str) -> None:

Lines 1-6 Link Here

(-)files/patch-raphodo_utilities.py (-2 / +2 lines)
1	--- raphodo/utilities.py.orig 2020-05-03 17:31:45 UTC	1	--- raphodo/utilities.py.orig 2020-12-24 23:41:26 UTC
2	+++ raphodo/utilities.py	2	+++ raphodo/utilities.py
3	@@ -83,10 +83,11 @@ if arrow_version >= parse_version('0.14.3') and arrow_	3	@@ -84,10 +84,11 @@ if arrow_version >= parse_version('0.14.3') and arrow_
4	# Linux specific code to ensure child processes exit when parent dies	4	# Linux specific code to ensure child processes exit when parent dies
5	# See http://stackoverflow.com/questions/19447603/	5	# See http://stackoverflow.com/questions/19447603/
6	# how-to-kill-a-python-child-process-created-with-subprocess-check-output-when-t/	6	# how-to-kill-a-python-child-process-created-with-subprocess-check-output-when-t/

Lines 1-4 Link Here

(-)files/patch-setup.py (-1 / +1 lines)
1	--- setup.py.orig 2020-05-03 17:31:45 UTC	1	--- setup.py.orig 2020-12-24 23:41:26 UTC
2	+++ setup.py	2	+++ setup.py
3	@@ -271,7 +271,6 @@ setup(	3	@@ -271,7 +271,6 @@ setup(
4	'scandir;python_version<"3.5"',	4	'scandir;python_version<"3.5"',

Return to bug 252238

Lines 1-6 Link Here

(-)files/patch-raphodo_rapid.py (-4 / +4 lines)
1	--- raphodo/rapid.py.orig 2020-05-03 17:31:45 UTC	1	--- raphodo/rapid.py.orig 2020-12-24 23:41:26 UTC
2	+++ raphodo/rapid.py	2	+++ raphodo/rapid.py
3	@@ -97,7 +97,7 @@ from PyQt5.QtNetwork import QLocalSocket, QLocalServer	3	@@ -101,7 +101,7 @@ from PyQt5.QtNetwork import QLocalSocket, QLocalServer
4	import sip	4	import sip
5		5
6	from raphodo.storage import (	6	from raphodo.storage import (
Lines 9-15 Link Here
9	has_one_or_more_folders, mountPaths, get_desktop_environment, get_desktop,	9	has_one_or_more_folders, mountPaths, get_desktop_environment, get_desktop,
10	gvfs_controls_mounts, get_default_file_manager, validate_download_folder,	10	gvfs_controls_mounts, get_default_file_manager, validate_download_folder,
11	validate_source_folder, get_fdo_cache_thumb_base_directory, WatchDownloadDirs, get_media_dir,	11	validate_source_folder, get_fdo_cache_thumb_base_directory, WatchDownloadDirs, get_media_dir,
12	@@ -945,18 +945,6 @@ class RapidWindow(QMainWindow):	12	@@ -949,18 +949,6 @@ class RapidWindow(QMainWindow):
13	logging.debug("Starting camera hotplug monitor...")	13	logging.debug("Starting camera hotplug monitor...")
14	QTimer.singleShot(0, self.cameraHotplugThread.start)	14	QTimer.singleShot(0, self.cameraHotplugThread.start)
15		15
Lines 28-34 Link Here
28	if self.gvfsControlsMounts:	28	if self.gvfsControlsMounts:
29	# Gio.VolumeMonitor must be in the main thread, according to	29	# Gio.VolumeMonitor must be in the main thread, according to
30	# Gnome documentation	30	# Gnome documentation
31	@@ -4748,8 +4736,6 @@ Do you want to proceed with the download?	31	@@ -4752,8 +4740,6 @@ Do you want to proceed with the download?
32	self.sendTerminateToThread(self.backup_controller)	32	self.sendTerminateToThread(self.backup_controller)
33		33
34	if not self.gvfsControlsMounts:	34	if not self.gvfsControlsMounts: