From 970a0e5394b784f3900bdb1f829443b14e0f6613 Mon Sep 17 00:00:00 2001 From: Diane Bruce Date: Sat, 2 Jan 2021 14:38:13 +0000 Subject: [PATCH] Changelog ========= v0.3.8 ------ - Allow editing of bands above 2.4GHz - Restore column layout on start - Support for Nanovna-F V2 - Fixes a crash with S21 hack Reported by: portscout --- comms/nanovna-saver/Makefile | 3 +-- comms/nanovna-saver/distinfo | 6 +++--- .../files/patch-NanoVNASaver_Hardware_Hardware.py | 10 +++++----- comms/nanovna-saver/files/patch-setup.py | 10 ++++------ 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/comms/nanovna-saver/Makefile b/comms/nanovna-saver/Makefile index 592290735c15..abb1c287e0fd 100644 --- a/comms/nanovna-saver/Makefile +++ b/comms/nanovna-saver/Makefile @@ -2,8 +2,7 @@ PORTNAME= nanovna-saver DISTVERSIONPREFIX= v -DISTVERSION= 0.3.7 -PORTREVISION= 1 +DISTVERSION= 0.3.8 CATEGORIES= comms hamradio MAINTAINER= hamradio@FreeBSD.org diff --git a/comms/nanovna-saver/distinfo b/comms/nanovna-saver/distinfo index 08190c830e43..6e9c3dc18751 100644 --- a/comms/nanovna-saver/distinfo +++ b/comms/nanovna-saver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1602611094 -SHA256 (mihtjel-nanovna-saver-v0.3.7_GH0.tar.gz) = 4b2cb4e736855452ef0fcc198f4f467ab042857b7844aac973fa99de7eb128ad -SIZE (mihtjel-nanovna-saver-v0.3.7_GH0.tar.gz) = 359208 +TIMESTAMP = 1609597287 +SHA256 (mihtjel-nanovna-saver-v0.3.8_GH0.tar.gz) = 761e5ec2d5efc6b0843038b9d241bcbdc433a76d68a5f0631be367a629e78163 +SIZE (mihtjel-nanovna-saver-v0.3.8_GH0.tar.gz) = 357896 diff --git a/comms/nanovna-saver/files/patch-NanoVNASaver_Hardware_Hardware.py b/comms/nanovna-saver/files/patch-NanoVNASaver_Hardware_Hardware.py index b2e67ff9cf1d..403e4cdc3040 100644 --- a/comms/nanovna-saver/files/patch-NanoVNASaver_Hardware_Hardware.py +++ b/comms/nanovna-saver/files/patch-NanoVNASaver_Hardware_Hardware.py @@ -1,14 +1,14 @@ ---- NanoVNASaver/Hardware/Hardware.py.orig 2020-08-13 17:01:29 UTC +--- NanoVNASaver/Hardware/Hardware.py.orig 2020-11-01 13:28:10 UTC +++ NanoVNASaver/Hardware/Hardware.py -@@ -32,6 +32,7 @@ from NanoVNASaver.Hardware.NanoVNA_H import NanoVNA_H +@@ -33,6 +33,7 @@ from NanoVNASaver.Hardware.NanoVNA_H import NanoVNA_H from NanoVNASaver.Hardware.NanoVNA_H4 import NanoVNA_H4 from NanoVNASaver.Hardware.NanoVNA_V2 import NanoVNA_V2 from NanoVNASaver.Hardware.Serial import drain_serial, Interface +from NanoVNASaver.Hardware.Sysctl import usb_vid_pid - logger = logging.getLogger(__name__) -@@ -61,8 +62,12 @@ def get_interfaces() -> List[Interface]: + logger = logging.getLogger(__name__) +@@ -63,8 +64,12 @@ def get_interfaces() -> List[Interface]: interfaces = [] # serial like usb interfaces for d in list_ports.comports(): @@ -23,7 +23,7 @@ for t in USBDEVICETYPES: if d.vid != t.vid or d.pid != t.pid: continue -@@ -72,7 +77,6 @@ def get_interfaces() -> List[Interface]: +@@ -74,7 +79,6 @@ def get_interfaces() -> List[Interface]: iface.port = d.device interfaces.append(iface) return interfaces diff --git a/comms/nanovna-saver/files/patch-setup.py b/comms/nanovna-saver/files/patch-setup.py index 0396193802d8..760681de939c 100644 --- a/comms/nanovna-saver/files/patch-setup.py +++ b/comms/nanovna-saver/files/patch-setup.py @@ -1,16 +1,14 @@ ---- setup.py.orig 2020-08-13 17:01:29 UTC +--- setup.py.orig 2021-01-02 14:25:03 UTC +++ setup.py -@@ -37,12 +37,5 @@ setup( - 'console_scripts': [ +@@ -38,11 +38,4 @@ setup( 'NanoVNASaver = NanoVNASaver.__main__:main' ], -- }, + }, - install_requires=[ - 'pyserial', - 'PyQt5', - 'numpy', -- 'scipy<1.5', +- 'scipy', - 'cython', - ], -+ } )