summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIonen Wolkens <ionen@gentoo.org>2021-08-07 00:21:27 -0400
committerIonen Wolkens <ionen@gentoo.org>2021-08-07 01:50:43 -0400
commit54e4d24434fb84b7dd931ed3ac61dfc5b5083023 (patch)
treeff769f8a9ae296e16a81eb5f6aa1364da8c42f24 /net-p2p
parentnet-p2p/retroshare: 0.6.5 minimal maintenance (diff)
downloadgentoo-54e4d24434fb84b7dd931ed3ac61dfc5b5083023.tar.gz
gentoo-54e4d24434fb84b7dd931ed3ac61dfc5b5083023.tar.bz2
gentoo-54e4d24434fb84b7dd931ed3ac61dfc5b5083023.zip
net-p2p/retroshare: trim patch
Notably no need to keep comment changes on this side. Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'net-p2p')
-rw-r--r--net-p2p/retroshare/files/retroshare-0.6.6-fix-cxx17-compilation.patch23
1 files changed, 1 insertions, 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 c756937c1657..73c5e1d18cc8 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
-