CVS commit: pkgsrc/inputmethod

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Sat Jul  4 07:28:53 UTC 2026

Modified Files:
        pkgsrc/inputmethod/canna: distinfo
        pkgsrc/inputmethod/canna-canuum: Makefile
Added Files:
        pkgsrc/inputmethod/canna/patches: patch-canuum_jhlp.c

Log Message:
canna-canuum: make ^O conversion toggle work on BSD systems

When canuum switches the tty to non-canonical input mode, also
disable IEXTEN.  On BSD termios implementations, leaving IEXTEN
enabled can make ^O be consumed by the tty line discipline as
VDISCARD before canuum can read it, so the default conversion-mode
toggle key does not work.
Also fix obvious bit-clear typos for IUCLC and XCASE.

Taken from uum/jhlp.c in FreeWnn-1.1.1-a023 via the previous
pkgsrc patch-canuum_jhlp.c for 3.7pl3.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/inputmethod/canna/distinfo
cvs rdiff -u -r1.19 -r1.20 pkgsrc/inputmethod/canna-canuum/Makefile
cvs rdiff -u -r0 -r1.3 pkgsrc/inputmethod/canna/patches/patch-canuum_jhlp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/inputmethod/canna/distinfo
diff -u pkgsrc/inputmethod/canna/distinfo:1.22 pkgsrc/inputmethod/canna/distinfo:1.23
--- pkgsrc/inputmethod/canna/distinfo:1.22      Fri Jul  3 15:05:58 2026
+++ pkgsrc/inputmethod/canna/distinfo   Sat Jul  4 07:28:53 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2026/07/03 15:05:58 tsutsui Exp $
+$NetBSD: distinfo,v 1.23 2026/07/04 07:28:53 tsutsui Exp $
 
 BLAKE2s (Canna38.tar.xz) = 0055232ceb6395d99f1e7fe27933e8f10efb9b973d69ca41b375b5e9999d4f57
 SHA512 (Canna38.tar.xz) = 50f44904fe95f5893f6d18f55ec29ae55b6d35ffec9f07c44898907bfbfef1c88b47ce269767395409a4ae6a22aa2f2be7ec44fc376eb83d2feb2453233f18f0
@@ -7,6 +7,7 @@ SHA1 (patch-Canna.conf) = 01a5e1b323d3cf
 SHA1 (patch-Imakefile) = 71c6d9fb2b60d386c37eb5f1f3df879cb8462929
 SHA1 (patch-canna_widedef.h) = a28dfd4c546dbc91e68589721c389426098d19ef
 SHA1 (patch-canuum_canna.c) = b52a0cdce5bd3e45ad9a9adbfab5c4f6d7c6ccf1
+SHA1 (patch-canuum_jhlp.c) = fdbc67d458268517a574ee9879983dda3ed8e914
 SHA1 (patch-canuum_termcap.c) = 38fb86a2e0385d2fe13165987c1c6842f558165d
 SHA1 (patch-canuum_termio.c) = 9b1284c3672a4fbceb85388ba544d17a17863e49
 SHA1 (patch-cmd_cmd.tmpl) = 642e3e15057fba2142ed48e0493464be978e07b2

Index: pkgsrc/inputmethod/canna-canuum/Makefile
diff -u pkgsrc/inputmethod/canna-canuum/Makefile:1.19 pkgsrc/inputmethod/canna-canuum/Makefile:1.20
--- pkgsrc/inputmethod/canna-canuum/Makefile:1.19       Fri Jul  3 16:03:24 2026
+++ pkgsrc/inputmethod/canna-canuum/Makefile    Sat Jul  4 07:28:53 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2026/07/03 16:03:24 tsutsui Exp $
+# $NetBSD: Makefile,v 1.20 2026/07/04 07:28:53 tsutsui Exp $
 
 CANNA_MODULE=  canuum
+PKGREVISION=   1
 
 .include "../../inputmethod/canna/Makefile.common"
 

Added files:

Index: pkgsrc/inputmethod/canna/patches/patch-canuum_jhlp.c
diff -u /dev/null pkgsrc/inputmethod/canna/patches/patch-canuum_jhlp.c:1.3
--- /dev/null   Sat Jul  4 07:28:53 2026
+++ pkgsrc/inputmethod/canna/patches/patch-canuum_jhlp.c        Sat Jul  4 07:28:53 2026
@@ -0,0 +1,29 @@
+$NetBSD: patch-canuum_jhlp.c,v 1.3 2026/07/04 07:28:53 tsutsui Exp $
+
+- disable IEXTEN when canuum puts the tty into non-canonical input mode
+  for BSD systems (from uum/jhlp.c in the latest FreeWnn-1.1.1-a023)
+- also fix obvious bit-clear typos for IUCLC and XCASE
+
+--- canuum/jhlp.c.orig 2026-07-04 07:02:53.545783256 +0000
++++ canuum/jhlp.c
+@@ -897,7 +897,7 @@ j_term_init ()
+ #else /* !USE_LINUX_TERM */
+   buf1.c_iflag &= ~(ISTRIP | INLCR | IGNCR | ICRNL | IXON);
+ #ifdef IUCLC
+-  buf1.c_iflag &= IUCLC;
++  buf1.c_iflag &= ~IUCLC;
+ #endif
+   if (flow_control)
+     {
+@@ -905,7 +905,10 @@ j_term_init ()
+     }
+   buf1.c_lflag &= ~(ECHONL | ECHOK | ECHOE | ECHO | ICANON | ISIG);
+ #ifdef XCASE
+-  buf1.c_lflag &= XCASE;
++  buf1.c_lflag &= ~XCASE;
++#endif
++#ifdef IEXTEN
++  buf1.c_lflag &= ~IEXTEN;
+ #endif
+   buf1.c_oflag = OPOST;
+ #ifdef USE_TERMIOS