* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/, net-p2p/retroshare/files/
@ 2016-07-27 21:00 Sergey Popov
0 siblings, 0 replies; 6+ messages in thread
From: Sergey Popov @ 2016-07-27 21:00 UTC (permalink / raw
To: gentoo-commits
commit: 1cfd854753dc82931f2a28aa2a6b220578ef35f7
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 27 18:55:59 2016 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 20:59:59 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cfd8547
net-p2p/retroshare: backport upstream fixes for building with Qt5 and new C++ ABI
Gentoo-Bug: 584832
Package-Manager: portage-2.3.0
.../files/retroshare-0.6.0-c11-compat.patch | 145 +++++++++++++++++++++
net-p2p/retroshare/retroshare-0.6.0.ebuild | 3 +
2 files changed, 148 insertions(+)
diff --git a/net-p2p/retroshare/files/retroshare-0.6.0-c11-compat.patch b/net-p2p/retroshare/files/retroshare-0.6.0-c11-compat.patch
new file mode 100644
index 0000000..b3d8f3b
--- /dev/null
+++ b/net-p2p/retroshare/files/retroshare-0.6.0-c11-compat.patch
@@ -0,0 +1,145 @@
+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);
diff --git a/net-p2p/retroshare/retroshare-0.6.0.ebuild b/net-p2p/retroshare/retroshare-0.6.0.ebuild
index 7088971..bf71893 100644
--- a/net-p2p/retroshare/retroshare-0.6.0.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.0.ebuild
@@ -78,6 +78,8 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/RetroShare-${PV}"
+PATCHES=( "${FILESDIR}/${P}-c11-compat.patch" )
+
src_prepare() {
local dir
@@ -99,6 +101,7 @@ src_prepare() {
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
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/, net-p2p/retroshare/files/
@ 2017-06-13 16:09 Sergey Popov
0 siblings, 0 replies; 6+ messages in thread
From: Sergey Popov @ 2017-06-13 16:09 UTC (permalink / raw
To: gentoo-commits
commit: 1f261c76ddda8f671bf9e2ba060e8b0727a61881
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 13 16:02:51 2017 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 16:03:21 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f261c76
net-p2p/retroshare: drop old versions
Package-Manager: Portage-2.3.6, Repoman-2.3.1
net-p2p/retroshare/Manifest | 2 -
.../files/retroshare-0.6.0-c11-compat.patch | 145 -----------------
net-p2p/retroshare/retroshare-0.6.0.ebuild | 172 ---------------------
net-p2p/retroshare/retroshare-0.6.1.ebuild | 169 --------------------
4 files changed, 488 deletions(-)
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index 96036ec6b24..bc57697ca2f 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -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
diff --git a/net-p2p/retroshare/files/retroshare-0.6.0-c11-compat.patch b/net-p2p/retroshare/files/retroshare-0.6.0-c11-compat.patch
deleted file mode 100644
index b3d8f3b9f97..00000000000
--- a/net-p2p/retroshare/files/retroshare-0.6.0-c11-compat.patch
+++ /dev/null
@@ -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);
diff --git a/net-p2p/retroshare/retroshare-0.6.0.ebuild b/net-p2p/retroshare/retroshare-0.6.0.ebuild
deleted file mode 100644
index 4d1b38f8244..00000000000
--- a/net-p2p/retroshare/retroshare-0.6.0.ebuild
+++ /dev/null
@@ -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
-}
diff --git a/net-p2p/retroshare/retroshare-0.6.1.ebuild b/net-p2p/retroshare/retroshare-0.6.1.ebuild
deleted file mode 100644
index f7341d6e4e0..00000000000
--- a/net-p2p/retroshare/retroshare-0.6.1.ebuild
+++ /dev/null
@@ -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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/, net-p2p/retroshare/files/
@ 2018-08-21 8:27 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2018-08-21 8:27 UTC (permalink / raw
To: gentoo-commits
commit: de000ce6015b9d016f28d68b39790c0580a90e1a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 21 08:23:16 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 21 08:27:16 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de000ce6
net-p2p/retroshare: Fix build with Qt 5.11
Closes: https://bugs.gentoo.org/661742
Package-Manager: Portage-2.3.47, Repoman-2.3.10
.../files/retroshare-0.6.4-qt-5.11.patch | 63 ++++++++++++++++++++++
net-p2p/retroshare/retroshare-0.6.4.ebuild | 6 ++-
2 files changed, 67 insertions(+), 2 deletions(-)
diff --git a/net-p2p/retroshare/files/retroshare-0.6.4-qt-5.11.patch b/net-p2p/retroshare/files/retroshare-0.6.4-qt-5.11.patch
new file mode 100644
index 00000000000..892cc89aff9
--- /dev/null
+++ b/net-p2p/retroshare/files/retroshare-0.6.4-qt-5.11.patch
@@ -0,0 +1,63 @@
+From 428b331d8efede1e2f39f2fc49216c675d081030 Mon Sep 17 00:00:00 2001
+From: sehraf <sehraf42@gmail.com>
+Date: Fri, 25 May 2018 23:12:35 +0200
+Subject: [PATCH] fix for Qt 5.11
+
+Quote from Arch mailing list:
+- there's been a huge header cleanup in Qt modules. Expect build failures for applications that rely on transitive includes instead of declaring all required headers. Those need to be fixed upstream by explicitely adding the missing includes.
+---
+ retroshare-gui/src/gui/Posted/PostedItem.cpp | 1 +
+ retroshare-gui/src/gui/chat/ChatTabWidget.cpp | 2 ++
+ retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp | 1 +
+ retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp | 1 +
+ 4 files changed, 5 insertions(+)
+
+diff --git a/retroshare-gui/src/gui/Posted/PostedItem.cpp b/retroshare-gui/src/gui/Posted/PostedItem.cpp
+index 7d70b3e157..8fc1cc6869 100644
+--- a/retroshare-gui/src/gui/Posted/PostedItem.cpp
++++ b/retroshare-gui/src/gui/Posted/PostedItem.cpp
+@@ -22,6 +22,7 @@
+ */
+
+ #include <QDateTime>
++#include <QStyle>
+
+ #include "rshare.h"
+ #include "PostedItem.h"
+diff --git a/retroshare-gui/src/gui/chat/ChatTabWidget.cpp b/retroshare-gui/src/gui/chat/ChatTabWidget.cpp
+index a965bbb323..6dd9c27576 100644
+--- a/retroshare-gui/src/gui/chat/ChatTabWidget.cpp
++++ b/retroshare-gui/src/gui/chat/ChatTabWidget.cpp
+@@ -20,6 +20,8 @@
+ * Boston, MA 02110-1301, USA.
+ ****************************************************************/
+
++#include <QTabBar>
++
+ #include "ChatTabWidget.h"
+ #include "ui_ChatTabWidget.h"
+ #include "ChatDialog.h"
+diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
+index d154408b73..72317640c7 100644
+--- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
++++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
+@@ -23,6 +23,7 @@
+
+ #include <QTimer>
+ #include <QFileInfo>
++#include <QStyle>
+
+ #include "rshare.h"
+ #include "GxsChannelPostItem.h"
+diff --git a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
+index 97ac9dd75a..e9773aba9c 100644
+--- a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
++++ b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
+@@ -23,6 +23,7 @@
+
+ #include <QTimer>
+ #include <QFileInfo>
++#include <QStyle>
+
+ #include "rshare.h"
+ #include "GxsForumMsgItem.h"
diff --git a/net-p2p/retroshare/retroshare-0.6.4.ebuild b/net-p2p/retroshare/retroshare-0.6.4.ebuild
index 89ef994223c..1a98bba1107 100644
--- a/net-p2p/retroshare/retroshare-0.6.4.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.4.ebuild
@@ -59,7 +59,11 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/RetroShare-${PV}"
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
src_prepare() {
+ default
+
local dir
sed -i \
@@ -81,8 +85,6 @@ src_prepare() {
# Avoid openpgpsdk false dependency on qtgui
sed -i '2iQT -= gui' openpgpsdk/src/openpgpsdk.pro || die
-
- eapply_user
}
src_configure() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/, net-p2p/retroshare/files/
@ 2020-06-22 8:16 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2020-06-22 8:16 UTC (permalink / raw
To: gentoo-commits
commit: 124fe3d1d0285a7420e52fb4c530e4c702f93a1b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 16:45:26 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 22 08:15:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=124fe3d1
net-p2p/retroshare: Fix build with Qt 5.15
Upstream patch needed quite some modifications to apply.
Closes: https://bugs.gentoo.org/728836
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/retroshare-0.6.5-qt-5.15.patch | 99 ++++++++++++++++++++++
net-p2p/retroshare/retroshare-0.6.5.ebuild | 13 +--
2 files changed, 107 insertions(+), 5 deletions(-)
diff --git a/net-p2p/retroshare/files/retroshare-0.6.5-qt-5.15.patch b/net-p2p/retroshare/files/retroshare-0.6.5-qt-5.15.patch
new file mode 100644
index 00000000000..21147a6391b
--- /dev/null
+++ b/net-p2p/retroshare/files/retroshare-0.6.5-qt-5.15.patch
@@ -0,0 +1,99 @@
+From bbaad838572b5fba6109bc7d3b5c55c2c68e6cdc Mon Sep 17 00:00:00 2001
+From: Phenom <retrosharephenom@gmail.com>
+Date: Mon, 1 Jun 2020 13:44:43 +0200
+Subject: [PATCH] Fix build with Qt 5.15+
+
+---
+ retroshare-gui/src/gui/elastic/elnode.h | 8 +++++---
+ .../src/gui/gxs/GxsCommentTreeWidget.cpp | 16 +++++++++-------
+ retroshare-gui/src/gui/gxs/GxsIdDetails.cpp | 18 ++++++++++--------
+ 3 files changed, 24 insertions(+), 18 deletions(-)
+
+diff --git a/retroshare-gui/src/gui/elastic/elnode.h b/retroshare-gui/src/gui/elastic/elnode.h
+index 1e0edd1a87..33043ddab3 100644
+--- a/retroshare-gui/src/gui/elastic/elnode.h
++++ b/retroshare-gui/src/gui/elastic/elnode.h
+@@ -26,6 +26,10 @@
+ #ifndef ELNODE_H
+ #define ELNODE_H
+
++#include "graphwidget.h"
++
++#include <retroshare/rstypes.h>
++
+ #include <QApplication>
+ #if QT_VERSION >= 0x040600
+ #include <QGraphicsObject>
+@@ -36,9 +40,7 @@
+ #include <QGraphicsItem>
+ #endif
+ #include <QList>
+-
+-#include <retroshare/rstypes.h>
+-#include "graphwidget.h"
++#include <QPainterPath>
+
+ class Edge;
+ QT_BEGIN_NAMESPACE
+--- a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
++++ b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
+@@ -18,6 +18,12 @@
+ * *
+ *******************************************************************************/
+
++#include "GxsCommentTreeWidget.h"
++
++#include "gui/common/RSElidedItemDelegate.h"
++#include "gui/gxs/GxsCreateCommentDialog.h"
++#include "gui/gxs/GxsIdTreeWidgetItem.h"
++
+ #include <QAbstractTextDocumentLayout>
+ #include <QApplication>
+ #include <QClipboard>
+@@ -25,13 +31,9 @@
+ #include <QMenu>
+ #include <QMimeData>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QTextDocument>
+
+-#include "gui/common/RSElidedItemDelegate.h"
+-#include "gui/gxs/GxsCommentTreeWidget.h"
+-#include "gui/gxs/GxsCreateCommentDialog.h"
+-#include "gui/gxs/GxsIdTreeWidgetItem.h"
+-
+ #include <iostream>
+
+ #define PCITEM_COLUMN_COMMENT 0
+diff --git a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
+--- a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
++++ b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
+@@ -18,19 +18,21 @@
+ * *
+ *******************************************************************************/
+
+-#include <QApplication>
+-#include <QThread>
+-#include <QTimerEvent>
+-#include <QMutexLocker>
++#include "GxsIdDetails.h"
+
+-#include <math.h>
+-#include "GxsIdDetails.h"
+ #include "retroshare-gui/RsAutoUpdatePage.h"
+
+ #include <retroshare/rspeers.h>
+
+-#include <iostream>
++#include <QApplication>
++#include <QMutexLocker>
+ #include <QPainter>
++#include <QPainterPath>
++#include <QThread>
++#include <QTimerEvent>
++
++#include <iostream>
++#include <cmath>
+
+ /* Images for tag icons */
+ #define IMAGE_LOADING ":/images/folder-draft.png"
diff --git a/net-p2p/retroshare/retroshare-0.6.5.ebuild b/net-p2p/retroshare/retroshare-0.6.5.ebuild
index ab3d11026c9..b2c53a2a283 100644
--- a/net-p2p/retroshare/retroshare-0.6.5.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.5.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit desktop qmake-utils xdg-utils
+inherit desktop eutils qmake-utils xdg-utils
DESCRIPTION="P2P private sharing application"
HOMEPAGE="https://retroshare.cc"
@@ -13,7 +13,6 @@ SRC_URI="https://github.com/RetroShare/RetroShare/releases/download/v${PV}/Retro
LICENSE="AGPL-3 GPL-2 GPL-3 Apache-2.0 LGPL-3"
SLOT="0"
KEYWORDS="amd64 x86"
-
IUSE="cli control-socket gnome-keyring +gui +jsonapi service +sqlcipher webui +xapian"
REQUIRED_USE="
@@ -60,10 +59,14 @@ BDEPEND="dev-util/cmake
)
)"
-src_unpack() {
- default
+PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" )
- mv RetroShare ${P} || die
+S="${WORKDIR}"/RetroShare
+
+src_prepare() {
+ # CRLF endings break patch...
+ edos2unix retroshare-gui/src/gui/elastic/elnode.h
+ default
}
src_configure() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/, net-p2p/retroshare/files/
@ 2023-05-14 11:25 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2023-05-14 11:25 UTC (permalink / raw
To: gentoo-commits
commit: 58b7a140f5125896f35adacfb472115b6ab6a98f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 11:23:39 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 14 11:25:12 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58b7a140
net-p2p/retroshare: drop 0.6.5-r2, 0.6.5-r3, 0.6.6
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-p2p/retroshare/Manifest | 1 -
.../files/retroshare-0.6.5-qt-5.15.patch | 99 -------------
net-p2p/retroshare/metadata.xml | 4 -
net-p2p/retroshare/retroshare-0.6.5-r2.ebuild | 153 ---------------------
net-p2p/retroshare/retroshare-0.6.5-r3.ebuild | 142 -------------------
net-p2p/retroshare/retroshare-0.6.6.ebuild | 122 ----------------
6 files changed, 521 deletions(-)
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index e636d71484b3..28864b4b5852 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1,2 +1 @@
-DIST retroshare-0.6.5.tar.gz 29377995 BLAKE2B 3a8909227080702e42e59b42301e873d4ece806e014a959080a3ae9df7d11564a6e6d915087a9ddd6d5c66d1e5c43895fa24dea8c0042fdce391c384a54182ee SHA512 a65fefb6baff42a81880a401c9005f73ac8180a247dd992a350f9bf5bac366ee6e809bf93cbbc31e80646156147a1d434306dadfbed1f69879ab61cfae3fddeb
DIST retroshare-0.6.6.tar.gz 24140207 BLAKE2B 1328f2d36f6bc2d1123dd915698f2778e771e36089d8fd8d9ec44d1a8bfa0f56c625b73f62811936e4cee5dd1eca797f9fdf16fdb8defd66706294abc4dde419 SHA512 23ed7c633426caa910a5ae6f04cfd33c523ecaedae1e4044981706420622aadd67ba2772ffd17c9cc1c6193fad508837a31fdcfabe2aab309b8b4302335ede4d
diff --git a/net-p2p/retroshare/files/retroshare-0.6.5-qt-5.15.patch b/net-p2p/retroshare/files/retroshare-0.6.5-qt-5.15.patch
deleted file mode 100644
index 21147a6391b0..000000000000
--- a/net-p2p/retroshare/files/retroshare-0.6.5-qt-5.15.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From bbaad838572b5fba6109bc7d3b5c55c2c68e6cdc Mon Sep 17 00:00:00 2001
-From: Phenom <retrosharephenom@gmail.com>
-Date: Mon, 1 Jun 2020 13:44:43 +0200
-Subject: [PATCH] Fix build with Qt 5.15+
-
----
- retroshare-gui/src/gui/elastic/elnode.h | 8 +++++---
- .../src/gui/gxs/GxsCommentTreeWidget.cpp | 16 +++++++++-------
- retroshare-gui/src/gui/gxs/GxsIdDetails.cpp | 18 ++++++++++--------
- 3 files changed, 24 insertions(+), 18 deletions(-)
-
-diff --git a/retroshare-gui/src/gui/elastic/elnode.h b/retroshare-gui/src/gui/elastic/elnode.h
-index 1e0edd1a87..33043ddab3 100644
---- a/retroshare-gui/src/gui/elastic/elnode.h
-+++ b/retroshare-gui/src/gui/elastic/elnode.h
-@@ -26,6 +26,10 @@
- #ifndef ELNODE_H
- #define ELNODE_H
-
-+#include "graphwidget.h"
-+
-+#include <retroshare/rstypes.h>
-+
- #include <QApplication>
- #if QT_VERSION >= 0x040600
- #include <QGraphicsObject>
-@@ -36,9 +40,7 @@
- #include <QGraphicsItem>
- #endif
- #include <QList>
--
--#include <retroshare/rstypes.h>
--#include "graphwidget.h"
-+#include <QPainterPath>
-
- class Edge;
- QT_BEGIN_NAMESPACE
---- a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
-+++ b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
-@@ -18,6 +18,12 @@
- * *
- *******************************************************************************/
-
-+#include "GxsCommentTreeWidget.h"
-+
-+#include "gui/common/RSElidedItemDelegate.h"
-+#include "gui/gxs/GxsCreateCommentDialog.h"
-+#include "gui/gxs/GxsIdTreeWidgetItem.h"
-+
- #include <QAbstractTextDocumentLayout>
- #include <QApplication>
- #include <QClipboard>
-@@ -25,13 +31,9 @@
- #include <QMenu>
- #include <QMimeData>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QTextDocument>
-
--#include "gui/common/RSElidedItemDelegate.h"
--#include "gui/gxs/GxsCommentTreeWidget.h"
--#include "gui/gxs/GxsCreateCommentDialog.h"
--#include "gui/gxs/GxsIdTreeWidgetItem.h"
--
- #include <iostream>
-
- #define PCITEM_COLUMN_COMMENT 0
-diff --git a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
---- a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
-+++ b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
-@@ -18,19 +18,21 @@
- * *
- *******************************************************************************/
-
--#include <QApplication>
--#include <QThread>
--#include <QTimerEvent>
--#include <QMutexLocker>
-+#include "GxsIdDetails.h"
-
--#include <math.h>
--#include "GxsIdDetails.h"
- #include "retroshare-gui/RsAutoUpdatePage.h"
-
- #include <retroshare/rspeers.h>
-
--#include <iostream>
-+#include <QApplication>
-+#include <QMutexLocker>
- #include <QPainter>
-+#include <QPainterPath>
-+#include <QThread>
-+#include <QTimerEvent>
-+
-+#include <iostream>
-+#include <cmath>
-
- /* Images for tag icons */
- #define IMAGE_LOADING ":/images/folder-draft.png"
diff --git a/net-p2p/retroshare/metadata.xml b/net-p2p/retroshare/metadata.xml
index 56985f7e44a7..7f0b4e9f7e6d 100644
--- a/net-p2p/retroshare/metadata.xml
+++ b/net-p2p/retroshare/metadata.xml
@@ -20,15 +20,11 @@
<use>
<flag name="autologin">Enables potentially insecure autologin capability via <pkg>app-crypt/libsecret</pkg></flag>
<flag name="cli">Enables terminal login support for retroshare-service</flag>
- <flag name="control-socket">Enables API via Unix socket support</flag>
- <flag name="gnome-keyring">Enables potentially insecure autologin capability via <pkg>gnome-base/gnome-keyring</pkg></flag>
<flag name="jsonapi">Enables the new RetroShare JSON API</flag>
<flag name="libupnp">Enables UPnP port forwarding via <pkg>net-libs/libupnp</pkg></flag>
<flag name="miniupnp">Enables UPnP port forwarding via <pkg>net-libs/miniupnpc</pkg></flag>
<flag name="service">Enables the new RetroShare service</flag>
<flag name="sqlcipher">Enables GXS database encryption via SQLCipher</flag>
- <flag name="webui">Enables Web interface and API support</flag>
- <flag name="xapian">Enables GXS content indexing and search via <pkg>dev-libs/xapian</pkg></flag>
</use>
<upstream>
<bugs-to>https://github.com/RetroShare/RetroShare/issues</bugs-to>
diff --git a/net-p2p/retroshare/retroshare-0.6.5-r2.ebuild b/net-p2p/retroshare/retroshare-0.6.5-r2.ebuild
deleted file mode 100644
index e4579943fbac..000000000000
--- a/net-p2p/retroshare/retroshare-0.6.5-r2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop edos2unix qmake-utils xdg-utils
-
-DESCRIPTION="P2P private sharing application"
-HOMEPAGE="https://retroshare.cc"
-SRC_URI="https://github.com/RetroShare/RetroShare/releases/download/v${PV}/RetroShare-v${PV}-source-with-submodules.tar.gz -> ${P}.tar.gz"
-
-# pegmarkdown can also be used with MIT
-LICENSE="AGPL-3 GPL-2 GPL-3 Apache-2.0 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cli control-socket gnome-keyring +gui +jsonapi service +sqlcipher webui +xapian"
-
-REQUIRED_USE="
- || ( cli gui service )
- service? ( jsonapi )"
-
-RDEPEND="
- app-arch/bzip2
- dev-libs/openssl:0=
- >=dev-libs/rapidjson-1.1.0
- net-libs/miniupnpc:=
- sys-libs/zlib
- control-socket? ( dev-qt/qtnetwork:5 )
- gnome-keyring? ( app-crypt/libsecret )
- gui? (
- dev-qt/qtcore:5
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtscript:5
- dev-qt/qtxml:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- x11-libs/libX11
- x11-libs/libXScrnSaver
- )
- service? ( dev-qt/qtcore:5 )
- sqlcipher? ( dev-db/sqlcipher )
- !sqlcipher? ( dev-db/sqlite:3 )
- webui? ( net-libs/libmicrohttpd )
- xapian? ( dev-libs/xapian )"
-
-DEPEND="${RDEPEND}
- dev-qt/qtcore:5
- gui? ( dev-qt/designer:5 )"
-
-BDEPEND="dev-util/cmake
- virtual/pkgconfig
- jsonapi? (
- || (
- >=app-doc/doxygen-1.8.17
- <app-doc/doxygen-1.8.16
- )
- )"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" )
-
-S="${WORKDIR}"/RetroShare
-
-src_prepare() {
- # CRLF endings break patch...
- edos2unix retroshare-gui/src/gui/elastic/elnode.h
- default
-}
-
-src_configure() {
- local qConfigs=()
-
- qConfigs+=( $(usex cli '' 'no_')retroshare_nogui )
- qConfigs+=( $(usex control-socket '' 'no_')libresapilocalserver )
- qConfigs+=( $(usex gnome-keyring '' 'no_')rs_autologin )
- qConfigs+=( $(usex gui '' 'no_')retroshare_gui )
- qConfigs+=( $(usex jsonapi '' 'no_')rs_jsonapi )
- qConfigs+=( $(usex service '' 'no_')retroshare_service )
- qConfigs+=( $(usex sqlcipher '' 'no_')sqlcipher )
- qConfigs+=( $(usex webui '' 'no_')libresapihttpserver )
- qConfigs+=( $(usex xapian '' 'no_')rs_deep_search )
-
- eqmake5 CONFIG+="${qConfigs[*]}" \
- RS_MAJOR_VERSION=$(ver_cut 1) RS_MINOR_VERSION=$(ver_cut 2) \
- RS_MINI_VERSION=$(ver_cut 3) RS_EXTRA_VERSION="-gentoo-${PR}" \
- RS_UPNP_LIB=miniupnpc
-}
-
-src_compile() {
- use jsonapi && {
- nonfatal emake ||
- elog "Due to a bug in RetroShare-v0.6.5 build system when JSON API is enabled, failure at first emake is normal"
- }
-
- emake
-}
-
-src_install() {
- use cli && dobin retroshare-nogui/src/retroshare-nogui
- use gui && dobin retroshare-gui/src/retroshare
- use service && dobin retroshare-service/src/retroshare-service
-
- insinto /usr/share/retroshare
- doins libbitdht/src/bitdht/bdboot.txt
-
- use webui && doins -r libresapi/src/webui
-
- dodoc README.md
- make_desktop_entry retroshare
-
- for i in 24 48 64 128 ; do
- doicon -s ${i} "data/${i}x${i}/apps/retroshare.png"
- done
-}
-
-pkg_pretend() {
- if ! use sqlcipher; then
- ewarn "You have disabled GXS database encryption, ${PN} will use SQLite"
- ewarn "instead of SQLCipher for GXS databases."
- ewarn "Builds using SQLite and builds using SQLCipher have incompatible"
- ewarn "database format, so you will need to manually delete GXS"
- ewarn "database (loosing all your GXS data and identities) when you"
- ewarn "toggle sqlcipher USE flag."
- fi
-}
-
-pkg_preinst() {
- local ver
- for ver in ${REPLACING_VERSIONS}; do
- if ver_test ${ver} -lt 0.5.9999; then
- ewarn "You are upgrading from Retroshare 0.5.* to ${PV}"
- ewarn "Version 0.6.* is backward-incompatible with 0.5 branch"
- ewarn "and clients with 0.6.* can not connect to clients that have 0.5.*"
- ewarn "It's recommended to drop all your configuration and either"
- ewarn "generate a new certificate or import existing from a backup"
- break
- fi
- if ver_test ${ver} -ge 0.6.0 && ver_test ${ver} -lt 0.6.4; then
- elog "Main executable has been renamed upstream from RetroShare06 to retroshare"
- break
- fi
- done
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/net-p2p/retroshare/retroshare-0.6.5-r3.ebuild b/net-p2p/retroshare/retroshare-0.6.5-r3.ebuild
deleted file mode 100644
index 4a653396a8f0..000000000000
--- a/net-p2p/retroshare/retroshare-0.6.5-r3.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop edos2unix qmake-utils xdg-utils
-
-DESCRIPTION="P2P private sharing application"
-HOMEPAGE="https://retroshare.cc"
-SRC_URI="https://github.com/RetroShare/RetroShare/releases/download/v${PV}/RetroShare-v${PV}-source-with-submodules.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3 Apache-2.0 CC-BY-SA-4.0 GPL-2 GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="autologin +gui +jsonapi +service +sqlcipher"
-
-REQUIRED_USE="
- || ( gui service )
- service? ( jsonapi )"
-
-RDEPEND="
- app-arch/bzip2
- dev-libs/openssl:0=
- >=dev-libs/rapidjson-1.1.0
- net-libs/miniupnpc:=
- sys-libs/zlib
- autologin? ( app-crypt/libsecret )
- gui? (
- dev-qt/qtcore:5
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtscript:5
- dev-qt/qtxml:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- x11-libs/libX11
- x11-libs/libXScrnSaver
- )
- service? ( dev-qt/qtcore:5 )
- sqlcipher? ( dev-db/sqlcipher )
- !sqlcipher? ( dev-db/sqlite:3 )"
-
-DEPEND="${RDEPEND}
- dev-qt/qtcore:5
- gui? ( dev-qt/designer:5 )"
-
-BDEPEND="dev-util/cmake
- virtual/pkgconfig
- jsonapi? ( app-doc/doxygen )"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" )
-
-S="${WORKDIR}"/RetroShare
-
-src_prepare() {
- # CRLF endings break patch...
- edos2unix retroshare-gui/src/gui/elastic/elnode.h
- default
-}
-
-src_configure() {
- local qConfigs=()
-
- qConfigs+=( $(usex autologin '' 'no_')rs_autologin )
- qConfigs+=( $(usex gui '' 'no_')retroshare_gui )
- qConfigs+=( $(usex jsonapi '' 'no_')rs_jsonapi )
- qConfigs+=( $(usex service '' 'no_')retroshare_service )
- qConfigs+=( $(usex sqlcipher '' 'no_')sqlcipher )
- qConfigs+=( no_retroshare_nogui )
- qConfigs+=( no_libresapi )
- qConfigs+=( no_libresapi_settings )
- qConfigs+=( no_libresapilocalserver )
- qConfigs+=( no_libresapihttpserver )
-
- eqmake5 CONFIG+="${qConfigs[*]}" \
- RS_MAJOR_VERSION=$(ver_cut 1) RS_MINOR_VERSION=$(ver_cut 2) \
- RS_MINI_VERSION=$(ver_cut 3) RS_EXTRA_VERSION="-gentoo-${PR}" \
- RS_UPNP_LIB=miniupnpc
-}
-
-src_compile() {
- use jsonapi && {
- nonfatal emake ||
- elog "Due to a bug in RetroShare-v0.6.5 build system when JSON API is enabled, failure at first emake is normal"
- }
-
- emake
-}
-
-src_install() {
- use gui && dobin retroshare-gui/src/retroshare
- use service && dobin retroshare-service/src/retroshare-service
-
- insinto /usr/share/retroshare
- doins libbitdht/src/bitdht/bdboot.txt
-
- dodoc README.md
- make_desktop_entry retroshare
-
- for i in 24 48 64 128 ; do
- doicon -s ${i} "data/${i}x${i}/apps/retroshare.png"
- done
-}
-
-pkg_pretend() {
- if ! use sqlcipher; then
- ewarn "You have disabled GXS database encryption, ${PN} will use SQLite"
- ewarn "instead of SQLCipher for GXS databases."
- ewarn "Builds using SQLite and builds using SQLCipher have incompatible"
- ewarn "database format, so you will need to manually delete GXS"
- ewarn "database (loosing all your GXS data and identities) when you"
- ewarn "toggle sqlcipher USE flag."
- fi
-}
-
-pkg_preinst() {
- local ver
- for ver in ${REPLACING_VERSIONS}; do
- if ver_test ${ver} -lt 0.5.9999; then
- ewarn "You are upgrading from Retroshare 0.5.* to ${PV}"
- ewarn "Version 0.6.* is backward-incompatible with 0.5 branch"
- ewarn "and clients with 0.6.* can not connect to clients that have 0.5.*"
- ewarn "It's recommended to drop all your configuration and either"
- ewarn "generate a new certificate or import existing from a backup"
- break
- fi
- if ver_test ${ver} -ge 0.6.0 && ver_test ${ver} -lt 0.6.4; then
- elog "Main executable has been renamed upstream from RetroShare06 to retroshare"
- break
- fi
- done
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/net-p2p/retroshare/retroshare-0.6.6.ebuild b/net-p2p/retroshare/retroshare-0.6.6.ebuild
deleted file mode 100644
index d331568ada6f..000000000000
--- a/net-p2p/retroshare/retroshare-0.6.6.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils xdg
-
-DESCRIPTION="P2P private sharing application"
-HOMEPAGE="https://retroshare.cc"
-SRC_URI="http://download.opensuse.org/repositories/network:/retroshare/Debian_Testing/retroshare-common_${PV}.orig.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/RetroShare"
-
-LICENSE="AGPL-3 Apache-2.0 CC-BY-SA-4.0 GPL-2 GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="autologin cli +gui +jsonapi libupnp +miniupnp +service +sqlcipher"
-
-REQUIRED_USE="
- || ( gui service )
- ?? ( libupnp miniupnp )
- service? ( || ( cli jsonapi ) )"
-
-RDEPEND="
- app-arch/bzip2
- dev-libs/openssl:0=
- >=dev-libs/rapidjson-1.1.0
- sys-libs/zlib
- autologin? ( app-crypt/libsecret )
- gui? (
- dev-qt/qtcore:5
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtscript:5
- dev-qt/qtxml:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- x11-libs/libX11
- x11-libs/libXScrnSaver
- )
- libupnp? ( net-libs/libupnp:= )
- miniupnp? ( net-libs/miniupnpc:= )
- service? ( dev-qt/qtcore:5 )
- sqlcipher? ( dev-db/sqlcipher )
- !sqlcipher? ( dev-db/sqlite:3 )"
-
-DEPEND="${RDEPEND}
- dev-qt/qtcore:5
- gui? ( dev-qt/designer:5 )"
-
-BDEPEND="dev-util/cmake
- virtual/pkgconfig
- jsonapi? ( app-doc/doxygen )"
-
-PATCHES=( "${FILESDIR}/${P}-fix-cxx17-compilation.patch" )
-
-src_configure() {
- local qconfigs=(
- $(usex cli '' 'no_')rs_service_terminal_login
- $(usex autologin '' 'no_')rs_autologin
- $(usex gui '' 'no_')retroshare_gui
- $(usex jsonapi '' 'no_')rs_jsonapi
- $(usex service '' 'no_')retroshare_service
- $(usex sqlcipher '' 'no_')sqlcipher
- )
-
- local qupnplibs="none"
- use miniupnp && qupnplibs="miniupnpc"
- use libupnp && qupnplibs="upnp ixml"
-
- eqmake5 CONFIG+="${qconfigs[*]}" \
- RS_MAJOR_VERSION=$(ver_cut 1) RS_MINOR_VERSION=$(ver_cut 2) \
- RS_MINI_VERSION=$(ver_cut 3) RS_EXTRA_VERSION="-gentoo-${PR}" \
- RS_UPNP_LIB="${qupnplibs}"
-}
-
-src_install() {
- use gui && dobin retroshare-gui/src/retroshare
- use service && dobin retroshare-service/src/retroshare-service
-
- insinto /usr/share/retroshare
- doins libbitdht/src/bitdht/bdboot.txt
-
- dodoc README.asciidoc
-
- if use gui; then
- make_desktop_entry retroshare
-
- for i in 24 48 64 128 ; do
- doicon -s ${i} "data/${i}x${i}/apps/retroshare.png"
- done
- fi
-}
-
-pkg_preinst() {
- xdg_pkg_preinst
-
- if ! use sqlcipher && ! has_version "net-p2p/retroshare[-sqlcipher]"; then
- ewarn "You have disabled GXS database encryption, ${PN} will use SQLite"
- ewarn "instead of SQLCipher for GXS databases."
- ewarn "Builds using SQLite and builds using SQLCipher have incompatible"
- ewarn "database format, so you will need to manually delete GXS"
- ewarn "database (loosing all your GXS data and identities) when you"
- ewarn "toggle sqlcipher USE flag."
- fi
-
- if [[ ${REPLACING_VERSIONS} ]]; then
- if ver_test ${REPLACING_VERSIONS} -lt 0.6; then
- ewarn "You are upgrading from Retroshare 0.5.* to ${PV}"
- ewarn "Version 0.6.* is backward-incompatible with 0.5 branch"
- ewarn "and clients with 0.6.* can not connect to clients that have 0.5.*"
- ewarn "It's recommended to drop all your configuration and either"
- ewarn "generate a new certificate or import existing from a backup"
- break
- fi
- if ver_test ${REPLACING_VERSIONS} -ge 0.6.0 && ver_test ${REPLACING_VERSIONS} -lt 0.6.4; then
- elog "Main executable has been renamed upstream from RetroShare06 to retroshare"
- break
- fi
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/, net-p2p/retroshare/files/
@ 2024-09-13 7:42 Joonas Niilola
0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2024-09-13 7:42 UTC (permalink / raw
To: gentoo-commits
commit: 5439590fc9c878f929b4c6f578bb07f85d53be26
Author: Filip Kobierski <fkobi <AT> pm <DOT> me>
AuthorDate: Mon Aug 26 15:34:41 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Sep 13 07:42:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5439590f
net-p2p/retroshare: add miniupnpc API 18 support, fix DEPEND
rapidjson is not needed without jsonapi USE flag
Signed-off-by: Filip Kobierski <fkobi <AT> pm.me>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../retroshare-0.6.7-fix-miniupnp-api-v18.patch | 32 +++++
net-p2p/retroshare/retroshare-0.6.7-r2.ebuild | 129 +++++++++++++++++++++
2 files changed, 161 insertions(+)
diff --git a/net-p2p/retroshare/files/retroshare-0.6.7-fix-miniupnp-api-v18.patch b/net-p2p/retroshare/files/retroshare-0.6.7-fix-miniupnp-api-v18.patch
new file mode 100644
index 000000000000..37d38b11c548
--- /dev/null
+++ b/net-p2p/retroshare/files/retroshare-0.6.7-fix-miniupnp-api-v18.patch
@@ -0,0 +1,32 @@
+From f1b89c4f87d77714571b4135c301bf0429096a20 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C8=98tefan=20Talpalaru?= <stefantalpalaru@yahoo.com>
+Date: Wed, 12 Jun 2024 01:00:41 +0200
+Subject: [PATCH] Support the miniupnpc-2.2.8 API change
+# NOTE: Taken from the official libretroshare repo
+# https://github.com/RetroShare/libretroshare/commit/c54e0266e4483797c1d6bacee6f563979d683464
+index 7178a8e39..5e5358fb9 100644
+--- a/libretroshare/src/rs_upnp/upnphandler_miniupnp.cc
++++ b/libretroshare/src/rs_upnp/upnphandler_miniupnp.cc
+@@ -41,6 +41,9 @@ class uPnPConfigData
+ struct UPNPUrls urls;
+ struct IGDdatas data;
+ char lanaddr[16]; /* my ip address on the LAN */
++#if MINIUPNPC_API_VERSION >= 18
++ char wanaddr[16]; /* my ip address on the WAN */
++#endif
+ };
+
+ #include <iostream>
+@@ -139,6 +142,10 @@ bool upnphandler::initUPnPState()
+ putchar('\n');
+ if(UPNP_GetValidIGD(upcd->devlist, &(upcd->urls),
+ &(upcd->data), upcd->lanaddr,
+- sizeof(upcd->lanaddr)))
++ sizeof(upcd->lanaddr)
++#if MINIUPNPC_API_VERSION >= 18
++ , upcd->wanaddr, sizeof(upcd->wanaddr)
++#endif
++ ))
+ {
+ printf("Found valid IGD : %s\n",
+ upcd->urls.controlURL);
\ No newline at end of file
diff --git a/net-p2p/retroshare/retroshare-0.6.7-r2.ebuild b/net-p2p/retroshare/retroshare-0.6.7-r2.ebuild
new file mode 100644
index 000000000000..49e285a13636
--- /dev/null
+++ b/net-p2p/retroshare/retroshare-0.6.7-r2.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic desktop qmake-utils xdg
+
+DESCRIPTION="Friend to Friend secure communication and sharing application"
+HOMEPAGE="https://retroshare.cc"
+SRC_URI="https://download.opensuse.org/repositories/network:/retroshare/Debian_Testing/retroshare-common_${PV}.orig.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/RetroShare"
+# NOTE: GitHub releases/archive is impractical to build so we use the OBS repo
+# but they squash point releases which is bad for us
+
+LICENSE="AGPL-3 Apache-2.0 CC-BY-SA-4.0 GPL-2 GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli +gui +jsonapi keyring libupnp +miniupnp +service +sqlcipher plugins"
+
+REQUIRED_USE="
+ || ( gui service )
+ ?? ( libupnp miniupnp )
+ plugins? ( gui )
+ service? ( || ( cli jsonapi ) )
+"
+RDEPEND="
+ app-arch/bzip2
+ dev-libs/openssl:0=
+ sys-libs/zlib
+ keyring? ( app-crypt/libsecret )
+ gui? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtxml:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ )
+ libupnp? ( net-libs/libupnp:= )
+ miniupnp? ( net-libs/miniupnpc:= )
+ sqlcipher? ( dev-db/sqlcipher )
+ !sqlcipher? ( dev-db/sqlite:3 )
+ plugins? (
+ media-libs/speex
+ media-libs/speexdsp
+ <media-video/ffmpeg-5
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ jsonapi? ( >=dev-libs/rapidjson-1.1.0 )
+ gui? ( dev-qt/designer:5 )
+"
+BDEPEND="
+ dev-build/cmake
+ dev-qt/qtcore:5
+ virtual/pkgconfig
+ gui? ( x11-base/xorg-proto )
+ jsonapi? ( app-text/doxygen )
+"
+PATCHES=( "${FILESDIR}/${P}-fix-miniupnp-api-v18.patch" )
+
+src_configure() {
+ local qconfigs=(
+ $(usex cli '' 'no_')rs_service_terminal_login
+ $(usex keyring '' 'no_')rs_autologin
+ $(usex gui '' 'no_')retroshare_gui
+ $(usex jsonapi '' 'no_')rs_jsonapi
+ $(usex service '' 'no_')retroshare_service
+ $(usex sqlcipher '' 'no_')sqlcipher
+ $(usex plugins '' 'no_')retroshare_plugins
+ )
+
+ local qupnplibs="none"
+ use miniupnp && qupnplibs="miniupnpc"
+ use libupnp && qupnplibs="upnp ixml"
+
+ # bug 907898
+ use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
+
+ # REVIEW: qmake is deprecated
+ # https://github.com/RetroShare/RetroShare/tree/master/jsonapi-generator
+ eqmake5 CONFIG+="${qconfigs[*]}" \
+ RS_MAJOR_VERSION=$(ver_cut 1) \
+ RS_MINOR_VERSION=$(ver_cut 2) \
+ RS_MINI_VERSION=$(ver_cut 3) \
+ RS_EXTRA_VERSION="-gentoo-${PR}" \
+ RS_UPNP_LIB="${qupnplibs}"
+}
+
+src_install() {
+ use gui && dobin retroshare-gui/src/retroshare
+ use service && dobin retroshare-service/src/retroshare-service
+
+ insinto /usr/share/retroshare
+ doins libbitdht/src/bitdht/bdboot.txt
+ use gui && doins -r retroshare-gui/src/qss
+
+ dodoc README.asciidoc
+
+ if use gui; then
+ make_desktop_entry retroshare
+
+ for i in 24 48 64 128 ; do
+ doicon -s ${i} "data/${i}x${i}/apps/retroshare.png"
+ done
+ fi
+ if use plugins; then
+ insinto /usr/lib/retroshare/extensions6
+ doins plugins/*/lib/*.so
+ fi
+}
+
+pkg_preinst() {
+ xdg_pkg_preinst
+
+ if ! use sqlcipher && ! has_version "net-p2p/retroshare[-sqlcipher]"; then
+ ewarn "You have disabled GXS database encryption, ${PN} will use SQLite"
+ ewarn "instead of SQLCipher for GXS databases."
+ ewarn "Builds using SQLite and builds using SQLCipher have incompatible"
+ ewarn "database format, so you will need to manually delete GXS"
+ ewarn "database (loosing all your GXS data and identities) when you"
+ ewarn "toggle sqlcipher USE flag."
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-09-13 7:42 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-22 8:16 [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/, net-p2p/retroshare/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-09-13 7:42 Joonas Niilola
2023-05-14 11:25 Andreas Sturmlechner
2018-08-21 8:27 Andreas Sturmlechner
2017-06-13 16:09 Sergey Popov
2016-07-27 21:00 Sergey Popov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox