packages (DEVEL): rtorrent/rtorrent-colors.patch, rtorrent/rtorrent-ncurses...

lisu lisu at pld-linux.org
Wed May 11 15:30:15 CEST 2011


Author: lisu                         Date: Wed May 11 13:30:15 2011 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- moved unstable version to DEVEL
- epoch 1

---- Files affected:
packages/rtorrent:
   rtorrent-colors.patch (1.23 -> 1.23.2.1) , rtorrent-ncurses.patch (1.5 -> 1.5.2.1) , rtorrent.spec (1.92 -> 1.92.2.1) 

---- Diffs:

================================================================
Index: packages/rtorrent/rtorrent-colors.patch
diff -u packages/rtorrent/rtorrent-colors.patch:1.23 packages/rtorrent/rtorrent-colors.patch:1.23.2.1
--- packages/rtorrent/rtorrent-colors.patch:1.23	Wed May 11 15:29:02 2011
+++ packages/rtorrent/rtorrent-colors.patch	Wed May 11 15:30:10 2011
@@ -73,7 +73,7 @@
 +    core::Download* d = *range.first;
 +
 +    if (d->download()->bytes_done())
-+      ratio = (double)d->download()->up_rate()->total() / (double)d->download()->bytes_done();
++      ratio = (double)d->info()->up_rate()->total() / (double)d->download()->bytes_done();
 +    if (ratio >= 1.0)
 +      col = 1;
 +    else if (ratio >= 0.5)
