Fix zeroconf support, now RDC sessions sent through zeroconf are picked up correctly.

Package-Manager: portage-2.1.2-r8

5 files changed, 167 insertions, 8 deletions

diff --git a/kde-base/krdc/ChangeLog b/kde-base/krdc/ChangeLog
index 40f911d170ee..e03deb22e15e 100644
--- a/kde-base/krdc/ChangeLog
+++ b/kde-base/krdc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/krdc
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/ChangeLog,v 1.67 2007/02/04 02:51:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/ChangeLog,v 1.68 2007/02/07 18:57:59 flameeyes Exp $
+
+*krdc-3.5.6-r1 (07 Feb 2007)
+
+  07 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/krdc-3.5.6-zeroconf.patch, +krdc-3.5.6-r1.ebuild:
+  Fix zeroconf support, now RDC sessions sent through zeroconf are picked up
+  correctly.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -krdc-3.5.2.ebuild:
   Remove old versions.
diff --git a/kde-base/krdc/Manifest b/kde-base/krdc/Manifest
index 95f0807333be..fcfdf8126fca 100644
--- a/kde-base/krdc/Manifest
+++ b/kde-base/krdc/Manifest
@@ -1,20 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX krdc-3.5.6-zeroconf.patch 4001 RMD160 c385a25aede953d28f01e7c82c9c1bc08e9a0c67 SHA1 bab1b61e144629e50cdb8ba2d711a3438ea0bd88 SHA256 bb74791e6d6d02ea915a559772ac8c6c65bfd9d3383c3b1bb9f326ec8aa2ae52
+MD5 15dccc83c0e66f7678e97c6696672407 files/krdc-3.5.6-zeroconf.patch 4001
+RMD160 c385a25aede953d28f01e7c82c9c1bc08e9a0c67 files/krdc-3.5.6-zeroconf.patch 4001
+SHA256 bb74791e6d6d02ea915a559772ac8c6c65bfd9d3383c3b1bb9f326ec8aa2ae52 files/krdc-3.5.6-zeroconf.patch 4001
 DIST kdenetwork-3.5.5.tar.bz2 9235564 RMD160 3e757d10ee5bf24b2ccf131e693fb614b9fdb9f4 SHA1 a95bac9de9770f551870fb73ce456d779ba36878 SHA256 c3f36e69bbd23902f2bdd9a1a8cda93b0436338ada422bb8ac6bc3d2bcd8e38f
 DIST kdenetwork-3.5.6.tar.bz2 9245468 RMD160 2f93badae14fab4d7911c74d2f427e85ca104827 SHA1 494c67139415e3b18a1d5d054d872e90b8289832 SHA256 786e6c25d5cba4ed1eeac947c5554d7fe57de593abf6551c58c178043b82475e
 EBUILD krdc-3.5.5.ebuild 702 RMD160 4da220ea9152b999cd5a31106f360c1c0795e2f6 SHA1 22a91f76085cce35c0f8c8752e10b3ee534a95db SHA256 aadb1df6d671945c7029b2166df119aa9645d1e6e76a296fa53849af66085d44
 MD5 8dd4363e65bb11324e8852bd4ce48d1e krdc-3.5.5.ebuild 702
 RMD160 4da220ea9152b999cd5a31106f360c1c0795e2f6 krdc-3.5.5.ebuild 702
 SHA256 aadb1df6d671945c7029b2166df119aa9645d1e6e76a296fa53849af66085d44 krdc-3.5.5.ebuild 702
+EBUILD krdc-3.5.6-r1.ebuild 756 RMD160 1fda607897bffdc128a6a42d0a6e5e4720346ac7 SHA1 8307bec68419f4035fd0300b39b7899feee4ce85 SHA256 162ff0b4c7b36b1c74f0994256569aca12281ab710e5ea2a01a7f6079193bfa0
+MD5 cd2ee30f77cf20bfc073f7e78e622dcf krdc-3.5.6-r1.ebuild 756
+RMD160 1fda607897bffdc128a6a42d0a6e5e4720346ac7 krdc-3.5.6-r1.ebuild 756
+SHA256 162ff0b4c7b36b1c74f0994256569aca12281ab710e5ea2a01a7f6079193bfa0 krdc-3.5.6-r1.ebuild 756
 EBUILD krdc-3.5.6.ebuild 711 RMD160 22557e3dc976691ff396a53ec8ab8c646cb84f3b SHA1 8450f11bc0d1da4f2195b69e06ef1a4151e0cb9b SHA256 3f83dcd91d8a23fe4b6ad0f24e426d82bce8d2933aba00935153641e58723c18
 MD5 d12f25aa408ebed672cc59c7a1a448d0 krdc-3.5.6.ebuild 711
 RMD160 22557e3dc976691ff396a53ec8ab8c646cb84f3b krdc-3.5.6.ebuild 711
 SHA256 3f83dcd91d8a23fe4b6ad0f24e426d82bce8d2933aba00935153641e58723c18 krdc-3.5.6.ebuild 711
