diff options
| author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2017-10-24 10:01:13 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2017-10-24 10:01:13 +0300 |
| commit | f0d53737e095ee43be5cf40454c5dcbfa4d25888 (patch) | |
| tree | f28d9a8887c4cb0196b336dfd1bdb402615d471a | |
| parent | 08a6a8060d5ac2fae4c465e5f7f0204f004e1d38 (diff) | |
retroshare: adapted pgpid-gui patch for latest code
| -rw-r--r-- | net-p2p/retroshare/files/pgpid_gui_abstractitemmodel.patch (renamed from net-p2p/retroshare/files/abstractitemmodel_test.patch) | 59 | ||||
| -rw-r--r-- | net-p2p/retroshare/retroshare-scm.ebuild | 2 |
2 files changed, 20 insertions, 41 deletions
diff --git a/net-p2p/retroshare/files/abstractitemmodel_test.patch b/net-p2p/retroshare/files/pgpid_gui_abstractitemmodel.patch index a48d75f..5adb04e 100644 --- a/net-p2p/retroshare/files/abstractitemmodel_test.patch +++ b/net-p2p/retroshare/files/pgpid_gui_abstractitemmodel.patch @@ -1,20 +1,3 @@ -diff --git a/RetroShare.pro b/RetroShare.pro -index 833173029..d22af1418 100644 ---- a/RetroShare.pro -+++ b/RetroShare.pro -@@ -56,12 +56,6 @@ retroshare_qml_app { - } - } - --retroshare_plugins { -- SUBDIRS += plugins -- plugins.file = plugins/plugins.pro -- plugins.depends = retroshare_gui -- plugins.target = plugins --} - - wikipoos { - SUBDIRS += pegmarkdown diff --git a/retroshare-gui/src/gui/NetworkDialog.cpp b/retroshare-gui/src/gui/NetworkDialog.cpp index bdeda264c..d7b864094 100644 --- a/retroshare-gui/src/gui/NetworkDialog.cpp @@ -1249,28 +1232,24 @@ index 2430a1984..8dfa43c48 100644 QObject::connect(notify,SIGNAL(errorOccurred(int,int,const QString&)),w,SLOT(displayErrorMessage(int,int,const QString&))) ; diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro -index b7bc361ce..6c4c821d1 100644 +index 6b3211392..69fbbc93c 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro -@@ -565,7 +565,9 @@ HEADERS += rshare.h \ - gui/GetStartedDialog.h \ - gui/statistics/BWGraph.h \ - util/RsSyntaxHighlighter.h \ -- util/imageutil.h -+ util/imageutil.h \ -+ gui/NetworkDialog/pgpid_item_model.h \ -+ gui/NetworkDialog/pgpid_item_proxy.h - - # gui/ForumsDialog.h \ - # gui/forums/ForumDetails.h \ -@@ -925,7 +927,9 @@ SOURCES += main.cpp \ - gui/statistics/RttStatistics.cpp \ - gui/statistics/BWGraph.cpp \ - util/RsSyntaxHighlighter.cpp \ -- util/imageutil.cpp -+ util/imageutil.cpp \ -+ gui/NetworkDialog/pgpid_item_model.cpp \ -+ gui/NetworkDialog/pgpid_item_proxy.cpp - - # gui/ForumsDialog.cpp \ - # gui/forums/ForumDetails.cpp \ +@@ -558,6 +558,8 @@ HEADERS += rshare.h \ + gui/feeds/SecurityItem.h \ + gui/feeds/SecurityIpItem.h \ + gui/feeds/NewsFeedUserNotify.h \ ++ gui/NetworkDialog/pgpid_item_model.h \ ++ gui/NetworkDialog/pgpid_item_proxy.h \ + gui/connect/ConnectFriendWizard.h \ + gui/connect/ConnectProgressDialog.h \ + gui/groups/CreateGroup.h \ +@@ -911,6 +913,8 @@ SOURCES += main.cpp \ + gui/connect/ConnectProgressDialog.cpp \ + gui/connect/FriendRecommendDialog.cpp \ + gui/groups/CreateGroup.cpp \ ++ gui/NetworkDialog/pgpid_item_model.cpp \ ++ gui/NetworkDialog/pgpid_item_proxy.cpp \ + gui/GetStartedDialog.cpp \ + gui/statistics/BandwidthGraphWindow.cpp \ + gui/statistics/BandwidthStatsWidget.cpp \ diff --git a/net-p2p/retroshare/retroshare-scm.ebuild b/net-p2p/retroshare/retroshare-scm.ebuild index 21fc516..284c93f 100644 --- a/net-p2p/retroshare/retroshare-scm.ebuild +++ b/net-p2p/retroshare/retroshare-scm.ebuild @@ -83,7 +83,7 @@ PATCHES=( "${FILESDIR}/hidden_service.patch" "${FILESDIR}/cflags.patch" "${FILESDIR}/disable_key_array_redraw.patch" - "${FILESDIR}/abstractitemmodel_test.patch" + "${FILESDIR}/pgpid_gui_abstractitemmodel.patch" ) |