summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2010-06-27 23:59:41 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2010-06-27 23:59:41 +0000
commite39f5da5547c8dd67a6d0fd1543841e5c2d17391 (patch)
treec4975f9211ff7f7fb8e1863ba727e823f2a0b195 /net-im
parentx86 stable, bug 322791 (diff)
downloadgentoo-2-e39f5da5547c8dd67a6d0fd1543841e5c2d17391.tar.gz
gentoo-2-e39f5da5547c8dd67a6d0fd1543841e5c2d17391.tar.bz2
gentoo-2-e39f5da5547c8dd67a6d0fd1543841e5c2d17391.zip
Apply patch to fix compilation with Qt-4.7. Fixes bug #325585
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-im')
-rw-r--r--net-im/choqok/ChangeLog6
-rw-r--r--net-im/choqok/choqok-0.9.55.ebuild6
-rw-r--r--net-im/choqok/files/choqok-0.9.55_qt47.patch13
3 files changed, 23 insertions, 2 deletions
diff --git a/net-im/choqok/ChangeLog b/net-im/choqok/ChangeLog
index 12505b7e57e6..446fa5a2ac0f 100644
--- a/net-im/choqok/ChangeLog
+++ b/net-im/choqok/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-im/choqok
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/choqok/ChangeLog,v 1.6 2010/03/25 21:09:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/choqok/ChangeLog,v 1.7 2010/06/27 23:59:41 hwoarang Exp $
+
+ 27 Jun 2010; Markos Chandras <hwoarang@gentoo.org> choqok-0.9.55.ebuild,
+ +files/choqok-0.9.55_qt47.patch:
+ Apply patch to fix compilation with Qt-4.7. Fixes bug #325585
25 Mar 2010; Tomáš Chvátal <scarabeus@gentoo.org> choqok-0.9.55.ebuild:
Drop redundant keywords line, how the heck it get there...
diff --git a/net-im/choqok/choqok-0.9.55.ebuild b/net-im/choqok/choqok-0.9.55.ebuild
index 471877001697..30585291c65f 100644
--- a/net-im/choqok/choqok-0.9.55.ebuild
+++ b/net-im/choqok/choqok-0.9.55.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/choqok/choqok-0.9.55.ebuild,v 1.2 2010/03/25 21:09:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/choqok/choqok-0.9.55.ebuild,v 1.3 2010/06/27 23:59:41 hwoarang Exp $
EAPI="2"
@@ -15,3 +15,7 @@ LICENSE="GPL-3"
KEYWORDS="~amd64 ~x86"
SLOT="4"
IUSE="debug"
+
+PATCHES=(
+ "${FILESDIR}"/${P}_qt47.patch
+)
diff --git a/net-im/choqok/files/choqok-0.9.55_qt47.patch b/net-im/choqok/files/choqok-0.9.55_qt47.patch
new file mode 100644
index 000000000000..ec4711237a53
--- /dev/null
+++ b/net-im/choqok/files/choqok-0.9.55_qt47.patch
@@ -0,0 +1,13 @@
+Index: choqok-0.9.55/helperlibs/twitterapihelper/twitterapimicroblog.h
+===================================================================
+--- choqok-0.9.55.orig/helperlibs/twitterapihelper/twitterapimicroblog.h
++++ choqok-0.9.55/helperlibs/twitterapihelper/twitterapimicroblog.h
+@@ -170,7 +170,7 @@ protected:
+ timelineName should be a valid, previously created timeline.
+ */
+ virtual void requestTimeLine(Choqok::Account *theAccount, QString timelineName,
+- QString sincePostId, int page = 1, QString maxId = 0 );
++ QString sincePostId, int page = 1, QString maxId = QString() );
+
+ virtual void setTimelineInfos();
+ virtual KUrl apiUrl( TwitterApiAccount* theAccount );