<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/87b852e7c1cf034465ca444320d3ef7c4a2048d2">https://github.com/macports/macports-ports/commit/87b852e7c1cf034465ca444320d3ef7c4a2048d2</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 87b852e7c1cf034465ca444320d3ef7c4a2048d2
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Thu Aug 1 05:09:43 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> retroshare-qt4: backport patch for updated miniupnpc
</span>---
www/retroshare-qt4/Portfile | 16 ++++++++------
.../files/0004-fix-miniupnpc-18.patch | 25 ++++++++++++++++++++++
2 files changed, 34 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/retroshare-qt4/Portfile b/www/retroshare-qt4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bc4cf43fe30..87786fb5de7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/retroshare-qt4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/retroshare-qt4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ openssl.branch 1.1
</span>
name retroshare-qt4
github.setup RetroShare RetroShare 0.6.4 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> # This is a legacy version aimed at systems which lack support for Qt5–Qt6.
platforms {darwin < 17}
categories www security p2p
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,8 @@ categories www security p2p
</span> license {AGPL-3 LGPL-3 GPL-3}
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description RetroShare is a Free and Open Source cross-platform, Friend-2-Friend and secure decentralised communication platform
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description RetroShare is a Free and Open Source cross-platform, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Friend-2-Friend and secure decentralised communication platform
</span> long_description {*}${description}
homepage https://retroshare.cc
checksums rmd160 4025206f4b940b5a81e120ef526509778cfca350 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +29,8 @@ checksums rmd160 4025206f4b940b5a81e120ef526509778cfca350 \
</span> github.tarball_from archive
depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append path:lib/pkgconfig/gnutls.pc:gnutls \
port:bzip2 \
port:gpgme \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,13 +38,16 @@ depends_lib-append path:lib/pkgconfig/gnutls.pc:gnutls \
</span> port:libgpg-error \
port:libmicrohttpd \
port:miniupnpc \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:sqlcipher \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:sqlite3 \
</span> port:zlib
patchfiles-append 0001-Fix-broken-linking-and-settings.patch \
0002-bdthreads.cc-fix-pointer-comparison.patch \
0003-Add-missing-headers.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Backport of https://github.com/RetroShare/libretroshare/commit/f1b89c4f87d77714571b4135c301bf0429096a20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 0004-fix-miniupnpc-18.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace "s|@PREFIX@|${prefix}|g" \
${worksrcpath}/libresapi/src/libresapi.pro \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,6 +81,3 @@ destroot {
</span> xinstall -m 0644 -W ${worksrcpath} LICENSE.txt README.md TODO.txt ${destroot}${docdir}
move ${worksrcpath}/retroshare-gui/src/retroshare.app ${destroot}${applications_dir}/retroshare.app
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# FIXME: on PowerPC the app builds and starts, however upon initial set-up it freezes on 0x0178bea8 in bn_mul4x_mont_int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See: https://github.com/RetroShare/RetroShare/issues/2762
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/retroshare-qt4/files/0004-fix-miniupnpc-18.patch b/www/retroshare-qt4/files/0004-fix-miniupnpc-18.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6123bbdb84a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/retroshare-qt4/files/0004-fix-miniupnpc-18.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libretroshare/src/upnp/upnphandler_miniupnp.cc 2018-03-14 03:25:38.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libretroshare/src/upnp/upnphandler_miniupnp.cc 2024-08-01 03:43:04.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,6 +20,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct UPNPUrls urls;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct IGDdatas data;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char lanaddr[16]; /* my ip address on the LAN */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MINIUPNPC_API_VERSION >= 18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char wanaddr[16]; /* my ip address on the WAN */
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -118,7 +121,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ putchar('\n');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(UPNP_GetValidIGD(upcd->devlist, &(upcd->urls),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &(upcd->data), upcd->lanaddr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sizeof(upcd->lanaddr)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sizeof(upcd->lanaddr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MINIUPNPC_API_VERSION >= 18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ , upcd->wanaddr, sizeof(upcd->wanaddr)
</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;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf("Found valid IGD : %s\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ upcd->urls.controlURL);
</span></pre><pre style='margin:0'>
</pre>