Revision bump adds upstream patch to reduce message delay in ICQ/AIM related conversations based on libpurple, spotted by genstorm.

Package-Manager: portage-2.2.0_alpha119/cvs/Linux x86_64

4 files changed, 103 insertions, 10 deletions

diff --git a/net-im/ktp-text-ui/ChangeLog b/net-im/ktp-text-ui/ChangeLog
index 5471b880ff4c..3110aed7b00e 100644
--- a/net-im/ktp-text-ui/ChangeLog
+++ b/net-im/ktp-text-ui/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/ktp-text-ui
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-text-ui/ChangeLog,v 1.4 2012/07/13 15:03:47 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-text-ui/ChangeLog,v 1.5 2012/07/19 00:43:40 johu Exp $
+
+*ktp-text-ui-0.4.0-r1 (19 Jul 2012)
+
+  19 Jul 2012; Johannes Huber <johu@gentoo.org>
+  +files/ktp-text-ui-0.4.0-reduce-libpurple-delay.patch,
+  +ktp-text-ui-0.4.0-r1.ebuild:
+  Revision bump adds upstream patch to reduce message delay in ICQ/AIM related
+  conversations based on libpurple, spotted by genstorm.
 
   13 Jul 2012; Johannes Huber <johu@gentoo.org> -ktp-text-ui-0.3.0.ebuild:
   Remove KDE Telepathy 0.3.0.
@@ -21,4 +29,3 @@
   25 Jan 2012; Johannes Huber <johu@gentoo.org> +ktp-text-ui-0.3.0.ebuild,
   +metadata.xml:
   Initial import from kde overlay. Add KDE Telepathy 0.3.0.
-
diff --git a/net-im/ktp-text-ui/Manifest b/net-im/ktp-text-ui/Manifest
index 1a3751fca71e..66885a3b580e 100644
--- a/net-im/ktp-text-ui/Manifest
+++ b/net-im/ktp-text-ui/Manifest
@@ -1,20 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX ktp-text-ui-0.4.0-reduce-libpurple-delay.patch 1787 SHA256 5e6b6d2a8aa048526650c10001e131d134b1898d685a88c81ce3657cad5c0563 SHA512 316ff742a1add0275fb369aab4eed2854d81338ff3b8b9ff80da8887cb5443f36688526336ea9f42c9a8f1d54c104817549def38906c547aaedf78b0c9052da1 WHIRLPOOL b79ac5affbc63db0244db7153f12b89643ab4a7975ee2fd956bb7b9b9d54cc6bdf1840a43e2e15712d6c53a5d4b8b97f58cd68935cf611d4ea835e11bf128cf4
 DIST ktp-text-ui-0.3.1.tar.bz2 196832 SHA256 866f35e6acf7a0e685b1433658a32602ad12566290344bb29bdc52ee11943362
 DIST ktp-text-ui-0.4.0.tar.bz2 253671 SHA256 ab394eb8d77e61e22495d65c4c705f2e500e4019fabe5c88e2204d1d15a75af7 SHA512 bf214d2e530b9640017a14b902ceb1426c1fea8845634d2eb94e6bcd1abb9cf837ee07a21ee1097d4ff325a240cc60ca96eda8c602c34b7e16b5b94105366cd3 WHIRLPOOL 422cda11679baf00453a8d2a9b8a53297fc86fbd2b96307dadf8780fc453f824caa94c6a128d5dd0e43d227b565d4c4f3eeabcea0805acdec6c686776154a7c5
 EBUILD ktp-text-ui-0.3.1.ebuild 818 SHA256 aed31c5e5d7c1bd9a69b45109eeaacb21df2dab9b482959703c7bc9ab58b3395 SHA512 1e5b8a511bcbb41d745c9783c9eef47bd8015eaeb3a41c4438dddaf12e0bcf130d542a7099b52e121e4355b6bd903a854ebd7bfb0ed03b8e1c9a92a9a33cc279 WHIRLPOOL 96a9bde4e2ee6db8fd1ce1f679547c55fc5088e5a3b34ab390c1338bb81c14e82ffc645373ec36191a37ad653f3db486972ff735a5b94adfc9457bbb458d5a6f