@@ -83,7 +83,7 @@
 +
 +    position = print_download_title(buffer, last, *range.first, ratio);
 +    m_canvas->print(0, pos, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
-+    if (d->download()->is_open())
++    if (d->info()->is_open())
 +      m_canvas->set_attr(0, pos, m_canvas->get_screen_width(), (d->is_done())?0:A_BOLD,
 +        (d->is_done())?col:4);
 +    pos++;
@@ -94,14 +94,14 @@
      position = print_download_info(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 (!d->download()->is_active())
++    if (!d->info()->is_active())
 +      m_canvas->set_attr(0, pos, m_canvas->get_screen_width(), A_BOLD, 8);
 +    pos++;
  
      position = print_download_status(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 (!d->download()->is_active())
++    if (!d->info()->is_active())
 +      m_canvas->set_attr(0, pos, m_canvas->get_screen_width(), A_BOLD, 8);
 +    pos++;
  
@@ -125,9 +125,9 @@
  
  char*
 -print_download_title(char* first, char* last, core::Download* d) {
--  return print_buffer(first, last, " %s", d->download()->name().c_str());
+-  return print_buffer(first, last, " %s", d->info()->name().c_str());
 +print_download_title(char* first, char* last, core::Download* d, double ratio) {
-+  return print_buffer(first, last, " %-82s  R: %5.2f", d->download()->name().c_str(), ratio);
++  return print_buffer(first, last, " %-82s  R: %5.2f", d->info()->name().c_str(), ratio);
  }
  
  char*
@@ -137,13 +137,13 @@
  
 -  first = print_buffer(first, last, " [%c%c R: %4.2f",
 +  first = print_buffer(first, last, " [%c%c",
-                        rpc::call_command_string("d.get_tied_to_file", rpc::make_target(d)).empty() ? ' ' : 'T',
--                       rpc::call_command_value("d.get_ignore_commands", rpc::make_target(d)) == 0 ? ' ' : 'I',
--                       (double)rpc::call_command_value("d.get_ratio", rpc::make_target(d)) / 1000.0);
-+                       rpc::call_command_value("d.get_ignore_commands", rpc::make_target(d)) == 0 ? ' ' : 'I');
+                        rpc::call_command_string("d.tied_to_file", rpc::make_target(d)).empty() ? ' ' : 'T',
+-                       rpc::call_command_value("d.ignore_commands", rpc::make_target(d)) == 0 ? ' ' : 'I',
+-                       (double)rpc::call_command_value("d.ratio", rpc::make_target(d)) / 1000.0);
++                       rpc::call_command_value("d.ignore_commands", rpc::make_target(d)) == 0 ? ' ' : 'I');
  
    if (d->priority() != 2)
-     first = print_buffer(first, last, " %s]", rpc::call_command_string("d.get_priority_str", rpc::make_target(d)).c_str());
+     first = print_buffer(first, last, " %s]", rpc::call_command_string("d.priority_str", rpc::make_target(d)).c_str());
 @@ -231,17 +230,18 @@
  print_client_version(char* first, char* last, const torrent::ClientInfo& clientInfo) {
    switch (torrent::ClientInfo::version_size(clientInfo.type())) {

================================================================
Index: packages/rtorrent/rtorrent-ncurses.patch
diff -u packages/rtorrent/rtorrent-ncurses.patch:1.5 packages/rtorrent/rtorrent-ncurses.patch:1.5.2.1
--- packages/rtorrent/rtorrent-ncurses.patch:1.5	Wed May 11 15:29:02 2011
+++ packages/rtorrent/rtorrent-ncurses.patch	Wed May 11 15:30:10 2011
@@ -1,11 +1,11 @@
---- rtorrent-0.8.7/src/display/canvas.h~	2010-06-26 14:05:07.000000000 +0200
-+++ rtorrent-0.8.7/src/display/canvas.h	2011-03-03 22:17:00.016390072 +0100
+--- rtorrent-0.8.8/src/display/canvas.h~	2011-04-07 14:36:10.000000000 +0200
++++ rtorrent-0.8.8/src/display/canvas.h	2011-05-10 09:23:30.883333501 +0200
 @@ -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) :
-     m_window(newwin(height, width, y, x)) {}
+-  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); }

================================================================
Index: packages/rtorrent/rtorrent.spec
diff -u packages/rtorrent/rtorrent.spec:1.92 packages/rtorrent/rtorrent.spec:1.92.2.1
--- packages/rtorrent/rtorrent.spec:1.92	Wed May 11 15:29:02 2011
+++ packages/rtorrent/rtorrent.spec	Wed May 11 15:30:10 2011
@@ -11,13 +11,12 @@
 Summary:	rTorrent - a console-based BitTorrent client
 Summary(pl.UTF-8):	rTorrent - konsolowy klient BitTorrenta
 Name:		rtorrent
-Version:	0.8.6
+Version:	0.8.8
 Release:	1
-Epoch:		1
 License:	GPL v2+
 Group:		Applications/Networking
 Source0:	http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
-# Source0-md5:	b804c45c01c40312926bcea6b55bb084
+# Source0-md5:	e7927c513872f096c7d72d659ab54ef0
 Patch0:		%{name}-colors.patch
 Patch1:		%{name}-ssl-no-verify.patch
 Patch2:		%{name}-ip_filter.patch
@@ -31,7 +30,7 @@
 BuildRequires:	curl-devel >= 7.12
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
-BuildRequires:	libtorrent-devel = 1:0.12.6
+BuildRequires:	libtorrent-devel >= 0.12.8
 BuildRequires:	ncurses-devel
 BuildRequires:	pkgconfig
 BuildRequires:	sqlite3-devel
@@ -101,12 +100,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.92  2011/05/11 13:29:02  lisu
-- reversed
-- epoch in libtorrent-devel BR
-
-Revision 1.90  2011/05/11 13:21:28  lisu
-- back to stable 0.8.6 version
+Revision 1.92.2.1  2011/05/11 13:30:10  lisu
+- moved unstable version to DEVEL
+- epoch 1
 
 Revision 1.89  2011/05/10 07:28:30  lisu
 - updated to 0.8.8
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rtorrent/rtorrent-colors.patch?r1=1.23&r2=1.23.2.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rtorrent/rtorrent-ncurses.patch?r1=1.5&r2=1.5.2.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rtorrent/rtorrent.spec?r1=1.92&r2=1.92.2.1&f=u



More information about the pld-cvs-commit mailing list