diff options
| author | Tilman Keskinoz <arved@FreeBSD.org> | 2012-02-27 14:14:20 +0000 |
|---|---|---|
| committer | Tilman Keskinoz <arved@FreeBSD.org> | 2012-02-27 14:14:20 +0000 |
| commit | 99ede11a3acfe3c9535f931cbf89cd8f08006f97 (patch) | |
| tree | e8bfbdf70e2f1fb7936fee09ca5a6b4358b02235 /net-im/kmess-kde4 | |
| parent | - Fix dependency on astro/marble. (diff) | |
Remove conflicting dependency on libungif, giflib is already pulled in as a
dependency
Fix receiving of the Contact list by following Location redirects
PR: 165008
Submitted by: Axel Gonzales
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=292302
Diffstat (limited to 'net-im/kmess-kde4')
| -rw-r--r-- | net-im/kmess-kde4/Makefile | 5 | ||||
| -rw-r--r-- | net-im/kmess-kde4/files/patch-soap | 33 |
2 files changed, 35 insertions, 3 deletions
diff --git a/net-im/kmess-kde4/Makefile b/net-im/kmess-kde4/Makefile index 0aa17e00de72..e32bd78b1b73 100644 --- a/net-im/kmess-kde4/Makefile +++ b/net-im/kmess-kde4/Makefile @@ -7,15 +7,14 @@ PORTNAME= kmess PORTVERSION= 2.0.6.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im kde MASTER_SITES= SF/${PORTNAME}/Latest%20versions/${PORTVERSION}/ MAINTAINER= syncer@gmail.com COMMENT= MSN Messenger client for KDE -LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \ - qca.2:${PORTSDIR}/devel/qca +LIB_DEPENDS= qca.2:${PORTSDIR}/devel/qca BUILD_DEPENDS= qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl \ ${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml RUN_DEPENDS= qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl diff --git a/net-im/kmess-kde4/files/patch-soap b/net-im/kmess-kde4/files/patch-soap new file mode 100644 index 000000000000..f8604e5563a5 --- /dev/null +++ b/net-im/kmess-kde4/files/patch-soap @@ -0,0 +1,33 @@ +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 |