<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cd94461376529188728d2a84d79d80f782320cf9">https://github.com/macports/macports-ports/commit/cd94461376529188728d2a84d79d80f782320cf9</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 cd944613765 retroshare-qt4: new port
</span>cd944613765 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cd94461376529188728d2a84d79d80f782320cf9
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Tue Apr 30 15:18:57 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> retroshare-qt4: new port
</span>---
www/retroshare-qt4/Portfile | 81 +++++++
.../0001-Fix-broken-linking-and-settings.patch | 240 +++++++++++++++++++++
.../0002-bdthreads.cc-fix-pointer-comparison.patch | 24 +++
.../files/0003-Add-missing-headers.patch | 21 ++
4 files changed, 366 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/retroshare-qt4/Portfile b/www/retroshare-qt4/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bc4cf43fe30
</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/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,81 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup conflicts_build 1.0
</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 legacysupport 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup qmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name retroshare-qt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup RetroShare RetroShare 0.6.4 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This is a legacy version aimed at systems which lack support for Qt5–Qt6.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms {darwin < 17}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories www security p2p
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://github.com/RetroShare/RetroShare/blob/master/.reuse/dep5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license {AGPL-3 LGPL-3 GPL-3}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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;'>+long_description {*}${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://retroshare.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4025206f4b940b5a81e120ef526509778cfca350 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 84355c0f3be5ec1dfa7253e327ea1254f76f47739c233cfb8d0983ebd1a61f4a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 20018361
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:lib/pkgconfig/gnutls.pc:gnutls \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:bzip2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gpgme \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libassuan \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libgpg-error \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libmicrohttpd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:miniupnpc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:sqlcipher \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 0001-Fix-broken-linking-and-settings.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-bdthreads.cc-fix-pointer-comparison.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0003-Add-missing-headers.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/libresapi/src/libresapi.pro \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/libretroshare/src/libretroshare.pro \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/retroshare.pri \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/retroshare-gui/src/retroshare-gui.pro \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/retroshare-nogui/src/retroshare-nogui.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@TARGET@|${macosx_deployment_target}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/retroshare.pri
</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;'>+compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# RetroShare can be configured to use either miniupnpc or libupnp. Having both active breaks linking. To be on a safe side, also deactivate gupnp.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Our libretroshare port tracks the upstream. It may not be compatible with a legacy or even current release of RetroShare.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts_build gupnp libupnp libretroshare
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pre_args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CONFIG+=rs_v07_changes" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CONFIG+=no_sqlcipher"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# api/ApiServerMHD.cpp: error: invalid conversion from 'int (*)(void*, MHD_ValueKind, const char*, const char*)' to 'MHD_KeyValueIterator' {aka 'MHD_Result (*)(void*, MHD_ValueKind, const char*, const char*)'} [-fpermissive]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *gcc* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -fpermissive
</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;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set docdir ${prefix}/share/doc/retroshare/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} LICENSE.txt README.md TODO.txt ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/retroshare-gui/src/retroshare.app ${destroot}${applications_dir}/retroshare.app
</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;'>+# 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:#e0ffe0;'>+# 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/0001-Fix-broken-linking-and-settings.patch b/www/retroshare-qt4/files/0001-Fix-broken-linking-and-settings.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6d3ff768834
</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/0001-Fix-broken-linking-and-settings.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,240 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 6d53fbdf4f2c381500fa4e1dc04aa3a166b1988b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 10 Aug 2023 04:45:28 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/3] Fix broken linking and settings
</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;'>+ libresapi/src/libresapi.pro | 4 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libretroshare/src/libretroshare.pro | 19 +++-----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ retroshare-gui/src/retroshare-gui.pro | 14 +++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ retroshare-nogui/src/retroshare-nogui.pro | 16 +++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ retroshare.pri | 57 +++++++----------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5 files changed, 47 insertions(+), 63 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git libresapi/src/libresapi.pro libresapi/src/libresapi.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ea2daa082..06ac04930 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libresapi/src/libresapi.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libresapi/src/libresapi.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -146,8 +146,8 @@ libresapihttpserver {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mac {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDEPATH += . $$INC_DIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #for(lib, LIB_DIR):exists($$lib/libmicrohttpd.a){ LIBS *= $$lib/libmicrohttpd.a}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBS *= -lmicrohttpd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # for(lib, LIB_DIR):exists($$lib/libmicrohttpd.a){ LIBS *= $$lib/libmicrohttpd.a}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBS *= @PREFIX@/lib/libmicrohttpd.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS *= -lmicrohttpd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git libretroshare/src/libretroshare.pro libretroshare/src/libretroshare.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c2604fa4a..3c1872dcd 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libretroshare/src/libretroshare.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libretroshare/src/libretroshare.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -306,32 +306,27 @@ mac {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CC = $${QMAKE_CXX}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OBJECTS_DIR = temp/obj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MOC_DIR = temp/moc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #DEFINES = WINDOWS_SYS WIN32 STATICLIB MINGW
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #DEFINES *= MINIUPNPC_VERSION=13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # DEFINES *= MINIUPNPC_VERSION=25
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG += upnp_miniupnpc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CONFIG += c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONFIG += c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # zeroconf disabled at the end of libretroshare.pro (but need the code)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #CONFIG += zeroconf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #CONFIG += zcnatassist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # CONFIG += zeroconf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # CONFIG += zcnatassist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Beautiful Hack to fix 64bit file access.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Beautiful Hack to fix 64-bit file access.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dfopen64=fopen -Dvstatfs64=vstatfs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #GPG_ERROR_DIR = ../../../../libgpg-error-1.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #GPGME_DIR = ../../../../gpgme-1.1.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for(lib, LIB_DIR):LIBS += -L"$$lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for(bin, BIN_DIR):LIBS += -L"$$bin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEPENDPATH += . $$INC_DIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDEPATH += . $$INC_DIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDEPATH += ../../../.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ INCLUDEPATH += @PREFIX@/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We need a explicit path here, to force using the home version of sqlite3 that really encrypts the database.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBS += /usr/local/lib/libsqlcipher.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #LIBS += -lsqlite3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBS += -lsqlite3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFINES *= PLUGIN_DIR=\"\\\"$${PLUGIN_DIR}\\\"\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFINES *= DATA_DIR=\"\\\"$${DATA_DIR}\\\"\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git retroshare-gui/src/retroshare-gui.pro retroshare-gui/src/retroshare-gui.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7a6d8d2a9..8f25e2891 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- retroshare-gui/src/retroshare-gui.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ retroshare-gui/src/retroshare-gui.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -238,8 +238,8 @@ win32 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macx {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ENABLE THIS OPTION FOR Univeral Binary BUILD.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #CONFIG += ppc x86
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # CONFIG += ppc x86
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_INFO_PLIST = Info.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mac_icon.files = $$files($$PWD/rsMacIcon.icns)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mac_icon.path = Contents/Resources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -249,18 +249,20 @@ macx {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_BUNDLE_DATA += mac_webui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG += version_detail_bash_script
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBS += -lssl -lcrypto -lz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #LIBS += -lssl -lcrypto -lz -lgpgme -lgpg-error -lassuan
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for(lib, LIB_DIR):exists($$lib/libminiupnpc.a){ LIBS += $$lib/libminiupnpc.a}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBS += -lssl -lcrypto -lgnutls -lz -lgpg-error -lassuan
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBS += -lsqlite3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBS += @PREFIX@/lib/libgpgme.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # LIBS += @PREFIX@/lib/libgpg-error.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBS += @PREFIX@/lib/libminiupnpc.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS += -framework CoreFoundation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS += -framework Security
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS += -framework Carbon
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for(lib, LIB_DIR):LIBS += -L"$$lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for(bin, BIN_DIR):LIBS += -L"$$bin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEPENDPATH += . $$INC_DIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDEPATH += . $$INC_DIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ INCLUDEPATH += @PREFIX@/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #DEFINES *= MAC_IDLE # for idle feature
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG -= uitools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git retroshare-nogui/src/retroshare-nogui.pro retroshare-nogui/src/retroshare-nogui.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1fdb27b71..e825982f6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- retroshare-nogui/src/retroshare-nogui.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ retroshare-nogui/src/retroshare-nogui.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -98,15 +98,19 @@ macx {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # CONFIG += ppc x86
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS += -Wl,-search_paths_first
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBS += -lssl -lcrypto -lz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for(lib, LIB_DIR):exists($$lib/libminiupnpc.a){ LIBS += $$lib/libminiupnpc.a}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBS += -lssl -lcrypto -lgnutls -lz -lbz2 -lgpg-error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBS += -lsqlite3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBS += @PREFIX@/lib/libgpgme.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # LIBS += @PREFIX@/lib/libgpg-error.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBS += @PREFIX@/lib/libminiupnpc.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBS += @PREFIX@/lib/libmicrohttpd.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS += -framework CoreFoundation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS += -framework Security
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for(lib, LIB_DIR):LIBS += -L"$$lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for(bin, BIN_DIR):LIBS += -L"$$bin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEPENDPATH += . $$INC_DIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDEPATH += . $$INC_DIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ INCLUDEPATH += @PREFIX@/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dstat64=stat -Dstatvfs64=statvfs -Dfopen64=fopen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -162,6 +166,12 @@ INCLUDEPATH += . $$PWD/../../libretroshare/src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PRE_TARGETDEPS *= $$OUT_PWD/../../libretroshare/src/lib/libretroshare.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS *= $$OUT_PWD/../../libretroshare/src/lib/libretroshare.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PRE_TARGETDEPS *= $$OUT_PWD/../../openpgpsdk/src/lib/libops.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBS *= $$OUT_PWD/../../openpgpsdk/src/lib/libops.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PRE_TARGETDEPS *= $$OUT_PWD/../../libbitdht/src/lib/libbitdht.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBS *= $$OUT_PWD/../../libbitdht/src/lib/libbitdht.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Input
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HEADERS += notifytxt.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SOURCES += notifytxt.cc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git retroshare.pri retroshare.pri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 446c1bd61..dae663386 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- retroshare.pri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ retroshare.pri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -85,7 +85,7 @@ rs_cppwarning:CONFIG -= no_rs_cppwarning
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # To disable GXS mail append the following assignation to qmake command line
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # "CONFIG+=no_rs_gxs_trans"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG *= rs_gxs_trans
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#no_rs_gxs_trans:CONFIG -= rs_gxs_trans ## Disabing not supported ATM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# no_rs_gxs_trans:CONFIG -= rs_gxs_trans ## Disabing not supported ATM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # To enable GXS based async chat append the following assignation to qmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # command line "CONFIG+=rs_async_chat"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -93,12 +93,8 @@ CONFIG *= no_rs_async_chat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rs_async_chat:CONFIG -= no_rs_async_chat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # To select your MacOsX version append the following assignation to qmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# command line "CONFIG+=rs_macos10.11" where 10.11 depends your version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-macx:CONFIG *= rs_macos10.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-rs_macos10.8:CONFIG -= rs_macos10.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-rs_macos10.9:CONFIG -= rs_macos10.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-rs_macos10.10:CONFIG -= rs_macos10.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-rs_macos10.12:CONFIG -= rs_macos10.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# command line "CONFIG+=rs_macos@TARGET@" where @TARGET@ depends your version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# macx:CONFIG *= rs_macos@TARGET@
</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;'>+ linux-* {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -165,45 +161,26 @@ win32 {
</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;'>+ macx {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rs_macos10.8 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(***retroshare.pri: Set Target and SDK to MacOS 10.8 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_MACOSX_DEPLOYMENT_TARGET=10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_MAC_SDK = macosx10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rs_macos@TARGET@ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(***retroshare.pri: Set Target and SDK to MacOS @TARGET@ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QMAKE_MACOSX_DEPLOYMENT_TARGET=@TARGET@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QMAKE_MAC_SDK = macosx@TARGET@
</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;'>+- rs_macos10.9 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(***retroshare.pri: Set Target and SDK to MacOS 10.9 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_MACOSX_DEPLOYMENT_TARGET=10.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_MAC_SDK = macosx10.9
</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;'>+- rs_macos10.10 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(***retroshare.pri: Set Target and SDK to MacOS 10.10 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_MACOSX_DEPLOYMENT_TARGET=10.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_MAC_SDK = macosx10.10
</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;'>+- rs_macos10.11 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(***retroshare.pri: Set Target and SDK to MacOS 10.11 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_MACOSX_DEPLOYMENT_TARGET=10.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_MAC_SDK = macosx10.11
</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;'>+- rs_macos10.12 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(***retroshare.pri: Set Target and SDK to MacOS 10.12 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_MACOSX_DEPLOYMENT_TARGET=10.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_MAC_SDK = macosx10.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_CXXFLAGS += -Wno-nullability-completeness
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_CFLAGS += -Wno-nullability-completeness
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# rs_macos10.12 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# message(***retroshare.pri: Set Target and SDK to MacOS 10.12 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# QMAKE_MACOSX_DEPLOYMENT_TARGET=10.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# QMAKE_MAC_SDK = macosx10.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# QMAKE_CXXFLAGS += -Wno-nullability-completeness
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# QMAKE_CFLAGS += -Wno-nullability-completeness
</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;'>+ message(***retroshare.pri:MacOSX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BIN_DIR += "/usr/bin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INC_DIR += "/usr/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- INC_DIR += "/usr/local/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- INC_DIR += "/opt/local/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIB_DIR += "/usr/local/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIB_DIR += "/opt/local/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BIN_DIR += "@PREFIX@/bin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ INC_DIR += "@PREFIX@/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIB_DIR += "@PREFIX@/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG += c++11
</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/www/retroshare-qt4/files/0002-bdthreads.cc-fix-pointer-comparison.patch b/www/retroshare-qt4/files/0002-bdthreads.cc-fix-pointer-comparison.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ad9999046be
</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/0002-bdthreads.cc-fix-pointer-comparison.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This is just borrowed from a later upstream version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 9c5ae1c29b0646b501f9704ce335f835ce33c1c0 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 10 Aug 2023 04:51:25 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/3] bdthreads.cc: fix pointer comparison
</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;'>+ libbitdht/src/util/bdthreads.cc | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git libbitdht/src/util/bdthreads.cc libbitdht/src/util/bdthreads.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b52d152da..6a944d6b2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libbitdht/src/util/bdthreads.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libbitdht/src/util/bdthreads.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -126,7 +126,7 @@ void bdThread::join() /* waits for the the mTid thread to stop */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mMutex.lock();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(_WIN32) || defined(__MINGW32__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(_WIN32) || defined(__MINGW32__) || defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Its a struct in Windows compile and the member .p ist checked in the pthreads library */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(mTid > 0)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/retroshare-qt4/files/0003-Add-missing-headers.patch b/www/retroshare-qt4/files/0003-Add-missing-headers.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e6e3f17e386
</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/0003-Add-missing-headers.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 9f950e44a2fc7222a051f0d466b524339bfa8662 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 20 Oct 2023 05:51:44 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 3/3] Add missing headers
</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;'>+ libretroshare/src/util/rstime.h | 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 libretroshare/src/util/rstime.h libretroshare/src/util/rstime.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4359a28ff..9b9540379 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libretroshare/src/util/rstime.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libretroshare/src/util/rstime.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,6 +24,7 @@
</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 <string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <cstdint>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace rstime {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>