From: Andreas Hüttel <dilfridge@gentoo.org>
Date: Fri, 23 Sep 2011 21:39:42 +0000 (+0000)
Subject: Fix twitter authentication, bug 383307
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9ebe3810866de07fd93a73789867cd1069b1a82a;p=gentoo.git

Fix twitter authentication, bug 383307

Package-Manager: portage-2.1.10.19/cvs/Linux x86_64
---

diff --git a/net-im/choqok/ChangeLog b/net-im/choqok/ChangeLog
index 9aaa641dd5e5..25738860e7f6 100644
--- a/net-im/choqok/ChangeLog
+++ b/net-im/choqok/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/choqok
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/choqok/ChangeLog,v 1.18 2011/04/12 12:53:32 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/choqok/ChangeLog,v 1.19 2011/09/23 21:39:42 dilfridge Exp $
+
+*choqok-1.1-r1 (23 Sep 2011)
+
+  23 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org> +choqok-1.1-r1.ebuild,
+  +files/choqok-1.1-twitter.patch:
+  Fix twitter authentication, bug 383307
 
 *choqok-1.1 (12 Apr 2011)
 
diff --git a/net-im/choqok/Manifest b/net-im/choqok/Manifest
index 082436a1b9b1..902dc665ebd8 100644
--- a/net-im/choqok/Manifest
+++ b/net-im/choqok/Manifest
@@ -1,8 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX choqok-1.1-twitter.patch 1557 RMD160 04c12c8aa81189b0ce57f03ca8d7852d5ab876d8 SHA1 e1d622bf26887f75d41194078b4bc15f7b809ed9 SHA256 be412e0f98f96bbef505a82b65d3fc600d892aec8c522a4c5fad0a636846190a
 DIST choqok-1.0.tar.bz2 885498 RMD160 8f232d1d8ba96bee46f5ebd0289a95154267e0d2 SHA1 f50345142525a182dc081b23617551ed6c44fea2 SHA256 45d08a621f2e96fb235aba24c181970cb9ddd423a695cd6c4f9be55300764847
 DIST choqok-1.1.tar.bz2 917476 RMD160 8a1ee9376b905089312d0689c1092a17a3770655 SHA1 e29c22279a861546b688539eb30de35edf66e29f SHA256 f9b3016a3e7dba1c5f894e3c453292333c49ee535a14c013f1331b20be519ff2
 DIST choqok.0.9.90.tar.bz2 440689 RMD160 00b00edf37294d05a8ea885779cfbda6b7825741 SHA1 6802a6b29405105c3879a7b05bd2a9173503f1df SHA256 f8bca5729769003533cb0da7438773824fb02b0dd6460ae4c908ca81174244bb
 EBUILD choqok-0.9.90-r1.ebuild 762 RMD160 3caa8a173200bc497df2ecdf3571349a991c93cb SHA1 bd4d3083bd5746170235cdcb7e2f1c98b6c32b21 SHA256 88ddd900b27586621e1a9c4984d712b83ce2809e883c0f5bd06a461339a46d54
 EBUILD choqok-1.0.ebuild 859 RMD160 7f44d32e35ddf8296fd1fb6c98338a1c112c1d48 SHA1 271a0402daf9a0b69e86094d7e993d48502a081c SHA256 d5399545324a7b91bc03a3e48e6cb0bf902e83486ad70c4ebd9f95629d0c1c1f
+EBUILD choqok-1.1-r1.ebuild 920 RMD160 3f71a339f1625b8df0b609733ac965fbb5baedfe SHA1 2ac7a52481f47eba2a4da4858559640e86e924ee SHA256 0af4c2bdb7284b77fe5bc8330ac30ed871f3e72a11a96be26e44a41e041ec51d
 EBUILD choqok-1.1.ebuild 873 RMD160 62be0c8a8e373ea7b5114b37a23f88ee5e56d83d SHA1 52c57b85e55de150335102cf5d04d38cf7997090 SHA256 f34eb87d0bb4e384ba49d25b94299c3306d1bbdaa1112ad9087b5185ea7bb7d6
-MISC ChangeLog 3117 RMD160 d1d3c5086cdb80ab024cc7e41acb6a8a49fc0bc3 SHA1 354f33559f74e6f738f7a83068a1164143b1e4c0 SHA256 3ac8a178fb349c5dad0217d351a59dfeaef95712db6d1eca75b9ca49f33702a9
+MISC ChangeLog 3304 RMD160 1cab8f34ef4ffd06254efc59f7e269df5ccca453 SHA1 eab1029b90f1da817f0787da10ee83f270121cc9 SHA256 56c164600e4bda624b3aa9d0ecc2e80954f4f64c05d1ea6c4b5e6e4fdb6d55bc
 MISC metadata.xml 264 RMD160 6635854d3ceb1ba29288435f98f2d3528e8abfee SHA1 b134d85ce6edba19983d2f97c8beaad07629ed65 SHA256 e5eb6745453aa53ed155e7f49eb761f4670847982d1c14f597d92b7870aba4a6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJOfPy9AAoJENwGBM22xffej1AQAJedE0l9CQOF4+Dy/Zb2GnuN
