packages: rtorrent/rtorrent-colors.patch, rtorrent/rtorrent.spec - rel 2; c...

[arekm]

Author: arekm                        Date: Sun May  6 09:54:38 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; colors patch is back

---- Files affected:
packages/rtorrent:
   rtorrent-colors.patch (1.24 -> 1.25) , rtorrent.spec (1.104 -> 1.105) 

---- Diffs:

================================================================
Index: packages/rtorrent/rtorrent-colors.patch
diff -u packages/rtorrent/rtorrent-colors.patch:1.24 packages/rtorrent/rtorrent-colors.patch:1.25
--- packages/rtorrent/rtorrent-colors.patch:1.24	Sat Jun 25 15:21:59 2011
+++ packages/rtorrent/rtorrent-colors.patch	Sun May  6 11:54:32 2012
@@ -53,7 +53,7 @@
  #include "core/download.h"
  #include "core/view.h"
  
-@@ -89,21 +91,48 @@
+@@ -89,20 +91,47 @@
    if (range.second != m_view->end_visible())
      ++range.second;
  
@@ -66,7 +66,6 @@
  
    while (range.first != range.second) {
      char buffer[m_canvas->width() + 1];
-     char* position;
      char* last = buffer + m_canvas->width() - 2 + 1;
 +    int col = 0;
 +    double ratio = 0;
@@ -81,24 +80,24 @@
 +    else
 +      col = 3;
 +
-+    position = print_download_title(buffer, last, *range.first, ratio);
++    print_download_title(buffer, last, *range.first, ratio);
 +    m_canvas->print(0, pos, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
 +    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++;
  
--    position = print_download_title(buffer, last, *range.first);
+-    print_download_title(buffer, last, *range.first);
 -    m_canvas->print(0, pos++, "%c %s", range.first == m_view->focus() ? '*' : ' ', buffer);
 -    
-     position = print_download_info(buffer, last, *range.first);
+     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->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);
+     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->info()->is_active())

================================================================
Index: packages/rtorrent/rtorrent.spec
diff -u packages/rtorrent/rtorrent.spec:1.104 packages/rtorrent/rtorrent.spec:1.105
--- packages/rtorrent/rtorrent.spec:1.104	Sun May  6 10:41:30 2012
+++ packages/rtorrent/rtorrent.spec	Sun May  6 11:54:32 2012
@@ -2,11 +2,10 @@
 # TODO:
 # - ip_filter patch is broken (doesn't handle ipv6 addresses. Also causes
 #   "rtorrent: CommandMap::insert(...) tried to insert an already existing key." error)
-# - fix colors patch and revert bcond
 #
 # Conditional build:
 %bcond_without	xmlrpc		# build xmlrpc-c support
-%bcond_with	colors		# without color version
+%bcond_without	colors		# without color version
 %bcond_without	ipv6		# without IPv6 support
 #
 Summary:	rTorrent - a console-based BitTorrent client
@@ -14,7 +13,7 @@
 Name:		rtorrent
 # keep stable line, see URL below
 Version:	0.9.2
-Release:	1
+Release:	2
 Epoch:		5
 License:	GPL v2+
 Group:		Applications/Networking
@@ -101,6 +100,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.105  2012/05/06 09:54:32  arekm
+- rel 2; colors patch is back
+
 Revision 1.104  2012/05/06 08:41:30  arekm
 - up to 0.9.2 but without colors patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/rtorrent/rtorrent-colors.patch?r1=1.24&r2=1.25
    http://cvs.pld-linux.org/packages/rtorrent/rtorrent.spec?r1=1.104&r2=1.105