+EBUILD ktp-text-ui-0.4.0-r1.ebuild 1057 SHA256 4ed0fe23690ba4266e2f1f6c732a97c55619e7f0216157460bea26d7e9d670c1 SHA512 e8ecc8fb672dc9336253d00e4fb887e2d0df41158b7ed9a8e56ece3a0838ec3e3f619aee22f69bdb0fd34c79189302be2236633526fb604d492b4c26e108e11c WHIRLPOOL 7e2a49b4ff97e439f0a7e8baad1b4352d7bc91e181a0306a0feb58487ae7bcb6bf153bf6ba7ce5484d4e947aec1943744f1dc95b69df87611fbed8a7c49874e5
 EBUILD ktp-text-ui-0.4.0.ebuild 993 SHA256 a467c77a5df081052894c9e21c9c352eb382d8d9f5f6004115f1732422fa4493 SHA512 680dcf1ed146c58b3add4c68ff8c53125fe9daf15df54105e0e5493307c65579393f32b3b69e04e05651d1b375baf12f1709dd7d3091c7dab16b78b510cf6a5d WHIRLPOOL 865f81756e91ebe506131e9351ed87a73cf0872b0844125e87795bb6659ad74cc73fdd22809f8f4606382561d41fc5a6838b03cb9657051301d721815c7faea3
-MISC ChangeLog 808 SHA256 f9922a3b90a005d31f093adb6976bd3b7c17b78751f3ee74a0e97eba74efd9c3 SHA512 5b5c59a3076651bee794b05bde5d9744cd75cc9fa963ec31f4a6f8ed6293d1d7c3b9eccc707fc52358106f0613514ddf7a81a5bedc8e8bfa83ebab580cca079e WHIRLPOOL 3ec71033e9afa5eb96dd112b280694b44cea63df4a7ea6a9836652aa9008110d69d2e6215bf12456d2ddf10757f478969c609323eb073a9cfecc8f3bc6c2c9ea
+MISC ChangeLog 1118 SHA256 ed1c40313487119c1931d74564f7060efbc6f2d02902e4d9a1aaddd6ed2ca0ee SHA512 4af1768e92e7e43d52a05691970d6593a4069096f3a7188431d2e62fd7cafa5343d4115b5fed9ad4d6dd24b4389bce5242bb5ba33a14556876bf93ed321c8962 WHIRLPOOL f2872a7ccbdbbcfb5ec72042f135c84d348139c5e13fe6ca8dbb652bfda4ef0154a2e54397b4d32b5c89fb9d046d2eabad285db070662c7c483ed6aae38cd284
 MISC metadata.xml 227 SHA256 9e1a342725212a68c9852d8b40643c8b3302282cd707843903246dc8d4dbde74 SHA512 078304eea2bd3a6354fa08845e21fe307cba0f9411ee792f6f0dbfd8ef543c99468fc203f5b88ea2ca21b1b6bb7ffe560198ea9eade58d660bc400a45f0c647c WHIRLPOOL f5b51b3e63864dafa831a46b03a8d96daeb86bac5f7c16e2214f5ea9811e97f059acc6872a90232db08d6019a54a42b297071b9a79d665e86a0f756e69df0654
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQADjYAAoJEO+t9ga+3I3a73IIAMuw3x0NPokhGWONokG40OYp
-DVDTCkdgvCgB4JlBfTPvnb8+Cve4zwMRXlXamdeEFfT8XsGC3th1qsJ2NaWqX/zu
-7b4KdkIZRyN9IN3ey+UyntKEWZ+DeRnLtzFhczX13zniw9pjUquHISWfx7Wls6y2
-Wx5Gpn20/44tcRXLt2rtqNYG5EC+Gjqe+b/hx+y6xYsMXH8b83sW8L7acaA/tC1t
-QlQMLXN266riQIEPaJvwo01Ktfxn4vOvSVhP5gY97kkU3SwDf4PJyd6Y/NEs8vxx
-B2t5N5eB8wD7Jj8/WM2fne+9ImJqyVpyVVHJUfh7z+Cf7dNRZnNH5r5xmJNOdv4=
-=jKdD
+iQEcBAEBCAAGBQJQB1g6AAoJEO+t9ga+3I3aOO0H/ifmd7bucBDzc8xcD8tmiAiR
+6WY+Eht57wt7/kSWewQcLBYoKPeHtCkqJtLgTUvbYGZRzzJgOOZi+aAhuHnIK6C6
+e5nZrPz2BD3UuVtROnpTjJrS6PQxMTS4Pj7kG/I7ZxCPDb+9KOAlpK/bfxiKk2Sw
+2gNb8AFvXfmtEEckWljbHYsXsmXsJ42VD9682Em4cyG6oTU/+WVg0EQrZRZevI8K
+NaN2tmmhK41dAh2AK+jQklf6ivRq/wcic3bHZFFIKqn7ojbd48gqZGW/TTtSgv2U
+wR7tT3+mLXiOafJZMbF+ae1KkscmEY9S9LoZHBZjGIgAyKqo31/Ro8E3mXAG4Co=
+=CiW8
 -----END PGP SIGNATURE-----
