Adding patch to fix compilation without OAuth support. Thanks to Dragon Jake for reporting.

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

5 files changed, 61 insertions, 12 deletions

diff --git a/net-im/qtwitter/ChangeLog b/net-im/qtwitter/ChangeLog
index d1ae1fdb2677..fc60592592a9 100644
--- a/net-im/qtwitter/ChangeLog
+++ b/net-im/qtwitter/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/qtwitter
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qtwitter/ChangeLog,v 1.14 2009/09/12 10:07:24 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qtwitter/ChangeLog,v 1.15 2009/09/20 07:46:21 ayoy Exp $
+
+  20 Sep 2009; Dominik Kapusta <ayoy@gentoo.org> qtwitter-0.9.0.ebuild,
+  +files/qtwitter-0.9.0-no-oauth-fix.patch, metadata.xml:
+  Adding patch to fix compilation without OAuth support. Thanks to Dragon
+  Jake for reporting.
 
 *qtwitter-0.9.0 (12 Sep 2009)
 
diff --git a/net-im/qtwitter/Manifest b/net-im/qtwitter/Manifest
index a7aa12686147..a8f045a3c7e9 100644
--- a/net-im/qtwitter/Manifest
+++ b/net-im/qtwitter/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX qtwitter-0.9.0-no-oauth-fix.patch 1317 RMD160 dd6fb636663f5ba074b51100a05502e890a539ea SHA1 54a08b010945039085a48559bf11d56f6777eb22 SHA256 dc1f21e5938eb4f6ba9813e5bb12197c5743c400f0c3a8e53254b26299abdcdd
 DIST qtwitter-0.7.1-src.tar.gz 652298 RMD160 fefa04aa21ef752203fe88e942ee37c887da86a8 SHA1 57f4c59a9dcf06d14f3c3df4a5f73e1b35151b36 SHA256 b91eecd0b42611a83255df79400409a56011f3dbb56f38e2f3db6549fb25dbee
 DIST qtwitter-0.8.3-src.tar.gz 717214 RMD160 8344196f3962ca300b209fe3df4cc23d7f9deaa5 SHA1 7ec6023791de8b06527b5a729c43483b12775a21 SHA256 82d8ae0a1bc2ce8093c42087ac13c3e1b51e1aefccc49a631b1b9e4f373e71ed
 DIST qtwitter-0.9.0-src.tar.gz 730360 RMD160 ee2997f9570e489cc91668a6a3a0a320011d46f5 SHA1 9150815ecbb0c3bcb92e88e7a97a4fbbbcfa6991 SHA256 e7b3136405aba36344509973a87df905ad0f4f4f806a362e9423d85d6d46a78f
 EBUILD qtwitter-0.7.1.ebuild 1884 RMD160 6d8711fbf90a01cb8b3ae480e5a257bba3634de1 SHA1 482b861c91a3083732c9fc1447958074442c927d SHA256 ce07ef54ef748e2e1c9998c4dffa8123107b79b6eca15ee93592d921e8e582d5
 EBUILD qtwitter-0.8.3.ebuild 1980 RMD160 4ce6e4c0b8b334921baab0379174fd40570f2929 SHA1 7881d280b9c4a6869d3002e15833d3d8e9ab7479 SHA256 cebc81a5b03ea55306bb6a5fa8f3bd5e21e44ff9da5a11292c0725e0cb30b1d6
