From: "Ionen Wolkens" <ionen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/files/
Date: Sat, 7 Aug 2021 05:51:34 +0000 (UTC) [thread overview]
Message-ID: <1628315443.54e4d24434fb84b7dd931ed3ac61dfc5b5083023.ionen@gentoo> (raw)
commit: 54e4d24434fb84b7dd931ed3ac61dfc5b5083023
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 7 04:21:27 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Aug 7 05:50:43 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54e4d244
net-p2p/retroshare: trim patch
Notably no need to keep comment changes on this side.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../retroshare-0.6.6-fix-cxx17-compilation.patch | 23 +---------------------
1 file changed, 1 insertion(+), 22 deletions(-)
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
index c756937c165..73c5e1d18cc 100644
--- 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
@@ -1,27 +1,9 @@
-From 8bed99cc9f3763269b6b1aada45a43c9993d7b80 Mon Sep 17 00:00:00 2001
+https://github.com/RetroShare/RetroShare/commit/8bed99cc9f3763269b6b1aada45a43c9993d7b80
From: Gioacchino Mazzurco <gio@eigenlab.org>
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 <retroshare@lunamutt.com> *
-- * Copyright (C) 2020 Gioacchino Mazzurco <gio@eigenlab.org> *
-- * Copyright (C) 2020 Asociación Civil Altermundi <info@altermundi.net> *
-+ * Copyright (C) 2020-2021 Gioacchino Mazzurco <gio@eigenlab.org> *
-+ * Copyright (C) 2020-2021 Asociación Civil Altermundi <info@altermundi.net> *
- * *
- * 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
****/
@@ -74,6 +56,3 @@ index 8556b8198..1a6375297 100644
std::string RsDirUtil::removeSymLinks(const std::string& path)
{
#if defined(WINDOWS_SYS) || defined(__APPLE__) || defined(__ANDROID__)
---
-2.31.1
-
next reply other threads:[~2021-08-07 5:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-07 5:51 Ionen Wolkens [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-07-06 8:18 [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/files/ Arthur Zamarin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1628315443.54e4d24434fb84b7dd931ed3ac61dfc5b5083023.ionen@gentoo \
--to=ionen@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox