Sat Apr 24 08:36:22 2021 UTC ()
irssi: add link to upstream PR


(nia)
diff -r1.53 -r1.54 pkgsrc/chat/irssi/distinfo
diff -r1.1 -r1.2 pkgsrc/chat/irssi/patches/patch-src_fe-text_terminfo-core.c
cvs diff -r1.53 -r1.54 pkgsrc/chat/irssi/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/irssi/distinfo 2021/04/24 08:32:00 1.53
+++ pkgsrc/chat/irssi/distinfo 2021/04/24 08:36:22 1.54
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.53 2021/04/24 08:32:00 nia Exp $ 1$NetBSD: distinfo,v 1.54 2021/04/24 08:36:22 nia Exp $
2 2
3SHA1 (irssi-1.2.3.tar.gz) = 1a7af14546cc1a7ada221dd9da82f58af58b5bbd 3SHA1 (irssi-1.2.3.tar.gz) = 1a7af14546cc1a7ada221dd9da82f58af58b5bbd
4RMD160 (irssi-1.2.3.tar.gz) = 72a9014c158e7685c6a1e56156ed62728588f1ae 4RMD160 (irssi-1.2.3.tar.gz) = 72a9014c158e7685c6a1e56156ed62728588f1ae
5SHA512 (irssi-1.2.3.tar.gz) = 7e4c8dc2d8e3532f26775702254339ba92e276c82b5a7041756574096928e25f2614d04a1cfa091ba90bc3e5a0d552578b80bc89c3c87c6d48722139c2ae47ff 5SHA512 (irssi-1.2.3.tar.gz) = 7e4c8dc2d8e3532f26775702254339ba92e276c82b5a7041756574096928e25f2614d04a1cfa091ba90bc3e5a0d552578b80bc89c3c87c6d48722139c2ae47ff
6Size (irssi-1.2.3.tar.gz) = 1824077 bytes 6Size (irssi-1.2.3.tar.gz) = 1824077 bytes
7SHA1 (patch-ad) = 8cb41612afcd6088b869235166da9a6eb37e6ec7 7SHA1 (patch-ad) = 8cb41612afcd6088b869235166da9a6eb37e6ec7
8SHA1 (patch-src_fe-text_terminfo-core.c) = e1f64ae71fcd56596f325bb57ec27f51d8826223 8SHA1 (patch-src_fe-text_terminfo-core.c) = 4f0af35b0288db4615e147211ca6e47b2383669d
cvs diff -r1.1 -r1.2 pkgsrc/chat/irssi/patches/Attic/patch-src_fe-text_terminfo-core.c (expand / switch to unified diff)

--- pkgsrc/chat/irssi/patches/Attic/patch-src_fe-text_terminfo-core.c 2021/04/24 08:32:00 1.1
+++ pkgsrc/chat/irssi/patches/Attic/patch-src_fe-text_terminfo-core.c 2021/04/24 08:36:22 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-src_fe-text_terminfo-core.c,v 1.1 2021/04/24 08:32:00 nia Exp $ 1$NetBSD: patch-src_fe-text_terminfo-core.c,v 1.2 2021/04/24 08:36:22 nia Exp $
2 2
3Fix compatibility with NetBSD curses 3Fix compatibility with NetBSD curses
4 4
5from the ncurses man page: 5from the ncurses man page:
6 6
7>X/Open Curses prototypes tparm with a fixed number of parameters, 7>X/Open Curses prototypes tparm with a fixed number of parameters,
8>rather than a variable argument list. 8>rather than a variable argument list.
9 9
10>This implementation uses a variable argument list, but can be con- 10>This implementation uses a variable argument list, but can be con-
11>figured to use the fixed-parameter list. Portable applications 11>figured to use the fixed-parameter list. Portable applications
12>should provide 9 parameters after the format; zeroes are fine for 12>should provide 9 parameters after the format; zeroes are fine for
13>this purpose. 13>this purpose.
14 14
@@ -16,26 +16,28 @@ from the ncurses man page: @@ -16,26 +16,28 @@ from the ncurses man page:
16>Issue 7 proposed the tiparm function in mid-2009. 16>Issue 7 proposed the tiparm function in mid-2009.
17 17
18Previously, irssi defined its own tparm prototype, so passing 18Previously, irssi defined its own tparm prototype, so passing
19a variable number of arguments worked. 19a variable number of arguments worked.
20 20
21However, since this change: 21However, since this change:
22 22
23https://github.com/irssi/irssi/commit/0b82f14151dad5f106c208d25818816a8f782a54 23https://github.com/irssi/irssi/commit/0b82f14151dad5f106c208d25818816a8f782a54
24 24
25<term.h> in included, which on systems using NetBSD libcurses, gives 25<term.h> in included, which on systems using NetBSD libcurses, gives
26the X/Open compliant definition of tparm, which does not work with 26the X/Open compliant definition of tparm, which does not work with
27a variable number of arguments. 27a variable number of arguments.
28 28
 29https://github.com/irssi/irssi/pull/1305
 30
29--- src/fe-text/terminfo-core.c.orig 2021-04-08 14:42:39.000000000 +0000 31--- src/fe-text/terminfo-core.c.orig 2021-04-08 14:42:39.000000000 +0000
30+++ src/fe-text/terminfo-core.c 32+++ src/fe-text/terminfo-core.c
31@@ -17,7 +17,7 @@ inline static int term_putchar(int c) 33@@ -17,7 +17,7 @@ inline static int term_putchar(int c)
32 #else 34 #else
33 /* Don't bother including curses.h because of these - 35 /* Don't bother including curses.h because of these -
34 they might not even be defined there */ 36 they might not even be defined there */
35-char *tparm(); 37-char *tparm();
36+char *tiparm(); 38+char *tiparm();
37 int tputs(); 39 int tputs();
38  40
39 int setupterm(); 41 int setupterm();
40@@ -110,14 +110,14 @@ static TERMINFO_REC tcaps[] = { 42@@ -110,14 +110,14 @@ static TERMINFO_REC tcaps[] = {
41 /* Move cursor (cursor_address / cup) */ 43 /* Move cursor (cursor_address / cup) */