minitube: deps fix

retrosahre: hidden service patch updated for latest git

2 files changed, 16 insertions, 37 deletions

diff --git a/media-video/minitube/minitube-scm.ebuild b/media-video/minitube/minitube-scm.ebuild
index 6de970b..d7d4864 100644
--- a/media-video/minitube/minitube-scm.ebuild
+++ b/media-video/minitube/minitube-scm.ebuild
@@ -21,8 +21,8 @@ IUSE="debug download gstreamer kde"
 DEPEND="dev-qt/qtgui:5[accessibility]
 	dev-qt/qtdbus:5
 	dev-qt/qtsql:5
-	kde? ( || ( media-libs/phonon[gstreamer?,qt5] dev-qt/qtphonon:5 ) )
-	!kde? ( || ( dev-qt/qtphonon:5 media-libs/phonon[gstreamer?,qt5] ) )
+	kde? ( || ( media-libs/phonon[gstreamer?] dev-qt/qtphonon:5 ) )
+	!kde? ( || ( dev-qt/qtphonon:5 media-libs/phonon[gstreamer?] ) )
 	gstreamer? (
 		media-plugins/gst-plugins-soup
 		media-plugins/gst-plugins-ffmpeg
diff --git a/net-p2p/retroshare/files/hidden_service.patch b/net-p2p/retroshare/files/hidden_service.patch
index e1e2de4..8efb5b1 100644
--- a/net-p2p/retroshare/files/hidden_service.patch
+++ b/net-p2p/retroshare/files/hidden_service.patch
@@ -1,21 +1,21 @@
 diff --git a/libretroshare/src/pqi/p3netmgr.cc b/libretroshare/src/pqi/p3netmgr.cc
-index a34119ed5..895ffe8c0 100644
+index 3381705cd..70c6e81cd 100644
 --- a/libretroshare/src/pqi/p3netmgr.cc
 +++ b/libretroshare/src/pqi/p3netmgr.cc
-@@ -1015,7 +1015,7 @@ bool p3NetMgrIMPL::checkNetAddress()
+@@ -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");
+-		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 f224465a5..8319ef7b1 100644
+index d1e9e4e97..377d14ce5 100644
 --- a/libretroshare/src/pqi/p3peermgr.cc
 +++ b/libretroshare/src/pqi/p3peermgr.cc
-@@ -74,7 +74,7 @@ static struct RsLog::logInfo p3peermgrzoneInfo = {RsLog::Default, "p3peermgr"};
+@@ -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
  
@@ -24,45 +24,24 @@ index f224465a5..8319ef7b1 100644
  static const uint16_t    kConfigDefaultProxyServerPortTor = 9050; // standard port.
  static const uint16_t    kConfigDefaultProxyServerPortI2P = 4447; // I2Pd's standard port
  
-@@ -215,7 +215,7 @@ bool p3PeerMgrIMPL::forceHiddenNode()
- 	// Force the Port.
- 	struct sockaddr_storage loopback;
- 	sockaddr_storage_clear(loopback);
--	sockaddr_storage_ipv4_aton(loopback, "127.0.0.1");
-+	sockaddr_storage_ipv4_aton(loopback, "0.0.0.0");
- 	uint16_t port = sockaddr_storage_port(mOwnState.localaddr); 
- 	sockaddr_storage_ipv4_setport(loopback, port); 
- 
 diff --git a/libretroshare/src/rsserver/p3peers.cc b/libretroshare/src/rsserver/p3peers.cc
-index 113489cd6..853067759 100644
+index c6d686469..0f3323eba 100644
 --- a/libretroshare/src/rsserver/p3peers.cc
 +++ b/libretroshare/src/rsserver/p3peers.cc
-@@ -311,9 +311,9 @@ bool p3Peers::getPeerDetails(const RsPeerId& id, RsPeerDetails &d)
- 		d.hiddenNodePort = ps.hiddenPort;
- 		d.hiddenType = ps.hiddenType;
+@@ -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.
-+		if(sockaddr_storage_isnull(ps.localaddr) && id != sOwnId)	// that happens if the address is not initialised.
+ 		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
-@@ -334,7 +334,7 @@ bool p3Peers::getPeerDetails(const RsPeerId& id, RsPeerDetails &d)
- 
- 		if (sockaddr_storage_isnull(ps.localaddr))
- 		{
--			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 7593fc590..9e231ec7c 100644
+index 095dbaeaf..0be569c14 100644
 --- a/libretroshare/src/rsserver/rsinit.cc
 +++ b/libretroshare/src/rsserver/rsinit.cc
-@@ -117,7 +117,7 @@ class RsInitConfig
+@@ -127,7 +127,7 @@ class RsInitConfig
  
  		/* Listening Port */
  		bool forceExtPort;
@@ -71,7 +50,7 @@ index 7593fc590..9e231ec7c 100644
  		unsigned short port;
  		std::string inet ;
  
-@@ -178,7 +178,7 @@ void RsInit::InitRsConfig()
+@@ -188,7 +188,7 @@ void RsInit::InitRsConfig()
  
  	rsInitConfig->load_trustedpeer = false;
  	rsInitConfig->port = 0 ;
@@ -80,7 +59,7 @@ index 7593fc590..9e231ec7c 100644
  	rsInitConfig->haveLogFile    = false;
  	rsInitConfig->outStderr      = false;
  	rsInitConfig->forceExtPort   = false;
-@@ -385,7 +385,7 @@ int RsInit::InitRetroShare(int _argc, char **_argv, bool /* strictCheck */)
+@@ -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;
@@ -89,7 +68,7 @@ index 7593fc590..9e231ec7c 100644
  #ifdef LOCALNET_TESTING
  		if(!portRestrictions.empty())       doPortRestrictions           = true;
  #endif
-@@ -1667,23 +1667,23 @@ int RsServer::StartupRetroShare()
+@@ -1684,23 +1684,23 @@ int RsServer::StartupRetroShare()
  	/**************************************************************************/
  	std::cerr << "Force Any Configuration before Startup (After Load)" << std::endl;