diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
commit | f516638b7fe9592837389826a6152a7e1b251c54 (patch) | |
tree | 8bfecb640b7b6403d7a3d662d923eed630033da7 /net-p2p/retroshare/files | |
parent | 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff) |
gentoo resync : 30.05.2020
Diffstat (limited to 'net-p2p/retroshare/files')
-rw-r--r-- | net-p2p/retroshare/files/retroshare-0.6.3-fix-comment.patch | 19 | ||||
-rw-r--r-- | net-p2p/retroshare/files/retroshare-0.6.4-qt-5.11.patch | 63 |
2 files changed, 0 insertions, 82 deletions
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 20652f180cd6..000000000000 --- a/net-p2p/retroshare/files/retroshare-0.6.3-fix-comment.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit b686771a38c93339ece773bd5ae4d0db1fa629b7 -Author: Gleb Nemshilov <gleb@fastmail.com> -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 892cc89aff9a..000000000000 --- 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 <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" |