- Update to 2.0.6.2

- Remove files/patch-soap (fixed upstream)

PR:		ports/169623
Submitted by:	Axel Gonzalez <loox@e-shell.net>
Approved by:	Mina R Waheeb <syncer@gmail.com> (maintainer)

5 files changed, 34 insertions, 55 deletions

diff --git a/net-im/kmess-kde4/Makefile b/net-im/kmess-kde4/Makefile
index de6e4882acea..89fada666064 100644
--- a/net-im/kmess-kde4/Makefile
+++ b/net-im/kmess-kde4/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	kmess
-PORTVERSION=	2.0.6.1
-PORTREVISION=	3
+PORTVERSION=	2.0.6.2
 CATEGORIES=	net-im kde
 MASTER_SITES=	SF/${PORTNAME}/Latest%20versions/${PORTVERSION}/
 
@@ -18,6 +17,7 @@ LIB_DEPENDS=	qca.2:${PORTSDIR}/devel/qca
 BUILD_DEPENDS=	qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl
 RUN_DEPENDS=	qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl
 
+USE_LDCONFIG=	${PREFIX}/lib/kde4
 LATEST_LINK=	${PORTNAME}-kde4
 MAKE_JOBS_SAFE=	yes
 
diff --git a/net-im/kmess-kde4/distinfo b/net-im/kmess-kde4/distinfo
index fac54cd3893e..b3d923313491 100644
--- a/net-im/kmess-kde4/distinfo
+++ b/net-im/kmess-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kmess-2.0.6.1.tar.bz2) = f41b09fb0a2fbbd3b3748267bed7e95e6fbd6f1391f603345f4de76a020dfaa4
-SIZE (kmess-2.0.6.1.tar.bz2) = 3187173
+SHA256 (kmess-2.0.6.2.tar.bz2) = d6af80d2144d3b859b46bc3aa18eaecb1329f1782bf165bda5617a92ec8a6a8e
+SIZE (kmess-2.0.6.2.tar.bz2) = 3170329
diff --git a/net-im/kmess-kde4/files/patch-soap b/net-im/kmess-kde4/files/patch-soap
deleted file mode 100644
index f8604e5563a5..000000000000
--- a/net-im/kmess-kde4/files/patch-soap
+++ /dev/null
@@ -1,33 +0,0 @@
-Follow Location redirects, MS seems to have moved some accounts to other
-servers. Forum topic reference:
-Connection problem to wlm - http://kmess.org/board/viewtopic.php?f=4&t=20549
-diff -Nur a/src/network/soap/httpsoapconnection.cpp b/src/network/soap/httpsoapconnection.cpp
---- src/network/soap/httpsoapconnection.cpp	2011-02-16 08:16:45.000000000 +0100
-+++ src/network/soap/httpsoapconnection.cpp	2011-11-08 16:53:29.612517607 +0100
-@@ -456,6 +456,7 @@
-   const QByteArray& replyContents = reply->readAll();
-   const int         statusCode    = reply->attribute( QNetworkRequest::HttpStatusCodeAttribute   ).toInt();
-   const QString     error         ( reply->attribute( QNetworkRequest::HttpReasonPhraseAttribute ).toString() );
-+  QUrl redirectUrl = reply->attribute( QNetworkRequest::RedirectionTargetAttribute ).toUrl();
- 
- #ifdef KMESSDEBUG_HTTPSOAPCONNECTION_GENERAL
-   bool requestSuccess = false;
-@@ -490,13 +491,16 @@
- #endif
- 
-     // Parse the message contents
--    if( currentResponse->isFaultMessage() )
-+    if( !redirectUrl.isEmpty() || currentResponse->isFaultMessage() )
-     {
--      // Verify if the server is redirecting us to another server
-       if( currentResponse->getFaultCode() == "psf:Redirect" )
-       {
-+        redirectUrl = XmlFunctions::getNodeValue( currentResponse->getFault(), "redirectUrl" );
-+      }
-+      // Verify if the server is redirecting us to another server
-+      if( !redirectUrl.isEmpty() )
-+      {
-         const QUrl& originalUrl = currentResponse->getEndPoint();
--        const QUrl redirectUrl( XmlFunctions::getNodeValue( currentResponse->getFault(), "redirectUrl" ) );
-         const QString originalHost( originalUrl.host() );
-         const QString redirectHost( redirectUrl.host() );
\ No newline at end of file
diff --git a/net-im/kmess-kde4/files/patch-src--model--contactlistmodelitem.cpp b/net-im/kmess-kde4/files/patch-src--model--contactlistmodelitem.cpp
new file mode 100644
index 000000000000..67266b25a246
--- /dev/null
+++ b/net-im/kmess-kde4/files/patch-src--model--contactlistmodelitem.cpp
@@ -0,0 +1,12 @@
+--- src/model/contactlistmodelitem.cpp.orig	2012-07-03 01:35:16.000000000 -0500
++++ src/model/contactlistmodelitem.cpp	2012-07-03 01:35:50.000000000 -0500
+@@ -79,7 +79,8 @@
+  */
+ ContactListModelItem::~ContactListModelItem()
+ {
+-  qDeleteAll( childItems_ );
++  while( !childItems_.isEmpty() )
++    delete childItems_.takeFirst();
+   childItems_.clear();
+ 
+   // Delete this item from the parent's children
diff --git a/net-im/kmess-kde4/pkg-plist b/net-im/kmess-kde4/pkg-plist
index 04c312ba8578..2b770f376722 100644
--- a/net-im/kmess-kde4/pkg-plist
+++ b/net-im/kmess-kde4/pkg-plist
@@ -216,21 +216,21 @@ share/sounds/kmess_chat.ogg
 share/sounds/kmess_logoff.ogg
 share/sounds/kmess_logon.ogg
 share/sounds/kmess_msg.ogg
-@dirrm share/emoticons/KMess-new/
-@dirrm share/doc/HTML/en/kmess/
-@dirrm share/apps/kmess/styles/Pure/
-@dirrm share/apps/kmess/styles/Fresh/
-@dirrm share/apps/kmess/styles/Fresh-dark/
-@dirrm share/apps/kmess/styles/Efficient/
-@dirrm share/apps/kmess/styles/Dim/
-@dirrm share/apps/kmess/styles/Colourful-Enclosed/
-@dirrm share/apps/kmess/styles/Classic/
-@dirrm share/apps/kmess/styles/Classic-compact/
-@dirrm share/apps/kmess/styles/
-@dirrm share/apps/kmess/pics/
-@dirrm share/apps/kmess/icons/hicolor/16x16/apps/
-@dirrm share/apps/kmess/icons/hicolor/16x16/actions/
-@dirrm share/apps/kmess/icons/hicolor/16x16/
-@dirrm share/apps/kmess/icons/hicolor/
-@dirrm share/apps/kmess/icons/
-@dirrm share/apps/kmess/
+@dirrm share/emoticons/KMess-new
+@dirrm share/doc/HTML/en/kmess
+@dirrm share/apps/kmess/styles/Pure
+@dirrm share/apps/kmess/styles/Fresh-dark
+@dirrm share/apps/kmess/styles/Fresh
+@dirrm share/apps/kmess/styles/Efficient
+@dirrm share/apps/kmess/styles/Dim
+@dirrm share/apps/kmess/styles/Colourful-Enclosed
+@dirrm share/apps/kmess/styles/Classic-compact
+@dirrm share/apps/kmess/styles/Classic
+@dirrm share/apps/kmess/styles
+@dirrm share/apps/kmess/pics
+@dirrm share/apps/kmess/icons/hicolor/16x16/apps
+@dirrm share/apps/kmess/icons/hicolor/16x16/actions
+@dirrm share/apps/kmess/icons/hicolor/16x16
+@dirrm share/apps/kmess/icons/hicolor
+@dirrm share/apps/kmess/icons
+@dirrm share/apps/kmess