From 36d3f1899ee98a5085a6d4c7fe418a07012085fe Mon Sep 17 00:00:00 2001
From: RETROSHARE Phenom <phenom@iMac-de-RETROSHARE-Phenom.local>
Date: Sat, 2 Apr 2022 14:30:18 +0200
Subject: [PATCH] Fix MacOS build

Need to use:
CONFIG+=rs_macos11.1 CONFIG+=no_rs_sam3 CONFIG+=no_rs_sam3_libsam3
CONFIG+=c++14
---
 retroshare-gui/src/gui/settings/ServerPage.cpp |  4 ++++
 retroshare.pri                                 | 12 ++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/retroshare-gui/src/gui/settings/ServerPage.cpp b/retroshare-gui/src/gui/settings/ServerPage.cpp
index f840f90a6..5089bd90c 100755
--- a/retroshare-gui/src/gui/settings/ServerPage.cpp
+++ b/retroshare-gui/src/gui/settings/ServerPage.cpp
@@ -47,7 +47,9 @@
 #include <QTcpSocket>
 #include <QTimer>
 
+#ifdef RS_USE_I2P_SAM3
 #include <libsam3.h>
+#endif
 
 #define ICON_STATUS_UNKNOWN ":/images/ledoff1.png"
 #define ICON_STATUS_WORKING ":/images/yellowled.png"
@@ -1562,6 +1564,7 @@ void ServerPage::syncI2PProxyAddrSam(QString t)
 
 void ServerPage::taskFinished(taskTicket *&ticket)
 {
+#ifdef RS_USE_I2P_SAM3
 	switch (ticket->task) {
 	case autoProxyTask::receiveKey:
 	{
@@ -1629,6 +1632,7 @@ void ServerPage::taskFinished(taskTicket *&ticket)
 
     delete ticket;
 	ticket = nullptr;
+ #endif //RS_USE_I2P_SAM3
 }
 
 void ServerPage::connectionWithoutCert()
diff --git a/retroshare.pri b/retroshare.pri
index ce1bccc06..9ed316b9a 100644
--- a/retroshare.pri
+++ b/retroshare.pri
@@ -140,6 +140,7 @@ rs_macos10.12:CONFIG -= rs_macos10.11
 rs_macos10.13:CONFIG -= rs_macos10.11
 rs_macos10.14:CONFIG -= rs_macos10.11
 rs_macos10.15:CONFIG -= rs_macos10.11
+rs_macos11.1:CONFIG -= rs_macos10.11
 
 # To enable JSON API append the following assignation to qmake command line
 # "CONFIG+=rs_jsonapi"
@@ -790,6 +791,13 @@ macx-* {
 		QMAKE_CXXFLAGS += -Wno-nullability-completeness
 		QMAKE_CFLAGS += -Wno-nullability-completeness
 	}
+	rs_macos11.1 {
+		message(***retroshare.pri: Set Target and SDK to MacOS 11.1 )
+		QMAKE_MACOSX_DEPLOYMENT_TARGET=11.1
+		QMAKE_MAC_SDK = macosx11.1
+		QMAKE_CXXFLAGS += -Wno-nullability-completeness
+		QMAKE_CFLAGS += -Wno-nullability-completeness
+	}
 
 
 
@@ -798,6 +806,10 @@ macx-* {
 	INCLUDEPATH += "/usr/local/include"
 	RS_UPNP_LIB = miniupnpc
 	QT += macextras
+	INCLUDEPATH += "/usr/local/opt/openssl/include"
+	QMAKE_LIBDIR += "/usr/local/opt/openssl/lib"
+	QMAKE_LIBDIR += "/usr/local/opt/sqlcipher/lib"
+	QMAKE_LIBDIR += "/usr/local/opt/miniupnpc/lib"
 }
 
 # If not yet defined attempt UPnP library autodetection should works at least