diff options
author | Johannes Huber <johu@gentoo.org> | 2012-08-31 13:10:56 +0000 |
---|---|---|
committer | Johannes Huber <johu@gentoo.org> | 2012-08-31 13:10:56 +0000 |
commit | db95defc592bcbac1083b0ac0424fa217028bc7d (patch) | |
tree | ce2c1c6f0120779c722cb295cbacd12b41fe8ea3 /net-im | |
parent | Stable for x86, wrt bug #432868 (diff) | |
download | historical-db95defc592bcbac1083b0ac0424fa217028bc7d.tar.gz historical-db95defc592bcbac1083b0ac0424fa217028bc7d.tar.bz2 historical-db95defc592bcbac1083b0ac0424fa217028bc7d.zip |
Remove old.
Package-Manager: portage-2.2.0_alpha123/cvs/Linux x86_64
Diffstat (limited to 'net-im')
-rw-r--r-- | net-im/kmess/ChangeLog | 8 | ||||
-rw-r--r-- | net-im/kmess/Manifest | 22 | ||||
-rw-r--r-- | net-im/kmess/files/2.0.5-msn_login_url_fix.patch | 44 | ||||
-rw-r--r-- | net-im/kmess/files/kmess-2.0.6-contact-list.patch | 38 | ||||
-rw-r--r-- | net-im/kmess/files/kmess-2.0.6-follow-location-redirects.patch | 34 | ||||
-rw-r--r-- | net-im/kmess/files/kmess-2.0.6-login-fix.patch | 14 | ||||
-rw-r--r-- | net-im/kmess/kmess-2.0.6-r3.ebuild | 63 |
7 files changed, 15 insertions, 208 deletions
diff --git a/net-im/kmess/ChangeLog b/net-im/kmess/ChangeLog index 1e9dfb2c413e..f14794b88fb7 100644 --- a/net-im/kmess/ChangeLog +++ b/net-im/kmess/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-im/kmess # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/ChangeLog,v 1.93 2012/08/31 13:07:32 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/ChangeLog,v 1.94 2012/08/31 13:10:55 johu Exp $ + + 31 Aug 2012; Johannes Huber <johu@gentoo.org> + -files/2.0.5-msn_login_url_fix.patch, -files/kmess-2.0.6-contact-list.patch, + -files/kmess-2.0.6-follow-location-redirects.patch, + -files/kmess-2.0.6-login-fix.patch, -kmess-2.0.6-r3.ebuild: + Remove old. 31 Aug 2012; Johannes Huber <johu@gentoo.org> kmess-2.0.6.2.ebuild: Stable for x86, wrt bug #432868 diff --git a/net-im/kmess/Manifest b/net-im/kmess/Manifest index f774abb2661d..09743e726b7f 100644 --- a/net-im/kmess/Manifest +++ b/net-im/kmess/Manifest @@ -1,26 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX 2.0.5-msn_login_url_fix.patch 1637 SHA256 146883b9430532ed3d5766a26aab45cbb311600591516a104f179f11fe9087ad SHA512 960d54f23ab1adf34bfc304e17910ccdfa7096c5239f9b43487aeedf011f96f927bb71ee453fb789d501d2a8567d2bcd820d8d08827fc988e81045f6cef0105b WHIRLPOOL 9044eedf4e7ff3768083b693ee829c3cee184ff7e7b011558d814ac5efab10b9a35c2f3bfeac1554772af34397f507de97db9ec70803d688f82d877eb8233778 -AUX kmess-2.0.6-contact-list.patch 1659 SHA256 95a9bf74ad625ae3047664cb6e71fc96c9c1ab9c797b6604c13dbe735506937b SHA512 246799a4de525efbb71172e899d5fcc51ce477a7496d26c0950a6f24608269f13f0102e42a88b03ba778971279467a2f4606fb8a56438d73dbd2a45fbb23314e WHIRLPOOL 96d87b90c4af54274e6cc393a7ff4ad3603e7f957dd7613f47e91dded459d2edeae4f8ea14383150b18ad43e876313fb289127f3d0752a65869ade7132eefc2f -AUX kmess-2.0.6-follow-location-redirects.patch 1756 SHA256 2d99260dc84c7020c59cf88161b14882407d3635c7d274a7536b79fb257bc403 SHA512 4319f765cc5aedd4f0966c6ba1e40043451eea738b0e295c5eb7dea4ea8f970b8dbf3cbb650176faf850b9190974f0d2594d087bfd54aed9ed3269f4fc27864f WHIRLPOOL bc1bf26302ef4f57c51b34ee8ee4010a063ab64237b249ddbd7087e75019134df2408f2b48610085c83dc528cc2aff6c5ad1c3f998fadabb8ebeb1c6025ab032 -AUX kmess-2.0.6-login-fix.patch 645 SHA256 a8024cffc91c4f5ddb91faebf33b2b5d5f7cd0a992afaccb288fbdb95864a7e0 SHA512 c974361e3dc67b8ff649f0d001db0917dfa46847f791be878fb66773ec2eb7baf8950fd3f61dcbf303a7595c47872c2d1821530b8353c2cd38241fcaee8fc025 WHIRLPOOL 26061fc168d91164b4e96810fe7ba91278cfc1d506e37651699f987999c5673378bfdb15669016413c845a63ed0c1f978d60dc3a192d4b658f60de3d0a9f096c DIST kmess-2.0.6.2.tar.bz2 3170329 SHA256 d6af80d2144d3b859b46bc3aa18eaecb1329f1782bf165bda5617a92ec8a6a8e SHA512 7a95c144729b81d89869be0ea6bb08d27f7fd0e89da0f7a93cedf5afedbddd32787aeac68ca3cc1b73334c12fd819ab0b0c7b15bf3afc8d1f48d59789e91ac22 WHIRLPOOL d45ae9dfb3896efa5e67dc664f1d4f4b90b1a935f10f302f33e1504e0b58db28c99302098b672955042ed9b63f54bdfd89d60dafd7b2cdfd6980391d66787562 -DIST kmess-2.0.6.tar.bz2 3183344 SHA256 3d2a93f71c6cd1e7969dee34fe0f78427cc5c512853f0bd2437c65baa92224f2 SHA512 3fa557213bfa3830a55b5c5aed40cdad183820a0a4b4b8c3e963684cac2b1ef29473e84eb56dfcdd6e940e29ee0b7408153556f45b1b944eb7441ee8d9679e86 WHIRLPOOL b60b4276143fa1977bad226c94f21d298a1a0cf354e9a6c62c3caa7213d8f83d65bdb3d99e8cf7a582af15cbcf04bc87a8aed180c8ac425c4a9d1bd4c097416d -EBUILD kmess-2.0.6-r3.ebuild 1558 SHA256 3032a26e0d5af784a5320cdd9b3d7c455bc552e274b0e7ad699f63462520d5ef SHA512 6f551e085cd4991b1a89502d7950d596775255493f427d658431df15ab1a9678dc0ed05b9b7b3d1e98376abc3369b8295e71f30e18d4fa26ff1176d1e4535b9a WHIRLPOOL 1e09beb767f878e7cc97518a35bae7b6480e1a45448592454eba625483af15317b6ac72ccf4d13d02264ebd99456efaeb00a607da293e78775384852f942de9b EBUILD kmess-2.0.6.2.ebuild 1600 SHA256 98f22c9250ff0a155b03124910624cb606a7c49ced55744d709b8970201abeac SHA512 066b601d76082d81917ab8e0688b565ecf828e6a7b90016a534e6a40f91310197176750c50e27dcfcaddfbf06413f9fd8c3ce19d1036e09cfbc7213901683763 WHIRLPOOL 7aa9a4503a9e2b4dd52a22584dcef980a9886698680a9e5094f76a05688867769803dd10f67b5f7dbbbc6f47e75750c0e5e7272e88af4fc68b5cec426050aed9 EBUILD kmess-2.0.9999.ebuild 1491 SHA256 767bd4e9c4c62f457dfa09be8569308c11b25fe9a2538d48ac4912277429317a SHA512 fc1d694d203cab16af8ae0eeb20401bbc9a7ab268359ec040e8378236eecac0825dbcae4a7265aaac26a9d833d8b1dc01bb284d9c1b9c8516b915742908157c9 WHIRLPOOL 669bd017486e84a16b4e1507f380c6be73d04cb2b29b47ed56f4d0f55e6bec99aef47327118f7450f83c663f3d0097ab988e1020eb7c45782e92eac344b6f3ce EBUILD kmess-9999.ebuild 1461 SHA256 6a512258f906085200ed8c1682895cf8c7f4c558569e0c3a89f7c2d01c9f62a0 SHA512 e76bb64f87f33b8f4d52057b9bbd835d2621b7332c7f9d9d1fca9a9eacfffeb7f029dc769bd2336b48bf59108f79b2b242649521e3ca907e892a76952d2e9736 WHIRLPOOL 0c19d5d0c372add1cdf7767c456a16fc2d04d5897af776e02163a8942495c19f0a98c9f673ee08c44631de09e85878beb1c056048697bc9de522f1df66e0ca9a -MISC ChangeLog 13782 SHA256 b0e5d3c5f5b7aac8b646e940e04f3c6327935fdfe4c61ec7483ac3b190bd1420 SHA512 14f657c91074b81221fa93f4440fa80215cab6beadc29f51d53381dddac4913a16626d9a3a9ca98881c2925f2e272b519d3b5a9316d70e907fee4eaaea8953af WHIRLPOOL b84ac2f73e90b83a42ae5e3ab7909bbadf5aaa22079f466aa79639d8c90b40ae45e2a097d35ddb619eaad21c6c949715cb32c7fb228e7fc3e5abbcc5815e91d8 +MISC ChangeLog 14040 SHA256 f2b7ca28dabb7b5027f1661fc6860531286baec88c526393524f9ce8e6b70e19 SHA512 69023f3dad41163d6ba06c9a1fdbf2214013afe633f6650f7f1c5e64ec5f7a1a31b06d79f6b0f634b07e54d4488a267379ba0381faff8c12fadea17cc524c7ca WHIRLPOOL a5df2556819c150b8b2db9ebdd0b13adc726de3fc7f08d31988e61bb0cea1810bc25e180a12b1ebd6b8443a320b5003e39da784a3a6b68bf3a8e6de83fd7cd5e MISC metadata.xml 412 SHA256 a8709df1103848b82fc1e16588d03e687e44e5627d53f07564f873e7b5e4b570 SHA512 335388108799c22703518beaf507388539c83a4b34b49baae7b4e29a12ead9c5372b01fb7bcaef4b47453641a6b08a3d06d2ffa8aa1f48f52f69e68b9fd1a531 WHIRLPOOL 913c84d614840bbb6c96a05788c211f885020dc9c42dff28f785adca91b3d7962ed8e6055c3335d8291e26a5d7e1e048f74c16ddfe13ec9afdc44adc7afbfcdf -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJQQLcfAAoJEO+t9ga+3I3a1fYH/0nUcPhP5BYJnxkw3DCL/7Og -SpCwna+r6AIWcZvnTVBkyxR3H8lWn/0GTCVzihSLl37wAPcjQ2M/XKaEbMkJG5yv -kKrzipyt3wwyXNzrpteqManvDwW79CXIjjj1ekHb1K87lOIDMyjEJog4ILP1WwBG -OhME0ggAFrJFzcxWn04ZaPzY3zITimrI7lRZp3YkIQU13cCkOAXXamfY0ILxirci -E2oe1USbTX4cQPxnA6HRC2XVmdKg9uQUbchR7Sb+BHxqVk522QY4YJIZhZ5MaoMY -nXL1ySqmCkO4QWld9N9WGwZfnoc/WYWxhfh44RZvKc/B7Ki2V/pjpH8WlYMQG3o= -=mvka +iQEcBAEBCAAGBQJQQLfkAAoJEO+t9ga+3I3ak+cH/j5VrITEZUULjBxaVhbDE5tg +c7YTbQsrSXT9+LghettOqYaBuw7/WheFuMbiIUhBx+lyeohiQ0tu7WzDXUzScbzS +fF38WrBbHfnOMAvkVKl7xFAagUyZK6Bu7Umt/SlRlYwyuDoypDhq57o0hRIzc3RZ +XZAfGtXCTDC0NHBXegDlV0lxBoaVsR5Jgmpr8+5nE3JBH33JYZ0V0BgUZtwamo// +yxREYLq3TXwsdrxmxgoaNaVKCqKhu2UVKYqRE29PnSQ+NSBVNn6jW6xWf8fsvEcf +Igb7nklS2bC30LYQtLZgk4KcTiGV9q/kvI+KkpGaRYw2P6Gc2rHd6Zg3xxu235s= +=olNn -----END PGP SIGNATURE----- diff --git a/net-im/kmess/files/2.0.5-msn_login_url_fix.patch b/net-im/kmess/files/2.0.5-msn_login_url_fix.patch deleted file mode 100644 index 386f219444aa..000000000000 --- a/net-im/kmess/files/2.0.5-msn_login_url_fix.patch +++ /dev/null @@ -1,44 +0,0 @@ - 2011-01-08 (Valerio) - * Fixed crash when taking any action in the Contact Added User dialog. - Also removed an unnecessary signal-bouncing slot. ---- a/src/network/msnnotificationconnection.cpp -+++ b/src/network/msnnotificationconnection.cpp -@@ -1029,16 +1029,12 @@ - hash.insert( QString::number(ack), "INBOX" ); - - // Ask for compose URL -- ack = sendCommand("URL", "COMPOSE"); -+ ack = sendCommand("URL", "COMPOSE some.invalid@kmess.email" ); - hash.insert( QString::number(ack), "COMPOSE" ); - - // Ask the personal profile URL -- ack = sendCommand("URL", "PROFILE"); -+ ack = sendCommand("URL", "PROFILE 0x" + QString::number( CurrentAccount::instance()->getLanguageCode().toInt(), 8 ) ); - hash.insert( QString::number(ack), "PROFILE" ); -- -- // Ask the URL for change account info -- ack = sendCommand("URL", "PERSON"); -- hash.insert( QString::number(ack), "PERSON" ); - } - - // Notify observers that the server is connected ---- a/src/utils/kmessshared.cpp -+++ b/src/utils/kmessshared.cpp -@@ -139,13 +139,11 @@ - return QString(); - } - -+ // this will have our (urlencoded) dodgy email address we used to satisfy URL COMPOSE -+ // at the initial login. replace it where we actually want it to go. - QString command( folder ); -- -- // Check if the user wants to send an email -- if( ! mailto.isEmpty() ) -- { -- command += "?mailto=1&to=" + mailto; -- } -+ -+ command = command.replace( "some.invalid%40kmess.email", mailto ); - - // Use the method into passport to compute the token - QString token( PassportLoginService::createHotmailToken( currentAccount->getToken( "Passport" ), diff --git a/net-im/kmess/files/kmess-2.0.6-contact-list.patch b/net-im/kmess/files/kmess-2.0.6-contact-list.patch deleted file mode 100644 index 59f8c4099fb4..000000000000 --- a/net-im/kmess/files/kmess-2.0.6-contact-list.patch +++ /dev/null @@ -1,38 +0,0 @@ -Index: kmess-2.0.6/src/network/soap/addressbookservice.cpp -=================================================================== ---- kmess-2.0.6.orig/src/network/soap/addressbookservice.cpp -+++ kmess-2.0.6/src/network/soap/addressbookservice.cpp -@@ -35,13 +35,12 @@ - /** - * @brief URL of the Address Book Service - */ --#define SERVICE_URL_ADDRESSBOOK "https://omega.contacts.msn.com/abservice/abservice.asmx" -+#define SERVICE_URL_ADDRESSBOOK "https://local-sn.contacts.msn.com/abservice/abservice.asmx" - - /** - * @brief URL of the Address Book Sharing Service - */ --#define SERVICE_URL_ADDRESSBOOK_SHARING "https://omega.contacts.msn.com/abservice/SharingService.asmx" -- -+#define SERVICE_URL_ADDRESSBOOK_SHARING "https://local-sn.contacts.msn.com/abservice/SharingService.asmx" - - - /** -Index: kmess-2.0.6/src/network/soap/httpsoapconnection.cpp -=================================================================== ---- kmess-2.0.6.orig/src/network/soap/httpsoapconnection.cpp -+++ kmess-2.0.6/src/network/soap/httpsoapconnection.cpp -@@ -546,6 +546,13 @@ void HttpSoapConnection::slotRequestFini - kmDebug() << "Received hostname suggestion from:" << originalUrl << "to:" << preferredHostName; - #endif - -+ if( preferredHostName.compare("proxy-sn.contacts.msn.com") == 0 ) -+ { -+#ifdef KMESSDEBUG_HTTPSOAPCONNECTION_GENERAL -+ kmDebug() << "Overriding hostname" << preferredHostName << "with local-sn.contacts.msn.com"; -+#endif -+ preferredHostName = "local-sn.contacts.msn.com"; -+ } - redirectionCounts_[ originalHost ] = 0; - redirections_[ originalHost ] = preferredHostName; - } diff --git a/net-im/kmess/files/kmess-2.0.6-follow-location-redirects.patch b/net-im/kmess/files/kmess-2.0.6-follow-location-redirects.patch deleted file mode 100644 index fbabdeff44dd..000000000000 --- a/net-im/kmess/files/kmess-2.0.6-follow-location-redirects.patch +++ /dev/null @@ -1,34 +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 ---- a/src/network/soap/httpsoapconnection.cpp 2011-02-16 08:16:45.000000000 +0100 -+++ b/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() ); - diff --git a/net-im/kmess/files/kmess-2.0.6-login-fix.patch b/net-im/kmess/files/kmess-2.0.6-login-fix.patch deleted file mode 100644 index 40a3073dcefa..000000000000 --- a/net-im/kmess/files/kmess-2.0.6-login-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ - 2011-01-13 (Adam) ---- a/src/network/msnnotificationconnection.cpp -+++ b/src/network/msnnotificationconnection.cpp -@@ -1033,7 +1033,9 @@ - hash.insert( QString::number(ack), "COMPOSE" ); - - // Ask the personal profile URL -- ack = sendCommand("URL", "PROFILE 0x" + QString::number( CurrentAccount::instance()->getLanguageCode().toInt(), 8 ) ); -+ // default to US English if no preference -+ quint32 langcode = CurrentAccount::instance()->getLanguageCode().toInt(); -+ ack = sendCommand("URL", "PROFILE 0x" + QString::number( ( langcode == 0 ? 1033 : langcode ), 8 ) ); - hash.insert( QString::number(ack), "PROFILE" ); - } - diff --git a/net-im/kmess/kmess-2.0.6-r3.ebuild b/net-im/kmess/kmess-2.0.6-r3.ebuild deleted file mode 100644 index 01f2fec438b1..000000000000 --- a/net-im/kmess/kmess-2.0.6-r3.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/kmess-2.0.6-r3.ebuild,v 1.3 2011/11/17 18:51:51 phajdan.jr Exp $ - -EAPI=3 - -KDE_LINGUAS="ar ca de el es et fi fr gl hu it ja nl pt_BR ru sk tr zh_CN zh_TW" -inherit kde4-base - -MY_P="${P/_/}" - -DESCRIPTION="KMess is an alternative MSN Messenger chat client for Linux" -HOMEPAGE="http://www.kmess.org" -SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -KEYWORDS="amd64 x86" -SLOT="4" -IUSE="debug gif konqueror libnotify xscreensaver" -RESTRICT="test" - -COMMONDEPEND=" - app-crypt/qca:2 - app-crypt/qca-ossl:2 - dev-libs/libxml2 - dev-libs/libxslt - gif? ( media-libs/giflib ) - konqueror? ( $(add_kdebase_dep libkonq) ) - libnotify? ( $(add_kdebase_dep knotify) ) - xscreensaver? ( x11-libs/libXScrnSaver ) -" -DEPEND="${COMMONDEPEND} - app-text/docbook-xml-dtd:4.2 - xscreensaver? ( x11-proto/scrnsaverproto ) -" -RDEPEND="${COMMONDEPEND} - konqueror? ( $(add_kdebase_dep konqueror) ) -" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${P}-login-fix.patch - "${FILESDIR}"/${P}-follow-location-redirects.patch -) - -src_configure() { - mycmakeargs="${mycmakeargs} - $(cmake-utils_use_with gif GIF) - $(cmake-utils_use_with konqueror LibKonq) - $(cmake-utils_use_want xscreensaver XSCREENSAVER)" - - kde4-base_src_configure -} - -pkg_postinst() { - kde4-base_pkg_postinst - - echo - elog "KMess can use the following optional packages:" - elog "- www-plugins/adobe-flash provides support for winks" - echo -} |