better solution for mpv shit from https://bugs.gentoo.org/show_bug.cgi?id=635650

1 files changed, 38 insertions, 8 deletions

diff --git a/net-p2p/retroshare/files/keyring_bgcolors+potential_crash_fix.patch b/net-p2p/retroshare/files/keyring_bgcolors+potential_crash_fix.patch
index 9ee9631..4b143bf 100644
--- a/net-p2p/retroshare/files/keyring_bgcolors+potential_crash_fix.patch
+++ b/net-p2p/retroshare/files/keyring_bgcolors+potential_crash_fix.patch
@@ -1,5 +1,28 @@
+diff --git a/RetroShare.pro b/RetroShare.pro
+index 833173029..dba75453e 100644
+--- a/RetroShare.pro
++++ b/RetroShare.pro
+@@ -56,12 +56,12 @@ retroshare_qml_app {
+     }
+ }
+ 
+-retroshare_plugins {
+-    SUBDIRS += plugins
+-    plugins.file = plugins/plugins.pro
+-    plugins.depends = retroshare_gui
+-    plugins.target = plugins
+-}
++#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 bc5ea3e06..0e4632201 100644
+index bc5ea3e06..50a2afcdd 100644
 --- a/retroshare-gui/src/gui/NetworkDialog.cpp
 +++ b/retroshare-gui/src/gui/NetworkDialog.cpp
 @@ -58,18 +58,22 @@
@@ -29,7 +52,14 @@ index bc5ea3e06..0e4632201 100644
  

  //RsPeerId getNeighRsCertId(QTreeWidgetItem *i);

  

-@@ -83,6 +87,7 @@ static const unsigned int ROLE_SORT = Qt::UserRole + 1 ;
+@@ -77,12 +81,13 @@
+  * #define NET_DEBUG 1

+  *****/

+ 

+-static const unsigned int ROLE_SORT = Qt::UserRole + 1 ;

++//static const unsigned int ROLE_SORT = Qt::UserRole + 1 ;

+ 

+ /** Constructor */

  NetworkDialog::NetworkDialog(QWidget *parent)

  {

      /* Invoke the Qt Designer generated object setup routine */

@@ -186,7 +216,7 @@ index 40c29fa4c..3b16dc57e 100644
      }
      //update data in ui, to avoid unnecessary redraw and ui updates, updating only changed elements
 diff --git a/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.h b/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.h
-index 8dc31d276..75b681ac1 100644
+index 8dc31d276..d4c78c56a 100644
 --- a/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.h
 +++ b/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.h
 @@ -3,6 +3,12 @@
@@ -212,11 +242,11 @@ index 8dc31d276..75b681ac1 100644
 +        mBackgroundColorSelf(_mBackgroundColorSelf), mBackgroundColorOwnSign(_mBackgroundColorOwnSign), mBackgroundColorAcceptConnection(_mBackgroundColorAcceptConnection),
 +        mBackgroundColorHasSignedMe(_mBackgroundColorHasSignedMe), mBackgroundColorDenied(_mBackgroundColorDenied)
 +    {}
-+    QColor &mBackgroundColorSelf;
-+    QColor &mBackgroundColorOwnSign;
-+    QColor &mBackgroundColorAcceptConnection;
-+    QColor &mBackgroundColorHasSignedMe;
-+    QColor &mBackgroundColorDenied;
++    QColor mBackgroundColorSelf;
++    QColor mBackgroundColorOwnSign;
++    QColor mBackgroundColorAcceptConnection;
++    QColor mBackgroundColorHasSignedMe;
++    QColor mBackgroundColorDenied;
 +};
 +