logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: e8d80df04467d22fb243926a42dbf9522012e334
parent 95a057ece34990831a6b91627cb23fb246a12c1c
Author: Michael Forney <mforney@mforney.org>
Date:   Wed, 16 Feb 2022 18:32:30 -0800

sfeed: Update to 1.2

Diffstat:

M.gitmodules1+
Apkg/sfeed/patch/0001-Handle-tparm-constants-with-type-const-char.patch32++++++++++++++++++++++++++++++++
Mpkg/sfeed/ver2+-
3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules @@ -286,6 +286,7 @@ [submodule "pkg/sfeed/src"] path = pkg/sfeed/src url = git://git.codemadness.org/sfeed + ignore = all [submodule "pkg/sinit/src"] path = pkg/sinit/src url = git://git.suckless.org/sinit diff --git a/pkg/sfeed/patch/0001-Handle-tparm-constants-with-type-const-char.patch b/pkg/sfeed/patch/0001-Handle-tparm-constants-with-type-const-char.patch @@ -0,0 +1,32 @@ +From d082676932a418c8095ea20b3d43f0e4b387b7f5 Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Thu, 17 Feb 2022 23:23:24 -0800 +Subject: [PATCH] Handle tparm constants with type const char * + +--- + sfeed_curses.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/sfeed_curses.c b/sfeed_curses.c +index 4087369..9bd65d7 100644 +--- a/sfeed_curses.c ++++ b/sfeed_curses.c +@@ -267,12 +267,12 @@ estrdup(const char *s) + + /* Wrapper for tparm which allows NULL parameter for str. */ + char * +-tparmnull(char *str, long p1, long p2, long p3, long p4, long p5, long p6, +- long p7, long p8, long p9) ++tparmnull(const char *str, long p1, long p2, long p3, long p4, long p5, ++ long p6, long p7, long p8, long p9) + { + if (!str) + return NULL; +- return tparm(str, p1, p2, p3, p4, p5, p6, p7, p8, p9); ++ return tparm((char *)str, p1, p2, p3, p4, p5, p6, p7, p8, p9); + } + + /* Counts column width of character string. */ +-- +2.34.1 + diff --git a/pkg/sfeed/ver b/pkg/sfeed/ver @@ -1 +1 @@ -1.1 r0 +1.2 r0