<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f15ae91cfadb0504acd9f95dd708b9817786fa70">https://github.com/macports/macports-ports/commit/f15ae91cfadb0504acd9f95dd708b9817786fa70</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f15ae91cfadb0504acd9f95dd708b9817786fa70
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Sun Feb 25 13:56:14 2024 +0700

<span style='display:block; white-space:pre;color:#404040;'>    Vidalia: add support for aarch64 via Qt5-based version
</span>---
 security/Vidalia/Portfile                          | 54 ++++++++++++++++------
 .../files/0001-Vidalia.cpp-fix-linking.patch       | 26 +++++++++++
 .../files/0002-LogFilter.cpp-fix-includes.patch    | 23 +++++++++
 3 files changed, 89 insertions(+), 14 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/Vidalia/Portfile b/security/Vidalia/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index adbc316c4d0..949a793bd74 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/Vidalia/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/Vidalia/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,11 +2,8 @@
</span> 
 PortSystem          1.0
 PortGroup           cmake 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup           qt4 1.0
</span> 
 name                Vidalia
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             0.2.21
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            1
</span> categories          security net aqua
 maintainers         nomaintainer
 description         Vidalia is a controller GUI for the Tor software
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,20 +13,53 @@ long_description    Vidalia is a cross-platform controller GUI for the Tor softw
</span> 
 license             {GPL-2+ OpenSSLException}
 homepage            https://www.torproject.org/projects/vidalia.html.en
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites        https://www.torproject.org/dist/vidalia/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    https://archive.torproject.org/tor-package-archive/vidalia/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname            vidalia-${version}
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  a1086c98216fed09472d494c95033097ec57b43c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.arch} eq "arm"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    PortGroup       github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    PortGroup       qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    qt5.depends_component   qtscript qttools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # No support for Qt5 in releases. Qt4 is broken on aarch64.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    github.setup    a-ilin vidalia 8240540188062a168a66b25ca61b852cc89140ad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    version         0.3.3-alpha
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision        0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums       rmd160  2107d50a7d72fd93ed75e613515ed33af4e191ca \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  e4c2138b43d32d9cd23282378074f94bc38065e2dc79da05a3f7fbfb61ecb2a0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    6116757
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # https://github.com/a-ilin/vidalia/pull/3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    0001-Vidalia.cpp-fix-linking.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    0002-LogFilter.cpp-fix-includes.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DUSE_QT5=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    PortGroup       qt4 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    version         0.2.21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision        1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    master_sites    https://www.torproject.org/dist/vidalia/ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    https://archive.torproject.org/tor-package-archive/vidalia/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    distname        vidalia-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums       rmd160  a1086c98216fed09472d494c95033097ec57b43c \
</span>                     sha256  c4008e7e7781dddf4a8670a435da6496dc9309dbdbc6125ac6d2cc871bdc1be7 \
                     size    6360390
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append  port:tor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles      patch-TorSettings.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    ${qt_cmake_defines}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    livecheck.type  regexm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    livecheck.url   ${homepage}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    livecheck.regex The most recent stable release is: (\[\\d\.\]+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles          patch-TorSettings.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append  port:tor
</span> 
 configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    ${qt_cmake_defines} \
</span>                     -DUSE_MINIUPNPC=OFF
 
 destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +75,3 @@ variant miniupnpc description "Enable miniupnpc support" {
</span> 
 default_variants-append \
                     +miniupnpc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type      regexm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url       ${homepage}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex     The most recent stable release is: (\[\\d\.\]+)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/Vidalia/files/0001-Vidalia.cpp-fix-linking.patch b/security/Vidalia/files/0001-Vidalia.cpp-fix-linking.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..42d3149a923
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/Vidalia/files/0001-Vidalia.cpp-fix-linking.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 678cb733f92a43e762d73b2b53843fd08f138de9 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 24 Feb 2024 12:15:49 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Vidalia.cpp: fix linking
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix suggested in https://github.com/a-ilin/vidalia/issues/1#issuecomment-936246083
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/vidalia/Vidalia.cpp | 5 +++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 5 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/vidalia/Vidalia.cpp src/vidalia/Vidalia.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2a34fc39..2497a33a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/vidalia/Vidalia.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/vidalia/Vidalia.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -239,6 +239,11 @@ VidaliaNativeEventFilter::nativeEventFilter(const QByteArray& /*eventType*/, voi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++bool VidaliaNativeEventFilter::nativeEventFilter(const QByteArray& /*eventType*/, void* message, long* result)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /** Returns true if the user wants to see usage information. */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/Vidalia/files/0002-LogFilter.cpp-fix-includes.patch b/security/Vidalia/files/0002-LogFilter.cpp-fix-includes.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5f15c9de20a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/Vidalia/files/0002-LogFilter.cpp-fix-includes.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From e618901f539760e12ea8a107a4064fceba1d2f19 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 24 Feb 2024 12:21:08 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] LogFilter.cpp: fix includes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes: https://github.com/a-ilin/vidalia/issues/2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/vidalia/log/LogFilter.cpp | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/vidalia/log/LogFilter.cpp src/vidalia/log/LogFilter.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d7b64d6b..35220131 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/vidalia/log/LogFilter.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/vidalia/log/LogFilter.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,6 +15,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "LogFilter.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QStack>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QList>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QString>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /** Constructor taking severity as argument. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LogFilter::LogFilter(uint filter)
</span></pre><pre style='margin:0'>

</pre>