CVS commit: pkgsrc/inputmethod/tamago-tsunagi

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Sat Dec 27 12:44:03 UTC 2025

Modified Files:
        pkgsrc/inputmethod/tamago-tsunagi: Makefile distinfo
Added Files:
        pkgsrc/inputmethod/tamago-tsunagi/patches: patch-its.el

Log Message:
(inputmethod/tamago-tsunagi) Fix for Emacs30


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/inputmethod/tamago-tsunagi/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/inputmethod/tamago-tsunagi/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/inputmethod/tamago-tsunagi/patches/patch-its.el

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

Modified files:

Index: pkgsrc/inputmethod/tamago-tsunagi/Makefile
diff -u pkgsrc/inputmethod/tamago-tsunagi/Makefile:1.3 pkgsrc/inputmethod/tamago-tsunagi/Makefile:1.4
--- pkgsrc/inputmethod/tamago-tsunagi/Makefile:1.3      Sat Sep  9 13:04:29 2023
+++ pkgsrc/inputmethod/tamago-tsunagi/Makefile  Sat Dec 27 12:44:02 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2023/09/09 13:04:29 mef Exp $
+# $NetBSD: Makefile,v 1.4 2025/12/27 12:44:02 mef Exp $
 
 DISTNAME=      tamago-tsunagi-5.0.7.1
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    inputmethod
 MASTER_SITES=  ${MASTER_SITE_OSDN:=tamago-tsunagi/62701/}
 

Index: pkgsrc/inputmethod/tamago-tsunagi/distinfo
diff -u pkgsrc/inputmethod/tamago-tsunagi/distinfo:1.4 pkgsrc/inputmethod/tamago-tsunagi/distinfo:1.5
--- pkgsrc/inputmethod/tamago-tsunagi/distinfo:1.4      Sat Sep  9 13:04:29 2023
+++ pkgsrc/inputmethod/tamago-tsunagi/distinfo  Sat Dec 27 12:44:02 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2023/09/09 13:04:29 mef Exp $
+$NetBSD: distinfo,v 1.5 2025/12/27 12:44:02 mef Exp $
 
 BLAKE2s (tamago-tsunagi-5.0.7.1.tar.gz) = 390d83c45785cd37cf363e83123f9ae5600e5761c0f352df9da6682d8935a2f9
 SHA512 (tamago-tsunagi-5.0.7.1.tar.gz) = dc830a9e7a7c53743c3e51807d9966bb2c0cb20c39a347bd6a3c2015a74fc5015eb9ddb8c9d0d357390e87d8b85122186299a391b6fa484916bbfc7025ec1ea7
@@ -6,3 +6,4 @@ Size (tamago-tsunagi-5.0.7.1.tar.gz) = 3
 SHA1 (patch-Makefile.in) = 8cb77ab851229d9b4173451ba9ca46bdfff940b9
 SHA1 (patch-egg-com.el) = 2c54082b0970d4d206d1ea3ec2ccf87faf77b5b0
 SHA1 (patch-egg-x0213.el) = 8fc19a1cc4804b774048c96b469dc4c75b65bdd5
+SHA1 (patch-its.el) = a501ce1399a2a742887c4f1811f8582b0cc2abbe

Added files:

Index: pkgsrc/inputmethod/tamago-tsunagi/patches/patch-its.el
diff -u /dev/null pkgsrc/inputmethod/tamago-tsunagi/patches/patch-its.el:1.1
--- /dev/null   Sat Dec 27 12:44:03 2025
+++ pkgsrc/inputmethod/tamago-tsunagi/patches/patch-its.el      Sat Dec 27 12:44:02 2025
@@ -0,0 +1,47 @@
+$NetBSD: patch-its.el,v 1.1 2025/12/27 12:44:02 mef Exp $
+
+--- egg/wnn.elc ---
+egg/wnn.el:34:11: Error: Wrong type argument: obarrayp, [nil nil nil ...
+
+Fix from FreeBSD ports
+
+--- its.el
++++ its.el
+@@ -695,7 +695,7 @@ This variable override `its-delete-by-keystroke'."
+ 
+ (defun its-map-compaction (map)
+   (if its-compaction-enable
+-      (let ((its-compaction-hash-table (make-vector 1000 nil))
++      (let ((its-compaction-hash-table (obarray-make 1000))
+           (its-compaction-integer-table (make-vector 138 nil))
+           (its-compaction-counter-1 1)
+           (its-compaction-counter-2 0)
+@@ -1357,8 +1357,8 @@ Return last state."
+   (interactive)
+   (its-convert (lambda (str lang) (japanese-katakana str))))
+ 
+-(defconst its-full-half-table (make-vector 100 nil))
+-(defconst its-half-full-table (make-vector 100 nil))
++(defconst its-full-half-table (obarray-make 100))
++(defconst its-half-full-table (obarray-make 100))
+ 
+ (let ((table '((Japanese
+               (?$B!!(B . ?\ ) (?$B!$(B . ?,)  (?$B!%(B . ?.)  (?$B!"(B . ?,)  (?$B!#(B . ?.)
+@@ -1468,7 +1468,6 @@ Return last state."
+               (?$(C#p(B . ?p)  (?$(C#q(B . ?q)  (?$(C#r(B . ?r)  (?$(C#s(B . ?s)  (?$(C#t(B . ?t)
+               (?$(C#u(B . ?u)  (?$(C#v(B . ?v)  (?$(C#w(B . ?w)  (?$(C#x(B . ?x)  (?$(C#y(B . ?y)
+               (?$(C#z(B . ?z))))
+-      (hash (make-vector 100 nil))
+       lang pair)
+   (while table
+     (setq lang (caar table)
+@@ -1480,8 +1479,7 @@ Return last state."
+       (set (intern (concat (symbol-name lang) (char-to-string (cdar pair)))
+                  its-half-full-table)
+          (caar pair))
+-      (setq pair (cdr pair)))
+-    hash))
++      (setq pair (cdr pair)))))
+ 
+ ;;; its-half-width : half-width-region for input-buffer
+ (defun its-half-width ()