ncurses: Apply Debian patch to fix tmux with screen-256color.

Bump PKGREVISION.
NetBSD · Mar 30, 2020 · e8a4d5a · e8a4d5a
1 parent 88cb3cb
commit e8a4d5a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.108 2020/03/28 07:55:54 wiz Exp $
+# $NetBSD: Makefile,v 1.109 2020/03/30 08:53:42 jperkin Exp $
 
 .include "Makefile.common"
-PKGREVISION=	1
+PKGREVISION=	2
 
 COMMENT=	CRT screen handling and optimization package
 

diff --git a/devel/ncurses/distinfo b/devel/ncurses/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.43 2020/03/28 07:55:54 wiz Exp $
+$NetBSD: distinfo,v 1.44 2020/03/30 08:53:42 jperkin Exp $
 
 SHA1 (ncurses-6.2.tar.gz) = 56e410fb77f2b5501a0b2f6a995376f3cefe1097
 RMD160 (ncurses-6.2.tar.gz) = bedfe81f33b3e55e44d14126c9c2821d7f222701
 SHA512 (ncurses-6.2.tar.gz) = 4c1333dcc30e858e8a9525d4b9aefb60000cfc727bc4a1062bace06ffc4639ad9f6e54f6bdda0e3a0e5ea14de995f96b52b3327d9ec633608792c99a1e8d840d
 Size (ncurses-6.2.tar.gz) = 3425862 bytes
 SHA1 (patch-c++_Makefile.in) = 32611b5fe66df676f35c39212402b77d99ca8e19
 SHA1 (patch-configure) = c0074d959a9981b3811519328f42a0c18a51c5a4
-SHA1 (patch-misc_terminfo.src) = 4efca9c426b3c2c4202775a50c51396189da7f8f
+SHA1 (patch-misc_terminfo.src) = d9eede4b159358f396693141ed9d9c2a76647917
 SHA1 (patch-mk-1st.awk) = adf9d68ee565da80078cfcfa8969a4ef806d65de
diff --git a/devel/ncurses/patches/patch-misc_terminfo.src b/devel/ncurses/patches/patch-misc_terminfo.src
@@ -1,11 +1,14 @@
-$NetBSD: patch-misc_terminfo.src,v 1.3 2020/03/28 07:55:55 wiz Exp $
+$NetBSD: patch-misc_terminfo.src,v 1.4 2020/03/30 08:53:42 jperkin Exp $
 
 Many terminal emulators still do not support the "rep" capability, so
 avoid it for maximum portability.  Patch from OmniOS, see also
 http://invisible-island.net/ncurses/ncurses.faq.html#xterm_generic
 or
 https://github.com/joyent/pkgsrc/issues/248
 
+Apply Debian patch for https://bugs.debian.org/933572, removing "rin"
+from screen-256color until tmux supports it correctly.
+
 --- misc/terminfo.src.orig	2020-01-19 01:09:38.000000000 +0000
 +++ misc/terminfo.src
 @@ -4513,7 +4513,7 @@ xterm-xfree86|xterm terminal emulator (X
@@ -17,3 +20,11 @@ https://github.com/joyent/pkgsrc/issues/248
  	use=ecma+strikeout, use=xterm+keypad, use=vt420+lrmm,
  	use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm+tmux,
  	use=xterm-basic,
+@@ -7346,6 +7346,7 @@ screen-16color-bce-s|GNU Screen with 16 
+
+ screen-256color|GNU Screen with 256 colors,
+ 	use=xterm+256setaf, use=screen4,
++	rin@,
+
+ screen-256color-s|GNU Screen with 256 colors and status line,
+ 	use=xterm+256setaf, use=screen-s,