net-p2p/retroshare: drop old versions

Package-Manager: Portage-2.3.6, Repoman-2.3.1
This commit is contained in:
Sergey Popov
2017-06-13 19:02:51 +03:00
parent 6b17795f59
commit 1f261c76dd
4 changed files with 0 additions and 488 deletions

View File

@@ -1,4 +1,2 @@
DIST retroshare-0.6.0.tar.gz 17436205 SHA256 50b9157bbe407aaefcbf9af1f29392e63148dc060bf78a3b200c9bc09998cf7c SHA512 794dacf1205a3c54973a7e34b6bd59fe88e9820677df182aaea37cfa90b90f548cd762b1243c25138f1b08ce67adf730c2f7b1cbfb1d97185eacabfd60f82374 WHIRLPOOL ef9b2222f84b4ecd4ef1f515b4cdce8362cb56f77e4d223ba1960d5131a1bed1bae816f4715a28f1b8ed36a969c89aad86ae32d95234bf54ad46b40b4e568902
DIST retroshare-0.6.1.tar.gz 18002032 SHA256 4ffbb6c61538f80d0f667c2a155c5eac38b0722a3e8d4f1dc1487d10087cfe42 SHA512 911c57a8c4bb8963043988e4aef626b3b411f74f3258a938fe893b96e43aedaf880dc7de1a5efda4a447e4857075ba10f5030f7d83f63b62fed1b1fddcfdfe80 WHIRLPOOL 000737cfa3e7568a5984d9a3bbde9d772b965c1be183e9d510e9114f3212e0499c8383ee1cc040b4ccf2e33d28b2b06ac63f7851a38c7447b6d97f5cec81649f
DIST retroshare-0.6.2.tar.gz 18523943 SHA256 76a3ae2f2089b14562d5be34602f5ae3c73a8549aecee246ea5e67d03018de2b SHA512 7b935321f436d72948c5c0286ef5e0236bd52d1b25f00980a3b3644ae4acbde043063279f90f6bc0356363bceda484aba57e160f34f013dde120b4f6969ef6c7 WHIRLPOOL 054f5ec8dbf70c89dabaccb50265bbf2a97fe1b2eab6c6a13d0b86f0dd1d4e4097e4eacf163fa75f4cd1225307e4c2d214dddb364de7a29b809c1dc0f767c32e
DIST retroshare_0.5.5-0.7068.tar.gz 11899395 SHA256 772b0d7916137e81fc0f5ea14f0a8fa70d3d7acb701ca0b0c1c66018f2255650 SHA512 51caeca54c6b6ce6ec049d3004301a74db5bb5dc2390c769486429ca0db4e45e2d8eba98c3f9ea99628c1a2452d71c8460ea4d3b3c103e321d3459211767bc1d WHIRLPOOL f6c8a7323be84d79975e970629f5bd457487cac6a061bc6817da328ff1de03a8d3fab98ab3cf4fba0628f239e09d8f8da4c14587764689a23193bbda22419e88

View File

@@ -1,145 +0,0 @@
commit aca88308eae16ab67627593c0df2fce7beb02e89
Author: zeners <zener@sbg.at>
Date: Tue Mar 29 21:22:14 2016 +0200
compatible to g++11 / QT5
method suggested by cyril
diff --git a/libretroshare/src/pqi/pqiqosstreamer.cc b/libretroshare/src/pqi/pqiqosstreamer.cc
index 898f2b5..fc0dc20 100644
--- a/libretroshare/src/pqi/pqiqosstreamer.cc
+++ b/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
--- a/libretroshare/src/pqi/pqiqosstreamer.h
+++ b/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
--- a/libretroshare/src/retroshare/rsreputations.h
+++ b/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
--- a/libretroshare/src/rsserver/p3face-server.cc
+++ b/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
--- a/libretroshare/src/rsserver/p3face.h
+++ b/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
--- a/libretroshare/src/services/p3gxsreputation.cc
+++ b/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
--- a/retroshare-gui/src/gui/elastic/node.cpp
+++ b/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
--- a/retroshare-gui/src/gui/elastic/node.h
+++ b/retroshare-gui/src/gui/elastic/node.h
@@ -118,10 +118,10 @@ private:
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
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
+++ b/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);

View File