-MISC ChangeLog 7878 RMD160 8521ffc660e7e3e4a5cfa8b33b8f8bb82aadc8a3 SHA1 52f783f861a8f94890112eb3bda4b6b956705b2c SHA256 7d1c6e9f36b07772f0201b83bd56dc6a14ae622ad51be77146fad14b747fb663
-MD5 3f8efc46b24a83774e65435c530e400c ChangeLog 7878
-RMD160 8521ffc660e7e3e4a5cfa8b33b8f8bb82aadc8a3 ChangeLog 7878
-SHA256 7d1c6e9f36b07772f0201b83bd56dc6a14ae622ad51be77146fad14b747fb663 ChangeLog 7878
+MISC ChangeLog 8111 RMD160 962fa1ff069df6c543fe1c3c2b51b46ca4e04a79 SHA1 b7293f18db73e7cfa91d2f04e9912364e6e98111 SHA256 80304db8fe387e9ed30c6bfa7cd5d458b51e6bee4ec238f9f1e5b862bca857bf
+MD5 0530fa354fb2a24cbc884a5152046c4a ChangeLog 8111
+RMD160 962fa1ff069df6c543fe1c3c2b51b46ca4e04a79 ChangeLog 8111
+SHA256 80304db8fe387e9ed30c6bfa7cd5d458b51e6bee4ec238f9f1e5b862bca857bf ChangeLog 8111
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -25,10 +33,13 @@ SHA256 64b6a68abeb7c279962ba59f88e31312dc4d1a4481371fd6cd87cb9f8f7a2730 files/di
 MD5 76be1bed4c1cd8adc1774b615c42c267 files/digest-krdc-3.5.6 256
 RMD160 9911b86823e6f8ea822b1b0acaa249c67e6e672c files/digest-krdc-3.5.6 256
 SHA256 60333dfe7ae128644368665b33d16628d6e0e23051d08abdc9d66568b40ff701 files/digest-krdc-3.5.6 256
+MD5 76be1bed4c1cd8adc1774b615c42c267 files/digest-krdc-3.5.6-r1 256
+RMD160 9911b86823e6f8ea822b1b0acaa249c67e6e672c files/digest-krdc-3.5.6-r1 256
+SHA256 60333dfe7ae128644368665b33d16628d6e0e23051d08abdc9d66568b40ff701 files/digest-krdc-3.5.6-r1 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFxUofAiZjviIA2XgRAvy6AKCqDgj0nXXURX4//2en/RRVT6ScpQCePMiO
-Ye5E5a41s6pUgmcPK32+5UQ=
-=Mb5Q
+iD8DBQFFyiFBAiZjviIA2XgRAi9kAJ47gRx1SA73ROCXk0RWfONc1AtM+ACgvwDr
+W3LUYLU/EMOTMFIuHkFt8aM=
+=i11D
 -----END PGP SIGNATURE-----
