mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-21 19:20:08 +02:00
Retroshare: bump (#2436)
* Retroshare: bump * WIP * WIP * Looks ok * Whitespace cleanup * Cleanup * AUTHORS
This commit is contained in:
192
net-p2p/retroshare/patches/retroshare-0.6.4.patchset
Normal file
192
net-p2p/retroshare/patches/retroshare-0.6.4.patchset
Normal file
@@ -0,0 +1,192 @@
|
||||
From 55856cf2b700b19d4fdae1665520ff87610a7d30 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
||||
Date: Mon, 9 Apr 2018 23:50:00 +0200
|
||||
Subject: Haiku supporting patches
|
||||
|
||||
|
||||
diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro
|
||||
index c2604fa..de27c8c 100644
|
||||
--- a/libretroshare/src/libretroshare.pro
|
||||
+++ b/libretroshare/src/libretroshare.pro
|
||||
@@ -365,7 +365,7 @@ openbsd-* {
|
||||
|
||||
haiku-* {
|
||||
|
||||
- QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dstat64=stat -Dstatvfs64=statvfs -Dfopen64=fopen
|
||||
+ QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dstat64=stat -Dstatvfs64=statvfs -Dfopen64=fopen -D_BSD_SOURCE
|
||||
OPENPGPSDK_DIR = ../../openpgpsdk/src
|
||||
INCLUDEPATH *= $${OPENPGPSDK_DIR} ../openpgpsdk
|
||||
DEFINES *= NO_SQLCIPHER
|
||||
diff --git a/libretroshare/src/rsserver/rsaccounts.cc b/libretroshare/src/rsserver/rsaccounts.cc
|
||||
index 6136a2a..3ce9ea0 100644
|
||||
--- a/libretroshare/src/rsserver/rsaccounts.cc
|
||||
+++ b/libretroshare/src/rsserver/rsaccounts.cc
|
||||
@@ -348,7 +348,11 @@ bool RsAccountsDetail::defaultBaseDirectory()
|
||||
}
|
||||
|
||||
basedir = h;
|
||||
- basedir += "/.retroshare";
|
||||
+ #ifndef __HAIKU__
|
||||
+ basedir += "/.retroshare";
|
||||
+ #else
|
||||
+ basedir += "/config/settings/retroshare";
|
||||
+ #endif
|
||||
|
||||
#else
|
||||
if (RsInit::isPortable())
|
||||
@@ -811,6 +815,8 @@ static bool checkAccount(const std::string &accountdir, AccountDetails &account,
|
||||
dataDirectory = ".";
|
||||
#elif defined(ANDROID)
|
||||
dataDirectory = defaultBaseDirectory()+"/usr/share/retroshare";
|
||||
+#elif defined(__HAIKU__)
|
||||
+ dataDirectory = ".";
|
||||
#elif defined(DATA_DIR)
|
||||
// cppcheck-suppress ConfigurationNotChecked
|
||||
dataDirectory = DATA_DIR;
|
||||
diff --git a/libretroshare/src/rsserver/rsinit.cc b/libretroshare/src/rsserver/rsinit.cc
|
||||
index 0d93002..1becc1b 100644
|
||||
--- a/libretroshare/src/rsserver/rsinit.cc
|
||||
+++ b/libretroshare/src/rsserver/rsinit.cc
|
||||
@@ -1228,6 +1228,9 @@ int RsServer::StartupRetroShare()
|
||||
#ifdef __APPLE__
|
||||
plugins_directories.push_back(rsAccounts->PathDataDirectory()) ;
|
||||
#endif
|
||||
+#ifdef __HAIKU__
|
||||
+ plugins_directories.push_back("/boot/system/apps/RetroShare/plugins") ;
|
||||
+#endif
|
||||
#if !defined(WINDOWS_SYS) && defined(PLUGIN_DIR)
|
||||
plugins_directories.push_back(std::string(PLUGIN_DIR)) ;
|
||||
#endif
|
||||
diff --git a/libretroshare/src/util/folderiterator.cc b/libretroshare/src/util/folderiterator.cc
|
||||
index eb70ab7..9249368 100644
|
||||
--- a/libretroshare/src/util/folderiterator.cc
|
||||
+++ b/libretroshare/src/util/folderiterator.cc
|
||||
@@ -115,6 +115,7 @@ bool FolderIterator::updateFileInfo(bool& should_skip)
|
||||
|
||||
#warning cyril soler: should we take care of symbolic links on windows?
|
||||
#ifndef WINDOWS_SYS
|
||||
+#ifndef __HAIKU__ /* FIXME, Haiku have incomplete dirent support */
|
||||
if( ent->d_type == DT_LNK)
|
||||
{
|
||||
if(!mAllowSymLinks)
|
||||
@@ -130,6 +131,7 @@ bool FolderIterator::updateFileInfo(bool& should_skip)
|
||||
should_skip = true ;
|
||||
return true ;
|
||||
}
|
||||
+#endif /*HAIKU*/
|
||||
#endif
|
||||
|
||||
struct stat64 buf ;
|
||||
diff --git a/libretroshare/src/util/rsthreads.cc b/libretroshare/src/util/rsthreads.cc
|
||||
index 39eca59..7706b7f 100644
|
||||
--- a/libretroshare/src/util/rsthreads.cc
|
||||
+++ b/libretroshare/src/util/rsthreads.cc
|
||||
@@ -32,6 +32,7 @@
|
||||
|
||||
#include "util/rstime.h"
|
||||
|
||||
+#ifndef __HAIKU__ /* FIXME, Haiku doesn't support pthread_setname_np*/
|
||||
#ifdef __APPLE__
|
||||
int __attribute__((weak)) pthread_setname_np(const char *__buf) ;
|
||||
int RS_pthread_setname_np(pthread_t /*__target_thread*/, const char *__buf) {
|
||||
@@ -43,6 +44,7 @@ int RS_pthread_setname_np(pthread_t __target_thread, const char *__buf) {
|
||||
return pthread_setname_np(__target_thread, __buf);
|
||||
}
|
||||
#endif
|
||||
+#endif /*HAIKU*/
|
||||
|
||||
#ifdef RSMUTEX_DEBUG
|
||||
#include <stdio.h>
|
||||
@@ -193,7 +195,7 @@ void RsThread::start(const std::string &threadName)
|
||||
mTid = tid;
|
||||
|
||||
// set name
|
||||
-
|
||||
+#ifndef __HAIKU__ /* FIXME! Haiku doesn't support pthread_setname_np*/
|
||||
if(pthread_setname_np)
|
||||
{
|
||||
if(!threadName.empty())
|
||||
@@ -210,6 +212,7 @@ void RsThread::start(const std::string &threadName)
|
||||
}
|
||||
}
|
||||
}
|
||||
+#endif /*HAIKU*/
|
||||
}
|
||||
else
|
||||
{
|
||||
diff --git a/plugins/FeedReader/FeedReader.pro b/plugins/FeedReader/FeedReader.pro
|
||||
index 7e7e40f..b388156 100644
|
||||
--- a/plugins/FeedReader/FeedReader.pro
|
||||
+++ b/plugins/FeedReader/FeedReader.pro
|
||||
@@ -127,9 +127,10 @@ openbsd-* {
|
||||
}
|
||||
|
||||
haiku-* {
|
||||
- LIBXML2_DIR = pkg-config --cflags libxml-2.0
|
||||
+ CONFIG += link_pkgconfig
|
||||
+ PKGCONFIG *= libcurl libxml-2.0 libxslt
|
||||
|
||||
+ LIBXML2_DIR = pkg-config --cflags libxml-2.0
|
||||
INCLUDEPATH += $${LIBXML2_DIR}
|
||||
-
|
||||
LIBS += -lcurl -lxml2 -lxslt
|
||||
}
|
||||
diff --git a/plugins/VOIP/VOIP.pro b/plugins/VOIP/VOIP.pro
|
||||
index ccf7f00..d4195a8 100644
|
||||
--- a/plugins/VOIP/VOIP.pro
|
||||
+++ b/plugins/VOIP/VOIP.pro
|
||||
@@ -28,6 +28,18 @@ linux-* {
|
||||
LIBS += -lspeex -lspeexdsp -lavcodec -lavutil
|
||||
}
|
||||
|
||||
+#################################### Haiku #####################################
|
||||
+
|
||||
+haiku-* {
|
||||
+ CONFIG += link_pkgconfig
|
||||
+
|
||||
+ PKGCONFIG += libavcodec libavutil
|
||||
+ PKGCONFIG += speex speexdsp
|
||||
+ PKGCONFIG += opencv
|
||||
+} else {
|
||||
+ LIBS += -lspeex -lspeexdsp -lavcodec -lavutil
|
||||
+}
|
||||
+
|
||||
#################################### Windows #####################################
|
||||
|
||||
win32 {
|
||||
diff --git a/retroshare-gui/src/gui/elastic/fft.h b/retroshare-gui/src/gui/elastic/fft.h
|
||||
index 0b5c48a..54154e7 100644
|
||||
--- a/retroshare-gui/src/gui/elastic/fft.h
|
||||
+++ b/retroshare-gui/src/gui/elastic/fft.h
|
||||
@@ -81,6 +81,15 @@ function prototypes
|
||||
*/
|
||||
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+ #include <math.h>
|
||||
+ void sincos(double x, double* p_sin, double* p_cos) {
|
||||
+ *p_sin = sin(x);
|
||||
+ *p_cos = cos(x);
|
||||
+ }
|
||||
+#endif /*HAIKU*/
|
||||
+
|
||||
+
|
||||
/* -------- initializing routines -------- */
|
||||
|
||||
#pragma once
|
||||
diff --git a/retroshare-gui/src/rshare.cpp b/retroshare-gui/src/rshare.cpp
|
||||
index ff6038d..0d2b235 100644
|
||||
--- a/retroshare-gui/src/rshare.cpp
|
||||
+++ b/retroshare-gui/src/rshare.cpp
|
||||
@@ -850,6 +850,8 @@ Rshare::defaultDataDirectory()
|
||||
{
|
||||
#if defined(Q_OS_WIN)
|
||||
return (win32_app_data_folder() + "\\RetroShare");
|
||||
+#elif defined(__HAIKU__)
|
||||
+ return (QDir::homePath() + "/config/settings/retroshare");
|
||||
#else
|
||||
return (QDir::homePath() + "/.RetroShare");
|
||||
#endif
|
||||
--
|
||||
2.16.2
|
||||
|
||||
@@ -1,293 +0,0 @@
|
||||
From b9111fc85b82eea35ce5af0160cc049ae4e23be0 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Reznikov <diver@gelios.net>
|
||||
Date: Tue, 20 Oct 2015 13:37:35 +0300
|
||||
Subject: Add Haiku support
|
||||
|
||||
|
||||
diff --git a/libbitdht/src/libbitdht.pro b/libbitdht/src/libbitdht.pro
|
||||
index 6f705fa..6c66841 100644
|
||||
--- a/libbitdht/src/libbitdht.pro
|
||||
+++ b/libbitdht/src/libbitdht.pro
|
||||
@@ -99,6 +99,12 @@ openbsd-* {
|
||||
DESTDIR = lib
|
||||
}
|
||||
|
||||
+################################# Haiku ##########################################
|
||||
+
|
||||
+haiku-* {
|
||||
+ DESTDIR = lib
|
||||
+}
|
||||
+
|
||||
################################### COMMON stuff ##################################
|
||||
################################### COMMON stuff ##################################
|
||||
|
||||
diff --git a/libbitdht/src/udp/udplayer.cc b/libbitdht/src/udp/udplayer.cc
|
||||
index ddf0258..4a37abf 100644
|
||||
--- a/libbitdht/src/udp/udplayer.cc
|
||||
+++ b/libbitdht/src/udp/udplayer.cc
|
||||
@@ -32,6 +32,7 @@
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <time.h>
|
||||
+#include <sys/select.h>
|
||||
|
||||
/***
|
||||
* #define UDP_ENABLE_BROADCAST 1
|
||||
diff --git a/libbitdht/src/util/bdrandom.cc b/libbitdht/src/util/bdrandom.cc
|
||||
index 3d2bc6a..6288f86 100644
|
||||
--- a/libbitdht/src/util/bdrandom.cc
|
||||
+++ b/libbitdht/src/util/bdrandom.cc
|
||||
@@ -13,7 +13,7 @@ static bool auto_seed = bdRandom::seed( (time(NULL) + ((uint32_t) pthread_self()
|
||||
#else
|
||||
#ifdef __APPLE__
|
||||
static bool auto_seed = bdRandom::seed( (time(NULL) + pthread_mach_thread_np(pthread_self())*0x1293fe + (getpid()^0x113ef76b))^0x18e34a12 ) ;
|
||||
- #elif defined(__FreeBSD__)
|
||||
+ #elif defined(__FreeBSD__) || (__HAIKU__)
|
||||
// since this is completely insecure anyway, just kludge for now
|
||||
static bool auto_seed = bdRandom::seed(time(NULL));
|
||||
#elif defined(__OpenBSD__)
|
||||
diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro
|
||||
index a103392..ee17470 100644
|
||||
--- a/libretroshare/src/libretroshare.pro
|
||||
+++ b/libretroshare/src/libretroshare.pro
|
||||
@@ -300,6 +300,19 @@ freebsd-* {
|
||||
DESTDIR = lib
|
||||
}
|
||||
|
||||
+################################# Haiku ##########################################
|
||||
+
|
||||
+haiku-* {
|
||||
+
|
||||
+ QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dstat64=stat -Dstatvfs64=statvfs -Dfopen64=fopen
|
||||
+ OPENPGPSDK_DIR = ../../openpgpsdk/src
|
||||
+ INCLUDEPATH *= $${OPENPGPSDK_DIR} ../openpgpsdk
|
||||
+ DEFINES *= NO_SQLCIPHER
|
||||
+ CONFIG += release
|
||||
+ CONFIG += upnp_libupnp
|
||||
+ DESTDIR = lib
|
||||
+}
|
||||
+
|
||||
################################# OpenBSD ##########################################
|
||||
|
||||
openbsd-* {
|
||||
diff --git a/libretroshare/src/pqi/pqinetwork.cc b/libretroshare/src/pqi/pqinetwork.cc
|
||||
index 00e24c6..1762f09 100644
|
||||
--- a/libretroshare/src/pqi/pqinetwork.cc
|
||||
+++ b/libretroshare/src/pqi/pqinetwork.cc
|
||||
@@ -55,6 +55,10 @@ int errno;
|
||||
|
||||
#endif
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+# define IFF_RUNNING 0x0001
|
||||
+#endif
|
||||
+
|
||||
/********************************** WINDOWS/UNIX SPECIFIC PART ******************/
|
||||
#ifndef WINDOWS_SYS
|
||||
|
||||
@@ -146,6 +150,7 @@ std::string socket_errorType(int err)
|
||||
|
||||
#include <net/if.h>
|
||||
#include <sys/ioctl.h>
|
||||
+#include <sys/sockio.h>
|
||||
|
||||
bool getLocalInterfaces_ipv4(struct in_addr &/*routeAddr*/, std::list<struct in_addr> &addrs)
|
||||
{
|
||||
diff --git a/libretroshare/src/pqi/pqinetwork.h b/libretroshare/src/pqi/pqinetwork.h
|
||||
index f8118f7..9d8b02e 100644
|
||||
--- a/libretroshare/src/pqi/pqinetwork.h
|
||||
+++ b/libretroshare/src/pqi/pqinetwork.h
|
||||
@@ -38,6 +38,7 @@
|
||||
#include <arpa/inet.h>
|
||||
|
||||
#include <sys/poll.h>
|
||||
+#include <errno.h>
|
||||
|
||||
//socket blocking/options.
|
||||
#include <fcntl.h>
|
||||
diff --git a/libretroshare/src/rsserver/rsinit.cc b/libretroshare/src/rsserver/rsinit.cc
|
||||
index 7357326..ee9cdd2 100644
|
||||
--- a/libretroshare/src/rsserver/rsinit.cc
|
||||
+++ b/libretroshare/src/rsserver/rsinit.cc
|
||||
@@ -1251,7 +1251,11 @@ int RsServer::StartupRetroShare()
|
||||
std::vector<std::string> plugins_directories ;
|
||||
|
||||
#ifndef WINDOWS_SYS
|
||||
- plugins_directories.push_back(std::string("/usr/lib/retroshare/extensions6/")) ;
|
||||
+#ifdef __HAIKU__
|
||||
+ plugins_directories.push_back(std::string("./plugins")) ;
|
||||
+#else
|
||||
+ plugins_directories.push_back(std::string("/usr/lib/retroshare/extensions6/")) ;
|
||||
+#endif
|
||||
#endif
|
||||
std::string extensions_dir = rsAccounts->PathBaseDirectory() + "/extensions6/" ;
|
||||
plugins_directories.push_back(extensions_dir) ;
|
||||
diff --git a/libretroshare/src/rsserver/rsloginhandler.cc b/libretroshare/src/rsserver/rsloginhandler.cc
|
||||
index b8b9a66..e5a7783 100644
|
||||
--- a/libretroshare/src/rsserver/rsloginhandler.cc
|
||||
+++ b/libretroshare/src/rsserver/rsloginhandler.cc
|
||||
@@ -118,6 +118,7 @@ bool RsLoginHandler::tryAutoLogin(const RsPeerId& ssl_id,std::string& ssl_passwd
|
||||
std::cerr << "RsTryAutoLogin()" << std::endl;
|
||||
|
||||
/******************************** WINDOWS/UNIX SPECIFIC PART ******************/
|
||||
+#ifndef __HAIKU__
|
||||
#ifndef WINDOWS_SYS /* UNIX */
|
||||
#if defined(UBUNTU) || defined(__FreeBSD__) || defined(__OpenBSD__)
|
||||
|
||||
@@ -349,6 +350,7 @@ bool RsLoginHandler::tryAutoLogin(const RsPeerId& ssl_id,std::string& ssl_passwd
|
||||
|
||||
return isDecrypt;
|
||||
#endif
|
||||
+#endif
|
||||
/******************************** WINDOWS/UNIX SPECIFIC PART ******************/
|
||||
|
||||
return false;
|
||||
@@ -360,6 +362,7 @@ bool RsLoginHandler::enableAutoLogin(const RsPeerId& ssl_id,const std::string& s
|
||||
std::cerr << "RsStoreAutoLogin()" << std::endl;
|
||||
|
||||
/******************************** WINDOWS/UNIX SPECIFIC PART ******************/
|
||||
+#ifndef __HAIKU__
|
||||
#ifndef WINDOWS_SYS /* UNIX */
|
||||
#if defined(UBUNTU) || defined(__FreeBSD__) || defined(__OpenBSD__)
|
||||
if(GNOME_KEYRING_RESULT_OK == gnome_keyring_store_password_sync(&my_schema, NULL, (gchar*)("RetroShare password for SSL Id "+ssl_id.toStdString()).c_str(),(gchar*)ssl_passwd.c_str(),"RetroShare SSL Id",ssl_id.toStdString().c_str(),NULL))
|
||||
@@ -517,6 +520,7 @@ bool RsLoginHandler::enableAutoLogin(const RsPeerId& ssl_id,const std::string& s
|
||||
/******************************** WINDOWS/UNIX SPECIFIC PART ******************/
|
||||
|
||||
return false;
|
||||
+#endif
|
||||
}
|
||||
|
||||
bool RsLoginHandler::clearAutoLogin(const RsPeerId& ssl_id)
|
||||
diff --git a/libretroshare/src/tcponudp/tou.cc b/libretroshare/src/tcponudp/tou.cc
|
||||
index 019eb72..e6fb7f4 100644
|
||||
--- a/libretroshare/src/tcponudp/tou.cc
|
||||
+++ b/libretroshare/src/tcponudp/tou.cc
|
||||
@@ -35,6 +35,7 @@ static const int kInitStreamTable = 5;
|
||||
#include <time.h>
|
||||
|
||||
#include "udp/udpstack.h"
|
||||
+#include "pqi/pqinetwork.h"
|
||||
#include "tcpstream.h"
|
||||
#include <vector>
|
||||
#include <iostream>
|
||||
@@ -42,6 +43,7 @@ static const int kInitStreamTable = 5;
|
||||
#include <errno.h>
|
||||
|
||||
#define DEBUG_TOU_INTERFACE 1
|
||||
+#define EUSERS 87
|
||||
|
||||
struct TcpOnUdp_t
|
||||
{
|
||||
diff --git a/libretroshare/src/util/rsdir.cc b/libretroshare/src/util/rsdir.cc
|
||||
index 4e7ccae..b396b16 100644
|
||||
--- a/libretroshare/src/util/rsdir.cc
|
||||
+++ b/libretroshare/src/util/rsdir.cc
|
||||
@@ -27,7 +27,7 @@
|
||||
// Includes for directory creation.
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
-#include <sys/fcntl.h>
|
||||
+#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "util/rsdir.h"
|
||||
diff --git a/plugins/FeedReader/FeedReader.pro b/plugins/FeedReader/FeedReader.pro
|
||||
index 67a00e9..968b944 100644
|
||||
--- a/plugins/FeedReader/FeedReader.pro
|
||||
+++ b/plugins/FeedReader/FeedReader.pro
|
||||
@@ -103,3 +103,10 @@ openbsd-* {
|
||||
LIBS += -lcurl -lxml2 -lxslt
|
||||
}
|
||||
|
||||
+haiku-* {
|
||||
+ LIBXML2_DIR = /system/develop/headers/x86/libxml2
|
||||
+
|
||||
+ INCLUDEPATH += $${LIBXML2_DIR}
|
||||
+
|
||||
+ LIBS += -lcurl -lxml2 -lxslt
|
||||
+}
|
||||
diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro
|
||||
index 2eece55..3006cde 100644
|
||||
--- a/retroshare-gui/src/retroshare-gui.pro
|
||||
+++ b/retroshare-gui/src/retroshare-gui.pro
|
||||
@@ -263,6 +263,24 @@ freebsd-* {
|
||||
LIBS += -lsqlite3
|
||||
}
|
||||
|
||||
+##################################### Haiku ######################################
|
||||
+
|
||||
+haiku-* {
|
||||
+ PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
|
||||
+ PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
|
||||
+
|
||||
+ LIBS *= ../../libretroshare/src/lib/libretroshare.a
|
||||
+ LIBS *= ../../openpgpsdk/src/lib/libops.a -lbz2 -lbsd
|
||||
+ LIBS *= -lssl -lcrypto -lnetwork
|
||||
+ LIBS *= -lgpgme
|
||||
+ LIBS *= -lupnp
|
||||
+ LIBS *= -lz
|
||||
+ LIBS *= -lixml
|
||||
+
|
||||
+ LIBS += ../../supportlibs/pegmarkdown/libpegmarkdown.a
|
||||
+ LIBS += -lsqlite3
|
||||
+}
|
||||
+
|
||||
##################################### OpenBSD ######################################
|
||||
|
||||
openbsd-* {
|
||||
diff --git a/retroshare-gui/src/util/global.h b/retroshare-gui/src/util/global.h
|
||||
index 8ff3671..891ff8b 100644
|
||||
--- a/retroshare-gui/src/util/global.h
|
||||
+++ b/retroshare-gui/src/util/global.h
|
||||
@@ -85,6 +85,8 @@
|
||||
#define OS_OPENBSD
|
||||
#elif defined(__GNU_HURD__)
|
||||
#define OS_HURD
|
||||
+#elif defined(__HAIKU__)
|
||||
+ #define OS_HAIKU
|
||||
#elif defined(WIN32_PLATFORM_PSPC)
|
||||
#define OS_WINCE_POCKETPC
|
||||
#elif defined(WIN32_PLATFORM_WFSP)
|
||||
@@ -101,7 +103,7 @@
|
||||
#define OS_BSD
|
||||
#endif
|
||||
|
||||
-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_HURD) || defined(OS_BSD)
|
||||
+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_HURD) || defined(OS_BSD) || defined(OS_HAIKU)
|
||||
#define OS_POSIX
|
||||
#endif
|
||||
|
||||
diff --git a/retroshare-nogui/src/retroshare-nogui.pro b/retroshare-nogui/src/retroshare-nogui.pro
|
||||
index 5bdc218..72f3a50 100644
|
||||
--- a/retroshare-nogui/src/retroshare-nogui.pro
|
||||
+++ b/retroshare-nogui/src/retroshare-nogui.pro
|
||||
@@ -177,6 +177,26 @@ openbsd-* {
|
||||
LIBS *= -rdynamic
|
||||
}
|
||||
|
||||
+##################################### Haiku ######################################
|
||||
+
|
||||
+haiku-* {
|
||||
+ QMAKE_CXXFLAGS *= -D_BSD_SOURCE
|
||||
+
|
||||
+ PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
|
||||
+ PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
|
||||
+
|
||||
+ LIBS *= ../../libretroshare/src/lib/libretroshare.a
|
||||
+ LIBS *= ../../openpgpsdk/src/lib/libops.a -lbz2 -lbsd
|
||||
+ LIBS *= -lssl -lcrypto -lnetwork
|
||||
+ LIBS *= -lgpgme
|
||||
+ LIBS *= -lupnp
|
||||
+ LIBS *= -lz
|
||||
+ LIBS *= -lixml
|
||||
+
|
||||
+ LIBS += ../../supportlibs/pegmarkdown/libpegmarkdown.a
|
||||
+ LIBS += -lsqlite3
|
||||
+
|
||||
+}
|
||||
|
||||
############################## Common stuff ######################################
|
||||
|
||||
--
|
||||
2.2.2
|
||||
|
||||
@@ -1,104 +0,0 @@
|
||||
SUMMARY="An open source application that offers secure chat and file sharing"
|
||||
DESCRIPTION="Retroshare creates encrypted connections to your friends. Nobody \
|
||||
can spy on you. Retroshare is completely decentralized. This means there are \
|
||||
no central servers. It is entirely Open-Source and free. There are no costs, \
|
||||
no ads and no Terms of Service."
|
||||
HOMEPAGE="http://retroshare.sourceforge.net/"
|
||||
COPYRIGHT="2006-2015, drbob"
|
||||
LICENSE="GNU GPL v2
|
||||
GNU LGPL v2.1"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/RetroShare/RetroShare/archive/v0.6.0-RC2-SVN.zip"
|
||||
CHECKSUM_SHA256="a5c75a274cd2f2028a2f96d3b0188fd9297505d4b47fb5e338bd6bada618baab"
|
||||
SOURCE_DIR="RetroShare-0.6.0-RC2-SVN"
|
||||
PATCHES="retroshare_x86-0.6.0.patchset"
|
||||
ADDITIONAL_FILES="retroshare.rdef"
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86 !x86_gcc2"
|
||||
|
||||
PROVIDES="
|
||||
retroshare$secondaryArchSuffix = $portVersion
|
||||
app:RetroShare = $portVersion
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
qt5base${secondaryArchSuffix}
|
||||
lib:libbz2$secondaryArchSuffix
|
||||
lib:libcrypto$secondaryArchSuffix
|
||||
lib:libcurl$secondaryArchSuffix
|
||||
lib:libgl$secondaryArchSuffix
|
||||
lib:libgpgme$secondaryArchSuffix
|
||||
lib:libmicrohttpd$secondaryArchSuffix
|
||||
# lib:linopencv$secondaryArchSuffix
|
||||
# lib:libspeex$secondaryArchSuffix
|
||||
# lib:libsqlcipher$secondaryArchSuffix
|
||||
lib:libsqlite3$secondaryArchSuffix
|
||||
lib:libssl$secondaryArchSuffix
|
||||
lib:libupnp$secondaryArchSuffix
|
||||
lib:libxml2$secondaryArchSuffix
|
||||
lib:libxslt$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
qt5base${secondaryArchSuffix}
|
||||
devel:libbz2$secondaryArchSuffix
|
||||
devel:libcrypto$secondaryArchSuffix
|
||||
devel:libcurl$secondaryArchSuffix
|
||||
devel:libgl$secondaryArchSuffix
|
||||
devel:libgpgme$secondaryArchSuffix
|
||||
devel:libmicrohttpd$secondaryArchSuffix
|
||||
# devel:linopencv$secondaryArchSuffix
|
||||
# devel:libspeex$secondaryArchSuffix
|
||||
# devel:libsqlcipher$secondaryArchSuffix
|
||||
devel:libsqlite3$secondaryArchSuffix
|
||||
devel:libssl$secondaryArchSuffix
|
||||
devel:libupnp$secondaryArchSuffix
|
||||
devel:libxml2$secondaryArchSuffix
|
||||
devel:libxslt$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:aclocal
|
||||
cmd:autoconf
|
||||
cmd:awk
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:make
|
||||
"
|
||||
|
||||
PATCH()
|
||||
{
|
||||
# disable VOIP plugin for now since we don't have opencv package yet
|
||||
sed -i 's/VOIP/#VOIP/g' plugins/plugins.pro
|
||||
}
|
||||
|
||||
BUILD()
|
||||
{
|
||||
# TODO: change path: /boot/home/.retroshare
|
||||
# TODO: for extra security use libsqlcipher instead of libsqlite3
|
||||
# FIXME: plugins don't seem to be looked up correctly
|
||||
|
||||
pushd supportlibs/pegmarkdown
|
||||
qmake
|
||||
make $jobArg
|
||||
popd
|
||||
|
||||
qmake CONFIG=release
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
mkdir -p $appsDir/RetroShare/plugins
|
||||
cp retroshare-gui/src/RetroShare $appsDir/RetroShare
|
||||
cp -r plugins/FeedReader/*.so* $appsDir/RetroShare/plugins
|
||||
# cp -r plugins/VOIP $appsDir/RetroShare/plugins
|
||||
strip -s $appsDir/RetroShare/RetroShare
|
||||
|
||||
addResourcesToBinaries $portDir/additional-files/retroshare.rdef \
|
||||
$appsDir/RetroShare/RetroShare
|
||||
addAppDeskbarSymlink $appsDir/RetroShare/RetroShare
|
||||
}
|
||||
196
net-p2p/retroshare/retroshare-0.6.4.recipe
Normal file
196
net-p2p/retroshare/retroshare-0.6.4.recipe
Normal file
@@ -0,0 +1,196 @@
|
||||
SUMMARY="An open source application that offers secure chat and file sharing"
|
||||
DESCRIPTION="Retroshare creates encrypted connections to your friends. Nobody \
|
||||
can spy on you. Retroshare is completely decentralized. This means there are \
|
||||
no central servers. It is entirely Open-Source and free. There are no costs, \
|
||||
no ads and no Terms of Service."
|
||||
HOMEPAGE="http://retroshare.sourceforge.net/"
|
||||
COPYRIGHT="2006-2014 RetroShare Team
|
||||
1989-1991 Free Software Foundation Inc.
|
||||
1995-1998 Eric Young
|
||||
1996-2001 Takuya OOURA
|
||||
1997, 2000, 2001, 2002, 2006 Benjamin Sittler
|
||||
2001-2004 Roger Dingledine
|
||||
2003 Justin Karneges
|
||||
2003 Kristen Wegner
|
||||
2004 Xavier Decoret
|
||||
2004-2005 John Gruber
|
||||
2004-2006 Robert Fernie.
|
||||
2004-2006 Roger Dingledine Nick Mathewson
|
||||
2004-2007 Kefei Zhou.
|
||||
2004-2007 Trolltech ASA.
|
||||
2004-2008 Cyril Soler
|
||||
2004-2009 Marcelo Roberto Jimenez
|
||||
2005 Thomas Bernard
|
||||
2005-2009 Nominet UK
|
||||
2005-2010 Thorvald Natvig
|
||||
2006 Christophe Dumez
|
||||
2006 Matt Edman Justin Hipple
|
||||
2006 Raul E.
|
||||
2006-2009 aMule Team
|
||||
2006-2010 Arseny Kapoulkine
|
||||
2006, 2007, 2008 crypton
|
||||
2007 2012 Ian Piumarta
|
||||
2007 Ariya Hidayat
|
||||
2007 Ian Piumarta
|
||||
2007 Ramiro Polla
|
||||
2007 Stefan Goessner
|
||||
2007-2011 drbob
|
||||
2007-2008 Christopher Evi-Parker Cyril Soler
|
||||
2007-2008 Cyril Soler
|
||||
2007-2008 Horatio
|
||||
2007-2008 Kashif Kaleem
|
||||
2007-2008 Robert Fernie Horatio Chris Parker
|
||||
2007-2014 Thunder
|
||||
2007-2008 Vinny Do Chris Evi-Parker
|
||||
2007-2008 Xesc & Technology
|
||||
2007-2010 Robert Fernie
|
||||
2007-2010 The Tor Project Inc.
|
||||
2007-2010 Xesc & Technology
|
||||
2007-2011 Robert Fernie
|
||||
2008 Ariya Hidayat
|
||||
2008 Cyril Soler
|
||||
2008 defnax
|
||||
2008 djhasis
|
||||
2008 edmanm
|
||||
2008 Matt Edman Justin Hipple
|
||||
2008 Timo Bingmann
|
||||
2008 Unipro Russia
|
||||
2008-2008 Robert Fernie.
|
||||
2008-2009 Golnaz Nilieh
|
||||
2008-2009 John MacFarlane
|
||||
2008-2009 Mehrdad Momeny
|
||||
2008-2009 Raghu Dev R.
|
||||
2009 defnax
|
||||
2009 lsn752
|
||||
2009 Nokia Corporation andor its subsidiary(-ies).
|
||||
2010 csoler
|
||||
2010 Peter Zotov
|
||||
2010 Thomas Kister
|
||||
2011 csoler
|
||||
2012 Romain Pokrzywka (KDAB)
|
||||
2013 Digia Plc andor its subsidiary(-ies).
|
||||
2013 Jeff Weinstein
|
||||
2013-2014 Colin Duquesnoy
|
||||
2014 John Brooks
|
||||
2015 electron128
|
||||
2016 defnax
|
||||
2016 John Brooks
|
||||
2016 Manu Pineda
|
||||
2016 Mr.Alice
|
||||
2016-2018 Gioacchino Mazzurco
|
||||
2017 Konrad Dębiec"
|
||||
LICENSE="GNU GPL v2
|
||||
GNU LGPL v2.1"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/RetroShare/RetroShare/archive/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="84355c0f3be5ec1dfa7253e327ea1254f76f47739c233cfb8d0983ebd1a61f4a"
|
||||
SOURCE_DIR="RetroShare-$portVersion"
|
||||
PATCHES="retroshare-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="retroshare.rdef"
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
retroshare$secondaryArchSuffix = $portVersion
|
||||
app:RetroShare = $portVersion
|
||||
cmd:retroshare_nogui = $portVersion
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libbz2$secondaryArchSuffix
|
||||
lib:libcrypto$secondaryArchSuffix
|
||||
lib:libcurl$secondaryArchSuffix
|
||||
lib:libgl$secondaryArchSuffix
|
||||
lib:libgpgme$secondaryArchSuffix
|
||||
lib:libixml$secondaryArchSuffix
|
||||
lib:libmicrohttpd$secondaryArchSuffix
|
||||
lib:libQt5Core$secondaryArchSuffix
|
||||
lib:libQt5Gui$secondaryArchSuffix
|
||||
lib:libQt5Multimedia$secondaryArchSuffix
|
||||
lib:libQt5Network$secondaryArchSuffix
|
||||
lib:libQt5PrintSupport$secondaryArchSuffix
|
||||
lib:libQt5Widgets$secondaryArchSuffix
|
||||
lib:libQt5Xml$secondaryArchSuffix
|
||||
# lib:libsqlcipher$secondaryArchSuffix
|
||||
lib:libsqlite3$secondaryArchSuffix
|
||||
lib:libssl$secondaryArchSuffix
|
||||
lib:libupnp$secondaryArchSuffix
|
||||
lib:libxml2$secondaryArchSuffix
|
||||
lib:libxslt$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libavcodec$secondaryArchSuffix
|
||||
devel:libavformat$secondaryArchSuffix
|
||||
devel:libavutil$secondaryArchSuffix
|
||||
devel:libbz2$secondaryArchSuffix
|
||||
devel:libcrypto$secondaryArchSuffix
|
||||
devel:libcurl$secondaryArchSuffix
|
||||
devel:libgl$secondaryArchSuffix
|
||||
devel:libgpgme$secondaryArchSuffix
|
||||
devel:libixml$secondaryArchSuffix
|
||||
devel:libmicrohttpd$secondaryArchSuffix
|
||||
devel:libopencv_core$secondaryArchSuffix
|
||||
devel:libQt5Core$secondaryArchSuffix
|
||||
devel:libQt5Gui$secondaryArchSuffix
|
||||
devel:libQt5Multimedia$secondaryArchSuffix
|
||||
devel:libQt5Network$secondaryArchSuffix
|
||||
devel:libQt5PrintSupport$secondaryArchSuffix
|
||||
devel:libQt5Widgets$secondaryArchSuffix
|
||||
devel:libQt5Xml$secondaryArchSuffix
|
||||
devel:libspeex$secondaryArchSuffix
|
||||
devel:libspeexdsp$secondaryArchSuffix
|
||||
# devel:libsqlcipher$secondaryArchSuffix
|
||||
devel:libsqlite3$secondaryArchSuffix
|
||||
devel:libssl$secondaryArchSuffix
|
||||
devel:libupnp$secondaryArchSuffix
|
||||
devel:libxml2$secondaryArchSuffix
|
||||
devel:libxslt$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:awk
|
||||
cmd:cmake
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
"
|
||||
|
||||
defineDebugInfoPackage retroshare$secondaryArchSuffix \
|
||||
$appsDir/RetroShare/RetroShare \
|
||||
$binDir/retroshare-nogui
|
||||
|
||||
BUILD()
|
||||
{
|
||||
echo "Building pegmarkdown..."
|
||||
cd supportlibs/pegmarkdown && qmake && make clean && make $jobArgs && cd ../..
|
||||
echo "Building FeedReader plugin..."
|
||||
cd plugins/FeedReader && qmake && make clean && make $jobArgs && cd ../..
|
||||
echo "Building VOIP plugin..."
|
||||
cd plugins/VOIP && qmake && make clean && make $jobArgs && cd ../..
|
||||
|
||||
echo "Building RetroShare..."
|
||||
qmake \
|
||||
PREFIX=$appsDir/Retroshare \
|
||||
LIB_DIR=$libDir
|
||||
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
mkdir -p $appsDir/RetroShare/plugins $binDir
|
||||
cp retroshare-gui/src/retroshare $appsDir/RetroShare/RetroShare
|
||||
cp retroshare-nogui/src/retroshare-nogui $binDir/retroshare-nogui
|
||||
|
||||
cp -r plugins/FeedReader/*.so* $appsDir/RetroShare/plugins
|
||||
cp -r plugins/VOIP/*.so* $appsDir/RetroShare/plugins
|
||||
|
||||
addResourcesToBinaries $portDir/additional-files/retroshare.rdef \
|
||||
$appsDir/RetroShare/RetroShare
|
||||
addAppDeskbarSymlink $appsDir/RetroShare/RetroShare
|
||||
}
|
||||
Reference in New Issue
Block a user