diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2010-06-20 19:15:24 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2010-06-20 19:15:24 +0000 |
| commit | cbb3bd74aa8b6b52f3b9991fca0bd7fdda323cd6 (patch) | |
| tree | bd07168591be6bf3cc216510219a4ef2505ffa73 /net-p2p | |
| parent | Fix building with KDE 4.4.x wrt #310491 by Marco DR. (diff) | |
| download | gentoo-2-cbb3bd74aa8b6b52f3b9991fca0bd7fdda323cd6.tar.gz gentoo-2-cbb3bd74aa8b6b52f3b9991fca0bd7fdda323cd6.tar.bz2 gentoo-2-cbb3bd74aa8b6b52f3b9991fca0bd7fdda323cd6.zip | |
Patch for trackerlist moc issue. Fixes bug #324669
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-p2p')
| -rw-r--r-- | net-p2p/qbittorrent/ChangeLog | 6 | ||||
| -rw-r--r-- | net-p2p/qbittorrent/files/moc_bug_workaround2.patch | 51 | ||||
| -rw-r--r-- | net-p2p/qbittorrent/qbittorrent-2.2.9-r1.ebuild | 4 |
3 files changed, 59 insertions, 2 deletions
diff --git a/net-p2p/qbittorrent/ChangeLog b/net-p2p/qbittorrent/ChangeLog index 858ea78a32ec..259cf706aaca 100644 --- a/net-p2p/qbittorrent/ChangeLog +++ b/net-p2p/qbittorrent/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-p2p/qbittorrent # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.90 2010/06/17 15:01:56 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.91 2010/06/20 19:15:24 hwoarang Exp $ + + 20 Jun 2010; Markos Chandras <hwoarang@gentoo.org> + +files/moc_bug_workaround2.patch, qbittorrent-2.2.9-r1.ebuild: + Patch for trackerlist moc issue. Fixes bug #324669 *qbittorrent-2.3.0_beta2 (17 Jun 2010) diff --git a/net-p2p/qbittorrent/files/moc_bug_workaround2.patch b/net-p2p/qbittorrent/files/moc_bug_workaround2.patch new file mode 100644 index 000000000000..0aa866d61aec --- /dev/null +++ b/net-p2p/qbittorrent/files/moc_bug_workaround2.patch @@ -0,0 +1,51 @@ +Index: src/trackerlist.h +=================================================================== +--- src/trackerlist.h (revision 4105) ++++ src/trackerlist.h (working copy) +@@ -61,10 +61,8 @@ + public slots: + void setRowColor(int row, QColor color); + +-#if LIBTORRENT_VERSION_MINOR < 15 + void moveSelectionUp(); + void moveSelectionDown(); +-#endif + + void clear(); + void loadStickyItems(const QTorrentHandle &h); +Index: src/trackerlist.cpp +=================================================================== +--- src/trackerlist.cpp (revision 4105) ++++ src/trackerlist.cpp (working copy) +@@ -94,8 +94,8 @@ + }
+ }
+
++void TrackerList::moveSelectionUp() {
+ #if LIBTORRENT_VERSION_MINOR < 15
+-void TrackerList::moveSelectionUp() {
+ QTorrentHandle h = properties->getCurrentTorrent();
+ if(!h.is_valid()) {
+ clear();
+@@ -129,9 +129,11 @@ + h.replace_trackers(trackers);
+ // Reannounce
+ h.force_reannounce();
++#endif
+ }
+
+ void TrackerList::moveSelectionDown() {
++#if LIBTORRENT_VERSION_MINOR < 15
+ QTorrentHandle h = properties->getCurrentTorrent();
+ if(!h.is_valid()) {
+ clear();
+@@ -165,8 +167,8 @@ + h.replace_trackers(trackers);
+ // Reannounce
+ h.force_reannounce();
++#endif
+ }
+-#endif
+
+ void TrackerList::clear() {
+ qDeleteAll(tracker_items.values());
diff --git a/net-p2p/qbittorrent/qbittorrent-2.2.9-r1.ebuild b/net-p2p/qbittorrent/qbittorrent-2.2.9-r1.ebuild index 6c990bb9f69a..9a094d2dcdd2 100644 --- a/net-p2p/qbittorrent/qbittorrent-2.2.9-r1.ebuild +++ b/net-p2p/qbittorrent/qbittorrent-2.2.9-r1.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-p2p/qbittorrent/qbittorrent-2.2.9-r1.ebuild,v 1.1 2010/06/17 12:09:12 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-2.2.9-r1.ebuild,v 1.2 2010/06/20 19:15:24 hwoarang Exp $ EAPI="2" PYTHON_DEPEND="2" @@ -39,6 +39,8 @@ src_prepare() { # Move saveDHTEntry definition away from slots so the moc # doens't get confused and breaks compilation epatch "${FILESDIR}"/moc_bug_workaround.patch + # same for trackerlist + epatch "${FILESDIR}"/moc_bug_workaround2.patch # fix WebUI for nox binary epatch "${FILESDIR}"/nox-webui-fix.patch # Respect LDFLAGS |