diff --git a/kde-base/krdc/files/digest-krdc-3.5.6-r1 b/kde-base/krdc/files/digest-krdc-3.5.6-r1
new file mode 100644
index 000000000000..2cf4d746b54e
--- /dev/null
+++ b/kde-base/krdc/files/digest-krdc-3.5.6-r1
@@ -0,0 +1,3 @@
+MD5 0f428cccc4ea16aa53c427530874c591 kdenetwork-3.5.6.tar.bz2 9245468
+RMD160 2f93badae14fab4d7911c74d2f427e85ca104827 kdenetwork-3.5.6.tar.bz2 9245468
+SHA256 786e6c25d5cba4ed1eeac947c5554d7fe57de593abf6551c58c178043b82475e kdenetwork-3.5.6.tar.bz2 9245468
diff --git a/kde-base/krdc/files/krdc-3.5.6-zeroconf.patch b/kde-base/krdc/files/krdc-3.5.6-zeroconf.patch
new file mode 100644
index 000000000000..c6f3ee092352
--- /dev/null
+++ b/kde-base/krdc/files/krdc-3.5.6-zeroconf.patch
@@ -0,0 +1,113 @@
+Index: kdenetwork-3.5.6/krdc/maindialogwidget.cpp
+===================================================================
+--- kdenetwork-3.5.6.orig/krdc/maindialogwidget.cpp
++++ kdenetwork-3.5.6/krdc/maindialogwidget.cpp
+@@ -33,7 +33,6 @@
+ #include "maindialogwidget.h"
+ 
+ static const QString DEFAULT_SCOPE = "default";
+-static const QString DNSSD_SCOPE = "DNS-SD";
+ 
+ class UrlListViewItem : public KListViewItem
+ {
+@@ -80,7 +79,7 @@ class UrlListViewItem : public KListView
+ 
+ MainDialogWidget::MainDialogWidget( QWidget *parent, const char *name )
+     : MainDialogBase( parent, name ),
+-      m_scanning( false ), m_locator_dnssd(0)
++      m_scanning( false )
+ {
+   HostPreferences *hp = HostPreferences::instance();
+   QStringList list;
+@@ -108,9 +107,21 @@ MainDialogWidget::MainDialogWidget( QWid
+   bool showBrowse = hp->showBrowsingPanel();
+   enableBrowsingArea( showBrowse );
+ 
++  m_locator_dnssd = new DNSSD::ServiceBrowser(QStringList::split(',',"_rfb._tcp,_rdp._tcp"),0,DNSSD::ServiceBrowser::AutoResolve);
++  connect(m_locator_dnssd,SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)),
++	  SLOT(addedService(DNSSD::RemoteService::Ptr)));
++  connect(m_locator_dnssd,SIGNAL(serviceRemoved(DNSSD::RemoteService::Ptr)),
++	  SLOT(removedService(DNSSD::RemoteService::Ptr)));
++  m_locator_dnssd->startBrowse();
++
+   adjustSize();
+ }
+ 
++MainDialogWidget::~MainDialogWidget()
++{
++  delete m_locator_dnssd;
++}
++
+ void MainDialogWidget::save()
+ {
+   HostPreferences *hp = HostPreferences::instance();
+@@ -216,35 +227,18 @@ void MainDialogWidget::rescan()
+ 
+   m_browsingView->clear();
+ 
+-  if (m_locator_dnssd) {
+-    delete m_locator_dnssd;  // still active browsers
+-    m_locator_dnssd = 0;
+-  }
+-
+-  if (m_scope == DNSSD_SCOPE) {
+-    kdDebug() << "Scope is DNSSD\n";
+-    m_locator_dnssd = new DNSSD::ServiceBrowser(QStringList::split(',',"_rfb._tcp,_rdp._tcp"),0,DNSSD::ServiceBrowser::AutoResolve);
+-    connect(m_locator_dnssd,SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)),
+-      SLOT(addedService(DNSSD::RemoteService::Ptr)));
+-    connect(m_locator_dnssd,SIGNAL(serviceRemoved(DNSSD::RemoteService::Ptr)),
+-      SLOT(removedService(DNSSD::RemoteService::Ptr)));
+-    m_locator_dnssd->startBrowse();
+-    // now find scopes
+-    lastSignalServices(true);
+-  } else {
+-    QString filter;
+-    if ( !m_searchInput->text().stripWhiteSpace().isEmpty() ) {
+-      QString ef = KServiceLocator::escapeFilter(
+-        m_searchInput->text().stripWhiteSpace() );
+-      filter = "(|(|(description=*"+ef+"*)(username=*"+ef+"*))(fullname=*"+ef+"*))";
+-    }
+-
+-    if ( !m_locator->findServices( "service:remotedesktop.kde",
+-                                   filter, m_scope ) ) {
+-      kdWarning() << "Failure in findServices()" << endl;
+-      errorScanning();
+-      return;
+-    }
++  QString filter;
++  if ( !m_searchInput->text().stripWhiteSpace().isEmpty() ) {
++    QString ef = KServiceLocator::escapeFilter(
++					       m_searchInput->text().stripWhiteSpace() );
++    filter = "(|(|(description=*"+ef+"*)(username=*"+ef+"*))(fullname=*"+ef+"*))";
++  }
++
++  if ( !m_locator->findServices( "service:remotedesktop.kde",
++				 filter, m_scope ) ) {
++    kdWarning() << "Failure in findServices()" << endl;
++    errorScanning();
++    return;
+   }
+ }
+ 
+@@ -350,8 +344,6 @@ void MainDialogWidget::lastSignalService
+ 
+ void MainDialogWidget::foundScopes( QStringList scopeList )
+ {
+-  scopeList << DNSSD_SCOPE;  
+-
+   int di = scopeList.findIndex( DEFAULT_SCOPE );
+   if ( di >= 0 )
+     scopeList[ di ] = i18n( "default" );
+Index: kdenetwork-3.5.6/krdc/maindialogwidget.h
+===================================================================
+--- kdenetwork-3.5.6.orig/krdc/maindialogwidget.h
++++ kdenetwork-3.5.6/krdc/maindialogwidget.h
+@@ -33,7 +33,7 @@ class MainDialogWidget : public MainDial
+ 
+   public:
+     MainDialogWidget( QWidget *parent, const char *name );
+-    ~MainDialogWidget() {}
++    ~MainDialogWidget();
+ 
+     void setRemoteHost( const QString & );
+     QString remoteHost();
diff --git a/kde-base/krdc/krdc-3.5.6-r1.ebuild b/kde-base/krdc/krdc-3.5.6-r1.ebuild
new file mode 100644
index 000000000000..61d151b3f5e5
--- /dev/null
+++ b/kde-base/krdc/krdc-3.5.6-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/krdc-3.5.6-r1.ebuild,v 1.1 2007/02/07 18:57:59 flameeyes Exp $
+
+KMNAME=kdenetwork
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="KDE remote desktop connection (RDP and VNC) client"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="kdehiddenvisibility rdesktop slp"
+DEPEND=">=dev-libs/openssl-0.9.6b
+	slp? ( net-libs/openslp )
+	x11-libs/libXxf86vm
+	x11-libs/libXtst"
+RDEPEND="${DEPEND}
+	rdesktop? ( >=net-misc/rdesktop-1.4.1 )"
+
+PATCHES="${FILESDIR}/${P}-zeroconf.patch"
+
+src_compile() {
+	local myconf="$(use_enable slp)"
+	kde-meta_src_compile
+}