[gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/files/

[gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/files/

[Ionen Wolkens]

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
-

[gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/files/

[Arthur Zamarin]

commit:     9f2da161ce9cdeefee50565d407493cd9704e8d6
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Jul  6 07:43:34 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jul  6 08:16:57 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f2da161

net-p2p/retroshare: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 .../retroshare-0.6.6-fix-cxx17-compilation.patch   | 58 ----------------------
 1 file changed, 58 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
deleted file mode 100644
index 73c5e1d18cc8..000000000000
--- a/net-p2p/retroshare/files/retroshare-0.6.6-fix-cxx17-compilation.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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
---- a/libretroshare/src/util/rsdir.cc
-+++ b/libretroshare/src/util/rsdir.cc
-@@ -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 <filesystem>
-+#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
--			        << " of: " << path << std::endl;
--			return false;
--		}
--	}
--	return true;
--}
--#endif // __cplusplus < 201703L
--
- std::string RsDirUtil::removeSymLinks(const std::string& path)
- {
- #if defined(WINDOWS_SYS) || defined(__APPLE__) || defined(__ANDROID__)