diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2009-12-22 20:20:23 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-12-22 20:20:23 +0000 |
commit | 4d2a6e38f69eeee2d6d9e5ceabe56751033a451d (patch) | |
tree | e10e74883c8ca7b79611e629f14a5a9934cf0541 /net-p2p/rtorrent/files | |
parent | Version bump. (diff) | |
download | gentoo-2-4d2a6e38f69eeee2d6d9e5ceabe56751033a451d.tar.gz gentoo-2-4d2a6e38f69eeee2d6d9e5ceabe56751033a451d.tar.bz2 gentoo-2-4d2a6e38f69eeee2d6d9e5ceabe56751033a451d.zip |
old
(Portage version: 2.2_rc60/cvs/Linux x86_64)
Diffstat (limited to 'net-p2p/rtorrent/files')
8 files changed, 0 insertions, 480 deletions
diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.0+gcc-4.3.patch b/net-p2p/rtorrent/files/rtorrent-0.8.0+gcc-4.3.patch deleted file mode 100644 index d95e6d3e414c..000000000000 --- a/net-p2p/rtorrent/files/rtorrent-0.8.0+gcc-4.3.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -Nurp rtorrent-0.8.0.old/rak/functional.h rtorrent-0.8.0/rak/functional.h ---- rtorrent-0.8.0.old/rak/functional.h 2008-03-09 15:56:18.000000000 +0100 -+++ rtorrent-0.8.0/rak/functional.h 2008-03-09 16:04:47.000000000 +0100 -@@ -37,6 +37,7 @@ - #ifndef RAK_FUNCTIONAL_H - #define RAK_FUNCTIONAL_H - -+#include <cstddef> - #include <functional> - - namespace rak { -diff -Nurp rtorrent-0.8.0.old/src/command_ui.cc rtorrent-0.8.0/src/command_ui.cc ---- rtorrent-0.8.0.old/src/command_ui.cc 2008-03-09 15:56:18.000000000 +0100 -+++ rtorrent-0.8.0/src/command_ui.cc 2008-03-09 16:05:36.000000000 +0100 -@@ -36,6 +36,8 @@ - - #include "config.h" - -+#include <ctime> -+ - #include <rak/functional.h> - #include <rak/functional_fun.h> - #include <sigc++/adaptors/bind.h> - -diff -Nurp rtorrent-0.8.0.old/src/display/text_element_value.cc rtorrent-0.8.0/src/display/text_element_value.cc ---- rtorrent-0.8.0.old/src/display/text_element_value.cc 2008-03-09 15:56:18.000000000 +0100 -+++ rtorrent-0.8.0/src/display/text_element_value.cc 2008-03-09 16:07:39.000000000 +0100 -@@ -36,6 +36,8 @@ - - #include "config.h" - -+#include <ctime> -+ - #include "globals.h" - #include "text_element_value.h" - -diff -Nurp rtorrent-0.8.0.old/src/rpc/exec_file.cc rtorrent-0.8.0/src/rpc/exec_file.cc ---- rtorrent-0.8.0.old/src/rpc/exec_file.cc 2008-03-09 15:56:18.000000000 +0100 -+++ rtorrent-0.8.0/src/rpc/exec_file.cc 2008-03-09 16:04:14.000000000 +0100 -@@ -36,6 +36,7 @@ - - #include "config.h" - -+#include <cstring> - #include <string> - #include <unistd.h> - #include <rak/path.h> -diff -Nurp rtorrent-0.8.0.old/src/rpc/parse.cc rtorrent-0.8.0/src/rpc/parse.cc ---- rtorrent-0.8.0.old/src/rpc/parse.cc 2008-03-09 15:56:18.000000000 +0100 -+++ rtorrent-0.8.0/src/rpc/parse.cc 2008-03-09 16:04:29.000000000 +0100 -@@ -36,6 +36,7 @@ - - #include "config.h" - -+#include <cstring> - #include <locale> - #include <rak/path.h> - #include <torrent/exceptions.h> diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.2-fix-configure-execinfo.patch b/net-p2p/rtorrent/files/rtorrent-0.8.2-fix-configure-execinfo.patch deleted file mode 100644 index 4df674759d02..000000000000 --- a/net-p2p/rtorrent/files/rtorrent-0.8.2-fix-configure-execinfo.patch +++ /dev/null @@ -1,14 +0,0 @@ -# Fixes a segfault when configure finds execinfo.h -Index: rtorrent/scripts/common.m4 -=================================================================== ---- rtorrent/scripts/common.m4 (revision 1062) -+++ rtorrent/scripts/common.m4 (working copy) -@@ -183,7 +183,7 @@ - AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_MSG_CHECKING(for execinfo.h) - -- AC_RUN_IFELSE( -+ AC_LINK_IFELSE( - [[#include <execinfo.h> - int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} - ]], diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_conn_type_seed.patch b/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_conn_type_seed.patch deleted file mode 100644 index 6b050f8b5766..000000000000 --- a/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_conn_type_seed.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: rtorrent/src/core/download_list.cc -=================================================================== ---- rtorrent/src/core/download_list.cc (revision 1060) -+++ rtorrent/src/core/download_list.cc (working copy) -@@ -399,7 +399,7 @@ - rpc::call_command("d.set_state_counter", rpc::call_command_value("d.get_state_counter", rpc::make_target(download)), rpc::make_target(download)); - - // If initial seeding is complete, don't try it again when restarting. -- if (download->is_done()) -+ if (download->is_done() && rpc::call_command_void("d.get_connection_current", rpc::make_target(download)).as_string() == "initial_seed") - rpc::call_command("d.set_connection_seed", rpc::call_command_void("d.get_connection_current", rpc::make_target(download)), rpc::make_target(download)); - - // Save the state after all the slots, etc have been called so we diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_load_cache.patch b/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_load_cache.patch deleted file mode 100644 index 3d37ca47e5e8..000000000000 --- a/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_load_cache.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: rtorrent/src/core/manager.cc -=================================================================== ---- rtorrent/src/core/manager.cc (revision 1060) -+++ rtorrent/src/core/manager.cc (working copy) -@@ -383,7 +383,8 @@ - void - Manager::try_create_download(const std::string& uri, int flags, const command_list_type& commands) { - // If the path was attempted loaded before, skip it. -- if (!(flags & create_raw_data) && -+ if ((flags & create_tied) && -+ !(flags & create_raw_data) && - !is_network_uri(uri) && - !file_status_cache()->insert(uri, 0)) - return; diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_scgi_crash.patch b/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_scgi_crash.patch deleted file mode 100644 index acc80ae10d05..000000000000 --- a/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_scgi_crash.patch +++ /dev/null @@ -1,19 +0,0 @@ -# Fix a crash in scgi_local or scgi_port when calling -# freeaddrinfo with a NULL pointer. -Index: rtorrent/src/command_network.cc -=================================================================== ---- rtorrent/src/command_network.cc (revision 1063) -+++ rtorrent/src/command_network.cc (working copy) -@@ -261,10 +261,10 @@ - break; - } - -- rak::address_info::free_address_info(ai); -+ if (ai != NULL) rak::address_info::free_address_info(ai); - - } catch (torrent::local_error& e) { -- rak::address_info::free_address_info(ai); -+ if (ai != NULL) rak::address_info::free_address_info(ai); - - throw torrent::input_error(e.what()); - } diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_start_stop_filter.patch b/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_start_stop_filter.patch deleted file mode 100644 index 2f9267821104..000000000000 --- a/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_start_stop_filter.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: rtorrent/src/main.cc -=================================================================== ---- rtorrent/src/main.cc (revision 1060) -+++ rtorrent/src/main.cc (working copy) -@@ -187,12 +187,12 @@ - "view_filter = active,false=\n" - - "view_add = started\n" -- "view_filter = started,false=\n" -+ "view_filter = started,d.get_state=\n" - "view.event_added = started,scheduler.simple.added=\n" - "view.event_removed = started,scheduler.simple.removed=\n" - - "view_add = stopped\n" -- "view_filter = stopped,false=\n" -+ "view_filter = stopped,not=$d.get_state=\n" - - "view_add = complete\n" - "view_filter = complete,d.get_complete=\n" diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_utf8_filenames.patch b/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_utf8_filenames.patch deleted file mode 100644 index bf73527c79ed..000000000000 --- a/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_utf8_filenames.patch +++ /dev/null @@ -1,238 +0,0 @@ -# Fix display of multi-byte characters with attributes -# (i.e. utf-8 filenames in the file list), and make the -# list aware of characters occupying two screen positions. -Index: rtorrent/src/display/window_file_list.cc -=================================================================== ---- rtorrent/src/display/window_file_list.cc (revision 1063) -+++ rtorrent/src/display/window_file_list.cc (working copy) -@@ -57,22 +57,61 @@ - m_element(element) { - } - --/* -+// Convert std::string to std::wstring of given width (in screen positions), -+// taking into account that some characters may be occupying two screen positions. - std::wstring --hack_wstring(const std::string& src) { -- size_t length = ::mbstowcs(NULL, src.c_str(), src.size()); -+wstring_width(const std::string& i_str, int width) { -+ wchar_t result[width + 1]; -+ size_t length = std::mbstowcs(result, i_str.c_str(), width); - -- if (length == (size_t)-1) -- return std::wstring(L"<invalid>"); -+ // If not valid UTF-8 encoding, at least copy the printable characters. -+ if (length == (size_t)-1) { -+ wchar_t* out = result; - -- std::wstring dest; -- dest.resize(length); -- -- ::mbstowcs(&*dest.begin(), src.c_str(), src.size()); -+ for (std::string::const_iterator itr = i_str.begin(); itr != i_str.end(); ++itr) -+ if (!std::isprint(*itr, std::locale::classic())) -+ *out++ = '?'; -+ else -+ *out++ = *itr; - -- return dest; -+ *out = 0; -+ } -+ -+ int swidth = wcswidth(result, width); -+ -+ // Limit to width if it's too wide already. -+ if (swidth == -1 || swidth > width) { -+ length = swidth = 0; -+ -+ while (result[length]) { -+ int next = ::wcwidth(result[length]); -+ -+ // Unprintable character? -+ if (next == -1) { -+ result[length] = '?'; -+ next = 1; -+ } -+ -+ if (swidth + next > width) { -+ result[length] = 0; -+ break; -+ } -+ -+ length++; -+ swidth += next; -+ } -+ } -+ -+ // Pad with spaces to given width. -+ while (swidth < width && length <= (unsigned int)width) { -+ result[length++] = ' '; -+ swidth++; -+ } -+ -+ result[length] = 0; -+ -+ return result; - } --*/ - - void - WindowFileList::redraw() { -@@ -115,6 +154,8 @@ - } - - unsigned int pos = 0; -+ int filenameWidth = m_canvas->width() - 16; -+ - m_canvas->print(0, pos++, "Cmp Pri Size Filename"); - - while (pos != m_canvas->height()) { -@@ -123,20 +164,19 @@ - if (itr == iterator(fl->end())) - break; - -+ m_canvas->set_default_attributes(itr == m_element->selected() ? is_focused() ? A_REVERSE : A_BOLD : A_NORMAL); -+ - if (itr.is_empty()) { -- m_canvas->print(16, pos, "EMPTY"); -+ m_canvas->print(0, pos, "%*c%-*s", 16, ' ', filenameWidth, "EMPTY"); - - } else if (itr.is_entering()) { -- m_canvas->print(16 + itr.depth(), pos, "\\ %s", -- itr.depth() < (*itr)->path()->size() ? (*itr)->path()->at(itr.depth()).c_str() : "UNKNOWN"); -+ m_canvas->print(0, pos, "%*c %ls", 16 + itr.depth(), '\\', -+ itr.depth() < (*itr)->path()->size() ? wstring_width((*itr)->path()->at(itr.depth()), filenameWidth - itr.depth() - 1).c_str() : L"UNKNOWN"); - - } else if (itr.is_leaving()) { -- m_canvas->print(16 + itr.depth() - 1, pos, "/"); -+ m_canvas->print(0, pos, "%*c %-*s", 16 + (itr.depth() - 1), '/', filenameWidth - (itr.depth() - 1), ""); - - } else if (itr.is_file()) { -- char buffer[std::max<unsigned int>(m_canvas->width() + 1, 256)]; -- Canvas::attributes_list attributes; -- - torrent::File* e = *itr; - - const char* priority; -@@ -148,34 +188,27 @@ - default: priority = "BUG"; break; - }; - -- sprintf(buffer, "%3d %s ", done_percentage(e), priority); -+ m_canvas->print(0, pos, "%3d %s ", done_percentage(e), priority); - - int64_t val = e->size_bytes(); - -- if (val < (int64_t(1000) << 20)) -- sprintf(buffer + 8, "%5.1f M", (double)val / (int64_t(1) << 20)); -+ if (val < (int64_t(1000) << 10)) -+ m_canvas->print(8, pos, "%5.1f K", (double)val / (int64_t(1) << 10)); -+ else if (val < (int64_t(1000) << 20)) -+ m_canvas->print(8, pos, "%5.1f M", (double)val / (int64_t(1) << 20)); - else if (val < (int64_t(1000) << 30)) -- sprintf(buffer + 8, "%5.1f G", (double)val / (int64_t(1) << 30)); -+ m_canvas->print(8, pos, "%5.1f G", (double)val / (int64_t(1) << 30)); - else -- sprintf(buffer + 8, "%5.1f T", (double)val / (int64_t(1) << 40)); -+ m_canvas->print(8, pos, "%5.1f T", (double)val / (int64_t(1) << 40)); - -- std::fill_n(buffer + 15, 64, ' '); -+ m_canvas->print(15, pos, "%*c %ls", 1 + itr.depth(), '|', -+ itr.depth() < (*itr)->path()->size() ? wstring_width((*itr)->path()->at(itr.depth()), filenameWidth - itr.depth() - 1).c_str() : L"UNKNOWN"); - -- int first = 16 + std::min<unsigned int>(itr.depth(), 8); -- int last = std::max<unsigned int>(m_canvas->width() + 1, 16 + 12); -- -- snprintf(buffer + first, last - first, "| %s", -- itr.depth() < (*itr)->path()->size() ? (*itr)->path()->at(itr.depth()).c_str() : "UNKNOWN"); -- -- m_canvas->print_attributes(0, pos, buffer, buffer + std::strlen(buffer), &attributes); -- - } else { - m_canvas->print(0, pos, "BORK BORK"); - } -+ m_canvas->set_default_attributes(A_NORMAL); - -- if (itr == m_element->selected()) -- m_canvas->set_attr(0, pos, m_canvas->width(), is_focused() ? A_REVERSE : A_BOLD, COLOR_PAIR(0)); -- - pos++; - first = (first + 1) % (m_canvas->height() - 1); - } -Index: rtorrent/src/display/canvas.cc -=================================================================== ---- rtorrent/src/display/canvas.cc (revision 1063) -+++ rtorrent/src/display/canvas.cc (working copy) -@@ -57,17 +57,31 @@ - Canvas::print_attributes(unsigned int x, unsigned int y, const char* first, const char* last, const attributes_list* attributes) { - move(x, y); - -+ attr_t org_attr; -+ short org_pair; -+ wattr_get(m_window, &org_attr, &org_pair, NULL); -+ - attributes_list::const_iterator attrItr = attributes->begin(); -- Attributes current = Attributes(first, Attributes::a_normal, Attributes::color_default); -+ wattr_set(m_window, Attributes::a_normal, Attributes::color_default, NULL); - - while (first != last) { -- if (attrItr != attributes->end() && first >= attrItr->position()) -- current = *attrItr++; -+ const char* next = last; - -- waddch(m_window, *first++ | current.attributes()); -+ if (attrItr != attributes->end()) { -+ next = attrItr->position(); -+ -+ if (first >= next) { -+ wattr_set(m_window, attrItr->attributes(), attrItr->colors(), NULL); -+ ++attrItr; -+ } -+ } -+ -+ print("%.*s", next - first, first); -+ first = next; - } - - // Reset the color. -+ wattr_set(m_window, org_attr, org_pair, NULL); - } - - void -Index: rtorrent/src/display/canvas.h -=================================================================== ---- rtorrent/src/display/canvas.h (revision 1063) -+++ rtorrent/src/display/canvas.h (working copy) -@@ -86,6 +86,7 @@ - // since the string shall always be a C string choosen at - // compiletime. Might cause extra copying of the string? - -+ void print(const char* str, ...); - void print(unsigned int x, unsigned int y, const char* str, ...); - - void print_attributes(unsigned int x, unsigned int y, const char* first, const char* last, const attributes_list* attributes); -@@ -95,6 +96,8 @@ - - void set_attr(unsigned int x, unsigned int y, unsigned int n, int attr, int color) { mvwchgat(m_window, y, x, n, attr, color, NULL); } - -+ void set_default_attributes(int attr) { wattrset(m_window, attr); } -+ - // Initialize stdscr. - static void initialize(); - static void cleanup(); -@@ -116,6 +119,15 @@ - }; - - inline void -+Canvas::print(const char* str, ...) { -+ va_list arglist; -+ -+ va_start(arglist, str); -+ vw_printw(m_window, const_cast<char*>(str), arglist); -+ va_end(arglist); -+} -+ -+inline void - Canvas::print(unsigned int x, unsigned int y, const char* str, ...) { - va_list arglist; - diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.4-gcc44.patch b/net-p2p/rtorrent/files/rtorrent-0.8.4-gcc44.patch deleted file mode 100644 index 10dad5f608d1..000000000000 --- a/net-p2p/rtorrent/files/rtorrent-0.8.4-gcc44.patch +++ /dev/null @@ -1,105 +0,0 @@ -diff -Nurp rtorrent-0.8.4.old/src/rpc/scgi_task.cc rtorrent-0.8.4/src/rpc/scgi_task.cc ---- rtorrent-0.8.4.old/src/rpc/scgi_task.cc 2008-05-07 07:19:10.000000000 -0500 -+++ rtorrent-0.8.4/src/rpc/scgi_task.cc 2009-02-04 10:23:31.000000000 -0600 -@@ -36,6 +36,8 @@ - - #include "config.h" - -+#include <cstdio> -+ - #include <rak/error_number.h> - #include <sys/types.h> - #include <sys/socket.h> - - -diff -Nurp rtorrent-0.8.4.old/src/command_peer.cc rtorrent-0.8.4/src/command_peer.cc ---- rtorrent-0.8.4.old/src/command_peer.cc 2008-05-07 07:19:11.000000000 -0500 -+++ rtorrent-0.8.4/src/command_peer.cc 2009-02-04 10:26:53.000000000 -0600 -@@ -36,6 +36,8 @@ - - #include "config.h" - -+#include <cstdio> -+ - #include <rak/error_number.h> - #include <rak/path.h> - #include <rak/socket_address.h> - - - -diff -Nurp rtorrent-0.8.4.old/src/display/utils.cc rtorrent-0.8.4/src/display/utils.cc ---- rtorrent-0.8.4.old/src/display/utils.cc 2008-08-27 03:25:01.000000000 -0500 -+++ rtorrent-0.8.4/src/display/utils.cc 2009-02-04 10:20:34.000000000 -0600 -@@ -36,6 +36,7 @@ - - #include "config.h" - -+#include <cstdio> - #include <cstring> - #include <sstream> - #include <iomanip> - - -diff -Nurp rtorrent-0.8.4.old/src/rpc/parse.cc rtorrent-0.8.4/src/rpc/parse.cc ---- rtorrent-0.8.4.old/src/rpc/parse.cc 2008-08-26 15:14:33.000000000 -0500 -+++ rtorrent-0.8.4/src/rpc/parse.cc 2009-02-04 10:23:06.000000000 -0600 -@@ -37,6 +37,7 @@ - #include "config.h" - - #include <cstring> -+#include <cstdio> - #include <locale> - #include <rak/path.h> - #include <torrent/exceptions.h> - - diff -Nurp rtorrent-0.8.4.old/src/utils/lockfile.cc rtorrent-0.8.4/src/utils/lockfile.cc ---- rtorrent-0.8.4.old/src/utils/lockfile.cc 2008-05-07 07:19:11.000000000 -0500 -+++ rtorrent-0.8.4/src/utils/lockfile.cc 2009-02-04 10:25:10.000000000 -0600 -@@ -40,6 +40,7 @@ - #include <cctype> - #include <cerrno> - #include <cstring> -+#include <cstdio> - #include <sstream> - #include <fcntl.h> - #include <signal.h> - -diff -Nurp rtorrent-0.8.4.old/src/command_download.cc rtorrent-0.8.4/src/command_download.cc ---- rtorrent-0.8.4.old/src/command_download.cc 2008-11-19 11:01:20.000000000 -0600 -+++ rtorrent-0.8.4/src/command_download.cc 2009-02-04 10:25:32.000000000 -0600 -@@ -36,6 +36,8 @@ - - #include "config.h" - -+#include <cstdio> -+ - #include <functional> - #include <unistd.h> - #include <rak/file_stat.h> - - -diff -Nurp rtorrent-0.8.4.old/src/command_events.cc rtorrent-0.8.4/src/command_events.cc ---- rtorrent-0.8.4.old/src/command_events.cc 2008-11-11 04:37:20.000000000 -0600 -+++ rtorrent-0.8.4/src/command_events.cc 2009-02-04 10:25:58.000000000 -0600 -@@ -36,6 +36,8 @@ - - #include "config.h" - -+#include <cstdio> -+ - #include <functional> - #include <rak/file_stat.h> - #include <rak/path.h> - -diff -Nurp rtorrent-0.8.4.old/src/command_network.cc rtorrent-0.8.4/src/command_network.cc ---- rtorrent-0.8.4.old/src/command_network.cc 2008-08-27 03:25:01.000000000 -0500 -+++ rtorrent-0.8.4/src/command_network.cc 2009-02-04 10:26:22.000000000 -0600 -@@ -36,6 +36,8 @@ - - #include "config.h" - -+#include <cstdio> -+ - #include <functional> - #include <rak/address_info.h> - #include <rak/path.h> |