CVS commit: pkgsrc/sysutils/fastfetch

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils/fastfetch
From: "Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>
Date: Fri, 14 Feb 2025 10:39:17 +0000

Module Name:    pkgsrc
Committed By:   vins
Date:           Fri Feb 14 10:39:17 UTC 2025

Modified Files:
        pkgsrc/sysutils/fastfetch: Makefile distinfo
Added Files:
        pkgsrc/sysutils/fastfetch/patches: patch-src_common_color.h
            patch-src_common_option.c patch-src_logo_ascii_netbsd2.txt
            patch-src_logo_builtin.c

Log Message:
sysutils/fastfetch: minor changes

* Add NetBSD2 logo, borrowed from screenfetch.
* Support 'orange' color.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/sysutils/fastfetch/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/fastfetch/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/fastfetch/patches/patch-src_common_color.h \
    pkgsrc/sysutils/fastfetch/patches/patch-src_common_option.c \
    pkgsrc/sysutils/fastfetch/patches/patch-src_logo_ascii_netbsd2.txt
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/sysutils/fastfetch/patches/patch-src_logo_builtin.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.16 pkgsrc/sysutils/fastfetch/Makefile:1.17
--- pkgsrc/sysutils/fastfetch/Makefile:1.16     Thu Feb 13 13:27:42 2025
+++ pkgsrc/sysutils/fastfetch/Makefile  Fri Feb 14 10:39:17 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2025/02/13 13:27:42 vins Exp $
+# $NetBSD: Makefile,v 1.17 2025/02/14 10:39:17 vins Exp $
 
 DISTNAME=      fastfetch-2.36.1
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=fastfetch-cli/}
 GITHUB_TAG=    ${PKGVERSION_NOREV}
@@ -9,7 +9,7 @@ GITHUB_TAG=     ${PKGVERSION_NOREV}
 MAINTAINER=    vins%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/fastfetch-cli/fastfetch/
 COMMENT=       Fast and feature-rich tool displaying system information
-LICENSE=       mit
+LICENSE=       mit AND gnu-gpl-v3 # patch-src_logo_ascii_netbsd2.txt
 
 USE_TOOLS+=    pkg-config
 

Index: pkgsrc/sysutils/fastfetch/distinfo
diff -u pkgsrc/sysutils/fastfetch/distinfo:1.11 pkgsrc/sysutils/fastfetch/distinfo:1.12
--- pkgsrc/sysutils/fastfetch/distinfo:1.11     Tue Feb 11 17:45:26 2025
+++ pkgsrc/sysutils/fastfetch/distinfo  Fri Feb 14 10:39:17 2025
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.11 2025/02/11 17:45:26 vins Exp $
+$NetBSD: distinfo,v 1.12 2025/02/14 10:39:17 vins Exp $
 
 BLAKE2s (fastfetch-2.36.1.tar.gz) = 02d2a72f53a6cd0020971823e91b70780e3b20b783053d39c3a38958990e6829
 SHA512 (fastfetch-2.36.1.tar.gz) = 2906b8e6912185a3acdd2b615ff869fa8f44ce0e547ed5529068eb2570ef5c013ed84691e62d613e52f2433595aa4e67859cf89b4116588ba4cb7c7bb7d8bb01
 Size (fastfetch-2.36.1.tar.gz) = 1176932 bytes
+SHA1 (patch-src_common_color.h) = a452dcb56469578f0e51c46b1f7af079303e7da1
+SHA1 (patch-src_common_option.c) = e7563a636bda0aa909c2fd2ef852bbed3c952949
+SHA1 (patch-src_logo_ascii_netbsd2.txt) = bf145d947cac62b88b999396ea0a0e9ad8e8a5ad
+SHA1 (patch-src_logo_builtin.c) = cf31f3769f1aae4c26cbdf5e68fd802436b0faa7

Added files:

