From 06ea5441df442f8b6803e29b4339546cf5dbcb08 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Sun, 20 Jun 2010 19:15:24 +0000 Subject: [PATCH] Patch for trackerlist moc issue. Fixes bug #324669 Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- net-p2p/qbittorrent/ChangeLog | 6 ++- net-p2p/qbittorrent/Manifest | 5 +- .../files/moc_bug_workaround2.patch | 51 +++++++++++++++++++ .../qbittorrent/qbittorrent-2.2.9-r1.ebuild | 4 +- 4 files changed, 62 insertions(+), 4 deletions(-) create mode 100644 net-p2p/qbittorrent/files/moc_bug_workaround2.patch 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 + +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/Manifest b/net-p2p/qbittorrent/Manifest index 4b03d403d163..1e1b6a086aae 100644 --- a/net-p2p/qbittorrent/Manifest +++ b/net-p2p/qbittorrent/Manifest @@ -1,4 +1,5 @@ AUX moc_bug_workaround.patch 796 RMD160 b4b4d70bea959d0375ad753dfaa9afdf65ea5508 SHA1 4f8088ce859e2acf41e03ccb19e7efeda9044852 SHA256 3c99d404d5206fc1b320ab26a367f0e28bd1408fe56eacd4a86e05ec8aade36e +AUX moc_bug_workaround2.patch 1313 RMD160 dc2a1b3dd336bf37c577b7e69beeedc61b546453 SHA1 b2722f7a2630ef69a5ad838672ca25f89f469a8a SHA256 147a1a04281c03f7ca721ad68aab7360f102267d667298a58f700d7b36ec17b0 AUX nox-webui-fix.patch 2673 RMD160 349085981eee5e2deed5dce6e8b9557c07022ec7 SHA1 7a290fe64ee74a95bc3d97c6d2eef26cc459bad2 SHA256 ebe5d99aca9614c13a5b00c0b66aa2b189cce47acd1a1792665f6fc7430c8af4 DIST qbittorrent-2.2.2.tar.gz 2498865 RMD160 c9ff7b7ac51ab1f0bf439205a69cae99a44ab27d SHA1 cb12f934f6c61c78f71b7afce065442d77e6dc9c SHA256 9750ae4c384f0b283f9185722fdb1206148438132c5f44b094c6b0e697c5711d DIST qbittorrent-2.2.5.tar.gz 2504251 RMD160 3e54e49bf877778b00d6c26c73bb8a66a8a17a4c SHA1 a7568c220d1e5ed3113c6be861bab4422ef5343a SHA256 461f1b8f38c3ca8d769e7d628ec897adc1cc1f81b43e36e1bcd3847dfe382f2d @@ -13,8 +14,8 @@ EBUILD qbittorrent-2.2.5.ebuild 1642 RMD160 8091a7b960f1f4b0c67de67d55d5f2572bc5 EBUILD qbittorrent-2.2.6.ebuild 1644 RMD160 2f0d53fe978d64e59451cdbb35dbaf475410cb53 SHA1 47c445cae4442ae1900a917e2fe6ad5f93b628a7 SHA256 37923ca31aec8e09fa108b9ff5bff773f4b681f05cf08656ee0723d1a41e11f2 EBUILD qbittorrent-2.2.7.ebuild 1644 RMD160 fba816796d2be19657865822ffebf7574d707942 SHA1 9bc1641d8e37cc44cc16b33c6acf249bc8ac6927 SHA256 32495a6225e4e561f8e99ed7ff88d82fa5e778af6d4f6cfa9602e6a21c6b4938 EBUILD qbittorrent-2.2.8.ebuild 1684 RMD160 f3f1f3493bfb5625f49a2ae01107af6e0be9246d SHA1 cea4413f886076683c7f500c8d7e16db8797e024 SHA256 815f85ad12645ee9004ae95d7c12ec7bbba7be232d50fdb59e33872e04c545cf -EBUILD qbittorrent-2.2.9-r1.ebuild 1910 RMD160 28879c0457623fbb9f3e958eb1b67eddb116d782 SHA1 ad1e9ea5b476a95cfa3e097119d6686aa215f303 SHA256 00c1e5dd8a82f68e2bf1a1d019dbfa223c9a659c5ccaf5d2aaec60e9dad13b9e +EBUILD qbittorrent-2.2.9-r1.ebuild 1982 RMD160 0707ac2d2088301d011d84f52a975fe1683f2e99 SHA1 1ef4a73f83493fcb2cc1cbbb0bd4d5fd43b42b6c SHA256 dbd61e2e4802859d795c71458b390c7b7ba626dd1f304466106edaff5797844d EBUILD qbittorrent-2.3.0_beta1.ebuild 1733 RMD160 ff30289572603ec004dd35ce4de03b2ac2466e53 SHA1 66d4f31908eabfe505aa050b32ce716c8d1d1fc1 SHA256 ef74c04b1187cd974fb6b36e4ca8e5a17fd121f1dff0af8d0937cca802d0e5b6 EBUILD qbittorrent-2.3.0_beta2.ebuild 1733 RMD160 9690a0f7d2b75cabe720314d35268fff22c558a8 SHA1 e20288cd6f1c09a96945a9dfb7cb89e5f9c89751 SHA256 a93e989dd7491c074f6f30d5592aecfa411bfab2799900e76ea1772b530d0b84 -MISC ChangeLog 15087 RMD160 2f2b00c331b21894a7f041894d1e5e2e1f071118 SHA1 50b805b2f6502004a50301709b1f8d6d762b69a9 SHA256 c64bc36d3678a3a10d082b44385adde0864b863a53140a0a7f3e9882576661a8 +MISC ChangeLog 15259 RMD160 1becc193058460dc839428f3a54a2a3dbfb2bf7a SHA1 e0f09e7b346ca9e69a919c9dc9a5daa0aabae3b2 SHA256 e0278e1b1d3719e05736a5b41865bde0c420d1ea72daa7d01dc6d03487686810 MISC metadata.xml 280 RMD160 25c947a1034c150a136911351c7da9ed8783ee44 SHA1 17a16b5a0ddc3de88d81a1493cd5cb4c1aa795aa SHA256 07e3116f2c52c06760e21dc1b8bd3b318b7d9a140fb1b8942736aedd0d750b73 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 -- 2.26.2