summaryrefslogtreecommitdiff
path: root/packages/net-p2p/retroshare/files
diff options
context:
space:
mode:
Diffstat (limited to 'packages/net-p2p/retroshare/files')
-rw-r--r--packages/net-p2p/retroshare/files/cflags.patch367
-rw-r--r--packages/net-p2p/retroshare/files/clang.patch25
-rw-r--r--packages/net-p2p/retroshare/files/copy_lobby_name_to_clipboard.patch64
-rw-r--r--packages/net-p2p/retroshare/files/disable_key_array_redraw.patch25
-rw-r--r--packages/net-p2p/retroshare/files/hidden_service.patch111
-rw-r--r--packages/net-p2p/retroshare/files/retroshare-0.6.0-fix-build.patch115
6 files changed, 0 insertions, 707 deletions
diff --git a/packages/net-p2p/retroshare/files/cflags.patch b/packages/net-p2p/retroshare/files/cflags.patch
deleted file mode 100644
index ef76ad7..0000000
--- a/packages/net-p2p/retroshare/files/cflags.patch
+++ /dev/null
@@ -1,367 +0,0 @@
-diff --git a/libbitdht/src/libbitdht.pro b/libbitdht/src/libbitdht.pro
-index d9e5816c4..916bc6ca5 100644
---- a/libbitdht/src/libbitdht.pro
-+++ b/libbitdht/src/libbitdht.pro
-@@ -69,14 +69,14 @@ win32 {
- QMAKE_CXXFLAGS += -Wextra
-
- # Switch off optimization for release version
-- QMAKE_CXXFLAGS_RELEASE -= -O2
-- QMAKE_CXXFLAGS_RELEASE += -O0
-- QMAKE_CFLAGS_RELEASE -= -O2
-- QMAKE_CFLAGS_RELEASE += -O0
-+ QMAKE_CXXFLAGS_RELEASE -=
-+ QMAKE_CXXFLAGS_RELEASE +=
-+ QMAKE_CFLAGS_RELEASE -=
-+ QMAKE_CFLAGS_RELEASE +=
-
- # Switch on optimization for debug version
-- #QMAKE_CXXFLAGS_DEBUG += -O2
-- #QMAKE_CFLAGS_DEBUG += -O2
-+ #QMAKE_CXXFLAGS_DEBUG +=
-+ #QMAKE_CFLAGS_DEBUG +=
- }
-
- ################################# MacOSX ##########################################
-diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro
-index fa9491c63..9063efd43 100644
---- a/libretroshare/src/libretroshare.pro
-+++ b/libretroshare/src/libretroshare.pro
-@@ -27,7 +27,7 @@ debug {
- # DEFINES *= P3TURTLE_DEBUG FT_DEBUG DEBUG_FTCHUNK MPLEX_DEBUG
- # DEFINES *= STATUS_DEBUG SERV_DEBUG RSSERIAL_DEBUG #CONN_DEBUG
-
-- QMAKE_CXXFLAGS -= -O2 -fomit-frame-pointer
-+ QMAKE_CXXFLAGS -= -fomit-frame-pointer
- QMAKE_CXXFLAGS *= -g -fno-omit-frame-pointer
- }
-
-@@ -251,14 +251,14 @@ win32-g++ {
- QMAKE_CXXFLAGS += -Wextra
-
- # Switch off optimization for release version
-- QMAKE_CXXFLAGS_RELEASE -= -O2
-- QMAKE_CXXFLAGS_RELEASE += -O0
-- QMAKE_CFLAGS_RELEASE -= -O2
-- QMAKE_CFLAGS_RELEASE += -O0
-+ QMAKE_CXXFLAGS_RELEASE -=
-+ QMAKE_CXXFLAGS_RELEASE +=
-+ QMAKE_CFLAGS_RELEASE -=
-+ QMAKE_CFLAGS_RELEASE +=
-
- # Switch on optimization for debug version
-- #QMAKE_CXXFLAGS_DEBUG += -O2
-- #QMAKE_CFLAGS_DEBUG += -O2
-+ #QMAKE_CXXFLAGS_DEBUG +=
-+ #QMAKE_CFLAGS_DEBUG +=
-
- DEFINES += USE_CMD_ARGS
-
-diff --git a/libretroshare/src/tests/gxs/data_service/nxs_tests.pro b/libretroshare/src/tests/gxs/data_service/nxs_tests.pro
-index 8fa292c61..cfa6a7d83 100644
---- a/libretroshare/src/tests/gxs/data_service/nxs_tests.pro
-+++ b/libretroshare/src/tests/gxs/data_service/nxs_tests.pro
-@@ -53,7 +53,7 @@ debug {
- # DEFINES *= P3TURTLE_DEBUG FT_DEBUG DEBUG_FTCHUNK MPLEX_DEBUG
- # DEFINES *= STATUS_DEBUG SERV_DEBUG RSSERIAL_DEBUG #CONN_DEBUG
-
-- QMAKE_CXXFLAGS -= -O2 -fomit-frame-pointer
-+ QMAKE_CXXFLAGS -= -fomit-frame-pointer
- QMAKE_CXXFLAGS *= -g -fno-omit-frame-pointer
- }
- ################################# Linux ##########################################
-@@ -100,14 +100,14 @@ win32 {
- QMAKE_CXXFLAGS += -Wextra
-
- # Switch off optimization for release version
-- QMAKE_CXXFLAGS_RELEASE -= -O2
-- QMAKE_CXXFLAGS_RELEASE += -O0
-- QMAKE_CFLAGS_RELEASE -= -O2
-- QMAKE_CFLAGS_RELEASE += -O0
-+ QMAKE_CXXFLAGS_RELEASE -=
-+ QMAKE_CXXFLAGS_RELEASE +=
-+ QMAKE_CFLAGS_RELEASE -=
-+ QMAKE_CFLAGS_RELEASE +=
-
- # Switch on optimization for debug version
-- #QMAKE_CXXFLAGS_DEBUG += -O2
-- #QMAKE_CFLAGS_DEBUG += -O2
-+ #QMAKE_CXXFLAGS_DEBUG +=
-+ #QMAKE_CFLAGS_DEBUG +=
-
- # PRE_TARGETDEPS += ../../libretroshare/src/lib/libretroshare.a
- PRE_TARGETDEPS += ../../../../libretroshare/libretroshare-build-desktop/lib/libretroshare.a
-diff --git a/libretroshare/src/tests/gxs/gen_exchange/genexchange_test.pro b/libretroshare/src/tests/gxs/gen_exchange/genexchange_test.pro
-index d95c4bcd4..82f921fc8 100644
---- a/libretroshare/src/tests/gxs/gen_exchange/genexchange_test.pro
-+++ b/libretroshare/src/tests/gxs/gen_exchange/genexchange_test.pro
-@@ -36,7 +36,7 @@ debug {
- # DEFINES *= P3TURTLE_DEBUG FT_DEBUG DEBUG_FTCHUNK MPLEX_DEBUG
- # DEFINES *= STATUS_DEBUG SERV_DEBUG RSSERIAL_DEBUG #CONN_DEBUG
-
-- QMAKE_CXXFLAGS -= -O2 -fomit-frame-pointer
-+ QMAKE_CXXFLAGS -= -fomit-frame-pointer
- QMAKE_CXXFLAGS *= -g -fno-omit-frame-pointer
- }
- ################################# Linux ##########################################
-@@ -85,14 +85,14 @@ win32 {
- QMAKE_CXXFLAGS += -Wextra
-
- # Switch off optimization for release version
-- QMAKE_CXXFLAGS_RELEASE -= -O2
-- QMAKE_CXXFLAGS_RELEASE += -O0
-- QMAKE_CFLAGS_RELEASE -= -O2
-- QMAKE_CFLAGS_RELEASE += -O0
-+ QMAKE_CXXFLAGS_RELEASE -=
-+ QMAKE_CXXFLAGS_RELEASE +=
-+ QMAKE_CFLAGS_RELEASE -=
-+ QMAKE_CFLAGS_RELEASE +=
-
- # Switch on optimization for debug version
-- #QMAKE_CXXFLAGS_DEBUG += -O2
-- #QMAKE_CFLAGS_DEBUG += -O2
-+ #QMAKE_CXXFLAGS_DEBUG +=
-+ #QMAKE_CFLAGS_DEBUG +=
-
- # PRE_TARGETDEPS += ../../libretroshare/src/lib/libretroshare.a
- PRE_TARGETDEPS += ../../../../../libretroshare/libretroshare-build-desktop/lib/libretroshare.a
-diff --git a/libretroshare/src/tests/gxs/nxs_test/nxs_tests.pro b/libretroshare/src/tests/gxs/nxs_test/nxs_tests.pro
-index 8fa292c61..cfa6a7d83 100644
---- a/libretroshare/src/tests/gxs/nxs_test/nxs_tests.pro
-+++ b/libretroshare/src/tests/gxs/nxs_test/nxs_tests.pro
-@@ -53,7 +53,7 @@ debug {
- # DEFINES *= P3TURTLE_DEBUG FT_DEBUG DEBUG_FTCHUNK MPLEX_DEBUG
- # DEFINES *= STATUS_DEBUG SERV_DEBUG RSSERIAL_DEBUG #CONN_DEBUG
-
-- QMAKE_CXXFLAGS -= -O2 -fomit-frame-pointer
-+ QMAKE_CXXFLAGS -= -fomit-frame-pointer
- QMAKE_CXXFLAGS *= -g -fno-omit-frame-pointer
- }
- ################################# Linux ##########################################
-@@ -100,14 +100,14 @@ win32 {
- QMAKE_CXXFLAGS += -Wextra
-
- # Switch off optimization for release version
-- QMAKE_CXXFLAGS_RELEASE -= -O2
-- QMAKE_CXXFLAGS_RELEASE += -O0
-- QMAKE_CFLAGS_RELEASE -= -O2
-- QMAKE_CFLAGS_RELEASE += -O0
-+ QMAKE_CXXFLAGS_RELEASE -=
-+ QMAKE_CXXFLAGS_RELEASE +=
-+ QMAKE_CFLAGS_RELEASE -=
-+ QMAKE_CFLAGS_RELEASE +=
-
- # Switch on optimization for debug version
-- #QMAKE_CXXFLAGS_DEBUG += -O2
-- #QMAKE_CFLAGS_DEBUG += -O2
-+ #QMAKE_CXXFLAGS_DEBUG +=
-+ #QMAKE_CFLAGS_DEBUG +=
-
- # PRE_TARGETDEPS += ../../libretroshare/src/lib/libretroshare.a
- PRE_TARGETDEPS += ../../../../libretroshare/libretroshare-build-desktop/lib/libretroshare.a
-diff --git a/openpgpsdk/src/openpgpsdk.pro b/openpgpsdk/src/openpgpsdk.pro
-index f667a0d23..5975a7bfb 100644
---- a/openpgpsdk/src/openpgpsdk.pro
-+++ b/openpgpsdk/src/openpgpsdk.pro
-@@ -26,10 +26,10 @@ win32-g++ {
- DEFINES *= WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T
-
- # Switch off optimization for release version
-- QMAKE_CXXFLAGS_RELEASE -= -O2
-- QMAKE_CXXFLAGS_RELEASE += -O0
-- QMAKE_CFLAGS_RELEASE -= -O2
-- QMAKE_CFLAGS_RELEASE += -O0
-+ QMAKE_CXXFLAGS_RELEASE -=
-+ QMAKE_CXXFLAGS_RELEASE +=
-+ QMAKE_CFLAGS_RELEASE -=
-+ QMAKE_CFLAGS_RELEASE +=
-
- mLibs = bz2 z ssl crypto
- static {
-diff --git a/plugins/Common/retroshare_plugin.pri b/plugins/Common/retroshare_plugin.pri
-index c6124862c..8a322aae4 100644
---- a/plugins/Common/retroshare_plugin.pri
-+++ b/plugins/Common/retroshare_plugin.pri
-@@ -49,14 +49,14 @@ win32 {
- # DESTDIR = lib
-
- # Switch off optimization for release version
-- QMAKE_CXXFLAGS_RELEASE -= -O2
-- QMAKE_CXXFLAGS_RELEASE += -O0
-- QMAKE_CFLAGS_RELEASE -= -O2
-- QMAKE_CFLAGS_RELEASE += -O0
-+ QMAKE_CXXFLAGS_RELEASE -=
-+ QMAKE_CXXFLAGS_RELEASE +=
-+ QMAKE_CFLAGS_RELEASE -=
-+ QMAKE_CFLAGS_RELEASE +=
-
- # Switch on optimization for debug version
-- #QMAKE_CXXFLAGS_DEBUG += -O2
-- #QMAKE_CFLAGS_DEBUG += -O2
-+ #QMAKE_CXXFLAGS_DEBUG +=
-+ #QMAKE_CFLAGS_DEBUG +=
-
- DEFINES += USE_CMD_ARGS
-
-diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro
-index 30b2af946..1a721643e 100644
---- a/retroshare-gui/src/retroshare-gui.pro
-+++ b/retroshare-gui/src/retroshare-gui.pro
-@@ -170,14 +170,14 @@ win32-g++ {
- QMAKE_LFLAGS+=-Wl,--exclude-libs,ALL
-
- # Switch off optimization for release version
-- QMAKE_CXXFLAGS_RELEASE -= -O2
-- QMAKE_CXXFLAGS_RELEASE += -O0
-- QMAKE_CFLAGS_RELEASE -= -O2
-- QMAKE_CFLAGS_RELEASE += -O0
-+ QMAKE_CXXFLAGS_RELEASE -=
-+ QMAKE_CXXFLAGS_RELEASE +=
-+ QMAKE_CFLAGS_RELEASE -=
-+ QMAKE_CFLAGS_RELEASE +=
-
- # Switch on optimization for debug version
-- #QMAKE_CXXFLAGS_DEBUG += -O2
-- #QMAKE_CFLAGS_DEBUG += -O2
-+ #QMAKE_CXXFLAGS_DEBUG +=
-+ #QMAKE_CFLAGS_DEBUG +=
-
- OBJECTS_DIR = temp/obj
-
-diff --git a/retroshare.pri b/retroshare.pri
-index c4f47aedf..6b1f0961f 100644
---- a/retroshare.pri
-+++ b/retroshare.pri
-@@ -308,11 +308,11 @@ rs_chatserver {
- }
-
- debug {
-- QMAKE_CXXFLAGS -= -O2 -fomit-frame-pointer
-- QMAKE_CFLAGS -= -O2 -fomit-frame-pointer
-+ QMAKE_CXXFLAGS -= -fomit-frame-pointer
-+ QMAKE_CFLAGS -= -fomit-frame-pointer
-
-- QMAKE_CXXFLAGS *= -O0 -g -fno-omit-frame-pointer
-- QMAKE_CFLAGS *= -O0 -g -fno-omit-frame-pointer
-+ QMAKE_CXXFLAGS *= -g -fno-omit-frame-pointer
-+ QMAKE_CFLAGS *= -g -fno-omit-frame-pointer
- }
-
- profiling {
-diff --git a/supportlibs/pegmarkdown/pegmarkdown.pro b/supportlibs/pegmarkdown/pegmarkdown.pro
-index cc21ccaf3..9fc25562c 100644
---- a/supportlibs/pegmarkdown/pegmarkdown.pro
-+++ b/supportlibs/pegmarkdown/pegmarkdown.pro
-@@ -10,7 +10,7 @@ QMAKE_CC = gcc
-
- #CONFIG += debug
- debug {
-- QMAKE_CFLAGS -= -O2
-+ QMAKE_CFLAGS -=
- QMAKE_CFLAGS *= -g
- }
-
-@@ -39,8 +39,8 @@ win32 {
- QMAKE_CFLAGS += -Wextra
-
- # Switch off optimization for release version
-- QMAKE_CFLAGS_RELEASE -= -O2
-- QMAKE_CFLAGS_RELEASE += -O0
-+ QMAKE_CFLAGS_RELEASE -=
-+ QMAKE_CFLAGS_RELEASE +=
-
- CONFIG += dummy_glib
-
-diff --git a/tests/librssimulator/librssimulator.pro b/tests/librssimulator/librssimulator.pro
-index 94c942f53..e7432ca38 100644
---- a/tests/librssimulator/librssimulator.pro
-+++ b/tests/librssimulator/librssimulator.pro
-@@ -14,7 +14,7 @@ profiling {
-
-
- debug {
-- QMAKE_CXXFLAGS -= -O2 -fomit-frame-pointer
-+ QMAKE_CXXFLAGS -= -fomit-frame-pointer
- QMAKE_CXXFLAGS *= -g -fno-omit-frame-pointer
- }
-
-@@ -159,14 +159,14 @@ win32 {
- QMAKE_CXXFLAGS += -Wextra
-
- # Switch off optimization for release version
-- QMAKE_CXXFLAGS_RELEASE -= -O2
-- QMAKE_CXXFLAGS_RELEASE += -O0
-- QMAKE_CFLAGS_RELEASE -= -O2
-- QMAKE_CFLAGS_RELEASE += -O0
-+ QMAKE_CXXFLAGS_RELEASE -=
-+ QMAKE_CXXFLAGS_RELEASE +=
-+ QMAKE_CFLAGS_RELEASE -=
-+ QMAKE_CFLAGS_RELEASE +=
-
- # Switch on optimization for debug version
-- #QMAKE_CXXFLAGS_DEBUG += -O2
-- #QMAKE_CFLAGS_DEBUG += -O2
-+ #QMAKE_CXXFLAGS_DEBUG +=
-+ #QMAKE_CFLAGS_DEBUG +=
-
- DEFINES += USE_CMD_ARGS
-
-diff --git a/tests/unittests/libretroshare/gxs/gen_exchange/genexchange_test.pro b/tests/unittests/libretroshare/gxs/gen_exchange/genexchange_test.pro
-index d95c4bcd4..82f921fc8 100644
---- a/tests/unittests/libretroshare/gxs/gen_exchange/genexchange_test.pro
-+++ b/tests/unittests/libretroshare/gxs/gen_exchange/genexchange_test.pro
-@@ -36,7 +36,7 @@ debug {
- # DEFINES *= P3TURTLE_DEBUG FT_DEBUG DEBUG_FTCHUNK MPLEX_DEBUG
- # DEFINES *= STATUS_DEBUG SERV_DEBUG RSSERIAL_DEBUG #CONN_DEBUG
-
-- QMAKE_CXXFLAGS -= -O2 -fomit-frame-pointer
-+ QMAKE_CXXFLAGS -= -fomit-frame-pointer
- QMAKE_CXXFLAGS *= -g -fno-omit-frame-pointer
- }
- ################################# Linux ##########################################
-@@ -85,14 +85,14 @@ win32 {
- QMAKE_CXXFLAGS += -Wextra
-
- # Switch off optimization for release version
-- QMAKE_CXXFLAGS_RELEASE -= -O2
-- QMAKE_CXXFLAGS_RELEASE += -O0
-- QMAKE_CFLAGS_RELEASE -= -O2
-- QMAKE_CFLAGS_RELEASE += -O0
-+ QMAKE_CXXFLAGS_RELEASE -=
-+ QMAKE_CXXFLAGS_RELEASE +=
-+ QMAKE_CFLAGS_RELEASE -=
-+ QMAKE_CFLAGS_RELEASE +=
-
- # Switch on optimization for debug version
-- #QMAKE_CXXFLAGS_DEBUG += -O2
-- #QMAKE_CFLAGS_DEBUG += -O2
-+ #QMAKE_CXXFLAGS_DEBUG +=
-+ #QMAKE_CFLAGS_DEBUG +=
-
- # PRE_TARGETDEPS += ../../libretroshare/src/lib/libretroshare.a
- PRE_TARGETDEPS += ../../../../../libretroshare/libretroshare-build-desktop/lib/libretroshare.a
-diff --git a/tests/unittests/unittests.pro b/tests/unittests/unittests.pro
-index c17be5b77..6721f39d7 100644
---- a/tests/unittests/unittests.pro
-+++ b/tests/unittests/unittests.pro
-@@ -120,14 +120,14 @@ win32 {
- QMAKE_LFLAGS += -Wl,--start-group
-
- # Switch off optimization for release version
-- QMAKE_CXXFLAGS_RELEASE -= -O2
-- QMAKE_CXXFLAGS_RELEASE += -O0
-- QMAKE_CFLAGS_RELEASE -= -O2
-- QMAKE_CFLAGS_RELEASE += -O0
-+ QMAKE_CXXFLAGS_RELEASE -=
-+ QMAKE_CXXFLAGS_RELEASE +=
-+ QMAKE_CFLAGS_RELEASE -=
-+ QMAKE_CFLAGS_RELEASE +=
-
- # Switch on optimization for debug version
-- #QMAKE_CXXFLAGS_DEBUG += -O2
-- #QMAKE_CFLAGS_DEBUG += -O2
-+ #QMAKE_CXXFLAGS_DEBUG +=
-+ #QMAKE_CFLAGS_DEBUG +=
-
- OBJECTS_DIR = temp/obj
- #LIBS += -L"D/Qt/2009.03/qt/plugins/imageformats"
diff --git a/packages/net-p2p/retroshare/files/clang.patch b/packages/net-p2p/retroshare/files/clang.patch
deleted file mode 100644
index 56663c5..0000000
--- a/packages/net-p2p/retroshare/files/clang.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/libretroshare/src/util/cxx11retrocompat.h b/libretroshare/src/util/cxx11retrocompat.h
-index 587b1374d..2acf87995 100644
---- a/libretroshare/src/util/cxx11retrocompat.h
-+++ b/libretroshare/src/util/cxx11retrocompat.h
-@@ -19,11 +19,13 @@
-
- #ifdef __GNUC__
- # define GCC_VERSION (__GNUC__*10000+__GNUC_MINOR__*100+__GNUC_PATCHLEVEL__)
--# if GCC_VERSION < 40700
--# define override
--# define final
--# endif // GCC version < 40700
--# if GCC_VERSION < 40600
--# define nullptr NULL
--# endif // GCC_VERSION < 40600
-+# ifndef __clang__
-+# if GCC_VERSION < 40700
-+# define override
-+# define final
-+# endif // GCC version < 40700
-+# if GCC_VERSION < 40600
-+# define nullptr NULL
-+# endif // GCC_VERSION < 40600
-+# endif //__clang__
- #endif //defined GNUC
diff --git a/packages/net-p2p/retroshare/files/copy_lobby_name_to_clipboard.patch b/packages/net-p2p/retroshare/files/copy_lobby_name_to_clipboard.patch
deleted file mode 100644
index a1efe6b..0000000
--- a/packages/net-p2p/retroshare/files/copy_lobby_name_to_clipboard.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.cpp b/retroshare-gui/src/gui/ChatLobbyWidget.cpp
-index 1ec3d39f0..37c630e1e 100644
---- a/retroshare-gui/src/gui/ChatLobbyWidget.cpp
-+++ b/retroshare-gui/src/gui/ChatLobbyWidget.cpp
-@@ -25,6 +25,7 @@
- #include <QTextBrowser>
- #include <QTimer>
- #include <QTreeWidget>
-+#include <QClipboard>
-
- #include <algorithm>
- #include <time.h>
-@@ -325,6 +326,9 @@ void ChatLobbyWidget::lobbyTreeWidgetCustomPopupMenu(QPoint)
- contextMnu.addAction(QIcon(IMAGE_SUBSCRIBE), tr("Add Auto Subscribe"), this, SLOT(autoSubscribeItem()));
-
- contextMnu.addAction(QIcon(IMAGE_COPYRSLINK), tr("Copy RetroShare Link"), this, SLOT(copyItemLink()));
-+
-+ if(!item->text(COLUMN_NAME).isEmpty())
-+ contextMnu.addAction(QIcon(IMAGE_COPYRSLINK), tr("Copy name to clipboard"), this, SLOT(copyLobbyNameToClipboard()));
- }
-
- contextMnu.addSeparator();//-------------------------------------------------------------------
-@@ -898,9 +902,8 @@ void ChatLobbyWidget::autoSubscribeItem()
- void ChatLobbyWidget::copyItemLink()
- {
- QTreeWidgetItem *item = ui.lobbyTreeWidget->currentItem();
-- if (item == NULL || item->type() != TYPE_LOBBY) {
-+ if (item == NULL) //this is always lobby, do not need to check twice
- return;
-- }
-
- ChatLobbyId id = item->data(COLUMN_DATA, ROLE_ID).toULongLong();
- QString name = item->text(COLUMN_NAME);
-@@ -913,6 +916,18 @@ void ChatLobbyWidget::copyItemLink()
- }
- }
-
-+
-+void ChatLobbyWidget::copyLobbyNameToClipboard()
-+{
-+ QTreeWidgetItem *item = ui.lobbyTreeWidget->currentItem();
-+ if (item == NULL)
-+ return;
-+
-+ QClipboard *clipboard = QGuiApplication::clipboard();
-+ clipboard->setText(item->text(COLUMN_NAME));
-+}
-+
-+
- QTreeWidgetItem *ChatLobbyWidget::getTreeWidgetItem(ChatLobbyId id)
- {
- for(int p=0;p<4;++p)
-diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.h b/retroshare-gui/src/gui/ChatLobbyWidget.h
-index cc3c26af3..86dadb7f0 100644
---- a/retroshare-gui/src/gui/ChatLobbyWidget.h
-+++ b/retroshare-gui/src/gui/ChatLobbyWidget.h
-@@ -79,6 +79,7 @@ protected slots:
- void updatePeerLeaving(ChatLobbyId);
- void autoSubscribeItem();
- void copyItemLink();
-+ void copyLobbyNameToClipboard();
-
- private slots:
- void filterColumnChanged(int);
diff --git a/packages/net-p2p/retroshare/files/disable_key_array_redraw.patch b/packages/net-p2p/retroshare/files/disable_key_array_redraw.patch
deleted file mode 100644
index 8bca5fa..0000000
--- a/packages/net-p2p/retroshare/files/disable_key_array_redraw.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/retroshare-gui/src/gui/NetworkView.cpp b/retroshare-gui/src/gui/NetworkView.cpp
-index 44c99736d..a4d452ec0 100644
---- a/retroshare-gui/src/gui/NetworkView.cpp
-+++ b/retroshare-gui/src/gui/NetworkView.cpp
-@@ -36,7 +36,7 @@
-
- /** Constructor */
- NetworkView::NetworkView(QWidget *parent)
--: RsAutoUpdatePage(60000,parent)
-+/*: RsAutoUpdatePage(60000,parent) */
- {
- /* Invoke the Qt Designer generated object setup routine */
- ui.setupUi(this);
-@@ -90,9 +90,9 @@ void NetworkView::changedFoFCheckBox( )
- }
- void NetworkView::redraw()
- {
-- ui.graphicsView->clearNodesPositions() ;
-+/* ui.graphicsView->clearNodesPositions() ;
- clear() ;
-- updateDisplay() ;
-+ updateDisplay() ; */
- }
-
- void NetworkView::clear()
diff --git a/packages/net-p2p/retroshare/files/hidden_service.patch b/packages/net-p2p/retroshare/files/hidden_service.patch
deleted file mode 100644
index 8efb5b1..0000000
--- a/packages/net-p2p/retroshare/files/hidden_service.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff --git a/libretroshare/src/pqi/p3netmgr.cc b/libretroshare/src/pqi/p3netmgr.cc
-index 3381705cd..70c6e81cd 100644
---- a/libretroshare/src/pqi/p3netmgr.cc
-+++ b/libretroshare/src/pqi/p3netmgr.cc
-@@ -996,7 +996,7 @@ bool p3NetMgrIMPL::checkNetAddress()
- std::cerr << "p3NetMgrIMPL::checkNetAddress() LOOPBACK ... forcing to 127.0.0.1";
- std::cerr << std::endl;
- #endif
-- sockaddr_storage_ipv4_aton(prefAddr, "127.0.0.1");
-+ sockaddr_storage_ipv4_aton(prefAddr, "0.0.0.0");
- validAddr = true;
- }
- else
-diff --git a/libretroshare/src/pqi/p3peermgr.cc b/libretroshare/src/pqi/p3peermgr.cc
-index d1e9e4e97..377d14ce5 100644
---- a/libretroshare/src/pqi/p3peermgr.cc
-+++ b/libretroshare/src/pqi/p3peermgr.cc
-@@ -80,7 +80,7 @@ static struct RsLog::logInfo p3peermgrzoneInfo = {RsLog::Default, "p3peermgr"};
- #define MAX_AVAIL_PERIOD 230 //times a peer stay in available state when not connected
- #define MIN_RETRY_PERIOD 140
-
--static const std::string kConfigDefaultProxyServerIpAddr = "127.0.0.1";
-+static const std::string kConfigDefaultProxyServerIpAddr = "0.0.0.0";
- static const uint16_t kConfigDefaultProxyServerPortTor = 9050; // standard port.
- static const uint16_t kConfigDefaultProxyServerPortI2P = 4447; // I2Pd's standard port
-
-diff --git a/libretroshare/src/rsserver/p3peers.cc b/libretroshare/src/rsserver/p3peers.cc
-index c6d686469..0f3323eba 100644
---- a/libretroshare/src/rsserver/p3peers.cc
-+++ b/libretroshare/src/rsserver/p3peers.cc
-@@ -314,7 +314,7 @@ bool p3Peers::getPeerDetails(const RsPeerId& id, RsPeerDetails &d)
-
- if(sockaddr_storage_isnull(ps.localaddr)) // that happens if the address is not initialised.
- {
-- d.localAddr = "INVALID_IP";
-+ d.localAddr = "0.0.0.0";
- d.localPort = 0 ;
- }
- else
-diff --git a/libretroshare/src/rsserver/rsinit.cc b/libretroshare/src/rsserver/rsinit.cc
-index 095dbaeaf..0be569c14 100644
---- a/libretroshare/src/rsserver/rsinit.cc
-+++ b/libretroshare/src/rsserver/rsinit.cc
-@@ -127,7 +127,7 @@ class RsInitConfig
-
- /* Listening Port */
- bool forceExtPort;
-- bool forceLocalAddr;
-+// bool forceLocalAddr;
- unsigned short port;
- std::string inet ;
-
-@@ -188,7 +188,7 @@ void RsInit::InitRsConfig()
-
- rsInitConfig->load_trustedpeer = false;
- rsInitConfig->port = 0 ;
-- rsInitConfig->forceLocalAddr = false;
-+// rsInitConfig->forceLocalAddr = false;
- rsInitConfig->haveLogFile = false;
- rsInitConfig->outStderr = false;
- rsInitConfig->forceExtPort = false;
-@@ -359,7 +359,7 @@ int RsInit::InitRetroShare(int argc, char **argv, bool /* strictCheck */)
- if(rsInitConfig->autoLogin) rsInitConfig->startMinimised = true ;
- if(rsInitConfig->outStderr) rsInitConfig->haveLogFile = false ;
- if(!rsInitConfig->logfname.empty()) rsInitConfig->haveLogFile = true;
-- if(rsInitConfig->inet != "127.0.0.1") rsInitConfig->forceLocalAddr = true;
-+// if(rsInitConfig->inet != "127.0.0.1") rsInitConfig->forceLocalAddr = true;
- #ifdef LOCALNET_TESTING
- if(!portRestrictions.empty()) doPortRestrictions = true;
- #endif
-@@ -1684,23 +1684,23 @@ int RsServer::StartupRetroShare()
- /**************************************************************************/
- std::cerr << "Force Any Configuration before Startup (After Load)" << std::endl;
-
-- if (rsInitConfig->forceLocalAddr)
-- {
-- struct sockaddr_storage laddr;
--
-- /* clean sockaddr before setting values (MaxOSX) */
-- sockaddr_storage_clear(laddr);
--
-- struct sockaddr_in *lap = (struct sockaddr_in *) &laddr;
--
-- lap->sin_family = AF_INET;
-- lap->sin_port = htons(rsInitConfig->port);
--
-- // universal
-- lap->sin_addr.s_addr = inet_addr(rsInitConfig->inet.c_str());
--
-- mPeerMgr->setLocalAddress(ownId, laddr);
-- }
-+// if (rsInitConfig->forceLocalAddr)
-+// {
-+// struct sockaddr_storage laddr;
-+//
-+// /* clean sockaddr before setting values (MaxOSX) */
-+// sockaddr_storage_clear(laddr);
-+//
-+// struct sockaddr_in *lap = (struct sockaddr_in *) &laddr;
-+//
-+// lap->sin_family = AF_INET;
-+// lap->sin_port = htons(rsInitConfig->port);
-+//
-+// // universal
-+// lap->sin_addr.s_addr = inet_addr(rsInitConfig->inet.c_str());
-+//
-+// mPeerMgr->setLocalAddress(ownId, laddr);
-+// }
-
- if (rsInitConfig->forceExtPort)
- {
diff --git a/packages/net-p2p/retroshare/files/retroshare-0.6.0-fix-build.patch b/packages/net-p2p/retroshare/files/retroshare-0.6.0-fix-build.patch
deleted file mode 100644
index aa220cb..0000000
--- a/packages/net-p2p/retroshare/files/retroshare-0.6.0-fix-build.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From ed867c52bd0497d0017eadc24d0c2cf678efa9e0 Mon Sep 17 00:00:00 2001
-From: Julian Ospald <hasufell@posteo.de>
-Date: Fri, 27 May 2016 18:07:28 +0200
-Subject: [PATCH] Don't hardcode g++ in the toolchain settings
-Upstream: merged, https://github.com/RetroShare/RetroShare/pull/395
-
-Although it's already quite ugly that we overwrite QMAKE_CC like this,
-hardcoding 'g++' can break the build where prefixed versions of
-the toolchain are expected and where QMAKE_CXX is already properly
-defined. So we just use QMAKE_CXX variable here.
-
-This fixes build failures on some distributions, e.g.
-https://galileo.mailstation.de/jenkins/job/lipidity/36/console
----
- libbitdht/src/libbitdht.pro | 6 +++---
- libretroshare/src/libretroshare.pro | 6 +++---
- tests/librssimulator/librssimulator.pro | 6 +++---
- 3 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/libbitdht/src/libbitdht.pro b/libbitdht/src/libbitdht.pro
-index a525159..738deea 100644
---- a/libbitdht/src/libbitdht.pro
-+++ b/libbitdht/src/libbitdht.pro
-@@ -29,7 +29,7 @@ debug {
-
- ################################# Linux ##########################################
- linux-* {
-- QMAKE_CC = g++
-+ QMAKE_CC = $${QMAKE_CXX}
- }
-
- linux-g++ {
-@@ -64,7 +64,7 @@ win32-x-g++ {
- ################################# Windows ##########################################
-
- win32 {
-- QMAKE_CC = g++
-+ QMAKE_CC = $${QMAKE_CXX}
- OBJECTS_DIR = temp/obj
- MOC_DIR = temp/moc
- DEFINES *= STATICLIB WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T
-@@ -89,7 +89,7 @@ win32 {
- ################################# MacOSX ##########################################
-
- mac {
-- QMAKE_CC = g++
-+ QMAKE_CC = $${QMAKE_CXX}
- OBJECTS_DIR = temp/obj
- MOC_DIR = temp/moc
- }
-diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro
-index d01d4c9..d9e64d3 100644
---- a/libretroshare/src/libretroshare.pro
-+++ b/libretroshare/src/libretroshare.pro
-@@ -122,7 +122,7 @@ linux-* {
- CONFIG += link_pkgconfig
-
- QMAKE_CXXFLAGS *= -Wall -D_FILE_OFFSET_BITS=64
-- QMAKE_CC = g++
-+ QMAKE_CC = $${QMAKE_CXX}
-
- contains(CONFIG, NO_SQLCIPHER) {
- DEFINES *= NO_SQLCIPHER
-@@ -225,7 +225,7 @@ win32-x-g++ {
- ################################# Windows ##########################################
-
- win32 {
-- QMAKE_CC = g++
-+ QMAKE_CC = $${QMAKE_CXX}
- OBJECTS_DIR = temp/obj
- MOC_DIR = temp/moc
- DEFINES *= WINDOWS_SYS WIN32 STATICLIB MINGW WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T
-@@ -259,7 +259,7 @@ win32 {
- ################################# MacOSX ##########################################
-
- mac {
-- QMAKE_CC = g++
-+ QMAKE_CC = $${QMAKE_CXX}
- OBJECTS_DIR = temp/obj
- MOC_DIR = temp/moc
- #DEFINES = WINDOWS_SYS WIN32 STATICLIB MINGW
-diff --git a/tests/librssimulator/librssimulator.pro b/tests/librssimulator/librssimulator.pro
-index 14f1d5c..5211e7e 100644
---- a/tests/librssimulator/librssimulator.pro
-+++ b/tests/librssimulator/librssimulator.pro
-@@ -70,7 +70,7 @@ linux-* {
-
- DESTDIR = lib
- QMAKE_CXXFLAGS *= -Wall -D_FILE_OFFSET_BITS=64
-- QMAKE_CC = g++
-+ QMAKE_CC = $${QMAKE_CXX}
-
- SSL_DIR = /usr/include/openssl
- UPNP_DIR = /usr/include/upnp
-@@ -143,7 +143,7 @@ win32-x-g++ {
- ################################# Windows ##########################################
-
- win32 {
-- QMAKE_CC = g++
-+ QMAKE_CC = $${QMAKE_CXX}
- OBJECTS_DIR = temp/obj
- MOC_DIR = temp/moc
- DEFINES *= WINDOWS_SYS WIN32 STATICLIB MINGW WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T
-@@ -188,7 +188,7 @@ win32 {
- ################################# MacOSX ##########################################
-
- mac {
-- QMAKE_CC = g++
-+ QMAKE_CC = $${QMAKE_CXX}
- OBJECTS_DIR = temp/obj
- MOC_DIR = temp/moc
- #DEFINES = WINDOWS_SYS WIN32 STATICLIB MINGW
---
-2.8.3
-
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-06 05:46:55 +0000