[gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/files/, net-p2p/retroshare/
commit: ff5e87afa1e6030f4bfd2ca30e198bd728a13fda
Author: Gioacchino Mazzurco eigenlab org>
AuthorDate: Tue Jul 20 09:06:38 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Aug 7 05:50:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff5e87af
net-p2p/retroshare: 0.6.6 version bump
Fixes a bunch of bugs fixed upstream in newer version and disabling
components that are been obsoleted upstream in older versions
Modernize 0.6.6 ebuild after ionenwks suggestions
Bug: https://bugs.gentoo.org/779838
Bug: https://bugs.gentoo.org/798048
Bug: https://bugs.gentoo.org/798099
Closes: https://bugs.gentoo.org/785964
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Gioacchino Mazzurco altermundi.net>
Signed-off-by: Ionen Wolkens gentoo.org>
net-p2p/retroshare/Manifest| 1 +
.../retroshare-0.6.6-fix-cxx17-compilation.patch | 79 +
net-p2p/retroshare/metadata.xml| 11 +-
net-p2p/retroshare/retroshare-0.6.6.ebuild | 122 +
4 files changed, 209 insertions(+), 4 deletions(-)
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index b3ae51167eb..e636d71484b 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1 +1,2 @@
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.6-fix-cxx17-compilation.patch
b/net-p2p/retroshare/files/retroshare-0.6.6-fix-cxx17-compilation.patch
new file mode 100644
index 000..c756937c165
--- /dev/null
+++ b/net-p2p/retroshare/files/retroshare-0.6.6-fix-cxx17-compilation.patch
@@ -0,0 +1,79 @@
+From 8bed99cc9f3763269b6b1aada45a43c9993d7b80 Mon Sep 17 00:00:00 2001
+From: Gioacchino Mazzurco
+Date: Fri, 6 Aug 2021 12:15:34 +0200
+Subject: [PATCH] Fix compilation with C++17
+
+---
+ libretroshare/src/util/rsdir.cc | 42 +
+ 1 file changed, 22 insertions(+), 20 deletions(-)
+
+diff --git a/libretroshare/src/util/rsdir.cc b/libretroshare/src/util/rsdir.cc
+index 8556b8198..1a6375297 100644
+--- a/libretroshare/src/util/rsdir.cc
b/libretroshare/src/util/rsdir.cc
+@@ -4,8 +4,8 @@
+ * libretroshare: retroshare core library
*
+ *
*
+ * Copyright (C) 2004-2007 Robert Fernie
*
+- * Copyright (C) 2020 Gioacchino Mazzurco
*
+- * Copyright (C) 2020 Asociación Civil Altermundi
*
++ * Copyright (C) 2020-2021 Gioacchino Mazzurco
*
++ * Copyright (C) 2020-2021 Asociación Civil Altermundi
*
+ *
*
+ * This program is free software: you can redistribute it and/or modify
*
+ * it under the terms of the GNU Lesser General Public License as
*
+@@ -64,6 +64,26 @@
+ * #define RSDIR_DEBUG 1
+ /
+
++#if __cplusplus < 201703L
++bool std::filesystem::create_directories(const std::string& path)
++{
++ for( std::string::size_type lastIndex = 0; lastIndex <
std::string::npos;
++ lastIndex = path.find('/', lastIndex) )
++ {
++ std::string&& curDir = path.substr(0, ++lastIndex);
++ if(!RsDirUtil::checkCreateDirectory(curDir))
++ {
++ RsErr() << __PRETTY_FUNCTION__ << " failure creating: "
<< curDir
++ << " of: " << path << std::endl;
++ return false;
++ }
++ }
++ return true;
++}
++#else
++# include
++#endif // __cplusplus < 201703L
++
+ std::string RsDirUtil::getTopDir(const std::string& dir)
+ {
+ std::string top;
+@@ -528,24 +548,6 @@ bool RsDirUtil::checkCreateDirectory(const std::string&
dir)
+ return true;
+ }
+
+-#if __cplusplus < 201703L
+-bool std::filesystem::create_directories(const std::string& path)
+-{
+- for( std::string::size_type lastIndex = 0; lastIndex <
std::string::npos;
+- lastIndex = path.find('/', lastIndex) )
+- {
+- std::string&& curDir = path.substr(0, ++lastIndex);
+- if(!RsDirUtil::checkCreateDirectory(curDir))
+- {
+- RsErr() << __PRETTY_FUNCTION__ << " failure creating: "
<< curDir
+-
[gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/files/, net-p2p/retroshare/
commit: bc4e11b46948e7d3fb18e80293c639988fc4869d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu May 21 17:14:15 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu May 21 18:13:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc4e11b4
net-p2p/retroshare: Drop 0.6.3-r2 and 0.6.4-r1
Bug: https://bugs.gentoo.org/697578
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
net-p2p/retroshare/Manifest| 2 -
.../files/retroshare-0.6.3-fix-comment.patch | 19 ---
.../files/retroshare-0.6.4-qt-5.11.patch | 63
net-p2p/retroshare/metadata.xml| 2 -
net-p2p/retroshare/retroshare-0.6.3-r2.ebuild | 160 -
net-p2p/retroshare/retroshare-0.6.4-r1.ebuild | 155
6 files changed, 401 deletions(-)
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index 8a44be70537..b3ae51167eb 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1,3 +1 @@
-DIST retroshare-0.6.3.tar.gz 19699359 BLAKE2B
5a7a77b5ab43d44928e08fd1edc3bd6baa8b42f5c1e68fb079d3c60786c1068914a4f7a4b32fe4b683e7b990fac1bd09e5af66a09a3e9b7013e5b51b3c69ae8c
SHA512
ee699ddc71aba3d20498d46e8183953b948896709d1469a5d5374b7c9b7955e460326b1ea3fe6f87e7235c5d2d5e8f042161410a0990b2dd2a44b42551fb5757
-DIST retroshare-0.6.4.tar.gz 20018361 BLAKE2B
63a32ee3a22f4df8b9f6cff149be2c9a9cf18ac895456c808885d510b261f683bf57141b8beb4a0206f7e61eb5c88ce505440956ccdf963ad6ad7f7a73679fb3
SHA512
7fcca6479b73cb4d70532fe46bb4cf24332d523b14a198a0e81689d0e00b62ca300d167be5ac282200e97f5fd9dc6b6c3a2c992ab1daa25846db1a404bf616f8
DIST retroshare-0.6.5.tar.gz 29377995 BLAKE2B
3a8909227080702e42e59b42301e873d4ece806e014a959080a3ae9df7d11564a6e6d915087a9ddd6d5c66d1e5c43895fa24dea8c0042fdce391c384a54182ee
SHA512
a65fefb6baff42a81880a401c9005f73ac8180a247dd992a350f9bf5bac366ee6e809bf93cbbc31e80646156147a1d434306dadfbed1f69879ab61cfae3fddeb
diff --git a/net-p2p/retroshare/files/retroshare-0.6.3-fix-comment.patch
b/net-p2p/retroshare/files/retroshare-0.6.3-fix-comment.patch
deleted file mode 100644
index 20652f180cd..000
--- a/net-p2p/retroshare/files/retroshare-0.6.3-fix-comment.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit b686771a38c93339ece773bd5ae4d0db1fa629b7
-Author: Gleb Nemshilov
-Date: Sun Aug 6 14:27:26 2017 +0700
-
-fix C++ comment to avoid compilation error
-
-diff --git a/supportlibs/pegmarkdown/utility_functions.c
b/supportlibs/pegmarkdown/utility_functions.c
-index 08f910274..9445de420 100644
a/supportlibs/pegmarkdown/utility_functions.c
-+++ b/supportlibs/pegmarkdown/utility_functions.c
-@@ -26,7 +26,7 @@ element *reverse(element *list) {
- element *new = NULL;
- element *next = NULL;
- #warning Phenom (2017-07-21): I don't know if it is a real memLeak for new.
If not remove this warning and add a comment how it is deleted.
--// cppcheck-suppress memleak
-+/* cppcheck-suppress memleak */
- while (list != NULL) {
- next = list->next;
- new = cons(list, new);
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
deleted file mode 100644
index 892cc89aff9..000
--- a/net-p2p/retroshare/files/retroshare-0.6.4-qt-5.11.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 428b331d8efede1e2f39f2fc49216c675d081030 Mon Sep 17 00:00:00 2001
-From: sehraf
-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
-+#include
-
- #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
-+
- #include "ChatTabWidget.h"
- #include "ui_ChatTabWidget.h"
- #include
[gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/files/, net-p2p/retroshare/
commit: 6a0047276f9fc04631f1c2131764705e60fd2c48
Author: Sergey Popov gentoo org>
AuthorDate: Mon Aug 7 08:54:33 2017 +
Commit: Sergey Popov gentoo org>
CommitDate: Mon Aug 7 08:55:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a004727
net-p2p/retroshare: version bump
Fix comment type to prevent compile error.
Sync live ebuild
Reported-by: Gleb fastmail.com>
Gentoo-Bug: 627150
Package-Manager: Portage-2.3.6, Repoman-2.3.1
net-p2p/retroshare/Manifest| 1 +
.../files/retroshare-0.6.3-fix-comment.patch | 19 +
...are-0.6..ebuild => retroshare-0.6.3.ebuild} | 33 +++---
net-p2p/retroshare/retroshare-0.6..ebuild | 16 +++
4 files changed, 53 insertions(+), 16 deletions(-)
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index 780a57b574a..f00ff216e37 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1 +1,2 @@
DIST retroshare-0.6.2.tar.gz 18523943 SHA256
76a3ae2f2089b14562d5be34602f5ae3c73a8549aecee246ea5e67d03018de2b SHA512
7b935321f436d72948c5c0286ef5e0236bd52d1b25f00980a3b3644ae4acbde043063279f90f6bc0356363bceda484aba57e160f34f013dde120b4f6969ef6c7
WHIRLPOOL
054f5ec8dbf70c89dabaccb50265bbf2a97fe1b2eab6c6a13d0b86f0dd1d4e4097e4eacf163fa75f4cd1225307e4c2d214dddb364de7a29b809c1dc0f767c32e
+DIST retroshare-0.6.3.tar.gz 19699359 SHA256
ddb64aa5148fdc950d4426f52f1cbb11578619b1242614e3c4ca4792ee5ce30b SHA512
ee699ddc71aba3d20498d46e8183953b948896709d1469a5d5374b7c9b7955e460326b1ea3fe6f87e7235c5d2d5e8f042161410a0990b2dd2a44b42551fb5757
WHIRLPOOL
38b78b920b4be88a313d3edad4e299c05667597a1945cd3455cbf2545a673f38ceb5b2cc4703a13b2f6a199b3ea72823934650446d51c144c0efdb946dd0a1d6
diff --git a/net-p2p/retroshare/files/retroshare-0.6.3-fix-comment.patch
b/net-p2p/retroshare/files/retroshare-0.6.3-fix-comment.patch
new file mode 100644
index 000..20652f180cd
--- /dev/null
+++ b/net-p2p/retroshare/files/retroshare-0.6.3-fix-comment.patch
@@ -0,0 +1,19 @@
+commit b686771a38c93339ece773bd5ae4d0db1fa629b7
+Author: Gleb Nemshilov
+Date: Sun Aug 6 14:27:26 2017 +0700
+
+fix C++ comment to avoid compilation error
+
+diff --git a/supportlibs/pegmarkdown/utility_functions.c
b/supportlibs/pegmarkdown/utility_functions.c
+index 08f910274..9445de420 100644
+--- a/supportlibs/pegmarkdown/utility_functions.c
b/supportlibs/pegmarkdown/utility_functions.c
+@@ -26,7 +26,7 @@ element *reverse(element *list) {
+ element *new = NULL;
+ element *next = NULL;
+ #warning Phenom (2017-07-21): I don't know if it is a real memLeak for new.
If not remove this warning and add a comment how it is deleted.
+-// cppcheck-suppress memleak
++/* cppcheck-suppress memleak */
+ while (list != NULL) {
+ next = list->next;
+ new = cons(list, new);
diff --git a/net-p2p/retroshare/retroshare-0.6..ebuild
b/net-p2p/retroshare/retroshare-0.6.3.ebuild
similarity index 79%
copy from net-p2p/retroshare/retroshare-0.6..ebuild
copy to net-p2p/retroshare/retroshare-0.6.3.ebuild
index 15d6a116d95..8e7f93647e4 100644
--- a/net-p2p/retroshare/retroshare-0.6..ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.3.ebuild
@@ -3,16 +3,16 @@
EAPI=6
-EGIT_REPO_URI="https://github.com/RetroShare/RetroShare.git";
-inherit eutils git-r3 gnome2-utils qmake-utils versionator
+inherit eutils gnome2-utils qmake-utils versionator
DESCRIPTION="P2P private sharing application"
HOMEPAGE="http://retroshare.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=""
+KEYWORDS="~amd64 ~x86"
IUSE="cli feedreader gnome-keyring +gui voip"
REQUIRED_USE="
@@ -53,7 +53,10 @@ RDEPEND="
virtual/ffmpeg[encode]
)"
DEPEND="${RDEPEND}
- virtual/pkgconfig"
+ virtual/pkgconfig
+"
+
+S="${WORKDIR}/RetroShare-${PV}"
src_prepare() {
local dir
@@ -76,7 +79,13 @@ src_prepare() {
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
+ sed -i '2iQT -= gui' openpgpsdk/src/openpgpsdk.pro || die
+
+ # Fix version
+ sed -i -e '/RS_BUILD_NUMBER/s/2/3/'
libretroshare/src/retroshare/rsversion.in || die
+
+ # Fix comment not allowed in C++11
+ eapply "${FILESDIR}/${P}-fix-comment.patch"
eapply_user
}
@@ -103,22 +112,22 @@ 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
+ use cli && dobin retroshare-nogui/src/retroshare-nogui
+ use gui && dobin retroshare-gui
