CVS commit: pkgsrc/sysutils/fastfetch

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun Jan 12 11:07:38 UTC 2025

Modified Files:
        pkgsrc/sysutils/fastfetch: Makefile distinfo
Added Files:
        pkgsrc/sysutils/fastfetch/patches: patch-CMakeLists.txt
            patch-src_detection_memory_memory__nbsd.c
            patch-src_logo_ascii_netbsd__small.txt patch-src_logo_builtin.c
Removed Files:
        pkgsrc/sysutils/fastfetch/patches:
            patch-src_detection_battery_battery__nbsd.c

Log Message:
sysutils/fastfetch: update to fastfetch-2.34.0

# changes (pkgsrc)
* Remove battery percentage patch (incorporated upstream).
* Fix memory usage detection on NetBSD. Calculating used memory as a
  substraction of total and free pages doesn't suit NetBSD UVM.
* Add netbsd_small logo and change default hightlight color for NetBSD
  from magenta to red .

# changes (upstream)

Changes:

    We now print distro pretty name if available (OS)
       This is a long requested feature. However, it may break some distros.
           File a bug with the content of /etc/os-release if it breaks your distro.

Bugfixes:

    Fix thunderbolt version of new MBPs (#1465, Host, macOS)
    Fix backlight name detection on FreeBSD (Brightness, FreeBSD)
    Fix Terminal detection when running fastfetch in pk-command-not-found
    Relax detection of terminals in NixOS (#1479, Terminal, Linux)
        Should fix konsole, ghostty and maybe others
    Fix core count output in multi-package platforms (CPU)
    Don't suppress the output of preRun (#1489)
    Fix battery percentage detection (Battery, NetBSD)

Features:

    Support ghostty terminal font detection (TerminalFont, Linux / macOS)
    Support kitty-icat image protocol, which uses kitten icat to generate image data
        Pros: support tmux; support gif animations; good performance
        Cons: due to the limitation of kitten icat, we need to clear the screen before
                          displaying the image logo
    Support WM version detection (WM)
        In Linux, Hyprland & sway are supported currently
    Improve performance when stdout is redirected (TerminalSize)
    Report thermal zone temp if CPU temp is not available (CPU, Linux)
    Report sound server (Pipewire or PulseAudio) if available (#1454, Sound, Linux)
    Enable OpenGL & OpenCL detection on Android (OpenGL / OpenCL, Android)
    Detect & report MediaTek Dimensity 9000+ SOC name (CPU, Android)
    Support appman (am-user) package manager detection (Packages, Linux)

Logo:

    Add Lubuntu
    Update Xray_os
    Add SnigdhaOS
    Add Rhino Linux


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/fastfetch/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/fastfetch/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/fastfetch/patches/patch-CMakeLists.txt \
    pkgsrc/sysutils/fastfetch/patches/patch-src_detection_memory_memory__nbsd.c \
    pkgsrc/sysutils/fastfetch/patches/patch-src_logo_ascii_netbsd__small.txt \
    pkgsrc/sysutils/fastfetch/patches/patch-src_logo_builtin.c
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/sysutils/fastfetch/patches/patch-src_detection_battery_battery__nbsd.c

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

Modified files:

Index: pkgsrc/sysutils/fastfetch/Makefile
diff -u pkgsrc/sysutils/fastfetch/Makefile:1.4 pkgsrc/sysutils/fastfetch/Makefile:1.5
--- pkgsrc/sysutils/fastfetch/Makefile:1.4      Wed Jan  8 18:08:30 2025
+++ pkgsrc/sysutils/fastfetch/Makefile  Sun Jan 12 11:07:38 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2025/01/08 18:08:30 vins Exp $
+# $NetBSD: Makefile,v 1.5 2025/01/12 11:07:38 vins Exp $
 
-DISTNAME=      fastfetch-2.33.0
-PKGREVISION=   3
+DISTNAME=      fastfetch-2.34.0
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=fastfetch-cli/}
 GITHUB_TAG=    ${PKGVERSION_NOREV}

Index: pkgsrc/sysutils/fastfetch/distinfo
diff -u pkgsrc/sysutils/fastfetch/distinfo:1.2 pkgsrc/sysutils/fastfetch/distinfo:1.3
--- pkgsrc/sysutils/fastfetch/distinfo:1.2      Tue Jan  7 21:01:15 2025
+++ pkgsrc/sysutils/fastfetch/distinfo  Sun Jan 12 11:07:38 2025
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.2 2025/01/07 21:01:15 vins Exp $
+$NetBSD: distinfo,v 1.3 2025/01/12 11:07:38 vins Exp $
 
-BLAKE2s (fastfetch-2.33.0.tar.gz) = 82e265189b919cd41b15c689b2d2a1243bfaab9962abbe71fc65c278e6c57799
-SHA512 (fastfetch-2.33.0.tar.gz) = f9d824f908e36e3dc1b7784f2da818d764be6bbc6baa77d6b26ea6776acb5f101c4c39267fa42d1c9ae735c9889badc7b3a65170d81308de852a178e50140154
-Size (fastfetch-2.33.0.tar.gz) = 1161845 bytes
-SHA1 (patch-src_detection_battery_battery__nbsd.c) = a6850a4fbd848df3f1b23c0a46fca45c79d6eacd
+BLAKE2s (fastfetch-2.34.0.tar.gz) = 68a21e6b2e7df430190cf5ef93c9f79baf8ddfccc0b7340eb4f28dd2896d04ac
+SHA512 (fastfetch-2.34.0.tar.gz) = 8a2bbcd1f612e1fd4649cd64b0a1b52fe52012adb89cf42f56d16d677ff407a88c1e3992c58fdbbccacb668456fa1288e1667eb631791b37ba2267b2d3021cc5
+Size (fastfetch-2.34.0.tar.gz) = 1166632 bytes
+SHA1 (patch-CMakeLists.txt) = a440d81fa17de272654da37d0ca8ae680b8d776f
+SHA1 (patch-src_detection_memory_memory__nbsd.c) = 658a4b61a0b80edb79d59a14a2038e5f35e418e0
+SHA1 (patch-src_logo_ascii_netbsd__small.txt) = f339c1e985be6d2fe3d7c522e8cfa9a7ceefd430
+SHA1 (patch-src_logo_builtin.c) = 449ef2d350db6c5e70bf974859a0f6f39252242a

Added files:

Index: pkgsrc/sysutils/fastfetch/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/sysutils/fastfetch/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Sun Jan 12 11:07:38 2025
+++ pkgsrc/sysutils/fastfetch/patches/patch-CMakeLists.txt      Sun Jan 12 11:07:38 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2025/01/12 11:07:38 vins Exp $
+
+Build memory_nbsd.c. 
+
+--- CMakeLists.txt.orig        2025-01-09 01:02:12.000000000 +0000
++++ CMakeLists.txt
+@@ -752,7 +752,7 @@ elseif(NetBSD)
+         src/detection/localip/localip_linux.c
+         src/detection/gamepad/gamepad_nosupport.c
+         src/detection/media/media_linux.c
+-        src/detection/memory/memory_obsd.c
++        src/detection/memory/memory_nbsd.c
+         src/detection/mouse/mouse_nosupport.c
+         src/detection/netio/netio_bsd.c
+         src/detection/opengl/opengl_linux.c
Index: pkgsrc/sysutils/fastfetch/patches/patch-src_detection_memory_memory__nbsd.c
diff -u /dev/null pkgsrc/sysutils/fastfetch/patches/patch-src_detection_memory_memory__nbsd.c:1.1
--- /dev/null   Sun Jan 12 11:07:38 2025
+++ pkgsrc/sysutils/fastfetch/patches/patch-src_detection_memory_memory__nbsd.c Sun Jan 12 11:07:38 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_detection_memory_memory__nbsd.c,v 1.1 2025/01/12 11:07:38 vins Exp $
+
+Memory detection for NetBSD.
+
+--- src/detection/memory/memory_nbsd.c.orig    2025-01-12 09:48:00.475080521 +0000
++++ src/detection/memory/memory_nbsd.c
+@@ -0,0 +1,19 @@
++#include "memory.h"
++#include "common/sysctl.h"
++
++#include <sys/param.h>
++#include <uvm/uvm_extern.h>
++
++const char* ffDetectMemory(FFMemoryResult* ram)
++{
++    static int uvmexp_mib[] = {CTL_VM, VM_UVMEXP2};
++    struct uvmexp_sysctl buf;
++    size_t length = sizeof(buf);
++    if (sysctl(uvmexp_mib, 2, &buf, &length, NULL, 0) < 0)
++      return "sysctl(CTL_VM, VM_UVMEXP2) call failed";
++
++    ram->bytesTotal = (uint64_t) buf.npages * instance.state.platform.sysinfo.pageSize;
++    ram->bytesUsed = ((uint64_t) buf.active + (uint64_t) buf.wired) * instance.state.platform.sysinfo.pageSize;
++
++    return NULL;
++}
Index: pkgsrc/sysutils/fastfetch/patches/patch-src_logo_ascii_netbsd__small.txt
diff -u /dev/null pkgsrc/sysutils/fastfetch/patches/patch-src_logo_ascii_netbsd__small.txt:1.1
--- /dev/null   Sun Jan 12 11:07:38 2025
+++ pkgsrc/sysutils/fastfetch/patches/patch-src_logo_ascii_netbsd__small.txt    Sun Jan 12 11:07:38 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_logo_ascii_netbsd__small.txt,v 1.1 2025/01/12 11:07:38 vins Exp $
+
+Add 'netbsd_small' logo.
+
+--- src/logo/ascii/netbsd_small.txt.orig       2025-01-12 10:51:25.096441370 +0000
++++ src/logo/ascii/netbsd_small.txt
+@@ -0,0 +1,8 @@
++$2 \\$1`-______,----__
++$2  \\       $1 __,---`_
++$2   \\      $1 `.____
++$2    \\$1-______,----`-
++$2     \\
++$2      \\
++$2       \\
++$2        \\
Index: pkgsrc/sysutils/fastfetch/patches/patch-src_logo_builtin.c
diff -u /dev/null pkgsrc/sysutils/fastfetch/patches/patch-src_logo_builtin.c:1.1
--- /dev/null   Sun Jan 12 11:07:38 2025
+++ pkgsrc/sysutils/fastfetch/patches/patch-src_logo_builtin.c  Sun Jan 12 11:07:38 2025
@@ -0,0 +1,31 @@
+$NetBSD: patch-src_logo_builtin.c,v 1.1 2025/01/12 11:07:38 vins Exp $
+
+* Include netbsd_small logo.
+* Use red instead of magenta as default highlight color.  
+
+--- src/logo/builtin.c.orig    2025-01-09 01:02:12.000000000 +0000
++++ src/logo/builtin.c
+@@ -3078,10 +3078,21 @@ static const FFlogo N[] = {
+         .names = {"netbsd"},
+         .lines = FASTFETCH_DATATEXT_LOGO_NETBSD,
+         .colors = {
+-            FF_COLOR_FG_MAGENTA,
++            FF_COLOR_FG_RED,
+             FF_COLOR_FG_WHITE,
+         },
+-        .colorKeys = FF_COLOR_FG_MAGENTA,
++        .colorKeys = FF_COLOR_FG_RED,
++        .colorTitle = FF_COLOR_FG_WHITE,
++    },
++    // NetBSDSmall
++    {
++        .names = {"netbsd_small"},
++        .lines = FASTFETCH_DATATEXT_LOGO_NETBSD_SMALL,
++        .colors = {
++            FF_COLOR_FG_RED,
++            FF_COLOR_FG_WHITE,
++        },
++        .colorKeys = FF_COLOR_FG_RED,
+         .colorTitle = FF_COLOR_FG_WHITE,
+     },
+     // Nobara