retroshare: update to 0.6.1 and unbreak
This commit is contained in:
Alessio Sergi
parent
188c096dea
commit
c28e4a7b92
|
|
@ -1,155 +0,0 @@
|
|||
From aca88308eae16ab67627593c0df2fce7beb02e89 Mon Sep 17 00:00:00 2001
|
||||
From: zeners <zener@sbg.at>
|
||||
Date: Tue, 29 Mar 2016 21:22:14 +0200
|
||||
Subject: [PATCH] compatible to g++11 / QT5
|
||||
|
||||
method suggested by cyril
|
||||
---
|
||||
libretroshare/src/pqi/pqiqosstreamer.cc | 2 ++
|
||||
libretroshare/src/pqi/pqiqosstreamer.h | 2 +-
|
||||
libretroshare/src/retroshare/rsreputations.h | 4 ++--
|
||||
libretroshare/src/rsserver/p3face-server.cc | 4 ++++
|
||||
libretroshare/src/rsserver/p3face.h | 6 +++---
|
||||
libretroshare/src/services/p3gxsreputation.cc | 4 ++++
|
||||
retroshare-gui/src/gui/elastic/node.cpp | 6 ++++++
|
||||
retroshare-gui/src/gui/elastic/node.h | 8 ++++----
|
||||
retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp | 2 +-
|
||||
9 files changed, 27 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/libretroshare/src/pqi/pqiqosstreamer.cc b/libretroshare/src/pqi/pqiqosstreamer.cc
|
||||
index 898f2b5..fc0dc20 100644
|
||||
--- libretroshare/src/pqi/pqiqosstreamer.cc
|
||||
+++ libretroshare/src/pqi/pqiqosstreamer.cc
|
||||
@@ -25,6 +25,8 @@
|
||||
|
||||
#include "pqiqosstreamer.h"
|
||||
|
||||
+const float pqiQoSstreamer::PQI_QOS_STREAMER_ALPHA = 2.0f ;
|
||||
+
|
||||
pqiQoSstreamer::pqiQoSstreamer(PQInterface *parent, RsSerialiser *rss, const RsPeerId& peerid, BinInterface *bio_in, int bio_flagsin)
|
||||
: pqithreadstreamer(parent,rss,peerid,bio_in,bio_flagsin), pqiQoS(PQI_QOS_STREAMER_MAX_LEVELS, PQI_QOS_STREAMER_ALPHA)
|
||||
{
|
||||
diff --git a/libretroshare/src/pqi/pqiqosstreamer.h b/libretroshare/src/pqi/pqiqosstreamer.h
|
||||
index b85ac32..574ba94 100644
|
||||
--- libretroshare/src/pqi/pqiqosstreamer.h
|
||||
+++ libretroshare/src/pqi/pqiqosstreamer.h
|
||||
@@ -34,7 +34,7 @@ class pqiQoSstreamer: public pqithreadstreamer, public pqiQoS
|
||||
pqiQoSstreamer(PQInterface *parent, RsSerialiser *rss, const RsPeerId& peerid, BinInterface *bio_in, int bio_flagsin);
|
||||
|
||||
static const uint32_t PQI_QOS_STREAMER_MAX_LEVELS = 10 ;
|
||||
- static const float PQI_QOS_STREAMER_ALPHA = 2.0 ;
|
||||
+ static const float PQI_QOS_STREAMER_ALPHA ;
|
||||
|
||||
virtual void locked_storeInOutputQueue(void *ptr,int priority) ;
|
||||
virtual int locked_out_queue_size() const { return _total_item_count ; }
|
||||
diff --git a/libretroshare/src/retroshare/rsreputations.h b/libretroshare/src/retroshare/rsreputations.h
|
||||
index 484aabb..8db42ee 100644
|
||||
--- libretroshare/src/retroshare/rsreputations.h
|
||||
+++ libretroshare/src/retroshare/rsreputations.h
|
||||
@@ -31,8 +31,8 @@
|
||||
class RsReputations
|
||||
{
|
||||
public:
|
||||
- static const float REPUTATION_THRESHOLD_ANTI_SPAM = 1.4f ;
|
||||
- static const float REPUTATION_THRESHOLD_DEFAULT = 1.0f ;
|
||||
+ static const float REPUTATION_THRESHOLD_ANTI_SPAM;
|
||||
+ static const float REPUTATION_THRESHOLD_DEFAULT;
|
||||
|
||||
// This is the interface file for the reputation system
|
||||
//
|
||||
diff --git a/libretroshare/src/rsserver/p3face-server.cc b/libretroshare/src/rsserver/p3face-server.cc
|
||||
index 746ebac..b769136 100644
|
||||
--- libretroshare/src/rsserver/p3face-server.cc
|
||||
+++ libretroshare/src/rsserver/p3face-server.cc
|
||||
@@ -69,6 +69,10 @@ static double getCurrentTS()
|
||||
return cts;
|
||||
}
|
||||
|
||||
+const double RsServer::minTimeDelta = 0.1; // 25;
|
||||
+const double RsServer::maxTimeDelta = 0.5;
|
||||
+const double RsServer::kickLimit = 0.15;
|
||||
+
|
||||
|
||||
RsServer::RsServer()
|
||||
: coreMutex("RsServer")
|
||||
diff --git a/libretroshare/src/rsserver/p3face.h b/libretroshare/src/rsserver/p3face.h
|
||||
index 23efa58..51f05a5 100644
|
||||
--- libretroshare/src/rsserver/p3face.h
|
||||
+++ libretroshare/src/rsserver/p3face.h
|
||||
@@ -194,9 +194,9 @@ class RsServer: public RsControl, public RsTickingThread
|
||||
double mAvgTickRate ;
|
||||
double mTimeDelta ;
|
||||
|
||||
- static const double minTimeDelta = 0.1; // 25;
|
||||
- static const double maxTimeDelta = 0.5;
|
||||
- static const double kickLimit = 0.15;
|
||||
+ static const double minTimeDelta; // 25;
|
||||
+ static const double maxTimeDelta;
|
||||
+ static const double kickLimit;
|
||||
};
|
||||
|
||||
/* Helper function to convert windows paths
|
||||
diff --git a/libretroshare/src/services/p3gxsreputation.cc b/libretroshare/src/services/p3gxsreputation.cc
|
||||
index dd7a46d..b78ca1f 100644
|
||||
--- libretroshare/src/services/p3gxsreputation.cc
|
||||
+++ libretroshare/src/services/p3gxsreputation.cc
|
||||
@@ -303,6 +303,10 @@ void p3GxsReputation::updateActiveFriends()
|
||||
|
||||
}
|
||||
|
||||
+const float RsReputations::REPUTATION_THRESHOLD_ANTI_SPAM = 1.4f ;
|
||||
+const float RsReputations::REPUTATION_THRESHOLD_DEFAULT = 1.0f ;
|
||||
+
|
||||
+
|
||||
static RsReputations::Opinion safe_convert_uint32t_to_opinion(uint32_t op)
|
||||
{
|
||||
return RsReputations::Opinion(std::min((uint32_t)op,UPPER_LIMIT)) ;
|
||||
diff --git a/retroshare-gui/src/gui/elastic/node.cpp b/retroshare-gui/src/gui/elastic/node.cpp
|
||||
index 7755172..bc33151 100644
|
||||
--- retroshare-gui/src/gui/elastic/node.cpp
|
||||
+++ retroshare-gui/src/gui/elastic/node.cpp
|
||||
@@ -87,6 +87,12 @@ Node::Node(const std::string& node_string,GraphWidget::NodeType type,GraphWidget
|
||||
_auth = GraphWidget::ELASTIC_NODE_AUTH_FULL ;
|
||||
}
|
||||
|
||||
+const float Node::MASS_FACTOR = 10 ;
|
||||
+const float Node::FRICTION_FACTOR = 10.8f ;
|
||||
+const float Node::REPULSION_FACTOR = 4;
|
||||
+const float Node::NODE_DISTANCE = 130.0f ;
|
||||
+
|
||||
+
|
||||
void Node::addEdge(Edge *edge)
|
||||
{
|
||||
edgeList << edge;
|
||||
diff --git a/retroshare-gui/src/gui/elastic/node.h b/retroshare-gui/src/gui/elastic/node.h
|
||||
index d7bcd5f..13c717b 100644
|
||||
--- retroshare-gui/src/gui/elastic/node.h
|
||||
+++ retroshare-gui/src/gui/elastic/node.h
|
||||
@@ -118,10 +118,10 @@ class Node : public QObject, public QGraphicsItem
|
||||
RsPeerId _ssl_id ;
|
||||
RsPgpId _gpg_id ;
|
||||
|
||||
- static const float MASS_FACTOR = 10 ;
|
||||
- static const float FRICTION_FACTOR = 10.8 ;
|
||||
- static const float REPULSION_FACTOR = 4 ;
|
||||
- static const float NODE_DISTANCE = 130.0 ;
|
||||
+ static const float MASS_FACTOR;
|
||||
+ static const float FRICTION_FACTOR;
|
||||
+ static const float REPULSION_FACTOR;
|
||||
+ static const float NODE_DISTANCE;
|
||||
};
|
||||
|
||||
#endif
|
||||
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
|
||||
index fe2e1aa..a3381b2 100644
|
||||
--- retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
|
||||
+++ retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
|
||||
@@ -1565,7 +1565,7 @@ void GxsForumThreadWidget::setMsgReadStatus(QList<QTreeWidgetItem*> &rows, bool
|
||||
// LIKE THIS BELOW...
|
||||
//std::string grpId = (*Row)->data(COLUMN_THREAD_DATA, ROLE_THREAD_GROUPID).toString().toStdString();
|
||||
|
||||
- RsGxsGrpMsgIdPair msgPair = std::make_pair(groupId(), msgId);
|
||||
+ RsGxsGrpMsgIdPair msgPair = std::make_pair(groupId(), RsGxsMessageId(msgId));
|
||||
|
||||
uint32_t token;
|
||||
rsGxsForums->setMessageReadStatus(token, msgPair, read);
|
||||
|
|
@ -1,11 +1,27 @@
|
|||
--- libretroshare/src/util/stacktrace.h.orig 2016-07-22 09:56:51.752455389 +0200
|
||||
+++ libretroshare/src/util/stacktrace.h 2016-07-22 09:57:55.192242561 +0200
|
||||
--- libretroshare/src/util/stacktrace.h.orig
|
||||
+++ libretroshare/src/util/stacktrace.h
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
-#ifndef WINDOWS_SYS
|
||||
-#if !defined(WINDOWS_SYS) && !defined(__ANDROID__)
|
||||
+#if defined(__linux__) && defined(__GLIBC__)
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <execinfo.h>
|
||||
@@ -110,13 +110,13 @@ static inline void print_stacktrace(FILE *out = stderr, unsigned int max_frames
|
||||
free(symbollist);
|
||||
}
|
||||
|
||||
-#else // !defined(WINDOWS_SYS) && !defined(__ANDROID__)
|
||||
+#else // defined(__linux__) && defined(__GLIBC__)
|
||||
static inline void print_stacktrace(FILE *out = stderr, unsigned int max_frames = 63)
|
||||
{
|
||||
(void) max_frames;
|
||||
|
||||
fprintf(out, "TODO: 2016/01/01 print_stacktrace not implemented yet for WINDOWS_SYS and ANDROID\n");
|
||||
}
|
||||
-#endif // !defined(WINDOWS_SYS) && !defined(__ANDROID__)
|
||||
+#endif // defined(__linux__) && defined(__GLIBC__)
|
||||
|
||||
#endif // _STACKTRACE_H_
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
broken=https://build.voidlinux.eu/builders/i686_builder/builds/26177/steps/shell_3/logs/stdio
|
||||
# Template file for 'retroshare'
|
||||
pkgname=retroshare
|
||||
version=0.6.0
|
||||
revision=3
|
||||
version=0.6.1
|
||||
revision=1
|
||||
build_style=qmake
|
||||
wrksrc="RetroShare-${version}"
|
||||
homepage="http://retroshare.github.io"
|
||||
|
|
@ -15,4 +14,4 @@ makedepends="qt5-tools-devel qt5-multimedia-devel qt5-x11extras-devel
|
|||
libupnp-devel libgnome-keyring-devel libmicrohttpd-devel sqlcipher-devel
|
||||
libXScrnSaver-devel libxslt-devel libcurl-devel ffmpeg-devel speex-devel"
|
||||
distfiles="https://github.com/RetroShare/RetroShare/archive/v${version}.tar.gz"
|
||||
checksum=50b9157bbe407aaefcbf9af1f29392e63148dc060bf78a3b200c9bc09998cf7c
|
||||
checksum=4ffbb6c61538f80d0f667c2a155c5eac38b0722a3e8d4f1dc1487d10087cfe42
|
||||
|
|
|
|||
Loading…
Reference in New Issue