mirror of
https://git.freebsd.org/ports.git
synced 2026-06-02 11:08:52 +00:00
graphics/rapid-photo-downloader: fix Python version specifier in setup.py
fixes build with newer setuptools PR: 294378 Approved by: maintainer timeout With hat: python
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
PORTNAME= rapid-photo-downloader
|
||||
DISTVERSION= 0.9.26
|
||||
PORTREVISION= 14
|
||||
PORTREVISION= 15
|
||||
CATEGORIES= graphics
|
||||
MASTER_SITES= https://launchpad.net/rapid/pyqt/${PORTVERSION}/+download/
|
||||
|
||||
|
||||
@@ -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 raphodo.storage import (
|
||||
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:
|
||||
|
||||
@@ -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/
|
||||
|
||||
@@ -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"',
|
||||
@@ -8,3 +8,12 @@
|
||||
'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']
|
||||
|
||||
Reference in New Issue
Block a user