CVS commit: pkgsrc/net/rtorrent

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Apr  1 09:37:55 UTC 2025

Modified Files:
        pkgsrc/net/rtorrent: Makefile distinfo
        pkgsrc/net/rtorrent/patches: patch-src_display_canvas.h
Added Files:
        pkgsrc/net/rtorrent/patches: patch-configure

Log Message:
rtorrent: updated to 0.15.2

0.15.2

Support for colors.
Add JSON-RPC capability.
Lua support.
Close low diskspace normal.
Fix various macos issues.
Added new tracker list commands.
Fix possible crash with save_input_history.
Added 'system.files.session.fdatasync' config option.


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 pkgsrc/net/rtorrent/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/net/rtorrent/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/rtorrent/patches/patch-configure
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/rtorrent/patches/patch-src_display_canvas.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/rtorrent/Makefile
diff -u pkgsrc/net/rtorrent/Makefile:1.101 pkgsrc/net/rtorrent/Makefile:1.102
--- pkgsrc/net/rtorrent/Makefile:1.101  Fri Mar 21 16:44:26 2025
+++ pkgsrc/net/rtorrent/Makefile        Tue Apr  1 09:37:54 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.101 2025/03/21 16:44:26 wiz Exp $
+# $NetBSD: Makefile,v 1.102 2025/04/01 09:37:54 adam Exp $
 
-DISTNAME=      rtorrent-0.15.1
-PKGREVISION=   1
+DISTNAME=      rtorrent-0.15.2
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=rakshasa/}
 GITHUB_RELEASE=        v${PKGVERSION_NOREV}
@@ -11,7 +10,7 @@ HOMEPAGE=     https://github.com/rakshasa/rt
 COMMENT=       Ncurses based torrent client with support for sessions
 LICENSE=       gnu-gpl-v2
 
-USE_CXX_FEATURES=      c++14
+USE_CXX_FEATURES=      c++17
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake pkg-config

Index: pkgsrc/net/rtorrent/distinfo
diff -u pkgsrc/net/rtorrent/distinfo:1.42 pkgsrc/net/rtorrent/distinfo:1.43
--- pkgsrc/net/rtorrent/distinfo:1.42   Thu Jan  2 20:00:05 2025
+++ pkgsrc/net/rtorrent/distinfo        Tue Apr  1 09:37:54 2025
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.42 2025/01/02 20:00:05 adam Exp $
+$NetBSD: distinfo,v 1.43 2025/04/01 09:37:54 adam Exp $
 
-BLAKE2s (rtorrent-0.15.1.tar.gz) = dca81a91068f0415b540702c3637de0910770a9bab9c2cbb992691b3449a9c53
-SHA512 (rtorrent-0.15.1.tar.gz) = e5c713601ecb0c4536b64d98ca53261db35980b04a3f274d12f51467b021d77768e7f6a2004a33a76a99f7d96e0a2c3de4605fd7ee186ba05a7c16aa96b97ea5
-Size (rtorrent-0.15.1.tar.gz) = 688056 bytes
-SHA1 (patch-src_display_canvas.h) = 6b10c508158d594bcb0633c9e7f3e2885f8456d1
+BLAKE2s (rtorrent-0.15.2.tar.gz) = 8d92714f872abc8c09e444ea510648aa29b98d36b83e6cfe6b8f0fdacd59854e
+SHA512 (rtorrent-0.15.2.tar.gz) = 557bb11d2f941a1d880723333bb9d47a3835dae15dc5477495725398fea010191ec6cef63625a6ad8de6b3253b48cede1cf257336c901854de550810ad3717ef
+Size (rtorrent-0.15.2.tar.gz) = 858419 bytes
+SHA1 (patch-configure) = 18c59449e34a3b2dba7d462937a217b5ff676153
+SHA1 (patch-src_display_canvas.h) = 56fa7905b3e11c6fd277d64b1209e7207e6a4a8e
 SHA1 (patch-src_utils_directory.cc) = b3b38e1d9d0887711ac54433e948bfc28112b985
 SHA1 (patch-src_utils_directory.h) = 77280b6ab0ba69c77c5bb88eca7beb11954415ad

Index: pkgsrc/net/rtorrent/patches/patch-src_display_canvas.h
diff -u pkgsrc/net/rtorrent/patches/patch-src_display_canvas.h:1.1 pkgsrc/net/rtorrent/patches/patch-src_display_canvas.h:1.2
--- pkgsrc/net/rtorrent/patches/patch-src_display_canvas.h:1.1  Sun Jun 24 16:59:52 2018
+++ pkgsrc/net/rtorrent/patches/patch-src_display_canvas.h      Tue Apr  1 09:37:54 2025
@@ -1,24 +1,24 @@
-$NetBSD: patch-src_display_canvas.h,v 1.1 2018/06/24 16:59:52 adam Exp $
+$NetBSD: patch-src_display_canvas.h,v 1.2 2025/04/01 09:37:54 adam Exp $
 
 Make this work with "ncurses" 5.8. Patch taken from:
 http://www.mail-archive.com/arch-general%archlinux.org@localhost/msg18728.html
 
---- src/display/canvas.h.orig  2018-06-07 04:25:27.000000000 +0000
+--- src/display/canvas.h.orig  2025-03-28 18:55:13.000000000 +0000
 +++ src/display/canvas.h
-@@ -37,6 +37,7 @@
+@@ -1,6 +1,7 @@
  #ifndef RTORRENT_DISPLAY_CANVAS_H
  #define RTORRENT_DISPLAY_CANVAS_H
  
 +#include <cstdarg>
  #include <string>
+ #include <unordered_map>
  #include <vector>
- 
-@@ -48,7 +49,7 @@ class Canvas {
- public:
-   typedef std::vector<Attributes> attributes_list;
+@@ -15,7 +16,7 @@ public:
+   typedef std::vector<Attributes>      attributes_list;
+   typedef std::unordered_map<int, int> attributes_map;
  
 -  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() { if (!m_isDaemon) { delwin(m_window); } }
+   ~Canvas();
  
-   void                refresh()                                               { if (!m_isDaemon) { wnoutrefresh(m_window); } }
+   void         refresh();

Added files:

Index: pkgsrc/net/rtorrent/patches/patch-configure
diff -u /dev/null pkgsrc/net/rtorrent/patches/patch-configure:1.1
--- /dev/null   Tue Apr  1 09:37:55 2025
+++ pkgsrc/net/rtorrent/patches/patch-configure Tue Apr  1 09:37:54 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-configure,v 1.1 2025/04/01 09:37:54 adam Exp $
+
+Portability fix.
+
+--- configure.orig     2025-04-01 09:32:44.985682824 +0000
++++ configure
+@@ -17587,8 +17587,7 @@ printf "%s\n" "#define API_VERSION 11" >
+   if test -z "${unwanted_values}"; then
+     CXX="$CXX"
+   else
+-    result=`echo "${values_to_check}" | $GREP -Fvx -- "${unwanted_values}" | $GREP -v '^$'`
+-    CXX=${result//$'\n'/ }
++    CXX=`echo "${values_to_check}" | $GREP -Fvx -- "${unwanted_values}" | $GREP -v '^$' | tr '\n' ' '`
+   fi
+ 
+