+tIbfDqKsEkopTb3Hc1+UA2kDH4XbL7dbY4+hvFnp40+Hvo0ENwT8VwrWCrTNfO9T
+d//qyaDayWiJ79QxkfKRzwhKrMy9/23fa4QbnUmFfBInQFKRi/ELsKZv4PyZMDSf
+klVQ87pLXoyjNWhWg1Zou59y1KwDbf5kd5s8dH+hEBgx28Hju3dk9wmh5cPjCZVD
+Meajyo15Hk01YkDYgHzRP3pCPLxUDfuGGnjCZGY+yA3D9VP7Ndnc/qlfnr1uvtgN
+nhrj7v8rQu19VGtfqfI4cB8JNh1yGlcnzCRisXJaYshnFlYwo8kRsYaeSdcruM8X
+P79RzUeTcp9Uo3VV1IvExDkCrbUVrtHPMMaJIa01eX+XoKmZWe9WMDLHKgieN7iZ
+6Pla4Bv/NpLnCwZinYstM4W0gkgdeEBQiMtLdMTzd1DtCnKT8h8tjTdB2ntEzXFZ
+UmUI1NKb1ON5c17NtKt9dz7l+1X51DsYWSUN16lBEc47BxiX6a+jKLQUyxJJ7rSW
+ESMzGyJTnAUN3yl6f1NyekThiN/nG7EilRrX+FIGxMQ/HLVdg+0EhjCAnxqhhwZJ
+tmGpq1GkcR5EDkkjQM8r+gmEuDarWzEs2VDba9wb5bnQRbgzZe0k90+Os8VRUhIh
+X8UIBFCGlaaKpswh1F+F
+=K0rx
+-----END PGP SIGNATURE-----
diff --git a/net-im/choqok/choqok-1.1-r1.ebuild b/net-im/choqok/choqok-1.1-r1.ebuild
new file mode 100644
index 000000000000..609e4aa82323
--- /dev/null
+++ b/net-im/choqok/choqok-1.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/choqok/choqok-1.1-r1.ebuild,v 1.1 2011/09/23 21:39:42 dilfridge Exp $
+
+EAPI=4
+
+if [[ ${PV} != *9999* ]]; then
+	KDE_LINGUAS="bg da de en_GB es et fr ja nb nds nl pa pl pt pt_BR ru sv tr uk zh_CN zh_TW"
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+	KDE_HANDBOOK="optional"
+	KEYWORDS="~amd64 ~x86"
+else
+	KDE_SCM="git"
+	KEYWORDS=""
+fi
+
+inherit kde4-base
+
+DESCRIPTION="Free/Open Source micro-blogging client for KDE"
+HOMEPAGE="http://choqok.gnufolks.org/"
+
+LICENSE="GPL-3"
+SLOT="4"
+IUSE="debug indicate"
+
+DEPEND="dev-libs/qjson
+	>=dev-libs/qoauth-1.0.1
+	indicate? ( dev-libs/libindicate-qt )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-twitter.patch" )
+
+src_prepare(){
+	mycmakeargs=(
+		$(cmake-utils_use !indicate QTINDICATE_DISABLE)
+	)
+
+	kde4-base_src_prepare
+}
diff --git a/net-im/choqok/files/choqok-1.1-twitter.patch b/net-im/choqok/files/choqok-1.1-twitter.patch
new file mode 100644
index 000000000000..823bfefc3a85
--- /dev/null
+++ b/net-im/choqok/files/choqok-1.1-twitter.patch
@@ -0,0 +1,30 @@
+commit 9053b699c33d998d3933a6c11e4ff624846620e5
+Author: Mehrdad Momeny <mehrdad.momeny@gmail.com>
+Date:   Sun Jul 24 11:30:49 2011 +0800
+
+    BUG:275185 Get user friends list bug fixed
+
+diff --git a/helperlibs/twitterapihelper/twitterapimicroblog.cpp b/helperlibs/twitterapihelper/twitterapimicroblog.cpp
+index 1efbb1f..1a87d61 100644
+--- a/helperlibs/twitterapihelper/twitterapimicroblog.cpp
++++ b/helperlibs/twitterapihelper/twitterapimicroblog.cpp
+@@ -681,14 +681,18 @@ void TwitterApiMicroBlog::requestFriendsScreenName(TwitterApiAccount* theAccount
+     TwitterApiAccount* account = qobject_cast<TwitterApiAccount*>(theAccount);
+     KUrl url = account->apiUrl();
+     url.addPath( QString("/statuses/friends.xml") );
++    KUrl tmpUrl(url);
+     url.addQueryItem( "cursor", d->friendsCursor );
++    QOAuth::ParamMap params;
++    params.insert("cursor", d->friendsCursor.toLatin1());
+ 
+     KIO::StoredTransferJob *job = KIO::storedGet( url, KIO::Reload, KIO::HideProgressInfo ) ;
+     if ( !job ) {
+         kDebug() << "Cannot create an http GET request!";
+         return;
+     }
+-    job->addMetaData("customHTTPHeader", "Authorization: " + authorizationHeader(account, url, QOAuth::GET));
++    job->addMetaData("customHTTPHeader", "Authorization: " + authorizationHeader(account, tmpUrl,
++                                                                                 QOAuth::GET, params));
+     mJobsAccount[job] = theAccount;
+     connect( job, SIGNAL( result( KJob* ) ), this, SLOT( slotRequestFriendsScreenName(KJob*) ) );
+     job->start();