@@ -1,172 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit eutils gnome2-utils qmake-utils versionator
DESCRIPTION="P2P private sharing application"
HOMEPAGE="http://retroshare.sourceforge.net"
SRC_URI="https://github.com/RetroShare/RetroShare/archive/v${PV}.tar.gz -> ${P}.tar.gz"
# pegmarkdown can also be used with MIT
LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="cli feedreader qt4 +qt5 voip"
REQUIRED_USE="^^ ( qt4 qt5 )
|| ( cli qt4 qt5 )
feedreader? ( || ( qt4 qt5 ) )
voip? ( || ( qt4 qt5 ) )"
RDEPEND="
app-arch/bzip2
dev-db/sqlcipher
dev-libs/openssl:0
gnome-base/libgnome-keyring
net-libs/libmicrohttpd
net-libs/libupnp:0
sys-libs/zlib
cli? (
dev-libs/protobuf
net-libs/libssh[server]
)
feedreader? (
dev-libs/libxml2
dev-libs/libxslt
net-misc/curl
)
qt4? (
x11-libs/libX11
x11-libs/libXScrnSaver
dev-qt/designer:4
dev-qt/qtcore:4
dev-qt/qtgui:4
)
qt5? (
x11-libs/libX11
x11-libs/libXScrnSaver
dev-qt/designer:5
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtmultimedia:5
dev-qt/qtnetwork:5
dev-qt/qtprintsupport:5
dev-qt/qtscript:5
dev-qt/qtwidgets:5
dev-qt/qtx11extras:5
dev-qt/qtxml:5
)
voip? (
qt5? (
<media-libs/opencv-3.0.0[-qt4]
)
qt4? (
<media-libs/opencv-3.0.0
dev-qt/qtmultimedia:4
dev-qt/qt-mobility[multimedia]
)
media-libs/speex
virtual/ffmpeg[encode]
)"
DEPEND="${RDEPEND}
qt4? ( dev-qt/qtcore:4 )
qt5? ( dev-qt/qtcore:5 )
virtual/pkgconfig"
S="${WORKDIR}/RetroShare-${PV}"
PATCHES=( "${FILESDIR}/${P}-c11-compat.patch" )
src_prepare() {
local dir
sed -i \
-e "s|/usr/lib/retroshare/extensions6/|/usr/$(get_libdir)/${PN}/extensions6/|" \
libretroshare/src/rsserver/rsinit.cc \
|| die "sed on libretroshare/src/rsserver/rsinit.cc failed"
rs_src_dirs="libbitdht/src openpgpsdk/src libresapi/src libretroshare/src supportlibs/pegmarkdown"
use cli && rs_src_dirs="${rs_src_dirs} retroshare-nogui/src"
use feedreader && rs_src_dirs="${rs_src_dirs} plugins/FeedReader"
use qt4 && rs_src_dirs="${rs_src_dirs} retroshare-gui/src"
use qt5 && rs_src_dirs="${rs_src_dirs} retroshare-gui/src"
use voip && rs_src_dirs="${rs_src_dirs} plugins/VOIP"
# Force linking to sqlcipher ONLY
sed -i \
-e '/isEmpty(SQLCIPHER_OK) {/aerror(libsqlcipher not found)' \
retroshare-gui/src/retroshare-gui.pro \
retroshare-nogui/src/retroshare-nogui.pro || die 'sed on retroshare-gui/src/retroshare-gui.pro failed'
epatch "${PATCHES[@]}"
eapply_user
}
src_configure() {
for dir in ${rs_src_dirs} ; do
pushd "${S}/${dir}" 2>/dev/null || die
use qt4 && eqmake4
use qt5 && eqmake5
popd 2>/dev/null || die
done
}
src_compile() {
local dir
for dir in ${rs_src_dirs} ; do
emake -C "${dir}"
done
unset rs_src_dirs
}
src_install() {
local i
local extension_dir="/usr/$(get_libdir)/${PN}/extensions6/"
use cli && dobin retroshare-nogui/src/RetroShare06-nogui
use qt4 && dobin retroshare-gui/src/RetroShare06
use qt5 && dobin retroshare-gui/src/RetroShare06
exeinto "${extension_dir}"
use feedreader && doexe plugins/FeedReader/*.so*
use voip && doexe plugins/VOIP/*.so*
insinto /usr/share/RetroShare06
doins libbitdht/src/bitdht/bdboot.txt
insinto /usr/share/RetroShare06/webui
doins libresapi/src/webfiles/*
dodoc README.md
make_desktop_entry RetroShare06
for i in 24 48 64 128 ; do
doicon -s ${i} "data/${i}x${i}/apps/retroshare06.png"
done
}
pkg_preinst() {
local ver
for ver in ${REPLACING_VERSIONS}; do
if ! version_is_at_least 0.5.9999 ${ver}; then
elog "You are upgrading from Retroshare 0.5.* to ${PV}"
elog "Version 0.6.* is backward-incompatible with 0.5 branch"
elog "and clients with 0.6.* can not connect to clients that have 0.5.*"
elog "It's recommended to drop all your configuration and either"
elog "generate a new certificate or import existing from a backup"
break
fi
done
gnome2_icon_savelist
}
pkg_postinst() {
gnome2_icon_cache_update
}
pkg_postrm() {
gnome2_icon_cache_update
}

View File

@@ -1,169 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit eutils gnome2-utils qmake-utils versionator
DESCRIPTION="P2P private sharing application"
HOMEPAGE="http://retroshare.net"
SRC_URI="https://github.com/RetroShare/RetroShare/archive/${PV}.tar.gz -> ${P}.tar.gz"
# pegmarkdown can also be used with MIT
LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="cli feedreader +gui qt4 +qt5 voip"
REQUIRED_USE="
|| ( cli gui )
gui? ( ^^ ( qt4 qt5 ) )
cli? ( ^^ ( qt4 qt5 ) )
feedreader? ( gui )
voip? ( gui )"
RDEPEND="
app-arch/bzip2
dev-db/sqlcipher
dev-libs/openssl:0
gnome-base/libgnome-keyring
net-libs/libmicrohttpd
net-libs/libupnp:0
sys-libs/zlib
feedreader? (
dev-libs/libxml2
dev-libs/libxslt
net-misc/curl
)
qt4? (
gui? (
dev-qt/designer:4
dev-qt/qtgui:4
x11-libs/libX11
x11-libs/libXScrnSaver
)
dev-qt/qtcore:4
)
qt5? (
gui? (
dev-qt/designer:5
dev-qt/qtwidgets:5
x11-libs/libX11
x11-libs/libXScrnSaver
)
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtmultimedia:5
dev-qt/qtnetwork:5
dev-qt/qtprintsupport:5
dev-qt/qtscript:5
dev-qt/qtx11extras:5
dev-qt/qtxml:5
)
voip? (
qt5? (
media-libs/opencv[-qt4(-)]
)
qt4? (
media-libs/opencv
dev-qt/qt-mobility[multimedia]
)
media-libs/speex
virtual/ffmpeg[encode]
)"
DEPEND="${RDEPEND}
virtual/pkgconfig
"
S="${WORKDIR}/RetroShare-${PV}"
src_prepare() {
local dir
sed -i \
-e "s|/usr/lib/retroshare/extensions6/|/usr/$(get_libdir)/${PN}/extensions6/|" \
libretroshare/src/rsserver/rsinit.cc \
|| die "sed on libretroshare/src/rsserver/rsinit.cc failed"
rs_src_dirs="libbitdht/src openpgpsdk/src libresapi/src libretroshare/src supportlibs/pegmarkdown"
use cli && rs_src_dirs="${rs_src_dirs} retroshare-nogui/src"
use feedreader && rs_src_dirs="${rs_src_dirs} plugins/FeedReader"
use gui && rs_src_dirs="${rs_src_dirs} retroshare-gui/src"
use voip && rs_src_dirs="${rs_src_dirs} plugins/VOIP"
# Force linking to sqlcipher ONLY
sed -i \
-e '/isEmpty(SQLCIPHER_OK) {/aerror(libsqlcipher not found)' \
retroshare-gui/src/retroshare-gui.pro \
retroshare-nogui/src/retroshare-nogui.pro || die 'sed on retroshare-gui/src/retroshare-gui.pro failed'
# Avoid openpgpsdk false dependency on qtgui
sed -i '2iQT -= gui' openpgpsdk/src/openpgpsdk.pro
eapply_user
}
src_configure() {
for dir in ${rs_src_dirs} ; do
pushd "${S}/${dir}" >/dev/null || die
use qt4 && eqmake4
use qt5 && eqmake5
popd >/dev/null || die
done
}
src_compile() {
local dir
for dir in ${rs_src_dirs} ; do
emake -C "${dir}"
done
unset rs_src_dirs
}
src_install() {
local i
local extension_dir="/usr/$(get_libdir)/${PN}/extensions6/"
use cli && dobin retroshare-nogui/src/RetroShare06-nogui
use gui && dobin retroshare-gui/src/RetroShare06
exeinto "${extension_dir}"
use feedreader && doexe plugins/FeedReader/*.so*
use voip && doexe plugins/VOIP/*.so*
insinto /usr/share/RetroShare06
doins libbitdht/src/bitdht/bdboot.txt
doins -r libresapi/src/webui
dodoc README.md
make_desktop_entry RetroShare06
for i in 24 48 64 128 ; do
doicon -s ${i} "data/${i}x${i}/apps/retroshare06.png"
done
}
pkg_preinst() {
local ver
for ver in ${REPLACING_VERSIONS}; do
if ! version_is_at_least 0.5.9999 ${ver}; then
elog "You are upgrading from Retroshare 0.5.* to ${PV}"
elog "Version 0.6.* is backward-incompatible with 0.5 branch"
elog "and clients with 0.6.* can not connect to clients that have 0.5.*"
elog "It's recommended to drop all your configuration and either"
elog "generate a new certificate or import existing from a backup"
break
fi
done
gnome2_icon_savelist
}
pkg_postinst() {
gnome2_icon_cache_update
}
pkg_postrm() {
gnome2_icon_cache_update
}