diff options
author | Justin Lecher <jlec@gentoo.org> | 2015-07-29 07:35:40 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2015-07-29 07:35:40 +0000 |
commit | cbf2c8fc433cf871834c50f2f11b7679d9351a90 (patch) | |
tree | 6475c1a9fbf077fe011d33a73980a3fde3ad6e1d /net-p2p | |
parent | Drop old (diff) | |
download | historical-cbf2c8fc433cf871834c50f2f11b7679d9351a90.tar.gz historical-cbf2c8fc433cf871834c50f2f11b7679d9351a90.tar.bz2 historical-cbf2c8fc433cf871834c50f2f11b7679d9351a90.zip |
Drop obsolete patches
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!
Diffstat (limited to 'net-p2p')
-rw-r--r-- | net-p2p/rtorrent/ChangeLog | 8 | ||||
-rw-r--r-- | net-p2p/rtorrent/Manifest | 28 | ||||
-rw-r--r-- | net-p2p/rtorrent/files/rtorrent-0.8.7-canvas-fix.patch | 301 | ||||
-rw-r--r-- | net-p2p/rtorrent/files/rtorrent-0.8.9-canvas-fix.patch | 299 | ||||
-rw-r--r-- | net-p2p/rtorrent/files/rtorrent-0.8.9-ncurses.patch | 17 | ||||
-rw-r--r-- | net-p2p/rtorrent/files/rtorrent-0.9.0-ncurses.patch | 10 |
6 files changed, 30 insertions, 633 deletions
diff --git a/net-p2p/rtorrent/ChangeLog b/net-p2p/rtorrent/ChangeLog index 5f0620218b2a..f369e37cda7d 100644 --- a/net-p2p/rtorrent/ChangeLog +++ b/net-p2p/rtorrent/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-p2p/rtorrent # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.200 2015/07/19 15:56:14 heroxbd Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.201 2015/07/29 07:35:39 jlec Exp $ + + 29 Jul 2015; Justin Lecher <jlec@gentoo.org> + -files/rtorrent-0.8.7-canvas-fix.patch, + -files/rtorrent-0.8.9-canvas-fix.patch, -files/rtorrent-0.8.9-ncurses.patch, + -files/rtorrent-0.9.0-ncurses.patch: + Drop obsolete patches 19 Jul 2015; Benda Xu <heroxbd@gentoo.org> files/rtorrent-0.9.4-tinfo.patch, rtorrent-0.9.4-r1.ebuild: diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest index fe3faba15505..f9fc653ec017 100644 --- a/net-p2p/rtorrent/Manifest +++ b/net-p2p/rtorrent/Manifest @@ -1,7 +1,6 @@ -AUX rtorrent-0.8.7-canvas-fix.patch 10095 SHA256 a40a88d17e3090d3a7244ae701b049687b3646f8cbecfe40a1456306b6b56fd7 SHA512 4441f64a069bc2980d71410f99115fe10c07d98f28852186079227f66fae7c0aa25672e9c6bd5184fcb66233a6c331b156581e7f5241614839343a9387a76589 WHIRLPOOL cd5e3bd12459a3d4db9beeff323ceaf2f0323c86689f079177019f9f39c8a714d73f9f1513cf76b1e9f39910f8dd32458e942bf55d7b733247f29eb152972f7d -AUX rtorrent-0.8.9-canvas-fix.patch 9995 SHA256 f53eca85da4800f123f1f482dd49e07d40fcc4055e84f9450f3894cc51259415 SHA512 40d93ff3bc80268ddbda9355b2c1b6aa0234991c8cfc8613c5711e16c5de4ae83e681c3e9b0b4f902daa6ab198dd5b8f96ca7f71dbabdf1a3b0d8761e747f714 WHIRLPOOL ee300ce00dbcb93238bd958089774910d21dde0485b9af997b133198f2af4fe007f279076e45c635545027637ff5590cfd48f8a99f95e4bfd8278acff7079924 -AUX rtorrent-0.8.9-ncurses.patch 618 SHA256 67002221b79bb5e43e8ed05ae0ebb22130c10eaf5739acbb1fb424050f2e2a05 SHA512 cc71e44cf748d6548cffc66b7a6d9f0873ef009fd028fe1f885933100eb01da80232443ba01f8968402c63c17b224f8ce8dc3cb6ad749bb4f0f7f932b8539c5c WHIRLPOOL 3ffee3947bd3c81b35b96a4063bbbab79138da1752943e7a26d3bb4d53d8cc16c332c7df33ed1714700a45c51a01474df090c2dedbf64a559c22fc2be99bb301 -AUX rtorrent-0.9.0-ncurses.patch 416 SHA256 043f85f5e77de132f5a8aeccc894f11fad961f237a5c092dd38e163620f6e40e SHA512 bc36d56880fbfb99d6e5cb19688d733d79a89c8aec88913f5962ea72503e4103b34eb2a67be76bbe80c35beda972f6fc5dbf1947f89624bf5e117774688e7cf8 WHIRLPOOL 211bff140ee9094fde6b9f21a0a853c26d79f79a9727203ee7d96b010795620d5d7eb01d683cfceee0a31c5d0c0701a85054b259f7c21c35ebac0ccd9de4fe53 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + AUX rtorrent-0.9.1-ncurses.patch 416 SHA256 043f85f5e77de132f5a8aeccc894f11fad961f237a5c092dd38e163620f6e40e SHA512 bc36d56880fbfb99d6e5cb19688d733d79a89c8aec88913f5962ea72503e4103b34eb2a67be76bbe80c35beda972f6fc5dbf1947f89624bf5e117774688e7cf8 WHIRLPOOL 211bff140ee9094fde6b9f21a0a853c26d79f79a9727203ee7d96b010795620d5d7eb01d683cfceee0a31c5d0c0701a85054b259f7c21c35ebac0ccd9de4fe53 AUX rtorrent-0.9.4-tinfo.patch 1137 SHA256 8c12b5715baec6afc362fa82743b3660ce1ab92edd1bc47048e4af3478f63318 SHA512 5f571daa1bdaa8823bbbf52c66df3ff88be487e3fdaa8ea4f45c26b13336995a4a81a712766a8181bc85746e458652bb11c4dcc28d76da3137025e52e614c179 WHIRLPOOL d44ec1195fb41e43683313083d1f90276f080515cb2e0be68d132a2c1874326b5db23e8dbc0c5063f5a19ecafbb42ea0f09fa551850346e37ab5bf63038bd0a6 AUX rtorrent.1 18204 SHA256 bac10215777c9a22826f56f6218b21734306e30e179deeab47164a845b01dae9 SHA512 f2d3fb87fd7c321822ce9e61cc334682f9692e3f86b42cb3d7d5826dec53d56e631e20455e0ea1e53448c11386988a6e7a70a91ed2923f90852956ad3fdafcfe WHIRLPOOL 6e98f2ce7660cf00fd8a7fb8d9cfcb2f44867a18d3376c6434aef0cf61703c5939743f7194ee76de3bb7b1dccf5fd8a4461047f96c210c5b13afee58048ee76e @@ -12,5 +11,24 @@ DIST rtorrent-0.9.3.tar.gz 583311 SHA256 9e93ca41beb1afe74ad7ad8013e0d53ae3586c9 DIST rtorrent-0.9.4.tar.gz 601913 SHA256 bc0a2c1ee613b68f37021beaf4e64a9252f91ed06f998c1e897897c354ce7e84 SHA512 ae243d0336acff50e91e4ed9d306beb4705559775518e6dc122ec18a1530e59e2c531cf54f4b79899a1569ca18d343fce255071b45c41df1357bddfe926692aa WHIRLPOOL 03eb3cff0f7d490ada2199310fd2ba7576de8e20557e532df49be17f84aa2afb9cb8137b2eb317bc0fb4ce8ce035e900c65c32e81dc5d5d215923d91e8c0612a EBUILD rtorrent-0.9.3.ebuild 1557 SHA256 58de765bb896d6a2d566d8201d8708b9892bbb43a15a5bda3d2af103198e2248 SHA512 0c24d469d72e709f951ab2d867090eb7c862d0d7b0d671ae15b9d3c55eae93acbe1363c56715131dcf69a97d61085157b5678a0622f6160f57266ddfbd77fa40 WHIRLPOOL 7ceda36e1d2850bd88adbeedb9ae543b1ba21f055c5ee30dd1604048725357e2e4712657dfe7ecdce7d28cb7bfec35ec637d6ce94836770e8ef268007c8ff802 EBUILD rtorrent-0.9.4-r1.ebuild 1702 SHA256 2bb76c9a419041c87a4173aed22626be71f643b62ee2e913a8add3772a5e566f SHA512 a7cc45d9842d1d90593af40edcd02694d9b5490662d4aec276c4ed5e46cc8aef31b6703a1263044cc980b235ac5bb8362859b85268d9c98dbfe67122330ad0a3 WHIRLPOOL 3e6dcb597bd7de8b6e0202667924717ae28d3a7a5a70cf8d1bf24f5d8c1f277bf6ef8a426bd479ca812916fd5938d53742fe47498054760853ca3089f477cf75 -MISC ChangeLog 30070 SHA256 926ee387a7c4e4f14c24ee95a57730327114881a5a4a4b0ed8e3281a6b6432e0 SHA512 39f8bb1478ce0d836df53c1e5f4288da6f2fbc434616e1c12fdb9bbc55c70ba9623c5ee69c79f0de72cd83db63b832f3e2955c71c02719db97da7146bce9a0a3 WHIRLPOOL fd6b320e68210dc6f4510a0dea3ade1cba6e539c4f577a814144ca13a3259aa872cd70bbfe07da4a179ad6d287d7db0de67fea81b8a943cb4dc03bf39f188348 +MISC ChangeLog 30299 SHA256 56a50fc40703456a109c21b62c768a999c8baf18684ff35658fda55e08cc2790 SHA512 661d2db8b47ec1f7463e62e412f2a9d67b01536d4401eafa77521af7805c4d3caf61249de9cee8585d0555c32dc65dd8a21127eeef8251caef3f93b8c5199785 WHIRLPOOL d6e32052df092c0ba95955c7f07f7bfb4fd39d5fbad593949c0ca69d9aa85cf676ec728c5d4745b0443fb799b1bcb2743fcda2cfc574603856f4e0b864fb8e27 MISC metadata.xml 402 SHA256 e4709f5c00e315805f08f4dde3c4dc632c086b019f3133ed36b67674fdd500ba SHA512 170c29371ee7e7eeea4b3e48d7783faf29e284e634b9f748977403ec4569d01a3f8fc121735d6546ee23ac4aeeb84d27745ec6168d7daaceea89f84268652c84 WHIRLPOOL 764757bd4b9da2fe40c24e1f04667268061f3e52c1fb15ef53e905e823c6b4f11bd61ac29179b4581063f5ab50f7dfc7df913cb4392c45822f1c3f8975652468 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.1 + +iQJ8BAEBCgBmBQJVuIJJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF +OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmirrcP/0oq2G8L5tzc/S6Xhmk39fmo +BqubiadLaEqXT/E6wZd/5scv0XDqoAptFfKJEazy8XDMfTipsYTVHXCo3+fAvlXy +2NzZmxMKFVn7nYjIfBNZa4agxqQhwKeVg+XfJRa4BwlZoKExEtQf1o0rzbhQOYAq +wy2zRINmTXFvAoFVjm/7Hrd0oC0jWmhXYg8ai0PYdg5fCwqhbL0a52ym/yqvzpqu +j+KYTGLKG88Atbl6noAeTA9zXpMF/kM0CU4D2cqx4e/2m1WcOGfY1bk1FDqziC+X +DljHW+iUIEYHDyPdv+vwUaEhqaVOzUa3hpEqmcbSGHwMPirOM8FpcBge0EoSi0H0 +3b/igp3gMsy2sQ1I1sZHomf4SfLctB4FKX10lH3+ePLBGLhLxVoEmAOACyHrhJz0 +wl0TYhs2zf4dLyIDlAA/45oH/77ZU6kvD/x1XS4DHG0p8xBCMX3fnd0gwvQZmu6W +Gtbzn8eLhWoBH/pa21BIGWFoqbyH6S9TDwqS61zzeFCaVnSMbJln9WGGi987uz0w +8k6P75wne84v7yXQ6E+zaUmI3IaOe2K51IVDPtQXZDIcB8SD9qkcsRQFJl6oZY0q +S82ZE3z0c2RITmXDYKNLVvtDdO2rQUZVqq0mHJvBCvqxSZT/aZZ+VgBNmHHg5V4e +SHSr+nJXfPIIfrpAT7im +=MHml +-----END PGP SIGNATURE----- diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.7-canvas-fix.patch b/net-p2p/rtorrent/files/rtorrent-0.8.7-canvas-fix.patch deleted file mode 100644 index 9fa32a4417ab..000000000000 --- a/net-p2p/rtorrent/files/rtorrent-0.8.7-canvas-fix.patch +++ /dev/null @@ -1,301 +0,0 @@ -Index: rtorrent/src/display/window_download_list.h -=================================================================== ---- rtorrent/src/display/window_download_list.h (revision 1163) -+++ rtorrent/src/display/window_download_list.h (working copy) -@@ -59,6 +59,10 @@ - virtual void redraw(); - - void set_view(core::View* l); -+ void set_done_fg_color(int64_t color); -+ void set_done_bg_color(int64_t color); -+ void set_active_fg_color(int64_t color); -+ void set_active_bg_color(int64_t color); - - private: - core::View* m_view; -Index: rtorrent/src/display/canvas.cc -=================================================================== ---- rtorrent/src/display/canvas.cc (revision 1163) -+++ rtorrent/src/display/canvas.cc (working copy) -@@ -92,6 +92,10 @@ - m_isInitialized = true; - - initscr(); -+ start_color(); -+ use_default_colors(); -+ init_pair(2, -1, -1); -+ init_pair(1, -1, -1); - raw(); - noecho(); - nodelay(stdscr, TRUE); -Index: rtorrent/src/display/window_download_list.cc -=================================================================== ---- rtorrent/src/display/window_download_list.cc (revision 1163) -+++ rtorrent/src/display/window_download_list.cc (working copy) -@@ -37,6 +37,7 @@ - #include "config.h" - - #include <rak/algorithm.h> -+#include <torrent/rate.h> - - #include "core/download.h" - #include "core/view.h" -@@ -96,12 +97,30 @@ - char* position; - char* last = buffer + m_canvas->width() - 2 + 1; - -+ if( pos >= m_canvas->height() ) break; - position = print_download_title(buffer, last, *range.first); -- m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer); -+ m_canvas->print(0, pos, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer); -+ if( (*range.first)->is_done() ) { -+ if( (*range.first)->info()->up_rate()->rate() != 0 ) { -+ m_canvas->set_attr(0, pos, m_canvas->width()-1, A_BOLD, 2); -+ } else { -+ m_canvas->set_attr(0, pos, m_canvas->width()-1, A_NORMAL, 2); -+ } -+ } else if( (*range.first)->info()->is_active() ) { -+ if( (*range.first)->info()->down_rate()->rate() != 0 ) { -+ m_canvas->set_attr(0, pos, m_canvas->width()-1, A_BOLD, 1); -+ } else { -+ m_canvas->set_attr(0, pos, m_canvas->width()-1, A_NORMAL, 1); -+ } -+ } -+ pos++; -+ -+ if( pos >= m_canvas->height() ) break; - - position = print_download_info(buffer, last, *range.first); - m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer); - -+ if( pos >= m_canvas->height() ) break; - position = print_download_status(buffer, last, *range.first); - m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer); - -@@ -109,4 +128,41 @@ - } - } - -+void -+WindowDownloadList::set_done_fg_color(int64_t color) { -+ short fg, bg; -+ pair_content(2, &fg, &bg); -+ if( color < 0 ) color = -1; -+ color = color % 8; -+ init_pair(2, (short)color, bg); - } -+ -+void -+WindowDownloadList::set_done_bg_color(int64_t color) { -+ short fg, bg; -+ pair_content(2, &fg, &bg); -+ if( color < 0 ) color = -1; -+ color = color % 8; -+ init_pair(2, fg, (short)color); -+} -+ -+void -+WindowDownloadList::set_active_fg_color(int64_t color) { -+ short fg, bg; -+ pair_content(1, &fg, &bg); -+ if( color < 0 ) color = -1; -+ color = color % 8; -+ init_pair(1, (short)color, bg); -+} -+ -+void -+WindowDownloadList::set_active_bg_color(int64_t color) { -+ short fg, bg; -+ pair_content(1, &fg, &bg); -+ if( color < 0 ) color = -1; -+ color = color % 8; -+ init_pair(1, fg, (short)color); -+} -+ -+} -+ -Index: rtorrent/src/command_network.cc -=================================================================== ---- rtorrent/src/command_network.cc (revision 1163) -+++ rtorrent/src/command_network.cc (working copy) -@@ -506,4 +506,15 @@ - CMD2_ANY ("dht.statistics", std::tr1::bind(&core::DhtManager::dht_statistics, control->dht_manager())); - CMD2_ANY ("dht.throttle.name", std::tr1::bind(&core::DhtManager::throttle_name, control->dht_manager())); - CMD2_ANY_STRING_V("dht.throttle.name.set", std::tr1::bind(&core::DhtManager::set_throttle_name, control->dht_manager(), std::tr1::placeholders::_2)); -+ -+ -+ CMD2_ANY ("set_done_fg_color", std::tr1::bind(&ui::Root::get_done_fg_color, control->ui())); -+ CMD2_ANY_VALUE_V ("done_fg_color", std::tr1::bind(&ui::Root::set_done_fg_color, control->ui(), std::tr1::placeholders::_2)); -+ CMD2_ANY ("set_done_bg_color", std::tr1::bind(&ui::Root::get_done_bg_color, control->ui())); -+ CMD2_ANY_VALUE_V ("done_bg_color", std::tr1::bind(&ui::Root::set_done_bg_color, control->ui(), std::tr1::placeholders::_2)); -+ CMD2_ANY ("set_active_fg_color", std::tr1::bind(&ui::Root::get_active_fg_color, control->ui())); -+ CMD2_ANY_VALUE_V ("active_fg_color", std::tr1::bind(&ui::Root::set_active_fg_color, control->ui(), std::tr1::placeholders::_2)); -+ CMD2_ANY ("set_active_bg_color", std::tr1::bind(&ui::Root::get_active_bg_color, control->ui())); -+ CMD2_ANY_VALUE_V ("active_bg_color", std::tr1::bind(&ui::Root::set_active_bg_color, control->ui(), std::tr1::placeholders::_2)); -+ - } -Index: rtorrent/src/ui/download_list.cc -=================================================================== ---- rtorrent/src/ui/download_list.cc (revision 1163) -+++ rtorrent/src/ui/download_list.cc (working copy) -@@ -137,6 +137,11 @@ - current_view()->next_focus(); - } - -+display::WindowDownloadList* -+DownloadList::current_window_list() { -+ return dynamic_cast<ElementDownloadList*>(m_uiArray[DISPLAY_DOWNLOAD_LIST])->window(); -+} -+ - void - DownloadList::activate_display(Display displayType) { - if (!is_active()) -Index: rtorrent/src/ui/download_list.h -=================================================================== ---- rtorrent/src/ui/download_list.h (revision 1163) -+++ rtorrent/src/ui/download_list.h (working copy) -@@ -101,6 +101,7 @@ - void activate_display(Display d); - - core::View* current_view(); -+ display::WindowDownloadList* current_window_list(); - void set_current_view(const std::string& name); - - void slot_open_uri(SlotOpenUri s) { m_slotOpenUri = s; } -Index: rtorrent/src/ui/element_download_list.h -=================================================================== ---- rtorrent/src/ui/element_download_list.h (revision 1163) -+++ rtorrent/src/ui/element_download_list.h (working copy) -@@ -60,6 +60,7 @@ - void disable(); - - core::View* view() { return m_view; } -+ WDownloadList* window() { return m_window; } - void set_view(core::View* l); - - void receive_command(const char* cmd); -Index: rtorrent/src/ui/root.cc -=================================================================== ---- rtorrent/src/ui/root.cc (revision 1163) -+++ rtorrent/src/ui/root.cc (working copy) -@@ -44,6 +44,7 @@ - - #include "core/manager.h" - #include "display/frame.h" -+#include "display/window_download_list.h" - #include "display/window_http_queue.h" - #include "display/window_title.h" - #include "display/window_input.h" -@@ -65,7 +66,11 @@ - m_windowTitle(NULL), - m_windowHttpQueue(NULL), - m_windowInput(NULL), -- m_windowStatusbar(NULL) { -+ m_windowStatusbar(NULL), -+ done_fg_color(-1), -+ done_bg_color(-1), -+ active_fg_color(-1), -+ active_bg_color(-1) { - } - - void -@@ -97,6 +102,10 @@ - setup_keys(); - - m_downloadList->activate(rootFrame->frame(1)); -+ m_downloadList->current_window_list()->set_done_fg_color(done_fg_color); -+ m_downloadList->current_window_list()->set_done_bg_color(done_bg_color); -+ m_downloadList->current_window_list()->set_active_fg_color(active_fg_color); -+ m_downloadList->current_window_list()->set_active_bg_color(active_bg_color); - } - - void -@@ -219,7 +228,47 @@ - torrent::set_max_unchoked(maxUnchoked); - } - -+int -+Root::get_done_fg_color() { -+ return done_fg_color; -+} -+ - void -+Root::set_done_fg_color(int64_t color) { -+ done_fg_color = color; -+} -+ -+int -+Root::get_done_bg_color() { -+ return done_bg_color; -+} -+ -+void -+Root::set_done_bg_color(int64_t color) { -+ done_bg_color = color; -+} -+ -+int -+Root::get_active_fg_color() { -+ return active_fg_color; -+} -+ -+void -+Root::set_active_fg_color(int64_t color) { -+ active_fg_color = color; -+} -+ -+int -+Root::get_active_bg_color() { -+ return active_bg_color; -+} -+ -+void -+Root::set_active_bg_color(int64_t color) { -+ active_bg_color = color; -+} -+ -+void - Root::adjust_down_throttle(int throttle) { - set_down_throttle(std::max<int>(torrent::down_throttle_global()->max_rate() / 1024 + throttle, 0)); - } -Index: rtorrent/src/ui/root.h -=================================================================== ---- rtorrent/src/ui/root.h (revision 1163) -+++ rtorrent/src/ui/root.h (working copy) -@@ -82,7 +82,16 @@ - // Rename to raw or something, make base function. - void set_down_throttle_i64(int64_t throttle) { set_down_throttle(throttle >> 10); } - void set_up_throttle_i64(int64_t throttle) { set_up_throttle(throttle >> 10); } -+ int get_done_fg_color(); -+ void set_done_fg_color(int64_t color); -+ int get_done_bg_color(); -+ void set_done_bg_color(int64_t color); -+ int get_active_fg_color(); -+ void set_active_fg_color(int64_t color); -+ int get_active_bg_color(); -+ void set_active_bg_color(int64_t color); - -+ - void adjust_down_throttle(int throttle); - void adjust_up_throttle(int throttle); - -@@ -93,6 +102,11 @@ - - input::TextInput* current_input(); - -+ int64_t done_fg_color; -+ int64_t done_bg_color; -+ int64_t active_fg_color; -+ int64_t active_bg_color; -+ - private: - void setup_keys(); - -@@ -105,6 +119,7 @@ - WStatusbar* m_windowStatusbar; - - input::Bindings m_bindings; -+ - }; - - } diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.9-canvas-fix.patch b/net-p2p/rtorrent/files/rtorrent-0.8.9-canvas-fix.patch deleted file mode 100644 index f95efd7fa10b..000000000000 --- a/net-p2p/rtorrent/files/rtorrent-0.8.9-canvas-fix.patch +++ /dev/null @@ -1,299 +0,0 @@ -Index: rtorrent/src/display/window_download_list.h -=================================================================== ---- rtorrent/src/display/window_download_list.h (revision 1163) -+++ rtorrent/src/display/window_download_list.h (working copy) -@@ -59,6 +59,10 @@ - virtual void redraw(); - - void set_view(core::View* l); -+ void set_done_fg_color(int64_t color); -+ void set_done_bg_color(int64_t color); -+ void set_active_fg_color(int64_t color); -+ void set_active_bg_color(int64_t color); - - private: - core::View* m_view; -Index: rtorrent/src/display/canvas.cc -=================================================================== ---- rtorrent/src/display/canvas.cc (revision 1163) -+++ rtorrent/src/display/canvas.cc (working copy) -@@ -92,6 +92,10 @@ - m_isInitialized = true; - - initscr(); -+ start_color(); -+ use_default_colors(); -+ init_pair(2, -1, -1); -+ init_pair(1, -1, -1); - raw(); - noecho(); - nodelay(stdscr, TRUE); -Index: rtorrent/src/display/window_download_list.cc -=================================================================== ---- rtorrent/src/display/window_download_list.cc (revision 1163) -+++ rtorrent/src/display/window_download_list.cc (working copy) -@@ -37,6 +37,7 @@ - #include "config.h" - - #include <rak/algorithm.h> -+#include <torrent/rate.h> - - #include "core/download.h" - #include "core/view.h" -@@ -96,12 +97,30 @@ - char* position; - char* last = buffer + m_canvas->width() - 2 + 1; - -+ if( pos >= m_canvas->height() ) break; - position = print_download_title(buffer, last, *range.first); -- m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer); -+ m_canvas->print(0, pos, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer); -+ if( (*range.first)->is_done() ) { -+ if( (*range.first)->info()->up_rate()->rate() != 0 ) { -+ m_canvas->set_attr(0, pos, m_canvas->width()-1, A_BOLD, 2); -+ } else { -+ m_canvas->set_attr(0, pos, m_canvas->width()-1, A_NORMAL, 2); -+ } -+ } else if( (*range.first)->info()->is_active() ) { -+ if( (*range.first)->info()->down_rate()->rate() != 0 ) { -+ m_canvas->set_attr(0, pos, m_canvas->width()-1, A_BOLD, 1); -+ } else { -+ m_canvas->set_attr(0, pos, m_canvas->width()-1, A_NORMAL, 1); -+ } -+ } -+ pos++; -+ -+ if( pos >= m_canvas->height() ) break; - - position = print_download_info(buffer, last, *range.first); - m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer); - -+ if( pos >= m_canvas->height() ) break; - position = print_download_status(buffer, last, *range.first); - m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer); - -@@ -109,4 +128,41 @@ - } - } - -+void -+WindowDownloadList::set_done_fg_color(int64_t color) { -+ short fg, bg; -+ pair_content(2, &fg, &bg); -+ if( color < 0 ) color = -1; -+ color = color % 8; -+ init_pair(2, (short)color, bg); - } -+ -+void -+WindowDownloadList::set_done_bg_color(int64_t color) { -+ short fg, bg; -+ pair_content(2, &fg, &bg); -+ if( color < 0 ) color = -1; -+ color = color % 8; -+ init_pair(2, fg, (short)color); -+} -+ -+void -+WindowDownloadList::set_active_fg_color(int64_t color) { -+ short fg, bg; -+ pair_content(1, &fg, &bg); -+ if( color < 0 ) color = -1; -+ color = color % 8; -+ init_pair(1, (short)color, bg); -+} -+ -+void -+WindowDownloadList::set_active_bg_color(int64_t color) { -+ short fg, bg; -+ pair_content(1, &fg, &bg); -+ if( color < 0 ) color = -1; -+ color = color % 8; -+ init_pair(1, fg, (short)color); -+} -+ -+} -+ -Index: rtorrent/src/command_network.cc -=================================================================== ---- rtorrent/src/command_network.cc (revision 1163) -+++ rtorrent/src/command_network.cc (working copy) -@@ -742,4 +742,13 @@ - CMD2_ANY ("dht.statistics", std::bind(&core::DhtManager::dht_statistics, control->dht_manager())); - CMD2_ANY ("dht.throttle.name", std::bind(&core::DhtManager::throttle_name, control->dht_manager())); - CMD2_ANY_STRING_V("dht.throttle.name.set", std::bind(&core::DhtManager::set_throttle_name, control->dht_manager(), std::placeholders::_2)); -+ -+ CMD2_ANY ("set_done_fg_color", std::bind(&ui::Root::get_done_fg_color, control->ui())); -+ CMD2_ANY_VALUE_V("done_fg_color", std::bind(&ui::Root::set_done_fg_color, control->ui(), std::placeholders::_2)); -+ CMD2_ANY ("set_done_bg_color", std::bind(&ui::Root::get_done_bg_color, control->ui())); -+ CMD2_ANY_VALUE_V("done_bg_color", std::bind(&ui::Root::set_done_bg_color, control->ui(), std::placeholders::_2)); -+ CMD2_ANY ("set_active_fg_color", std::bind(&ui::Root::get_active_fg_color, control->ui())); -+ CMD2_ANY_VALUE_V("active_fg_color", std::bind(&ui::Root::set_active_fg_color, control->ui(), std::placeholders::_2)); -+ CMD2_ANY ("set_active_bg_color", std::bind(&ui::Root::get_active_bg_color, control->ui())); -+ CMD2_ANY_VALUE_V("active_bg_color", std::bind(&ui::Root::set_active_bg_color, control->ui(), std::placeholders::_2)); - } -Index: rtorrent/src/ui/download_list.cc -=================================================================== ---- rtorrent/src/ui/download_list.cc (revision 1163) -+++ rtorrent/src/ui/download_list.cc (working copy) -@@ -137,6 +137,11 @@ - current_view()->next_focus(); - } - -+display::WindowDownloadList* -+DownloadList::current_window_list() { -+ return dynamic_cast<ElementDownloadList*>(m_uiArray[DISPLAY_DOWNLOAD_LIST])->window(); -+} -+ - void - DownloadList::activate_display(Display displayType) { - if (!is_active()) -Index: rtorrent/src/ui/download_list.h -=================================================================== ---- rtorrent/src/ui/download_list.h (revision 1163) -+++ rtorrent/src/ui/download_list.h (working copy) -@@ -101,6 +101,7 @@ - void activate_display(Display d); - - core::View* current_view(); -+ display::WindowDownloadList* current_window_list(); - void set_current_view(const std::string& name); - - void slot_open_uri(SlotOpenUri s) { m_slotOpenUri = s; } -Index: rtorrent/src/ui/element_download_list.h -=================================================================== ---- rtorrent/src/ui/element_download_list.h (revision 1163) -+++ rtorrent/src/ui/element_download_list.h (working copy) -@@ -60,6 +60,7 @@ - void disable(); - - core::View* view() { return m_view; } -+ WDownloadList* window() { return m_window; } - void set_view(core::View* l); - - void receive_command(const char* cmd); -Index: rtorrent/src/ui/root.cc -=================================================================== ---- rtorrent/src/ui/root.cc (revision 1163) -+++ rtorrent/src/ui/root.cc (working copy) -@@ -44,6 +44,7 @@ - - #include "core/manager.h" - #include "display/frame.h" -+#include "display/window_download_list.h" - #include "display/window_http_queue.h" - #include "display/window_title.h" - #include "display/window_input.h" -@@ -65,7 +66,11 @@ - m_windowTitle(NULL), - m_windowHttpQueue(NULL), - m_windowInput(NULL), -- m_windowStatusbar(NULL) { -+ m_windowStatusbar(NULL), -+ done_fg_color(-1), -+ done_bg_color(-1), -+ active_fg_color(-1), -+ active_bg_color(-1) { - } - - void -@@ -97,6 +102,10 @@ - setup_keys(); - - m_downloadList->activate(rootFrame->frame(1)); -+ m_downloadList->current_window_list()->set_done_fg_color(done_fg_color); -+ m_downloadList->current_window_list()->set_done_bg_color(done_bg_color); -+ m_downloadList->current_window_list()->set_active_fg_color(active_fg_color); -+ m_downloadList->current_window_list()->set_active_bg_color(active_bg_color); - } - - void -@@ -219,7 +228,47 @@ - torrent::set_max_unchoked(maxUnchoked); - } - -+int -+Root::get_done_fg_color() { -+ return done_fg_color; -+} -+ - void -+Root::set_done_fg_color(int64_t color) { -+ done_fg_color = color; -+} -+ -+int -+Root::get_done_bg_color() { -+ return done_bg_color; -+} -+ -+void -+Root::set_done_bg_color(int64_t color) { -+ done_bg_color = color; -+} -+ -+int -+Root::get_active_fg_color() { -+ return active_fg_color; -+} -+ -+void -+Root::set_active_fg_color(int64_t color) { -+ active_fg_color = color; -+} -+ -+int -+Root::get_active_bg_color() { -+ return active_bg_color; -+} -+ -+void -+Root::set_active_bg_color(int64_t color) { -+ active_bg_color = color; -+} -+ -+void - Root::adjust_down_throttle(int throttle) { - set_down_throttle(std::max<int>(torrent::down_throttle_global()->max_rate() / 1024 + throttle, 0)); - } -Index: rtorrent/src/ui/root.h -=================================================================== ---- rtorrent/src/ui/root.h (revision 1163) -+++ rtorrent/src/ui/root.h (working copy) -@@ -82,7 +82,16 @@ - // Rename to raw or something, make base function. - void set_down_throttle_i64(int64_t throttle) { set_down_throttle(throttle >> 10); } - void set_up_throttle_i64(int64_t throttle) { set_up_throttle(throttle >> 10); } -+ int get_done_fg_color(); -+ void set_done_fg_color(int64_t color); -+ int get_done_bg_color(); -+ void set_done_bg_color(int64_t color); -+ int get_active_fg_color(); -+ void set_active_fg_color(int64_t color); -+ int get_active_bg_color(); -+ void set_active_bg_color(int64_t color); - -+ - void adjust_down_throttle(int throttle); - void adjust_up_throttle(int throttle); - -@@ -93,6 +102,11 @@ - - input::TextInput* current_input(); - -+ int64_t done_fg_color; -+ int64_t done_bg_color; -+ int64_t active_fg_color; -+ int64_t active_bg_color; -+ - private: - void setup_keys(); - -@@ -105,6 +119,7 @@ - WStatusbar* m_windowStatusbar; - - input::Bindings m_bindings; -+ - }; - - } diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.9-ncurses.patch b/net-p2p/rtorrent/files/rtorrent-0.8.9-ncurses.patch deleted file mode 100644 index 49a008e634ba..000000000000 --- a/net-p2p/rtorrent/files/rtorrent-0.8.9-ncurses.patch +++ /dev/null @@ -1,17 +0,0 @@ -rtorrent segfaults with latest ncurses (5.8). -this patch fixes the issue. - -https://bugs.gentoo.org/show_bug.cgi?id=358271 -https://bugzilla.redhat.com/show_bug.cgi?id=682454 -http://libtorrent.rakshasa.no/ticket/2518 ---- src/display/canvas.h -+++ src/display/canvas.h -@@ -48,7 +48,7 @@ - public: - typedef std::vector<Attributes> attributes_list; - -- Canvas(int x = 0, int y = 0, int width = 0, int height = 0); -+ Canvas(int x = 0, int y = 0, int width = 1, int height = 1); - ~Canvas() { delwin(m_window); } - - void refresh() { wnoutrefresh(m_window); } diff --git a/net-p2p/rtorrent/files/rtorrent-0.9.0-ncurses.patch b/net-p2p/rtorrent/files/rtorrent-0.9.0-ncurses.patch deleted file mode 100644 index 260cd9a38425..000000000000 --- a/net-p2p/rtorrent/files/rtorrent-0.9.0-ncurses.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/display/canvas.h -+++ src/display/canvas.h -@@ -48,5 +48,5 @@ class Canvas { - public: - typedef std::vector<Attributes> attributes_list; - -- Canvas(int x = 0, int y = 0, int width = 0, int height = 0); -+ Canvas(int x = 0, int y = 0, int width = 1, int height = 1); - ~Canvas() { delwin(m_window); } - void refresh() { wnoutrefresh(m_window); } |