diff --git a/net-im/ktp-text-ui/files/ktp-text-ui-0.4.0-reduce-libpurple-delay.patch b/net-im/ktp-text-ui/files/ktp-text-ui-0.4.0-reduce-libpurple-delay.patch
new file mode 100644
index 000000000000..bc1ad87b2fc5
--- /dev/null
+++ b/net-im/ktp-text-ui/files/ktp-text-ui-0.4.0-reduce-libpurple-delay.patch
@@ -0,0 +1,43 @@
+commit 04a419887ba7102726ae4168294da613ea58a6e2
+Author: Martin Klapetek <martin.klapetek@gmail.com>
+Date:   Wed Jul 18 14:58:33 2012 +0200
+
+    Don't spam the channel with Composing state if the state actually hasn't changed
+    
+    This fixes delays in messages with some accounts like ICQ/AIM, however if user sends quickly too many messages,
+    they will still be delayed (by libpurple), just considerably less. Now we're on par with Empathy and Kopete,
+    that's all we can do about it.
+    
+    Reviewed-by: George Kiagiadakis
+    BUG: 300655
+    FIXED-IN: 0.4.1
+
+diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
+index e3439d8..e30d7b5 100644
+--- a/lib/chat-widget.cpp
++++ b/lib/chat-widget.cpp
+@@ -862,13 +862,21 @@ void ChatWidget::onChannelInvalidated()
+ void ChatWidget::onInputBoxChanged()
+ {
+     //if the box is empty
+-    bool textBoxEmpty = !d->ui.sendMessageBox->toPlainText().isEmpty();
++    bool textBoxEmpty = d->ui.sendMessageBox->toPlainText().isEmpty();
+ 
+-    //FIXME buffer what we've sent to telepathy, make this more efficient.
+-    if(textBoxEmpty) {
++    //if the timer is active, it means the user is continuously typing
++    if (d->pausedStateTimer->isActive()) {
++        //just restart the timer and don't spam with chat state changes
++        d->pausedStateTimer->start(5000);
++        return;
++    }
++
++    if(!textBoxEmpty) {
++        //if the user has typed some text, set state to Composing and start the timer
+         d->channel->requestChatState(Tp::ChannelChatStateComposing);
+         d->pausedStateTimer->start(5000);
+     } else {
++        //if the user typed no text/cleared the input field, set Active and stop the timer
+         d->channel->requestChatState(Tp::ChannelChatStateActive);
+         d->pausedStateTimer->stop();
+     }
diff --git a/net-im/ktp-text-ui/ktp-text-ui-0.4.0-r1.ebuild b/net-im/ktp-text-ui/ktp-text-ui-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..7d659be36dc0
--- /dev/null
+++ b/net-im/ktp-text-ui/ktp-text-ui-0.4.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-text-ui/ktp-text-ui-0.4.0-r1.ebuild,v 1.1 2012/07/19 00:43:40 johu Exp $
+
+EAPI=4
+
+KDE_LINGUAS="ca cs da de el es et fi fr ga gl hu it ja km lt nb nds nl pl pt
+pt_BR sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv ug uk zh_CN zh_TW"
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="KDE Telepathy text chat window"
+HOMEPAGE="http://community.kde.org/Real-Time_Communication_and_Collaboration"
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="mirror://kde/unstable/kde-telepathy/${PV}/src/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="debug +history"
+
+DEPEND="
+	>=net-libs/telepathy-qt-0.9.1
+	history? ( net-libs/telepathy-logger-qt )
+"
+RDEPEND="${DEPEND}
+	>=net-im/ktp-contact-list-${PV}
+"
+
+PATCHES=( "${FILESDIR}/${P}-reduce-libpurple-delay.patch" )
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with history TelepathyLoggerQt4)
+	)
+
+	cmake-utils_src_configure
+}