latest OSX patches

libresapi/src/libresapi.pro

@@ -32,7 +32,12 @@ libmicrohttpd{
 		CONFIG += link_pkgconfig
 		PKGCONFIG *= libmicrohttpd
 	} else {
-		LIBS *= -lmicrohttpd
+		mac {
+		INCLUDEPATH += /usr/local/include
+		LIBS *= /usr/local/lib/libmicrohttpd.a
+		} else {
+			LIBS *= -lmicrohttpd
+		}
 	}
 	SOURCES += \
 		api/ApiServerMHD.cpp

libretroshare/src/grouter/p3grouter.h

@@ -225,7 +225,9 @@ private:
     void handleLowLevelTransactionAckItem(RsGRouterTransactionAcknItem*) ;
 
     static Sha1CheckSum computeDataItemHash(RsGRouterGenericDataItem *data_item);
-
+#ifdef __APPLE__
+public:
+#endif
     class nullstream: public std::ostream {};
 
     std::ostream& grouter_debug() const
@@ -234,7 +236,9 @@ private:
 
         return _debug_enabled?(std::cerr):null;
     }
-
+#ifdef __APPLE__
+private:
+#endif
     void routePendingObjects() ;
     void handleTunnels() ;
     void autoWash() ;

libretroshare/src/libretroshare.pro

@@ -274,7 +274,7 @@ mac {
 		# Beautiful Hack to fix 64bit file access.
                 QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dfopen64=fopen -Dvstatfs64=vstatfs
 
-                UPNPC_DIR = ../../../miniupnpc-1.3
+                UPNPC_DIR = /usr/local/include
 		#GPG_ERROR_DIR = ../../../../libgpg-error-1.7
 		#GPGME_DIR  = ../../../../gpgme-1.1.8
 
@@ -283,7 +283,7 @@ mac {
 		#INCLUDEPATH += . $${UPNPC_DIR} $${GPGME_DIR}/src $${GPG_ERROR_DIR}/src
 
 		# We need a explicit path here, to force using the home version of sqlite3 that really encrypts the database.
-		LIBS += ../../../lib/libsqlcipher.a
+		LIBS += /usr/local/lib/libsqlcipher.a
 		#LIBS += -lsqlite3
 }
 

libretroshare/src/rsserver/rsinit.cc

@@ -365,7 +365,11 @@ int RsInit::InitRetroShare(int argcIgnored, char **argvIgnored, bool strictCheck
 #ifdef LOCALNET_TESTING
 			   >> parameter('R',"restrict-port" ,portRestrictions             ,"port1-port2","Apply port restriction"                   ,false)
 #endif
+#ifdef __APPLE__
+ 				>> help('h',"help","Display this Help") ;
+#else
 				>> help() ;
+#endif
 
 			as.defaultErrorHandling(true) ;
 

libretroshare/src/util/argstream.h

@@ -141,9 +141,15 @@ namespace
 			inline OptionHolder(char s,
 					const char* l,
 					const char* desc);  
+#ifdef __APPLE__
+ 			friend OptionHolder help(char s,
+ 					const char* l,
+ 					const char* desc);
+#else
 			friend OptionHolder help(char s='h',
 					const char* l="help",
 					const char* desc="Display this help");
+#endif
 		private:
 			std::string shortName_;
 			std::string longName_;

retroshare-gui/src/retroshare-gui.pro

@@ -212,12 +212,12 @@ macx {
 	CONFIG += version_detail_bash_script
         LIBS += -lssl -lcrypto -lz 
         #LIBS += -lssl -lcrypto -lz -lgpgme -lgpg-error -lassuan
-	LIBS += ../../../miniupnpc-1.3/libminiupnpc.a
+	LIBS += /usr/local/lib/libminiupnpc.a
 	LIBS += -framework CoreFoundation
 	LIBS += -framework Security
 	LIBS += -framework Carbon
 	INCLUDEPATH += . /usr/local/include
-	DEFINES *= MAC_IDLE # for idle feature
+	#DEFINES *= MAC_IDLE # for idle feature
 	CONFIG -= uitools
 }
 

retroshare-nogui/src/retroshare-nogui.pro

@@ -96,9 +96,10 @@ macx {
 
 	LIBS += -Wl,-search_paths_first
         LIBS += -lssl -lcrypto -lz 
-	LIBS += ../../../miniupnpc-1.0/libminiupnpc.a
+	LIBS += /usr/local/lib/libminiupnpc.a
 	LIBS += -framework CoreFoundation
 	LIBS += -framework Security
+	INCLUDEPATH += /usr/local/include
 
 	sshserver {
 		LIBS += -L../../../lib