From 05f89b7f0bae5598e345f52ea1c07e393d6d6a62 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 22 Jul 2016 10:31:27 +0200 Subject: [PATCH] retroshare: update to 0.6.0. --- srcpkgs/retroshare/files/retroshare.desktop | 11 -- ...8308eae16ab67627593c0df2fce7beb02e89.patch | 155 ++++++++++++++++++ srcpkgs/retroshare/patches/musl.patch | 11 ++ .../patches/retroshare06-libupnp.patch | 12 -- .../patches/retroshare06-novoip.patch | 9 - srcpkgs/retroshare/template | 34 ++-- 6 files changed, 178 insertions(+), 54 deletions(-) delete mode 100644 srcpkgs/retroshare/files/retroshare.desktop create mode 100644 srcpkgs/retroshare/patches/aca88308eae16ab67627593c0df2fce7beb02e89.patch create mode 100644 srcpkgs/retroshare/patches/musl.patch delete mode 100644 srcpkgs/retroshare/patches/retroshare06-libupnp.patch delete mode 100644 srcpkgs/retroshare/patches/retroshare06-novoip.patch diff --git a/srcpkgs/retroshare/files/retroshare.desktop b/srcpkgs/retroshare/files/retroshare.desktop deleted file mode 100644 index 39b465db855..00000000000 --- a/srcpkgs/retroshare/files/retroshare.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Name=RetroShare -Comment=Securely share files with your friends -Exec=/usr/bin/retroshare -Icon=/usr/share/pixmaps/retroshare.png -Terminal=false -Type=Application -Categories=Application;Network; - diff --git a/srcpkgs/retroshare/patches/aca88308eae16ab67627593c0df2fce7beb02e89.patch b/srcpkgs/retroshare/patches/aca88308eae16ab67627593c0df2fce7beb02e89.patch new file mode 100644 index 00000000000..ebfb8d145e6 --- /dev/null +++ b/srcpkgs/retroshare/patches/aca88308eae16ab67627593c0df2fce7beb02e89.patch @@ -0,0 +1,155 @@ +From aca88308eae16ab67627593c0df2fce7beb02e89 Mon Sep 17 00:00:00 2001 +From: zeners +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 &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); diff --git a/srcpkgs/retroshare/patches/musl.patch b/srcpkgs/retroshare/patches/musl.patch new file mode 100644 index 00000000000..3d55aa01520 --- /dev/null +++ b/srcpkgs/retroshare/patches/musl.patch @@ -0,0 +1,11 @@ +--- 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 +@@ -25,7 +25,7 @@ + + #include + +-#ifndef WINDOWS_SYS ++#if defined(__linux__) && defined(__GLIBC__) + + #include + #include diff --git a/srcpkgs/retroshare/patches/retroshare06-libupnp.patch b/srcpkgs/retroshare/patches/retroshare06-libupnp.patch deleted file mode 100644 index 75f0efaec41..00000000000 --- a/srcpkgs/retroshare/patches/retroshare06-libupnp.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru retroshare06-0.6.0.orig/src/libretroshare/src/libretroshare.pro retroshare06-0.6.0/src/libretroshare/src/libretroshare.pro ---- retroshare06-0.6.0.orig/src/libretroshare/src/libretroshare.pro 2015-12-29 12:44:59.441793222 +0100 -+++ retroshare06-0.6.0/src/libretroshare/src/libretroshare.pro 2015-12-29 12:45:27.413886403 +0100 -@@ -173,7 +173,7 @@ - # Normal libupnp - } else { - # Patched libupnp or new unreleased version -- DEFINES *= PATCHED_LIBUPNP -+ # DEFINES *= PATCHED_LIBUPNP - } - - DEFINES *= UBUNTU diff --git a/srcpkgs/retroshare/patches/retroshare06-novoip.patch b/srcpkgs/retroshare/patches/retroshare06-novoip.patch deleted file mode 100644 index 2272128e055..00000000000 --- a/srcpkgs/retroshare/patches/retroshare06-novoip.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -uNr retroshare06-0.6.0.orig/src/plugins/plugins.pro retroshare06-0.6.0/src/plugins/plugins.pro ---- retroshare06-0.6.0.orig/src/plugins/plugins.pro 2015-12-29 15:19:39.530000000 +0100 -+++ retroshare06-0.6.0/src/plugins/plugins.pro 2015-12-29 15:20:03.906000000 +0100 -@@ -1,5 +1,4 @@ - TEMPLATE = subdirs - - SUBDIRS += \ -- VOIP \ - FeedReader diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template index 0a0ee6fd5b1..ff50bb0b3e7 100644 --- a/srcpkgs/retroshare/template +++ b/srcpkgs/retroshare/template @@ -1,27 +1,17 @@ # Template file for 'retroshare' pkgname=retroshare -version=0.6.0.RC2 -revision=3 -homepage="http://retroshare.sourceforge.net/" +version=0.6.0 +revision=1 +build_style=qmake +wrksrc="RetroShare-${version}" +homepage="http://retroshare.github.io" short_desc="A Decentralized Social Sharing Network" maintainer="Abel Vdo " license="GPL-3" -hostmakedepends="pkg-config qt-qmake" -makedepends="qt-devel libressl-devel libssh-devel zlib-devel bzip2-devel sqlite-devel libupnp-devel libgnome-keyring-devel libmicrohttpd-devel sqlcipher-devel libXScrnSaver-devel libxslt-devel libcurl-devel" -distfiles="${SOURCEFORGE_SITE}/retroshare/RetroShare/0.6.0-rc2/${pkgname}_${version}~8551_src.tgz" -checksum="2320676da905de6c48b01eda611811965277ffa1d5ddbb387aa8f0414c2de050" -depends="qt" -build_style=qmake -wrksrc="retroshare06-0.6.0" -build_wrksrc="src" -patch_args="-Np1" -post_install() { - cd ${wrksrc} - vbin src/retroshare-gui/src/RetroShare retroshare - vbin src/retroshare-nogui/src/retroshare-nogui retroshare-nogui - vinstall src/plugins/FeedReader/libFeedReader.so 755 usr/lib/retroshare/extensions6/ - vinstall src/retroshare-gui/src/gui/images/logo/logo_512.png 644 usr/share/pixmaps/ retroshare.png - vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications/ - vinstall src//libbitdht/src/bitdht/bdboot.txt 644 usr/share/RetroShare06/ - vcopy src/retroshare-gui/src/qss usr/share/RetroShare06/ -} +hostmakedepends="pkg-config qt5-qmake" +makedepends="qt5-tools-devel qt5-multimedia-devel qt5-x11extras-devel + libressl-devel libssh-devel zlib-devel bzip2-devel sqlite-devel libopencv-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