<pre style='margin:0'>
ra1nb0w (ra1nb0w) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a6eefb4ff5d1f8431f6cf9c5d1e298ab28b8efaf">https://github.com/macports/macports-ports/commit/a6eefb4ff5d1f8431f6cf9c5d1e298ab28b8efaf</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new a6eefb4ff5d NanoVNA-QT: fix qt include
</span>a6eefb4ff5d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a6eefb4ff5d1f8431f6cf9c5d1e298ab28b8efaf
</span>Author: Davide Gerhard <ra1nb0w@macports.org>
AuthorDate: Tue Sep 28 12:38:01 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> NanoVNA-QT: fix qt include
</span>---
science/NanoVNA-QT/Portfile | 9 +++++++--
science/NanoVNA-QT/files/calibration.c.patch | 18 ++++++++++++++++++
science/NanoVNA-QT/files/polarview.c.patch | 21 +++++++++++++++++++++
science/NanoVNA-QT/files/xavna.c.patch | 28 ++++++++++++++++++++++++++++
4 files changed, 74 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/NanoVNA-QT/Portfile b/science/NanoVNA-QT/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f7ed306a004..7f978a58a05 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/NanoVNA-QT/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/NanoVNA-QT/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@ github.setup nanovna NanoVNA-QT 20200507
</span> checksums rmd160 e21f916570b5faad23a14601655ef09af7f72175 \
sha256 e9eac940d24a3be337de8ccb7506c2aee1f154cd1cd85a5912578a07629bdc7e \
size 876497
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
compiler.c_standard 2011
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +25,10 @@ subport libxavna {
</span> description C and C++ library for accessing the NanoVNA V2 hardware
long_description ${description}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ calibration.c.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xavna.c.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # remove -fno-delete-null-pointer-checks
# because it doesn't exist on macOS < 10.10
if { ${os.major} <= 13 } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +53,8 @@ if {${subport} eq ${name}} {
</span>
# build the project with one call
patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- nanovna.pro.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nanovna.pro.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ polarview.c.patch
</span>
qt5.depends_component \
qtcharts \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/NanoVNA-QT/files/calibration.c.patch b/science/NanoVNA-QT/files/calibration.c.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4abbf2c645d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/NanoVNA-QT/files/calibration.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 5b6a03df6fec2dc8f608ac5c372bf4b0f24bcbde Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Matthew Kendall <mdkendall@users.noreply.github.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 22 Jul 2020 11:57:57 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Add missing define.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libxavna/calibration.C | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libxavna/calibration.C b/libxavna/calibration.C
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3f65b20..9f35c0f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libxavna/calibration.C
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libxavna/calibration.C
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _USE_MATH_DEFINES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "include/calibration.H"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "include/workarounds.H"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iostream>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/NanoVNA-QT/files/polarview.c.patch b/science/NanoVNA-QT/files/polarview.c.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4847ce158c2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/NanoVNA-QT/files/polarview.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From bca4d39e4b6c71bd9d4b8b9b308ad6ab343c3ef8 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Matthew Kendall <mdkendall@users.noreply.github.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 22 Jul 2020 12:05:21 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Add missing include.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vna_qt/polarview.C | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/vna_qt/polarview.C b/vna_qt/polarview.C
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8bde6e3..5800463 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vna_qt/polarview.C
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vna_qt/polarview.C
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,6 +3,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cmath>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QPaintEvent>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QPainter>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QPainterPath>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PolarView::PolarView(QWidget *parent) : QWidget(parent)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/NanoVNA-QT/files/xavna.c.patch b/science/NanoVNA-QT/files/xavna.c.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9800a9ae3bc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/NanoVNA-QT/files/xavna.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a6fa1a30b72d0edee0b858af5329e96c0fac98a4 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: nanovna <54525305+nanovna@users.noreply.github.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 25 Jul 2020 14:10:32 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] =?UTF-8?q?=E3=83=95=E3=82=A7=E3=83=BC=E3=82=BA=E6=AD=A3?=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ =?UTF-8?q?=E8=A6=8F=E5=8C=96=E3=81=AE=E3=83=90=E3=82=B0=E3=82=92=E4=BF=AE?=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ =?UTF-8?q?=E6=AD=A3?=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libxavna/xavna.C | 3 ++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libxavna/xavna.C b/libxavna/xavna.C
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a14dfd6..01d6e10 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libxavna/xavna.C
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xlibxavna/xavna.C
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -146,7 +146,8 @@ static tuple<complex5,int> readValue3(int ttyFD, int cnt) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static tuple<array<complex<double>,4>,int> readValue4(int ttyFD, int cnt) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ array<complex<double>, 4> result = {0.,0.,0.,0.};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tuple<array<int64_t,8>,int> tmp = readValue2(ttyFD, cnt);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // normalizePhase must be false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tuple<array<int64_t,8>,int> tmp = readValue2(ttyFD, cnt, false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ array<int64_t,8> vals = get<0>(tmp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result[0] = processValue(vals[0], vals[1]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result[1] = processValue(vals[2], vals[3]);
</span></pre><pre style='margin:0'>
</pre>