git: 14bfcede4d86 - main - security/nyx: fix runtime with python 3.11
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 18 Nov 2024 07:25:22 UTC
The branch main has been updated by rm:
URL: https://cgit.FreeBSD.org/ports/commit/?id=14bfcede4d86c65fe810fb644a0f1f8449fe4703
commit 14bfcede4d86c65fe810fb644a0f1f8449fe4703
Author: Ruslan Makhmatkhanov <rm@FreeBSD.org>
AuthorDate: 2024-11-18 07:22:56 +0000
Commit: Ruslan Makhmatkhanov <rm@FreeBSD.org>
CommitDate: 2024-11-18 07:22:56 +0000
security/nyx: fix runtime with python 3.11
switch to pep517 while here
taken from upstream commit:
https://github.com/torproject/nyx/commit/dcaddf2ab
PR: 281337
Reported by: mdw
Approved by: maintainer timeout
---
security/nyx/Makefile | 6 ++++--
security/nyx/files/patch-nyx_panel_____init____.py | 11 +++++++++++
security/nyx/files/patch-test_____init____.py | 11 +++++++++++
3 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/security/nyx/Makefile b/security/nyx/Makefile
index 0ca0b04f9c8b..90d73b96862d 100644
--- a/security/nyx/Makefile
+++ b/security/nyx/Makefile
@@ -1,6 +1,6 @@
PORTNAME= nyx
PORTVERSION= 2.1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security net
MASTER_SITES= PYPI
@@ -11,11 +11,13 @@ WWW= https://nyx.torproject.org/
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stem>=1.7.1:security/py-stem@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
USES= python
-USE_PYTHON= distutils autoplist noflavors
+USE_PYTHON= autoplist noflavors pep517
NO_ARCH= yes
diff --git a/security/nyx/files/patch-nyx_panel_____init____.py b/security/nyx/files/patch-nyx_panel_____init____.py
new file mode 100644
index 000000000000..9588e181f369
--- /dev/null
+++ b/security/nyx/files/patch-nyx_panel_____init____.py
@@ -0,0 +1,11 @@
+--- nyx/panel/__init__.py.orig 2024-11-18 07:13:38 UTC
++++ nyx/panel/__init__.py
+@@ -78,7 +78,7 @@ class KeyHandler(collections.namedtuple('Help', ['key'
+ is_match = self._key_func(key) if self._key_func else key.match(self.key)
+
+ if is_match:
+- if inspect.getargspec(self._action).args == ['key']:
++ if inspect.getfullargspec(self._action).args == ['key']:
+ self._action(key)
+ else:
+ self._action()
diff --git a/security/nyx/files/patch-test_____init____.py b/security/nyx/files/patch-test_____init____.py
new file mode 100644
index 000000000000..65fcb2a1da48
--- /dev/null
+++ b/security/nyx/files/patch-test_____init____.py
@@ -0,0 +1,11 @@
+--- test/__init__.py.orig 2024-11-18 07:14:15 UTC
++++ test/__init__.py
+@@ -94,7 +94,7 @@ def render(func, *args, **kwargs):
+ nyx.curses.CURSES_SCREEN.erase()
+ start_time = time.time()
+
+- func_args = inspect.getargspec(func).args
++ func_args = inspect.getfullargspec(func).args
+
+ if func_args[:1] == ['subwindow'] or func_args[:2] == ['self', 'subwindow']:
+ def _draw(subwindow):