commit: 8ba6a56e27393d5f125e97053062f5a273395035
parent 51d621d4166d3310c0abced4ebfde0279a701aa6
Author: Michael Forney <mforney@mforney.org>
Date: Fri, 18 Feb 2022 02:57:56 -0800
catgirl: Update to 2.0a
Diffstat:
7 files changed, 60 insertions(+), 94 deletions(-)
diff --git a/pkg/catgirl/patch/0001-Revert-Use-gnu-case-range-and-gnu-conditional-omitte.patch b/pkg/catgirl/patch/0001-Revert-Use-gnu-case-range-and-gnu-conditional-omitte.patch
@@ -1,4 +1,4 @@
-From 2ee883206837a7dc5a0049841b5a9cdc096f67f6 Mon Sep 17 00:00:00 2001
+From 48ce2b38033ae93717fd330c3cb6c0476e2979e5 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Thu, 7 May 2020 00:36:14 -0700
Subject: [PATCH] Revert "Use gnu-case-range and
@@ -15,7 +15,7 @@ This reverts commit 75a6aa9258270169f43f56e063f1bfb57eebe56b.
6 files changed, 57 insertions(+), 39 deletions(-)
diff --git a/Makefile b/Makefile
-index 373e7d5..a07ef19 100644
+index 48fc350..ac452d2 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,7 @@ PREFIX ?= /usr/local
@@ -29,7 +29,7 @@ index 373e7d5..a07ef19 100644
LDADD.ncursesw = -lncursesw
diff --git a/command.c b/command.c
-index 5c97ef5..0e90715 100644
+index 335c396..d87e162 100644
--- a/command.c
+++ b/command.c
@@ -68,8 +68,8 @@ static int splitChunk(const char *cmd, uint id) {
@@ -52,7 +52,7 @@ index 5c97ef5..0e90715 100644
}
static void commandNick(uint id, char *params) {
-@@ -269,7 +269,7 @@ static void commandOp(uint id, char *params) {
+@@ -275,7 +275,7 @@ static void commandOp(uint id, char *params) {
}
static void commandDeop(uint id, char *params) {
@@ -61,7 +61,7 @@ index 5c97ef5..0e90715 100644
}
static void commandVoice(uint id, char *params) {
-@@ -281,7 +281,7 @@ static void commandVoice(uint id, char *params) {
+@@ -287,7 +287,7 @@ static void commandVoice(uint id, char *params) {
}
static void commandDevoice(uint id, char *params) {
@@ -70,7 +70,7 @@ index 5c97ef5..0e90715 100644
}
static void commandBan(uint id, char *params) {
-@@ -356,12 +356,12 @@ static void commandWhowas(uint id, char *params) {
+@@ -362,12 +362,12 @@ static void commandWhowas(uint id, char *params) {
static void commandNS(uint id, char *params) {
(void)id;
@@ -85,7 +85,7 @@ index 5c97ef5..0e90715 100644
}
static void commandQuery(uint id, char *params) {
-@@ -436,7 +436,8 @@ static void commandFilter(enum Heat heat, uint id, char *params) {
+@@ -442,7 +442,8 @@ static void commandFilter(enum Heat heat, uint id, char *params) {
uiFormat(
id, Cold, NULL, "%sing \3%02d%s %s %s %s",
(heat == Hot ? "Highlight" : "Ignor"), Brown, filter.mask,
@@ -95,7 +95,7 @@ index 5c97ef5..0e90715 100644
);
} else {
for (size_t i = 0; i < FilterCap && filters[i].mask; ++i) {
-@@ -444,8 +445,9 @@ static void commandFilter(enum Heat heat, uint id, char *params) {
+@@ -450,8 +451,9 @@ static void commandFilter(enum Heat heat, uint id, char *params) {
uiFormat(
Network, Warm, NULL, "%sing \3%02d%s %s %s %s",
(heat == Hot ? "Highlight" : "Ignor"), Brown, filters[i].mask,
@@ -107,7 +107,7 @@ index 5c97ef5..0e90715 100644
);
}
}
-@@ -458,8 +460,8 @@ static void commandUnfilter(enum Heat heat, uint id, char *params) {
+@@ -464,8 +466,8 @@ static void commandUnfilter(enum Heat heat, uint id, char *params) {
uiFormat(
id, Cold, NULL, "%s %sing \3%02d%s %s %s %s",
(found ? "No longer" : "Not"), (heat == Hot ? "highlight" : "ignor"),
@@ -118,7 +118,7 @@ index 5c97ef5..0e90715 100644
);
}
-@@ -488,7 +490,9 @@ static void commandExec(uint id, char *params) {
+@@ -494,7 +496,9 @@ static void commandExec(uint id, char *params) {
dup2(execPipe[1], STDOUT_FILENO);
dup2(utilPipe[1], STDERR_FILENO);
@@ -129,7 +129,7 @@ index 5c97ef5..0e90715 100644
execl(shell, shell, "-c", params, NULL);
warn("%s", shell);
_exit(EX_UNAVAILABLE);
-@@ -513,7 +517,8 @@ static void commandHelp(uint id, char *params) {
+@@ -519,7 +523,8 @@ static void commandHelp(uint id, char *params) {
if (pid) return;
char buf[256];
@@ -162,7 +162,7 @@ index 9e59db5..9ea1192 100644
}
diff --git a/handle.c b/handle.c
-index a8f054c..1ace1b3 100644
+index e460c7c..0cdda74 100644
--- a/handle.c
+++ b/handle.c
@@ -299,9 +299,9 @@ static void handleReplyISupport(struct Message *msg) {
@@ -320,10 +320,10 @@ index a8f054c..1ace1b3 100644
return true;
}
diff --git a/ui.c b/ui.c
-index 1adcafe..2df8396 100644
+index 2789bd7..4b87a1f 100644
--- a/ui.c
+++ b/ui.c
-@@ -495,7 +495,7 @@ static size_t windowTop(const struct Window *window) {
+@@ -497,7 +497,7 @@ static size_t windowTop(const struct Window *window) {
}
static size_t windowBottom(const struct Window *window) {
@@ -332,7 +332,7 @@ index 1adcafe..2df8396 100644
if (window->scroll) bottom -= SplitLines + MarkerLines;
return bottom;
}
-@@ -978,7 +978,6 @@ static void keyCode(int code) {
+@@ -976,7 +976,6 @@ static void keyCode(int code) {
break; case KeyMetaGt: scrollTo(window, 0);
break; case KeyMetaLt: scrollTop(window);
@@ -340,7 +340,7 @@ index 1adcafe..2df8396 100644
break; case KeyMetaA: showAuto();
break; case KeyMetaB: edit(id, EditPrevWord, 0);
break; case KeyMetaD: edit(id, EditDeleteNextWord, 0);
-@@ -1008,6 +1007,12 @@ static void keyCode(int code) {
+@@ -1006,6 +1005,12 @@ static void keyCode(int code) {
break; case KEY_SEND: scrollTo(window, 0);
break; case KEY_SHOME: scrollTo(window, BufferCap);
break; case KEY_UP: windowScroll(window, +1);
@@ -367,5 +367,5 @@ index 219a83c..9c721e0 100644
if (error) return error;
}
--
-2.32.0
+2.34.1
diff --git a/pkg/catgirl/patch/0002-Break-out-of-input-loop-when-UI-is-hidden.patch b/pkg/catgirl/patch/0002-Break-out-of-input-loop-when-UI-is-hidden.patch
@@ -1,4 +1,4 @@
-From a878ba9c650d4cb25ddf656e4812536456005f6f Mon Sep 17 00:00:00 2001
+From 923a6d5c2d391af83c8b108c3cf59d5e709e25b0 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Mon, 31 May 2021 16:37:09 -0700
Subject: [PATCH] Break out of input loop when UI is hidden
@@ -10,10 +10,10 @@ with M-l, which restores curses mode when using NetBSD's libcurses.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ui.c b/ui.c
-index 2df8396..2ad1fd8 100644
+index 4b87a1f..c92c0df 100644
--- a/ui.c
+++ b/ui.c
-@@ -1091,7 +1091,7 @@ void uiRead(void) {
+@@ -1089,7 +1089,7 @@ void uiRead(void) {
wint_t ch;
static bool paste, style, literal;
@@ -23,5 +23,5 @@ index 2df8396..2ad1fd8 100644
paste = true;
} else if (ret == KEY_CODE_YES && ch == KeyPasteOff) {
--
-2.32.0
+2.34.1
diff --git a/pkg/catgirl/patch/0003-Resize-status-window-explicitly-during-resize.patch b/pkg/catgirl/patch/0003-Resize-status-window-explicitly-during-resize.patch
@@ -1,4 +1,4 @@
-From e3f4f70859054485039e2d8dede1d0b95dd40fa7 Mon Sep 17 00:00:00 2001
+From 56114f444867f3c13c7de1abbab87818007bba21 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Mon, 31 May 2021 16:40:28 -0700
Subject: [PATCH] Resize status window explicitly during resize()
@@ -11,10 +11,10 @@ status window explicitly.
1 file changed, 1 insertion(+)
diff --git a/ui.c b/ui.c
-index 2ad1fd8..64e83d3 100644
+index c92c0df..1e9e03f 100644
--- a/ui.c
+++ b/ui.c
-@@ -659,6 +659,7 @@ static void windowReflow(struct Window *window) {
+@@ -657,6 +657,7 @@ static void windowReflow(struct Window *window) {
static void resize(void) {
wclear(main);
@@ -23,5 +23,5 @@ index 2ad1fd8..64e83d3 100644
for (uint num = 0; num < windows.len; ++num) {
windowReflow(windows.ptrs[num]);
--
-2.32.0
+2.34.1
diff --git a/pkg/catgirl/patch/0004-Fix-strptime-decode-for-musl-libc.patch b/pkg/catgirl/patch/0004-Fix-strptime-decode-for-musl-libc.patch
@@ -1,34 +0,0 @@
-From c6813f480f7c60541f4e3cb7601c89dfafc59ddc Mon Sep 17 00:00:00 2001
-From: psykose <alice@ayaya.dev>
-Date: Tue, 26 Oct 2021 10:14:17 +0200
-Subject: [PATCH] Fix strptime decode for musl libc
-
-POSIX does not define a %F for strptime[1], but does define %F for
-strftime[2]. Afaik most libc's implement %F for both, but musl is very
-standards-compliant and does not have %F on strptime, leading to
-unparsed message tag times, which causes all backlog sent from bouncer
-on startup to have a timestamp of the current time, instead of the
-actual timestamp sent.
-
-[1] https://pubs.opengroup.org/onlinepubs/9699919799/functions/strptime.html
-[2] https://pubs.opengroup.org/onlinepubs/9699919799/functions/strftime.html
----
- handle.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/handle.c b/handle.c
-index 1ace1b3..7f99a7c 100644
---- a/handle.c
-+++ b/handle.c
-@@ -91,7 +91,7 @@ static const time_t *tagTime(const struct Message *msg) {
- static time_t time;
- struct tm tm;
- if (!msg->tags[TagTime]) return NULL;
-- if (!strptime(msg->tags[TagTime], "%FT%T", &tm)) return NULL;
-+ if (!strptime(msg->tags[TagTime], "%Y-%m-%dT%T", &tm)) return NULL;
- time = timegm(&tm);
- return &time;
- }
---
-2.34.0
-
diff --git a/pkg/catgirl/patch/0004-HACK-Disable-colorized-output-in-M-l-window-list.patch b/pkg/catgirl/patch/0004-HACK-Disable-colorized-output-in-M-l-window-list.patch
@@ -0,0 +1,34 @@
+From 9c8a70c58b3b95dcccf3e91f570781938d517dcd Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Thu, 3 Jun 2021 00:54:30 -0700
+Subject: [PATCH] [HACK] Disable colorized output in M-l window list
+
+vid_attr is not supported by NetBSD's libcurses, and this is not
+crucial feature.
+---
+ ui.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/ui.c b/ui.c
+index 1e9e03f..dcdf6ae 100644
+--- a/ui.c
++++ b/ui.c
+@@ -684,7 +684,6 @@ static void windowList(const struct Window *window) {
+
+ char buf[TimeCap];
+ strftime(buf, sizeof(buf), uiTime.format, localtime(&line->time));
+- vid_attr(colorAttr(Colors[Gray]), colorPair(Colors[Gray], -1), NULL);
+ printf("%s ", buf);
+
+ bool align = false;
+@@ -700,7 +699,6 @@ static void windowList(const struct Window *window) {
+ size_t tab = strcspn(str, "\t");
+ if (tab < len) len = tab;
+
+- vid_attr(styleAttr(style), stylePair(style), NULL);
+ printf("%.*s", (int)len, str);
+ str += len;
+ }
+--
+2.34.1
+
diff --git a/pkg/catgirl/patch/0005-HACK-Disable-colorized-output-in-M-l-window-list.patch b/pkg/catgirl/patch/0005-HACK-Disable-colorized-output-in-M-l-window-list.patch
@@ -1,34 +0,0 @@
-From 80dac47ee3aa26290cda962ab2531afb054bf47a Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Thu, 3 Jun 2021 00:54:30 -0700
-Subject: [PATCH] [HACK] Disable colorized output in M-l window list
-
-vid_attr is not supported by NetBSD's libcurses, and this is not
-crucial feature.
----
- ui.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/ui.c b/ui.c
-index 64e83d3..407672c 100644
---- a/ui.c
-+++ b/ui.c
-@@ -686,7 +686,6 @@ static void windowList(const struct Window *window) {
-
- char buf[TimeCap];
- strftime(buf, sizeof(buf), uiTime.format, localtime(&line->time));
-- vid_attr(colorAttr(Colors[Gray]), colorPair(Colors[Gray], -1), NULL);
- printf("%s ", buf);
-
- bool align = false;
-@@ -702,7 +701,6 @@ static void windowList(const struct Window *window) {
- size_t tab = strcspn(str, "\t");
- if (tab < len) len = tab;
-
-- vid_attr(styleAttr(style), stylePair(style), NULL);
- printf("%.*s", (int)len, str);
- str += len;
- }
---
-2.32.0
-
diff --git a/pkg/catgirl/ver b/pkg/catgirl/ver
@@ -1 +1 @@
-1.9a r1
+2.0a r0
