From: Markos Chandras Date: Sun, 27 Jun 2010 23:59:41 +0000 (+0000) Subject: Apply patch to fix compilation with Qt-4.7. Fixes bug #325585 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=71edfa86eb4bc8fde53b841df6cd8f094fc5209d;p=gentoo.git Apply patch to fix compilation with Qt-4.7. Fixes bug #325585 Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- 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 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 choqok-0.9.55.ebuild: Drop redundant keywords line, how the heck it get there... diff --git a/net-im/choqok/Manifest b/net-im/choqok/Manifest index 17fac65d5430..ae5261a93093 100644 --- a/net-im/choqok/Manifest +++ b/net-im/choqok/Manifest @@ -1,14 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX choqok-0.9.55_qt47.patch 758 RMD160 0ddd20f7a6e8979b05c3c7ba5fb28af3b56a2e91 SHA1 3ea427431242f9a251d75de1e525a0a631bd203b SHA256 5f931e4daa57902e5644dbb2a17bb4ce9349689d09c57d15a30f4b3ec8d9ddcf DIST choqok-0.9.55.tar.bz2 431604 RMD160 ed801f21c990863f209b5f9834ee156d2bc37cce SHA1 3d3ab1bc992c0c89cb0dbf216be7f236dcb8b9fc SHA256 c1b8498d31eb85cdf4f87d35662d3f6dd591a1cbb5df94c2b111a56012f7ee64 -EBUILD choqok-0.9.55.ebuild 612 RMD160 194daaff64fa87eb545b255171b69ffa66b02340 SHA1 de36183cfd8d4d6a855c5c1d75f584132e7ffa45 SHA256 545dffd5bc8e5b994861f5ffd91d201ace808faf7714577756509112f7845193 -MISC ChangeLog 1164 RMD160 6000dea7844362fe9ae24d1716a6de0844a170f5 SHA1 55138f7cb1b3f7c9678f4f9c3aad9558873d3621 SHA256 650eb542f29ecad4990ab226a7220763e6e9db22b1cdab043bb4e57ebc1457d8 +EBUILD choqok-0.9.55.ebuild 655 RMD160 9bf70cc35a62bfb7f9f8f2b229ffd0fe0c73b159 SHA1 e423becf2ffe96b00379cd81e555029b4eeff4e3 SHA256 54ef4125e4e149d50da01868cfd8c76877f6e878aaa953cc833d58c600b0d9c7 +MISC ChangeLog 1338 RMD160 e66a840ffaec1d83f92f528dcac446c219abace9 SHA1 ea4771645d3ed07f970ed1c7c7df09e08be76cbb SHA256 e96434b8007331e61680b278151c3050a6be4ae32a51a09ba53aebe46e0a6f18 MISC metadata.xml 158 RMD160 7344d8189b297bc3aaa35226811d79c8dacb9f6f SHA1 4f1871fb2f1f05defed13aa3d8fd3d0e65788b5e SHA256 b1f2af69cc9a002750dfc0abd0f1dc63431290bebbabd4a17169dd3d4dbe89a2 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEARECAAYFAkur0PoACgkQHB6c3gNBRYcV5gCfdKl2kBqkLr5y/ftpOquEGp7h -QHIAni8HrRFmCfGkwFcYW6DA0VY/0HwQ -=AtF/ ------END PGP SIGNATURE----- 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 );