From 28653ad92c8b8f7401e0ee0c8bac3648721029e3 Mon Sep 17 00:00:00 2001
From: redDwarf03 <sylvain@archethic.net>
Date: Fri, 25 Apr 2025 21:07:38 +0200
Subject: [PATCH] Updates for macos sequoia to run retroshare-service

origin redDwarf03 <sylvain@archethic.net>
---
 retroshare-service/CMakeLists.txt             | 45 +++++++++++++++++++
 retroshare-service/src/retroshare-service.pro |  7 +++
 2 files changed, 52 insertions(+)

diff --git a/retroshare-service/CMakeLists.txt b/retroshare-service/CMakeLists.txt
index 97562c91e..261158923 100644
--- a/retroshare-service/CMakeLists.txt
+++ b/retroshare-service/CMakeLists.txt
@@ -61,6 +61,21 @@ cmake_dependent_option(
 set(FETCHCONTENT_QUIET OFF)
 include(FetchContent)
 
+# Find required dependencies
+# find_package for Botan and json-c failed to populate variables, remove them.
+# find_package(Botan 3 REQUIRED)
+# message(STATUS "Botan_FOUND=${Botan_FOUND}")
+# message(STATUS "BOTAN_LIBRARIES=${BOTAN_LIBRARIES}")
+# message(STATUS "BOTAN_INCLUDE_DIRS=${BOTAN_INCLUDE_DIRS}")
+# 
+# find_package(json-c REQUIRED)
+# message(STATUS "json-c_FOUND=${json-c_FOUND}")
+# message(STATUS "JSON-C_LIBRARIES=${JSON-C_LIBRARIES}")
+# message(STATUS "JSON-C_INCLUDE_DIRS=${JSON-C_INCLUDE_DIRS}")
+
+find_package(ZLIB REQUIRED)
+find_package(BZip2 REQUIRED)
+
 find_package(Git REQUIRED)
 
 ################################################################################
@@ -113,6 +128,36 @@ target_link_libraries(${PROJECT_NAME} PRIVATE retroshare)
 
 ################################################################################
 
+# Add RNP build directories to linker search path
+target_link_directories(${PROJECT_NAME} PRIVATE
+    ${PROJECT_SOURCE_DIR}/../../supportlibs/librnp/Build/src/lib
+    ${PROJECT_SOURCE_DIR}/../../supportlibs/librnp/Build/src/libsexpp
+)
+
+# Link libraries by name, including RNP libs and dependencies first
+target_link_libraries(${PROJECT_NAME} PRIVATE
+    rnp             # Link by name
+    sexpp
+    botan-3
+    json-c
+    bz2
+    z
+    retroshare
+)
+
+################################################################################
+
+# Add include directories from found packages
+# target_include_directories(${PROJECT_NAME} PRIVATE
+#     ${Botan_INCLUDE_DIRS}
+#     ${JSONC_INCLUDE_DIRS}
+# )
+
+# Link only libretroshare, it should handle its own dependencies now
+target_link_libraries(${PROJECT_NAME} PRIVATE retroshare)
+
+################################################################################
+
 if(RS_SERVICE_DESKTOP)
 	if(UNIX AND NOT APPLE)
 		install(
diff --git a/retroshare-service/src/retroshare-service.pro b/retroshare-service/src/retroshare-service.pro
index 275f868cc..95589673e 100644
--- a/retroshare-service/src/retroshare-service.pro
+++ b/retroshare-service/src/retroshare-service.pro
@@ -67,6 +67,7 @@ unix {
 macx {
 	# ENABLE THIS OPTION FOR Univeral Binary BUILD.
 	#CONFIG += ppc x86
+	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13
 	#QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
 	LIBS += -lz 
         #LIBS += -lssl -lcrypto -lz -lgpgme -lgpg-error -lassuan
@@ -81,6 +82,12 @@ macx {
 	LIBS += -framework Security
 	LIBS += -framework Carbon
 
+	# Explicitly add RNP libs here for the service target
+	LIBRNP_BUILD_PATH = $$clean_path($${OUT_PWD}/../../supportlibs/librnp/Build)
+	LIBS += -L$$clean_path($${LIBRNP_BUILD_PATH}/src/lib) -lrnp
+	LIBS += -L$$clean_path($${LIBRNP_BUILD_PATH}/src/libsexpp) -lsexpp
+	LIBS += -lbz2 -lz -ljson-c -lbotan-3
+
 	for(lib, LIB_DIR):LIBS += -L"$$lib"
 	for(bin, BIN_DIR):LIBS += -L"$$bin"