Index: pkgsrc/sysutils/fastfetch/patches/patch-src_common_color.h
diff -u /dev/null pkgsrc/sysutils/fastfetch/patches/patch-src_common_color.h:1.1
--- /dev/null   Fri Feb 14 10:39:17 2025
+++ pkgsrc/sysutils/fastfetch/patches/patch-src_common_color.h  Fri Feb 14 10:39:17 2025
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_common_color.h,v 1.1 2025/02/14 10:39:17 vins Exp $
+
+Define _ORANGE colors.
+
+--- src/common/color.h.orig    2025-02-11 02:40:51.000000000 +0000
++++ src/common/color.h
+@@ -18,6 +18,7 @@
+ #define FF_COLOR_FG_MAGENTA "35"
+ #define FF_COLOR_FG_CYAN "36"
+ #define FF_COLOR_FG_WHITE "37"
++#define FF_COLOR_FG_ORANGE "38;2;255;133;"
+ #define FF_COLOR_FG_DEFAULT "39"
+ 
+ #define FF_COLOR_FG_LIGHT_BLACK "90"
+@@ -37,6 +38,7 @@
+ #define FF_COLOR_BG_MAGENTA "45"
+ #define FF_COLOR_BG_CYAN "46"
+ #define FF_COLOR_BG_WHITE "47"
++#define FF_COLOR_BG_ORANGE "48;2;255;133;"
+ #define FF_COLOR_BG_DEFAULT "49"
+ 
+ #define FF_COLOR_BG_LIGHT_BLACK "100"
Index: pkgsrc/sysutils/fastfetch/patches/patch-src_common_option.c
diff -u /dev/null pkgsrc/sysutils/fastfetch/patches/patch-src_common_option.c:1.1
--- /dev/null   Fri Feb 14 10:39:17 2025
+++ pkgsrc/sysutils/fastfetch/patches/patch-src_common_option.c Fri Feb 14 10:39:17 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_common_option.c,v 1.1 2025/02/14 10:39:17 vins Exp $
+
+Associate 'orange' color to its ANSI escape code.
+
+--- src/common/option.c.orig   2025-02-14 09:05:56.473760877 +0000
++++ src/common/option.c
+@@ -193,6 +193,7 @@ void ffOptionParseColorNoClear(const cha
+             else FF_APPEND_COLOR_CODE_COND(magenta, FF_COLOR_FG_MAGENTA)
+             else FF_APPEND_COLOR_CODE_COND(cyan, FF_COLOR_FG_CYAN)
+             else FF_APPEND_COLOR_CODE_COND(white, FF_COLOR_FG_WHITE)
++            else FF_APPEND_COLOR_CODE_COND(orange, FF_COLOR_FG_ORANGE)
+             else FF_APPEND_COLOR_CODE_COND(default, FF_COLOR_FG_DEFAULT)
+             else FF_APPEND_COLOR_CODE_COND(light_black, FF_COLOR_FG_LIGHT_BLACK)
+             else FF_APPEND_COLOR_CODE_COND(light_red, FF_COLOR_FG_LIGHT_RED)
Index: pkgsrc/sysutils/fastfetch/patches/patch-src_logo_ascii_netbsd2.txt
diff -u /dev/null pkgsrc/sysutils/fastfetch/patches/patch-src_logo_ascii_netbsd2.txt:1.1
--- /dev/null   Fri Feb 14 10:39:17 2025
+++ pkgsrc/sysutils/fastfetch/patches/patch-src_logo_ascii_netbsd2.txt  Fri Feb 14 10:39:17 2025
@@ -0,0 +1,30 @@
+$NetBSD: patch-src_logo_ascii_netbsd2.txt,v 1.1 2025/02/14 10:39:17 vins Exp $
+
+Add NetBSD2 logo.
+Originally written by Brett Bohnenkamper <kittykatt%kittykatt.us@localhost>
+https://github.com/KittyKatt/screenFetch
+
+--- src/logo/ascii/netbsd2.txt.orig    2025-02-14 09:05:35.316778482 +0000
++++ src/logo/ascii/netbsd2.txt
+@@ -0,0 +1,21 @@
++
++$1                                  __,gnnnOCCCCCOObaau,_
++$2   _._                    $1__,gnnCCCCCCCCOPF"''
++$2  (N\\$1XCbngg,._____.,gnnndCCCCCCCCCCCCF"___,,,,___ 
++$2   \N\\$1XCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCOOOOPYvv.
++$2    \N\\$1XCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCPF"''
++$2     \N\\$1XCCCCCCCCCCCCCCCCCCCCCCCCCOF"'
++$2      \N\\$1XCCCCCCCCCCCCCCCCCCCCOF"'
++$2       \N\\$1XCCCCCCCCCCCCCCCPF"'
++$2        \N\\$1\"PCOCCCOCCFP""
++$2         \N\\
++$2          \N\\
++$2           \N\\
++$2            \NN\
++$2             \NN\
++$2              \NNA.
++$2               \NNA,
++$2                \NNN,
++$2                 \NNN\
++$2                  \NNN\
++$2                   \NNNA

Index: pkgsrc/sysutils/fastfetch/patches/patch-src_logo_builtin.c
diff -u /dev/null pkgsrc/sysutils/fastfetch/patches/patch-src_logo_builtin.c:1.3
--- /dev/null   Fri Feb 14 10:39:17 2025
+++ pkgsrc/sysutils/fastfetch/patches/patch-src_logo_builtin.c  Fri Feb 14 10:39:17 2025
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_logo_builtin.c,v 1.3 2025/02/14 10:39:17 vins Exp $
+
+Embed the NetBSD2 alternative logo.
+
+--- src/logo/builtin.c.orig    2025-02-11 02:40:51.000000000 +0000
++++ src/logo/builtin.c
+@@ -3135,6 +3135,18 @@ static const FFlogo N[] = {
+         .colorKeys = FF_COLOR_FG_RED,
+         .colorTitle = FF_COLOR_FG_WHITE,
+     },
++    // NetBSD2
++    {
++        .names = {"NetBSD2", "NetBSD_alt"},
++        .lines = FASTFETCH_DATATEXT_LOGO_NETBSD2,
++        .type = FF_LOGO_LINE_TYPE_ALTER_BIT,
++        .colors = {
++            FF_COLOR_FG_RED,
++            FF_COLOR_FG_WHITE,
++        },
++        .colorKeys = FF_COLOR_FG_RED,
++        .colorTitle = FF_COLOR_FG_WHITE,
++    },
+     // NetBSD Small
+     {
+         .names = {"NetBSD_small"},

Prev by Date: CVS commit: pkgsrc/biology/bowtie2
Next by Date: CVS commit: pkgsrc/security/botan3
Previous by Thread: CVS commit: pkgsrc/biology/bowtie2
Next by Thread: CVS commit: pkgsrc/security/botan3
Indexes:

Home | Main Index | Thread Index | Old Index