Module Name: pkgsrc
Committed By: rin
Date: Sun Jul 24 08:56:55 UTC 2022
Modified Files:
pkgsrc/x11/mlterm: Makefile distinfo
Added Files:
pkgsrc/x11/mlterm/patches: patch-vtemu_vt__parser.c
Log Message:
X11/mlterm: Fix TTIMEST without Ps argument.
Cherry-picked from upstream.
Bump revision.
To generate a diff of this commit:
cvs rdiff -u -r1.173 -r1.174 pkgsrc/x11/mlterm/Makefile
cvs rdiff -u -r1.94 -r1.95 pkgsrc/x11/mlterm/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/mlterm/patches/patch-vtemu_vt__parser.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/x11/mlterm/Makefile
diff -u pkgsrc/x11/mlterm/Makefile:1.173 pkgsrc/x11/mlterm/Makefile:1.174
--- pkgsrc/x11/mlterm/Makefile:1.173 Thu Jul 7 12:59:51 2022
+++ pkgsrc/x11/mlterm/Makefile Sun Jul 24 08:56:54 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.173 2022/07/07 12:59:51 rin Exp $
+# $NetBSD: Makefile,v 1.174 2022/07/24 08:56:54 rin Exp $
DISTNAME= mlterm-3.9.2
DIST_SUBDIR= ${PKGNAME_NOREV} # for re-tagged 3.9.2
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GITHUB:=arakiken/}
GITHUB_PROJECT= ${PKGBASE}
Index: pkgsrc/x11/mlterm/distinfo
diff -u pkgsrc/x11/mlterm/distinfo:1.94 pkgsrc/x11/mlterm/distinfo:1.95
--- pkgsrc/x11/mlterm/distinfo:1.94 Sat Jul 9 09:40:20 2022
+++ pkgsrc/x11/mlterm/distinfo Sun Jul 24 08:56:54 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.94 2022/07/09 09:40:20 rin Exp $
+$NetBSD: distinfo,v 1.95 2022/07/24 08:56:54 rin Exp $
BLAKE2s (mlterm-3.9.2/mlterm-3.9.2.tar.gz) = 3bd490eb661bc802cb05ebbb17a73956f5a62ca3838dcf5cb7baad0c01c3ebdb
SHA512 (mlterm-3.9.2/mlterm-3.9.2.tar.gz) = 3076dafbc98a01738d88acf0e0f52e15d33862b3e9b7a851a4496f1be07ee9e51103daf7842954bcae1f1ba62bd6645b0bd60af7f66ee98721bdf3786b9fcbaf
@@ -8,3 +8,4 @@ SHA1 (patch-etc_font-fb) = 52c18f512c67f
SHA1 (patch-uitoolkit_fb_ui__display__wscons.c) = ab508245bf5f924853a765177509f274833631af
SHA1 (patch-uitoolkit_xlib_ui__imagelib.c) = 4c8b3f520d9e1e4fa900b860767799ee16fa0026
SHA1 (patch-vtemu_Makefile.in) = 172f12f73408489f782d63c8b0b7915af441d368
+SHA1 (patch-vtemu_vt__parser.c) = ac8e6c8748047778daa1fc22c971e10e58918887
Added files:
Index: pkgsrc/x11/mlterm/patches/patch-vtemu_vt__parser.c
diff -u /dev/null pkgsrc/x11/mlterm/patches/patch-vtemu_vt__parser.c:1.1
--- /dev/null Sun Jul 24 08:56:55 2022
+++ pkgsrc/x11/mlterm/patches/patch-vtemu_vt__parser.c Sun Jul 24 08:56:54 2022
@@ -0,0 +1,21 @@
+$NetBSD: patch-vtemu_vt__parser.c,v 1.1 2022/07/24 08:56:54 rin Exp $
+
+Fix TTIMEST without Ps argument; IM should be turned off in this case.
+
+Cherry-picked from upstream commit 2c3d00d:
+https://github.com/arakiken/mlterm/commit/2c3d00d530930c262322d4b1d431352cf68e2245
+
+--- vtemu/vt_parser.c.orig
++++ vtemu/vt_parser.c
+@@ -4900,8 +4900,10 @@ inline static int parse_vt100_escape_sequence(
+
+ vt_parser->im_is_active = im_is_active(vt_parser);
+ } else if (*str_p == 't') {
+- /* ps[0] = 0 (Close), ps[0] = 1 (Open) */
++ /* ps[0] = 0, -1 (Close), ps[0] = 1 (Open) */
+
++ if (ps[0] == -1)
++ ps[0] = 0;
+ if (ps[0] != im_is_active(vt_parser)) {
+ switch_im_mode(vt_parser);
+ }