diff --git a/net-p2p/deluge-cli/Makefile b/net-p2p/deluge-cli/Makefile index 173bbc310188..841069334df5 100644 --- a/net-p2p/deluge-cli/Makefile +++ b/net-p2p/deluge-cli/Makefile @@ -1,63 +1,63 @@ PORTNAME= deluge DISTVERSION= 2.0.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-p2p python MASTER_SITES= CHEESESHOP PKGNAMESUFFIX= -cli MAINTAINER= rm@FreeBSD.org COMMENT= CLI part of bittorrent client using Python and libtorrent-rasterbar LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= intltool-merge:textproc/intltool \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel \ ${PYTHON_PKGNAMEPREFIX}slimit>0:www/py-slimit RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>=0.18:devel/py-xdg@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar>=0:net-p2p/py-libtorrent-rasterbar@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>=0.8:security/py-openssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}chardet>=1.0.1:textproc/py-chardet@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mako>=0.2.5:textproc/py-mako@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} \ ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}rencode>0:converters/py-rencode@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}distro>0:sysutils/py-distro@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setproctitle>0:devel/py-setproctitle@${PY_FLAVOR} USES= cpe gettext python:3.5+ USE_PYTHON= autoplist distutils CPE_VENDOR= deluge-torrent NO_ARCH= yes USE_RC_SUBR= deluged deluge_web SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} OPTIONS_DEFINE= DOCS PORTDOCS= CHANGELOG.md README.md post-patch: @${REINPLACE_CMD} -e "/'new_release_check':/s|True,|False,|g ; \ /'geoip_db_location':/s|/usr/share/GeoIP/GeoIP.dat|${LOCALBASE}/share/GeoIP/GeoIP.dat|g" \ ${WRKSRC}/deluge/core/preferencesmanager.py @${REINPLACE_CMD} -e "/'check_new_releases':/s|True,|False,|g ; \ /'show_new_releases':/s|True,|False,|g" \ ${WRKSRC}/deluge/ui/gtk3/gtkui.py post-install: # install man pages .for man in deluge.1 deluge-console.1 deluge-gtk.1 deluge-web.1 deluged.1 ${INSTALL_MAN} ${WRKSRC}/docs/man/${man} ${STAGEDIR}${MANPREFIX}/man/man1/ .endfor post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include diff --git a/net-p2p/deluge-cli/files/patch-deluge_log.py b/net-p2p/deluge-cli/files/patch-deluge_log.py new file mode 100644 index 000000000000..c908439441da --- /dev/null +++ b/net-p2p/deluge-cli/files/patch-deluge_log.py @@ -0,0 +1,29 @@ +From 351664ec071daa04161577c6a1c949ed0f2c3206 Mon Sep 17 00:00:00 2001 +From: minus +Date: Sun, 17 Nov 2019 09:36:23 +0100 +Subject: [Logging] Fix Python 3.8 compatibility + +Deluge's logger class extends Python's `logging.Logger`. Since Python +3.8, it takes an additional argument `stacklevel`. +The implementation in Deluge does not support that. Work around the +problem by ignoring additional arguments. +--- + deluge/log.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/deluge/log.py b/deluge/log.py +index 75e8308..0f9877f 100644 +--- deluge/log.py ++++ deluge/log.py +@@ -86,7 +86,7 @@ class Logging(LoggingLoggerClass): + def exception(self, msg, *args, **kwargs): + yield LoggingLoggerClass.exception(self, msg, *args, **kwargs) + +- def findCaller(self, stack_info=False): # NOQA: N802 ++ def findCaller(self, *args, **kwargs): # NOQA: N802 + f = logging.currentframe().f_back + rv = '(unknown file)', 0, '(unknown function)' + while hasattr(f, 'f_code'): +-- +cgit v1.1 +