-EBUILD qtwitter-0.9.0.ebuild 1877 RMD160 74270208ce4e38bb904994c167ec9fe334d3ed73 SHA1 92d45f282636ce42fb4b504a1ef17bcbb21c083c SHA256 9e1a4f78039fccd904c24228dc7e86774bf8c31c9ae20cfec60d3b39a55eb606
-MISC ChangeLog 2257 RMD160 ad961a7ca2298d05d3a0713624d0abef58336603 SHA1 52363cdb4c82466cda3ec0f173384cdfb005164b SHA256 b037816593a7349e6ae99b3f806d2ac85157f7f0440d52ddaf760587b2f964fe
-MISC metadata.xml 535 RMD160 09417bed7dc7653afa28f6a333ba3e3add25cc68 SHA1 95d385827928c8e47bb42cfc1fe8df5d2656fa40 SHA256 1a0460eeacef5d3c7c7d150aac7f28850be27a004f8ca19074107e595ab133cf
+EBUILD qtwitter-0.9.0.ebuild 1930 RMD160 2fd1ec1c5c88f0e6b2bfd81d3898311f7caf38a4 SHA1 be89fc24c7d0b8d993671475b85ea78204262ade SHA256 de45b0676177d1008841fe96cb8b715d3c516a1cd85f2fe93e1271831a3ff31c
+MISC ChangeLog 2483 RMD160 fecd8290c81d2a39122cd224932b521209f2f9f0 SHA1 2dca163a55a4d7aaffce118b090f2748b9aaa776 SHA256 079d471318b75df613e4cff63bf92579e7d8e6bac653c057259497bf40e2f785
+MISC metadata.xml 385 RMD160 58a82127b96d58581d5e2260d2e0be8f154d2643 SHA1 f43cbedcfa8babcd98c874bd18b710c2aafeccc3 SHA256 ea0867fe73cb3760891b45c9d67c49b8212073b875aa290ad655d1505fb97ed3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkq13dkACgkQ+CZEqwt+F6YnegCeKPYhJ7CT4eIDZN7+q5DO5Jzo
+EUQAoKRRPSfMHWO6W8mWKwAn2OgyM1Bz
+=Q7Ho
+-----END PGP SIGNATURE-----
diff --git a/net-im/qtwitter/files/qtwitter-0.9.0-no-oauth-fix.patch b/net-im/qtwitter/files/qtwitter-0.9.0-no-oauth-fix.patch
new file mode 100644
index 000000000000..41758f914532
--- /dev/null
+++ b/net-im/qtwitter/files/qtwitter-0.9.0-no-oauth-fix.patch
@@ -0,0 +1,37 @@
+diff --git a/qtwitter-app/src/statuslist.cpp b/qtwitter-app/src/statuslist.cpp
+index 4b3fec5..c5b5673 100644
+--- a/qtwitter-app/src/statuslist.cpp
++++ b/qtwitter-app/src/statuslist.cpp
+@@ -25,7 +25,9 @@
+ #include <QPixmap>
+ 
+ #include <account.h>
+-#include <oauthwizard.h>
++#ifdef OAUTH
++#  include <oauthwizard.h>
++#endif
+ #include "imagedownload.h"
+ #include "core.h"
+ #include "dmdialog.h"
+diff --git a/twitterapi/twitterapi.cpp b/twitterapi/twitterapi.cpp
+index d4e69cc..eed4496 100644
+--- a/twitterapi/twitterapi.cpp
++++ b/twitterapi/twitterapi.cpp
+@@ -284,7 +284,7 @@ TwitterAPI::TwitterAPI( const QString &serviceUrl, const QString &login,
+ }
+ #else
+ TwitterAPI::TwitterAPI( const QString &serviceUrl, const QString &login,
+-                        const QString &password, QObject *parent = 0 ) :
++                        const QString &password, QObject *parent ) :
+     QObject( parent ),
+     d_ptr( new TwitterAPIPrivate )
+ {
+@@ -444,7 +444,7 @@ void TwitterAPI::postUpdate( const QString &data, quint64 inReplyTo )
+ #else
+   QByteArray auth = d->login.toUtf8() + ":" + d->password.toUtf8();
+   request.setRawHeader( "Authorization", "Basic " + auth.toBase64() );
+-  content = prepareRequest( data, inReplyTo );
++  content = d->prepareRequest( data, inReplyTo );
+ #endif
+ 
+   request.setUrl( QUrl(url) );
diff --git a/net-im/qtwitter/metadata.xml b/net-im/qtwitter/metadata.xml
index 1f9ce8d3f18f..099738bf66ef 100644
--- a/net-im/qtwitter/metadata.xml
+++ b/net-im/qtwitter/metadata.xml
@@ -6,13 +6,8 @@
 	<flag name="oauth">Enables authorization using OAuth for Twitter accounts</flag>
 </use>
 <maintainer>
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-</maintainer>
-<maintainer>
-<email>d@ayoy.net</email>
+<email>ayoy@gentoo.org</email>
 <name>Dominik Kapusta</name>
-<description>Upstream developer, proxy maintainer</description>
 </maintainer>
 <longdescription lang="en">
 </longdescription>
diff --git a/net-im/qtwitter/qtwitter-0.9.0.ebuild b/net-im/qtwitter/qtwitter-0.9.0.ebuild
index a0cb0f51f49f..d4738e5afbc7 100644
--- a/net-im/qtwitter/qtwitter-0.9.0.ebuild
+++ b/net-im/qtwitter/qtwitter-0.9.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qtwitter/qtwitter-0.9.0.ebuild,v 1.1 2009/09/12 10:07:24 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qtwitter/qtwitter-0.9.0.ebuild,v 1.2 2009/09/20 07:46:21 ayoy Exp $
 
 EAPI="2"
 
-inherit qt4
+inherit qt4 eutils
 
 DESCRIPTION="A Qt-based client for Twitter and Identi.ca"
 HOMEPAGE="http://www.qt-apps.org/content/show.php/qTwitter?content=99087"
@@ -59,6 +59,7 @@ src_prepare() {
 
 	if ! use oauth; then
 		sed -i '/DEFINES += OAUTH/d' ${PN}.pri || die "sed failed"
+		epatch "${FILESDIR}/${P}-no-oauth-fix.patch"
 	fi
 }